Changeset 306 in svn for trunk/src

Timestamp:

Mar 9, 2009, 12:38:39 PM (16 years ago)

Author:

severine ovyn

Message:

OK flags very forward

File:

• trunk/src/SmearUtil.cc (modified) (6 diffs)

trunk/src/SmearUtil.cc

@@ -119 +119 @@
   FLAG_bfield      = 1;                       //1 to run the bfield propagation else 0
   FLAG_vfd         = 1;                       //1 to run the very forward detectors else 0
-  FLAG_zdc         = 1;                       //1 to run the zero degree calorimeter else 0
+  FLAG_RP         = 1;                       //1 to run the zero degree calorimeter else 0
   FLAG_trigger     = 1;                       //1 to run the trigger selection else 0
   FLAG_frog        = 1;                       //1 to run the FROG event display
@@ -244 +244 @@
   FLAG_bfield      = DET.FLAG_bfield;
   FLAG_vfd         = DET.FLAG_vfd;
-  FLAG_zdc         = DET.FLAG_zdc;
+  FLAG_RP          = DET.FLAG_RP;
   FLAG_trigger     = DET.FLAG_trigger;
   FLAG_frog        = DET.FLAG_frog;
@@ -362 +362 @@
   FLAG_bfield      = DET.FLAG_bfield;
   FLAG_vfd         = DET.FLAG_vfd;
-  FLAG_zdc         = DET.FLAG_zdc;
+  FLAG_RP          = DET.FLAG_RP;
   FLAG_trigger     = DET.FLAG_trigger;
   FLAG_frog        = DET.FLAG_frog;
@@ -507 +507 @@
 
     else if(strstr(temp_string.c_str(),"FLAG_vfd"))         {curstring >> varname >> ivalue; FLAG_vfd         = ivalue;}
-    else if(strstr(temp_string.c_str(),"FLAG_zdc"))         {curstring >> varname >> ivalue; FLAG_zdc         = ivalue;}
+    else if(strstr(temp_string.c_str(),"FLAG_RP"))          {curstring >> varname >> ivalue; FLAG_RP         = ivalue;}
     else if(strstr(temp_string.c_str(),"FLAG_trigger"))     {curstring >> varname >> ivalue; FLAG_trigger     = ivalue;}
     else if(strstr(temp_string.c_str(),"FLAG_frog"))        {curstring >> varname >> ivalue; FLAG_frog        = ivalue;}
@@ -606 +606 @@
         << left << setw(10) <<CEN_max_mu        <<""<< right << setw(15)<<"*"<<"\n";
   f_out<<"*                                                                    *"<<"\n";
-  if(FLAG_vfd==1){
-    f_out<<"#**********************************                                  *"<<"\n";
-    f_out<<"# Very forward detector switched on                                  *"<<"\n";
-    f_out<<"#**********************************                                  *"<<"\n";
+  if(FLAG_RP==1){
+    f_out<<"#************************************                                *"<<"\n";
+    f_out<<"# Very forward Roman Pots switched on                                *"<<"\n";
+    f_out<<"#************************************                                *"<<"\n";
     f_out<<"*                                                                    *"<<"\n";
-    f_out << left << setw(55) <<"* Minimum very forward calorimeter:          "<<""
-          << left << setw(5) <<VFD_min_calo_vfd <<""<< right << setw(10)<<"*"<<"\n";
-    f_out << left << setw(55) <<"* Maximum very forward calorimeter:          "<<""
-          << left << setw(5) <<VFD_max_calo_vfd <<""<< right << setw(10)<<"*"<<"\n";
-    f_out << left << setw(55) <<"* Minimum coverage zero_degree calorimeter "<<""
-          << left << setw(5) <<VFD_min_zdc          <<""<< right << setw(10)<<"*"<<"\n";
-    f_out << left << setw(55) <<"* Distance of the ZDC to the IP, in meters:  "<<""
-          << left << setw(5) <<VFD_s_zdc            <<""<< right << setw(10)<<"*"<<"\n";
-    f_out << left << setw(55) <<"* Distance of the RP to the IP, in meters:   "<<""
+    f_out << left << setw(55) <<"* Distance of the 220 RP to the IP in meters:"<<""
           << left << setw(5) <<RP_220_s             <<""<< right << setw(10)<<"*"<<"\n";
-    f_out << left << setw(55) <<"* Distance of the RP to the beam, in meters: "<<""
+    f_out << left << setw(55) <<"* Distance of the 220 RP to the beam in meters:"<<""
           << left << setw(5) <<RP_220_x             <<""<< right << setw(10)<<"*"<<"\n";
-    f_out << left << setw(55) <<"* Distance of the RP to the IP, in meters:   "<<""
+    f_out << left << setw(55) <<"* Distance of the 420 RP to the IP in meters:"<<""
           << left << setw(5) <<RP_420_s             <<""<< right << setw(10)<<"*"<<"\n";
-    f_out << left << setw(55) <<"* Distance of the RP to the beam, in meters: "<<""
+    f_out << left << setw(55) <<"* Distance of the 420 RP to the beam in meters:"<<""
           << left << setw(5) <<RP_420_x             <<""<< right << setw(10)<<"*"<<"\n";
     f_out << left << setw(55) <<"* Interaction point at the LHC named: "<<""
@@ -646 +638 @@
   }
   else {
-    f_out<<"#***********************************                                 *"<<"\n";
-    f_out<<"# Very forward detector switched off                                 *"<<"\n";
-    f_out<<"#***********************************                                 *"<<"\n";
+    f_out<<"#*************************************                               *"<<"\n";
+    f_out<<"# Very forward Roman Pots switched off                               *"<<"\n";
+    f_out<<"#*************************************                               *"<<"\n";
     f_out<<"*                                                                    *"<<"\n";
   }
+  if(FLAG_vfd==1){
+    f_out<<"#**************************************                              *"<<"\n";
+    f_out<<"# Very forward calorimeters switched on                              *"<<"\n";
+    f_out<<"#**************************************                              *"<<"\n";
+    f_out<<"*                                                                    *"<<"\n";
+    f_out << left << setw(55) <<"* Minimum very forward calorimeter:          "<<""
+          << left << setw(5) <<VFD_min_calo_vfd <<""<< right << setw(10)<<"*"<<"\n";
+    f_out << left << setw(55) <<"* Maximum very forward calorimeter:          "<<""
+          << left << setw(5) <<VFD_max_calo_vfd <<""<< right << setw(10)<<"*"<<"\n";
+    f_out << left << setw(55) <<"* Minimum coverage zero_degree calorimeter "<<""
+          << left << setw(5) <<VFD_min_zdc          <<""<< right << setw(10)<<"*"<<"\n";
+    f_out << left << setw(55) <<"* Distance of the ZDC to the IP, in meters:  "<<""
+          << left << setw(5) <<VFD_s_zdc            <<""<< right << setw(10)<<"*"<<"\n";
+    f_out<<"*                                                                    *"<<"\n";
+  }
+  else {
+    f_out<<"#***************************************                             *"<<"\n";
+    f_out<<"# Very forward calorimeters switched off                             *"<<"\n";
+    f_out<<"#***************************************                             *"<<"\n";
+    f_out<<"*                                                                    *"<<"\n";
+  }
+
   f_out<<"#************************************                                *"<<"\n";
   f_out<<"# Electromagnetic smearing parameters                                *"<<"\n";