Changeset fbad4c7 in git for classes

Timestamp:

May 24, 2018, 9:12:31 PM (6 years ago)

Author:

Michele Selvaggi <michele.selvaggi@…>

Branches:

ImprovedOutputFile, Timing, dual_readout, llp, master

Children:

4689481

Parents:

4fd4f01 (diff), 792092a (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' into photonId

Conflicts:

cards/CMS_PhaseII/CMS_PhaseII_200PU_v03.tcl

Location:

classes

Files:

• DelphesClasses.cc (modified) (3 diffs)
• DelphesClasses.h (modified) (2 diffs)
• DelphesHepMCReader.cc (modified) (1 diff)
• DelphesHepMCReader.h (modified) (1 diff)

classes/DelphesClasses.cc

@@ -125 +125 @@
   Flavor(0), FlavorAlgo(0), FlavorPhys(0),
   BTag(0), BTagAlgo(0), BTagPhys(0),
-  TauTag(0), Eem(0.0), Ehad(0.0),
+  TauTag(0), TauWeight(0.0), Eem(0.0), Ehad(0.0),
   DeltaEta(0.0), DeltaPhi(0.0),
   Momentum(0.0, 0.0, 0.0, 0.0),
@@ -280 +280 @@
   object.BTagPhys = BTagPhys;
   object.TauTag = TauTag;
+  object.TauWeight = TauWeight;
   object.Eem = Eem;
   object.Ehad = Ehad;
@@ -404 +405 @@
   BTagPhys = 0;
   TauTag = 0;
+  TauWeight = 0.0;
   Eem = 0.0;
   Ehad = 0.0;

classes/DelphesClasses.h

@@ -375 +375 @@
 
   UInt_t TauTag; // 0 or 1 for a jet that has been tagged as a tau
+  Float_t TauWeight; // probability for jet to be identified as tau
 
   Int_t Charge; // tau charge
@@ -563 +564 @@
 
   UInt_t TauTag;
+  Float_t TauWeight;
 
   Float_t Eem;

classes/DelphesHepMCReader.cc

@@ -333 +333 @@
 //---------------------------------------------------------------------------
 
+void DelphesHepMCReader::AnalyzeWeight(ExRootTreeBranch *branch)
+{
+  Weight *element;
+  vector< double >::const_iterator itWeight;
+
+  for(itWeight = fWeight.begin(); itWeight != fWeight.end(); ++itWeight)
+  {
+    element = static_cast<Weight *>(branch->NewEntry());
+
+    element->Weight = *itWeight;
+  }
+}
+
+//---------------------------------------------------------------------------
+
 void DelphesHepMCReader::AnalyzeParticle(DelphesFactory *factory,
   TObjArray *allParticleOutputArray,

classes/DelphesHepMCReader.h

@@ -59 +59 @@
     TStopwatch *readStopWatch, TStopwatch *procStopWatch);
 
+  void AnalyzeWeight(ExRootTreeBranch *branch);
+
 private: