Changeset 14 in ZHANGProjects

Timestamp:

Jul 25, 2014, 11:01:45 AM (10 years ago)

Author:

zhangj

Message:

(1) Fix the bug to print the coordinates information for a specific particles. (2) Add some comments.

Location:

ICOSIM/CPP/trunk/source

Files:

• .kdev4/source.kdev4 (modified) (1 diff)
• crystal_dan_FINAL_VERSION_CHvsVR.f (modified) (1 diff)
• lattice.cc (modified) (1 diff)
• lattice.h (modified) (2 diffs)
• simulation.cc (modified) (10 diffs)

ICOSIM/CPP/trunk/source/.kdev4/source.kdev4

@@ -12 +12 @@
 
 [Launch][Launch Configuration 0][Data]
-Arguments=../sample/collimatorfile_standard_ions_nominal.csv    ../outputs/test
+Arguments=../sample/collimatorfile_crystal_matlab.csv    ../outputs/crystal/test
 Dependencies=@Variant(\x00\x00\x00\t\x00\x00\x00\x00\x00)
 Dependency Action=Nothing

ICOSIM/CPP/trunk/source/crystal_dan_FINAL_VERSION_CHvsVR.f

@@ -145 +145 @@
 c      miscut=0.001000
 c 
-      write(*,*)"last miscut angle =",miscut
+c      write(*,*)"last miscut angle =",miscut
 c      write(*,*) 'enter crystal subroutine'
 c      write(*,*) 'particle energy Gev :', PC

ICOSIM/CPP/trunk/source/lattice.cc

@@ -440 +440 @@
 
     if (idpart >= 0) {
-        if (idpart >= bunch.size()) {
-            cerr << "Warning, the particle that you want to spy using IDPART does not exist!" << endl;
+        if (idpart > bunch.size()) {
+            cerr << "Warning, the particle that you want to spy using IDPART does not exist!" << "  idpart = " << idpart << ",  bunch.size = " << bunch.size() <<endl;
         } else {
             choicePart = idpart;

ICOSIM/CPP/trunk/source/lattice.h

@@ -108 +108 @@
 
     int npart; //number of particles
-    vector <int> ips; //vector indicating the position of the collimators (gives the index of the collimators in the complete lattice, e.g. if the first collimator is the 5th element, we will have ips[0] = 5)
+    vector <int> ips; //vector indicating the position of the collimators (the index of the collimators in the complete lattice, e.g. if the first collimator is the 5th element, we will have ips[0] = 5)
 
     vector <int> cocount;//count the number of particles crashing on each collimator
@@ -118 +118 @@
 
     vector <int> ii;//'TCI' collimators
-    vector < int > ip;//'TCP', 'CRYSTAL' and 'TCRYO' collimators
-    vector < int > is;//'TCS' collimators
+    vector < int > ip;//'TCP', 'CRYSTAL' and 'TCRYO' collimators; primary collimators, 
+                      // only these collimators will be used to do particle-matter simulation
+    vector < int > is;//'TCS' secondary collimators; absorbers.
     vector < int > it;//'TCT' collimators
-    vector < int > itcla;//'TCLA' collimators
+    vector < int > itcla;//'TCLA' collimators; absorber.
 
     vector < int > ipcoll; // vector giving the position like ips, but only for 'TCP' collimators

ICOSIM/CPP/trunk/source/simulation.cc

@@ -995 +995 @@
 
 
-    //tracking the particles through the machine
+    //nonlinear tracking the particles through the machine
     cout << "FOURTH TRACKING, TRACKING THROUGHT THE MACHINE." << endl;
 
@@ -1988 +1988 @@
 
     if (plotflag == "Yes") {
-        PlotTrajectory(emix, emiy, ibeg, iend, xco, yco, outputpath);
+        PlotTrajectory(emix, emiy, ibeg, iend, xco, yco, outputpath); 
     }
 
@@ -2010 +2010 @@
     int irevloc(0), i0loc(0), imloc(0);
 
+    //total number of lost particles on collimators + apertures
     NLostTotal = asumhitcolli[asumhitcolli.size() - 1] + asumhits[asumhits.size() - 1];
 
@@ -2019 +2020 @@
 
     vector <double> sep;
-    vector <double> plosslocal, zlosslocal;
+    vector <double> plosslocal, zlosslocal; // local lost power & lost position
 
     for (double k(lat.reseau[i0loc]->S); k < lat.reseau[imloc]->S; ++k) {
@@ -2025 +2026 @@
     }
 
+    //calculate the location range to count the lost particles in this range, each 0.5 m
     for (int i(0); i < sep.size() - 1; ++i) {
         zlosslocal.push_back(sep[i] + (sep[i + 1] - sep[i]) / 2);
@@ -2031 +2033 @@
     int count(0);
 
+    //find the partice lost locations and number of lost particles
     for (int i(0); i < sep.size() - 1; ++i) {
         for (int j(0); j < hitso.size(); ++j) {
@@ -2065 +2068 @@
             sip.push_back(lat.reseau[i]->S);
             pos.push_back(i);
-        }
-    }
-
+         //   std::cout << lat.reseau[i]->NAME << std::endl;
+        }
+    }
+
+  // std::cout << pos.size() << std::endl;
+  // std::cout << "size of the IP number: " << sip.size() << std::endl;
+    
     if (sip.size() != 0) {
 
@@ -2124 +2131 @@
     vector <int> removedCollimators;
 
+    //if the open jar of the collimator is larger than 100 sigma, so it means
+    // this collimator is not used in the collimation.
     for (int i(0); i < lat.resColli.size(); ++i) {
         if (lat.resColli[i]->nsig > 100) {
@@ -2211 +2220 @@
     }
 
+    /********************************************************
+     * 
+     *  Generate GNUPLOT scripts to plot the summary data.
+     * ******************************************************/
     //Writing PlotRunSummary1.p
 
@@ -2287 +2300 @@
         PlotRun3 << "set title \"Time Development after first impact on collimator\"" << endl << endl;
         PlotRun3 << "set logscale y" << endl << endl;
-        PlotRun3 << " plot \"PlotRunSummary4.dat\" using 1:2 title \'particles in beam\' with line, \"PlotRunSummary4.dat\" using 1:3 title \'particles lost on collimators\' with line, \"PlotRunSummary4.dat\" using 1:4 title \'particles lost elsewhere\' with line" << endl << endl;
+        PlotRun3 << " plot \"PlotRunSummary4.dat\" using 1:2 title \'rest particles in beam\' with line, \"PlotRunSummary4.dat\" using 1:3 title \'particles lost on collimators\' with line, \"PlotRunSummary4.dat\" using 1:4 title \'particles lost elsewhere\' with line" << endl << endl;
         PlotRun3 << "unset logscale y" << endl;
         PlotRun3.close();