Changeset 387 in PSPA for Interface_Web

Timestamp:

Mar 12, 2013, 3:16:20 PM (11 years ago)

Author:

lemeur

Message:

mise a jour compatibilites snapshot

Location:

Interface_Web/trunk/pspaWT

Files:

• sources/controler/src/elementBeam.cc (modified) (1 diff)
• sources/controler/src/elementBend.cc (modified) (2 diffs)
• sources/controler/src/elementCell.cc (modified) (1 diff)
• sources/controler/src/elementDrift.cc (modified) (2 diffs)
• sources/controler/src/elementRfgun.cc (modified) (1 diff)
• sources/controler/src/elementSnapshot.cc (modified) (1 diff)
• sources/controler/src/elementSoleno.cc (modified) (2 diffs)
• sources/controler/src/softwareParmela.cc (modified) (3 diffs)
• sources/controler/src/softwareTransport.cc (modified) (2 diffs)
• workingArea/pmbfield (modified) (1 diff)

Interface_Web/trunk/pspaWT/sources/controler/src/elementBeam.cc

@@ -91 +91 @@
     beam2Moments moments(x_, xp_, y_, yp_, dl_, del_);
     cout << " elementBeam::transportOutputFlow(), p0 = " << p0_ << endl;
-    sortie << label_ << ":" << moments.writeToTransportInput(p0_);
+    sortie << label_ << ":" << moments.writeToTransportInput(p0_) << endl;
     return sortie.str();
 }

Interface_Web/trunk/pspaWT/sources/controler/src/elementBend.cc

@@ -96 +96 @@
     ecin = EREST_MeV*(sqrt(ecin) - 1.0);
     sortie << "BEND /l=" << lenghtElem_ << "  / aper=" << aperture_ << "  / iout=1 / wr=" << ecin << " /alpha=" << angleDeg_ << " / beta1=" << beta1_;
-    sortie << " / beta2=" << beta1_;
+    sortie << " / beta2=" << beta1_  << endl;
+
     return sortie.str();
   }
@@ -104 +105 @@
   {
     ostringstream sortie;
-    sortie << label_ << ":" << "  SBEND, RADIUS=" << radius_ << ", ANGLE=" << angleDeg_ << ", E1=" << beta1_ << ", E2=" << beta2_ << ";";
+    sortie << label_ << ":" << "  SBEND, RADIUS=" << radius_ << ", ANGLE=" << angleDeg_ << ", E1=" << beta1_ << ", E2=" << beta2_ << ";" << endl;
     return sortie.str();
   }

Interface_Web/trunk/pspaWT/sources/controler/src/elementCell.cc

@@ -101 +101 @@
     if ( focusingMagFile_ != "") {
       sortie << "POISSON /zoff=" << offsetMag_ << " /rmult=" << scaleFactor_ << endl;
-      sortie << focusingMagFile_;
+      sortie << focusingMagFile_ << endl;
     }
 

Interface_Web/trunk/pspaWT/sources/controler/src/elementDrift.cc

@@ -65 +65 @@
 {
   ostringstream sortie;
-  sortie << "DRIFT /l=" << lenghtElem_ << "  /aper=" << aperture_ << "  /iout=1";
+  sortie << "DRIFT /l=" << lenghtElem_ << "  /aper=" << aperture_ << "  /iout=1" << endl;
   return sortie.str();
 }
@@ -74 +74 @@
     ostringstream sortie;
     // longueur en m
-    sortie << label_ << ":" << "  DRIFT, L=" << 0.01*lenghtElem_ << ";";
+    sortie << label_ << ":" << "  DRIFT, L=" << 0.01*lenghtElem_ << ";" << endl;
     return sortie.str();
   }

Interface_Web/trunk/pspaWT/sources/controler/src/elementRfgun.cc

@@ -105 +105 @@
     
 
-    sortie << "SCHEFF /beami=" << -fabs(totalCharge_)/ELECTRONANOCOULOMB << " /nprog=2 /point=-1.7";
+    sortie << "SCHEFF /beami=" << -fabs(totalCharge_)/ELECTRONANOCOULOMB << " /nprog=2 /point=-1.7"  << endl;
  
     return sortie.str();

Interface_Web/trunk/pspaWT/sources/controler/src/elementSnapshot.cc

@@ -71 +71 @@
 string elementSnapshot::parmelaOutputFlow() const
 {
-  return string(" ");
+    // ostringstream sortie;
+    // return sortie.str();
+  return string("");
 }
 
 string elementSnapshot::transportOutputFlow() const
 {
-  return string(" ");
+  return string("");
 }
 

Interface_Web/trunk/pspaWT/sources/controler/src/elementSoleno.cc

@@ -74 +74 @@
     ostringstream sortie;
     // on passe l'induction magnetique en Gauss 
