Resolve conflict with cms-sw#31072

cms-tau-pog · Aug 11, 2020 · 105c13e · 105c13e
2 parents 1f08b68 + bd0bca6
commit 105c13e
Show file tree

Hide file tree

Showing 140 changed files with 9,058 additions and 2,070 deletions.
diff --git a/CommonTools/PileupAlgos/python/Puppi_cff.py b/CommonTools/PileupAlgos/python/Puppi_cff.py
@@ -116,8 +116,8 @@
     )
 )
 
-from Configuration.Eras.Modifier_run2_miniAOD_devel_cff import run2_miniAOD_devel
-run2_miniAOD_devel.toModify(
+from Configuration.ProcessModifiers.run2_miniAOD_UL_cff import run2_miniAOD_UL
+run2_miniAOD_UL.toModify(
     puppi,
     EtaMinUseDeltaZ = 2.4,
     PtMaxCharged = 20.,

diff --git a/Configuration/Applications/python/ConfigBuilder.py b/Configuration/Applications/python/ConfigBuilder.py
@@ -2289,6 +2289,14 @@ def prepare(self, doChecking = False):
         from Configuration.StandardSequences.earlyDeleteSettings_cff import customiseEarlyDelete
         self.process = customiseEarlyDelete(self.process)
 
+        imports = cms.specialImportRegistry.getSpecialImports()
+        if len(imports) > 0:
+            #need to inject this at the top
+            index = self.pythonCfgCode.find("import FWCore.ParameterSet.Config")
+            #now find the end of line
+            index = self.pythonCfgCode.find("\n",index)
+            self.pythonCfgCode = self.pythonCfgCode[:index]+ "\n" + "\n".join(imports)+"\n" +self.pythonCfgCode[index:]
+
 
         # make the .io file
 

diff --git a/DataFormats/BTauReco/interface/ChargedCandidateFeatures.h b/DataFormats/BTauReco/interface/ChargedCandidateFeatures.h
@@ -8,6 +8,9 @@ class ChargedCandidateFeatures {
   public:
 
     float ptrel;
+    float ptrel_noclip;
+    float erel;
+    float etarel;
     float puppiw;
     float vtx_ass;
 
@@ -25,6 +28,14 @@ class ChargedCandidateFeatures {
 
     float btagPf_trackJetDistVal;
 
+    float drsubjet1;
+    float drsubjet2;
+    float dxy;
+    float dxysig;
+    float dz;
+    float dzsig;
+    float deltaR;
+
     float chi2;
     float quality;
 

diff --git a/DataFormats/BTauReco/interface/DeepDoubleXFeatures.h b/DataFormats/BTauReco/interface/DeepDoubleXFeatures.h
@@ -7,6 +7,7 @@
 #include "DataFormats/BTauReco/interface/SecondaryVertexFeatures.h"
 #include "DataFormats/BTauReco/interface/BoostedDoubleSVTagInfoFeatures.h"
 #include "DataFormats/BTauReco/interface/ChargedCandidateFeatures.h"
+#include "DataFormats/BTauReco/interface/NeutralCandidateFeatures.h"
 
 namespace btagbtvdeep {
 
@@ -25,11 +26,13 @@ class DeepDoubleXFeatures {
     JetFeatures jet_features;
     BoostedDoubleSVTagInfoFeatures tag_info_features;
 
-    std::vector<SecondaryVertexFeatures> sv_features;
-
     std::vector<ChargedCandidateFeatures> c_pf_features;
 
-    std::size_t npv; // used by deep flavour     
+    std::vector<NeutralCandidateFeatures> n_pf_features;
+
+    std::vector<SecondaryVertexFeatures> sv_features;
+
+    std::size_t npv;  // used by deep flavour
 
   private:
     bool is_empty_ = true;

diff --git a/DataFormats/BTauReco/interface/NeutralCandidateFeatures.h b/DataFormats/BTauReco/interface/NeutralCandidateFeatures.h
@@ -8,9 +8,15 @@ class NeutralCandidateFeatures {
   public:
 
     float ptrel;
+    float ptrel_noclip;
+    float erel;
+
+    float drsubjet1;
+    float drsubjet2;
 
     float puppiw;
     float deltaR;
+    float deltaR_noclip;
     float isGamma;
 
     float hadFrac;

diff --git a/DataFormats/BTauReco/interface/SecondaryVertexFeatures.h b/DataFormats/BTauReco/interface/SecondaryVertexFeatures.h
@@ -8,6 +8,7 @@ class SecondaryVertexFeatures {
   public:
 
     float pt;
+    float ptrel;
     float mass;
 
     float deltaR;

diff --git a/DataFormats/BTauReco/src/classes_def.xml b/DataFormats/BTauReco/src/classes_def.xml
@@ -408,23 +408,27 @@
   <class name="btagbtvdeep::JetFeatures" ClassVersion="3">
     <version ClassVersion="3" checksum="386672900"/>
   </class>
-  <class name="btagbtvdeep::SecondaryVertexFeatures" ClassVersion="3">
+  <class name="btagbtvdeep::SecondaryVertexFeatures" ClassVersion="4">
+   <version ClassVersion="4" checksum="3987593676"/>
     <version ClassVersion="3" checksum="3610780843"/>
   </class>
   <class name="btagbtvdeep::ShallowTagInfoFeatures" ClassVersion="3">
     <version ClassVersion="3" checksum="273372007"/>
   </class>
-  <class name="btagbtvdeep::NeutralCandidateFeatures" ClassVersion="3">
+  <class name="btagbtvdeep::NeutralCandidateFeatures" ClassVersion="4">
+   <version ClassVersion="4" checksum="3657612864"/>
     <version ClassVersion="3" checksum="938442516"/>
   </class>
-  <class name="btagbtvdeep::ChargedCandidateFeatures" ClassVersion="4">
+  <class name="btagbtvdeep::ChargedCandidateFeatures" ClassVersion="5">
+   <version ClassVersion="5" checksum="3385708923"/>
     <version ClassVersion="4" checksum="2173116472"/>
     <version ClassVersion="3" checksum="1302021141"/>
   </class>
   <class name="btagbtvdeep::DeepFlavourFeatures" ClassVersion="3">
     <version ClassVersion="3" checksum="2487956635"/>
   </class>
-    <class name="btagbtvdeep::DeepDoubleXFeatures" ClassVersion="3">
+    <class name="btagbtvdeep::DeepDoubleXFeatures" ClassVersion="4">
+     <version ClassVersion="4" checksum="3057931654"/>
     <version ClassVersion="3" checksum="1764960743"/>
   </class>
   <class name="btagbtvdeep::BoostedDoubleSVTagInfoFeatures" ClassVersion="3">

diff --git a/DataFormats/Common/interface/RandomNumberGeneratorState.h b/DataFormats/Common/interface/RandomNumberGeneratorState.h
@@ -0,0 +1,26 @@
+#ifndef DataFormats_Common_RandomNumberGeneratorState_h
+#define DataFormats_Common_RandomNumberGeneratorState_h
+
+/*----------------------------------------------------------------------
+  
+RandomNumberGeneratorState is used to communicate with an external process
+----------------------------------------------------------------------*/
+
+#include <vector>
+namespace edm {
+  struct RandomNumberGeneratorState {
+    RandomNumberGeneratorState() = default;
+    RandomNumberGeneratorState(std::vector<unsigned long> iState, long iSeed)
+        : state_(std::move(iState)), seed_{iSeed} {}
+
+    RandomNumberGeneratorState(RandomNumberGeneratorState const&) = default;
+    RandomNumberGeneratorState(RandomNumberGeneratorState&&) = default;
+
+    RandomNumberGeneratorState& operator=(RandomNumberGeneratorState const&) = default;
+    RandomNumberGeneratorState& operator=(RandomNumberGeneratorState&&) = default;
+
+    std::vector<unsigned long> state_;
+    long seed_;
+  };
+}  // namespace edm
+#endif
diff --git a/DataFormats/Common/src/classes.h b/DataFormats/Common/src/classes.h
@@ -31,6 +31,7 @@
 #include "DataFormats/Common/interface/SecondaryEventIDAndFileInfo.h"
 #include "DataFormats/Provenance/interface/EventAuxiliary.h"
 #include "FWCore/MessageLogger/interface/ErrorSummaryEntry.h"
+#include "DataFormats/Common/interface/RandomNumberGeneratorState.h"
 
 #include <vector>
 
diff --git a/DataFormats/Common/src/classes_def.xml b/DataFormats/Common/src/classes_def.xml
@@ -185,5 +185,8 @@
 
  <class name="edm::RefProd<std::vector<int> >"/>
  <class name="edm::RefToBaseProd<int>"/>
+ <class name="edm::RandomNumberGeneratorState" ClassVersion="3">
+  <version ClassVersion="3" checksum="2237762164"/>
+ </class>
 
 </lcgdict>