Changeset 225 in PSPA for Interface_Web/trunk/pspaWT/src/dataManager.cc

Timestamp:

Dec 27, 2012, 5:18:50 PM (12 years ago)

Author:

lemeur

Message:

element 'fit' + label en parametre

File:

• Interface_Web/trunk/pspaWT/src/dataManager.cc (modified) (5 diffs)

Interface_Web/trunk/pspaWT/src/dataManager.cc

@@ -65 +65 @@
 
           if(!elPtr->is_parmela_element()) {
-            diagnostic += " the element " + elPtr->getName().getElementName() + " is not allowed for PARMELA \n";
+            diagnostic += " the element " + elPtr->getNomdElement().getElementName() + " is not allowed for PARMELA \n";
           }
         }           
@@ -77 +77 @@
 
           if (!elPtr->is_transport_element()) {
-            diagnostic += " the element " + elPtr->getName().getElementName() + " is not allowed for TRANSPORT \n";
+            diagnostic += " the element " + elPtr->getNomdElement().getElementName() + " is not allowed for TRANSPORT \n";
           }
         }           
@@ -148 +148 @@
             string elemLabel = getLabelFromElementNumero (k);
             abstractElement* ptr = elementsGallery_.getElementPointerFromNumero(k);
-            if (!diagnosticBeam_.back().setFromTransport(elemLabel, ptr->getName() )  )
+            if (!diagnosticBeam_.back().setFromTransport(elemLabel, ptr->getNomdElement() )  )
               {
                 sortie << " reading transport output  failed " << endl;
@@ -262 +262 @@
 
   // Dans le cas où le premier element n'est pas beam
-  if ( premierEl->getName().getElementType() != beam ) {
+  if ( premierEl->getNomdElement().getElementType() != beam ) {
     // s'il n'y a pas faisceau courant, erreur
     if ( currentBeam_ == NULL ) {
@@ -329 +329 @@
   double initalKineticEnergy = 0.0;
   elPtr = elementsGallery_.getElementPointer(indexDeb);
-  if ( elPtr->getName().getElementType() != RFgun ) {
+  if ( elPtr->getNomdElement().getElementType() != RFgun ) {
     cerr << " dataManager::createInputFileParmela : the first element should be rfgun" << endl;
     return false;