Changeset 9 in ZHANGProjects

Timestamp:

Apr 24, 2014, 4:51:08 PM (10 years ago)

Author:

zhangj

Message:

Add feature to define the install location of the crystal inner side (-1) or out side (1) of the vacuum chamber in the 'crystalinfo.csv' file.

Location:

ICOSIM/CPP/trunk/source

Files:

• Collimator.h (modified) (1 diff)
• CrystalCollimator.cc (modified) (1 diff)
• simcrys.cc (modified) (3 diffs)
• simcrys.h (modified) (1 diff)
• simulation.cc (modified) (1 diff)

ICOSIM/CPP/trunk/source/Collimator.h

@@ -107 +107 @@
 
     int C_orient; //crystal orientation (1 for 110, 2 for 111)
-    int IS; //integer that defines the substance (0 for Si, 1 for W, 2 for C, 3 for Ge)
+    int IS; //integer that defines the substance (0 for Si, 1 for W, 2 for C, 3 for Ge
+    double Mirror; // -1 or 1; an integer to define the install location of the crystal. 
+                // -1: the crystal is installed inner side of the vacuum chamber
+                // 1: the crystal is installed at the out side of the vacuum chamber
     double C_xmax; //maximum in the x direction (dimension of the crystal) [m]
     double C_ymax; //maximum in the y direction (dimension of the cystal) [m]

ICOSIM/CPP/trunk/source/CrystalCollimator.cc

@@ -91 +91 @@
     SimCrys sim(Crystal (C_orient,  IS, C_xmax, C_ymax, Cry_length, Rcurv), Partcrys (0)); //simulation of the passage through the crystal
 
-    sim.general(sim, pas, outputpath, 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);
 
     ifstream enter;

ICOSIM/CPP/trunk/source/simcrys.cc

@@ -409 +409 @@
 
 
-void SimCrys::general(SimCrys& sim, const int& pas, string outputpath, double C_rotation, double C_aperture, double C_offset, double C_tilt, double Crystal_tilt)
+void SimCrys::general(SimCrys& sim, const int& pas, string outputpath, double Mirror, double C_rotation, double C_aperture, double C_offset, double C_tilt, double Crystal_tilt)
 {
     srand ( time(NULL) );
@@ -471 +471 @@
     double totcount(0);
 
-    double mirror=0.0;
+    double mirror=Mirror;
     double tiltangle=0.0;
 
@@ -639 +639 @@
                     //cout<<"PARTICULE NON PERDU>>><<"<<endl;
 
-                    //?????????????? Need to define the correct value of the mirror for the install locations
+                    //To define the correct value of the mirror for the install locations
                     // of the crystal in SPS & LHC, inner side or outside of the vacuum chamber????
                     //  by Zhang @ CERN, 23/04/2014.....
-                    mirror = 1;
+                    //mirror = 1;
+                    
                     
                     x  = mirror * x;

ICOSIM/CPP/trunk/source/simcrys.h

@@ -53 +53 @@
     //THE GENERAL FUNCTION OF THE TEST THAT REGROUP ALL THE PREVIOUS FUNCTIONS!!!!
 
-    void general(SimCrys& sim, const int& pas, string outputpath, double C_rotation, double C_aperture, double C_offset, double C_tilt, double Crystal_tilt);
+    void general(SimCrys& sim, const int& pas, string outputpath, double Mirror, double C_rotation, double C_aperture, double C_offset, double C_tilt, double Crystal_tilt);
 
 

ICOSIM/CPP/trunk/source/simulation.cc

@@ -460 +460 @@
                         getline(readinfocrystal, temp1, ',');
                         lat.resColli[j]->IS = atoi(temp1.c_str());
+                        //added feature, to define the install location of the crystal, then 
+                        //get the correct transformation between the beam frame & crystal frame.
+                        getline(readinfocrystal, temp1, ',');
+                        lat.resColli[j]->Mirror = atoi(temp1.c_str());
+                        
                         getline(readinfocrystal, temp1, ',');
                         lat.resColli[j]->C_xmax = atof(temp1.c_str());