Changeset 312 in PSPA for Interface_Web/trunk/pspaWT/sources/controler/src/particleBeam.cc

Timestamp:

Feb 5, 2013, 2:23:23 PM (11 years ago)

Author:

lemeur

Message:

suppression designation elements par index + fin generator

File:

• Interface_Web/trunk/pspaWT/sources/controler/src/particleBeam.cc (modified) (6 diffs)

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

@@ -81 +81 @@
 
 void particleBeam::setWithParticles(vector<double>& centroid, bareParticle& referencePart, vector<bareParticle>& particles) {
+  cout << " particleBeam::setWithParticles taille vect. part. " << particles.size() << endl;
   centroid_.clear();
   centroid_ = centroid;
@@ -86 +87 @@
   goodPartic_.clear();
   goodPartic_ = particles;
+  cout << " particleBeam::setWithParticles taille vect. part. ENREGISTRE " << goodPartic_.size() << endl;
+  //  printAllXYZ();
   particleRepresentationOk_ = true;
 }
@@ -112 +115 @@
 
 
-// bool  particleBeam::setFromTransport(string workingDir, string elLab, const nomdElements elem)
-// {
-//   string elementLabel = elLab;
-//   // transformer le label en majuscules ; je ne suis pas sur que ca 
-//   // marchera a tous les coups (glm)
-//   std::transform(elementLabel.begin(), elementLabel.end(), elementLabel.begin(), (int (*)(int))std::toupper);
-
-//   cout << " particleBeam::setFromTransport on cherche element " << elementLabel << endl;
-//   string buf;
-//   ifstream infile;
-//   //  string nameIn = WORKINGAREA + "transport.output";
-//   string nameIn = workingDir + "transport.output";
-//   infile.open(nameIn.c_str(), ios::in);
-//   if (!infile) {
-//     cerr << " particleBeam::setFromTransport : error re-opening transport output stream " << nameIn << endl;
-//     return false;
-//   }
-//   //  else cout << " particleBeam::setFromTransport() : ouverture du fichier " << nameIn << endl; 
-
-//   string::size_type nn = string::npos;
-//   while ( getline(infile, buf) ) {
-//     //      cout << " buf= "  << buf << endl;
-//     nn = buf.find(elementLabel);
-//     //     cout << " string::npos= " << string::npos << " nn= " << nn << endl;
-//     if ( nn != string::npos ) {
-//       //       cout << " particleBeam::setFromTransport : element " << elementLabel << " trouve " << endl;
-//       break;
-//     }
-//   }
-
-//   if ( nn == string::npos ) {
-//     cerr << " particleBeam::setFromTransport : element " << elementLabel << " non trouve dans le fichier  " << nameIn << endl;
-//     return false;
-//   }
-//   if (elem.getElementType() == bend ) {
-//     getline(infile, buf);
-//     getline(infile, buf);
-//   }
-//   readTransportMoments(infile);
-//   impressionDesMoments();
-//   infile.close();
-//   momentRepresentationOk_ = true;
-//   return true;
-// }
-
-// bool  particleBeam::setFromTransport(string workingDir, string elLab, const nomdElements elem)
-// {
-//   string elementLabel = elLab;
-//   // transformer le label en majuscules ; je ne suis pas sur que ca 
-//   // marchera a tous les coups (glm)
-//   std::transform(elementLabel.begin(), elementLabel.end(), elementLabel.begin(), (int (*)(int))std::toupper);
-
-//   cout << " particleBeam::setFromTransport on cherche element " << elementLabel << endl;
-//   ifstream infile;
-//   //  string nameIn = WORKINGAREA + "transport.output";
-//   string nameIn = workingDir + "transport.output";
-//   infile.open(nameIn.c_str(), ios::in);
-//   if (!infile) {
-//     cerr << " particleBeam::setFromTransport : error re-opening transport output stream " << nameIn << endl;
-//     return false;
-//   }
-//   //  else cout << " particleBeam::setFromTransport() : ouverture du fichier " << nameIn << endl; 
-
-//   string::size_type nn = string::npos;
-//   string  fichier;
-//   string buf;
-//   unsigned compteur = 0;
-//   while ( getline(infile, buf) ) {
-//       fichier += buf+"\n";
-//     nn = buf.find(elementLabel);
-//     if ( nn != string::npos ) {
-//       compteur++;
-//       //      break;
-//     }
-//   }
-//   infile.close();
-//   cout << " compteur= " << compteur << endl;
-//   if ( compteur == 0 ) {
-//     cerr << " particleBeam::setFromTransport : element " << elementLabel << " non trouve dans le fichier  " << nameIn << endl;
-//     return false;
-//   }
-
-
-//   stringstream fichierStream(fichier);
-//   buf.clear();
-//   unsigned relu = 0;
-//   while ( std::getline(fichierStream, buf) ) {
-//     //    cout << " relecture buffer : " << buf << endl;
-//     nn = buf.find(elementLabel);
-//     if ( nn != string::npos ) {
-//       relu++;
-//       if ( relu == compteur ) {
-//      cout << " TROUVE !" << endl;
-//      break;
-//       }
-//     }
-//   }
-//
-//   readTransportMoments(fichierStream);
-//   //  impressionDesMoments();
-//   momentRepresentationOk_ = true;
-//   return true;
-// }
-
-
-// bool particleBeam::setFromParmela(string workingDir,unsigned numeroElement, double referencefrequency) {
-//   unsigned  k;
-//   FILE* filefais;
-//   string nomfilefais = workingDir + "parmdesz";
-//   cout << " nom fichier desz : " << nomfilefais << endl;
-//   filefais = fopen(nomfilefais.c_str(), "r");
-
-//   if ( filefais == (FILE*)0 ) {
-//     cerr << " particleBeam::setFromParmela() erreur a l'ouverture du fichier" << nomfilefais  << endl;; 
-//     return false;
-//   }
-//   else cout << " particleBeam::setFromParmela() : ouverture du fichier " << nomfilefais << endl; 
-
-//   parmelaParticle partic;
-//   std::vector<parmelaParticle> faisceau;
-
-//   cout << " particleBeam::setFromParmela : numeroElement = " << numeroElement << endl;
-//   unsigned indexElement = numeroElement-1;
- 
-
-
-
-//   int testNombrePartRef =0;
-//   double phaseRef;
-
-//   while( partic.readFromParmelaFile(filefais) > 0 ) {
-//     if ( partic.ne == (int)indexElement )
-//       {
-//      faisceau.push_back(partic);
-
-//      if ( partic.np == 1 ) {
-//        // en principe on est sur la particule de reference
-//        if ( fabs(partic.xx) > EPSILON || fabs(partic.yy) > EPSILON || fabs(partic.xxp) > EPSILON  || fabs(partic.yyp) > EPSILON) {
-//          printf(" ATTENTION part. reference douteuse  \n");
-//          partic.imprim();
-//        }
-//        phaseRef = partic.phi;
-//        TRIDVECTOR  posRef(partic.xx,partic.yy,0.0);
-//        TRIDVECTOR betagammaRef(partic.xxp*partic.begamz, partic.yyp*partic.begamz, partic.begamz);
-//        referenceParticle_ = bareParticle(posRef, betagammaRef);
-//        testNombrePartRef++;
-//        if ( testNombrePartRef != 1 ) {
-//          cerr << " TROP DE PART. DE REF : " << testNombrePartRef << " !! " << endl;
-//          return false;
-//        }
-//      }
-//       }
-//   }
-
-//   if ( faisceau.size() == 0) 
-//     {
-//       cerr << " particleBeam::setFromParmela echec lecture  element " << numeroElement << endl;
-//       return false;
-//     }
-  
-//   // facteur  c/ 360. pour calculer (c dphi) / (360.freq) 
-//   // avec freq en Mhz et dphi en degres et résultat en cm: 
-//   double FACTEUR =  83.3333;  // ameliorer la precision
-
-
-
-//   // pour l'instant on choisit un centroid nul;
-//   centroid_ = vector<double>(6,0.0);
-
-//   goodPartic_.clear();
-//   goodPartic_.resize(faisceau.size(), bareParticle());
-//   double x,xp,y,yp;
-//   double betagammaz;
-//   double betaz;
-//   double deltaz;
-//   double dephas;
-//   double g;
-//   TRIDVECTOR  pos;
-//   TRIDVECTOR betagamma;
-//   // contrairement a ce qu'indique la notice PARMELA, dans parmdesz, les xp et yp 
-//   // sont donnes en radians
-//   for ( k=0; k < faisceau.size(); k++) {
-//     x=faisceau.at(k).xx;
-//     xp=faisceau.at(k).xxp;
-//     y=faisceau.at(k).yy;
-//     yp=faisceau.at(k).yyp;
-
-//     // dephasage par rapport a la reference  
-//     dephas = faisceau.at(k).phi - phaseRef; // degrés
-//     g = faisceau.at(k).wz/ERESTMeV;
-//     betagammaz = faisceau.at(k).begamz;
-//     betaz = betagammaz/(g+1.0);
-//     deltaz = FACTEUR * betaz * dephas / referencefrequency;
-//     x += xp * deltaz;
-//     y += yp * deltaz;
-//     pos.setComponents(x,y,deltaz);
-//     betagamma.setComponents(xp*betagammaz, yp*betagammaz, betagammaz);
-//     goodPartic_.at(k) = bareParticle(pos,betagamma);
-//   }
-//   particleRepresentationOk_ = true;
-//   return true;
-// }
 
 
@@ -358 +159 @@
       double xx,yy,zz;
       goodPartic_.at(k).getPosition().getComponents(xx,yy,zz);
-      cout << " part. numero " << k << "  x= " << xx << " y= " << yy  << " z= " << zz << endl;
+      double betgamx, betgamy, betgamz;
+      goodPartic_.at(k).getBetaGamma().getComponents(betgamx, betgamy, betgamz);
+      cout << " part. numero " << k << "  x= " << xx << " y= " << yy  << " z= " << zz << "  betgamx= " << betgamx << " betgamy= " << betgamy  << " betgamz= " << betgamz << endl;
     }
 }
@@ -421 +224 @@
   double P_reference_MeV_sur_c = sqrt( gref*(gref+2) );
 
+  cout << " gref = " << gref << " P_reference_MeV_sur_c = " << P_reference_MeV_sur_c << endl;
+
+
   // initialisation des moments
   razDesMoments();
@@ -432 +238 @@
   double PMeVsc;
   double del;
-  vector<double> part(6);
+  vector<double> part(6, 0.0);
 
     vector< vector<double> >& matrice = rij_.getMatrix();