Changeset 1354 in svn for trunk/classes

Timestamp:

Jan 20, 2014, 12:30:34 PM (11 years ago)

Author:

Pavel Demin

Message:

reorder variables in Candidate

Location:

trunk/classes

Files:

• DelphesClasses.cc (modified) (2 diffs)
• DelphesClasses.h (modified) (7 diffs)

trunk/classes/DelphesClasses.cc

@@ -111 +111 @@
   Position(0.0, 0.0, 0.0, 0.0),
   Area(0.0, 0.0, 0.0, 0.0),
-  fFactory(0),
-  fArray(0),
   NCharged(0),
   NNeutrals(0),
@@ -118 +116 @@
   BetaStar(0),
   MeanSqDeltaR(0),
-  PTD(0)
+  PTD(0),
+  fFactory(0),
+  fArray(0)
 {
   Edges[0] = 0.0;

trunk/classes/DelphesClasses.h

@@ -211 +211 @@
 
   Float_t E; // photon energy
-  
-  Float_t T; //particle arrival time of flight 
-  
+
+  Float_t T; //particle arrival time of flight
+
   Float_t EhadOverEem; // ratio of the hadronic versus electromagnetic energy deposited in the calorimeter
 
@@ -235 +235 @@
   Float_t Eta; // electron pseudorapidity
   Float_t Phi; // electron azimuthal angle
-  
-  Float_t T; //particle arrival time of flight 
-  
+
+  Float_t T; //particle arrival time of flight
+
   Int_t Charge; // electron charge
 
@@ -262 +262 @@
   Float_t Phi; // muon azimuthal angle
 
-  Float_t T; //particle arrival time of flight 
-    
+  Float_t T; //particle arrival time of flight
+
   Int_t Charge; // muon charge
 
@@ -286 +286 @@
   Float_t Phi; // jet azimuthal angle
 
-  Float_t T; //particle arrival time of flight 
-  
+  Float_t T; //particle arrival time of flight
+
   Float_t Mass; // jet invariant mass
 
@@ -371 +371 @@
   Float_t E; // calorimeter tower energy
 
-  Float_t T; //particle arrival time of flight 
-  
+  Float_t T; //particle arrival time of flight
+
   Float_t Eem; // calorimeter tower electromagnetic energy
   Float_t Ehad; // calorimeter tower hadronic energy
@@ -421 +421 @@
   TLorentzVector Momentum, Position, Area;
 
-  static CompBase *fgCompare; //!
-  const CompBase *GetCompare() const { return fgCompare; }
-
-  void AddCandidate(Candidate *object);
-  TObjArray *GetCandidates();
-
-  Bool_t Overlaps(const Candidate *object) const;
-
-  virtual void Copy(TObject &object) const;
-  virtual TObject *Clone(const char *newname = "") const;
-  virtual void Clear(Option_t* option = "");
-
-// -- PileUpJetID variables ---
+  // PileUpJetID variables
 
   Int_t    NCharged;
@@ -443 +431 @@
   Float_t  FracPt[5];
 
+  static CompBase *fgCompare; //!
+  const CompBase *GetCompare() const { return fgCompare; }
+
+  void AddCandidate(Candidate *object);
+  TObjArray *GetCandidates();
+
+  Bool_t Overlaps(const Candidate *object) const;
+
+  virtual void Copy(TObject &object) const;
+  virtual TObject *Clone(const char *newname = "") const;
+  virtual void Clear(Option_t* option = "");
+
 private:
   DelphesFactory *fFactory; //!