Merge branch 'testTileCellBuilder.TileRecUtils-20180925' into 'master'

TileRecUtils: Test TileCellBuilder.

See merge request atlas/athena!14510

TileCalorimeter/TileRecUtils/CMakeLists.txt

@@ -32,6 +32,7 @@ atlas_depends_on_subdirs( PUBLIC
 
 # External dependencies:
 find_package( Boost COMPONENTS filesystem thread system )
+find_package( ROOT COMPONENTS Core )
 find_package( CLHEP )
 
 # Component(s) in the package:
@@ -53,3 +54,15 @@ atlas_add_component( TileRecUtils
 atlas_install_python_modules( python/*.py )
 atlas_install_joboptions( share/*.py )
 
+atlas_add_dictionary( TileRecUtilsDict
+                      TileRecUtils/TileRecUtilsDict.h
+                      TileRecUtils/selection.xml
+                      INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
+                      LINK_LIBRARIES ${ROOT_LIBRARIES} TileRecUtilsLib )
+
+
+atlas_add_test( TileCellBuilder_test
+  SCRIPT test/TileCellBuilder_test.sh
+  PROPERTIES TIMEOUT 600
+  EXTRA_PATTERNS "LArDetectorToolNV|is still valid|no data retrieved|Database being retired|Reading file|Unable to locate catalog|Resolved path|DigitizationFlags|^Domain|created CondCont|no dictionary for class|^ +[+]|Reading LArPedestalMC|IOV callback|^DetectorStore|TileDetectorTool|Creating TileCondProxyFile" )
+

TileCalorimeter/TileRecUtils/TileRecUtils/TileRecUtilsDict.h

+// This file's extension implies that it's C, but it's really -*- C++ -*-.
+/*
+ * Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration.
+ */
+/**
+ * @file TileRecUtils/TileRecUtilsDict.h
+ * @author scott snyder <snyder@bnl.gov>
+ * @date Sep, 2018
+ * @brief Generate dictionary for TileRecUtils.
+ */
+
+
+#ifndef TILERECUTILS_TILERECUTILSDICT_H
+#define TILERECUTILS_TILERECUTILSDICT_H
+
+
+// Needed for tests.
+#include "TileRecUtils/TileBeamInfoProvider.h"
+
+
+#endif // not TILERECUTILS_TILERECUTILSDICT_H

TileCalorimeter/TileRecUtils/TileRecUtils/selection.xml

+<lcgdict>
+  <class name="TileBeamInfoProvider"/>
+</lcgdict>

TileCalorimeter/TileRecUtils/src/TileBeamInfoProvider.cxx

@@ -641,7 +641,7 @@ const TileDQstatus * TileBeamInfoProvider::getDQstatus() {
     TileFragHash::TYPE RChType = m_rcCnt->get_type();
     if (RChType != TileFragHash::OptFilterDsp
         && RChType != TileFragHash::OptFilterDspCompressed) {
-      ATH_MSG_INFO("RawChannelContaier didn't come from BS - don't check DQ flags");
+      ATH_MSG_INFO("RawChannelContainer didn't come from BS - don't check DQ flags");
       ATH_MSG_INFO("RChType = " << RChType);
       m_DQstatus.setAllGood();
       m_checkDQ = false;

TileCalorimeter/TileRecUtils/src/TileCellBuilder.cxx

@@ -172,7 +172,7 @@ TileCellBuilder::~TileCellBuilder(){
  * Initializer
  */
 StatusCode TileCellBuilder::initialize() {
-  
+
   // retrieve MBTS and Tile detector manager, TileID helper and TileIfno from det store
   if (m_MBTSContainerKey.key().empty()) {
     m_mbtsMgr = nullptr;
@@ -310,7 +310,7 @@ StatusCode TileCellBuilder::process(CaloCellContainer * theCellContainer) {
 
   } else {
     
-    ATH_MSG_DEBUG( "Container " << m_rawChannelContainerKey.key() << " with TileRawChannles found ");
+    ATH_MSG_DEBUG( "Container " << m_rawChannelContainerKey.key() << " with TileRawChannels found ");
 
     m_RChType = rawChannelContainer->get_type();
     m_RChUnit = rawChannelContainer->get_unit();
@@ -402,7 +402,7 @@ StatusCode TileCellBuilder::process(CaloCellContainer * theCellContainer) {
           dspTimeCut = 63.9375; // 64-1/16 ns is hard limit in DSP
           dspCorrectAmplitude = ((dspFlags & 0x3000000) == 0);
           dspCorrectTime = ((dspFlags & 0x3000000) != 0);
-        } else { // dsp container contains resluts of offline reco
+        } else { // dsp container contains results of offline reco
           dspTimeCut = ((dspFlags >> 27) & 1) ? 100.0 : 75.0; // 100 or 75 ns is the limit for 9 or 7 samples
         }
 
@@ -1140,7 +1140,7 @@ void TileCellBuilder::build(const ITERATOR & begin, const ITERATOR & end, COLLEC
 
     if (index == -3) { // E4' cells
 
-      if (m_E4prCells) { // do something with them only if contaier existst
+      if (m_E4prCells) { // do something with them only if container exists
         ++nE4pr;
 
         // convert ADC counts to MeV. like for normal cells

TileCalorimeter/TileRecUtils/src/TileCellBuilderFromHit.cxx

@@ -370,7 +370,7 @@ StatusCode TileCellBuilderFromHit::process(CaloCellContainer * theCellContainer)
     flag |= fl << (p - 1);
   }
 
-  // number of cosecutively masked modules (if it's > 15 we have error already set)
+  // number of consecutively masked modules (if it's > 15 we have error already set)
   flag |= (std::min(15, drConsecMaxMax) << 16);
 
   if (drConsecMaxMax > 1 && error < xAOD::EventInfo::Warning) {

TileCalorimeter/TileRecUtils/test/TileCellBuilder_test.sh

+#!/bin/bash
+#
+# Script running the TileCellBuilder_test.py test with CTest.
+#
+
+# Run the job:
+athena.py TileRecUtils/TileCellBuilder_test.py