From ed546c7cde484293a08c9ce9953ba8cf5ffbc556 Mon Sep 17 00:00:00 2001
From: mmusich <marco.musich@cern.ch>
Date: Mon, 28 Feb 2022 10:40:10 +0100
Subject: [PATCH 1/3] fix BeamSpot Analyzer fillDescriptions

---
 .../plugins/BeamSpotAnalyzer.cc                 | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/RecoVertex/BeamSpotProducer/plugins/BeamSpotAnalyzer.cc b/RecoVertex/BeamSpotProducer/plugins/BeamSpotAnalyzer.cc
index ad400a010d90d..3bfd900733aff 100644
--- a/RecoVertex/BeamSpotProducer/plugins/BeamSpotAnalyzer.cc
+++ b/RecoVertex/BeamSpotProducer/plugins/BeamSpotAnalyzer.cc
@@ -216,13 +216,16 @@ void BeamSpotAnalyzer::fillDescriptions(edm::ConfigurationDescriptions& descript
   desc.setComment("Analyzer of BeamSpot Objects");
 
   edm::ParameterSetDescription bsAnalyzerParamsDesc;
-  std::vector<edm::ParameterSet> bsAnaDefaults(1);
-  bsAnaDefaults[0].addParameter("WriteToDB", false);
-  bsAnaDefaults[0].addParameter("RunAllFitters", false);
-  bsAnaDefaults[0].addUntrackedParameter("fitEveryNLumi", -1);
-  bsAnaDefaults[0].addUntrackedParameter("resetEveryNLumi", -1);
-  bsAnaDefaults[0].addParameter("RunBeamWidthFit", false);
-  desc.addVPSet("BSAnalyzerParameters", bsAnalyzerParamsDesc, bsAnaDefaults);
+  bsAnalyzerParamsDesc.add("WriteToDB", false);
+  bsAnalyzerParamsDesc.add("RunAllFitters", false);
+  bsAnalyzerParamsDesc.addUntracked("fitEveryNLumi", -1);
+  bsAnalyzerParamsDesc.addUntracked("resetEveryNLumi", -1);
+  bsAnalyzerParamsDesc.add("RunBeamWidthFit", false);
+  desc.add<edm::ParameterSetDescription>("BSAnalyzerParameters", bsAnalyzerParamsDesc);
+
+  BeamFitter::fillDescription(desc);
+  PVFitter::fillDescription(desc);
+
   descriptions.addWithDefaultLabel(desc);
 }
 

From b0a1a9c0a0bd6f482321766e5f815f5e7c6d9a50 Mon Sep 17 00:00:00 2001
From: mmusich <marco.musich@cern.ch>
Date: Mon, 28 Feb 2022 10:40:33 +0100
Subject: [PATCH 2/3] add unit test for BeamSpotAnalyzer description

---
 .../BeamSpotProducer/test/BuildFile.xml       |  5 +++++
 .../test/testBeamSpotAnalyzer.cc              | 22 +++++++++++++++++++
 2 files changed, 27 insertions(+)
 create mode 100644 RecoVertex/BeamSpotProducer/test/testBeamSpotAnalyzer.cc

diff --git a/RecoVertex/BeamSpotProducer/test/BuildFile.xml b/RecoVertex/BeamSpotProducer/test/BuildFile.xml
index b7bbbe45b0710..e864907e7951f 100644
--- a/RecoVertex/BeamSpotProducer/test/BuildFile.xml
+++ b/RecoVertex/BeamSpotProducer/test/BuildFile.xml
@@ -14,3 +14,8 @@
     <flags TEST_RUNNER_ARGS="/bin/bash RecoVertex/BeamSpotProducer/test testReadWriteBSFromDB.sh"/>
   </bin>
 </environment>
+
+<bin file="testBeamSpotAnalyzer.cc">
+  <use name="FWCore/TestProcessor"/>
+  <use name="catch2"/>
+</bin>
diff --git a/RecoVertex/BeamSpotProducer/test/testBeamSpotAnalyzer.cc b/RecoVertex/BeamSpotProducer/test/testBeamSpotAnalyzer.cc
new file mode 100644
index 0000000000000..cdd0d381b5222
--- /dev/null
+++ b/RecoVertex/BeamSpotProducer/test/testBeamSpotAnalyzer.cc
@@ -0,0 +1,22 @@
+#include "FWCore/TestProcessor/interface/TestProcessor.h"
+
+#define CATCH_CONFIG_MAIN
+#include "catch.hpp"
+
+TEST_CASE("BeamSpotAnalyzer tests", "[BeamSpotAnalyzer]") {
+  //The python configuration
+  edm::test::TestProcessor::Config config{
+      R"_(from FWCore.TestProcessor.TestProcess import *
+from RecoVertex.BeamSpotProducer.d0_phi_analyzer_cff import d0_phi_analyzer 
+process = TestProcess()
+process.beamAnalyzer = d0_phi_analyzer 
+process.moduleToTest(process.beamAnalyzer)
+)_"};
+
+  SECTION("Run with no Lumis") {
+    edm::test::TestProcessor tester{config};
+    tester.testRunWithNoLuminosityBlocks();
+    //get here without an exception or crashing
+    REQUIRE(true);
+  };
+}

From 285031cf7ee58f3d73ec09df7d2d9dcb9a62d32a Mon Sep 17 00:00:00 2001
From: mmusich <marco.musich@cern.ch>
Date: Mon, 28 Feb 2022 10:48:24 +0100
Subject: [PATCH 3/3] remove repeated include

---
 RecoVertex/BeamSpotProducer/plugins/BeamSpotAnalyzer.cc | 1 -
 1 file changed, 1 deletion(-)

diff --git a/RecoVertex/BeamSpotProducer/plugins/BeamSpotAnalyzer.cc b/RecoVertex/BeamSpotProducer/plugins/BeamSpotAnalyzer.cc
index 3bfd900733aff..fb743bd191a5c 100644
--- a/RecoVertex/BeamSpotProducer/plugins/BeamSpotAnalyzer.cc
+++ b/RecoVertex/BeamSpotProducer/plugins/BeamSpotAnalyzer.cc
@@ -9,7 +9,6 @@ ________________________________________________________________**/
 
 // C++ standard
 #include <string>
-#include <string>
 
 // CMS
 #include "DataFormats/BeamSpot/interface/BeamSpot.h"