diff --git a/TileCalorimeter/TileCalib/TileCalibBlobObjs/TileCalibBlobObjs/TileCalibUtils.h b/TileCalorimeter/TileCalib/TileCalibBlobObjs/TileCalibBlobObjs/TileCalibUtils.h index d1e2253dd9870341b49aefa2d5bd386233108076..85af6046020d124bba7f4db73dd161cd38c17db0 100644 --- a/TileCalorimeter/TileCalib/TileCalibBlobObjs/TileCalibBlobObjs/TileCalibUtils.h +++ b/TileCalorimeter/TileCalib/TileCalibBlobObjs/TileCalibBlobObjs/TileCalibUtils.h @@ -132,21 +132,21 @@ class TileCalibUtils{ static unsigned int badtiming_definition_chan() {return BADTIMING_DEFINITION_CHAN;} - static const unsigned int MAX_ROS ; /**< @brief Number of ROSs */ - static const unsigned int MAX_DRAWER ; /**< @brief Number of drawers in ROS 1-4 */ - static const unsigned int MAX_DRAWR0 ; /**< @brief Number of drawers in ROS 0 */ - static const unsigned int MAX_CHAN ; /**< @brief Number of channels in drawer */ - static const unsigned int MAX_GAIN ; /**< @brief Number of gains per channel */ - static const unsigned int MAX_DRAWERIDX; /**< @brief Maximal drawer index */ - static const unsigned int LAS_PART_CHAN; /**< @brief Empty channel number to store laser partition variation */ - static const unsigned int TRIPS_DRAWERIDX; /**< @brief DrawerIdx used for storing trips probabilities */ - static const unsigned int TRIPS_ROS; /**< @brief Ros used for storing trips probabilities */ - static const unsigned int TRIPS_DRAWER; /**< @brief Drawer used for storing trips probabilities */ - static const unsigned int DEFINITIONS_DRAWERIDX; /**< @brief Drawer used for storing of bad and noisy channel definitions */ - static const unsigned int BAD_DEFINITION_CHAN; /**< @brief Channel used for storing of bad channel definitions */ - static const unsigned int NOISY_DEFINITION_CHAN; /**< @brief Channel used for storing of noisy channel definitions */ - static const unsigned int NOGAINL1_DEFINITION_CHAN; /**< @brief Channel used for storing of NoGainLevel1 channel definitions */ - static const unsigned int BADTIMING_DEFINITION_CHAN; /**< @brief Channel used for storing of bad timing channel definitions */ + static const unsigned int MAX_ROS = 5; /**< @brief Number of ROSs */ + static const unsigned int MAX_DRAWER = 64; /**< @brief Number of drawers in ROS 1-4 */ + static const unsigned int MAX_DRAWR0 = 20; /**< @brief Number of drawers in ROS 0 */ + static const unsigned int MAX_CHAN = 48; /**< @brief Number of channels in drawer */ + static const unsigned int MAX_GAIN = 2; /**< @brief Number of gains per channel */ + static const unsigned int MAX_DRAWERIDX = 276; /**< @brief Maximal drawer index */ + static const unsigned int LAS_PART_CHAN= 43; /**< @brief Empty channel number to store laser partition variation */ + static const unsigned int TRIPS_DRAWERIDX= 2; /**< @brief DrawerIdx used for storing trips probabilities */ + static const unsigned int TRIPS_ROS = 0; /**< @brief Ros used for storing trips probabilities */ + static const unsigned int TRIPS_DRAWER = 2; /**< @brief Drawer used for storing trips probabilities */ + static const unsigned int DEFINITIONS_DRAWERIDX = 1; /**< @brief Drawer used for storing of bad and noisy channel definitions */ + static const unsigned int BAD_DEFINITION_CHAN = 0; /**< @brief Channel used for storing of bad channel definitions */ + static const unsigned int NOISY_DEFINITION_CHAN = 1; /**< @brief Channel used for storing of noisy channel definitions */ + static const unsigned int NOGAINL1_DEFINITION_CHAN = 2; /**< @brief Channel used for storing of NoGainLevel1 channel definitions */ + static const unsigned int BADTIMING_DEFINITION_CHAN = 3; /**< @brief Channel used for storing of bad timing channel definitions */ }; diff --git a/TileCalorimeter/TileCalib/TileCalibBlobObjs/src/TileCalibUtils.cxx b/TileCalorimeter/TileCalib/TileCalibBlobObjs/src/TileCalibUtils.cxx index 728abb40f20d2687c5cc19e5a6cd60741fa63c45..f0c2c3533f30fc3db3c38929c72ff775f555bf6e 100644 --- a/TileCalorimeter/TileCalib/TileCalibBlobObjs/src/TileCalibUtils.cxx +++ b/TileCalorimeter/TileCalib/TileCalibBlobObjs/src/TileCalibUtils.cxx @@ -1,5 +1,5 @@ /* - Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration + Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration */ #include "TileCalibBlobObjs/TileCalibUtils.h" @@ -9,21 +9,21 @@ #include <iomanip> #include <cmath> -const unsigned int TileCalibUtils::MAX_ROS = 5; /**< @brief Number of ROSs */ -const unsigned int TileCalibUtils::MAX_DRAWER = 64; /**< @brief Number of drawers in ROS 1-4 */ -const unsigned int TileCalibUtils::MAX_DRAWR0 = 20; /**< @brief Number of drawers in ROS 0 */ -const unsigned int TileCalibUtils::MAX_CHAN = 48; /**< @brief Number of channels in drawer */ -const unsigned int TileCalibUtils::MAX_GAIN = 2; /**< @brief Number of gains per channel */ -const unsigned int TileCalibUtils::MAX_DRAWERIDX = 276; /**< @brief Maximal drawer index */ -const unsigned int TileCalibUtils::LAS_PART_CHAN = 43; /**< @brief Empty channel number to store laser partition variation */ -const unsigned int TileCalibUtils::TRIPS_DRAWERIDX = 2; /**< @brief DrawerIdx used for storing trips probabilities */ -const unsigned int TileCalibUtils::TRIPS_ROS = 0; /**< @brief Ros used for storing trips probabilities */ -const unsigned int TileCalibUtils::TRIPS_DRAWER = 2; /**< @brief Drawer used for storing trips probabilities */ -const unsigned int TileCalibUtils::DEFINITIONS_DRAWERIDX = 1; /**< @brief Drawer used for storing of bad and noisy channel definitions */ -const unsigned int TileCalibUtils::BAD_DEFINITION_CHAN = 0; /**< @brief Channel used for storing of bad channel definitions */ -const unsigned int TileCalibUtils::NOISY_DEFINITION_CHAN = 1; /**< @brief Channel used for storing of noisy channel definitions */ -const unsigned int TileCalibUtils::NOGAINL1_DEFINITION_CHAN = 2; /**< @brief Channel used for storing of NoGainLevel1 channel definitions */ -const unsigned int TileCalibUtils::BADTIMING_DEFINITION_CHAN = 3; /**< @brief Channel used for storing of bad timing channel definitions */ +const unsigned int TileCalibUtils::MAX_ROS; +const unsigned int TileCalibUtils::MAX_DRAWER; +const unsigned int TileCalibUtils::MAX_DRAWR0; +const unsigned int TileCalibUtils::MAX_CHAN; +const unsigned int TileCalibUtils::MAX_GAIN; +const unsigned int TileCalibUtils::MAX_DRAWERIDX; +const unsigned int TileCalibUtils::LAS_PART_CHAN; +const unsigned int TileCalibUtils::TRIPS_DRAWERIDX; +const unsigned int TileCalibUtils::TRIPS_ROS; +const unsigned int TileCalibUtils::TRIPS_DRAWER; +const unsigned int TileCalibUtils::DEFINITIONS_DRAWERIDX; +const unsigned int TileCalibUtils::BAD_DEFINITION_CHAN; +const unsigned int TileCalibUtils::NOISY_DEFINITION_CHAN; +const unsigned int TileCalibUtils::NOGAINL1_DEFINITION_CHAN; +const unsigned int TileCalibUtils::BADTIMING_DEFINITION_CHAN; // //_____________________________________________________________________________