Fork me on GitHub

Changeset 1321 in svn for trunk


Ignore:
Timestamp:
Nov 4, 2013, 2:13:47 PM (11 years ago)
Author:
Pavel Demin
Message:

update ROOT tree classes

Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/classes/DelphesClasses.h

    r1318 r1321  
    3636
    3737  Float_t ReadTime;
    38   Float_t ProcTime; 
     38  Float_t ProcTime;
    3939
    4040  ClassDef(Event, 1)
     
    7575
    7676  Int_t ProcessID; // unique signal process id | signal_process_id()
    77   Int_t MPI; // number of multi parton interactions | mpi () 
     77  Int_t MPI; // number of multi parton interactions | mpi ()
    7878
    7979  Float_t Weight; // weight for the event
     
    8484
    8585  Int_t ID1; // flavour code of first parton | pdf_info()->id1()
    86   Int_t ID2; // flavour code of second parton | pdf_info()->id2()     
     86  Int_t ID2; // flavour code of second parton | pdf_info()->id2()
    8787
    8888  Float_t X1; // fraction of beam momentum carried by first parton ("beam side") | pdf_info()->x1()
     
    106106  Int_t Status; // particle status | hepevt.isthep[number]
    107107  Int_t IsPU; // 0 or 1 for particles from pile-up interactions
    108  
     108
    109109
    110110  Int_t M1; // particle 1st mother | hepevt.jmohep[number][0] - 1
     
    136136  static CompBase *fgCompare; //!
    137137  const CompBase *GetCompare() const { return fgCompare; }
    138  
     138
    139139  TLorentzVector P4();
    140140
     
    172172public:
    173173  Float_t Rho; // rho energy density
     174  Float_t Edges[2]; // pseudorapidity range edges
    174175
    175176  ClassDef(Rho, 1)
     
    197198
    198199  Float_t E; // photon energy
    199  
     200
    200201  Float_t EhadOverEem; // ratio of the hadronic versus electromagnetic energy deposited in the calorimeter
    201202
     
    291292//---------------------------------------------------------------------------
    292293
    293 class Track: public SortableObject 
    294 {
    295 public: 
     294class Track: public SortableObject
     295{
     296public:
    296297  Int_t PID; // HEP ID number
    297298
     
    326327//---------------------------------------------------------------------------
    327328
    328 class Tower: public SortableObject 
     329class Tower: public SortableObject
    329330{
    330331public:
     
    352353//---------------------------------------------------------------------------
    353354
    354 class Candidate: public SortableObject 
     355class Candidate: public SortableObject
    355356{
    356357  friend class DelphesFactory;
     
    367368
    368369  Float_t Mass;
    369  
     370
    370371  Int_t IsPU;
    371372  Int_t IsConstituent;
    372  
     373
    373374  UInt_t BTag;
    374375  UInt_t TauTag;
     
    393394  virtual void Copy(TObject &object) const;
    394395  virtual TObject *Clone(const char *newname = "") const;
    395   virtual void Clear(Option_t* option = ""); 
     396  virtual void Clear(Option_t* option = "");
    396397
    397398private:
    398399  DelphesFactory *fFactory; //!
    399400  TObjArray *fArray; //!
    400  
     401
    401402  void SetFactory(DelphesFactory *factory) { fFactory = factory; }
    402403
  • trunk/modules/TreeWriter.cc

    r1123 r1321  
    496496    entry = static_cast<MissingET*>(branch->NewEntry());
    497497
     498    entry->Eta = (-momentum).Eta();
    498499    entry->Phi = (-momentum).Phi();
    499500    entry->MET = momentum.Pt();
     
    523524void TreeWriter::ProcessRho(ExRootTreeBranch *branch, TObjArray *array)
    524525{
     526  TIter iterator(array);
    525527  Candidate *candidate = 0;
    526528  Rho *entry = 0;
    527529
    528   // get the first entry
    529   if((candidate = static_cast<Candidate*>(array->At(0))))
     530  // loop over all rho
     531  iterator.Reset();
     532  while((candidate = static_cast<Candidate*>(iterator.Next())))
    530533  {
    531534    const TLorentzVector &momentum = candidate->Momentum;
     
    534537
    535538    entry->Rho = momentum.E();
     539    entry->Edges[0] = candidate->Edges[0];
     540    entry->Edges[1] = candidate->Edges[1];
    536541  }
    537542}
Note: See TracChangeset for help on using the changeset viewer.