Merge branch 'tilecal-for-22.0' into 'master'

Two additional variables - TDC and QDC timeout added to calibration ntuple

See merge request atlas/athena!23704

TileCalorimeter/TileCalib/TileCalibBlobPython/share/ReadBchFromCool.py

 #!/bin/env python
 
-# Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 #
 # ReadBchFromCool.py  --schema='COOLOFL_TILE/CONDBR2'  --folder='OFL02' --tag='UPD4'
 # Sanya Solodkov 2011-07-15
@@ -334,7 +334,7 @@ for iovs in iovList:
     if iov:
         pref = "(%i,%i)  " % (iovs[0][0],iovs[0][1])
     if comment:
-        log.info( blobReader.getComment(iovs[0]) )
+        log.info( pref + blobReader.getComment(iovs[0]) )
     modOk = False
     miss  = 0
     good  = 0

TileCalorimeter/TileCalib/TileCalibBlobPython/share/ReadCalibFromCool.py

 #!/bin/env python
 
-# Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 #
 # ReadCalibFromCool.py
 # Andrei Artamonov 2009-11-03
@@ -333,7 +333,11 @@ for iovs in iovList:
     if prefix:
         pref = prefix + " " + pref
     if comment:
-        log.info( blobReader.getComment(iovs[0]) )
+        log.info( pref + blobReader.getComment(iovs[0]) )
+    if prefix and prefix.startswith("Write"):
+        comm = blobReader.getComment(iovs[0])
+        if ": " in comm: comm = comm[comm.find(": ")+2:]
+        print '%s --update --folder=%s --tag=%s --run=%i --lumi=%i --comment="%s"' % (prefix,folderPath,folderTag,iovs[0][0],iovs[0][1],comm)
     miss=0
     good=0
     for ros in xrange(rosmin,rosmax):

TileCalorimeter/TileRec/TileRec/TileAANtuple.h

@@ -328,6 +328,8 @@ class TileAANtuple : public AthAlgorithm {
     };
     std::unique_ptr<Arrays> m_arrays;
 
+    bool m_qdctimeout;
+    bool m_tdctimeout;
     int m_daqtype;
     int m_nBadDr;
     int m_nBadHV;