Merge remote-tracking branch 'upstream/24.0' into sweep_24.0_main_2024-04-16
Conflicts: Database/IOVDbSvc/python/CondDB.py
Showing
- DataQuality/DataQualityConfigurations/config/InDetAlignment/collisions_run.config 96 additions, 1020 deletions...onfigurations/config/InDetAlignment/collisions_run.config
- DataQuality/DataQualityConfigurations/config/Tau/collisions_run.config 921 additions, 1 deletion...ataQualityConfigurations/config/Tau/collisions_run.config
- Database/IOVDbSvc/python/CondDB.py 0 additions, 440 deletionsDatabase/IOVDbSvc/python/CondDB.py
- Database/IOVDbSvc/python/IOVDb.py 0 additions, 55 deletionsDatabase/IOVDbSvc/python/IOVDb.py
- InnerDetector/InDetConfig/python/SiClusterizationToolConfig.py 2 additions, 2 deletions...Detector/InDetConfig/python/SiClusterizationToolConfig.py
- InnerDetector/InDetMonitoring/InDetAlignmentMonitoringRun3/python/IDAlignMonGenericTracksAlgCfg.py 1 addition, 1 deletion...entMonitoringRun3/python/IDAlignMonGenericTracksAlgCfg.py
- InnerDetector/InDetMonitoring/InDetAlignmentMonitoringRun3/python/IDAlignMonPVBiasesAlgCfg.py 1 addition, 1 deletion...lignmentMonitoringRun3/python/IDAlignMonPVBiasesAlgCfg.py
- InnerDetector/InDetMonitoring/InDetAlignmentMonitoringRun3/python/IDAlignMonResidualsAlgCfg.py 1 addition, 1 deletion...ignmentMonitoringRun3/python/IDAlignMonResidualsAlgCfg.py
- InnerDetector/InDetMonitoring/InDetAlignmentMonitoringRun3/python/InDetAlignmentMonitoringRun3Config.py 2 additions, 2 deletions...nitoringRun3/python/InDetAlignmentMonitoringRun3Config.py
- InnerDetector/InDetRecTools/SiClusterizationTool/SiClusterizationTool/PixelRDOTool.h 8 additions, 1 deletion.../SiClusterizationTool/SiClusterizationTool/PixelRDOTool.h
- InnerDetector/InDetRecTools/SiClusterizationTool/src/PixelRDOTool.cxx 2 additions, 2 deletions...r/InDetRecTools/SiClusterizationTool/src/PixelRDOTool.cxx
- MuonSpectrometer/MuonCablings/MuonTGC_Cabling/CMakeLists.txt 0 additions, 1 deletionMuonSpectrometer/MuonCablings/MuonTGC_Cabling/CMakeLists.txt
- MuonSpectrometer/MuonCablings/MuonTGC_Cabling/python/MuonTGC_CablingConfig.py 0 additions, 13 deletions...nCablings/MuonTGC_Cabling/python/MuonTGC_CablingConfig.py
- MuonSpectrometer/MuonCablings/MuonTGC_Cabling/python/__init__.py 0 additions, 7 deletions...ctrometer/MuonCablings/MuonTGC_Cabling/python/__init__.py
- MuonSpectrometer/MuonCalib/MuonCalibStandAlone/MdtCalibIOSvc/CMakeLists_disabled.txt 0 additions, 3 deletions...MuonCalibStandAlone/MdtCalibIOSvc/CMakeLists_disabled.txt
- MuonSpectrometer/MuonCalib/MuonCalibStandAlone/MdtCalibIOSvc/share/MdtCalibIOSvc.py 0 additions, 14 deletions.../MuonCalibStandAlone/MdtCalibIOSvc/share/MdtCalibIOSvc.py
- MuonSpectrometer/MuonConfig/python/MuonCalibrationConfig.py 1 addition, 3 deletionsMuonSpectrometer/MuonConfig/python/MuonCalibrationConfig.py
- MuonSpectrometer/MuonConfig/python/MuonReconstructionConfig.py 1 addition, 1 deletion...pectrometer/MuonConfig/python/MuonReconstructionConfig.py
- PhysicsAnalysis/AnalysisCommon/ParticleBuilderOptions/CMakeLists.txt 0 additions, 8 deletions...ysis/AnalysisCommon/ParticleBuilderOptions/CMakeLists.txt
- PhysicsAnalysis/AnalysisCommon/ParticleBuilderOptions/python/AODFlags.py 0 additions, 329 deletions.../AnalysisCommon/ParticleBuilderOptions/python/AODFlags.py
Loading
Please register or sign in to comment