CTPPS · JanChyczynski · Feb 25, 2022 · Jul 13, 2022 · Jul 13, 2022 · Jul 13, 2022
diff --git a/CalibPPS/ESProducers/python/ctppsLHCInfo_cff.py b/CalibPPS/ESProducers/python/ctppsLHCInfo_cff.py
@@ -2,6 +2,8 @@
 
 # by default, LHCInfo is now loaded from CondDB using a GT
 ctppsLHCInfoLabel = cms.string("")
+ctppsLHCInfoPerLSLabel = cms.string("")
+ctppsLHCInfoPerFillLabel = cms.string("")
 
 ## minimal LHCInfo for 2016 data
 #ctppsLHCInfoLabel = cms.string("ctpps_minimal")

diff --git a/Calibration/PPSAlCaRecoProducer/python/ALCARECOPPSCalMaxTracks_cff.py b/Calibration/PPSAlCaRecoProducer/python/ALCARECOPPSCalMaxTracks_cff.py
@@ -1,3 +1,5 @@
+print("in file ALCARECOPPSCalMaxTracks_cff.py")
+
 import FWCore.ParameterSet.Config as cms
 
 # 1. HLT filter
@@ -14,9 +16,12 @@
 from EventFilter.CTPPSRawToDigi.ctppsRawToDigi_cff import totemTimingRawToDigi as _totemTimingRawToDigi
 from EventFilter.CTPPSRawToDigi.ctppsRawToDigi_cff import ctppsPixelDigis as _ctppsPixelDigis
 
-ctppsDiamondRawToDigiAlCaRecoProducer  = _ctppsDiamondRawToDigi.clone(rawDataTag = 'hltPPSCalibrationRaw')
-totemTimingRawToDigiAlCaRecoProducer = _totemTimingRawToDigi.clone(rawDataTag = 'hltPPSCalibrationRaw')
-ctppsPixelDigisAlCaRecoProducer = _ctppsPixelDigis.clone(inputLabel = 'hltPPSCalibrationRaw')
+# ctppsDiamondRawToDigiAlCaRecoProducer  = _ctppsDiamondRawToDigi.clone(rawDataTag = 'hltPPSCalibrationRaw')
+# totemTimingRawToDigiAlCaRecoProducer = _totemTimingRawToDigi.clone(rawDataTag = 'hltPPSCalibrationRaw')
+# ctppsPixelDigisAlCaRecoProducer = _ctppsPixelDigis.clone(inputLabel = 'hltPPSCalibrationRaw')
+ctppsDiamondRawToDigiAlCaRecoProducer  = _ctppsDiamondRawToDigi.clone(rawDataTag = 'rawDataCollector')
+totemTimingRawToDigiAlCaRecoProducer = _totemTimingRawToDigi.clone(rawDataTag = 'rawDataCollector')
+ctppsPixelDigisAlCaRecoProducer = _ctppsPixelDigis.clone(inputLabel = 'rawDataCollector')
 
 ctppsRawToDigiTaskAlCaRecoProducer = cms.Task(
     ctppsDiamondRawToDigiAlCaRecoProducer,
@@ -85,7 +90,8 @@
 )
 
 from RecoPPS.ProtonReconstruction.ctppsProtons_cff import ctppsProtons as _ctppsProtons
-ctppsProtonsAlCaRecoProducer = _ctppsProtons.clone(tagLocalTrackLite = 'ctppsLocalTrackLiteProducerAlCaRecoProducer')
+ctppsProtonsAlCaRecoProducer = _ctppsProtons.clone(tagLocalTrackLite = 'ctppsLocalTrackLiteProducerAlCaRecoProducer',
+verbosity = cms.untracked.uint32(2))
 
 # 5. RECO - final task assembly
 #------------------------------------------------------

