Changeset 3b465ca in git

Timestamp:

Nov 4, 2013, 2:13:47 PM (11 years ago)

Author:

pavel <pavel@…>

Branches:

ImprovedOutputFile, Timing, dual_readout, llp, master

Children:

984cd31

Parents:

1697699

Message:

update ROOT tree classes

Files:

• classes/DelphesClasses.h (modified) (12 diffs)
• modules/TreeWriter.cc (modified) (3 diffs)

classes/DelphesClasses.h

@@ -36 +36 @@
 
   Float_t ReadTime;
-  Float_t ProcTime;  
+  Float_t ProcTime;
 
   ClassDef(Event, 1)
@@ -75 +75 @@
 
   Int_t ProcessID; // unique signal process id | signal_process_id()
-  Int_t MPI; // number of multi parton interactions | mpi () 
+  Int_t MPI; // number of multi parton interactions | mpi ()
 
   Float_t Weight; // weight for the event
@@ -84 +84 @@
 
   Int_t ID1; // flavour code of first parton | pdf_info()->id1()
-  Int_t ID2; // flavour code of second parton | pdf_info()->id2()     
+  Int_t ID2; // flavour code of second parton | pdf_info()->id2()
 
   Float_t X1; // fraction of beam momentum carried by first parton ("beam side") | pdf_info()->x1()
@@ -106 +106 @@
   Int_t Status; // particle status | hepevt.isthep[number]
   Int_t IsPU; // 0 or 1 for particles from pile-up interactions
-  
+
 
   Int_t M1; // particle 1st mother | hepevt.jmohep[number][0] - 1
@@ -136 +136 @@
   static CompBase *fgCompare; //!
   const CompBase *GetCompare() const { return fgCompare; }
-  
+
   TLorentzVector P4();
 
@@ -172 +172 @@
 public:
   Float_t Rho; // rho energy density
+  Float_t Edges[2]; // pseudorapidity range edges
 
   ClassDef(Rho, 1)
@@ -197 +198 @@
 
   Float_t E; // photon energy
-  
+
   Float_t EhadOverEem; // ratio of the hadronic versus electromagnetic energy deposited in the calorimeter
 
@@ -291 +292 @@
 //---------------------------------------------------------------------------
 
-class Track: public SortableObject 
-{
-public:  
+class Track: public SortableObject
+{
+public:
   Int_t PID; // HEP ID number
 
@@ -326 +327 @@
 //---------------------------------------------------------------------------
 
-class Tower: public SortableObject 
+class Tower: public SortableObject
 {
 public:
@@ -352 +353 @@
 //---------------------------------------------------------------------------
 
-class Candidate: public SortableObject 
+class Candidate: public SortableObject
 {
   friend class DelphesFactory;
@@ -367 +368 @@
 
   Float_t Mass;
-  
+
   Int_t IsPU;
   Int_t IsConstituent;
-  
+
   UInt_t BTag;
   UInt_t TauTag;
@@ -393 +394 @@
   virtual void Copy(TObject &object) const;
   virtual TObject *Clone(const char *newname = "") const;
-  virtual void Clear(Option_t* option = ""); 
+  virtual void Clear(Option_t* option = "");
 
 private:
   DelphesFactory *fFactory; //!
   TObjArray *fArray; //!
-  
+
   void SetFactory(DelphesFactory *factory) { fFactory = factory; }
 

modules/TreeWriter.cc

@@ -496 +496 @@
     entry = static_cast<MissingET*>(branch->NewEntry());
 
+    entry->Eta = (-momentum).Eta();
     entry->Phi = (-momentum).Phi();
     entry->MET = momentum.Pt();
@@ -523 +524 @@
 void TreeWriter::ProcessRho(ExRootTreeBranch *branch, TObjArray *array)
 {
+  TIter iterator(array);
   Candidate *candidate = 0;
   Rho *entry = 0;
 
-  // get the first entry
-  if((candidate = static_cast<Candidate*>(array->At(0))))
+  // loop over all rho
+  iterator.Reset();
+  while((candidate = static_cast<Candidate*>(iterator.Next())))
   {
     const TLorentzVector &momentum = candidate->Momentum;
@@ -534 +537 @@
 
     entry->Rho = momentum.E();
+    entry->Edges[0] = candidate->Edges[0];
+    entry->Edges[1] = candidate->Edges[1];
   }
 }