Changeset 17 in ZHANGProjects for ICOSIM/CPP/trunk/source/CrystalCollimator.cc

Timestamp:

Sep 30, 2014, 11:05:33 AM (10 years ago)

Author:

zhangj

Message:

Added comments...

File:

• ICOSIM/CPP/trunk/source/CrystalCollimator.cc (modified) (6 diffs)

ICOSIM/CPP/trunk/source/CrystalCollimator.cc

@@ -32 +32 @@
 
 
-void CrystalCollimator::collipassCrystal(vector <Particle>& bunch, const double& betgam, const int& pas, string outputpath)
+void CrystalCollimator::collipassCrystal(vector <Particle>& bunch, const double& betgam, const int& pas, long int& nhit, string outputpath)
 {
-
+//pas: number of turns
     //Calculate proton energy
     double Mproton(0.93827231); //rest mass [GeV]
@@ -62 +62 @@
 
         for (int k(0); k < bunch.size(); ++k) {
-
+            //simulate the particles that are not lost on the previous aperture
+            if(bunch[k].inabs !=0){   
             sortie  << bunch[k].coordonnees[0][0] << "," << bunch[k].coordonnees[0][2] << "," << bunch[k].coordonnees[0][1] << "," << bunch[k].coordonnees[0][3] << "," << Eproton[k] << endl;
+            }
         }
 
@@ -93 +95 @@
    // sim.general(sim, pas, outputpath, NAME, emitx0, emity0,enum, C_rotation, C_aperture, C_offset, C_tilt, Cry_tilt);
     
-    sim.general(sim, pas, outputpath, Mirror, C_rotation, C_aperture, C_offset, C_tilt, Cry_tilt);
+    sim.general(sim, pas, nhit, outputpath, Mirror, C_rotation, C_aperture, C_offset, C_tilt, Cry_tilt);
 
+    
+    //assign the new bunch coordinates after the crystal
+    for (int k(0); k < bunch.size(); ++k) {
+      bunch[k].inabs =0 ;
+    }
+    
+    
     ifstream enter;
     string file_in;
@@ -105 +114 @@
     } else {
 
-        for (int k(0); k < bunch.size(); ++k) {
+        for (int k(0); k < bunch.size()-nhit; ++k) {
 
             string rest;
@@ -120 +129 @@
             getline(enter, rest, ',');
             bunch[k].coordonnees[1][3] = atof(rest.c_str());
-
+            
+            //particle is not lost (interact) with the crystal
+            bunch[k].inabs = 1; 
+            
             getline(enter, rest);
             Eproton[k] = atof(rest.c_str());
+         
         }
 
@@ -128 +141 @@
     }
 
+    
     vector <double> gamProton;
     vector <double> betProton;