Changes in readers/DelphesROOT.cpp [341014c:94083e7] in git

File:

• readers/DelphesROOT.cpp (modified) (12 diffs)

readers/DelphesROOT.cpp

@@ -18 +18 @@
 
 #include <algorithm>
+#include <stdexcept>
 #include <iostream>
+#include <sstream>
 #include <memory>
-#include <sstream>
-#include <stdexcept>
 
 #include <map>
 #include <vector>
 
+#include <stdlib.h>
 #include <signal.h>
 #include <stdio.h>
-#include <stdlib.h>
-
+
+#include "TROOT.h"
 #include "TApplication.h"
-#include "TROOT.h"
-
+
+#include "TFile.h"
 #include "TClonesArray.h"
+#include "TObjArray.h"
+#include "TStopwatch.h"
 #include "TDatabasePDG.h"
-#include "TFile.h"
+#include "TParticlePDG.h"
 #include "TLorentzVector.h"
-#include "TObjArray.h"
-#include "TParticlePDG.h"
-#include "TStopwatch.h"
-
+
+#include "modules/Delphes.h"
+#include "classes/DelphesStream.h"
 #include "classes/DelphesClasses.h"
 #include "classes/DelphesFactory.h"
-#include "classes/DelphesStream.h"
-#include "modules/Delphes.h"
-
+
+#include "ExRootAnalysis/ExRootTreeWriter.h"
+#include "ExRootAnalysis/ExRootTreeReader.h"
+#include "ExRootAnalysis/ExRootTreeBranch.h"
 #include "ExRootAnalysis/ExRootProgressBar.h"
-#include "ExRootAnalysis/ExRootTreeBranch.h"
-#include "ExRootAnalysis/ExRootTreeReader.h"
-#include "ExRootAnalysis/ExRootTreeWriter.h"
+
+
 
 using namespace std;
 
 //---------------------------------------------------------------------------
+
 
 //---------------------------------------------------------------------------
@@ -91 +94 @@
   if(argc < 4)
   {
-    cout << " Usage: " << appName << " config_file"
-         << " output_file"
-         << " input_file(s)" << endl;
+    cout << " Usage: " << appName << " config_file" << " output_file" << " input_file(s)" << endl;
     cout << " config_file - configuration file in Tcl format," << endl;
     cout << " output_file - output file in ROOT format," << endl;
@@ -121 +122 @@
 
     branchEvent = treeWriter->NewBranch("Event", HepMCEvent::Class());
-
+   
     confReader = new ExRootConfReader;
     confReader->ReadFile(argv[1]);
@@ -128 +129 @@
     modularDelphes->SetConfReader(confReader);
     modularDelphes->SetTreeWriter(treeWriter);
-
+    
     TChain *chain = new TChain("Delphes");
-
+    
     factory = modularDelphes->GetFactory();
     allParticleOutputArray = modularDelphes->ExportArray("allParticles");
@@ -144 +145 @@
       chain->Add(argv[i]);
       ExRootTreeReader *treeReader = new ExRootTreeReader(chain);
-
+      
       inputFile = TFile::Open(argv[i]);
 
@@ -152 +153 @@
         throw runtime_error(message.str());
       }
-
+      
       numberOfEvents = treeReader->GetEntries();
-      TClonesArray *branchParticle = treeReader->UseBranch("Particle");
+      TClonesArray *branchParticle   = treeReader->UseBranch("Particle");
       TClonesArray *branchHepMCEvent = treeReader->UseBranch("Event");
-
+     
       if(numberOfEvents <= 0) continue;
 
@@ -168 +169 @@
       for(Int_t entry = 0; entry < numberOfEvents && !interrupted; ++entry)
       {
-
+    
         treeReader->ReadEntry(entry);
 
-        // -- TBC need also to include event weights --
-
-        eve = (HepMCEvent *)branchHepMCEvent->At(0);
+        // -- TBC need also to include event weights --  
+        
+        eve = (HepMCEvent*) branchHepMCEvent->At(0);
         element = static_cast<HepMCEvent *>(branchEvent->NewEntry());
-
+        
         element->Number = eventCounter;
 
@@ -196 +197 @@
         element->ProcTime = eve->ProcTime;
 
-        for(Int_t j = 0; j < branchParticle->GetEntriesFast(); j++)
-        {
-
-          gen = (GenParticle *)branchParticle->At(j);
+        for(Int_t j=0; j < branchParticle->GetEntriesFast(); j++)
+        {     
+         
+          gen = (GenParticle*) branchParticle->At(j);     
           candidate = factory->NewCandidate();
 
           candidate->Momentum = gen->P4();
-          candidate->Position.SetXYZT(gen->X, gen->Y, gen->Z, gen->T * 1.0E3 * c_light);
-
+          candidate->Position.SetXYZT(gen->X, gen->Y, gen->Z, gen->T*1.0E3*c_light);
+          
           candidate->PID = gen->PID;
           candidate->Status = gen->Status;
-
+     
           candidate->M1 = gen->M1;
           candidate->M2 = gen->M2;
@@ -215 +216 @@
 
           candidate->Charge = gen->Charge;
-          candidate->Mass = gen->Mass;
-
+          candidate->Mass   = gen->Mass;
+    
           allParticleOutputArray->Add(candidate);
-
+ 
           pdgCode = TMath::Abs(gen->PID);
 
@@ -230 +231 @@
           }
         }
-
+        
         modularDelphes->ProcessTask();
 
@@ -241 +242 @@
         ++eventCounter;
       }
-
+ 
       progressBar.Update(eventCounter, eventCounter, kTRUE);
       progressBar.Finish();
 
       inputFile->Close();
-
+    
       delete treeReader;
+      
     }
 
@@ -260 +262 @@
     delete outputFile;
     delete chain;
-
+    
     return 0;
   }