Changeset 222 in PSPA

Timestamp:

Dec 20, 2012, 9:43:37 PM (12 years ago)

Author:

lemeur

Message:

bricoles

Location:

Interface_Web/trunk/pspaWT

Files:

• include/particleBeam.h (modified) (1 diff)
• src/GWt_pspaApplication.cc (modified) (1 diff)
• src/particleBeam.cc (modified) (8 diffs)

Interface_Web/trunk/pspaWT/include/particleBeam.h

@@ -77 +77 @@
 
   const transportMoments&  getTransportMoments() const;
+  double getSigmaTransportij(unsigned i, unsigned j);
+  double getUnnormalizedEmittanceX();
   double getP0Transport() const;
   bool particleRepresentationOk() const;

Interface_Web/trunk/pspaWT/src/GWt_pspaApplication.cc

@@ -749 +749 @@
   //  WContainerWidget* toto = static_cast<WContainerWidget*>(leDessin_);
   //  toto->clear();
-  new WText(nameOfCase_ + " : emittance x,x' ", toto);
+
+  //  new WText(nameOfCase_ + " : espace de phase x,x' "+ " nb partic. "+ mixedTools::intToString(partic.size()), toto);
+
+
+  new WText(nameOfCase_ + " : emittance x,x' " + mixedTools::doubleToString(beam->getUnnormalizedEmittanceX()) + " pi.mm.mrad" , toto);
+  new WBreak(toto);
+  new WText(" xmax = " + mixedTools::doubleToString(beam->getSigmaTransportij(1,1)) + " cm ", toto);
+  new WBreak(toto);
+  new WText(" x' max = " + mixedTools::doubleToString(beam->getSigmaTransportij(2,2)) + " mrad ", toto);
+  new WBreak(toto);
+  new WText(" corr. 12 = " + mixedTools::doubleToString(beam->getSigmaTransportij(2,1))  + " sqrt(cm.rad) ", toto);
+  
   vector<double> xcor;
   vector<double> ycor;

Interface_Web/trunk/pspaWT/src/particleBeam.cc

@@ -23 +23 @@
 
 void particleBeam::clear() {
-  unsigned k,j;
   goodPartic_.clear();
   rij_.raz();
-  // for ( k=0; k < 6; k++){
-  //   for ( j=0; j <= k; j++) {
-  //     ( rij_transportMoments_.at(k) ).at(j) = 0.0; 
-  //   }
-  // }
   P0Transport_ = 0.0;
   particleRepresentationOk_ = false;
@@ -43 +37 @@
     return rij_;
 }
+
+double particleBeam::getSigmaTransportij(unsigned i, unsigned j)  {
+  if ( i < 1 || i > 6 || j < 1 || j > 6 ) {
+    cerr << " particleBeam::getSigmaTransportij() indices out of range  " << endl;
+    return 0.0;
+  }
+  if ( !momentRepresentationOk_ ) {
+    cerr << " particleBeam::getSigmaTransportij() beam is not in moment representation " << endl;
+    return 0.0;
+  }
+
+  i--;
+  j--;
+  if ( j > i ) {
+    unsigned aux = i;
+    i = j;
+    j = aux;
+  }
+  return ( rij_.getMatrix().at(i) ).at(j);
+}
+
+
+double particleBeam::getUnnormalizedEmittanceX() {
+  double r = getSigmaTransportij(2,1);
+  double rac = (1 - r*r);
+  if ( rac <= 0.0 ) {
+    return 0.0;
+  }
+  rac = sqrt(1 - r*r);
+  return  10.*getSigmaTransportij(1,1) * getSigmaTransportij(2,2) * rac; // en pi.mm.mrad
+}
+
 double particleBeam::getP0Transport() const { 
   return P0Transport_;
@@ -66 +92 @@
   return goodPartic_;
 }
