diff --git a/TileCalorimeter/TileExample/TileRecEx/share/jobOptions_TileCalibRec.py b/TileCalorimeter/TileExample/TileRecEx/share/jobOptions_TileCalibRec.py
index ab0be98a39c4184d0e74b6f60a6751a51de65202..63168433bc3dae0d73873911a9a707b49e37dcd7 100644
--- a/TileCalorimeter/TileExample/TileRecEx/share/jobOptions_TileCalibRec.py
+++ b/TileCalorimeter/TileExample/TileRecEx/share/jobOptions_TileCalibRec.py
@@ -203,8 +203,10 @@ else:
                 Year = 2016
             elif RunNumber < 342540:
                 Year = 2017
-            else:
+            elif RunNumber < 367980:
                 Year = 2018
+            else:
+                Year = 2019
 
 
             if 'RunStream' in dir():
@@ -788,17 +790,6 @@ jobproperties.print_JobProperties('tree&value')
 include( "TileConditions/TileConditions_jobOptions.py" )
 tileInfoConfigurator.OutputLevel = OutputLevel
 # use correct timing constants for different run types
-from TileConditions.TileCondToolConf import *
-if TilePhysTiming:
-    if RUN2 and TileLasPulse: tileCondToolTiming = getTileCondToolTiming( 'COOL','GAPLAS')
-    else:                     tileCondToolTiming = getTileCondToolTiming( 'COOL','PHY')
-elif TileLasPulse:
-    tileCondToolTiming = getTileCondToolTiming( 'COOL','LAS')
-elif TileCisPulse:
-    tileCondToolTiming = getTileCondToolTiming( 'COOL','CIS')
-else:
-    tileCondToolTiming = getTileCondToolTiming( 'COOL','PHY')
-tileInfoConfigurator.TileCondToolTiming = tileCondToolTiming
 print tileInfoConfigurator
 
 #============================================================
@@ -856,7 +847,6 @@ if not ReadPool:
 
     from TileByteStream.TileByteStreamConf import TileROD_Decoder
     ToolSvc += TileROD_Decoder()
-    ToolSvc.TileROD_Decoder.TileCondToolTiming = tileCondToolTiming
     if TileCompareMode:
         ToolSvc.TileROD_Decoder.useFrag5Raw  = True
         ToolSvc.TileROD_Decoder.useFrag5Reco = True
@@ -910,7 +900,6 @@ if doTileOptATLAS and tileRawChannelBuilderOptATLAS:
         tileRawChannelBuilderOptATLAS.TileRawChannelContainer = "TileRawChannelFixed"
 
     if PhaseFromCOOL:
-        tileRawChannelBuilderOptATLAS.TileCondToolTiming = tileCondToolTiming
         tileRawChannelBuilderOptATLAS.correctTime = False; # do not need to correct time with best phase
 
     tileRawChannelBuilderOptATLAS.BestPhase   = PhaseFromCOOL; # Phase from COOL or assume phase=0
@@ -923,7 +912,6 @@ if doTileOptATLAS and tileRawChannelBuilderOptATLAS:
 if doTileMF:
 
     if PhaseFromCOOL:
-        ToolSvc.TileRawChannelBuilderMF.TileCondToolTiming = tileCondToolTiming
         ToolSvc.TileRawChannelBuilderMF.correctTime = False; # do not need to correct time with best phase
 
     ToolSvc.TileRawChannelBuilderMF.BestPhase   = PhaseFromCOOL; # Phase from COOL or assume phase=0
@@ -942,7 +930,6 @@ if doTileOF1:
     ToolSvc.TileRawChannelBuilderOF1.PedestalMode = TileOF1Ped  
 
     if PhaseFromCOOL:
-        ToolSvc.TileRawChannelBuilderOF1.TileCondToolTiming = tileCondToolTiming
         ToolSvc.TileRawChannelBuilderOF1.correctTime = False # do not need to correct time with best phase
 
     ToolSvc.TileRawChannelBuilderOF1.BestPhase   = PhaseFromCOOL # Phase from COOL or assume phase=0
@@ -1635,8 +1622,8 @@ if doTileCalib:
 
         # declare LASER tool(s) and set jobOptions if necessary
         TileLaserTool = TileLaserDefaultCalibTool()
-        TileLaserTool.rawChannelContainer    = "TileRawChannelOpt2"
-        TileLaserTool.laserObjContainer      = "TileLaserObj"
+        TileLaserTool.TileRawChannelContainer    = "TileRawChannelOpt2"
+        TileLaserTool.TileLaserObject      = "TileLaserObj"
 
         if hasattr(ToolSvc, 'TileDigitsMon'):
             TileLaserTool.StuckBitsProbsTool = ToolSvc.TileDigitsMon
diff --git a/TileCalorimeter/TileRec/src/TileAANtuple.cxx b/TileCalorimeter/TileRec/src/TileAANtuple.cxx
index 84e611b9185cc1d59a0effd514bc2f5ebcfb1d70..6dcf1214d04a64c8dcc9998031548fac61f95e7b 100755
--- a/TileCalorimeter/TileRec/src/TileAANtuple.cxx
+++ b/TileCalorimeter/TileRec/src/TileAANtuple.cxx
@@ -2366,7 +2366,6 @@ StatusCode TileAANtuple::storeDCS() {
       unsigned int drawerIdx = TileCalibUtils::getDrawerIdx(ROS,drawer);
       for (int channel=0; channel<48; ++channel){
         TileBchStatus chStat = m_tileBadChanTool->getChannelStatus(drawerIdx,channel);
-        int pmt=abs(m_cabling->channel2hole(ROS,channel));
         m_arrays->m_HV[rosI][drawer][channel]       = m_tileDCS->getChannelHV(ROS, drawer, channel);
         m_arrays->m_HVSET[rosI][drawer][channel]    = m_tileDCS->getChannelHVSet(ROS, drawer, channel);
         m_arrays->m_HVSTATUS[rosI][drawer][channel] = m_tileDCS->getDCSHVStatus(ROS, drawer, channel);
@@ -2385,6 +2384,7 @@ StatusCode TileAANtuple::storeDCS() {
         }
           
         if (msgLvl(MSG::VERBOSE) || (chbad && !drbad)) {
+          int pmt=abs(m_cabling->channel2hole(ROS,channel));
           ATH_MSG_VERBOSE( "Module=" << TileCalibUtils::getDrawerString(ROS, drawer)
                            << " channel=" << channel << " pmt=" << pmt
                            << " HV=" << m_arrays->m_HV[rosI][drawer][channel]
@@ -2396,7 +2396,7 @@ StatusCode TileAANtuple::storeDCS() {
       }
         
       for (int ind=0; ind<7; ++ind){
-        m_arrays->m_TEMP[rosI][drawer][ind] = m_tileDCS->getChannelHV(ROS, drawer, ind+49);
+        m_arrays->m_TEMP[rosI][drawer][ind] = m_tileDCS->getChannelHV(ROS, drawer, ind+48);
         ATH_MSG_VERBOSE( "Module=" << TileCalibUtils::getDrawerString(ROS, drawer)
                          << " TEMP" << ind+1 << "=" << m_arrays->m_TEMP[rosI][drawer][ind] );