Changeset 128 in PSPA for Interface_Web/trunk/pspaWT/src/particleBeam.cc

Timestamp:

Dec 3, 2012, 6:47:03 PM (12 years ago)

Author:

lemeur

Message:

relecture fichier de sortie tansport

File:

• Interface_Web/trunk/pspaWT/src/particleBeam.cc (modified) (3 diffs)

Interface_Web/trunk/pspaWT/src/particleBeam.cc

@@ -2 +2 @@
 #include "mathematicalConstants.h"
 #include "PhysicalConstants.h"
+//#include "nomdElements.h"
 //#include <string>
 #include <stdio.h>
 
 #include "environmentVariables.h"
+
+bool  particleBeam::setFromTransport(string elLab, typedElement elemType)
+{
+   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";
+  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 (elemType == bend ) 
+    {
+      getline(infile, buf);
+      getline(infile, buf);
+    }
+  readTransportMoments(infile);
+  //  impressionDesMoments();
+   infile.close();
+   momentRepresentationOk_ = true;
+  return true;
+}
 
 
@@ -317 +366 @@
 }
 
-bool  particleBeam::setFromTransport(ifstream& inp, unsigned nblignes)
-  {
-    unsigned k;
-       unsigned j,m;
-    unsigned  nl0;
-    //    cout << " particleBeam : lecture resultats transport nblignes= " << nblignes << endl;
-      string buf;
-       nl0 = nblignes - 7;
-       //       cout << " setFromTransport nblignes= " << nblignes << endl;
-       for (k=0; k < nl0; k++) 
-         {
-           getline(inp, buf);
-           // cout  << " ligne " << k+1 << " buf= " << buf << endl;
-         }
-
-       readTransportMoments(inp);
-
+void particleBeam::impressionDesMoments() const
+{
+  unsigned j,m;
   cout << " impression des moments " << endl;
   for ( j = 0; j < 6; j++)
@@ -343 +378 @@
       cout << endl;
     }
-
-     momentRepresentationOk_ = true;
-     return true;
-  }
+}
+
+    //&&&&&&&&&&&
+
+ // bool  particleBeam::setFromTransport(ifstream& inp, unsigned nblignes)
+ //  {
+ //    unsigned k;
+ //       unsigned j,m;
+ //    unsigned  nl0;
+ //    //    cout << " particleBeam : lecture resultats transport nblignes= " << nblignes << endl;
+ //      string buf;
+ //       nl0 = nblignes - 7;
+ //       //       cout << " setFromTransport nblignes= " << nblignes << endl;
+ //       for (k=0; k < nl0; k++) 
+ //              {
+ //        getline(inp, buf);
+ //        // cout  << " ligne " << k+1 << " buf= " << buf << endl;
+ //      }
+
+ //       readTransportMoments(inp);
+
+ //  cout << " impression des moments " << endl;
+ //  for ( j = 0; j < 6; j++)
+ //    {
+ //      for (m=0; m <= j; m++) 
+ //     {
+ //           cout  << ( rij_transportMoments_.at(j) ).at(m) << " ";
+ //     }
+ //      cout << endl;
+ //    }
+
+ //     momentRepresentationOk_ = true;
+ //     return true;
+ //  }