-
-  // void particleBeam::setFromBeamParameters(double x, double xp, double y, double yp, double dl, double del, double P0)
-  // {
-  //   clear();
-  //   rij_ = transportMoments(x, xp, y, yp, dl, del);
-  //   P0Transport_ = P0;
-  //   momentRepresentationOk_ = true;
-  // }
 
 
@@ -377 +395 @@
   for ( j = 0; j < 6; j++) {
         ( matrice.at(j) ).at(j) = sqrt(( matrice.at(j) ).at(j) * facmoy );
-    //    ( rij_transportMoments_.at(j) ).at(j) = sqrt(( rij_transportMoments_.at(j) ).at(j) * facmoy );
   }
 
   for ( j = 0; j < 6; j++) {
     auxj =  ( matrice.at(j) ).at(j);
-    //    auxj =  ( rij_transportMoments_.at(j) ).at(j);
     for (m=0; m < j; m++) {
       auxm = ( matrice.at(m) ).at(m);
       (  matrice.at(j) ).at(m) *= facmoy/(auxj * auxm);
-      //      auxm = ( rij_transportMoments_.at(m) ).at(m);
-      // ( rij_transportMoments_.at(j) ).at(m) *= facmoy/(auxj * auxm);
     }
   }
@@ -397 +411 @@
   ( matrice.at(1) ).at(1)  *= uniteAngle;
   ( matrice.at(3) ).at(3)  *= uniteAngle;
-
-  // ( rij_transportMoments_.at(1) ).at(1)  *= uniteAngle;
-  // ( rij_transportMoments_.at(3) ).at(3)  *= uniteAngle;
-   
   P0Transport_ = 1.0e-3*ERESTMeV*P_reference_MeV_sur_c;
 
@@ -411 +421 @@
 void particleBeam::impressionDesMoments() const {
   rij_.impression();
-  // unsigned j,m;
-  // 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;
-  //   }
 }
 
 void particleBeam::razDesMoments() {
   rij_.raz();
-  // // initialisation des moments
-  // unsigned j,m;
-  // for ( j = 0; j < rij_transportMoments_.size(); j++)
-  //   {
-  //     for (m=0; m <= j; m++) 
-  //    {
-  //      ( rij_transportMoments_.at(j) ).at(m) = 0.0; // element r_jm
-  //    }
-  //   }
 }
 
@@ -439 +430 @@
 void particleBeam::readTransportMoments(ifstream& inp) {
 rij_.readFromTransportOutput(inp);
-  // string  bidString;
-  // double bidon;
-
-  // // initialisation des moments
-  // razDesMoments();
-
-  // inp >> bidon >>  bidString >>  bidon >>  ( rij_transportMoments_.at(0) ).at(0) >> bidString;
-  // inp >> bidon >> ( rij_transportMoments_.at(1) ).at(1) >>  bidString >> ( rij_transportMoments_.at(1) ).at(0);
-  // inp >> bidon >> ( rij_transportMoments_.at(2) ).at(2) >>  bidString >> ( rij_transportMoments_.at(2) ).at(0)  >> ( rij_transportMoments_.at(2) ).at(1);
-  // inp >> bidon >> ( rij_transportMoments_.at(3) ).at(3) >>  bidString >> ( rij_transportMoments_.at(3) ).at(0)  >> ( rij_transportMoments_.at(3) ).at(1) >> ( rij_transportMoments_.at(3) ).at(2);
-
-  // inp >> bidon >> ( rij_transportMoments_.at(4) ).at(4) >>  bidString >> ( rij_transportMoments_.at(4) ).at(0)  >> ( rij_transportMoments_.at(4) ).at(1) >> ( rij_transportMoments_.at(4) ).at(2) >> ( rij_transportMoments_.at(4) ).at(3);
-
-  // inp >> bidon >> ( rij_transportMoments_.at(5) ).at(5) >>  bidString >> ( rij_transportMoments_.at(5) ).at(0)  >> ( rij_transportMoments_.at(5) ).at(1) >> ( rij_transportMoments_.at(5) ).at(2) >> ( rij_transportMoments_.at(5) ).at(3) >> ( rij_transportMoments_.at(5) ).at(4);
-
 }
 
@@ -477 +453 @@
   cout <<  " racs11= " << xm << " racs22= " << ym << " r12= " << r << endl;
 
-  // double xm = ( rij_transportMoments_.at(0) ).at(0);
-  // double ym = ( rij_transportMoments_.at(1) ).at(1);
-  // double r  = ( rij_transportMoments_.at(1) ).at(0);
 
   int nbintv = 50;