Merge pull request cms-sw#33916 from Dr15Jones/removeParameterSetFromSimBeamSpotObjects

Removed ParameterSet usage from SimBeamSpotObjects

Author: cmsbuild

CondFormats/BeamSpotObjects/BuildFile.xml

@@ -1,8 +1,6 @@
 <use name="CondFormats/Serialization"/>
 <use name="FWCore/Utilities"/>
-<use name="FWCore/ParameterSet"/>
 <use name="CondFormats/Common"/>
-<use name="CLHEP"/>
 <export>
   <lib name="1"/>
 </export>

CondFormats/BeamSpotObjects/interface/SimBeamSpotObjects.h

@@ -10,10 +10,6 @@
 #include "CondFormats/Serialization/interface/Serializable.h"
 
 #include <sstream>
-#include "CLHEP/Units/GlobalSystemOfUnits.h"
-#include "CLHEP/Units/GlobalPhysicalConstants.h"
-
-#include "FWCore/ParameterSet/interface/ParameterSet.h"
 
 class SimBeamSpotObjects {
 public:
@@ -28,18 +24,6 @@ class SimBeamSpotObjects {
 
   void print(std::stringstream& ss) const;
 
-  void read(edm::ParameterSet& p) {
-    fX0 = p.getParameter<double>("X0") * cm;
-    fY0 = p.getParameter<double>("Y0") * cm;
-    fZ0 = p.getParameter<double>("Z0") * cm;
-    fSigmaZ = p.getParameter<double>("SigmaZ") * cm;
-    fAlpha = p.getParameter<double>("Alpha") * radian;
-    fPhi = p.getParameter<double>("Phi") * radian;
-    fbetastar = p.getParameter<double>("BetaStar") * cm;
-    femittance = p.getParameter<double>("Emittance") * cm;              // this is not the normalized emittance
-    fTimeOffset = p.getParameter<double>("TimeOffset") * ns * c_light;  // HepMC time units are mm
-  }
-
   COND_SERIALIZABLE;
 };
 

IOMC/EventVertexGenerators/src/BeamProfile2DB.cc

@@ -21,7 +21,8 @@
 
 // user include files
 #include "FWCore/Framework/interface/Frameworkfwd.h"
-#include "FWCore/Framework/interface/EDAnalyzer.h"
+#include "FWCore/Framework/interface/global/EDAnalyzer.h"
+#include "FWCore/ParameterSet/interface/ParameterSet.h"
 
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
@@ -32,11 +33,14 @@
 #include "CondCore/DBOutputService/interface/PoolDBOutputService.h"
 #include "CondFormats/BeamSpotObjects/interface/SimBeamSpotObjects.h"
 
+#include "CLHEP/Units/GlobalSystemOfUnits.h"
+#include "CLHEP/Units/GlobalPhysicalConstants.h"
+
 //
 // class declaration
 //
 
-class BeamProfile2DB : public edm::EDAnalyzer {
+class BeamProfile2DB : public edm::global::EDAnalyzer<> {
 public:
   explicit BeamProfile2DB(const edm::ParameterSet&);
   ~BeamProfile2DB() override;
@@ -45,13 +49,29 @@ class BeamProfile2DB : public edm::EDAnalyzer {
 
 private:
   void beginJob() override;
-  void analyze(const edm::Event&, const edm::EventSetup&) override;
+  void analyze(edm::StreamID, const edm::Event&, const edm::EventSetup&) const override;
   void endJob() override;
 
   // ----------member data ---------------------------
-  edm::ParameterSet config_;
+  SimBeamSpotObjects beamSpot_;
 };
 
+namespace {
+  SimBeamSpotObjects read(const edm::ParameterSet& p) {
+    SimBeamSpotObjects ret;
+    ret.fX0 = p.getParameter<double>("X0") * cm;
+    ret.fY0 = p.getParameter<double>("Y0") * cm;
+    ret.fZ0 = p.getParameter<double>("Z0") * cm;
+    ret.fSigmaZ = p.getParameter<double>("SigmaZ") * cm;
+    ret.fAlpha = p.getParameter<double>("Alpha") * radian;
+    ret.fPhi = p.getParameter<double>("Phi") * radian;
+    ret.fbetastar = p.getParameter<double>("BetaStar") * cm;
+    ret.femittance = p.getParameter<double>("Emittance") * cm;              // this is not the normalized emittance
+    ret.fTimeOffset = p.getParameter<double>("TimeOffset") * ns * c_light;  // HepMC time units are mm
+    return ret;
+  }
+
+}  // namespace
 //
 // constants, enums and typedefs
 //
@@ -63,11 +83,7 @@ class BeamProfile2DB : public edm::EDAnalyzer {
 //
 // constructors and destructor
 //
-BeamProfile2DB::BeamProfile2DB(const edm::ParameterSet& iConfig)
-
-{
-  config_ = iConfig;
-}
+BeamProfile2DB::BeamProfile2DB(const edm::ParameterSet& iConfig) : beamSpot_(read(iConfig)) {}
 
 BeamProfile2DB::~BeamProfile2DB() {
   // do anything here that needs to be done at desctruction time
@@ -79,28 +95,32 @@ BeamProfile2DB::~BeamProfile2DB() {
 //
 
 // ------------ method called for each event  ------------
-void BeamProfile2DB::analyze(const edm::Event& iEvent, const edm::EventSetup& iSetup) {}
+void BeamProfile2DB::analyze(edm::StreamID, const edm::Event& iEvent, const edm::EventSetup& iSetup) const {}
 
 // ------------ method called once each job just before starting event loop  ------------
 void BeamProfile2DB::beginJob() {}
 
 // ------------ method called once each job just after ending the event loop  ------------
 void BeamProfile2DB::endJob() {
   edm::Service<cond::service::PoolDBOutputService> poolDbService;
-  SimBeamSpotObjects* beam = new SimBeamSpotObjects();
-
-  beam->read(config_);
-
   poolDbService->createNewIOV<SimBeamSpotObjects>(
-      beam, poolDbService->beginOfTime(), poolDbService->endOfTime(), "SimBeamSpotObjectsRcd");
+      &beamSpot_, poolDbService->beginOfTime(), poolDbService->endOfTime(), "SimBeamSpotObjectsRcd");
 }
 
 // ------------ method fills 'descriptions' with the allowed parameters for the module  ------------
 void BeamProfile2DB::fillDescriptions(edm::ConfigurationDescriptions& descriptions) {
   //The following says we do not know what parameters are allowed so do no validation
   // Please change this to state exactly what you do use, even if it is no parameters
   edm::ParameterSetDescription desc;
-  desc.setUnknown();
+  desc.add<double>("X0")->setComment("in cm");
+  desc.add<double>("Y0")->setComment("in cm");
+  desc.add<double>("Z0")->setComment("in cm");
+  desc.add<double>("SigmaZ")->setComment("in cm");
+  desc.add<double>("BetaStar")->setComment("in cm");
+  desc.add<double>("Emittance")->setComment("in cm");
+  desc.add<double>("Alpha")->setComment("in radians");
+  desc.add<double>("Phi")->setComment("in radians");
+  desc.add<double>("TimeOffset")->setComment("in ns");
   descriptions.addDefault(desc);
 }