diff --git a/Calorimeter/CaloRecAlgs/src/CaloRecAlg.cxx b/Calorimeter/CaloRecAlgs/src/CaloRecAlg.cxx
index 5b132d2f9ce057254aedf9937f0359eea0303196..4e60ea011ed392b34fff441cf9807b352d14d04d 100644
--- a/Calorimeter/CaloRecAlgs/src/CaloRecAlg.cxx
+++ b/Calorimeter/CaloRecAlgs/src/CaloRecAlg.cxx
@@ -95,7 +95,6 @@ StatusCode CaloRecAlg::execute(const EventContext& ctx) const {
   }  
   ATH_MSG_DEBUG("PreshowerHitContainer '" << preshowerHitContainerHandle.name() << "' filled with "<< preshowerHitContainerHandle->size() <<" items");
   
-
   // High-gain calo isn't guaranteed to exist
   if ( calo2WaveHitHandle.isValid() ) {
     ATH_MSG_DEBUG("Found ReadHandle for WaveformHitContainer " << m_calo2WaveHitContainerKey);
@@ -123,7 +122,6 @@ StatusCode CaloRecAlg::execute(const EventContext& ctx) const {
     ATH_MSG_DEBUG("No ReadHandle for WaveformHitContainer " << m_calo2WaveHitContainerKey);
   }
 
-  
   return StatusCode::SUCCESS;
 }
 
diff --git a/PhysicsAnalysis/NtupleDumper/scripts/faser_ntuple_maker.py b/PhysicsAnalysis/NtupleDumper/scripts/faser_ntuple_maker.py
index 4d475f1c4f7385dcb7a2dc555577b80d36d06ed0..3c52d672d2b909540b1764f50e9204cd48be12ee 100755
--- a/PhysicsAnalysis/NtupleDumper/scripts/faser_ntuple_maker.py
+++ b/PhysicsAnalysis/NtupleDumper/scripts/faser_ntuple_maker.py
@@ -27,7 +27,8 @@ parser.add_argument("--merge", type=int, default=1,
                     help="Specify merged files per reco file (MC only)")
 parser.add_argument("--last", type=int, default=0,
                     help="Specify last file in slice (normally --files)")
-
+parser.add_argument("-g", "--geom", default="",
+                    help="Specify geometry (if it can't be parsed from run number\n Values: Ti12Data03 (2022 TiT12)")
 parser.add_argument("--outfile", default="",
                     help="Override output file name")
 
diff --git a/Waveform/WaveformConditions/WaveformConditionsTools/src/WaveformCableMappingTool.cxx b/Waveform/WaveformConditions/WaveformConditionsTools/src/WaveformCableMappingTool.cxx
index cce64853b4387b8fb637d79e7e6295093415ca2e..8771650cf2d39b947ccaffcee901020331f1d59b 100644
--- a/Waveform/WaveformConditions/WaveformConditionsTools/src/WaveformCableMappingTool.cxx
+++ b/Waveform/WaveformConditions/WaveformConditionsTools/src/WaveformCableMappingTool.cxx
@@ -107,7 +107,10 @@ WaveformCableMappingTool::getCableMapping(const EventContext& ctx) const {
 	ATH_MSG_DEBUG("PMT:" << m_ecalID->pmt(identifier) << " PMT Max:" << m_ecalID->pmt_max(identifier));
       }
       else if (det_type == "calo2") {
-	identifier = m_ecalID->pmt_id(rowVal, moduleVal, pmtVal);
+	// Do checks of PMT identifier
+	identifier = m_ecalID->pmt_id(rowVal, moduleVal, pmtVal, true);
+	ATH_MSG_DEBUG("Calo2 ID:" << identifier);
+	ATH_MSG_DEBUG("PMT:" << m_ecalID->pmt(identifier) << " PMT Max:" << m_ecalID->pmt_max(identifier));
       }
       else if (det_type == "veto") {
 	identifier = m_vetoID->pmt_id(stationVal, plateVal, pmtVal);