From ab32d50ded0e41de32cac23c230d4681f1952c46 Mon Sep 17 00:00:00 2001 From: Jose Date: Fri, 11 Feb 2022 06:41:22 +0100 Subject: [PATCH] AlCaReco for AlCaLumiPixels in Run3 --- .../plugins/CorrPCCProducer.cc | 3 +- .../plugins/RawPCCProducer.cc | 109 +++++++++--------- .../ALCARECOAlCaPCCRandom_Output_cff.py | 2 +- .../python/ALCARECOAlCaPCCRandom_cff.py | 19 +-- .../ALCARECOAlCaPCCZeroBias_Output_cff.py | 2 +- .../python/ALCARECOAlCaPCCZeroBias_cff.py | 21 +--- .../ALCARECORawPCCProducer_Output_cff.py | 5 +- .../python/ALCARECORawPCCProducer_cff.py | 32 ++--- .../python/alcaPCCIntegrator_cfi.py | 9 ++ .../python/alcaRawPCCProducer_cfi.py | 12 +- .../python/relval_production.py | 2 +- .../python/relval_steps.py | 14 ++- 12 files changed, 112 insertions(+), 118 deletions(-) create mode 100644 Calibration/LumiAlCaRecoProducers/python/alcaPCCIntegrator_cfi.py diff --git a/Calibration/LumiAlCaRecoProducers/plugins/CorrPCCProducer.cc b/Calibration/LumiAlCaRecoProducers/plugins/CorrPCCProducer.cc index ae52383a8e945..576b7718cb198 100644 --- a/Calibration/LumiAlCaRecoProducers/plugins/CorrPCCProducer.cc +++ b/Calibration/LumiAlCaRecoProducers/plugins/CorrPCCProducer.cc @@ -4,8 +4,9 @@ class: CorrPCCProducer.cc description: Computes the type 1 and type 2 corrections to the luminosity type 1 - first (spillover from previous BXs real clusters) type 2 - after (comes from real activation) + pedestal - is a constant noise term for low lumi period -authors:Sam Higginbotham (shigginb@cern.ch) and Chris Palmer (capalmer@cern.ch) +authors:Sam Higginbotham (shigginb@cern.ch) and Chris Palmer (capalmer@cern.ch) , Jose Benitez (jose.benitez@cern.ch) ________________________________________________________________**/ #include diff --git a/Calibration/LumiAlCaRecoProducers/plugins/RawPCCProducer.cc b/Calibration/LumiAlCaRecoProducers/plugins/RawPCCProducer.cc index f7b7013d2a9be..2b968686901d6 100644 --- a/Calibration/LumiAlCaRecoProducers/plugins/RawPCCProducer.cc +++ b/Calibration/LumiAlCaRecoProducers/plugins/RawPCCProducer.cc @@ -4,7 +4,7 @@ class: RawPCCProducer.cc description: Creates a LumiInfo object that will contain the luminosity per bunch crossing, along with the total luminosity and the statistical error. -authors:Sam Higginbotham (shigginb@cern.ch) and Chris Palmer (capalmer@cern.ch) +authors:Sam Higginbotham (shigginb@cern.ch), Chris Palmer (capalmer@cern.ch), Jose Benitez (jose.benitez@cern.ch) ________________________________________________________________**/ #include @@ -40,43 +40,45 @@ class RawPCCProducer : public edm::global::EDProducer pccToken_; + //background corrections from DB const edm::ESGetToken lumiCorrectionsToken_; - const edm::EDPutTokenT putToken_; - const std::string takeAverageValue_; //Output average values + //The list of modules to skip in the lumi calc. + const std::vector modVeto_; + //background corrections + const bool applyCorr_; + //Output average values + const std::string takeAverageValue_; - const std::vector modVeto_; //The list of modules to skip in the lumi calc. + //output object labels + const edm::EDPutTokenT putToken_; + //produce csv lumi file + const bool saveCSVFile_; const std::string csvOutLabel_; mutable std::mutex fileLock_; - const bool saveCSVFile_; - - const bool applyCorr_; }; //-------------------------------------------------------------------------------------------------- RawPCCProducer::RawPCCProducer(const edm::ParameterSet& iConfig) - : lumiCorrectionsToken_(esConsumes()), - putToken_{produces( + : pccToken_(consumes(edm::InputTag( + iConfig.getParameter("RawPCCProducerParameters").getParameter("inputPccLabel"), + iConfig.getParameter("RawPCCProducerParameters").getParameter("ProdInst")))), + lumiCorrectionsToken_(esConsumes()), + modVeto_( + iConfig.getParameter("RawPCCProducerParameters").getParameter>("modVeto")), + applyCorr_(iConfig.getParameter("RawPCCProducerParameters") + .getUntrackedParameter("ApplyCorrections", false)), + takeAverageValue_(iConfig.getParameter("RawPCCProducerParameters") + .getUntrackedParameter("OutputValue", std::string("Average"))), + putToken_(produces( iConfig.getParameter("RawPCCProducerParameters") - .getUntrackedParameter("outputProductName", "alcaLumi"))}, - takeAverageValue_{iConfig.getParameter("RawPCCProducerParameters") - .getUntrackedParameter("OutputValue", std::string("Totals"))}, - modVeto_{ - iConfig.getParameter("RawPCCProducerParameters").getParameter>("modVeto")}, - csvOutLabel_{iConfig.getParameter("RawPCCProducerParameters") - .getUntrackedParameter("label", std::string("rawPCC.csv"))}, - saveCSVFile_{iConfig.getParameter("RawPCCProducerParameters") - .getUntrackedParameter("saveCSVFile", false)}, - applyCorr_{iConfig.getParameter("RawPCCProducerParameters") - .getUntrackedParameter("ApplyCorrections", false)} { - auto pccSource = - iConfig.getParameter("RawPCCProducerParameters").getParameter("inputPccLabel"); - auto prodInst = - iConfig.getParameter("RawPCCProducerParameters").getParameter("ProdInst"); - - pccToken_ = consumes(edm::InputTag(pccSource, prodInst)); -} + .getUntrackedParameter("outputProductName", "alcaLumi"))), + saveCSVFile_(iConfig.getParameter("RawPCCProducerParameters") + .getUntrackedParameter("saveCSVFile", false)), + csvOutLabel_(iConfig.getParameter("RawPCCProducerParameters") + .getUntrackedParameter("label", std::string("rawPCC.csv"))) {} //-------------------------------------------------------------------------------------------------- RawPCCProducer::~RawPCCProducer() {} @@ -87,45 +89,48 @@ void RawPCCProducer::produce(edm::StreamID, edm::Event& iEvent, const edm::Event //-------------------------------------------------------------------------------------------------- void RawPCCProducer::globalEndLuminosityBlockProduce(edm::LuminosityBlock& lumiSeg, const edm::EventSetup& iSetup) const { - float totalLumi = 0.0; //The total raw luminosity from the pixel clusters - not scaled - float statErrOnLumi = 0.0; //the statistical error on the lumi - large num ie sqrt(N) + //The total raw luminosity from the pixel clusters - not scaled + float totalLumi = 0.0; + //the statistical error on the lumi - large num ie sqrt(N) + float statErrOnLumi = 0.0; //new vector containing clusters per bxid std::vector clustersPerBXOutput(LumiConstants::numBX, 0); //new vector containing clusters per bxid with afterglow corrections std::vector corrClustersPerBXOutput(LumiConstants::numBX, 0); - //The indicies of all the good modules - not vetoed - std::vector goodMods; - - edm::Handle pccHandle; - lumiSeg.getByToken(pccToken_, pccHandle); - + ////////////////////////////////// + /// read input , clusters per module per bx + ///////////////////////////////// + const edm::Handle pccHandle = lumiSeg.getHandle(pccToken_); const reco::PixelClusterCounts& inputPcc = *(pccHandle.product()); - //vector with Module IDs 1-1 map to bunch x-ing in clusers auto modID = inputPcc.readModID(); //vector with total events at each bxid. auto events = inputPcc.readEvents(); + //cluster counts per module per bx auto clustersPerBXInput = inputPcc.readCounts(); - //making list of modules to sum over + //////////////////////////// + ///Apply the module veto + /////////////////////////// + std::vector goodMods; for (unsigned int i = 0; i < modID.size(); i++) { if (std::find(modVeto_.begin(), modVeto_.end(), modID.at(i)) == modVeto_.end()) { goodMods.push_back(i); } } - - //summing over good modules only for (int bx = 0; bx < int(LumiConstants::numBX); bx++) { for (unsigned int i = 0; i < goodMods.size(); i++) { clustersPerBXOutput.at(bx) += clustersPerBXInput.at(goodMods.at(i) * int(LumiConstants::numBX) + bx); } } + ////////////////////////////// + //// Apply afterglow corrections + ////////////////////////////// std::vector correctionScaleFactors; if (applyCorr_) { - //Get PCC corrections from the event setup through a token const auto pccCorrections = &iSetup.getData(lumiCorrectionsToken_); correctionScaleFactors = pccCorrections->getCorrectionsBX(); } else { @@ -145,14 +150,14 @@ void RawPCCProducer::globalEndLuminosityBlockProduce(edm::LuminosityBlock& lumiS std::vector errorPerBX; //Stat error (or number of events) errorPerBX.assign(events.begin(), events.end()); + ////////////////////////////////// + /// Compute average number of clusters per event + //////////////////////////////// if (takeAverageValue_ == "Average") { unsigned int NActiveBX = 0; for (int bx = 0; bx < int(LumiConstants::numBX); bx++) { if (events[bx] > 0) { NActiveBX++; - // Counting where events are will only work - // for ZeroBias or AlwaysTrue triggers. - // Random triggers will get all BXs. corrClustersPerBXOutput[bx] /= float(events[bx]); errorPerBX[bx] = 1 / sqrt(float(events[bx])); } @@ -163,14 +168,16 @@ void RawPCCProducer::globalEndLuminosityBlockProduce(edm::LuminosityBlock& lumiS } } + /////////////////////////////////////////////////////// + ///Lumi saved in the LuminosityBlocks LumiInfo outputLumiInfo; - outputLumiInfo.setTotalInstLumi(totalLumi); outputLumiInfo.setTotalInstStatError(statErrOnLumi); - outputLumiInfo.setErrorLumiAllBX(errorPerBX); outputLumiInfo.setInstLumiAllBX(corrClustersPerBXOutput); + lumiSeg.emplace(putToken_, std::move(outputLumiInfo)); + //Lumi saved in the csv file if (saveCSVFile_) { std::lock_guard lock(fileLock_); std::ofstream csfile(csvOutLabel_, std::ios_base::app); @@ -178,18 +185,12 @@ void RawPCCProducer::globalEndLuminosityBlockProduce(edm::LuminosityBlock& lumiS csfile << std::to_string(lumiSeg.luminosityBlock()) << ","; csfile << std::to_string(totalLumi); - if (totalLumi > 0) { - for (unsigned int bx = 0; bx < LumiConstants::numBX; bx++) { - csfile << "," << std::to_string(corrClustersPerBXOutput[bx]); - } - csfile << std::endl; - } else if (totalLumi < 0) { - edm::LogInfo("WARNING") << "WHY IS LUMI NEGATIVE?!?!?!? " << totalLumi; - } + for (unsigned int bx = 0; bx < LumiConstants::numBX; bx++) + csfile << "," << std::to_string(corrClustersPerBXOutput[bx]); + csfile << std::endl; csfile.close(); } - lumiSeg.emplace(putToken_, std::move(outputLumiInfo)); } DEFINE_FWK_MODULE(RawPCCProducer); diff --git a/Calibration/LumiAlCaRecoProducers/python/ALCARECOAlCaPCCRandom_Output_cff.py b/Calibration/LumiAlCaRecoProducers/python/ALCARECOAlCaPCCRandom_Output_cff.py index 1b20ec6eeb03c..d12bbdca9c7e2 100644 --- a/Calibration/LumiAlCaRecoProducers/python/ALCARECOAlCaPCCRandom_Output_cff.py +++ b/Calibration/LumiAlCaRecoProducers/python/ALCARECOAlCaPCCRandom_Output_cff.py @@ -6,7 +6,7 @@ SelectEvents = cms.vstring('pathALCARECOAlCaPCCRandom') ), outputCommands = cms.untracked.vstring( - 'keep *_*alcaPCCProducerRandom*_*_*') + 'keep *_alcaPCCIntegratorRandom_alcaPCCRandom_*') ) diff --git a/Calibration/LumiAlCaRecoProducers/python/ALCARECOAlCaPCCRandom_cff.py b/Calibration/LumiAlCaRecoProducers/python/ALCARECOAlCaPCCRandom_cff.py index 149eb1d7f3854..e5e925da1d2cd 100644 --- a/Calibration/LumiAlCaRecoProducers/python/ALCARECOAlCaPCCRandom_cff.py +++ b/Calibration/LumiAlCaRecoProducers/python/ALCARECOAlCaPCCRandom_cff.py @@ -9,20 +9,13 @@ throw = cms.bool(False) # tolerate triggers stated above, but not available ) -from EventFilter.SiPixelRawToDigi.SiPixelRawToDigi_cfi import siPixelDigis -siPixelDigisForLumiR = siPixelDigis.cpu.clone( - InputLabel = "hltFEDSelectorLumiPixels" -) -from RecoLocalTracker.SiPixelClusterizer.SiPixelClusterizerPreSplitting_cfi import siPixelClustersPreSplitting -siPixelClustersForLumiR = siPixelClustersPreSplitting.cpu.clone( - src = "siPixelDigisForLumiR" -) +from Calibration.LumiAlCaRecoProducers.alcaPCCIntegrator_cfi import alcaPCCIntegrator +alcaPCCIntegratorRandom = alcaPCCIntegrator.clone() +alcaPCCIntegratorRandom.AlcaPCCIntegratorParameters.inputPccLabel="hltAlcaPixelClusterCounts" +alcaPCCIntegratorRandom.AlcaPCCIntegratorParameters.trigstring = "alcaPCCEvent" +alcaPCCIntegratorRandom.AlcaPCCIntegratorParameters.ProdInst = "alcaPCCRandom" -from Calibration.LumiAlCaRecoProducers.alcaPCCProducer_cfi import alcaPCCProducer -alcaPCCProducerRandom = alcaPCCProducer.clone() -alcaPCCProducerRandom.pixelClusterLabel = cms.InputTag("siPixelClustersForLumiR") -alcaPCCProducerRandom.trigstring = cms.untracked.string("alcaPCCRandom") # Sequence # -seqALCARECOAlCaPCCRandom = cms.Sequence(ALCARECORandomHLT + siPixelDigisForLumiR + siPixelClustersForLumiR + alcaPCCProducerRandom) +seqALCARECOAlCaPCCRandom = cms.Sequence(ALCARECORandomHLT+alcaPCCIntegratorRandom) diff --git a/Calibration/LumiAlCaRecoProducers/python/ALCARECOAlCaPCCZeroBias_Output_cff.py b/Calibration/LumiAlCaRecoProducers/python/ALCARECOAlCaPCCZeroBias_Output_cff.py index b31a6794dc8a6..7b6956039a2d7 100644 --- a/Calibration/LumiAlCaRecoProducers/python/ALCARECOAlCaPCCZeroBias_Output_cff.py +++ b/Calibration/LumiAlCaRecoProducers/python/ALCARECOAlCaPCCZeroBias_Output_cff.py @@ -6,7 +6,7 @@ SelectEvents = cms.vstring('pathALCARECOAlCaPCCZeroBias') ), outputCommands = cms.untracked.vstring( - 'keep *_*alcaPCCProducerZeroBias_*_*') + 'keep *_alcaPCCIntegratorZeroBias_alcaPCCZeroBias_*') ) diff --git a/Calibration/LumiAlCaRecoProducers/python/ALCARECOAlCaPCCZeroBias_cff.py b/Calibration/LumiAlCaRecoProducers/python/ALCARECOAlCaPCCZeroBias_cff.py index cce52734afeb0..86abf9d876c88 100644 --- a/Calibration/LumiAlCaRecoProducers/python/ALCARECOAlCaPCCZeroBias_cff.py +++ b/Calibration/LumiAlCaRecoProducers/python/ALCARECOAlCaPCCZeroBias_cff.py @@ -9,20 +9,11 @@ throw = cms.bool(False) # tolerate triggers stated above, but not available ) -from EventFilter.SiPixelRawToDigi.SiPixelRawToDigi_cfi import siPixelDigis -siPixelDigisForLumiZB = siPixelDigis.cpu.clone( - InputLabel = "hltFEDSelectorLumiPixels" -) - -from RecoLocalTracker.SiPixelClusterizer.SiPixelClusterizerPreSplitting_cfi import siPixelClustersPreSplitting -siPixelClustersForLumiZB = siPixelClustersPreSplitting.cpu.clone( - src = "siPixelDigisForLumiZB" -) +from Calibration.LumiAlCaRecoProducers.alcaPCCIntegrator_cfi import alcaPCCIntegrator +alcaPCCIntegratorZeroBias = alcaPCCIntegrator.clone() +alcaPCCIntegratorZeroBias.AlcaPCCIntegratorParameters.inputPccLabel="hltAlcaPixelClusterCounts" +alcaPCCIntegratorZeroBias.AlcaPCCIntegratorParameters.trigstring = "alcaPCCEvent" +alcaPCCIntegratorZeroBias.AlcaPCCIntegratorParameters.ProdInst = "alcaPCCZeroBias" -from Calibration.LumiAlCaRecoProducers.alcaPCCProducer_cfi import alcaPCCProducer -alcaPCCProducerZeroBias = alcaPCCProducer.clone() -alcaPCCProducerZeroBias.pixelClusterLabel = cms.InputTag("siPixelClustersForLumiZB") -alcaPCCProducerZeroBias.trigstring = cms.untracked.string("alcaPCCZeroBias") -# Sequence # -seqALCARECOAlCaPCCZeroBias = cms.Sequence(ALCARECOZeroBiasHLT + siPixelDigisForLumiZB + siPixelClustersForLumiZB + alcaPCCProducerZeroBias) +seqALCARECOAlCaPCCZeroBias = cms.Sequence(ALCARECOZeroBiasHLT + alcaPCCIntegratorZeroBias) diff --git a/Calibration/LumiAlCaRecoProducers/python/ALCARECORawPCCProducer_Output_cff.py b/Calibration/LumiAlCaRecoProducers/python/ALCARECORawPCCProducer_Output_cff.py index 6dab76239db5d..b511d693bc5ce 100644 --- a/Calibration/LumiAlCaRecoProducers/python/ALCARECORawPCCProducer_Output_cff.py +++ b/Calibration/LumiAlCaRecoProducers/python/ALCARECORawPCCProducer_Output_cff.py @@ -6,8 +6,9 @@ SelectEvents = cms.vstring('pathALCARECORawPCCProducer') ), outputCommands = cms.untracked.vstring( - 'keep *_rawPCCProd_*_*') - ) + 'keep *_ALCARECORawPCCProd*_*_*' + ) +) import copy diff --git a/Calibration/LumiAlCaRecoProducers/python/ALCARECORawPCCProducer_cff.py b/Calibration/LumiAlCaRecoProducers/python/ALCARECORawPCCProducer_cff.py index 82af696afdb3a..6afaea0fa4ab9 100644 --- a/Calibration/LumiAlCaRecoProducers/python/ALCARECORawPCCProducer_cff.py +++ b/Calibration/LumiAlCaRecoProducers/python/ALCARECORawPCCProducer_cff.py @@ -1,24 +1,16 @@ import FWCore.ParameterSet.Config as cms +from Calibration.LumiAlCaRecoProducers.alcaRawPCCProducer_cfi import * +ALCARECORawPCCProd = rawPCCProd.clone() +ALCARECORawPCCProd.RawPCCProducerParameters.inputPccLabel="alcaPCCIntegratorZeroBias" +ALCARECORawPCCProd.RawPCCProducerParameters.ProdInst="alcaPCCZeroBias" +ALCARECORawPCCProd.RawPCCProducerParameters.outputProductName="rawPCCProd" +ALCARECORawPCCProd.RawPCCProducerParameters.OutputValue="Average" +ALCARECORawPCCProd.RawPCCProducerParameters.ApplyCorrections=True +ALCARECORawPCCProd.RawPCCProducerParameters.saveCSVFile=False # .csv file may be retrived from PromtReco Crab jobs (saved into dataset) -from Calibration.LumiAlCaRecoProducers.ALCARECOAlCaPCCZeroBias_cff import seqALCARECOAlCaPCCZeroBias +#additional instance with no background corrections, useful for low lumi runs where corrections are invalid +ALCARECORawPCCProdUnCorr = ALCARECORawPCCProd.clone() +ALCARECORawPCCProdUnCorr.RawPCCProducerParameters.ApplyCorrections=False -#Make sure that variables match in producer.cc and .h -ALCARECORawPCCProd = cms.EDProducer("RawPCCProducer", - RawPCCProducerParameters = cms.PSet( - #Mod factor to count lumi and the string to specify output - inputPccLabel = cms.string("alcaPCCProducerZeroBias"), - ProdInst = cms.string("alcaPCCZeroBias"), - OutputValue = cms.untracked.string("Average"), - outputProductName = cms.untracked.string("rawPCZeroBias"), - #Below is a list of module IDs that will be ignored in calculation of luminosity - ApplyCorrections = cms.untracked.bool(True), - modVeto=cms.vint32() - ) -) - -ALCARECORawPCCProd.RawPCCProducerParameters.modVeto.extend([302055684,302055688,302055692,302055696,302055700,302055704,302055708,302055712,302055940,302055944,302055948,302055952,302055956,302055960,302055964,302055968,302056196,302056200,302056204,302056208,302056212,302056216,302056220,302056224,302056452,302056456,302056460,302056464,302056468,302056472,302056476,302056480,302056708,302056712,302056716,302056720,302056724,302056728,302056732,302056736,302056964,302056968,302056972,302056976,302056980,302056984,302056988,302056992,302057220,302057224,302057228,302057232,302057236,302057240,302057244,302057248,302057476,302057480,302057484,302057488,302057492,302057496,302057500,302057504,302057732,302057736,302057740,302057744,302057748,302057752,302057756,302057760,302057988,302057992,302057996,302058000,302058004,302058008,302058012,302058016,302058244,302058248,302058252,302058256,302058260,302058264,302058268,302058272,302058500,302058504,302058508,302058512,302058516,302058520,302058524,302058528,302058756,302058760,302058764,302058768,302058772,302058776,302058780,302058784,302059012,302059016,302059020,302059024,302059028,302059032,302059036,302059040,302059268,302059272,302059276,302059280,302059284,302059288,302059292,302059296,302059524,302059528,302059532,302059536,302059540,302059544,302059548,302059552,302059780,302059784,302059788,302059792,302059796,302059800,302059804,302059808,302060036,302060040,302060044,302060048,302060052,302060056,302060060,302060064,302060292,302060296,302060300,302060304,302060308,302060312,302060316,302060320,302060548,302060552,302060556,302060560,302060564,302060568,302060572,302060576,303042564,303042568,303042572,303042576,303042580,303042584,303042588,303042592,303046660,303046664,303046668,303046672,303046676,303046680,303046684,303046688,303050756,303050760,303050764,303050768,303050772,303050776,303050780,303050784,303054852,303054856,303054860,303054864,303054868,303054872,303054876,303054880,303058948,303058952,303058956,303058960,303058964,303058968,303058972,303058976,303063044,303063048,303063052,303063056,303063060,303063064,303063068,303063072,303067140,303067144,303067148,303067152,303067156,303067160,303067164,303067168,303071236,303071240,303071244,303071248,303071252,303071256,303071260,303071264,303075332,303075336,303075340,303075344,303075348,303075352,303075356,303075360,303079428,303079432,303079436,303079440,303079444,303079448,303079452,303079456,303083524,303083528,303083532,303083536,303083540,303083544,303083548,303083552,303087620,303087624,303087628,303087632,303087636,303087640,303087644,303087648,304091140,304091144,304091148,304091156,304091160,304091164,304091168,304095236,304095240,304095244,304095248,304095252,304095256,304095260,304095264,304099332,304099344,304099348,304099352,304099356,304099360,304103428,304103432,304103436,304103440,304103444,304103448,304103452,304103456,304107524,304107528,304107532,304107536,304107540,304107544,304107548,304111620,304111624,304111628,304111632,304111636,304111640,304111644,304111648,304115716,304115720,304115724,304115728,304115732,304115736,304115740,304115744,304119812,304119816,304119820,304119828,304119832,304119836,304119840,304123908,304123912,304123916,304123924,304123928,304123932,304123936,304128004,304128008,304128012,304128016,304128020,304128024,304128028,304128032,304132100,304132104,304132108,304132112,304132116,304132120,304132124,304132128,304136196,304136200,304136204,304136212,304136216,304136220,304136224,304140292,304140296,304140300,304140304,304144388,304144392,304144396,304144400,304148484,304148488,304148492,304148496,304148500,304148504,304148508,304148512,304152580,304152584,304152588,304152592,304152596,304152600,304152604,304152608,304156676,304156680,304156684,304156688,304156692,304156696,304156700,304156704,304160772,304160776,304160780,304160788,304160792,304160796,304160800,304164868,304164872,304164876,304164880,304164884,304164888,304164892,304164896,304168964,304168968,304168972,304168976,304168980,304168984,304168988,304168992,304173060,304173064,304173068,304173072,304173076,304173080,304173084,304173088,304177156,304177160,304177164,304177168,304177172,304177176,304177180,304177184,304181252,304181256,304181260,304181264,304181268,304181272,304181276,304181280,304185348,304185352,304185356,304185360,304185364,304185368,304185372,304185376,304189444,304189448,304189456,304189460,304189464,304189468,304189472,304193540,304193544,304193548,304193552,304193556,304193560,304193564,304193568,304197636,304197640,304197644,304197648,304197652,304197656,304197660,304197664,304201732,304201736,304201740,304201744,304201748,304201752,304201756,304201760,305139720,305139732,305139736,305139740,305139744,305143812,305143816,305143824,305143840,305147908,305147928,305147932,305152008,305152020,305152024,305152028,305156108,305156112,305156116,305156120,305156124,305156128,305160200,305160204,305160216,305160220,305160224,305164312,305168392,305168412,305168416,305172488,305172492,305172496,305172500,305172512,305176580,305176584,305176588,305176592,305176596,305176604,305180676,305180680,305180696,305184784,305184792,305184800,305188868,305188872,305188876,305188880,305188888,305188896,305192968,305192972,305192976,305192980,305192984,305192988,305192992,305197060,305197064,305197076,305197080,305197084,305197088,305201172,305205252,305205268,305205272,305205276,305205280,305209352,305209356,305209364,305209368,305209372,305209376,305213452,305213464,305213468,305213472,305217540,305217544,305217548,305221644,305225732,305225744,305229828,305229832,305229836,305229840,305233924,305233928,305233932,305233936,305233948,305238020,305238024,305238028,305238032,305242128,305242140,305246216,305246220,305250320,305250324,305250328,305250336,305254404,305254408,305254412,305254416,305254420,305254424,305254428,305258500,305258504,305258508,305258512,305258516,305258524,305258528,305262596,305262612,305262620,305266692,305266704,305266708,305266712,305270788,305270796,305270808,305274884,305274912,305278980,305278984,305279000,305279004,305283092,305283096,305283104,305287176,305287180,305287200,305291272,305291284,305291288,305291292,305291296,305295372,305295376,305295380,305295384,305295388,305295392,305299460,305299472,305299480,305299484,305299488,305303556,305303564,305303568,305303572,305303580,305303584,305307652,305307660,305307664,305307672,305307676,305307680,305311748,305311756,305311768,305315844,305315860,305315864,305315868,306188296,306188300,306188312,306188316,306188320,306192392,306196484,306196504,306200580,306200600,306200608,306204676,306204680,306204692,306204696,306208796,306212872,306212876,306212880,306212892,306212896,306216964,306216984,306216992,306221068,306221072,306221080,306221084,306221088,306225156,306229252,306229260,306229268,306233348,306233352,306233368,306233376,306237456,306237468,306237472,306241540,306241552,306241560,306241564,306241568,306245636,306245644,306245656,306249740,306249756,306253832,306257948,306257952,306262024,306262040,306262044,306262048,306266116,306266132,306266144,306270212,306270228,306274316,306274320,306274332,306274336,306278404,306278412,306282516,306282520,306282528,306286596,306286600,306286620,306286624,306290708,306290712,306290716,306290720,306294796,306294808,306294812,306294816,306298892,306298900,306298908,306298912,306302980,306303000,306307076,306307080,306307088,306307096,306307104,306311176,306311180,306311188,306311200,306315268,306315272,306315276,306315288,306315292,306319372,306319376,306323472,306323480,306323488,306327568,306327580,306327584,306331664,306331668,306335748,306335768,306339860,306339864,306339868,306339872,306343940,306343956,306348044,306348056,306348060,306348064,306352156,306352160,306356232,306356244,306356248,306356256,306360336,306360340,306360348,306364420,306364432,306364440,306364444,306368524,306368532,306368536,306368540,306368544,306372616,306372636,306376708,306376720,306376732,306380808,306380820,306380828,306380832,306384908,306384912,306384916,306384920,306384924,306384928,306389000,306389008,306389012,306389016,306389020,306389024,306393096,306393108,306393112,306393116,306393120,306397188,306397200,306397204,306397208,306397212,306397216,306401288,306401292,306405392,306405400,306405404,306409480,306409496,306409500,306409504,306413576,306413580,306413596,306417668,306417680,306417684,306417688,306417692,306421764,306421768,306421780,306421784,306425864,306425888,306429960,306429972,306434060,306434064,306434068,306438148,306438152,306438156,306438168,306442248,306446368,344204292,344205316,344208388,344209412,344212484,344213508,344216580,344217604,344220676,344221700,344224772,344225796,344228868,344229892,344232964,344233988,344237060,344241156,344242180,344250372,344254468,344257540,344258564,344261636,344262660,344265732,344266756,344269828,344270852,344274948,344278020,344279044,344282116,344283140,344287236,344290308,344291332,344294404,344295428,344303620,344310788,344311812,344314884,344315908,344318980,344320004,344323076,344324100,344327172,344328196,344331268,344332292,344335364,344336388,344339460,344340484,344347652,344351748,344360964,344365060,344369156,344372228,344376324,344377348,344380420,344381444,344384516,344385540,344388612,344389636,344392708,344393732,344397828,344404996,344409092,344413188,344426500,344462340,344463364,344466436,344467460,344470532,344474628,344478724,344482820,344486916,344491012,344492036,344495108,344496132,344500228,344503300,344504324,344507396,344508420,344512516,344515588,344516612,344520708,344523780,344524804,344527876,344528900,344531972,344532996,344536068,344537092,344540164,344541188,344544260,344545284,344549380,344552452,344556548,344557572,344564740,344568836,344569860,344572932,344577028,344581124,344585220,344594436,344601604,344606724,344610820,344613892,344614916,344617988,344619012,344622084,344623108,344626180,344627204,344631300,344635396,344639492,344643588,344647684,344651780,344654852,344655876,344658948,344659972,344663044,344664068,344667140,344668164,344671236,344672260,344676356,344679428,344680452,344684548,344687620,344688644,344724484,344725508,344728580,344729604,344733700,344736772,344740868,344741892,344744964,344745988,344749060,344750084,344765444,344766468,344769540,344773636,344774660,344777732,344781828,344782852,344785924,344786948,344790020,344791044,344794116,344795140,344798212,344799236,344802308,344803332,344810500,344811524,344814596,344815620,344822788,344843268,344847364,344859652,344860676,344863748,344871940,344876036,344877060,344881156,344884228,344885252,344888324,344900612,344904708,344905732,344908804,344909828,344912900,344913924,344916996,344918020,344921092,344922116,344926212,344933380,344937476,344938500,344942596,344945668,344946692,344950788,352588804,352589828,352592900,352593924,352596996,352601092,352602116,352605188,352606212,352609284,352610308,352613380,352614404,352618500,352621572,352622596,352626692,352630788,352633860,352634884,352637956,352638980,352642052,352643076,352647172,352651268,352654340,352655364,352658436,352659460,352662532,352663556,352666628,352667652,352670724,352671748,352675844,352678916,352683012,352684036,352687108,352688132,352691204,352692228,352695300,352696324,352699396,352700420,352703492,352704516,352707588,352708612,352711684,352712708,352716804,352723972,352728068,352732164,352736260,352737284,352740356,352744452,352745476,352748548,352752644,352760836,352764932,352765956,352770052,352773124,352774148,352778244,352781316,352782340,352786436,352790532,352793604,352794628,352798724,352805892,352806916,352811012,352815108,352850948,352851972,352855044,352856068,352859140,352860164,352863236,352864260,352867332,352868356,352871428,352872452,352888836,352891908,352896004,352900100,352904196,352905220,352908292,352909316,352912388,352913412,352917508,352920580,352921604,352924676,352932868,352941060,352945156,352949252,352950276,352953348,352954372,352957444,352958468,352962564,352965636,352966660,352969732,352970756,352973828,352974852,352999428,353003524,353011716,353014788,353018884,353019908,353022980,353028100,353032196,353035268,353040388,353044484,353047556,353052676,353055748,353056772,353060868,353063940,353068036,353072132,353073156,353076228,353077252,353113092,353114116,353117188,353118212,353121284,353122308,353125380,353126404,353129476,353130500,353133572,353134596,353137668,353141764,353142788,353145860,353146884,353150980,353154052,353158148,353162244,353166340,353170436,353174532,353175556,353178628,353179652,353182724,353183748,353186820,353187844,353190916,353191940,353195012,353196036,353199108,353200132,353203204,353204228,353211396,353212420,353215492,353220612,353223684,353224708,353227780,353228804,353231876,353232900,353235972,353236996,353240068,353244164,353248260,353252356,353253380,353256452,353257476,353260548,353261572,353264644,353273860,353276932,353277956,353281028,353285124,353286148,353289220,353290244,353301508,353302532,353305604,353306628,353309700,353310724,353313796,353314820,353317892,353318916,353321988,353323012,353326084,353327108,353330180,353331204,353334276,353335300,353338372,353339396]) - - - -seqALCARECORawPCCProducer = cms.Sequence(seqALCARECOAlCaPCCZeroBias + ALCARECORawPCCProd) +seqALCARECORawPCCProducer = cms.Sequence(ALCARECORawPCCProd+ALCARECORawPCCProdUnCorr) diff --git a/Calibration/LumiAlCaRecoProducers/python/alcaPCCIntegrator_cfi.py b/Calibration/LumiAlCaRecoProducers/python/alcaPCCIntegrator_cfi.py new file mode 100644 index 0000000000000..e9c8fbc0a96d7 --- /dev/null +++ b/Calibration/LumiAlCaRecoProducers/python/alcaPCCIntegrator_cfi.py @@ -0,0 +1,9 @@ +import FWCore.ParameterSet.Config as cms + +alcaPCCIntegrator = cms.EDProducer("AlcaPCCIntegrator", + AlcaPCCIntegratorParameters = cms.PSet( + inputPccLabel = cms.string("hltAlcaPixelClusterCounts"), + trigstring = cms.untracked.string("alcaPCCEvent"), + ProdInst = cms.string("alcaPCCRandom") + ) +) diff --git a/Calibration/LumiAlCaRecoProducers/python/alcaRawPCCProducer_cfi.py b/Calibration/LumiAlCaRecoProducers/python/alcaRawPCCProducer_cfi.py index d31cd34c4e0ee..5fd6d532347b0 100644 --- a/Calibration/LumiAlCaRecoProducers/python/alcaRawPCCProducer_cfi.py +++ b/Calibration/LumiAlCaRecoProducers/python/alcaRawPCCProducer_cfi.py @@ -1,15 +1,17 @@ import FWCore.ParameterSet.Config as cms +#note this default parameters are used to process the Random stream rawPCCProd = cms.EDProducer("RawPCCProducer", RawPCCProducerParameters = cms.PSet( - #Mod factor to count lumi and the string to specify output - inputPccLabel = cms.string("alcaPCCProducerRandom"), + inputPccLabel = cms.string("alcaPCCIntegratorRandom"), ProdInst = cms.string("alcaPCCRandom"), - resetEveryNLumi = cms.untracked.int32(1), + OutputValue = cms.untracked.string("Totals"), + ApplyCorrections = cms.untracked.bool(False), outputProductName = cms.untracked.string("rawPCCRandom"), - modVeto=cms.vint32() + modVeto=cms.vint32(), + saveCSVFile=cms.untracked.bool(False) ) ) -rawPCCProd.RawPCCProducerParameters.modVeto.extend([302055684,302055688,302055692,302055696,302055700,302055704,302055708,302055712,302055940,302055944,302055948,302055952,302055956,302055960,302055964,302055968,302056196,302056200,302056204,302056208,302056212,302056216,302056220,302056224,302056452,302056456,302056460,302056464,302056468,302056472,302056476,302056480,302056708,302056712,302056716,302056720,302056724,302056728,302056732,302056736,302056964,302056968,302056972,302056976,302056980,302056984,302056988,302056992,302057220,302057224,302057228,302057232,302057236,302057240,302057244,302057248,302057476,302057480,302057484,302057488,302057492,302057496,302057500,302057504,302057732,302057736,302057740,302057744,302057748,302057752,302057756,302057760,302057988,302057992,302057996,302058000,302058004,302058008,302058012,302058016,302058244,302058248,302058252,302058256,302058260,302058264,302058268,302058272,302058500,302058504,302058508,302058512,302058516,302058520,302058524,302058528,302058756,302058760,302058764,302058768,302058772,302058776,302058780,302058784,302059012,302059016,302059020,302059024,302059028,302059032,302059036,302059040,302059268,302059272,302059276,302059280,302059284,302059288,302059292,302059296,302059524,302059528,302059532,302059536,302059540,302059544,302059548,302059552,302059780,302059784,302059788,302059792,302059796,302059800,302059804,302059808,302060036,302060040,302060044,302060048,302060052,302060056,302060060,302060064,302060292,302060296,302060300,302060304,302060308,302060312,302060316,302060320,302060548,302060552,302060556,302060560,302060564,302060568,302060572,302060576,303042564,303042568,303042572,303042576,303042580,303042584,303042588,303042592,303046660,303046664,303046668,303046672,303046676,303046680,303046684,303046688,303050756,303050760,303050764,303050768,303050772,303050776,303050780,303050784,303054852,303054856,303054860,303054864,303054868,303054872,303054876,303054880,303058948,303058952,303058956,303058960,303058964,303058968,303058972,303058976,303063044,303063048,303063052,303063056,303063060,303063064,303063068,303063072,303067140,303067144,303067148,303067152,303067156,303067160,303067164,303067168,303071236,303071240,303071244,303071248,303071252,303071256,303071260,303071264,303075332,303075336,303075340,303075344,303075348,303075352,303075356,303075360,303079428,303079432,303079436,303079440,303079444,303079448,303079452,303079456,303083524,303083528,303083532,303083536,303083540,303083544,303083548,303083552,303087620,303087624,303087628,303087632,303087636,303087640,303087644,303087648,304091140,304091144,304091148,304091156,304091160,304091164,304091168,304095236,304095240,304095244,304095248,304095252,304095256,304095260,304095264,304099332,304099344,304099348,304099352,304099356,304099360,304103428,304103432,304103436,304103440,304103444,304103448,304103452,304103456,304107524,304107528,304107532,304107536,304107540,304107544,304107548,304111620,304111624,304111628,304111632,304111636,304111640,304111644,304111648,304115716,304115720,304115724,304115728,304115732,304115736,304115740,304115744,304119812,304119816,304119820,304119828,304119832,304119836,304119840,304123908,304123912,304123916,304123924,304123928,304123932,304123936,304128004,304128008,304128012,304128016,304128020,304128024,304128028,304128032,304132100,304132104,304132108,304132112,304132116,304132120,304132124,304132128,304136196,304136200,304136204,304136212,304136216,304136220,304136224,304140292,304140296,304140300,304140304,304144388,304144392,304144396,304144400,304148484,304148488,304148492,304148496,304148500,304148504,304148508,304148512,304152580,304152584,304152588,304152592,304152596,304152600,304152604,304152608,304156676,304156680,304156684,304156688,304156692,304156696,304156700,304156704,304160772,304160776,304160780,304160788,304160792,304160796,304160800,304164868,304164872,304164876,304164880,304164884,304164888,304164892,304164896,304168964,304168968,304168972,304168976,304168980,304168984,304168988,304168992,304173060,304173064,304173068,304173072,304173076,304173080,304173084,304173088,304177156,304177160,304177164,304177168,304177172,304177176,304177180,304177184,304181252,304181256,304181260,304181264,304181268,304181272,304181276,304181280,304185348,304185352,304185356,304185360,304185364,304185368,304185372,304185376,304189444,304189448,304189456,304189460,304189464,304189468,304189472,304193540,304193544,304193548,304193552,304193556,304193560,304193564,304193568,304197636,304197640,304197644,304197648,304197652,304197656,304197660,304197664,304201732,304201736,304201740,304201744,304201748,304201752,304201756,304201760,305139720,305139732,305139736,305139740,305139744,305143812,305143816,305143824,305143840,305147908,305147928,305147932,305152008,305152020,305152024,305152028,305156108,305156112,305156116,305156120,305156124,305156128,305160200,305160204,305160216,305160220,305160224,305164312,305168392,305168412,305168416,305172488,305172492,305172496,305172500,305172512,305176580,305176584,305176588,305176592,305176596,305176604,305180676,305180680,305180696,305184784,305184792,305184800,305188868,305188872,305188876,305188880,305188888,305188896,305192968,305192972,305192976,305192980,305192984,305192988,305192992,305197060,305197064,305197076,305197080,305197084,305197088,305201172,305205252,305205268,305205272,305205276,305205280,305209352,305209356,305209364,305209368,305209372,305209376,305213452,305213464,305213468,305213472,305217540,305217544,305217548,305221644,305225732,305225744,305229828,305229832,305229836,305229840,305233924,305233928,305233932,305233936,305233948,305238020,305238024,305238028,305238032,305242128,305242140,305246216,305246220,305250320,305250324,305250328,305250336,305254404,305254408,305254412,305254416,305254420,305254424,305254428,305258500,305258504,305258508,305258512,305258516,305258524,305258528,305262596,305262612,305262620,305266692,305266704,305266708,305266712,305270788,305270796,305270808,305274884,305274912,305278980,305278984,305279000,305279004,305283092,305283096,305283104,305287176,305287180,305287200,305291272,305291284,305291288,305291292,305291296,305295372,305295376,305295380,305295384,305295388,305295392,305299460,305299472,305299480,305299484,305299488,305303556,305303564,305303568,305303572,305303580,305303584,305307652,305307660,305307664,305307672,305307676,305307680,305311748,305311756,305311768,305315844,305315860,305315864,305315868,306188296,306188300,306188312,306188316,306188320,306192392,306196484,306196504,306200580,306200600,306200608,306204676,306204680,306204692,306204696,306208796,306212872,306212876,306212880,306212892,306212896,306216964,306216984,306216992,306221068,306221072,306221080,306221084,306221088,306225156,306229252,306229260,306229268,306233348,306233352,306233368,306233376,306237456,306237468,306237472,306241540,306241552,306241560,306241564,306241568,306245636,306245644,306245656,306249740,306249756,306253832,306257948,306257952,306262024,306262040,306262044,306262048,306266116,306266132,306266144,306270212,306270228,306274316,306274320,306274332,306274336,306278404,306278412,306282516,306282520,306282528,306286596,306286600,306286620,306286624,306290708,306290712,306290716,306290720,306294796,306294808,306294812,306294816,306298892,306298900,306298908,306298912,306302980,306303000,306307076,306307080,306307088,306307096,306307104,306311176,306311180,306311188,306311200,306315268,306315272,306315276,306315288,306315292,306319372,306319376,306323472,306323480,306323488,306327568,306327580,306327584,306331664,306331668,306335748,306335768,306339860,306339864,306339868,306339872,306343940,306343956,306348044,306348056,306348060,306348064,306352156,306352160,306356232,306356244,306356248,306356256,306360336,306360340,306360348,306364420,306364432,306364440,306364444,306368524,306368532,306368536,306368540,306368544,306372616,306372636,306376708,306376720,306376732,306380808,306380820,306380828,306380832,306384908,306384912,306384916,306384920,306384924,306384928,306389000,306389008,306389012,306389016,306389020,306389024,306393096,306393108,306393112,306393116,306393120,306397188,306397200,306397204,306397208,306397212,306397216,306401288,306401292,306405392,306405400,306405404,306409480,306409496,306409500,306409504,306413576,306413580,306413596,306417668,306417680,306417684,306417688,306417692,306421764,306421768,306421780,306421784,306425864,306425888,306429960,306429972,306434060,306434064,306434068,306438148,306438152,306438156,306438168,306442248,306446368,344204292,344205316,344208388,344209412,344212484,344213508,344216580,344217604,344220676,344221700,344224772,344225796,344228868,344229892,344232964,344233988,344237060,344241156,344242180,344250372,344254468,344257540,344258564,344261636,344262660,344265732,344266756,344269828,344270852,344274948,344278020,344279044,344282116,344283140,344287236,344290308,344291332,344294404,344295428,344303620,344310788,344311812,344314884,344315908,344318980,344320004,344323076,344324100,344327172,344328196,344331268,344332292,344335364,344336388,344339460,344340484,344347652,344351748,344360964,344365060,344369156,344372228,344376324,344377348,344380420,344381444,344384516,344385540,344388612,344389636,344392708,344393732,344397828,344404996,344409092,344413188,344426500,344462340,344463364,344466436,344467460,344470532,344474628,344478724,344482820,344486916,344491012,344492036,344495108,344496132,344500228,344503300,344504324,344507396,344508420,344512516,344515588,344516612,344520708,344523780,344524804,344527876,344528900,344531972,344532996,344536068,344537092,344540164,344541188,344544260,344545284,344549380,344552452,344556548,344557572,344564740,344568836,344569860,344572932,344577028,344581124,344585220,344594436,344601604,344606724,344610820,344613892,344614916,344617988,344619012,344622084,344623108,344626180,344627204,344631300,344635396,344639492,344643588,344647684,344651780,344654852,344655876,344658948,344659972,344663044,344664068,344667140,344668164,344671236,344672260,344676356,344679428,344680452,344684548,344687620,344688644,344724484,344725508,344728580,344729604,344733700,344736772,344740868,344741892,344744964,344745988,344749060,344750084,344765444,344766468,344769540,344773636,344774660,344777732,344781828,344782852,344785924,344786948,344790020,344791044,344794116,344795140,344798212,344799236,344802308,344803332,344810500,344811524,344814596,344815620,344822788,344843268,344847364,344859652,344860676,344863748,344871940,344876036,344877060,344881156,344884228,344885252,344888324,344900612,344904708,344905732,344908804,344909828,344912900,344913924,344916996,344918020,344921092,344922116,344926212,344933380,344937476,344938500,344942596,344945668,344946692,344950788,352588804,352589828,352592900,352593924,352596996,352601092,352602116,352605188,352606212,352609284,352610308,352613380,352614404,352618500,352621572,352622596,352626692,352630788,352633860,352634884,352637956,352638980,352642052,352643076,352647172,352651268,352654340,352655364,352658436,352659460,352662532,352663556,352666628,352667652,352670724,352671748,352675844,352678916,352683012,352684036,352687108,352688132,352691204,352692228,352695300,352696324,352699396,352700420,352703492,352704516,352707588,352708612,352711684,352712708,352716804,352723972,352728068,352732164,352736260,352737284,352740356,352744452,352745476,352748548,352752644,352760836,352764932,352765956,352770052,352773124,352774148,352778244,352781316,352782340,352786436,352790532,352793604,352794628,352798724,352805892,352806916,352811012,352815108,352850948,352851972,352855044,352856068,352859140,352860164,352863236,352864260,352867332,352868356,352871428,352872452,352888836,352891908,352896004,352900100,352904196,352905220,352908292,352909316,352912388,352913412,352917508,352920580,352921604,352924676,352932868,352941060,352945156,352949252,352950276,352953348,352954372,352957444,352958468,352962564,352965636,352966660,352969732,352970756,352973828,352974852,352999428,353003524,353011716,353014788,353018884,353019908,353022980,353028100,353032196,353035268,353040388,353044484,353047556,353052676,353055748,353056772,353060868,353063940,353068036,353072132,353073156,353076228,353077252,353113092,353114116,353117188,353118212,353121284,353122308,353125380,353126404,353129476,353130500,353133572,353134596,353137668,353141764,353142788,353145860,353146884,353150980,353154052,353158148,353162244,353166340,353170436,353174532,353175556,353178628,353179652,353182724,353183748,353186820,353187844,353190916,353191940,353195012,353196036,353199108,353200132,353203204,353204228,353211396,353212420,353215492,353220612,353223684,353224708,353227780,353228804,353231876,353232900,353235972,353236996,353240068,353244164,353248260,353252356,353253380,353256452,353257476,353260548,353261572,353264644,353273860,353276932,353277956,353281028,353285124,353286148,353289220,353290244,353301508,353302532,353305604,353306628,353309700,353310724,353313796,353314820,353317892,353318916,353321988,353323012,353326084,353327108,353330180,353331204,353334276,353335300,353338372,353339396]) +rawPCCProd.RawPCCProducerParameters.modVeto.extend([303042564,303042568,303042572,303042576,303042580,303042588,303042592,303046660,303046664,303046668,303046672,303046676,303046680,303046684,303046688,303050760,303050764,303050768,303050772,303050776,303050780,303050784,303054852,303054856,303054860,303054864,303054868,303054872,303054876,303054880,303058948,303058952,303058956,303058960,303058964,303058968,303058972,303058976,303063044,303063048,303063052,303063056,303063060,303063064,303063068,303063072,303067140,303067144,303067148,303067152,303067156,303067160,303067164,303067168,303071236,303071240,303071244,303071248,303071252,303071256,303071260,303071264,303075332,303075336,303075340,303075344,303075348,303075352,303075356,303075360,303079428,303079432,303079436,303079440,303079444,303079448,303079452,303079456,303083524,303083528,303083532,303083536,303083540,303083544,303083548,303083552,303087620,303087624,303087628,303087632,303087636,303087640,303087644,303087648,304091140,304091144,304091148,304091156,304091160,304091164,304091168,304095236,304095240,304095244,304095248,304095252,304095256,304095260,304095264,304099332,304099336,304099340,304099344,304099348,304099352,304099356,304099360,304103428,304103432,304103436,304103440,304103444,304103448,304103452,304103456,304107524,304107528,304107532,304107536,304107540,304107544,304107548,304111620,304111624,304111628,304111632,304111636,304111640,304111644,304111648,304115716,304115720,304115724,304115728,304115732,304115736,304115740,304115744,304119812,304119816,304119828,304119832,304119836,304119840,304123908,304123928,304123932,304123936,304128004,304128008,304128012,304128016,304128020,304128024,304128028,304128032,304132100,304132104,304132108,304132112,304132120,304132124,304132128,304136196,304136200,304136204,304136212,304136216,304136220,304136224,304140292,304140296,304140300,304140304,304140308,304140312,304140316,304140320,304144388,304144392,304144396,304144400,304144404,304144408,304144412,304144416,304148484,304148488,304148492,304148496,304148500,304148504,304148508,304148512,304152580,304152584,304152588,304152592,304152596,304152600,304152604,304152608,304156676,304156680,304156688,304156692,304156696,304156700,304156704,304160772,304160776,304160780,304160784,304160788,304160792,304160796,304160800,304164868,304164872,304164876,304164880,304164884,304164888,304164892,304164896,304168964,304168968,304168984,304168988,304168992,304173060,304173064,304173068,304173072,304173076,304173080,304173084,304173088,304177156,304177160,304177164,304177168,304177172,304177176,304177180,304177184,304181252,304181256,304181260,304181264,304181268,304181272,304181276,304181280,304185348,304185352,304185356,304185360,304185364,304185368,304185372,304185376,304189444,304189448,304189452,304189456,304189460,304189464,304189468,304189472,304193540,304193544,304193548,304193552,304193556,304193560,304193564,304193568,304197636,304197640,304197644,304197648,304197652,304197656,304197660,304197664,304201732,304201736,304201740,304201744,304201748,304201752,304201756,304201760,305139736,305139744,305143812,305143816,305143820,305143824,305143828,305147912,305147928,305147932,305152008,305152012,305152020,305152024,305152028,305152032,305156104,305156116,305156120,305156124,305156128,305160200,305160212,305160216,305160220,305160224,305164308,305164316,305164320,305168392,305168396,305168400,305168404,305168412,305172492,305172500,305172508,305176580,305176596,305176600,305176604,305176608,305180676,305180688,305180692,305180696,305180700,305180704,305184784,305184792,305184796,305188872,305188876,305188888,305188892,305188896,305192972,305192976,305192980,305192988,305192992,305197060,305197068,305197084,305201156,305201160,305201164,305201168,305201172,305201176,305201180,305205256,305205264,305205272,305205280,305209348,305209352,305209356,305209368,305209376,305213444,305213452,305213460,305213464,305213472,305217544,305217552,305217556,305217560,305217564,305217568,305221636,305221640,305221652,305221656,305221660,305221664,305225736,305225740,305225748,305225752,305225756,305225760,305229828,305229836,305229840,305233924,305233932,305233940,305233948,305238028,305238032,305238036,305238048,305242136,305246224,305250308,305250328,305254416,305254420,305254424,305258504,305258508,305258512,305258516,305258524,305262596,305262604,305262608,305262612,305266696,305266712,305266716,305266720,305270788,305270792,305270796,305270804,305274884,305274904,305274908,305278988,305278992,305278996,305283076,305283092,305287172,305287180,305291268,305291272,305291276,305291284,305291288,305295364,305295376,305295380,305295384,305295392,305299468,305299476,305299484,305303560,305303584,305307652,305307656,305307660,305307676,305307680,305311748,305311772,305311776,305315852,305315856,305315860,305315868,306188296,306188312,306192400,306196508,306196512,306200608,306204684,306204692,306204696,306204700,306204704,306208788,306208792,306208796,306208800,306212868,306212872,306212876,306212880,306212884,306212888,306212892,306212896,306216964,306216980,306216984,306216988,306216992,306221076,306225160,306225164,306225172,306225176,306229260,306229264,306229272,306229280,306233352,306233360,306233364,306237448,306237452,306237460,306237464,306237468,306237472,306241544,306241548,306241556,306241560,306241564,306241568,306245636,306245644,306245648,306245652,306245656,306245660,306245664,306249732,306249736,306249740,306249748,306249752,306249756,306249760,306253844,306257936,306257952,306262024,306262028,306266124,306266128,306266136,306270212,306270228,306270240,306278424,306278432,306282508,306282528,306286596,306286604,306290692,306290700,306290704,306298900,306298904,306298908,306298912,306302980,306302984,306302988,306302996,306307088,306307096,306311172,306311184,306311200,306319368,306319372,306319380,306319388,306319392,306323468,306323484,306327572,306331652,306331656,306331664,306331668,306335748,306335760,306335768,306335772,306335776,306339860,306339868,306339872,306343944,306343956,306343968,306348040,306348056,306352132,306352136,306352140,306352156,306352160,306356232,306356244,306360332,306360344,306364440,306364448,306368532,306368536,306368544,306372612,306376708,306376728,306376732,306380812,306380820,306384904,306384920,306384928,306388996,306389004,306393108,306397196,306397200,306401284,306401296,306401300,306401304,306405384,306405396,306405400,306409480,306409484,306409500,306409504,306413572,306413580,306413596,306417688,306417696,306421780,306425860,306425864,306425868,306425884,306425888,306429960,306429964,306429972,306429976,306434068,306434072,306434076,306434080,306438148,306438156,306438160,306442252,306442260,306442264,306442268,306442272,306446340,306446356,306446360,306446364,306446368,344201220,344205316,344208388,344213508,344220676,344221700,344225796,344233988,344241156,344242180,344246276,344249348,344253444,344254468,344257540,344262660,344265732,344266756,344270852,344274948,344278020,344279044,344282116,344291332,344295428,344298500,344302596,344303620,344314884,344320004,344324100,344328196,344332292,344335364,344336388,344339460,344340484,344344580,344348676,344365060,344369156,344373252,344376324,344380420,344384516,344389636,344397828,344401924,344406020,344409092,344410116,344422404,344425476,344426500,344462340,344463364,344466436,344467460,344471556,344474628,344475652,344478724,344479748,344482820,344483844,344486916,344487940,344495108,344499204,344500228,344508420,344511492,344512516,344515588,344516612,344520708,344523780,344524804,344532996,344537092,344540164,344541188,344545284,344548356,344549380,344553476,344556548,344560644,344561668,344568836,344569860,344572932,344573956,344577028,344578052,344581124,344582148,344585220,344586244,344598532,344602628,344605700,344606724,344609796,344610820,344613892,344617988,344627204,344630276,344631300,344638468,344642564,344646660,344647684,344650756,344659972,344664068,344667140,344668164,344672260,344676356,344679428,344680452,344687620,344688644,344729604,344733700,344736772,344740868,344741892,344744964,344749060,344750084,344753156,344757252,344758276,344761348,344762372,344765444,344766468,344769540,344774660,344777732,344778756,344781828,344782852,344785924,344786948,344790020,344791044,344794116,344795140,344798212,344799236,344802308,344803332,344806404,344807428,344811524,344826884,344827908,344830980,344843268,344844292,344847364,344848388,344851460,344855556,344863748,344867844,344871940,344872964,344876036,344877060,344881156,344892420,344896516,344900612,344901636,344904708,344913924,344921092,344922116,344930308,344933380,344946692,344950788,352588804,352589828,352592900,352593924,352596996,352601092,352602116,352605188,352606212,352609284,352610308,352617476,352621572,352622596,352625668,352626692,352629764,352630788,352633860,352634884,352637956,352638980,352642052,352643076,352646148,352654340,352658436,352659460,352662532,352663556,352666628,352667652,352670724,352671748,352675844,352678916,352679940,352683012,352684036,352687108,352688132,352691204,352692228,352695300,352696324,352699396,352700420,352703492,352704516,352707588,352708612,352711684,352712708,352715780,352719876,352740356,352741380,352744452,352745476,352748548,352749572,352753668,352757764,352761860,352765956,352770052,352774148,352781316,352782340,352786436,352789508,352790532,352793604,352794628,352797700,352798724,352801796,352802820,352805892,352806916,352809988,352811012,352814084,352815108,352850948,352851972,352855044,352856068,352859140,352860164,352863236,352864260,352868356,352871428,352872452,352875524,352876548,352879620,352883716,352892932,352896004,352900100,352901124,352904196,352905220,352908292,352912388,352913412,352920580,352924676,352925700,352928772,352936964,352937988,352941060,352945156,352949252,352950276,352953348,352954372,352957444,352958468,352962564,352966660,352974852,352995332,352999428,353002500,353010692,353015812,353018884,353022980,353024004,353044484,353047556,353048580,353052676,353063940,353068036,353073156,353076228,353118212,353122308,353126404,353129476,353130500,353134596,353141764,353142788,353146884,353149956,353150980,353154052,353155076,353158148,353162244,353163268,353166340,353167364,353170436,353174532,353175556,353178628,353179652,353183748,353187844,353190916,353191940,353195012,353196036,353199108,353200132,353203204,353204228,353207300,353208324,353211396,353216516,353219588,353223684,353224708,353228804,353231876,353235972,353240068,353244164,353249284,353252356,353256452,353268740,353281028,353285124,353286148,353290244,353293316,353298436,353302532,353305604,353313796,353314820,353317892,353321988,353326084,353330180,353331204,353334276,353338372,353339396]) diff --git a/Configuration/PyReleaseValidation/python/relval_production.py b/Configuration/PyReleaseValidation/python/relval_production.py index 506a379a28eb4..b44b3336a22ae 100644 --- a/Configuration/PyReleaseValidation/python/relval_production.py +++ b/Configuration/PyReleaseValidation/python/relval_production.py @@ -19,7 +19,7 @@ workflows[1004] = [ '',['RunHI2011','TIER0EXPHI','ALCAEXPHI','ALCAHARVD1HI','ALCAHARVD2HI','ALCAHARVD3HI','ALCAHARVD5HI']] workflows[1010] = ['',['TestEnableEcalHCAL2017B','TIER0EXPTE', 'ALCAEXPTE', 'ALCAHARVDTE']] -workflows[1020] = ['',['AlCaLumiPixels2016H','TIER0EXPLP','ALCAEXPLP','ALCAHARVLP', 'TIER0PROMPTLP']] +workflows[1020] = ['',['AlCaLumiPixels2021','TIER0EXPLP','ALCAEXPLP','ALCAHARVLP', 'TIER0PROMPTLP']] workflows[1030] = ['',['RunHLTPhy2017B','TIER0EXPHPBS','ALCASPLITHPBS','ALCAHARVDHPBS', 'ALCAHARVDHPBSLOWPU']] workflows[1040] = ['',['RunZeroBias2017F','TIER0RAWSIPIXELCAL','ALCASPLITSIPIXELCAL','ALCAHARVDSIPIXELCAL']] diff --git a/Configuration/PyReleaseValidation/python/relval_steps.py b/Configuration/PyReleaseValidation/python/relval_steps.py index 389e7e82b2d26..fa73d96a07c33 100644 --- a/Configuration/PyReleaseValidation/python/relval_steps.py +++ b/Configuration/PyReleaseValidation/python/relval_steps.py @@ -81,7 +81,7 @@ steps['RunJet2011A']={'INPUT':InputInfo(dataSet='/Jet/Run2011A-v1/RAW',label='2011A',run=Run2011A,events=100000)} steps['TestEnableEcalHCAL2017B']={'INPUT':InputInfo(dataSet='/TestEnablesEcalHcal/Run2017B-v1/RAW',label='2017B',run=Run2017BTE,events=100000,location='STD')} -steps['AlCaLumiPixels2016H']={'INPUT':InputInfo(dataSet='/AlCaLumiPixels1/Run2016H-v1/RAW',label='2016H',run=Run2016HALP,events=100000,location='STD')} +steps['AlCaLumiPixels2021']={'INPUT':InputInfo(dataSet='/AlCaLumiPixelsCountsExpress/Commissioning2021-v1/RAW',label='2021',run=[346512],events=100000,location='STD')} Run2011B=[177719] @@ -2041,7 +2041,8 @@ def lhegensim2018ml(fragment,howMuch): } steps['TIER0EXPLP']={'-s': 'ALCAPRODUCER:AlCaPCCRandom', - '--conditions': 'auto:run2_data', + '--conditions': 'auto:run3_data_express', + '--era':'Run3', '--datatier':'ALCARECO', '--eventcontent':'ALCARECO', '--data': '', @@ -2051,7 +2052,8 @@ def lhegensim2018ml(fragment,howMuch): } steps['TIER0PROMPTLP']={'-s': 'ALCAPRODUCER:AlCaPCCZeroBias+RawPCCProducer', - '--conditions': 'auto:run2_data', + '--conditions': 'auto:run3_data_prompt', + '--era':'Run3', '--datatier':'ALCARECO', '--eventcontent':'ALCARECO', '--data': '', @@ -2063,13 +2065,15 @@ def lhegensim2018ml(fragment,howMuch): steps['ALCAEXPLP']={'-s':'ALCAOUTPUT:AlCaPCCRandom,ALCA:PromptCalibProdLumiPCC', - '--conditions':'auto:run2_data', + '--conditions': 'auto:run3_data_express', + '--era':'Run3', '--datatier':'ALCARECO', '--eventcontent':'ALCARECO', '--triggerResultsProcess': 'RECO'} steps['ALCAHARVLP']={'-s':'ALCAHARVEST:%s'%(autoPCL['PromptCalibProdLumiPCC']), - '--conditions':'auto:run2_data', + '--conditions': 'auto:run3_data_express', + '--era':'Run3', '--scenario':'pp', '--datatier':'DQM', '--eventcontent': 'DQM',