Changeset 264bf40 in git

Timestamp:

Apr 26, 2013, 12:39:14 PM (12 years ago)

Author:

pavel <pavel@…>

Branches:

ImprovedOutputFile, Timing, dual_readout, llp, master

Children:

f8d08bb

Parents:

a817a22

Message:

define BTag and TauTag as UInt_t and use them as a set of bits

Files:

• classes/DelphesClasses.h (modified) (2 diffs)
• examples/delphes_card_ATLAS.tcl (modified) (1 diff)
• examples/delphes_card_CMS.tcl (modified) (1 diff)
• examples/delphes_card_CMS_NoVFC.tcl (modified) (1 diff)
• examples/delphes_card_CMS_PileUp.tcl (modified) (1 diff)
• modules/BTagging.cc (modified) (2 diffs)
• modules/BTagging.h (modified) (1 diff)
• modules/Merger.cc (modified) (1 diff)
• modules/ModulesLinkDef.h (modified) (2 diffs)

classes/DelphesClasses.h

@@ -246 +246 @@
   Float_t DeltaPhi;  // jet radius in azimuthal angle
 
-  Int_t BTag; // 0 or 1 for a jet that has been tagged as containing a heavy quark
-  Int_t TauTag; // 0 or 1 for a jet that has been tagged as a tau
+  UInt_t BTag; // 0 or 1 for a jet that has been tagged as containing a heavy quark
+  UInt_t TauTag; // 0 or 1 for a jet that has been tagged as a tau
 
   Int_t Charge; // tau charge
@@ -346 +346 @@
   Int_t IsConstituent;
   
-  Int_t BTag;
-  Int_t TauTag;
+  UInt_t BTag;
+  UInt_t TauTag;
 
   Float_t Eem;

examples/delphes_card_ATLAS.tcl

@@ -482 +482 @@
   set JetInputArray FastJetFinder/jets
 
+  set BitNumber 0
+
   set DeltaR 0.5
 

examples/delphes_card_CMS.tcl

@@ -485 +485 @@
   set JetInputArray FastJetFinder/jets
 
+  set BitNumber 0
+
   set DeltaR 0.5
 

examples/delphes_card_CMS_NoVFC.tcl

@@ -473 +473 @@
   set JetInputArray FastJetFinder/jets
 
+  set BitNumber 0
+
   set DeltaR 0.5
 

examples/delphes_card_CMS_PileUp.tcl

@@ -547 +547 @@
   set JetInputArray FastJetFinder/jets
 
+  set BitNumber 0
+
   set DeltaR 0.5
 

modules/BTagging.cc

@@ -92 +92 @@
   DelphesFormula *formula;
   Int_t i, size;
+
+  fBitNumber = GetInt("BitNumber", 0);
 
   fDeltaR = GetDouble("DeltaR", 0.5);
@@ -202 +204 @@
 
     // apply an efficency formula
-    jet->BTag = gRandom->Uniform() <= formula->Eval(pt, eta);
-  }
-}
-
-//------------------------------------------------------------------------------
+    jet->BTag |= (gRandom->Uniform() <= formula->Eval(pt, eta)) << fBitNumber;
+  }
+}
+
+//------------------------------------------------------------------------------

modules/BTagging.h

@@ -39 +39 @@
 private:
 
+  Int_t fBitNumber;
+
   Double_t fDeltaR;
 

modules/Merger.cc

@@ -140 +140 @@
   candidate->Momentum.SetPtEtaPhiE(sumPT, 0.0, 0.0, sumE);
   
-  fEnergyOutputArray->Add(candidate);}
+  fEnergyOutputArray->Add(candidate);
+}
 
 //------------------------------------------------------------------------------

modules/ModulesLinkDef.h

@@ -32 +32 @@
 #include "modules/ConstituentFilter.h"
 #include "modules/StatusPidFilter.h"
+#include "modules/Cloner.h"
 #include "modules/ExampleModule.h"
 
@@ -60 +61 @@
 #pragma link C++ class ConstituentFilter+;
 #pragma link C++ class StatusPidFilter+;
+#pragma link C++ class Cloner+;
 #pragma link C++ class ExampleModule+;