Changeset 69 in svn

Timestamp:

Dec 2, 2008, 12:17:27 PM (16 years ago)

Author:

severine ovyn

Message:

add DOTRIGGER tag

Location:

trunk

Files:

• data/DataCardDet.dat (modified) (2 diffs)
• interface/SmearUtil.h (modified) (1 diff)
• src/SmearUtil.cc (modified) (4 diffs)

trunk/data/DataCardDet.dat

@@ -26 +26 @@
 ELG_Ncen         0.25                   // N term for central ECAL
 ELG_Ccen         0.0055                 // C term for central ECAL
-ELG_Cfwd         0.107                  // S term for forward ECAL
-ELG_Sfwd         2.084                  // C term for forward ECAL
+ELG_Sfwd         1.5                    // S term for forward ECAL
 ELG_Nfwd         0.0                    // N term for central ECAL
+ELG_Cfwd         0.06                   // C term for forward ECAL
 
 #energy resolution for hadrons in ecal/hcal/hf
@@ -65 +65 @@
 CONERADIUS              0.7
 JETALGO                 1               // 1 for Cone algorithm, 2 for MidPoint algorithm, 3 for SIScone algorithm, 4 for kt algorithm
+
+DOTRIGGER               1

trunk/interface/SmearUtil.h

@@ -119 +119 @@
   double PROTOJET_PTMIN;
 
+  int DOTRIGGER;
 
   /// Reads the data card for the initialisation of the parameters 

trunk/src/SmearUtil.cc

@@ -52 +52 @@
 ELG_Ncen =        0.25 ;                 // N term for central ECAL
 ELG_Ccen =        0.0055 ;                // C term for central ECAL
-ELG_Cfwd =        0.107 ;                 // S term for forward ECAL
-ELG_Sfwd =        2.084 ;                 // C term for forward ECAL
-ELG_Nfwd =        0.0   ;                 // N term for central ECAL
+ELG_Sfwd =        1.5;                    // S term for forward ECAL
+ELG_Nfwd =        0.0;                    // N term for central ECAL
+ELG_Cfwd =        0.06;                   // C term for forward ECAL
 
 HAD_Shcal =       1.5 ;                    // S term for central HCAL // hadronic calorimeter
@@ -182 +182 @@
  PROTOJET_PTMIN = 0.0; 
 
+ DOTRIGGER=1;
 
 }
 
 void RESOLution::Logfile(string LogName) { 
-//void RESOLution::Logfile(string outputfilename) { 
 
   ofstream f_out(LogName.c_str());
@@ -446 +446 @@
   float energy = electron.E();  // before smearing
   float energyS = 0.0;          // after smearing  // \sigma/E = C + N/E + S/\sqrt{E}
-  
-  if(fabs(electron.Eta()) < MAX_TRACKER) { // if the electron is inside the tracker
+  float eta=fabs(electron.Eta()); 
+ 
+  if(eta < MAX_TRACKER) { // if the electron is inside the tracker
     energyS = gRandom->Gaus(energy, sqrt( 
                                          pow(ELG_Ncen,2) + 
@@ -453 +454 @@
                                          pow(ELG_Scen*sqrt(energy),2) ));
   } 
-  if(fabs(electron.Eta()) > MAX_TRACKER && fabs(electron.Eta()) < MAX_CALO_FWD){
+  if(eta > MAX_TRACKER && eta < MAX_CALO_FWD){
     energyS = gRandom->Gaus(energy, sqrt(
                                          pow(ELG_Nfwd,2) +