Changeset 1180bc1 in git for modules/BTagging.cc

Timestamp:

Jun 30, 2015, 2:38:29 PM (9 years ago)

Author:

Michele Selvaggi <michele.selvaggi@…>

Branches:

ImprovedOutputFile, Timing, dual_readout, llp, master

Children:

c627b07

Parents:

6153fb0

Message:

fixed BTagging without LHEF

File:

• modules/BTagging.cc (modified) (7 diffs)

modules/BTagging.cc

@@ -34 +34 @@
 #include "classes/DelphesFormula.h"
 
-#include "ExRootAnalysis/ExRootResult.h"
-#include "ExRootAnalysis/ExRootFilter.h"
-#include "ExRootAnalysis/ExRootClassifier.h"
-
 #include "TMath.h"
 #include "TString.h"
@@ -55 +51 @@
 //------------------------------------------------------------------------------
 
-class BTaggingPartonClassifier : public ExRootClassifier
+BTagging::BTagging() :
+  fItJetInputArray(0)
 {
-public:
-
-  BTaggingPartonClassifier() {}
-
-  Int_t GetCategory(TObject *object);
-
-  Double_t fEtaMax, fPTMin;
-};
-
-//------------------------------------------------------------------------------
-
-Int_t BTaggingPartonClassifier::GetCategory(TObject *object)
-{
-  Candidate *parton = static_cast<Candidate*>(object);
-  const TLorentzVector &momentum = parton->Momentum;
-  Int_t pdgCode;
-
-  if(momentum.Pt() <= fPTMin || TMath::Abs(momentum.Eta()) > fEtaMax) return -1;
-
-  pdgCode = TMath::Abs(parton->PID);
-  if(pdgCode != 21 && pdgCode > 5) return -1;
-
-  return 0;
-}
-
-//------------------------------------------------------------------------------
-
-BTagging::BTagging() :
-  fClassifier(0), fFilter(0),
-  fItPartonInputArray(0), fItJetInputArray(0)
-{
-  fClassifier = new BTaggingPartonClassifier;
 }
 
@@ -95 +60 @@
 BTagging::~BTagging()
 {
-  if(fClassifier) delete fClassifier;
 }
 
@@ -108 +72 @@
 
   fBitNumber = GetInt("BitNumber", 0);
-
-  fDeltaR = GetDouble("DeltaR", 0.5);
-
-  fClassifier->fPTMin = GetDouble("PartonPTMin", 1.0);
-  fClassifier->fEtaMax = GetDouble("PartonEtaMax", 2.5);
 
   // read efficiency formulas
@@ -139 +98 @@
   // import input array(s)
 
-  fPartonInputArray = ImportArray(GetString("PartonInputArray", "Delphes/partons"));
-  fItPartonInputArray = fPartonInputArray->MakeIterator();
-
-  fFilter = new ExRootFilter(fPartonInputArray);
-
   fJetInputArray = ImportArray(GetString("JetInputArray", "FastJetFinder/jets"));
   fItJetInputArray = fJetInputArray->MakeIterator();
@@ -155 +109 @@
   DelphesFormula *formula;
 
-  if(fFilter) delete fFilter;
   if(fItJetInputArray) delete fItJetInputArray;
-  if(fItPartonInputArray) delete fItPartonInputArray;
 
   for(itEfficiencyMap = fEfficiencyMap.begin(); itEfficiencyMap != fEfficiencyMap.end(); ++itEfficiencyMap)
@@ -172 +124 @@
   Candidate *jet;
   Double_t pt, eta, phi, e;
-  TObjArray *partonArray;
   map< Int_t, DelphesFormula * >::iterator itEfficiencyMap;
   DelphesFormula *formula;
-
-  // select quark and gluons
-  fFilter->Reset();
-  partonArray = fFilter->GetSubArray(fClassifier, 0);
-
-  if(partonArray == 0) return;
-
-  TIter itPartonArray(partonArray);
 
   // loop over all input jets