diff --git a/CalibPPS/TimingCalibration/python/ALCARECOPPSDiamondSampicTimingCalibHarvester_cff.py b/CalibPPS/TimingCalibration/python/ALCARECOPPSDiamondSampicTimingCalibHarvester_cff.py index 1c6ecf70c86a7..c4d3106a70710 100644 --- a/CalibPPS/TimingCalibration/python/ALCARECOPPSDiamondSampicTimingCalibHarvester_cff.py +++ b/CalibPPS/TimingCalibration/python/ALCARECOPPSDiamondSampicTimingCalibHarvester_cff.py @@ -1,5 +1,5 @@ import FWCore.ParameterSet.Config as cms - +from DQMServices.Components.EDMtoMEConverter_cfi import EDMtoMEConverter from Geometry.VeryForwardGeometry.geometryRPFromDB_cfi import * from CalibPPS.TimingCalibration.PPSDiamondSampicTimingCalibrationPCLHarvester_cfi import * @@ -9,5 +9,11 @@ from DQMServices.Core.DQMEDHarvester import DQMEDHarvester dqmEnv = DQMEDHarvester('DQMHarvestingMetadata', subSystemFolder=cms.untracked.string('AlCaReco/PPSDiamondSampicTimingCalibrationPCL/AlignedChannels')) - -ALCAHARVESTPPSDiamondSampicTimingCalibration = cms.Sequence(PPSDiamondSampicTimingCalibrationPCLHarvester + dqmEnv) + +EDMtoMEConvertPPSTimingSampicCalibration = EDMtoMEConverter.clone() +EDMtoMEConvertPPSTimingSampicCalibration.lumiInputTag = cms.InputTag("EDMtoMEConvertPPSTimingSampicCalibration", "MEtoEDMConverterLumi") +EDMtoMEConvertPPSTimingSampicCalibration.runInputTag = cms.InputTag("EDMtoMEConvertPPSTimingSampicCalibration", "MEtoEDMConverterRun") + +ALCAHARVESTPPSDiamondSampicTimingCalibration = cms.Sequence(EDMtoMEConvertPPSTimingSampicCalibration + + PPSDiamondSampicTimingCalibrationPCLHarvester + + dqmEnv) diff --git a/CalibPPS/TimingCalibration/python/PPSTimingCalibrationHarvester_cff.py b/CalibPPS/TimingCalibration/python/PPSTimingCalibrationHarvester_cff.py index 5fcabfa63217e..d9ac61918802f 100644 --- a/CalibPPS/TimingCalibration/python/PPSTimingCalibrationHarvester_cff.py +++ b/CalibPPS/TimingCalibration/python/PPSTimingCalibrationHarvester_cff.py @@ -2,3 +2,14 @@ from Geometry.VeryForwardGeometry.geometryRPFromDB_cfi import * from CalibPPS.TimingCalibration.ppsTimingCalibrationPCLHarvester_cfi import * +from DQMServices.Components.EDMtoMEConverter_cfi import EDMtoMEConverter + +EDMtoMEConvertPPSTimingCalibration = EDMtoMEConverter.clone() +EDMtoMEConvertPPSTimingCalibration.lumiInputTag = cms.InputTag("EDMtoMEConvertPPSTimingCalibration", "MEtoEDMConverterLumi") +EDMtoMEConvertPPSTimingCalibration.runInputTag = cms.InputTag("EDMtoMEConvertPPSTimingCalibration", "MEtoEDMConverterRun") + + +ALCAHARVESTPPSTimingCalibration = cms.Task( + EDMtoMEConvertPPSTimingCalibration, + ppsTimingCalibrationPCLHarvester +) diff --git a/Configuration/StandardSequences/python/AlCaHarvesting_cff.py b/Configuration/StandardSequences/python/AlCaHarvesting_cff.py index 0050299b593dc..efdb9b864590b 100644 --- a/Configuration/StandardSequences/python/AlCaHarvesting_cff.py +++ b/Configuration/StandardSequences/python/AlCaHarvesting_cff.py @@ -228,7 +228,6 @@ # -------------------------------------------------------------------------------------- # PPS calibration -ALCAHARVESTPPSTimingCalibration = ppsTimingCalibrationPCLHarvester.clone() ALCAHARVESTPPSTimingCalibration_metadata = cms.PSet(record = cms.untracked.string('PPSTimingCalibrationRcd')) ALCAHARVESTPPSTimingCalibration_dbOutput = cms.PSet(record = cms.string('PPSTimingCalibrationRcd'), tag = cms.string('PPSDiamondTimingCalibration_pcl'),