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

Timestamp:

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

Author:

zhangj

Message:

Added comments...

File:

• ICOSIM/CPP/trunk/source/lattice.cc (modified) (8 diffs)

ICOSIM/CPP/trunk/source/lattice.cc

@@ -441 +441 @@
 {
 
+  cout << "bunch size is: " << bunch.size() << endl;
+  
+  
     if (idpart >= 0) {
         if (idpart > bunch.size()) {
@@ -602 +605 @@
           read(bunch);
           }*/
-
+        
+        
         for (int p(0); p < bunch.size(); ++p) { //loop througt the particles
 
             double dpopeff;
 
+            // .inabs = 0, particle lost, .inabs = 1, particle not lost 
             if (bunch[p].inabs == 1) {
 
@@ -743 +748 @@
 
                             int lost(bunch.size());
-
-                            resColli[icop]->collipassCrystal(bunch, betgam, turn, outputpath);
-
-                            nhitcolli[icop] = lost - bunch.size(); //nhitcolli(icop) gives the number particles getting lost in collimator number icop,
-
+                             
+                            long int nhit = 0;
+                            
+                            resColli[icop]->collipassCrystal(bunch, betgam, turn, nhit, outputpath);
+
+                            //nhitcolli[icop] = lost - bunch.size(); //nhitcolli(icop) gives the number particles getting lost in collimator number icop,
+                            
+                             nhitcolli[icop] = nhit; 
+
+                         //    cout << "after the crystal: bunch size = " << bunch.size()<< endl;
                         }
 
@@ -924 +934 @@
                         if (inside == false) {
                             cout <<"The particle is lost at element " << reseau[i]->NAME << endl;
+//                           cout << "Particle ID is: " << p << endl;
+//                           cout << "bunch size is: " << bunch.size() << endl;
+//                           cout << "bunch status is: " << bunch[p].inabs << endl;
+//                           
                             xh0 = bunch[p].coordonnees[0][0];
                             bunch[p].inabs = 0;
@@ -1100 +1114 @@
             }
         }
+    //    cout << "bunch size is ...." << bunch.size() << endl;
 
         if (plotflag == "Yes") {
@@ -1132 +1147 @@
     vector <Particle> tempinabs;
 
-    //we contine just with particles that are not lost
+    //we contine to track for the next turn; just with particles that are not lost 
     for (int w(0); w < bunch.size(); ++w) {
         if (bunch[w].inabs != 0) {
@@ -1139 +1154 @@
     }
 
+ //   cout << "bunch size before the turn: "<< bunch.size() << endl; 
+    
     bunch.clear();
 
@@ -1147 +1164 @@
     tempinabs.clear();
 
-}
+   // cout << "bunch size after the turn " <<bunch.size() << endl;
+}