Merge branch 'master-SCTDecode' into 'master'

Change properties of SCT_RawDataByteStreamCnv/share/testSCTDecode.py (ATLASRECTS-4939)

See merge request atlas/athena!22774

InnerDetector/InDetEventCnv/SCT_RawDataByteStreamCnv/share/testSCTDecode.py

@@ -109,8 +109,9 @@ from SiLorentzAngleTool.SCTLorentzAngleToolSetup import SCTLorentzAngleToolSetup
 sctLorentzAngleToolSetup = SCTLorentzAngleToolSetup()
 from SiClusterizationTool.SiClusterizationToolConf import InDet__ClusterMakerTool
 InDetClusterMakerTool = InDet__ClusterMakerTool(name = "InDetClusterMakerTool",
-                                                PixelCalibSvc        = None,
-                                                UsePixelCalibCondDB  = False,
+                                                PixelCablingSvc = None,
+                                                PixelModuleData = "",
+                                                PixelChargeCalibCondData = "",
                                                 PixelLorentzAngleTool = None,
                                                 SCTLorentzAngleTool = sctLorentzAngleToolSetup.SCTLorentzAngleTool)
 # SCT conditions setups

InnerDetector/InDetRecTools/SiClusterizationTool/src/ClusterMakerTool.cxx

@@ -61,10 +61,16 @@ StatusCode  ClusterMakerTool::initialize(){
   // Code entered here will be executed once at program start.
 
    ATH_MSG_INFO ( name() << " initialize()" );
-   
-   ATH_CHECK(m_pixelCabling.retrieve());
-   ATH_CHECK(m_moduleDataKey.initialize());
-   ATH_CHECK(m_chargeDataKey.initialize());
+
+   if (not m_pixelCabling.empty()) {
+     ATH_CHECK(m_pixelCabling.retrieve());
+   }
+   if (not m_moduleDataKey.empty()) {
+     ATH_CHECK(m_moduleDataKey.initialize());
+   }
+   if (not m_chargeDataKey.empty()) {
+     ATH_CHECK(m_chargeDataKey.initialize());
+   }
 
    if (not m_pixelLorentzAngleTool.empty()) {
      ATH_CHECK(m_pixelLorentzAngleTool.retrieve());