Changeset 1180bc1 in git for modules/JetFlavorAssociation.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/JetFlavorAssociation.cc (modified) (8 diffs)

modules/JetFlavorAssociation.cc

@@ -151 +151 @@
   fPartonInputArray = ImportArray(GetString("PartonInputArray", "Delphes/partons"));
   fItPartonInputArray = fPartonInputArray->MakeIterator();
+  fPartonFilter = new ExRootFilter(fPartonInputArray);
 
   fParticleInputArray = ImportArray(GetString("ParticleInputArray", "Delphes/allParticles"));
   fItParticleInputArray = fParticleInputArray->MakeIterator();
 
-  fParticleLHEFInputArray = ImportArray(GetString("ParticleLHEFInputArray", "Delphes/allParticlesLHEF"));
-  fItParticleLHEFInputArray = fParticleLHEFInputArray->MakeIterator();
-
-  fPartonFilter = new ExRootFilter(fPartonInputArray);
-  fParticleLHEFFilter = new ExRootFilter(fParticleLHEFInputArray);
+  try
+  {
+    fParticleLHEFInputArray = ImportArray(GetString("ParticleLHEFInputArray", "Delphes/allParticlesLHEF"));
+  }
+  catch(runtime_error &e)
+  {
+    fParticleLHEFInputArray = 0;
+  }
+
+  if(fParticleLHEFInputArray)
+  {
+    fItParticleLHEFInputArray = fParticleLHEFInputArray->MakeIterator();
+    fParticleLHEFFilter = new ExRootFilter(fParticleLHEFInputArray);
+  }
 
   fJetInputArray = ImportArray(GetString("JetInputArray", "FastJetFinder/jets"));
@@ -183 +193 @@
 
   Candidate *jet;
-  TObjArray *partonArray;
-  TObjArray *partonLHEFArray;
-
-  // select quark && gluons
+  TObjArray *partonArray = 0;
+  TObjArray *partonLHEFArray = 0;
+
+  // select quark and gluons
   fPartonFilter->Reset();
   partonArray = fPartonFilter->GetSubArray(fPartonClassifier, 0); // get the filtered parton array
-
   if(partonArray == 0) return;
-  TIter itPartonArray(partonArray);
-
-  fParticleLHEFFilter->Reset();
-  partonLHEFArray = fParticleLHEFFilter->GetSubArray(fParticleLHEFClassifier, 0); // get the filtered parton array
-
-  if(partonLHEFArray == 0) return;
-  TIter itPartonLHEFArray(partonLHEFArray);
-
+
+  if(fParticleLHEFInputArray) 
+  {
+    fParticleLHEFFilter->Reset();
+    partonLHEFArray = fParticleLHEFFilter->GetSubArray(fParticleLHEFClassifier, 0); // get the filtered parton array
+  }
   // loop over all input jets
   fItJetInputArray->Reset();
@@ -204 +211 @@
   {
     // get standard flavor
-    GetAlgoFlavor(jet, itPartonArray, itPartonLHEFArray);
-    GetPhysicsFlavor(jet, itPartonArray, itPartonLHEFArray);
+    GetAlgoFlavor(jet, partonArray, partonLHEFArray);
+    if(fParticleLHEFInputArray) GetPhysicsFlavor(jet, partonArray, partonLHEFArray);
   }
 }
@@ -213 +220 @@
 // https://cmssdt.cern.ch/SDT/lxr/source/PhysicsTools/JetMCAlgos/plugins/JetPartonMatcher.cc?v=CMSSW_7_3_0_pre1
 
-void JetFlavorAssociation::GetAlgoFlavor(Candidate *jet, TIter &itPartonArray, TIter &itPartonLHEFArray)
+void JetFlavorAssociation::GetAlgoFlavor(Candidate *jet, TObjArray *partonArray, TObjArray *partonLHEFArray)
 {
   float maxPt = 0;
-  bool isGoodParton = true;
   int daughterCounter = 0;
   Candidate *parton, *partonLHEF;
   Candidate *tempParton = 0, *tempPartonHighestPt = 0;
   int pdgCode, pdgCodeMax = -1;
+  
+  TIter itPartonArray(partonArray);
+  TIter itPartonLHEFArray(partonLHEFArray);
 
   itPartonArray.Reset();
@@ -232 +241 @@
       if(pdgCodeMax < pdgCode) pdgCodeMax = pdgCode;
     }
-
-    isGoodParton = true;
+ 
+    if(!fParticleLHEFInputArray) continue;
+ 
     itPartonLHEFArray.Reset();
     while((partonLHEF = static_cast<Candidate *>(itPartonLHEFArray.Next())))
@@ -240 +250 @@
          parton->PID == partonLHEF->PID &&
          partonLHEF->Charge == parton->Charge)
-      {
-         isGoodParton = false;
+      {      
          break;
       }
-
-      if(!isGoodParton) continue;
 
       // check the daugheter
@@ -285 +292 @@
 //------------------------------------------------------------------------------
 
-void JetFlavorAssociation::GetPhysicsFlavor(Candidate *jet, TIter &itPartonArray, TIter &itPartonLHEFArray)
+void JetFlavorAssociation::GetPhysicsFlavor(Candidate *jet, TObjArray *partonArray, TObjArray *partonLHEFArray)
 {
   int partonCounter = 0;
@@ -298 +305 @@
   vector<Candidate *>::iterator itContaminations;
 
+  TIter itPartonArray(partonArray);
+  TIter itPartonLHEFArray(partonLHEFArray);
+
   contaminations.clear();