Changes in classes/DelphesClasses.h [eb52a5d:cab38f6] in git

File:

• classes/DelphesClasses.h (modified) (15 diffs)

classes/DelphesClasses.h

@@ -84 +84 @@
 //---------------------------------------------------------------------------
 
-class LHEFWeight: public TObject
-{
-public:
-  Int_t ID; // weight ID
-  Float_t Weight; // weight value
-
-  ClassDef(LHEFWeight, 1)
-};
-
-//---------------------------------------------------------------------------
-
 class HepMCEvent: public Event
 {
@@ -161 +150 @@
   const CompBase *GetCompare() const { return fgCompare; }
 
-  TLorentzVector P4() const;
+  TLorentzVector P4();
 
   ClassDef(GenParticle, 1)
@@ -188 +177 @@
   Float_t Phi; // mising energy azimuthal angle
 
-  TLorentzVector P4() const;
+  TLorentzVector P4();
 
   ClassDef(MissingET, 1)
@@ -242 +231 @@
   TRefArray Particles; // references to generated particles
 
-  // Isolation variables
-
-  Float_t IsolationVar;
-  Float_t IsolationVarRhoCorr;
-  Float_t SumPtCharged;
-  Float_t SumPtNeutral;
-  Float_t SumPtChargedPU;
-  Float_t SumPt;
-
-  static CompBase *fgCompare; //!
-  const CompBase *GetCompare() const { return fgCompare; }
-
-  TLorentzVector P4() const;
-
-  ClassDef(Photon, 3)
+  static CompBase *fgCompare; //!
+  const CompBase *GetCompare() const { return fgCompare; }
+
+  TLorentzVector P4();
+
+  ClassDef(Photon, 2)
 };
 
@@ -277 +257 @@
   TRef Particle; // reference to generated particle
 
-  // Isolation variables
-
-  Float_t IsolationVar;
-  Float_t IsolationVarRhoCorr;
-  Float_t SumPtCharged;
-  Float_t SumPtNeutral;
-  Float_t SumPtChargedPU;
-  Float_t SumPt;
-
-  static CompBase *fgCompare; //!
-  const CompBase *GetCompare() const { return fgCompare; }
-
-  TLorentzVector P4() const;
-
-  ClassDef(Electron, 3)
+  static CompBase *fgCompare; //!
+  const CompBase *GetCompare() const { return fgCompare; }
+
+  TLorentzVector P4();
+
+  ClassDef(Electron, 2)
 };
 
@@ -310 +281 @@
   TRef Particle; // reference to generated particle
 
-   // Isolation variables
-
-  Float_t IsolationVar;
-  Float_t IsolationVarRhoCorr;
-  Float_t SumPtCharged;
-  Float_t SumPtNeutral;
-  Float_t SumPtChargedPU;
-  Float_t SumPt;
-
-  static CompBase *fgCompare; //!
-  const CompBase *GetCompare() const { return fgCompare; }
-
-  TLorentzVector P4() const;
-
-  ClassDef(Muon, 3)
+  static CompBase *fgCompare; //!
+  const CompBase *GetCompare() const { return fgCompare; }
+
+  TLorentzVector P4();
+
+  ClassDef(Muon, 2)
 };
 
@@ -344 +306 @@
   Float_t DeltaPhi;  // jet radius in azimuthal angle
 
-  UInt_t Flavor;
-  UInt_t FlavorAlgo;
-  UInt_t FlavorPhys;
-
   UInt_t BTag; // 0 or 1 for a jet that has been tagged as containing a heavy quark
-  UInt_t BTagAlgo;
-  UInt_t BTagPhys;
-
   UInt_t TauTag; // 0 or 1 for a jet that has been tagged as a tau
 
@@ -358 +313 @@
   Float_t EhadOverEem; // ratio of the hadronic versus electromagnetic energy deposited in the calorimeter
 
-  Int_t NCharged; // number of charged constituents
-  Int_t NNeutrals; // number of neutral constituents
-  Float_t Beta; // (sum pt of charged pile-up constituents)/(sum pt of charged constituents)
-  Float_t BetaStar; // (sum pt of charged constituents coming from hard interaction)/(sum pt of charged constituents)
-  Float_t MeanSqDeltaR; // average distance (squared) between constituent and jet weighted by pt (squared) of constituent
-  Float_t PTD; // average pt between constituent and jet weighted by pt of constituent
-  Float_t FracPt[5]; // (sum pt of constituents within a ring 0.1*i < DeltaR < 0.1*(i+1))/(sum pt of constituents)
-
-  Float_t Tau[5]; // N-subjettiness
-
-  TLorentzVector TrimmedP4[5]; // first entry (i = 0) is the total Trimmed Jet 4-momenta and from i = 1 to 4 are the trimmed subjets 4-momenta
-  TLorentzVector PrunedP4[5]; // first entry (i = 0) is the total Pruned Jet 4-momenta and from i = 1 to 4 are the pruned subjets 4-momenta
-  TLorentzVector SoftDroppedP4[5]; // first entry (i = 0) is the total SoftDropped Jet 4-momenta and from i = 1 to 4 are the pruned subjets 4-momenta
-
-  Int_t NSubJetsTrimmed; // number of subjets trimmed
-  Int_t NSubJetsPruned; // number of subjets pruned
-  Int_t NSubJetsSoftDropped; // number of subjets soft-dropped
+  Int_t    NCharged; // number of charged constituents 
+  Int_t    NNeutrals; // number of neutral constituents 
+  Float_t  Beta; // (sum pt of charged pile-up constituents)/(sum pt of charged constituents) 
+  Float_t  BetaStar; // (sum pt of charged constituents coming from hard interaction)/(sum pt of charged constituents) 
+  Float_t  MeanSqDeltaR; // average distance (squared) between constituent and jet weighted by pt (squared) of constituent
+  Float_t  PTD; // average pt between constituent and jet weighted by pt of constituent
+  Float_t  FracPt[5]; // (sum pt of constituents within a ring 0.1*i < DeltaR < 0.1*(i+1))/(sum pt of constituents) 
+
+  Float_t Tau1; // 1-subjettiness
+  Float_t Tau2; // 2-subjettiness
+  Float_t Tau3; // 3-subjettiness
+  Float_t Tau4; // 4-subjettiness
+  Float_t Tau5; // 5-subjettiness
 
   TRefArray Constituents; // references to constituents
