Changeset 71 in svn for trunk/Delphes.cpp

Timestamp:

Dec 3, 2008, 2:47:52 AM (16 years ago)

Author:

Xavier Rouby

Message:

iEta et iPhi. Verification non complete.

File:

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

trunk/Delphes.cpp

@@ -55 +55 @@
   char *appargv[] = {appName, "-b"};
   TApplication app(appName, &appargc, appargv);
-  
-  if(argc != 4 && argc != 3) {
-      cout << " Usage: " << argv[0] << " input_file" << " output_file" << " data_card " << endl;
+
+  if(argc != 4 && argc != 3 && argc != 5) {
+      cout << " Usage: " << argv[0] << " input_file output_file [detector_card] [trigger_card] " << endl;
       cout << " input_list - list of files in Ntpl, StdHep of LHEF format," << endl;
       cout << " output_file - output file." << endl;
-      cout << " data_card - Datacard containing resolution variables for the detector simulation (optional) "<<endl;
+      cout << " detector_card - Datacard containing resolution variables for the detector simulation (optional) "<<endl;
+      cout << " trigger_card - Datacard containing the trigger algorithms (optional) "<<endl;
       exit(1);
   }
@@ -93 +94 @@
   DET->Logfile(LogName);
 
-
   //Trigger information
-  TriggerTable *TRIGT = new TriggerTable();
-  TRIGT->TriggerCardReader("data/trigger.dat");
-  TRIGT->PrintTriggerTable(LogName);
-  //outputFile->Close();
-  
+  //Trigger *TRIG = new Trigger();
+  //TRIG->TriggerReader("data/trigger.dat");
 
   //Propagation of tracks in the B field
@@ -231 +228 @@
             { 
             genMomentum.SetPxPyPzE(particle->Px, particle->Py, particle->Pz, particle->E);
-            //TRACP->Propagation(particle,genMomentum);
+            TRACP->Propagation(particle,genMomentum);
             float eta=fabs(genMomentum.Eta());
             switch(pid) {
@@ -271 +268 @@
                 // back of the input_particles vector
                 input_particles.push_back(fastjet::PseudoJet(genMomentum.Px(),genMomentum.Py(),genMomentum.Pz(), genMomentum.E())); 
-  
+                
                 genMomentumCalo.SetPxPyPzE(CaloTower.fourVector.px,CaloTower.fourVector.py,CaloTower.fourVector.pz,CaloTower.fourVector.E);
                 elementCalo = (TRootCalo*) branchCalo->NewEntry();
                 elementCalo->Set(genMomentumCalo);
+                DET->BinEtaPhi(genMomentumCalo.Phi(), genMomentumCalo.Eta(), elementCalo->Phi, elementCalo->Eta);
               }
             }
@@ -304 +302 @@
           
         } // while
-
-   // 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)
@@ -338 +322 @@
       }
       
+      // 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);
@@ -344 +344 @@
       // 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();
+  
+  cout << "** Exiting..." << endl;
+  
   delete treeWriter;
-  
-  if(DET->DOTRIGGER == 1) 
-    {
-      TChain chainT("Analysis");
-      chainT.Add(outputfilename.c_str());
-      ExRootTreeReader *treeReaderT = new ExRootTreeReader(&chainT);
-      
-      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");
-      
-      ExRootTreeWriter *treeWriterT = new ExRootTreeWriter(outputfilename, "Trigger");
-      ExRootTreeBranch *branchTrigger = treeWriterT->NewBranch("TrigResult", TRootTrigger::Class());
-      
-      TRootTrigger *elementTrigger;
-      
-      Long64_t entryT, allEntriesT = treeReaderT->GetEntries();
-      cout << "** Chain contains " << allEntriesT << " events" << endl;
-      for(entryT = 0; entryT < allEntriesT; ++entryT)
-        {
-          treeWriterT->Clear();
-          treeReaderT->ReadEntry(entry);
-          elementTrigger = (TRootTrigger*) branchTrigger->NewEntry();
-          elementTrigger->Accepted=1;
-          treeWriterT->Fill();
-        }
-      
-      treeWriterT->Write();
-      delete treeWriterT;
-    }
-  
-  cout << "** Exiting..." << endl;
-  
   delete treeReader;
   delete DET;
   if(converter) delete converter;
-  
+
   todo("TODO");
 }