-    sortie << "SOLENOID /l=" << lenghtElem_ << "  /aper=" << aperture_ << "  /iout=1 /h=" << 1000.*B0_;
+    sortie << "SOLENOID /l=" << lenghtElem_ << "  /aper=" << aperture_ << "  /iout=1 /h=" << 1000.*B0_  << endl;
     return sortie.str();
   }
@@ -84 +84 @@
     sortie << label_ << ":" << "  SOLENOID, L=" << 0.01*lenghtElem_ << ", B=" << B0_ << ";" << endl;
     if ( varyB0_ ) {
-      sortie <<  "  VARY, " << label_+"[B]"  << ";";
+      sortie <<  "  VARY, " << label_+"[B]"  << ";" << endl;
     }
     return sortie.str();

Interface_Web/trunk/pspaWT/sources/controler/src/softwareParmela.cc

@@ -87 +87 @@
   unsigned int premier = numeroDeb_ ;
   if ( there_is_rfgun ) {
-    outfile << dataManager_->getElementPointerFromNumero(numeroDeb_)->parmelaOutputFlow() << endl;
+    outfile << dataManager_->getElementPointerFromNumero(numeroDeb_)->parmelaOutputFlow();
     premier++;
   } else {
@@ -93 +93 @@
   }
   
-  // commentaire :  si l'element est un snapshot ne rien ecrire dans inputFileName_ (= parmin) un saut de ligne perturbe l'execution de parmela
   for ( k = premier; k <= numeroFin_; k++)
     {
       elPtr = dataManager_->getElementPointerFromNumero(k);
       if (elPtr) {
-        if(elPtr->getNomdElement().getElementType() == snapshot) continue;
-        outfile << elPtr->parmelaOutputFlow() << endl;
+        outfile << elPtr->parmelaOutputFlow();
       }
     }
@@ -166 +164 @@
         particleBeam* lastDiag = dataManager_->updateCurrentDiagnostic(false);
 
-        if(elem->getNomdElement().getElementType() == snapshot) {
-          // si cet element est un snapshot, on organise la sortie correspondante
-          string* param = elem->getParametersString();
-          string cliche = workingDir + param[2].c_str();
-          if( beamToParmela(cliche,lastDiag) ) {
-              //            cout  <<  "["  <<  k  <<  "] : ecrit sur fichier " << cliche << " le contenu de beam["<<avantDernier<<"]"<<endl;
-            cout  <<  "["  <<  k  <<  "] : ecrit sur fichier " << cliche << " le contenu de beam[ ]"<<endl;
-          }
-        }
+        // if(elem->getNomdElement().getElementType() == snapshot) {
+        //   // si cet element est un snapshot, on organise la sortie correspondante
+        //   string* param = elem->getParametersString();
+        //   string cliche = workingDir + param[2].c_str();
+        //   if( beamToParmela(cliche,lastDiag) ) {
+        //       //         cout  <<  "["  <<  k  <<  "] : ecrit sur fichier " << cliche << " le contenu de beam["<<avantDernier<<"]"<<endl;
+        //     cout  <<  "["  <<  k  <<  "] : ecrit sur fichier " << cliche << " le contenu de beam[ ]"<<endl;
+        //   }
+        // }
         // si le numero est reconnu de parmela
       } else {

Interface_Web/trunk/pspaWT/sources/controler/src/softwareTransport.cc

@@ -84 +84 @@
       elPtr = dataManager_->getElementPointerFromNumero(k);
       cout << "debug:: element [" << k << "] " << elPtr->getNomdElement().getElementName() << endl;
-      outfile << elPtr->transportOutputFlow() << endl;
+      outfile << elPtr->transportOutputFlow();
     }
 
@@ -151 +151 @@
         // si l'element doit etre ignore, on renvoie sur le diag precedent
         dataManager_->updateCurrentDiagnostic(false);
-      // si l'element est un snapshot, recuperer la sortie precedente
-        if(ptr->getNomdElement().getElementType() == snapshot) {
-          string* param = ptr->getParametersString();
-          string cliche = workingDir + param[2].c_str();
-          cout<<"["<<k<<"] : ecrit sur fichier " << cliche << " le contenu de beam[ ]"<<endl;
-        }
+      // // si l'element est un snapshot, recuperer la sortie precedente
+      //        if(ptr->getNomdElement().getElementType() == snapshot) {
+      //          string* param = ptr->getParametersString();
+      //          string cliche = workingDir + param[2].c_str();
+      //          cout<<"["<<k<<"] : ecrit sur fichier " << cliche << " le contenu de beam[ ]"<<endl;
+      //        }
       } else {
         // si le numero est reconnu de transport

Interface_Web/trunk/pspaWT/workingArea/pmbfield

@@ -1 +1 @@
  z(cm)   b(gauss)
- -20.530      0.00      0.00      0.00      0.00
+   0.000     74.32      0.00     74.27     -1.41