Merge remote-tracking branch 'upstream/24.0' into sweep_24.0_main_2024-04-23
Resolved Conflicts: PhysicsAnalysis/DerivationFramework/DerivationFrameworkHiggs/python/HIGG1D1CustomJetsConfig.py Reconstruction/Jet/JetRecConfig/python/JetInputConfig.py Reconstruction/Jet/JetRecTools/python/JetRecToolsConfig.py Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Jet/JetTrackingConfig.py
No related branches found
No related tags found
Showing
- DataQuality/DataQualityConfigurations/config/CTP/collisions_minutes10.config 28 additions, 9 deletions...lityConfigurations/config/CTP/collisions_minutes10.config
- DataQuality/DataQualityConfigurations/config/CTP/collisions_run.config 28 additions, 9 deletions...ataQualityConfigurations/config/CTP/collisions_run.config
- DataQuality/DataQualityConfigurations/config/CTP/cosmics_minutes10.config 21 additions, 4 deletions...QualityConfigurations/config/CTP/cosmics_minutes10.config
- DataQuality/DataQualityConfigurations/config/CTP/cosmics_run.config 27 additions, 10 deletions...y/DataQualityConfigurations/config/CTP/cosmics_run.config
- DataQuality/DataQualityConfigurations/config/CTP/heavyions_run.config 27 additions, 10 deletions...DataQualityConfigurations/config/CTP/heavyions_run.config
- DataQuality/dqm_algorithms/dqm_algorithms/CTP_AllBinsAreEmptyExceptZero.h 32 additions, 0 deletions...algorithms/dqm_algorithms/CTP_AllBinsAreEmptyExceptZero.h
- DataQuality/dqm_algorithms/src/CTP_AllBinsAreEmptyExceptZero.cxx 110 additions, 0 deletions...lity/dqm_algorithms/src/CTP_AllBinsAreEmptyExceptZero.cxx
- Database/EventIndex/EventIndexProducer/python/POOL2EI_Lib.py 57 additions, 46 deletionsDatabase/EventIndex/EventIndexProducer/python/POOL2EI_Lib.py
- Database/EventIndex/EventIndexProducer/python/POOLtoEI_Skeleton.py 1 addition, 1 deletion...EventIndex/EventIndexProducer/python/POOLtoEI_Skeleton.py
- Event/xAOD/xAODTrigger/Root/eFexTauRoI_v1.cxx 1 addition, 2 deletionsEvent/xAOD/xAODTrigger/Root/eFexTauRoI_v1.cxx
- HLT/Trigger/TrigTransforms/TrigTransform/python/trigRecoExe.py 1 addition, 1 deletion...rigger/TrigTransforms/TrigTransform/python/trigRecoExe.py
- HLT/Trigger/TrigTransforms/TrigTransform/python/trigTranslate.py 2 additions, 2 deletions...gger/TrigTransforms/TrigTransform/python/trigTranslate.py
- InnerDetector/InDetEventCnv/SCT_RawDataByteStreamCnv/src/SCT_RodDecoder.cxx 2 additions, 2 deletions...tEventCnv/SCT_RawDataByteStreamCnv/src/SCT_RodDecoder.cxx
- InnerDetector/InDetMonitoring/InDetAlignmentMonitoringRun3/python/IDAlignMonGenericTracksAlgCfg.py 64 additions, 3 deletions...entMonitoringRun3/python/IDAlignMonGenericTracksAlgCfg.py
- InnerDetector/InDetMonitoring/InDetAlignmentMonitoringRun3/src/IDAlignMonGenericTracksAlg.cxx 67 additions, 5 deletions...lignmentMonitoringRun3/src/IDAlignMonGenericTracksAlg.cxx
- LArCalorimeter/LArExample/LArConditionsCommon/CMakeLists.txt 1 addition, 2 deletionsLArCalorimeter/LArExample/LArConditionsCommon/CMakeLists.txt
- LArCalorimeter/LArExample/LArConditionsCommon/python/LArCondFlags.py 0 additions, 515 deletions...ter/LArExample/LArConditionsCommon/python/LArCondFlags.py
- LArCalorimeter/LArExample/LArConditionsCommon/python/LArCool.py 0 additions, 26 deletions...orimeter/LArExample/LArConditionsCommon/python/LArCool.py
- LArCalorimeter/LArExample/LArConditionsCommon/share/CheckADC2MeV.py 0 additions, 221 deletions...eter/LArExample/LArConditionsCommon/share/CheckADC2MeV.py
- LArCalorimeter/LArExample/LArConditionsCommon/share/CheckLArIdMap_jobOptions.py 0 additions, 120 deletions...ple/LArConditionsCommon/share/CheckLArIdMap_jobOptions.py
Loading
Please register or sign in to comment