Changeset 94 in svn for trunk/Resolutions.cpp

Timestamp:

Dec 12, 2008, 5:32:29 PM (16 years ago)

Author:

severine ovyn

Message:

Add frog plus cleaning + bugs remove

File:

• trunk/Resolutions.cpp (modified) (7 diffs)

trunk/Resolutions.cpp

@@ -236 +236 @@
           
           //input generator level particle for jet algorithm      
-          if(particle->Status == 1 && eta < DET->MAX_CALO_FWD)
+          if(particle->Status == 1 && eta < DET->CEN_max_calo_fwd)
             {
               input_particlesGEN.push_back(fastjet::PseudoJet(genMomentum.Px(),genMomentum.Py(),genMomentum.Pz(), genMomentum.E()));
@@ -246 +246 @@
           if( (particle->Status == 1)    &&
               ((pid != pNU1) && (pid != pNU2) && (pid != pNU3)) &&
-              (fabs(particle->Eta) < DET->MAX_CALO_FWD)
+              (fabs(particle->Eta) < DET->CEN_max_calo_fwd)
               )
             {
@@ -260 +260 @@
               case pE: // all electrons with eta < DET->MAX_CALO_FWD
                 DET->SmearElectron(recoMomentum);
-                if(recoMomentum.E() !=0 && eta < DET->MAX_TRACKER){
+                if(recoMomentum.E() !=0 && eta < DET->CEN_max_tracker){
                   elementElec=(RESOLELEC*) branchelec->NewEntry();
                   elementElec->E = genMomentum.E();
@@ -287 +287 @@
               int charge=Charge(pid);
               if(recoMomentum.E() !=0 && pid != pMU) {
-                if(charge == 0 || (charge !=0 && recoMomentum.Pt() >= DET->PT_TRACKS_MIN)){
+                if(charge == 0 || (charge !=0 && recoMomentum.Pt() >= DET->TRACK_ptmin)){
                   towers.push_back(PhysicsTower(LorentzVector(recoMomentum.Px(),recoMomentum.Py(),recoMomentum.Pz(), recoMomentum.E())));
                   input_particlesReco.push_back(fastjet::PseudoJet(recoMomentum.Px(),recoMomentum.Py(),recoMomentum.Pz(), recoMomentum.E()));
@@ -296 +296 @@
               if(
                  (genMomentum.E()!=0) &&
-                 (fabs(genMomentum.Eta()) < DET->MAX_TRACKER) &&
-                 (genMomentum.Pt() > DET->PT_TRACKS_MIN ) &&     // pt too small to be taken into account
-                 ((rand()%100) < DET->TRACKING_EFF)  &&
+                 (fabs(genMomentum.Eta()) < DET->CEN_max_tracker) &&
+                 (genMomentum.Pt() > DET->TRACK_ptmin ) &&     // pt too small to be taken into account
+                 ((rand()%100) < DET->TRACK_eff)  &&
                  (charge!=0)
                  )
@@ -346 +346 @@
         TLorentzVector JETT(0,0,0,0);
         JETT.SetPxPyPzE(sorted_jetsReco[i].px(),sorted_jetsReco[i].py(),sorted_jetsReco[i].pz(),sorted_jetsReco[i].E());
-        if(fabs(JETT.Eta()) < (DET->MAX_TRACKER - DET->TAU_CONE_TRACKS)) 
+        if(fabs(JETT.Eta()) < (DET->CEN_max_tracker - DET->TAU_track_scone)) 
            {
             for(Int_t i=0; i<TausHadr.GetEntries();i++)
@@ -354 +354 @@
                     elementTaujet= (TAUHAD*) branchtaujet->NewEntry();
                     elementTaujet->EnergieCen = (DET->EnergySmallCone(towers,JETT.Eta(),JETT.Phi())/JETT.E());
-                    elementTaujet->NumTrack = DET->NumTracks(TrackCentral,DET->PT_TRACK_TAU,JETT.Eta(),JETT.Phi());
+                    elementTaujet->NumTrack = DET->NumTracks(TrackCentral,DET->TAU_track_pt,JETT.Eta(),JETT.Phi());
                  }
               }