Changeset 65 in svn for trunk

Timestamp:

Dec 2, 2008, 11:16:48 AM (16 years ago)

Author:

severine ovyn

Message:

remove fill bug

Location:

trunk

Files:

• Delphes.cpp (modified) (7 diffs)
• src/JetUtils.cc (modified) (2 diffs)
• src/VeryForward.cc (modified) (2 diffs)

trunk/Delphes.cpp

@@ -30 +30 @@
 #include "interface/JetUtils.h"
 
+#include "Utilities/FROG/Examples/Sim_Delphes/FrogUtil.h"
 
 #include <vector>
@@ -232 +233 @@
             { 
             genMomentum.SetPxPyPzE(particle->Px, particle->Py, particle->Pz, particle->E);
-//cout<<"avant "<<genMomentum.Pt()<<endl;
-            TRACP->Propagation(particle,genMomentum);
-//cout<<"apres "<<genMomentum.Pt()<<endl;
+            //TRACP->Propagation(particle,genMomentum);
             float eta=fabs(genMomentum.Eta());
             switch(pid) {
@@ -241 +240 @@
               DET->SmearElectron(genMomentum);
               electron.push_back(genMomentum);
-  //            cout<<"apres le smearing "<<genMomentum.Pt()<<endl;
-
               elecPID.push_back(particle->PID);
               break; // case pE
@@ -276 +273 @@
                 // back of the input_particles vector
                 input_particles.push_back(fastjet::PseudoJet(genMomentum.Px(),genMomentum.Py(),genMomentum.Pz(), genMomentum.E())); 
-            //   cout<<"on remplie avec "<<pid<<" Pt "<<genMomentum.Pt()<<" Eta "<<genMomentum.Eta()<<" Phi "<<genMomentum.Eta()<<endl;
   
                 genMomentumCalo.SetPxPyPzE(CaloTower.fourVector.px,CaloTower.fourVector.py,CaloTower.fourVector.pz,CaloTower.fourVector.E);
@@ -310 +306 @@
           
         } // while
-// cout<<"*************"<<endl;     
+
+   // computes the Missing Transverse Momentum
+   TLorentzVector Att(0.,0.,0.,0.);
+   for(unsigned int i=0; i < towers.size(); i++)
+     {
+        Att.SetPxPyPzE(towers[i].fourVector.px,towers[i].fourVector.py,towers[i].fourVector.pz,towers[i].fourVector.E);
+        PTmis = PTmis + Att;
+     }
+   elementEtmis = (TRootETmis*) branchETmis->NewEntry();
+   elementEtmis->ET = (PTmis).Pt();
+   elementEtmis->Phi = (-PTmis).Phi();
+   elementEtmis->Px = (-PTmis).Px();
+   elementEtmis->Py = (-PTmis).Py();
+   //*****************************
+   
       for(unsigned int i=0; i < electron.size(); i++) {
         if(electron[i].E()!=0 && fabs(electron[i].Eta()) < DET->MAX_TRACKER && electron[i].Pt() > DET->ELEC_pt)
@@ -330 +340 @@
       }
       
-      // computes the Missing Transverse Momentum
-      TLorentzVector Att(0.,0.,0.,0.);
-      for(unsigned int i=0; i < towers.size(); i++)
-        {
-          Att.SetPxPyPzE(towers[i].fourVector.px,towers[i].fourVector.py,towers[i].fourVector.pz,towers[i].fourVector.E);
-          PTmis = PTmis + Att;
-        }
-      elementEtmis = (TRootETmis*) branchETmis->NewEntry();
-      elementEtmis->ET = (PTmis).Pt();
-      elementEtmis->Phi = (-PTmis).Phi();
-      elementEtmis->Px = (-PTmis).Px();
-      elementEtmis->Py = (-PTmis).Py();
-
-      //*****************************
-      treeWriter->Fill();
-      
       sorted_jets=JETRUN->RunJets(input_particles);
       JETRUN->RunJetBtagging(treeWriter, branchJet,sorted_jets,NFCentralQ);
@@ -352 +346 @@
       // Add here the trigger
       // Should test all the trigger table on the event, based on reconstructed objects
+      treeWriter->Fill();
      
     } // Loop over all events
 
+
   treeWriter->Write();
-  
+  delete treeWriter;
+
+/*  if(DET->DOTRIGGER == 1) 
+    {
+//      TChain chainT("Analysis");
+//      chainT.Add(outputfilename.c_str());
+      ExRootTreeReader *treeReaderT = new ExRootTreeReader("Analysis");
+
+
+      const TClonesArray *branchElecTrig = treeReaderT->UseBranch("Electron");
+      const TClonesArray *branchMuonTrig = treeReaderT->UseBranch("Muon");
+      const TClonesArray *branchJetTrig = treeReaderT->UseBranch("Jet");
+      const TClonesArray *branchTauJetTrig = treeReaderT->UseBranch("TauJet");
+      const TClonesArray *branchPhotonTrig = treeReaderT->UseBranch("Photon");
+      const TClonesArray *branchETmisTrig = treeReaderT->UseBranch("ETmis");
+   
+     // Loop over all events
+     Long64_t entryT, allEntriesT = treeReaderT->GetEntries();
+      cout << "** Chain contains " << allEntriesT << " events" << endl;
+     for(entryT = 0; entryT < allEntriesT; ++entryT)
+        {
+//cout<<"entry "<<entryT<<endl;
+        }
+   }
+*/
+
   cout << "** Exiting..." << endl;
   
-  delete treeWriter;
   delete treeReader;
   delete DET;

trunk/src/JetUtils.cc

@@ -106 +106 @@
       }
   } // for itJet : loop on all jets
- treeWriter->Fill();
   
 }
@@ -131 +130 @@
   } // for itJet : loop on all jets
   
-  treeWriter->Fill();
   
 }

trunk/src/VeryForward.cc

@@ -80 +80 @@
     elementZdc->side = sign(eta);
     
-    treeWriter->Fill();
     
   }
@@ -140 +139 @@
 
       }
-     treeWriter->Fill();
       //                if(p1.stopped(beamline) && (p1.getStoppingElement()->getS() > 100))
       //                        cout << "Eloss ="  << 7000.-p1.getE() << " ; " << p1.getStoppingElement()->getName() << endl;