Fork me on GitHub

Changeset 69 in svn for trunk


Ignore:
Timestamp:
Dec 2, 2008, 12:17:27 PM (16 years ago)
Author:
severine ovyn
Message:

add DOTRIGGER tag

Location:
trunk
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/data/DataCardDet.dat

    r62 r69  
    2626ELG_Ncen         0.25                   // N term for central ECAL
    2727ELG_Ccen         0.0055                 // C term for central ECAL
    28 ELG_Cfwd         0.107                  // S term for forward ECAL
    29 ELG_Sfwd         2.084                  // C term for forward ECAL
     28ELG_Sfwd         1.5                    // S term for forward ECAL
    3029ELG_Nfwd         0.0                    // N term for central ECAL
     30ELG_Cfwd         0.06                   // C term for forward ECAL
    3131
    3232#energy resolution for hadrons in ecal/hcal/hf
     
    6565CONERADIUS              0.7
    6666JETALGO                 1               // 1 for Cone algorithm, 2 for MidPoint algorithm, 3 for SIScone algorithm, 4 for kt algorithm
     67
     68DOTRIGGER               1
  • trunk/interface/SmearUtil.h

    r62 r69  
    119119  double PROTOJET_PTMIN;
    120120
     121  int DOTRIGGER;
    121122
    122123  /// Reads the data card for the initialisation of the parameters
  • trunk/src/SmearUtil.cc

    r62 r69  
    5252ELG_Ncen =        0.25 ;                 // N term for central ECAL
    5353ELG_Ccen =        0.0055 ;                // C term for central ECAL
    54 ELG_Cfwd =        0.107 ;                 // S term for forward ECAL
    55 ELG_Sfwd =        2.084 ;                 // C term for forward ECAL
    56 ELG_Nfwd =        0.0   ;                 // N term for central ECAL
     54ELG_Sfwd =        1.5;                    // S term for forward ECAL
     55ELG_Nfwd =        0.0;                    // N term for central ECAL
     56ELG_Cfwd =        0.06;                   // C term for forward ECAL
    5757
    5858HAD_Shcal =       1.5 ;                    // S term for central HCAL // hadronic calorimeter
     
    182182 PROTOJET_PTMIN = 0.0;
    183183
     184 DOTRIGGER=1;
    184185
    185186}
    186187
    187188void RESOLution::Logfile(string LogName) {
    188 //void RESOLution::Logfile(string outputfilename) {
    189189
    190190  ofstream f_out(LogName.c_str());
     
    446446  float energy = electron.E();  // before smearing
    447447  float energyS = 0.0;          // after smearing  // \sigma/E = C + N/E + S/\sqrt{E}
    448  
    449   if(fabs(electron.Eta()) < MAX_TRACKER) { // if the electron is inside the tracker
     448  float eta=fabs(electron.Eta());
     449 
     450  if(eta < MAX_TRACKER) { // if the electron is inside the tracker
    450451    energyS = gRandom->Gaus(energy, sqrt(
    451452                                         pow(ELG_Ncen,2) +
     
    453454                                         pow(ELG_Scen*sqrt(energy),2) ));
    454455  }
    455   if(fabs(electron.Eta()) > MAX_TRACKER && fabs(electron.Eta()) < MAX_CALO_FWD){
     456  if(eta > MAX_TRACKER && eta < MAX_CALO_FWD){
    456457    energyS = gRandom->Gaus(energy, sqrt(
    457458                                         pow(ELG_Nfwd,2) +
Note: See TracChangeset for help on using the changeset viewer.