Changeset 1372 in svn for trunk/classes

Timestamp:

Apr 17, 2014, 10:54:17 AM (11 years ago)

Author:

Pavel Demin

Message:

several minor corrections

Location:

trunk/classes

Files:

• DelphesClasses.cc (modified) (3 diffs)
• DelphesClasses.h (modified) (8 diffs)

trunk/classes/DelphesClasses.cc

@@ -112 +112 @@
   Position(0.0, 0.0, 0.0, 0.0),
   Dxy(0),SDxy(0),Xd(0),Yd(0),Zd(0),
-  Tau1(0.0), Tau2(0.0), Tau3(0.0), Tau4(0.0), Tau5(0.0), 
+  Tau1(0.0), Tau2(0.0), Tau3(0.0), Tau4(0.0), Tau5(0.0),
   Area(0.0, 0.0, 0.0, 0.0),
   NCharged(0),
@@ -241 +241 @@
   object.Tau4 = Tau4;
   object.Tau5 = Tau5;
- 
+
   object.fFactory = fFactory;
   object.fArray = 0;
@@ -303 +303 @@
   Tau4 = 0.0;
   Tau5 = 0.0;
- 
+
   fArray = 0;
 }

trunk/classes/DelphesClasses.h

@@ -107 +107 @@
   Int_t IsPU; // 0 or 1 for particles from pile-up interactions
 
-
   Int_t M1; // particle 1st mother | hepevt.jmohep[number][0] - 1
   Int_t M2; // particle 2nd mother | hepevt.jmohep[number][1] - 1
@@ -299 +298 @@
 
   Float_t EhadOverEem; // ratio of the hadronic versus electromagnetic energy deposited in the calorimeter
-
-  TRefArray Constituents; // references to constituents
-  TRefArray Particles; // references to generated particles
-
-  static CompBase *fgCompare; //!
-  const CompBase *GetCompare() const { return fgCompare; }
-
-  TLorentzVector P4();
 
   // -- PileUpJetID variables ---
@@ -319 +310 @@
 
  // -- Nsubjettiness variables ---
-  
-  Float_t Tau1; 
-  Float_t Tau2; 
-  Float_t Tau3; 
-  Float_t Tau4; 
-  Float_t Tau5; 
+
+  Float_t Tau1;
+  Float_t Tau2;
+  Float_t Tau3;
+  Float_t Tau4;
+  Float_t Tau5;
+
+  TRefArray Constituents; // references to constituents
+  TRefArray Particles; // references to generated particles
+
+  static CompBase *fgCompare; //!
+  const CompBase *GetCompare() const { return fgCompare; }
+
+  TLorentzVector P4();
 
   ClassDef(Jet, 2)
@@ -355 +354 @@
   Float_t ZOuter; // track position (z component) at the tracker edge
   Float_t TOuter; // track position (z component) at the tracker edge
-  
+
   Float_t Dxy;     // track signed transverse impact parameter
   Float_t SDxy;    // signed error on the track signed transverse impact parameter
@@ -369 +368 @@
   TLorentzVector P4();
 
-  ClassDef(Track, 1)
+  ClassDef(Track, 2)
 };
 
@@ -456 +455 @@
 
   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
@@ -472 +471 @@
   Float_t  PTD;
   Float_t  FracPt[5];
- 
+
   // -- Nsubjettiness variables ---
- 
-  Float_t Tau1;
-  Float_t Tau2;
-  Float_t Tau3;
-  Float_t Tau4;
-  Float_t Tau5;
- 
+
+  Float_t Tau[5];
+
   static CompBase *fgCompare; //!
   const CompBase *GetCompare() const { return fgCompare; }
@@ -499 +494 @@
   void SetFactory(DelphesFactory *factory) { fFactory = factory; }
 
-  ClassDef(Candidate, 1)
+  ClassDef(Candidate, 2)
 };