Backport of generator parameter scan functionality to 71x

GeneratorInterface/Configuration/python/GeneratorInterface_EventContent_cff.py

@@ -15,6 +15,7 @@
         'keep LHERunInfoProduct_*_*_*',
         'keep LHEEventProduct_*_*_*',
         'keep GenRunInfoProduct_generator_*_*',
+        'keep GenLumiInfoHeader_generator_*_*',
         'keep GenLumiInfoProduct_generator_*_*',
         'keep GenEventInfoProduct_generator_*_*',
         'keep edmHepMCProduct_generator_*_*',
@@ -29,6 +30,7 @@
         'keep LHERunInfoProduct_*_*_*',
         'keep LHEEventProduct_*_*_*',
         'keep GenRunInfoProduct_generator_*_*',
+        'keep GenLumiInfoHeader_generator_*_*',
         'keep GenLumiInfoProduct_generator_*_*',
         'keep GenEventInfoProduct_generator_*_*',
         'keep edmHepMCProduct_generator_*_*',
@@ -43,6 +45,7 @@
         'keep LHERunInfoProduct_*_*_*',
         'keep LHEEventProduct_*_*_*',
         'keep GenRunInfoProduct_generator_*_*',
+        'keep GenLumiInfoHeader_generator_*_*',
         'keep GenLumiInfoProduct_generator_*_*',
         'keep GenEventInfoProduct_generator_*_*',
         'keep GenFilterInfo_*_*_*',

GeneratorInterface/Core/BuildFile.xml

@@ -1,6 +1,7 @@
 <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"/>

GeneratorInterface/Core/interface/BaseHadronizer.h

@@ -20,13 +20,18 @@
 
 #include "SimDataFormats/GeneratorProducts/interface/GenRunInfoProduct.h"
 #include "SimDataFormats/GeneratorProducts/interface/GenEventInfoProduct.h"
+#include "SimDataFormats/GeneratorProducts/interface/GenLumiInfoHeader.h"
 
 #include "SimDataFormats/GeneratorProducts/interface/LHERunInfoProduct.h"
 #include "SimDataFormats/GeneratorProducts/interface/LHEEventProduct.h"
 
 #include "GeneratorInterface/LHEInterface/interface/LHERunInfo.h"
 #include "GeneratorInterface/LHEInterface/interface/LHEEvent.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
