Revert accidental changes

cms-sw · Nov 12, 2020 · 8f74a2c · 8f74a2c
1 parent 49b5d2b
commit 8f74a2c
Show file tree

Hide file tree

Showing 16 changed files with 345 additions and 686 deletions.
diff --git a/Configuration/Applications/python/ConfigBuilder.py b/Configuration/Applications/python/ConfigBuilder.py
@@ -988,7 +988,7 @@ def define_Configs(self):
         self.PATDefaultSeq='miniAOD'
         self.PATGENDefaultSeq='miniGEN'
         #TODO: Check based of file input
-        self.NANOGENDefaultSeq='nanogenSequence' if any([x in self.stepMap for x in ['LHE', 'GEN', 'AOD']]) else 'nanogenMiniSequence' 
+        self.NANOGENDefaultSeq='nanogenSequence'
         self.NANODefaultSeq='nanoSequence'
 
         self.EVTCONTDefaultCFF="Configuration/EventContent/EventContent_cff"

diff --git a/GeneratorInterface/Core/BuildFile.xml b/GeneratorInterface/Core/BuildFile.xml
@@ -1,15 +1,15 @@
-<use   name="FWCore/Concurrency"/>
-<use   name="FWCore/ServiceRegistry"/>
-<use   name="FWCore/Utilities"/>
-<use   name="FWCore/Framework"/>
-<use   name="SimDataFormats/GeneratorProducts"/>
-<use   name="GeneratorInterface/LHEInterface"/>
-<use   name="heppdt"/>
-<use   name="boost"/>
-<use   name="clhep"/>
-<use   name="lhapdf"/>
-<use   name="f77compiler"/>
-<use   name="root"/>
+<use name="FWCore/Concurrency"/>
+<use name="FWCore/ServiceRegistry"/>
+<use name="FWCore/Utilities"/>
+<use name="FWCore/Framework"/>
+<use name="SimDataFormats/GeneratorProducts"/>
+<use name="GeneratorInterface/LHEInterface"/>
+<use name="heppdt"/>
+<use name="boost"/>
+<use name="clhep"/>
+<use name="lhapdf"/>
+<use name="f77compiler"/>
+<use name="root"/>
 <use name="tinyxml2"/>
 <export>
   <lib name="1"/>

diff --git a/GeneratorInterface/Core/files.txt b/GeneratorInterface/Core/files.txt
diff --git a/GeneratorInterface/Core/plugins/BuildFile.xml b/GeneratorInterface/Core/plugins/BuildFile.xml
@@ -1,17 +1,11 @@
-<use   name="FWCore/Framework"/>
-<use   name="FWCore/ParameterSet"/>
-<use   name="FWCore/MessageLogger"/>
-<use   name="FWCore/Utilities"/>
-<use   name="SimDataFormats/GeneratorProducts"/>
-<use   name="GeneratorInterface/Core"/>
-<library   name="GeneratorInterfaceCore_plugins" file="*.cc" >
-  <use name="DataFormats/HepMCCandidate"/>
-  <use name="DataFormats/Candidate"/>
-  <use name="DataFormats/METReco"/>
-  <use name="DataFormats/JetReco"/>
-  <use name="PhysicsTools/UtilAlgos"/>
-  <use name="FWCore/SharedMemory"/>
-  <use name="SimDataFormats/GeneratorProducts"/>
-  <use name="lhapdf"/>
-  <flags   EDM_PLUGIN="1"/>
+<use name="FWCore/Framework"/>
+<use name="FWCore/ParameterSet"/>
+<use name="FWCore/MessageLogger"/>
+<use name="FWCore/Utilities"/>
+<use name="SimDataFormats/GeneratorProducts"/>
+<use name="GeneratorInterface/Core"/>
+<use name="FWCore/SharedMemory"/>
+<use name="clhep"/>
+<library name="GeneratorInterfaceCore_plugins" file="*.cc">
+  <flags EDM_PLUGIN="1"/>
 </library>
diff --git a/GeneratorInterface/Core/plugins/ExternalGeneratorFilter.cc b/GeneratorInterface/Core/plugins/ExternalGeneratorFilter.cc
@@ -13,7 +13,6 @@
 #include "SimDataFormats/GeneratorProducts/interface/ExternalGeneratorEventInfo.h"
 #include "SimDataFormats/GeneratorProducts/interface/ExternalGeneratorLumiInfo.h"
 
-#include "FWCore/SharedMemory/interface/BufferInfo.h"
 #include "FWCore/SharedMemory/interface/ReadBuffer.h"
 #include "FWCore/SharedMemory/interface/WriteBuffer.h"
 #include "FWCore/SharedMemory/interface/ControllerChannel.h"

diff --git a/GeneratorInterface/LHEInterface/plugins/BuildFile.xml b/GeneratorInterface/LHEInterface/plugins/BuildFile.xml
@@ -3,18 +3,24 @@
 <use name="FWCore/ServiceRegistry"/>
 <use name="FWCore/Utilities"/>
 <use name="GeneratorInterface/LHEInterface"/>
-<use name="GeneratorInterface/Core"/>
-<use name="SimDataFormats/GeneratorProducts"/>
 <use name="stdcxx-fs"/>
 <library name="GeneratorInterfaceLHEProducer" file="LHEFilter.cc LHE2HepMCConverter.cc ExternalLHEProducer.cc ExternalLHEAsciiDumper.cc">
   <use name="FWCore/Framework"/>
   <use name="FWCore/Concurrency"/>
-  <use name="FWCore/SharedMemory"/>
-  <use name="boost"/>
+  <use name="SimDataFormats/GeneratorProducts"/>
+  <use name="GeneratorInterface/Core"/>
   <flags EDM_PLUGIN="1"/>
 </library>
 <library name="GeneratorInterfaceLHEIO" file="LH5Source.cc LHESource.cc LHEProvenanceHelper.cc LHEWriter.cc">
 	<use name="FWCore/Framework"/>
 	<use name="FWCore/Sources"/>
+        <use name="SimDataFormats/GeneratorProducts"/>
 	<flags EDM_PLUGIN="1"/>
 </library>
+
+<library name="GeneratorInterfaceLHECOMWeightProducer" file="LHECOMWeightProducer.cc">
+  <use name="FWCore/Framework"/>
+  <use name="SimDataFormats/GeneratorProducts"/>
+  <use name="lhapdf"/>
+  <flags EDM_PLUGIN="1"/>
+</library>