Changeset 32 in svn

Timestamp:

Nov 17, 2008, 8:49:25 PM (16 years ago)

Author:

severine ovyn

Message:

remove HCALecal

Location:

trunk

Files:

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

trunk/data/DataCardDet.dat

@@ -24 +24 @@
 #energy resolution for hadrons in ecal/hcal/hf
 # \sigma/E = C + N/E + S/\sqrt{E}
-HAD_Secal        0.05                     // S term for central ECAL // electromagnetic calorimeter
-HAD_Necal        0.25                     // N term for central ECAL
-HAD_Cecal        0.0055                   // C term for central ECAL
 HAD_Shcal        1.5                      // S term for central HCAL // hadronic calorimeter
 HAD_Nhcal        0.                       // N term for central HCAL

trunk/interface/SmearUtil.h

@@ -58 +58 @@
   //energy resolution for hadrons in ecal/hcal/hf
   // \sigma/E = C + N/E + S/\sqrt{E}
-  float HAD_Secal;   // S term for central ECAL // electromagnetic calorimeter
-  float HAD_Necal;   // N term for central ECAL
-  float HAD_Cecal;   // C term for central ECAL
   float HAD_Shcal;   // S term for central HCAL // hadronic calorimeter
   float HAD_Nhcal;   // N term for central HCAL

trunk/src/SmearUtil.cc

@@ -122 +122 @@
     else if(strstr(temp_string.c_str(),"ELG_Cfwd")){curstring >> varname >> value; ELG_Cfwd = value;}
     else if(strstr(temp_string.c_str(),"ELG_Nfwd")){curstring >> varname >> value; ELG_Nfwd = value;}
-    else if(strstr(temp_string.c_str(),"HAD_Secal")){curstring >> varname >> value; HAD_Secal = value;}
-    else if(strstr(temp_string.c_str(),"HAD_Necal")){curstring >> varname >> value; HAD_Necal = value;}
-    else if(strstr(temp_string.c_str(),"HAD_Cecal")){curstring >> varname >> value; HAD_Cecal = value;}
     else if(strstr(temp_string.c_str(),"HAD_Shcal")){curstring >> varname >> value; HAD_Shcal = value;}
     else if(strstr(temp_string.c_str(),"HAD_Nhcal")){curstring >> varname >> value; HAD_Nhcal = value;}
@@ -227 +224 @@
       
    energyS2 =  gRandom->Gaus(energy_ecal, sqrt(
-                                      pow(HAD_Necal,2) +
-                                      pow(HAD_Cecal*energy_ecal,2) + 
-                                      pow(HAD_Secal*sqrt(energy_ecal),2) ) );     
+                                      pow(ELG_Ncen,2) +
+                                      pow(ELG_Ccen*energy_ecal,2) + 
+                                      pow(ELG_Scen*sqrt(energy_ecal),2) ) );     
 
   energyS = ((energyS1>0)?energyS1:0) + ((energyS2>0)?energyS2:0);