+#include "FWCore/Framework/interface/LuminosityBlock.h"
+
+#include "CLHEP/Random/RandomEngine.h"
+
 
 // foward declarations
 namespace edm {
@@ -48,7 +53,8 @@ namespace gen {
     GenRunInfoProduct &getGenRunInfo() { return genRunInfo_; }
     HepMC::GenEvent *getGenEvent() { return genEvent_.release(); }
     GenEventInfoProduct *getGenEventInfo() { return genEventInfo_.release(); }
-
+    virtual GenLumiInfoHeader *getGenLumiInfoHeader() const;
+
     void resetEvent(HepMC::GenEvent *event) { genEvent_.reset(event); }
     void resetEventInfo(GenEventInfoProduct *eventInfo) { genEventInfo_.reset(eventInfo); }
 
@@ -66,6 +72,14 @@ namespace gen {
     void setRandomEngine(CLHEP::HepRandomEngine* v) { doSetRandomEngine(v); }
 
     std::vector<std::string> const& sharedResources() const { return doSharedResources(); }
+
+    int randomIndex() const { return randomIndex_; }
+    const std::string &randomInitConfigDescription() const { return randomInitConfigDescriptions_[randomIndex_]; }
+    const std::string &gridpackPath() const { return gridpackPaths_[std::max(randomIndex_,0)]; }
+
+    void randomizeIndex(edm::LuminosityBlock const& lumi, CLHEP::HepRandomEngine* rengine);
+    void generateLHE(edm::LuminosityBlock const& lumi, CLHEP::HepRandomEngine* rengine);
+    void cleanLHE();
 
   protected:
     GenRunInfoProduct& runInfo() { return genRunInfo_; }
@@ -74,6 +88,8 @@ namespace gen {
 
     lhef::LHEEvent* lheEvent() { return lheEvent_.get(); }
     lhef::LHERunInfo *lheRunInfo() { return lheRunInfo_.get(); }
+    int randomIndex_;
+    std::string lheFile_;
 
   private:
 
@@ -91,6 +107,11 @@ namespace gen {
     edm::Event                          *edmEvent_;
 
     static const std::vector<std::string> theSharedResources;
+
+    std::vector<double> randomInitWeights_;
+    std::vector<std::string> randomInitConfigDescriptions_;
+    std::vector<std::string> gridpackPaths_;
+
   };
 
 } // namespace gen

GeneratorInterface/Core/interface/GeneratorFilter.h

@@ -24,18 +24,21 @@
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "FWCore/ServiceRegistry/interface/RandomEngineSentry.h"
 #include "FWCore/Utilities/interface/EDMException.h"
+#include "CLHEP/Random/RandomEngine.h"
 
 // #include "GeneratorInterface/ExternalDecays/interface/ExternalDecayDriver.h"
 
 //#include "GeneratorInterface/LHEInterface/interface/LHEEvent.h"
 #include "SimDataFormats/GeneratorProducts/interface/HepMCProduct.h"
 #include "SimDataFormats/GeneratorProducts/interface/GenRunInfoProduct.h"
+#include "SimDataFormats/GeneratorProducts/interface/GenLumiInfoHeader.h"
 #include "SimDataFormats/GeneratorProducts/interface/GenLumiInfoProduct.h"
 #include "SimDataFormats/GeneratorProducts/interface/GenEventInfoProduct.h"
 
 namespace edm
 {
   template <class HAD, class DEC> class GeneratorFilter : public one::EDFilter<EndRunProducer,
+                                                                               BeginLuminosityBlockProducer,
 									       EndLuminosityBlockProducer,
                                                                                one::WatchLuminosityBlocks,
                                                                                one::SharedResources>
@@ -53,6 +56,7 @@ namespace edm
     virtual bool filter(Event& e, EventSetup const& es) override;
     virtual void endRunProduce(Run &, EventSetup const&) override;
     virtual void beginLuminosityBlock(LuminosityBlock const&, EventSetup const&) override;
+    virtual void beginLuminosityBlockProduce(LuminosityBlock&, EventSetup const&) override;
     virtual void endLuminosityBlock(LuminosityBlock const&, EventSetup const&) override;
     virtual void endLuminosityBlockProduce(LuminosityBlock &, EventSetup const&) override;
 
@@ -99,6 +103,7 @@ namespace edm
          usesResource(resource);
        }
     }
+
     // This handles the case where there are no shared resources, because you
     // have to declare something when the SharedResources template parameter was used.
     if(sharedResources.empty() && (!decayer_ || decayer_->sharedResources().empty())) {
@@ -107,6 +112,7 @@ namespace edm
 
     produces<edm::HepMCProduct>();
     produces<GenEventInfoProduct>();
+    produces<GenLumiInfoHeader, edm::InLumi>();
     produces<GenLumiInfoProduct, edm::InLumi>();
     produces<GenRunInfoProduct, edm::InRun>();
 
@@ -186,6 +192,7 @@ namespace edm
 	// create GenEventInfoProduct from HepMC event in case hadronizer didn't provide one
 	genEventInfo.reset(new GenEventInfoProduct(event.get()));
       }
+
     ev.put(genEventInfo);
 
     std::auto_ptr<HepMCProduct> bare_product(new HepMCProduct());
@@ -215,11 +222,19 @@ namespace edm
   template <class HAD, class DEC>
   void
   GeneratorFilter<HAD, DEC>::beginLuminosityBlock( LuminosityBlock const& lumi, EventSetup const& es )
+  {}
+
+  template <class HAD, class DEC>
+  void
+  GeneratorFilter<HAD, DEC>::beginLuminosityBlockProduce( LuminosityBlock &lumi, EventSetup const& es )
   {
     nEventsInLumiBlock_ = 0;
     RandomEngineSentry<HAD> randomEngineSentry(&hadronizer_, lumi.index());
     RandomEngineSentry<DEC> randomEngineSentryDecay(decayer_, lumi.index());
 
+    hadronizer_.randomizeIndex(lumi,randomEngineSentry.randomEngine());
+    hadronizer_.generateLHE(lumi,randomEngineSentry.randomEngine());
+
     if ( !hadronizer_.readSettings(0) )
        throw edm::Exception(errors::Configuration) 
 	 << "Failed to read settings for the hadronizer "
@@ -245,12 +260,18 @@ namespace edm
 	 << "Failed to initialize hadronizer "
 	 << hadronizer_.classname()
 	 << " for internal parton generation\n";
+
+    std::auto_ptr<GenLumiInfoHeader> genLumiInfoHeader(hadronizer_.getGenLumiInfoHeader());
+    lumi.put(genLumiInfoHeader);
+
   }
 
   template <class HAD, class DEC>
   void
   GeneratorFilter<HAD, DEC>::endLuminosityBlock(LuminosityBlock const&, EventSetup const&)
-  {}
+  {
+    hadronizer_.cleanLHE();
+  }
 
   template <class HAD, class DEC>
   void
@@ -279,6 +300,7 @@ namespace edm
     std::auto_ptr<GenLumiInfoProduct> genLumiInfo(new GenLumiInfoProduct());
     genLumiInfo->setHEPIDWTUP(-1);
     genLumiInfo->setProcessInfo( GenLumiProcess );
+
     lumi.put(genLumiInfo);
 
     nEventsInLumiBlock_ = 0;

GeneratorInterface/Core/interface/HadronizerFilter.h

@@ -28,6 +28,7 @@
 #include "FWCore/Utilities/interface/InputTag.h"
 #include "FWCore/Utilities/interface/TypeID.h"
 #include "DataFormats/Provenance/interface/BranchDescription.h"
+#include "CLHEP/Random/RandomEngine.h"
 
 // #include "GeneratorInterface/ExternalDecays/interface/ExternalDecayDriver.h"
 
@@ -44,13 +45,15 @@
 
 #include "SimDataFormats/GeneratorProducts/interface/HepMCProduct.h"
 #include "SimDataFormats/GeneratorProducts/interface/GenRunInfoProduct.h"
+#include "SimDataFormats/GeneratorProducts/interface/GenLumiInfoHeader.h"
 #include "SimDataFormats/GeneratorProducts/interface/GenLumiInfoProduct.h"
 #include "SimDataFormats/GeneratorProducts/interface/GenEventInfoProduct.h"
 
 
 namespace edm
 {
   template <class HAD, class DEC> class HadronizerFilter : public one::EDFilter<EndRunProducer,
+                                                                                BeginLuminosityBlockProducer,
 										EndLuminosityBlockProducer,
                                                                                 one::WatchRuns,
                                                                                 one::WatchLuminosityBlocks,
@@ -71,6 +74,7 @@ namespace edm
     virtual void endRun(Run const&, EventSetup const&) override;
     virtual void endRunProduce(Run &, EventSetup const&) override;
     virtual void beginLuminosityBlock(LuminosityBlock const&, EventSetup const&) override;
+    virtual void beginLuminosityBlockProduce(LuminosityBlock&, EventSetup const&) override;
     virtual void endLuminosityBlock(LuminosityBlock const&, EventSetup const&) override;
     virtual void endLuminosityBlockProduce(LuminosityBlock &, EventSetup const&) override;
 
@@ -154,6 +158,7 @@ namespace edm
 
     produces<edm::HepMCProduct>();
     produces<GenEventInfoProduct>();
+    produces<GenLumiInfoHeader, edm::InLumi>();
     produces<GenLumiInfoProduct, edm::InLumi>();
     produces<GenRunInfoProduct, edm::InRun>();
     if(filter_)
@@ -269,7 +274,6 @@ namespace edm
       finalEvent->weights()[0] *= multihadweight;
     }
 
-
     ev.put(finalGenEventInfo);
 
     std::auto_ptr<HepMCProduct> bare_product(new HepMCProduct());
@@ -338,13 +342,20 @@ namespace edm
   template <class HAD, class DEC>
   void
   HadronizerFilter<HAD,DEC>::beginLuminosityBlock(LuminosityBlock const& lumi, EventSetup const& es)
+  {}
+
+  template <class HAD, class DEC>
+  void
+  HadronizerFilter<HAD,DEC>::beginLuminosityBlockProduce(LuminosityBlock &lumi, EventSetup const& es)
   {
     lhef::LHERunInfo* lheRunInfo = hadronizer_.getLHERunInfo().get();
     lheRunInfo->initLumi();
 
     RandomEngineSentry<HAD> randomEngineSentry(&hadronizer_, lumi.index());
     RandomEngineSentry<DEC> randomEngineSentryDecay(decayer_, lumi.index());
-
+
+    hadronizer_.randomizeIndex(lumi,randomEngineSentry.randomEngine());
+
     if ( !hadronizer_.readSettings(1) )
        throw edm::Exception(errors::Configuration) 
 	 << "Failed to read settings for the hadronizer "
@@ -374,6 +385,10 @@ namespace edm
 	<< "Failed to initialize hadronizer "
 	<< hadronizer_.classname()
 	<< " for external parton generation\n";
+
+    std::auto_ptr<GenLumiInfoHeader> genLumiInfoHeader(hadronizer_.getGenLumiInfoHeader());
+    lumi.put(genLumiInfoHeader);
+
   }
 
   template <class HAD, class DEC>
@@ -410,6 +425,7 @@ namespace edm
     std::auto_ptr<GenLumiInfoProduct> genLumiInfo(new GenLumiInfoProduct());
     genLumiInfo->setHEPIDWTUP(lheRunInfo->getHEPRUP()->IDWTUP);
     genLumiInfo->setProcessInfo( GenLumiProcess );
+
     lumi.put(genLumiInfo);