Commit 7c5402f5 authored by Scott Snyder's avatar Scott Snyder Committed by Graeme Stewart
Browse files

Fix compilation warnings. (TileConditions-00-09-37)

	* Tagging TileConditions-00-09-37.
	* Fix compilation warnings.

2014-12-04  Siarhei Harkusha  <Siarhei.Harkusha@cern.ch>

	* python/TileCondToolConf.py: added possibility to set up the following conditions tools
	 using file with arbitrary name (file should be in current directory or in DATAPATH env):
	 TileCondToolNoiseRawChn, TileCondToolAutoCr, TileCondToolMuID, TileCondToolTiming,
	 TileCondToolPulseShape, TileCondToolIntegrator, TileCondToolMuID
	* src/TileBadChanTool.cxx: added possability to use bad timing definition from data base
	* Tagging TileConditions-00-09-36

2014-11-25  Sanya Solodkov  <solodkov@pcatl03.cern.ch>

	* reverting changes in TileDCSSvc done on 2014-09-25
	* now COOL channels are the same in RUN1 and RUN2 DB
	* Tagging TileConditions-00-09-34

2014-11-12  Sanya Solodkov  <solodkov@pcatl03.cern.ch>
...
(Long ChangeLog diff - truncated)
parent d47ed13c
......@@ -206,6 +206,7 @@ StatusCode TileBadChanTool::recache(IOVSVC_CALLBACK_ARGS_K(keys)) {
//--- drawerIdx=1, channel=0: definition of bad channel
//--- drawerIdx=1, channel=1: definition of noisy channel
//--- drawerIdx=1, channel=2: definition of NoGainLevel1 channel
//--- drawerIdx=1, channel=3: definition of bad timing channel
//--- .... (this list could be extended if needed)
//============================================================
//=== Reset defintion to hard-coded defaults
......@@ -247,6 +248,18 @@ StatusCode TileBadChanTool::recache(IOVSVC_CALLBACK_ARGS_K(keys)) {
ATH_MSG_INFO( "No TileBchStatus::isNoGainL1() definition found in DB, using defaults" );
}
//=== TileBchStatus.isBadTiming() definition
definitionsCalibDrawer->getStatusWords(TileCalibUtils::BADTIMING_DEFINITION_CHAN, 0, adcBits, chnBits);
chnStatus = m_tileBchDecoder[bitPatVer]->decode(chnBits, adcBits);
if (chnStatus.isAffected()) {
ATH_MSG_INFO( "Updating TileBchStatus::isBadTiming() definition from DB" );
TileBchStatus::defineBadTiming(chnStatus);
} else {
ATH_MSG_INFO( "No TileBchStatus::isBadTiming() definition found in DB, using defaults" );
}
//=== report current definitions
ATH_MSG_INFO( "TileBchStatus::isBad() is defined by: "
<< TileBchStatus::getDefinitionBad().getString() );
......@@ -254,6 +267,8 @@ StatusCode TileBadChanTool::recache(IOVSVC_CALLBACK_ARGS_K(keys)) {
<< TileBchStatus::getDefinitionNoisy().getString() );
ATH_MSG_INFO( "TileBchStatus::isNoGainL1() is defined by: "
<< TileBchStatus::getDefinitionNoGainL1().getString() );
ATH_MSG_INFO( "TileBchStatus::isBadTiming() is defined by: "
<< TileBchStatus::getDefinitionBadTiming().getString() );
// Check if drawer trips probabilities for simulation are exist in DB.
......
......@@ -277,7 +277,7 @@ const TileOfcWeightsStruct* TileCondToolOfc::getOfcWeights(unsigned int drawerId
<< " Cache " << m_cache );
unsigned int chanIdx;
unsigned int chanIdx = 0;
if (m_cache) chanIdx = TileCalibUtils::getChanIdx(drawerIdx, channel) + MAX_ADCS * adc;
// --- calculate on-fly if #of cached phases for this channel is too big
if (m_cache && ((*ofc_phase_cache[chanIdx]).size() < m_cache)) {
......
......@@ -195,17 +195,18 @@ StatusCode TileDCSSvc::initialize() {
// read special deltas for few unstable PMTs
if (m_readHVSET) read_badhv("BadHVChannels.dat");
if (m_version == 2) {
ATH_MSG_INFO( "Reading config for RUN2");
if (read_config("DCSChStatesInCOOLR2.dat", "_LVPS_", m_pModulesSTATES)) return StatusCode::FAILURE;
if (read_config("DCSChHVInCOOLR2.dat", "Drawer", m_pModulesHV)) return StatusCode::FAILURE;
if (read_config("DCSChHVSETInCOOLR2.dat", "Drawer", m_pModulesHVSET)) return StatusCode::FAILURE;
} else {
ATH_MSG_INFO( "Reading config for RUN1");
// not needed - all cool channels are the same as in RUN1 now
//if (m_version == 2) {
// ATH_MSG_INFO( "Reading config for RUN2");
// if (read_config("DCSChStatesInCOOLR2.dat", "_LVPS_", m_pModulesSTATES)) return StatusCode::FAILURE;
// if (read_config("DCSChHVInCOOLR2.dat", "Drawer", m_pModulesHV)) return StatusCode::FAILURE;
// if (read_config("DCSChHVSETInCOOLR2.dat", "Drawer", m_pModulesHVSET)) return StatusCode::FAILURE;
//} else {
// ATH_MSG_INFO( "Reading config for RUN1");
if (read_config("DCSChStatesInCOOL.dat", "_LVPS_", m_pModulesSTATES)) return StatusCode::FAILURE;
if (read_config("DCSChHVInCOOL.dat", "Drawer", m_pModulesHV)) return StatusCode::FAILURE;
if (read_config("DCSChHVSETInCOOL.dat", "Drawer", m_pModulesHVSET)) return StatusCode::FAILURE;
}
//}
return StatusCode::SUCCESS;
}
......@@ -452,7 +453,7 @@ int TileDCSSvc::read_badhv(std::string filename) {
float delta, offset;
char ll[256];
std::string line;
size_t pos;
size_t pos = 0;
while (true) {
......
......@@ -418,7 +418,7 @@ void TileInfoLoader::handle ( const Incident& incident ) {
if (m_eorCalled) {
if (m_detStore->record(m_info, "TileInfo", false ).isFailure()) {
ATH_MSG_ERROR( "Failed to register new TileInfo object in the detector store." );
ATH_MSG_WARNING( "Failed to register new TileInfo object in the detector store." );
} else {
ATH_MSG_INFO( "Placed TileInfo object in the detector store." );
m_eorCalled = false;
......@@ -433,9 +433,11 @@ void TileInfoLoader::handle ( const Incident& incident ) {
ATH_MSG_DEBUG( "TileInfo counter before release " << m_detStore->typeCount<TileInfo>() );
m_detStore->releaseObject(m_info->clID(), "TileInfo");
ATH_MSG_INFO( "Removed TileInfo object from detector store." );
//StatusCode sc = m_detStore->remove(m_info);
if (m_detStore->remove(m_info).isFailure()) {
ATH_MSG_WARNING( "Failed to remove TileInfo object from detector store." );
} else {
ATH_MSG_INFO( "Removed TileInfo object from detector store." );
}
ATH_MSG_DEBUG( "TileInfo counter after release " << m_detStore->typeCount<TileInfo>() );
m_eorCalled = true;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment