Changeset 59 in svn for trunk/Delphes.cpp

Timestamp:

Nov 27, 2008, 8:49:44 PM (16 years ago)

Author:

severine ovyn

Message:

remove bug

File:

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

trunk/Delphes.cpp

@@ -207 +207 @@
       while( (particle = (TRootGenParticle*) itGen.Next()) )
         {
-          genMomentum.SetPxPyPzE(particle->Px, particle->Py, particle->Pz, particle->E);
-          
           int pid = abs(particle->PID);
-          float eta = fabs(genMomentum.Eta());
-
-          //subarray of the quarks (i.e. not final particles, i.e status not equal to 1) 
-          // in the tracker (i.e. for those we know the tracks)
-          // with enough p_T
-          //// This subarray is needed for the B-jet algorithm
+         //// This subarray is needed for the B-jet algorithm
           // optimization for speed : put first PID condition, then ETA condition, then either pt or status
           if( (pid <= pB || pid == pGLUON) &&// is it a light quark or a gluon, i.e. is it one of these : u,d,c,s,b,g ?
-              eta < DET->MAX_TRACKER &&
+              fabs(particle->Eta) < DET->MAX_TRACKER &&
               particle->Status != 1 &&
               particle->PT > DET->PT_QUARKS_MIN ) {
             NFCentralQ.Add(particle);
           }
-          
-          
+                  
           // keeps only final particles, visible by the central detector, including the fiducial volume
           // the ordering of conditions have been optimised for speed : put first the STATUS condition
@@ -230 +222 @@
           // 
           if( (particle->Status == 1)    &&
-              ( 
-               (pid == pMU  && eta < DET->MAX_MU) ||
-               (pid != pMU  && (pid != pNU1) && (pid != pNU2) && (pid != pNU3) && eta < DET->MAX_CALO_FWD) 
-                )
-              ) { 
-          //  TRACP->Propagation(particle,genMomentum);
-            eta = fabs(genMomentum.Eta());
+              ((pid != pNU1) && (pid != pNU2) && (pid != pNU3)) &&
+              (fabs(particle->Eta) < DET->MAX_CALO_FWD)
+            ) 
+            { 
+            genMomentum.SetPxPyPzE(particle->Px, particle->Py, particle->Pz, particle->E);
+            TRACP->Propagation(particle,genMomentum);
+            float eta=fabs(genMomentum.Eta());
             switch(pid) {
               
@@ -264 +256 @@
               break;
             } // switch (pid)
-            
+
             // all final particles but muons and neutrinos      
             // for calorimetric towers and mission PT
@@ -275 +267 @@
                 // back of the input_particles vector
                 input_particles.push_back(fastjet::PseudoJet(genMomentum.Px(),genMomentum.Py(),genMomentum.Pz(), genMomentum.E())); 
-                //genMomentumCalo.SetPtEtaPhiE(CaloTower.Et(),CaloTower.iEta(),CaloTower.iPhi(),CaloTower.fourVector.E);
+                
                 genMomentumCalo.SetPxPyPzE(CaloTower.fourVector.px,CaloTower.fourVector.py,CaloTower.fourVector.pz,CaloTower.fourVector.E);
                 elementCalo = (TRootCalo*) branchCalo->NewEntry();
@@ -301 +293 @@
                 TrackCentral.push_back(genMomentum);
               }
-            
+
           } // switch
           
@@ -340 +332 @@
       elementEtmis->Px = (-PTmis).Px();
       elementEtmis->Py = (-PTmis).Py();
+
       //*****************************
+      treeWriter->Fill();
       
       sorted_jets=JETRUN->RunJets(input_particles);
@@ -346 +340 @@
       JETRUN->RunTauJets(treeWriter,branchTauJet,sorted_jets,towers, TrackCentral);
 
-
-      treeWriter->Fill();
-
       // Add here the trigger
       // Should test all the trigger table on the event, based on reconstructed objects
-      
- //     Trigger *TRIG = new Trigger();
- //     TRIG->TriggerReader("data/trigger.dat");
      
     } // Loop over all events