From . * [new ref] HEAD -> merge-attempt From https://github.com/cms-sw/cmssw * [new ref] refs/pull/47851/head -> cms-sw/refs/pull/47851/head Switched to branch 'merge-attempt' Merge made by the 'ort' strategy. .../test/apeMeasurement/refitting_cfg.py | 1 - .../APEEstimation/test/apeTreeCreateDefault_cfg.py | 1 - .../test/cfgTemplate/apeEstimatorSummary_cfg.py | 1 - .../test/cfgTemplate/apeEstimator_cfg.py | 1 - .../test/serialIntoNtuples_tpl.py | 1 - Alignment/LaserAlignment/test/laserAlignment.py | 1 - .../LaserAlignment/test/laserAlignment_sim.py | 1 - .../test/GeometryCentering_cfg.py | 2 - .../OfflineValidation/test/testIntoNtuples_cfg.py | 2 - .../testPrimaryVertexRelatedValidations_cfg.py | 2 - .../OfflineValidation/test/test_all_Phase2_cfg.py | 2 - Alignment/OfflineValidation/test/test_all_cfg.py | 2 - Alignment/SurveyAnalysis/test/writeSurvey_cfg.py | 1 - .../test/castor_localrun_pedestals_cfg.py | 2 - .../EcalTPGTools/python/ecalTPGScale_DB_cff.py | 5 - .../test/produceTPGParameters_TCCPattern.py | 1 - .../test/produceTPGParameters_beam4.py | 1 - .../test/produceTPGParameters_beam_zerotesla_v0.py | 1 - .../test/produceTPGParameters_beamv0.py | 1 - .../test/produceTPGParameters_beamv0_MC.py | 1 - .../test/produceTPGParameters_beamv1.py | 1 - .../test/produceTPGParameters_beamv2.py | 1 - .../test/produceTPGParameters_beamv2_MC_ideal.py | 1 - .../test/produceTPGParameters_beamv2_MC_startup.py | 1 - .../test/produceTPGParameters_beamv3.py | 1 - .../test/produceTPGParameters_beamv3ForFG.py | 1 - .../test/produceTPGParameters_beamv3ForSFGVB.py | 1 - .../produceTPGParameters_beamv3WithAPDGain10.py | 1 - .../test/produceTPGParameters_beamv4_128.py | 1 - .../produceTPGParameters_beamv4_128_MC_ideal.py | 1 - .../produceTPGParameters_beamv4_128_MC_startup.py | 1 - .../test/produceTPGParameters_beamv4_MC_ideal.py | 1 - .../test/produceTPGParameters_beamv4_MC_startup.py | 1 - .../test/produceTPGParameters_beamv5.py | 1 - .../test/produceTPGParameters_beamv5_MC_startup.py | 1 - .../test/produceTPGParameters_beamv5_ZS.py | 1 - .../test/produceTPGParameters_beamv5_emul.py | 1 - ...rs_beamv6_transparency_spikekill_2016_script.py | 1 - ...v6_transparency_spikekill_2016_script_270062.py | 1 - .../test/produceTPGParameters_beamv7.py | 1 - .../test/produceTPGParameters_craft_DB.py | 1 - .../test/produceTPGParameters_craft_v1.py | 1 - .../test/produceTPGParameters_debug.py | 1 - .../test/produceTPGParameters_pascal.py | 1 - .../python/Hcal_FrontierConditions_cff.py | 2 - .../python/hcalCalibrationsMTCC2_cfi.py | 1 - .../python/hcalCalibrationsMTCC2_orcon_cfi.py | 2 - .../CSCCalibration/python/CSC_BadChambers_cfi.py | 2 - .../CSCCalibration/test/readConstantsFromDB_cfg.py | 4 - .../CSCCalibration/test/readDBBadChambers_cfg.py | 3 - .../CSCCalibration/test/readDBBadStrips_cfg.py | 3 - .../CSCCalibration/test/readDBBadWires_cfg.py | 3 - .../test/readDBChipSpeedCorrection_cfg.py | 3 - .../CSCCalibration/test/readDBCrosstalk_cfg.py | 3 - CalibMuon/CSCCalibration/test/readDBGains_cfg.py | 3 - .../test/readDBGasGainCorrection_cfg.py | 3 - .../CSCCalibration/test/readDBNoiseMatrix_cfg.py | 3 - .../CSCCalibration/test/readDBPedestals_cfg.py | 3 - .../CSCCalibration/test/readL1TPParameters_cfg.py | 3 - .../test/readNewVectorConstants_cfg.py | 2 - .../python/getCSCConditions_frontier_cff.py | 2 - .../python/getCSCDBConditionsME42_frontier_cff.py | 2 - .../python/getCSCDBConditions_frontier_cff.py | 2 - .../DTCalibration/python/Workflow/DTWorkflow.py | 1 - .../python/Workflow/addPoolDBESSource.py | 5 +- .../RPCCalibration/python/RPC_Calibration_cff.py | 2 - .../test/testConditionAccess_sqlite_cfg.py | 2 - CalibTracker/SiPixelConnectivity/test/read_cfg.py | 1 - .../SiStripDCS/test/FilterTrackerOn_cfg.py | 2 - .../SiStripDCS/test/Synchronization/SyncO2O_cfg.py | 2 - .../SiStripDCS/test/templateCheckAllIOVs_cfg.py | 1 - .../test/python/DummyCondDBReaderTemplate_cfg.py | 2 - .../python/SiStripApvGainBuilderFromTag_cfg.py | 2 - .../python/SiStripFedCablingManipulator_cfg.py | 2 - ...SiStripNoiseNormalizedWithApvGainBuilder_cfg.py | 2 - ...iStripBackPlaneCorrectionDepDummyPrinter_cfg.py | 2 - .../siStripBackPlaneCorrectionDummyPrinter_cfg.py | 2 - .../siStripClusterThresholdDummyPrinter_cfg.py | 2 - .../test/python/siStripDetVOffDummyPrinter_cfg.py | 2 - .../test/python/siStripGainDummyPrinter_cfg.py | 2 - .../test/python/siStripGainSimDummyPrinter_cfg.py | 2 - .../python/siStripLorentzAngleDummyPrinter_cfg.py | 2 - .../test/python/siStripNoisesDummyPrinter_cfg.py | 2 - .../python/siStripPedestalsDummyPrinter_cfg.py | 2 - .../python/siStripThresholdDummyPrinter_cfg.py | 2 - .../test/python/templateCheckAllIOVs_cfg.py | 1 - ...ripBadModule_fromMultipleDBSources_merge_cfg.py | 2 - .../read_DummyCondDBWriter_SiStripQuality_cfg.py | 2 - .../SiStripLorentzAngle/python/SQLiteCheck_cfg.py | 2 - .../SiStripLorentzAngle/python/redigi_cff.py | 4 - .../SiStripQualityStatistics_Cabling_cfg.py | 1 - .../SiStripQualityStatistics_singleTag_cfg.py | 1 - CondFormats/CSCObjects/test/readBadChambers_cfg.py | 2 - CondFormats/CSCObjects/test/readBadStrips_cfg.py | 2 - CondFormats/CSCObjects/test/readBadWires_cfg.py | 2 - .../CSCObjects/test/readChamberIndex_cfg.py | 2 - CondFormats/CSCObjects/test/readChamberMap_cfg.py | 2 - .../test/readChamberTimeCorrections_cfg.py | 2 - CondFormats/CSCObjects/test/readCrateMap_cfg.py | 2 - CondFormats/CSCObjects/test/readDCSData_cfg.py | 2 - CondFormats/CSCObjects/test/readDDUMap_cfg.py | 2 - CondFormats/CSCObjects/test/testReadoutMap_cfg.py | 2 - .../DTObjects/test/load_dtdead_test_sqlite.py | 2 - .../DTObjects/test/load_dtmap_test_sqlite.py | 2 - .../DTObjects/test/load_dtranget0_test_sqlite.py | 2 - .../DTObjects/test/load_dtt0_test_sqlite.py | 2 - .../DTObjects/test/load_dtttrig_test_sqlite.py | 2 - .../test/SiStripDeDx2DReader_cfg.py | 2 - .../test/SiStripDeDx3DReader_cfg.py | 2 - .../test/SiStripDeDxReader_cfg.py | 2 - .../test/retrieve_PPSAlignmentConfiguration_cfg.py | 103 +++--- .../CTPPS/test/retrieve_PPSAssociationCuts_cfg.py | 1 - CondTools/DQM/test/DQMSummaryEventSetupAnalyzer.py | 1 - CondTools/DT/test/chk_keyed_conf.py | 2 - CondTools/DT/test/chk_keyed_user.py | 2 - CondTools/DT/test/chkhv_test.py | 2 - CondTools/DT/test/compMapCheck.py | 2 - CondTools/DT/test/validate/validate_r_template.py | 2 - CondTools/Ecal/python/EcalO2O_DAQ_cfg.py | 1 - CondTools/Ecal/python/EcalO2O_DAQ_v2_cfg.py | 1 - CondTools/Ecal/python/EcalO2O_SRP_cfg.py | 1 - CondTools/Ecal/python/EcalO2O_channelStatus_cfg.py | 1 - CondTools/Ecal/python/EcalO2O_laser_online_cfg.py | 1 - .../EcalO2O_laser_online_cfg_last_express.py | 1 - ...EcalO2O_laser_online_cfg_prompt_40hoursdelay.py | 1 - CondTools/Ecal/python/EcalO2O_pedestals_cfg.py | 1 - .../Ecal/python/EcalO2O_pedestals_v5_online_cfg.py | 1 - CondTools/Ecal/python/EcalTPGLinPed_cfg.py | 1 - CondTools/Ecal/python/EcalTPGPedfromFile_cfg.py | 1 - .../Ecal/python/EcalTPGPhysicsConstfromFile_cfg.py | 1 - .../python/EcalTPGSpikeThresholdfromFile_cfg.py | 1 - .../Ecal_Laser_weekly_Linearization_Check_cfg.py | 1 - .../python/Ecal_Laser_weekly_Linearization_cfg.py | 1 - CondTools/Ecal/python/Ecal_Laser_weekly_cfg.py | 1 - ...rs_beamv6_transparency_spikekill_2016_script.py | 1 - CondTools/Hcal/test/dumpCastorCond_cfg.py | 2 - CondTools/Hcal/test/dumpHcalCond_cfg.py | 2 - CondTools/Hcal/test/dumpHcalDcsValues_cfg.py | 2 - CondTools/Hcal/test/runDumpHcalCond_cfg.py | 4 - .../python/validate_alignment_devdb10_cfg.py | 5 - .../python/validate_alignment_frontier_cfg.py | 5 - .../python/validate_alignment_orcoffint2r_cfg.py | 5 - .../python/validate_csc_devdb10_cfg.py | 5 - .../python/validate_csc_frontier_cfg.py | 5 - .../python/validate_csc_orcoffint2r_cfg.py | 5 - .../python/validate_csc_orcon_cfg.py | 5 - .../python/validate_dt_devdb10_cfg.py | 5 - .../python/validate_dt_frontier_cfg.py | 4 - .../python/validate_dt_orcoffint2r_cfg.py | 5 - .../python/validate_dt_orcon_cfg.py | 5 - .../python/validate_ecal_orcoffint2r_cfg.py | 4 - .../python/validate_sistrip_frontier_cfg.py | 5 - CondTools/RPC/test/PVSSIDReader.py | 1 - CondTools/RunInfo/test/FillInfoESAnalyzer.py | 1 - CondTools/RunInfo/test/LHCInfoESAnalyzer.py | 1 - CondTools/RunInfo/test/RunInfoESAnalyzer.py | 1 - .../python/SiPixelGainCalibrationESSource_cfi.py | 3 - CondTools/SiPixel/test/PixelDCSObjectReader_cfg.py | 2 - .../test/SiPixel2DTemplateDBObjectReader_cfg.py | 1 - .../test/SiPixelGenErrorDBObjectReader_cfg.py | 1 - .../test/SiPixelInclusiveReader_sqlite_cfg.py | 1 - .../SiPixelInclusiveSmearedConditionsReader_cfg.py | 1 - .../SiPixel/test/performanceSummary_read_cfg.py | 1 - .../test/SiStripApvGainFromDeDxCalibration_cfg.py | 1 - CondTools/SiStrip/test/db_tree_dump.py | 2 - .../EcalTB/python/readCalibrations2004_v2_cff.py | 5 - .../EcalTB/python/readCalibrations2006_v0_cff.py | 4 - .../EcalTB/python/readConfiguration2004_v2_cff.py | 5 - .../EcalTB/python/readConfiguration2006_v0_cff.py | 5 - .../python/readConfiguration2006_v1_fromDB_cff.py | 5 - .../readConfiguration2006_v1_fromFrontier_cff.py | 6 - .../python/readConfigurationH2_2006_v0_cff.py | 5 - .../python/readConfigurationH2_2007_v0_cff.py | 2 - .../python/readConfigurationH4_2007_v0_cff.py | 2 - .../test/apvcyclephaseproducer_test_dbfile_cfg.py | 2 - DQM/DTMonitorClient/test/dt_finedelay_beam_cfg.py | 2 - .../python/dt_standalonedatabases_cfi.py | 6 - .../test/DTkFactValidation_1_TEMPL_cfg.py | 2 - DQM/L1TMonitor/python/L1TCSCTPG_cff.py | 4 - DQM/L1TMonitor/python/L1TCSCTPG_offline_cff.py | 4 - .../scripts/TemplateCfg21X_Quality_cfg.py | 2 - .../test/DBReader_Quality_cfg.py | 2 - DQM/SiStripMonitorSummary/test/DBReader_cfg.py | 4 - .../test/DBReader_conddbmonitoring_generic_cfg.py | 2 - .../DBReader_conddbmonitoring_singlemodule_cfg.py | 2 - .../test/DBReader_specifc_cfg.py | 4 - .../test/RunInfo_conddbmonitoring_cfg.py | 4 - .../test/SiStripCorrelateBadStripAndNoise_cfg.py | 5 +- .../SiStripCorrelateNoise_conddbmonitoring_cfg.py | 5 +- .../test/SiStripPlotGain_cfg.py | 5 +- .../CalibMuon/python/dtT0DBValidation_cfg.py | 2 - .../CalibMuon/python/dtTTrigDBValidation_cfg.py | 2 - .../test/DTnoiseDBValidation_ORCONsqlite_cfg.py | 2 - .../test/DTt0DBValidation_ORCONsqlite_cfg.py | 2 - .../CalibMuon/test/DTt0DBValidation_TEMPL_cfg.py | 4 - .../DTtTrigDBValidation_ORCONsqlite_TEMPL_cfg.py | 2 - .../test/DTtTrigDBValidation_ORCONsqlite_cfg.py | 2 - .../test/DTtTrigDBValidation_TEMPL_cfg.py | 4 - .../CalibMuon/test/DTtTrigDBValidation_cfg.py | 2 - .../SiStripDQMBadStripsValidation_cfg.py | 1 - .../SiStripBadComponentsDQMServiceReader_cfg.py | 2 - .../test/SiStripFEDErrorsDQMRead_cfg.py | 2 - ...ipQualityBadAPVandHotStripIdentifierRoot_cfg.py | 4 - .../test/SiStripQualityStatistics_full_cfg.py | 4 - .../test/SiStripQualityStatistics_offline_cfg.py | 2 - .../test/example_QualityValidation_cfg.py | 1 - .../test/template_DQMProfileConverter_cfg.py | 2 - .../template_SiStripBadComponents_merge_cfg.py | 2 - ...plate_SiStripQualityBadAPVIdentifierRoot_cfg.py | 4 - ...ipQualityBadAPVandHotStripIdentifierRoot_cfg.py | 4 - ...ate_SiStripQualityHotStripIdentifierRoot_cfg.py | 2 - ...emplate_SiStripQualityStatistics_offline_cfg.py | 2 - .../test/testSuite/SiStripBadStripReader_cfg.py | 2 - .../DTRawToDigi/python/DTFrontierCabling_cfi.py | 2 - .../DTRawToDigi/python/DTSQLiteCabling_cfi.py | 1 - .../python/SiStripSQLiteCabling_cfi.py | 1 - Geometry/CaloEventSetup/python/calodbsqlitefile.py | 3 - Geometry/CaloEventSetup/python/xmlsqlitefile.py | 3 - IORawData/DTCommissioning/test/runDTTreeROS8.py | 2 - .../Modules/test/JetCorrectionLocalDBReader_cfg.py | 1 - .../Modules/test/METCorrectionLocalDBReader_cfg.py | 1 - .../Modules/test/TauJetCorrectionDBReader_cfg.py | 1 - .../test/testMultShiftMETcorrDBInputProducer.py | 1 - L1Trigger/Configuration/python/L1Trigger_custom.py | 1 - L1Trigger/Configuration/python/customiseReEmul.py | 2 - L1Trigger/L1TCaloLayer1/test/testL1TCaloLayer1.py | 2 - .../test/runMuonOverlap_run3_data.py | 2 - .../L1TNtuples/python/customiseL1CustomReco.py | 1 - .../test/rpcTechnicalTriggerCosmics_cfg.py | 2 - .../test/rpcTechnicalTriggerData_cfg.py | 2 - .../test/rpcTechnicalTrigger_cfg.py | 2 - .../python/L1CSCTriggerPrimitivesDBConfig_cff.py | 1 - .../test/BackgroundDBReader_cfg.py | 2 - .../test/LikelihoodPdfDBReader_cfg.py | 2 - .../test/MuScleFitMuonProducer_cfg.py | 2 - .../test/ResolutionDBReader_cfg.py | 2 - .../test/ScaleDBReader_cfg.py | 2 - .../python/getCSCChamberConditions_cff.py | 4 - OnlineDB/CSCCondDB/test/readChamberIndex_cfg.py | 2 - OnlineDB/CSCCondDB/test/readChamberMap_cfg.py | 2 - OnlineDB/CSCCondDB/test/readCrateMap_cfg.py | 2 - OnlineDB/CSCCondDB/test/readDDUMap_cfg.py | 2 - .../template_Validate_FEDCabling_O2O_cfg.py | 2 - .../test/testPopCon/read_UnitTest_ApvGain_cfg.py | 2 - .../test/testPopCon/read_UnitTest_Latency_cfg.py | 2 - .../test/testPopCon/read_UnitTest_Noise_cfg.py | 2 - .../test/testReadMVAComputerCondDB_cfg.py | 2 - .../PatAlgos/python/patTestJEC_local_cfi.py | 1 - .../python/recoLayer0/tauJetCorrections_cff.py | 1 - .../python/trackProbabilityFakeCond_cfi.py | 9 - .../python/trackProbabilityFrontierCond_cfi.py | 9 - .../python/MVAJetTagsFakeConditions_cfi.py | 2 - .../python/MVAJetTagsFrontierConditions_cfi.py | 2 - .../test/testEcalClusterSeverityAlgo-filtered.py | 4 - .../test/testEcalClusterSeverityAlgo-relVal.py | 4 - .../python/PhotonConversionMVAComputer_cfi.py | 2 - RecoLocalCalo/Castor/test/castor_cfg.py | 2 - .../python/getEcalConditions_frontier_cff.py | 4 - .../python/getEcalConditions_orcoffint2r_cff.py | 4 - .../python/BeamSpotEarly10TeVCollision_cfi.py | 1 - .../python/BeamSpotEarlyCollision_cfi.py | 1 - .../python/BeamSpotNominalCollision1_cfi.py | 1 - .../python/BeamSpotNominalCollision2_cfi.py | 1 - .../python/BeamSpotNominalCollision3_cfi.py | 1 - .../python/BeamSpotNominalCollision4_cfi.py | 1 - .../python/BeamSpotNominalCollision_cfi.py | 1 - .../python/BeamSpotSimpleGaussian_cfi.py | 1 - SimCalorimetry/CastorSim/data/CastorDigiReco.py | 2 - .../CastorSim/data/CastorDigiValidation.py | 2 - SimCalorimetry/CastorSim/data/pythia_cfg.py | 2 - .../test/readDBTPConds_beamv5_ideal_cfg.py | 5 - .../test/readDBTPConds_beamv5_startup_cfg.py | 5 - .../test/readDBTPConds_cfg.py | 5 - .../test/writeTP_DBOffline_cfg.py | 5 - .../DataMixer_DataConditions_3_8_X_data2010.py | 392 ++++++++++----------- 275 files changed, 249 insertions(+), 852 deletions(-) Switched to branch 'from-CMSSW_15_1_X_2025-04-12-1100'