Changeset 839deb7 in git for classes

Timestamp:

Jun 29, 2015, 10:27:47 PM (9 years ago)

Author:

Pavel Demin <pavel.demin@…>

Branches:

ImprovedOutputFile, Timing, dual_readout, llp, master

Children:

c1ce3fe

Parents:

5d2481f

Message:

fix variable names and formatting

Location:

classes

Files:

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

classes/DelphesClasses.cc

@@ -131 +131 @@
   NCharged(0),
   NNeutrals(0),
-  NSubJetsTrimmed(0),
-  NSubJetsPruned(0), 
-  NSubJetsSoftDropped(0), 
   Beta(0),
   BetaStar(0),
   MeanSqDeltaR(0),
   PTD(0),
-  Ntimes(-1),
+  NTimeHits(-1),
   IsolationVar(-999),
   IsolationVarRhoCorr(-999),
@@ -145 +142 @@
   SumPtChargedPU(-999),
   SumPt(-999),
+  NSubJetsTrimmed(0),
+  NSubJetsPruned(0),
+  NSubJetsSoftDropped(0),
   fFactory(0),
   fArray(0)
@@ -274 +274 @@
   object.MeanSqDeltaR = MeanSqDeltaR;
   object.PTD = PTD;
-  object.Ntimes = Ntimes; 
+  object.NTimeHits = NTimeHits;
   object.IsolationVar = IsolationVar;
   object.IsolationVarRhoCorr = IsolationVarRhoCorr;
@@ -292 +292 @@
   object.Tau[3] = Tau[3];
   object.Tau[4] = Tau[4];
-  
+
   object.TrimmedP4[0] = TrimmedP4[0];
   object.TrimmedP4[1] = TrimmedP4[1];
@@ -316 +316 @@
   object.fArray = 0;
 
-  // Copy cluster timing info
-  copy(Ecal_E_t.begin(),Ecal_E_t.end(),back_inserter(object.Ecal_E_t));
+  // copy cluster timing info
+  copy(ECalEnergyTimePairs.begin(), ECalEnergyTimePairs.end(), back_inserter(object.ECalEnergyTimePairs));
 
   if(fArray && fArray->GetEntriesFast() > 0)
@@ -374 +374 @@
   MeanSqDeltaR = 0.0;
   PTD = 0.0;
-  
-  Ntimes = 0;
-  Ecal_E_t.clear();
-  
+
+  NTimeHits = 0;
+  ECalEnergyTimePairs.clear();
+
   IsolationVar = -999;
   IsolationVarRhoCorr = -999;
@@ -384 +384 @@
   SumPtChargedPU = -999;
   SumPt = -999;
-  
+
   FracPt[0] = 0.0;
   FracPt[1] = 0.0;
@@ -395 +395 @@
   Tau[3] = 0.0;
   Tau[4] = 0.0;
-  
+
   for(i = 0; i < 5; ++i)
   {
     TrimmedP4[i].SetXYZT(0.0, 0.0, 0.0, 0.0);
-    PrunedP4[i].SetXYZT(0.0, 0.0, 0.0, 0.0); 
+    PrunedP4[i].SetXYZT(0.0, 0.0, 0.0, 0.0);
     SoftDroppedP4[i].SetXYZT(0.0, 0.0, 0.0, 0.0);
   }
@@ -406 +406 @@
   NSubJetsPruned = 0;
   NSubJetsSoftDropped = 0;
-  
+
   fArray = 0;
 }

classes/DelphesClasses.h

@@ -443 +443 @@
 
   Float_t T; // ecal deposit time, averaged by sqrt(EM energy) over all particles, not smeared
-  Int_t   Ntimes; // number of hits contributing to time measurement
+  Int_t NTimeHits; // number of hits contributing to time measurement
 
   Float_t Eem; // calorimeter tower electromagnetic energy
@@ -506 +506 @@
 
   Int_t IsConstituent;
-  
+
   Int_t IsFromConversion;
-  
+
   UInt_t Flavor;
   UInt_t FlavorAlgo;
@@ -528 +528 @@
   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    Ntimes;
-  std::vector<std::pair<Float_t,Float_t> > Ecal_E_t;
+  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