@@ -382 +333 @@
   const CompBase *GetCompare() const { return fgCompare; }
 
-  TLorentzVector P4() const;
-  TLorentzVector Area;
-
-  ClassDef(Jet, 3)
+  TLorentzVector P4();
+
+  ClassDef(Jet, 2)
 };
 
@@ -426 +376 @@
   const CompBase *GetCompare() const { return fgCompare; }
 
-  TLorentzVector P4() const;
+  TLorentzVector P4();
 
   ClassDef(Track, 2)
@@ -442 +392 @@
   Float_t E; // calorimeter tower energy
 
-  Float_t T; // ecal deposit time, averaged by sqrt(EM energy) over all particles, not smeared
-  Int_t NTimeHits; // number of hits contributing to time measurement
+  Float_t T; //particle arrival time of flight
 
   Float_t Eem; // calorimeter tower electromagnetic energy
@@ -455 +404 @@
   const CompBase *GetCompare() const { return fgCompare; }
 
-  TLorentzVector P4() const;
-
-  ClassDef(Tower, 2)
+  TLorentzVector P4();
+
+  ClassDef(Tower, 1)
 };
 
@@ -503 +452 @@
 
   Int_t IsPU;
-  Int_t IsRecoPU;
-
   Int_t IsConstituent;
 
-  Int_t IsFromConversion;
-
-  UInt_t Flavor;
-  UInt_t FlavorAlgo;
-  UInt_t FlavorPhys;
-
   UInt_t BTag;
-  UInt_t BTagAlgo;
-  UInt_t BTagPhys;
-
   UInt_t TauTag;
 
@@ -528 +466 @@
   TLorentzVector Momentum, Position, Area;
 
-  Float_t Dxy;
-  Float_t SDxy;
-  Float_t Xd;
-  Float_t Yd;
-  Float_t Zd;
+  Float_t  Dxy;
+  Float_t  SDxy;
+  Float_t  Xd;
+  Float_t  Yd;
+  Float_t  Zd;
 
   // PileUpJetID variables
 
-  Int_t NCharged;
-  Int_t NNeutrals;
-  Float_t Beta;
-  Float_t BetaStar;
-  Float_t MeanSqDeltaR;
-  Float_t PTD;
-  Float_t FracPt[5];
-
-  // Timing information
-
-  Int_t NTimeHits;
-  std::vector< std::pair< Float_t, Float_t > > ECalEnergyTimePairs;
-
-  // Isolation variables
-
-  Float_t IsolationVar;
-  Float_t IsolationVarRhoCorr;
-  Float_t SumPtCharged;
-  Float_t SumPtNeutral;
-  Float_t SumPtChargedPU;
-  Float_t SumPt;
+  Int_t    NCharged;
+  Int_t    NNeutrals;
+  Float_t  Beta;
+  Float_t  BetaStar;
+  Float_t  MeanSqDeltaR;
+  Float_t  PTD;
+  Float_t  FracPt[5];
 
   // N-subjettiness variables
 
   Float_t Tau[5];
-
-  // Other Substructure variables
-
-  TLorentzVector TrimmedP4[5]; // first entry (i = 0) is the total Trimmed Jet 4-momenta and from i = 1 to 4 are the trimmed subjets 4-momenta
-  TLorentzVector PrunedP4[5]; // first entry (i = 0) is the total Pruned Jet 4-momenta and from i = 1 to 4 are the pruned subjets 4-momenta
-  TLorentzVector SoftDroppedP4[5]; // first entry (i = 0) is the total SoftDropped Jet 4-momenta and from i = 1 to 4 are the pruned subjets 4-momenta
-
-  Int_t NSubJetsTrimmed; // number of subjets trimmed
-  Int_t NSubJetsPruned; // number of subjets pruned
-  Int_t NSubJetsSoftDropped; // number of subjets soft-dropped
-
 
   static CompBase *fgCompare; //!
@@ -591 +504 @@
   void SetFactory(DelphesFactory *factory) { fFactory = factory; }
 
-  ClassDef(Candidate, 3)
+  ClassDef(Candidate, 2)
 };