add fillDesc in BetafuncEvtVtxGenerator and GaussEvtVtxGenerator and …

…use them
cms-sw · Nov 10, 2023 · 1a98ef1 · 1a98ef1
1 parent f88656d
commit 1a98ef1
Show file tree

Hide file tree

Showing 6 changed files with 45 additions and 24 deletions.
diff --git a/IOMC/EventVertexGenerators/interface/BetafuncEvtVtxGenerator.h b/IOMC/EventVertexGenerators/interface/BetafuncEvtVtxGenerator.h
@@ -20,6 +20,7 @@ ________________________________________________________________________
 
 #include "IOMC/EventVertexGenerators/interface/BaseEvtVtxGenerator.h"
 #include "FWCore/Framework/interface/ESWatcher.h"
+#include "FWCore/ParameterSet/interface/ConfigurationDescriptions.h"
 #include "FWCore/Utilities/interface/ESGetToken.h"
 #include "CondFormats/DataRecord/interface/SimBeamSpotObjectsRcd.h"
 #include "CondFormats/BeamSpotObjects/interface/SimBeamSpotObjects.h"
@@ -37,6 +38,8 @@ class BetafuncEvtVtxGenerator : public BaseEvtVtxGenerator {
   BetafuncEvtVtxGenerator& operator=(const BetafuncEvtVtxGenerator& rhs) = delete;
   ~BetafuncEvtVtxGenerator() override = default;
 
+  static void fillDescriptions(edm::ConfigurationDescriptions& descriptions);
+
   void beginLuminosityBlock(edm::LuminosityBlock const&, edm::EventSetup const&) override;
 
   /// return a new event vertex

diff --git a/IOMC/EventVertexGenerators/interface/GaussEvtVtxGenerator.h b/IOMC/EventVertexGenerators/interface/GaussEvtVtxGenerator.h
@@ -9,6 +9,7 @@
 
 #include "IOMC/EventVertexGenerators/interface/BaseEvtVtxGenerator.h"
 #include "FWCore/Framework/interface/ESWatcher.h"
+#include "FWCore/ParameterSet/interface/ConfigurationDescriptions.h"
 #include "FWCore/Utilities/interface/ESGetToken.h"
 #include "CondFormats/DataRecord/interface/SimBeamSpotObjectsRcd.h"
 #include "CondFormats/BeamSpotObjects/interface/SimBeamSpotObjects.h"
@@ -26,6 +27,8 @@ class GaussEvtVtxGenerator : public BaseEvtVtxGenerator {
   GaussEvtVtxGenerator& operator=(const GaussEvtVtxGenerator& rhs) = delete;
   ~GaussEvtVtxGenerator() override = default;
 
+  static void fillDescriptions(edm::ConfigurationDescriptions& descriptions);
+
   void beginLuminosityBlock(edm::LuminosityBlock const&, edm::EventSetup const&) override;
 
   /// return a new event vertex

diff --git a/IOMC/EventVertexGenerators/python/VtxSmearedDesign_cfi.py b/IOMC/EventVertexGenerators/python/VtxSmearedDesign_cfi.py
@@ -1,11 +1,8 @@
 import FWCore.ParameterSet.Config as cms
 
-# Load GaussEvtVtx Generator and read parameters from GT (SimBeamSpotObjectRcd)
-from IOMC.EventVertexGenerators.VtxSmearedParameters_cfi import VtxSmearedCommon
-VtxSmeared = cms.EDProducer("GaussEvtVtxGenerator",
-    VtxSmearedCommon
+# Load GaussEvtVtxGenerator and read parameters from GT (SimBeamSpotObjectRcd)
+from IOMC.EventVertexGenerators.GaussEvtVtxGenerator_cfi import GaussEvtVtxGenerator
+VtxSmeared = GaussEvtVtxGenerator.clone(
+    src = "generator:unsmeared",
+    readDB = True
 )
-VtxSmeared.readDB = True
-
-
-
diff --git a/IOMC/EventVertexGenerators/python/VtxSmearedRealistic_cfi.py b/IOMC/EventVertexGenerators/python/VtxSmearedRealistic_cfi.py
@@ -1,11 +1,8 @@
 import FWCore.ParameterSet.Config as cms
 
-# Load BetafuncEvtVtx Generator and read parameters from GT (SimBeamSpotObjectRcd)
-from IOMC.EventVertexGenerators.VtxSmearedParameters_cfi import VtxSmearedCommon
-VtxSmeared = cms.EDProducer("BetafuncEvtVtxGenerator",
-    VtxSmearedCommon
+# Load BetafuncEvtVtxGenerator and read parameters from GT (SimBeamSpotObjectRcd)
+from IOMC.EventVertexGenerators.BetafuncEvtVtxGenerator_cfi import BetafuncEvtVtxGenerator
+VtxSmeared = BetafuncEvtVtxGenerator.clone(
+    src = "generator:unsmeared",
+    readDB = True
 )
-VtxSmeared.readDB = True
-
-
-
diff --git a/IOMC/EventVertexGenerators/src/BetafuncEvtVtxGenerator.cc b/IOMC/EventVertexGenerators/src/BetafuncEvtVtxGenerator.cc
@@ -24,11 +24,8 @@ ________________________________________________________________________
 #include "CLHEP/Random/RandGaussQ.h"
 #include "CLHEP/Units/GlobalSystemOfUnits.h"
 #include "CLHEP/Units/GlobalPhysicalConstants.h"
-//#include "CLHEP/Vector/ThreeVector.h"
 #include "HepMC/SimpleVector.h"
 
-#include <iostream>
-
 BetafuncEvtVtxGenerator::BetafuncEvtVtxGenerator(const edm::ParameterSet& p) : BaseEvtVtxGenerator(p), boost_(4, 4) {
   readDB_ = p.getParameter<bool>("readDB");
   if (!readDB_) {
@@ -140,3 +137,17 @@ void BetafuncEvtVtxGenerator::sigmaZ(double s) {
 }
 
 TMatrixD const* BetafuncEvtVtxGenerator::GetInvLorentzBoost() const { return &boost_; }
+
+void BetafuncEvtVtxGenerator::fillDescriptions(edm::ConfigurationDescriptions& descriptions) {
+  edm::ParameterSetDescription desc;
+  desc.add<double>("X0Incm", 0.0);
+  desc.add<double>("Y0Incm", 0.0);
+  desc.add<double>("Z0Incm", 0.0);
+  desc.add<double>("SigmaZIncm", 0.0);
+  desc.add<double>("BetaStarIncm", 0.0);
+  desc.add<double>("EmittanceIncm", 0.0);
+  desc.add<double>("TimeOffsetInns", 0.0);
+  desc.add<edm::InputTag>("src");
+  desc.add<bool>("readDB");
+  descriptions.add("BetafuncEvtVtxGenerator", desc);
+}
diff --git a/IOMC/EventVertexGenerators/src/GaussEvtVtxGenerator.cc b/IOMC/EventVertexGenerators/src/GaussEvtVtxGenerator.cc
@@ -1,14 +1,10 @@
-
-
 #include "IOMC/EventVertexGenerators/interface/GaussEvtVtxGenerator.h"
-#include "FWCore/Utilities/interface/Exception.h"
-
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
+#include "FWCore/Utilities/interface/Exception.h"
 
 #include "CLHEP/Random/RandGaussQ.h"
 #include "CLHEP/Units/GlobalSystemOfUnits.h"
 #include "CLHEP/Units/GlobalPhysicalConstants.h"
-//#include "CLHEP/Vector/ThreeVector.h"
 #include "HepMC/SimpleVector.h"
 
 GaussEvtVtxGenerator::GaussEvtVtxGenerator(const edm::ParameterSet& p) : BaseEvtVtxGenerator(p) {
@@ -95,3 +91,17 @@ void GaussEvtVtxGenerator::sigmaZ(double s) {
                                        << "Illegal resolution in Z (negative)";
   }
 }
+
+void GaussEvtVtxGenerator::fillDescriptions(edm::ConfigurationDescriptions& descriptions) {
+  edm::ParameterSetDescription desc;
+  desc.add<double>("MeanXIncm", 0.0);
+  desc.add<double>("MeanYIncm", 0.0);
+  desc.add<double>("MeanZIncm", 0.0);
+  desc.add<double>("SigmaXIncm", 0.0);
+  desc.add<double>("SigmaYIncm", 0.0);
+  desc.add<double>("SigmaZIncm", 0.0);
+  desc.add<double>("TimeOffsetInns", 0.0);
+  desc.add<edm::InputTag>("src");
+  desc.add<bool>("readDB");
+  descriptions.add("GaussEvtVtxGenerator", desc);
+}