Changeset 9be57d9 in git

Timestamp:

Feb 27, 2015, 1:41:42 PM (10 years ago)

Author:

Michele Selvaggi <michele.selvaggi@…>

Branches:

ImprovedOutputFile, Timing, dual_readout, llp, master

Children:

fa33983

Parents:

d5cae2b (diff), 532016b (diff), 76ab6be (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', remote branch 'origin' into mergeCMS

Files:

• Makefile (modified) (1 diff)
• doc/genMakefile.tcl (modified) (1 diff)
• modules/ModulesLinkDef.h (modified) (2 diffs)
• modules/TaggingParticlesSkimmer.cc (added)
• modules/TaggingParticlesSkimmer.h (added)
• modules/TauTagging.cc (modified) (4 diffs)
• modules/TauTagging.h (modified) (2 diffs)

Makefile

@@ -29 +29 @@
 OPT_LIBS += -L$(subst include,lib,$(subst :, -L,$(LD_LIBRARY_PATH)))
 endif
-OPT_LIBS += -lGenVector -lFWCoreFWLite -lDataFormatsFWLite -lDataFormatsPatCandidates -lDataFormatsLuminosity -lSimDataFormatsGeneratorProducts -lCommonToolsUtils
+OPT_LIBS += -lGenVector -lFWCoreFWLite -lDataFormatsFWLite -lDataFormatsPatCandidates -lDataFormatsLuminosity -lSimDataFormatsGeneratorProducts -lCommonToolsUtils -lDataFormatsCommon
 endif
 

doc/genMakefile.tcl

@@ -219 +219 @@
 OPT_LIBS += -L$(subst include,lib,$(subst :, -L,$(LD_LIBRARY_PATH)))
 endif
-OPT_LIBS += -lGenVector -lFWCoreFWLite -lDataFormatsFWLite -lDataFormatsPatCandidates -lDataFormatsLuminosity -lSimDataFormatsGeneratorProducts -lCommonToolsUtils
+OPT_LIBS += -lGenVector -lFWCoreFWLite -lDataFormatsFWLite -lDataFormatsPatCandidates -lDataFormatsLuminosity -lSimDataFormatsGeneratorProducts -lCommonToolsUtils -lDataFormatsCommon
 endif
 

modules/ModulesLinkDef.h

@@ -50 +50 @@
 #include "modules/JetPileUpSubtractor.h"
 #include "modules/TrackPileUpSubtractor.h"
+#include "modules/TaggingParticlesSkimmer.h"
 #include "modules/PileUpJetID.h"
 #include "modules/ConstituentFilter.h"
@@ -89 +90 @@
 #pragma link C++ class JetPileUpSubtractor+;
 #pragma link C++ class TrackPileUpSubtractor+;
+#pragma link C++ class TaggingParticlesSkimmer+;
 #pragma link C++ class PileUpJetID+;
 #pragma link C++ class ConstituentFilter+;

modules/TauTagging.cc

@@ -33 +33 @@
 #include "classes/DelphesFactory.h"
 #include "classes/DelphesFormula.h"
-
-#include "ExRootAnalysis/ExRootResult.h"
-#include "ExRootAnalysis/ExRootFilter.h"
-#include "ExRootAnalysis/ExRootClassifier.h"
 
 #include "TMath.h"
@@ -53 +49 @@
 using namespace std;
 
-//------------------------------------------------------------------------------
-
-class TauTaggingPartonClassifier : public ExRootClassifier
-{
-public:
-
-  TauTaggingPartonClassifier(const TObjArray *array);
-
-  Int_t GetCategory(TObject *object);
-
-  Double_t fEtaMax, fPTMin;
-
-  const TObjArray *fParticleInputArray;
-};
 
 //------------------------------------------------------------------------------
@@ -79 +61 @@
 {
   Candidate *tau = static_cast<Candidate *>(object);
-  Candidate *daughter = 0;
+  Candidate *daughter1 = 0;
+  Candidate *daughter2 = 0;
+  
   const TLorentzVector &momentum = tau->Momentum;
-  Int_t pdgCode, i;
+  Int_t pdgCode, i, j;
 
   pdgCode = TMath::Abs(tau->PID);
@@ -98 +82 @@
   for(i = tau->D1; i <= tau->D2; ++i)
   {
-    daughter = static_cast<Candidate *>(fParticleInputArray->At(i));
-    pdgCode = TMath::Abs(daughter->PID);
-    if(pdgCode == 11 || pdgCode == 13 || pdgCode == 15 || pdgCode == 24) return -1;
+    daughter1 = static_cast<Candidate *>(fParticleInputArray->At(i));
+    pdgCode = TMath::Abs(daughter1->PID);
+    if(pdgCode == 11 || pdgCode == 13 || pdgCode == 15) return -1;
+    else if(pdgCode == 24)
+    {
+     if(daughter1->D1 < 0) return -1;
+     for(j = daughter1->D1; j <= daughter1->D2; ++j)
+     {
+       daughter2 = static_cast<Candidate*>(fParticleInputArray->At(j));
+       pdgCode = TMath::Abs(daughter2->PID);
+       if(pdgCode == 11 || pdgCode == 13) return -1;
+     }
+        
+    }
   }
 

modules/TauTagging.h

@@ -31 +31 @@
 
 #include "classes/DelphesModule.h"
+#include "ExRootAnalysis/ExRootResult.h"
+#include "ExRootAnalysis/ExRootFilter.h"
+#include "ExRootAnalysis/ExRootClassifier.h"
 
 #include <map>
@@ -76 +79 @@
 };
 
+
+//------------------------------------------------------------------------------
+
+class TauTaggingPartonClassifier : public ExRootClassifier
+{
+public:
+
+  TauTaggingPartonClassifier(const TObjArray *array);
+
+  Int_t GetCategory(TObject *object);
+
+  Double_t fEtaMax, fPTMin;
+
+  const TObjArray *fParticleInputArray;
+};
+
+
 #endif