susynt-write/patchSTBadJetORPhotonDecPRWDataSF.patch at master · susynt/susynt-write · GitHub

1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
Index: SUSYTools/Root/Jets.cxx
===================================================================
--- SUSYTools/Root/Jets.cxx	(revision 792274)
+++ SUSYTools/Root/Jets.cxx	(working copy)
@@ -371,7 +371,7 @@

   bool SUSYObjDef_xAOD::IsBadJet(const xAOD::Jet& input) const {

-    if ( !dec_passOR(input) ) return false;
+    //if ( !dec_passOR(input) ) return false;

     float ptcut = 20e3;
     bool  isPileup = !dec_passJvt(input);
Index: SUSYTools/Root/SUSYObjDef_xAOD.cxx
===================================================================
--- SUSYTools/Root/SUSYObjDef_xAOD.cxx	(revision 792274)
+++ SUSYTools/Root/SUSYObjDef_xAOD.cxx	(working copy)
@@ -306,7 +306,10 @@
     acc_truthType("truthType"),
     acc_truthOrigin("truthOrigin"),
     acc_bkgTruthOrigin("bkgTruthOrigin"),
-    randomrunnumber("RandomRunNumber")
+    randomrunnumber("RandomRunNumber"),
+    dec_photonPassCleaning("passCleaning"),
+    dec_photonPassAmbiguity("passAmbiguity")
+
 {
   //General settings
   declareProperty( "DataSource", m_dataSource = Undefined );
@@ -2056,11 +2059,11 @@
   return m_prwTool->getDataWeight( *evtInfo, trig );
 }

-float SUSYObjDef_xAOD::GetCorrectedAverageInteractionsPerCrossing() {
+float SUSYObjDef_xAOD::GetCorrectedAverageInteractionsPerCrossing(bool includeDataSF) {

   const xAOD::EventInfo* evtInfo = 0;
   ATH_CHECK( evtStore()->retrieve( evtInfo, "EventInfo" ) );
-  return m_prwTool->getCorrectedMu( *evtInfo );
+  return m_prwTool->getCorrectedMu( *evtInfo, includeDataSF );
 }

 double SUSYObjDef_xAOD::GetSumOfWeights(int channel) {
Index: SUSYTools/Root/Photons.cxx
===================================================================
--- SUSYTools/Root/Photons.cxx	(revision 792274)
+++ SUSYTools/Root/Photons.cxx	(working copy)
@@ -101,6 +101,10 @@
   dec_baseline(input) = false;
   dec_isol(input) = false;

+  dec_photonPassCleaning(input) = false;
+  dec_photonPassAmbiguity(input) = false;
+  if(m_egammaAmbiguityTool->accept( input )) dec_photonPassAmbiguity(input) = true;
+
   // Author cuts needed according to https://twiki.cern.ch/twiki/bin/view/AtlasProtected/EGammaIdentificationRun2#Photon_authors
   if ( !(input.author() & (xAOD::EgammaParameters::AuthorPhoton + xAOD::EgammaParameters::AuthorAmbiguous)) )
     return StatusCode::SUCCESS;
@@ -134,6 +138,8 @@
       return StatusCode::SUCCESS;
     }

+  dec_photonPassCleaning(input) = true;
+
   if (!isAtlfast() && !isData()) {
     if ( m_electronPhotonShowerShapeFudgeTool->applyCorrection(input) != CP::CorrectionCode::Ok)
       ATH_MSG_ERROR("FillPhoton - fudge tool: applyCorrection failed");
Index: SUSYTools/SUSYTools/ISUSYObjDef_xAODTool.h
===================================================================
--- SUSYTools/SUSYTools/ISUSYObjDef_xAODTool.h	(revision 792274)
+++ SUSYTools/SUSYTools/ISUSYObjDef_xAODTool.h	(working copy)
@@ -303,7 +303,7 @@

     virtual float GetDataWeight(const std::string&) = 0;

-    virtual float GetCorrectedAverageInteractionsPerCrossing() = 0;
+    virtual float GetCorrectedAverageInteractionsPerCrossing(bool includeDataSF) = 0;

     virtual double GetSumOfWeights(int channel) = 0;

Index: SUSYTools/SUSYTools/SUSYObjDef_xAOD.h
===================================================================
--- SUSYTools/SUSYTools/SUSYObjDef_xAOD.h	(revision 792274)
+++ SUSYTools/SUSYTools/SUSYObjDef_xAOD.h	(working copy)
@@ -290,7 +290,7 @@

     float GetDataWeight(const std::string&) override final;

-    float GetCorrectedAverageInteractionsPerCrossing() override final;
+    float GetCorrectedAverageInteractionsPerCrossing(bool includeDataSF=false) override final;

     double GetSumOfWeights(int channel) override final;

@@ -689,6 +689,8 @@
     SG::AuxElement::Accessor<int> acc_truthOrigin;
     SG::AuxElement::Accessor<int> acc_bkgTruthOrigin;
     SG::AuxElement::Accessor<unsigned int> randomrunnumber;
+    SG::AuxElement::Decorator<char> dec_photonPassCleaning;
+    SG::AuxElement::Decorator<char> dec_photonPassAmbiguity;

   }; // Class SUSYObjDef_xAOD