diff --git a/Calibration/PPSAlCaRecoProducer/test/test_express_AlCaRecoProducer.sh b/Calibration/PPSAlCaRecoProducer/test/test_express_AlCaRecoProducer.sh
@@ -2,11 +2,16 @@
 function die { echo $1: status $2; exit $2; }
 
 customise_commands="process.GlobalTag.toGet = cms.VPSet()\
+\nprocess.GlobalTag.toGet.append(cms.PSet(record = cms.string(\"LHCInfoPerLSRcd\"),tag =  cms.string(\"LHCInfoPerLS_end_2\"), connect = cms.string(\"sqlite_file:/eos/home-j/jchyczyn/new/CMSSW_12_5_0_pre3/src/CondTools/RunInfo/python/lhcinfo_pop_test.db\")))\
+\nprocess.GlobalTag.toGet.append(cms.PSet(record = cms.string(\"CTPPSOpticsRcd\"),tag =  cms.string(\"PPSOpticalFunctions_test\"), connect = cms.string(\"sqlite_file:/afs/cern.ch/user/w/wcarvalh/public/CTPPS/optical_functions/validation/Aug22/PPSOpticalFunctions_singleIOV_2022_with_verticals.db\")))\
+\nprocess.GlobalTag.toGet.append(cms.PSet(record = cms.string(\"LHCInfoPerFillRcd\"),tag =  cms.string(\"LHCInfoPerFill_end_2\"), connect = cms.string(\"sqlite_file:/eos/home-j/jchyczyn/new/CMSSW_12_5_0_pre3/src/CondTools/RunInfo/python/lhcinfo_pop_test.db\")))\
+\nprocess.GlobalTag.toGet.append(cms.PSet(record = cms.string(\"LHCInfoRcd\"),tag =  cms.string(\"LHCInfo_end_2\"), connect = cms.string(\"sqlite_file:/eos/home-j/jchyczyn/new/CMSSW_12_5_0_pre3/src/CondTools/RunInfo/python/lhcinfo_pop_test.db\")))\
 \nprocess.GlobalTag.toGet.append(cms.PSet(record = cms.string(\"AlCaRecoTriggerBitsRcd\"),tag =  cms.string(\"AlCaRecoHLTpaths_PPS2022_express_v1\"), connect = cms.string(\"frontier://FrontierProd/CMS_CONDITIONS\")))\
-\nprocess.GlobalTag.toGet.append(cms.PSet(record = cms.string(\"PPSTimingCalibrationLUTRcd\"),tag =  cms.string(\"PPSDiamondTimingCalibrationLUT_test\"), connect = cms.string(\"frontier://FrontierProd/CMS_CONDITIONS\")))\
-\nprocess.ALCARECOPPSCalMaxTracksFilter.TriggerResultsTag = cms.InputTag(\"TriggerResults\",\"\",\"HLTX\")"
+\nprocess.GlobalTag.toGet.append(cms.PSet(record = cms.string(\"PPSTimingCalibrationLUTRcd\"),tag =  cms.string(\"PPSDiamondTimingCalibrationLUT_test\"), connect = cms.string(\"frontier://FrontierProd/CMS_CONDITIONS\")))"
+# \nprocess.ALCARECOPPSCalMaxTracksFilter.TriggerResultsTag = cms.InputTag(\"TriggerResults\",\"\",\"HLT\")"
 
-INPUTFILE="/store/group/alca_global/pps_alcareco_producer_tests/outputALCAPPS_single.root"
+INPUTFILE="/store/data/Run2022C/ZeroBias/RAW/v1/000/356/615/00000/a4076bff-3bec-459e-bd44-b66538bf5c2b.root"
+# INPUTFILE="/store/group/alca_global/pps_alcareco_producer_tests/outputALCAPPS_single.root"
 COMMMAND=`xrdfs cms-xrd-global.cern.ch locate $INPUTFILE`
 STATUS=$?
 echo "xrdfs command status = "$STATUS
@@ -15,13 +20,13 @@ if [ $STATUS -eq 0 ]; then
     (cmsDriver.py testExpressPPSAlCaRecoProducer -s ALCAPRODUCER:PPSCalMaxTracks,ENDJOB \
     --process ALCARECO \
     --scenario pp \
-    --era ctpps_2018 \
+    --era run3_HB \
     --conditions auto:run3_data_express \
     --data  \
     --datatier ALCARECO \
     --eventcontent ALCARECO \
     --nThreads 8 \
-    --number 100 --filein ${INPUTFILE} \
+    --number 10000 --filein ${INPUTFILE} \
     --fileout file:outputALCAPPS_RECO_express.root \
     --customise_commands="$customise_commands") || die 'failed running test_express_AlCaRecoProducer' $?
 else

diff --git a/Calibration/PPSAlCaRecoProducer/test/test_prompt_PPSAlCaReco_output.py b/Calibration/PPSAlCaRecoProducer/test/test_prompt_PPSAlCaReco_output.py
@@ -1,9 +1,10 @@
 import FWCore.ParameterSet.Config as cms
 
 # load era modifier to run on 2018 data
-from Configuration.Eras.Modifier_ctpps_2018_cff import ctpps_2018
+# from Configuration.Eras.Modifier_ctpps_2018_cff import ctpps_2018
+from Configuration.Eras.Modifier_ctpps_2022_cff import ctpps_2022
 
-process = cms.Process( 'TEST',ctpps_2018)
+process = cms.Process( 'TEST',ctpps_2022)
 
 # LHCInfo plotter
 process.load("Validation.CTPPS.ctppsLHCInfoPlotter_cfi")

diff --git a/CondCore/RunInfoPlugins/src/plugin.cc b/CondCore/RunInfoPlugins/src/plugin.cc
@@ -10,10 +10,16 @@
 #include "CondFormats/RunInfo/interface/FillInfo.h"
 #include "CondFormats/DataRecord/interface/LHCInfoRcd.h"
 #include "CondFormats/RunInfo/interface/LHCInfo.h"
+#include "CondFormats/DataRecord/interface/LHCInfoPerLSRcd.h"
+#include "CondFormats/RunInfo/interface/LHCInfoPerLS.h"
+#include "CondFormats/DataRecord/interface/LHCInfoPerFillRcd.h"
+#include "CondFormats/RunInfo/interface/LHCInfoPerFill.h"
 
 REGISTER_PLUGIN(RunSummaryRcd, RunSummary);
 REGISTER_PLUGIN(RunInfoRcd, RunInfo);
 REGISTER_PLUGIN(L1TriggerScalerRcd, L1TriggerScaler);
 REGISTER_PLUGIN(MixingRcd, MixingModuleConfig);
 REGISTER_PLUGIN(FillInfoRcd, FillInfo);
 REGISTER_PLUGIN(LHCInfoRcd, LHCInfo);
+REGISTER_PLUGIN(LHCInfoPerLSRcd, LHCInfoPerLS);
+REGISTER_PLUGIN(LHCInfoPerFillRcd, LHCInfoPerFill);
diff --git a/CondCore/Utilities/plugins/Module_2XML.cc b/CondCore/Utilities/plugins/Module_2XML.cc
@@ -211,6 +211,8 @@ PAYLOAD_2XML_MODULE(pluginUtilities_payload2xml) {
   PAYLOAD_2XML_CLASS(L1TriggerKeyExt);
   PAYLOAD_2XML_CLASS(L1TriggerKeyListExt);
   PAYLOAD_2XML_CLASS(LHCInfo);
+  PAYLOAD_2XML_CLASS(LHCInfoPerFill);
+  PAYLOAD_2XML_CLASS(LHCInfoPerLS);
   PAYLOAD_2XML_CLASS(METCorrectorParametersCollection);
   PAYLOAD_2XML_CLASS(MEtXYcorrectParametersCollection);
   PAYLOAD_2XML_CLASS(MagFieldConfig);

diff --git a/CondCore/Utilities/src/CondFormats.h b/CondCore/Utilities/src/CondFormats.h
@@ -139,6 +139,9 @@
 #include "CondFormats/RecoMuonObjects/interface/DYTParamObject.h"
 #include "CondFormats/RunInfo/interface/RunInfo.h"
 #include "CondFormats/RunInfo/interface/LHCInfo.h"
+#include "CondFormats/RunInfo/interface/LHCInfoVectorizedFields.h"
+#include "CondFormats/RunInfo/interface/LHCInfoPerFill.h"
+#include "CondFormats/RunInfo/interface/LHCInfoPerLS.h"
 #include "CondFormats/RunInfo/interface/MixingModuleConfig.h"
 #include "CondFormats/SiPixelObjects/interface/SiPixelCalibConfiguration.h"
 #include "CondFormats/SiPixelObjects/interface/SiPixelCPEGenericErrorParm.h"

diff --git a/CondFormats/DataRecord/interface/LHCInfoPerFillRcd.h b/CondFormats/DataRecord/interface/LHCInfoPerFillRcd.h
@@ -0,0 +1,25 @@
+#ifndef LHCInfoPerFillRcd_LHCInfoPerFillRcd_h
+#define LHCInfoPerFillRcd_LHCInfoPerFillRcd_h
+// -*- C++ -*-
+//
+// Package:     CondFormats/DataRecord
+// Class  :     LHCInfoPerFillRcd
+//
+/**\class LHCInfoPerFillRcd LHCInfoPerFillRcd.h CondFormats/DataRecord/interface/LHCInfoPerFillRcd.h
+
+ Description: [one line class summary]
+
+ Usage:
+    <usage>
+
+*/
+//
+// Author:      Jan Krzysztof Chyczynski
+// Created:     Wed, 13 Jul 2022 16:36:24 GMT
+//
+
+#include "FWCore/Framework/interface/EventSetupRecordImplementation.h"
+
+class LHCInfoPerFillRcd : public edm::eventsetup::EventSetupRecordImplementation<LHCInfoPerFillRcd> {};
+
+#endif
diff --git a/CondFormats/DataRecord/interface/LHCInfoPerLSRcd.h b/CondFormats/DataRecord/interface/LHCInfoPerLSRcd.h
@@ -0,0 +1,26 @@
+#ifndef DataRecord_LHCInfoPerLSRcd_h
+#define DataRecord_LHCInfoPerLSRcd_h
+// -*- C++ -*-
+//
+// Package:     DataRecord
+// Class  :     LHCInfoPerLSRcd
+//
+/**\class LHCInfoPerLSRcd LHCInfoPerLSRcd.h CondFormats/DataRecord/interface/LHCInfoPerLSRcd.h
+
+ Description: [one line class summary]
+
+ Usage:
+    <usage>
+
+*/
+//
+// Author:
+// Created:     Tue Feb 15 2022
+// $Id$
+//
+
+#include "FWCore/Framework/interface/EventSetupRecordImplementation.h"
+
+class LHCInfoPerLSRcd : public edm::eventsetup::EventSetupRecordImplementation<LHCInfoPerLSRcd> {};
+
+#endif
diff --git a/CondFormats/DataRecord/src/LHCInfoPerFillRcd.cc b/CondFormats/DataRecord/src/LHCInfoPerFillRcd.cc
@@ -0,0 +1,15 @@
+// -*- C++ -*-
+//
+// Package:     CondFormats/DataRecord
+// Class  :     LHCInfoPerFillRcd
+//
+// Implementation:
+//     [Notes on implementation]
+//
+// Author:      Jan Krzysztof Chyczynski
+// Created:     Wed, 13 Jul 2022 16:36:24 GMT
+
+#include "CondFormats/DataRecord/interface/LHCInfoPerFillRcd.h"
+#include "FWCore/Framework/interface/eventsetuprecord_registration_macro.h"
+
+EVENTSETUP_RECORD_REG(LHCInfoPerFillRcd);
diff --git a/CondFormats/DataRecord/src/LHCInfoPerLSRcd.cc b/CondFormats/DataRecord/src/LHCInfoPerLSRcd.cc
@@ -0,0 +1,16 @@
+// -*- C++ -*-
+//
+// Package:     DataRecord
+// Class  :     LHCInfoPerLSRcd
+//
+// Implementation:
+//     [Notes on implementation]
+//
+// Author:
+// Created:     Tue Feb 15 2022
+// $Id$
+
+#include "CondFormats/DataRecord/interface/LHCInfoPerLSRcd.h"
+#include "FWCore/Framework/interface/eventsetuprecord_registration_macro.h"
+
+EVENTSETUP_RECORD_REG(LHCInfoPerLSRcd);
diff --git a/CondFormats/RunInfo/BuildFile.xml b/CondFormats/RunInfo/BuildFile.xml
@@ -1,9 +1,12 @@
 <use name="CondFormats/Common"/>
 <use name="CondFormats/Serialization"/>
+<use name="CondCore/CondDB"/>
 <use name="FWCore/ParameterSet"/>
 <use name="FWCore/Utilities"/>
 <use name="CoralBase"/>
 <use name="boost_serialization"/>
+<use name="FWCore/Framework"/>
+<use name="CondFormats/DataRecord"/>
 <export>
   <lib name="1"/>
 </export>
diff --git a/CondFormats/RunInfo/interface/LHCInfoCombined.h b/CondFormats/RunInfo/interface/LHCInfoCombined.h
@@ -0,0 +1,56 @@
+#ifndef CondFormats_RunInfo_LHCInfoCombined_H
+#define CondFormats_RunInfo_LHCInfoCombined_H
+
+#include "FWCore/Framework/interface/Frameworkfwd.h"
+#include "FWCore/Framework/interface/one/EDAnalyzer.h"
+#include "FWCore/Framework/interface/Event.h"
+#include "FWCore/Framework/interface/EventSetup.h"
+#include "FWCore/Framework/interface/ESHandle.h"
+#include "FWCore/Framework/interface/ESWatcher.h"
+#include "FWCore/Framework/interface/MakerMacros.h"
+#include "FWCore/Framework/interface/ConsumesCollector.h"
+
+#include "CondFormats/RunInfo/interface/LHCInfo.h"
+#include "CondFormats/RunInfo/interface/LHCInfoPerLS.h"
+#include "CondFormats/RunInfo/interface/LHCInfoPerFill.h"
+
+#include "CondFormats/DataRecord/interface/LHCInfoPerLSRcd.h"
+#include "CondFormats/DataRecord/interface/LHCInfoPerFillRcd.h"
+#include "CondFormats/DataRecord/interface/LHCInfoRcd.h"
+
+#include "CondCore/CondDB/interface/Types.h"
+
+#include <bitset>
+#include <iostream>
+#include <string>
+#include <sstream>
+#include <vector>
+
+class LHCInfoCombined {
+public:
+
+  LHCInfoCombined() = default;
+
+  LHCInfoCombined(const LHCInfo& lhcInfo);
+  LHCInfoCombined(const LHCInfoPerLS& infoPerLS, const LHCInfoPerFill& infoPerFill);
+  LHCInfoCombined(const edm::EventSetup &iSetup,
+        const edm::ESGetToken<LHCInfoPerLS, LHCInfoPerLSRcd>& tokenInfoPerLS,
+        const edm::ESGetToken<LHCInfoPerFill, LHCInfoPerFillRcd>& tokenInfoPerFill,
+        const edm::ESGetToken<LHCInfo, LHCInfoRcd>& tokenInfo);
+
+  void setFromLHCInfo(const LHCInfo& lhcInfo);
+  void setFromPerLS(const LHCInfoPerLS& infoPerLS);
+  void setFromPerFill(const LHCInfoPerFill& infoPerFill);
+
+  float crossingAngleX;
+  float crossingAngleY;
+  float betaStarX;
+  float betaStarY;
+  float energy;
+
+  void print(std::stringstream& ss) const;
+};
+
+std::ostream& operator<<(std::ostream& os, LHCInfoCombined beamInfo);
+
+#endif  // CondFormats_RunInfo_LHCInfoCombined_H