diff --git a/InnerDetector/InDetConditions/InDetConditionsAthenaPool/CMakeLists.txt b/InnerDetector/InDetConditions/InDetConditionsAthenaPool/CMakeLists.txt
index 1af400f94b7c800be9545c2a6b97214461a9754c..8500b6064c72ba49c40a126dd4459cb28499332b 100644
--- a/InnerDetector/InDetConditions/InDetConditionsAthenaPool/CMakeLists.txt
+++ b/InnerDetector/InDetConditions/InDetConditionsAthenaPool/CMakeLists.txt
@@ -16,10 +16,7 @@ atlas_depends_on_subdirs(
# Component(s) in the package:
atlas_add_poolcnv_library( InDetConditionsAthenaPoolPoolCnv src/*.cxx
- FILES TRT_ConditionsData/TRTRtFloat.h
- TRT_ConditionsData/TRTWeiFloat.h
- TRT_ConditionsData/TRTAliFloat.h
- TRT_ConditionsData/TRTStrawStatusData.h
+ FILES TRT_ConditionsData/TRTStrawStatusData.h
TRT_ConditionsData/FloatArrayStore.h
TRT_ConditionsData/StrawT0Container.h
TRT_ConditionsData/RtRelationContainer.h
diff --git a/InnerDetector/InDetConditions/TRT_ConditionsData/CMakeLists.txt b/InnerDetector/InDetConditions/TRT_ConditionsData/CMakeLists.txt
index 8b620cc1aa28d6547c8c86a280269969afe85f21..21df872f9dc891da7653c40579cb14eefeb6459d 100644
--- a/InnerDetector/InDetConditions/TRT_ConditionsData/CMakeLists.txt
+++ b/InnerDetector/InDetConditions/TRT_ConditionsData/CMakeLists.txt
@@ -8,7 +8,6 @@ atlas_subdir( TRT_ConditionsData )
# Declare the package's dependencies:
atlas_depends_on_subdirs( PUBLIC
Control/AthenaKernel
- Control/AthToolSupport/AsgTools
Database/AthenaPOOL/AthenaPoolUtilities
DetectorDescription/DetDescrCond/DetDescrConditions
DetectorDescription/Identifier
diff --git a/InnerDetector/InDetConditions/TRT_ConditionsData/TRT_ConditionsData/ArrayStore.h b/InnerDetector/InDetConditions/TRT_ConditionsData/TRT_ConditionsData/ArrayStore.h
index bae14b9fa33cb7a7d8224c197d3dbb93ef83423e..ced4f715689f0173eb3d2ddce26ddefbbf267b59 100755
--- a/InnerDetector/InDetConditions/TRT_ConditionsData/TRT_ConditionsData/ArrayStore.h
+++ b/InnerDetector/InDetConditions/TRT_ConditionsData/TRT_ConditionsData/ArrayStore.h
@@ -161,7 +161,6 @@ void ArrayStore<IdType, StorageType>::cleanUp(){
this->clear();
int i(-tmp.size());
for (;i<(int)tmp.size();i++){
- //std::cout << indexmap.count(i) << " " << i << std::endl;
bool first(true);
IdType shared_id;
typename std::multimap<int,IdType>::iterator pos;
diff --git a/InnerDetector/InDetConditions/TRT_ConditionsData/TRT_ConditionsData/MultChanContainer.h b/InnerDetector/InDetConditions/TRT_ConditionsData/TRT_ConditionsData/MultChanContainer.h
index 774233a3b0e705c9d051f818fa8364b7313d1ac7..10efd44aadfa399bb3ccc4c54bebbae996c4cc75 100755
--- a/InnerDetector/InDetConditions/TRT_ConditionsData/TRT_ConditionsData/MultChanContainer.h
+++ b/InnerDetector/InDetConditions/TRT_ConditionsData/TRT_ConditionsData/MultChanContainer.h
@@ -29,7 +29,8 @@
#include "AthenaPoolUtilities/CondMultChanCollection.h"
#include "TRT_ConditionsData/NestedContainer.h"
-
+#include "AthenaKernel/getMessageSvc.h"
+#include "GaudiKernel/MsgStream.h"
#include <cxxabi.h>
namespace TRTCond
@@ -172,7 +173,8 @@ template <class DaughterContainer>
{
// on the first call, we insert a container for the default. the default is always the first container.
if( id.level()==ExpandedIdentifier::BARRELEC ) {
- std::cout << "Sorry: TRTCond::MultiChannelContainer cannot store containers at BARREL_EC granularity" << std::endl ;
+ MsgStream log(Athena::getMessageSvc(),"TRTCond::MultChanContainer");
+ log << MSG::WARNING << "Sorry: cannot store containers at BARREL_EC granularity" << endmsg ;
}
return findContainer( channelId( id ) ) ;
}
@@ -208,8 +210,10 @@ template <class DaughterContainer>
// update the cache
// sanity check to test we have added a default value
- if( this->size()>0 && *(this->chan_begin()) != m_defaultschannelid )
- std::cout << "TRTCal::MultChanContainer ERROR: first channel id is not defaults channel id!" << std::endl ;
+ if( this->size()>0 && *(this->chan_begin()) != m_defaultschannelid ) {
+ MsgStream log(Athena::getMessageSvc(),"TRTCond::MultChanContainer");
+ log << MSG::ERROR << " first channel id is not defaults channel id!" << endmsg ;
+ }
// first get the max channel id
size_t maxchanid(0) ;
@@ -230,16 +234,17 @@ template <class DaughterContainer>
template <class DaughterContainer>
inline void MultChanContainer<DaughterContainer>::set( const ExpandedIdentifier& id, const typename DaughterContainer::value_type& t )
{
- if( id.level()==ExpandedIdentifier::DETECTOR )
+ if( id.level()==ExpandedIdentifier::DETECTOR ) {
// set the default value. don't use the id, since it will only confuse the container
findContainer(id)->set( t ) ;
- else if( id.level()==ExpandedIdentifier::BARRELEC )
- std::cout << "Sorry: TRTCond::MultiChannelContainer cannot store containers at BARREL_EC granularity" << std::endl ;
- else
+ } else if( id.level()==ExpandedIdentifier::BARRELEC ) {
+ MsgStream log(Athena::getMessageSvc(),"TRTCond::MultChanContainer");
+ log << MSG::WARNING << "Sorry: cannot store containers at BARREL_EC granularity" << endmsg;
+ } else {
findContainer(id)->set( id, t ) ;
+ }
}
-
template <class DaughterContainer>
inline const typename DaughterContainer::value_type&
MultChanContainer<DaughterContainer>::get( const ExpandedIdentifier& id ) const
diff --git a/InnerDetector/InDetConditions/TRT_ConditionsData/TRT_ConditionsData/NestedContainer.h b/InnerDetector/InDetConditions/TRT_ConditionsData/TRT_ConditionsData/NestedContainer.h
index e3227798f07c710e0d20afab9e00f670bbc2ca4f..559102e201601d8df1e0b93108e2370dcc87f380 100755
--- a/InnerDetector/InDetConditions/TRT_ConditionsData/TRT_ConditionsData/NestedContainer.h
+++ b/InnerDetector/InDetConditions/TRT_ConditionsData/TRT_ConditionsData/NestedContainer.h
@@ -65,6 +65,8 @@
#include <functional>
#include <algorithm>
#include "TRT_ConditionsData/ExpandedIdentifier.h"
+#include "AthenaKernel/getMessageSvc.h"
+#include "GaudiKernel/MsgStream.h"
namespace TRTCond
@@ -312,7 +314,6 @@ namespace TRTCond
T defaultvalue(Trait::initialvalue()) ;
if( firstvaliddaughter < m_daughters.size() )
Trait::copy(defaultvalue,NestedContainerDaughterAccessor<Daughter,T,Trait>::get(m_daughters[firstvaliddaughter])) ;
- //else { printindent() ; std::cout << "found not a single valid daughter! " << m_daughters.size() << std::endl ; }
clear() ; // this clears pointers in the daughters. would rather replace that with destructors.
m_daughters = DaughterContainer(0) ;
m_default = defaultvalue ;
diff --git a/InnerDetector/InDetConditions/TRT_ConditionsData/TRT_ConditionsData/StorePIDinfo.h b/InnerDetector/InDetConditions/TRT_ConditionsData/TRT_ConditionsData/StorePIDinfo.h
index eefc1a47c86545fde7cb390e7842f02e46c99f5c..408aa0c715377ce13d0b9734fa42944718fbb62f 100644
--- a/InnerDetector/InDetConditions/TRT_ConditionsData/TRT_ConditionsData/StorePIDinfo.h
+++ b/InnerDetector/InDetConditions/TRT_ConditionsData/TRT_ConditionsData/StorePIDinfo.h
@@ -9,6 +9,7 @@
///////////////////////////////////////////////////////////////////
#include <vector>
#include "GaudiKernel/StatusCode.h"
+
class StorePIDinfo{
public:
StorePIDinfo();
diff --git a/InnerDetector/InDetConditions/TRT_ConditionsData/TRT_ConditionsData/StrawDxMultChanContainer.h b/InnerDetector/InDetConditions/TRT_ConditionsData/TRT_ConditionsData/StrawDxMultChanContainer.h
index 81033a06d15ef8c2ff4293289f30522e46c0dd25..0e2b733fba3692265ecee126bffc4ea1c9507941 100755
--- a/InnerDetector/InDetConditions/TRT_ConditionsData/TRT_ConditionsData/StrawDxMultChanContainer.h
+++ b/InnerDetector/InDetConditions/TRT_ConditionsData/TRT_ConditionsData/StrawDxMultChanContainer.h
@@ -16,6 +16,8 @@
#include "TRT_ConditionsData/StrawDxContainer.h"
#include "TRT_ConditionsData/MultChanContainer.h"
+#include "AthenaKernel/getMessageSvc.h"
+#include "GaudiKernel/MsgStream.h"
namespace TRTCond
{
@@ -54,18 +56,23 @@ namespace TRTCond
/** set dx */
void setDx(const ExpandedIdentifier& id, float dx1, float dx2, float dxerr) {
- if( id.level()==ExpandedIdentifier::DETECTOR )
+ if( id.level()==ExpandedIdentifier::DETECTOR ) {
findContainer(id)->setDx(dx1,dx2,dxerr) ;
- else if( id.level()==ExpandedIdentifier::BARRELEC )
- std::cout << "Sorry: TRTCond::StrawDxMultChanContainer cannot store containers at BARREL_EC granularity" << std::endl ;
- else
+ } else if( id.level()==ExpandedIdentifier::BARRELEC ) {
+ MsgStream log(Athena::getMessageSvc(),"StrawDxMultChanContainer");
+ log << MSG::WARNING << "Sorry: cannot store containers at BARREL_EC granularity" << endmsg ;
+ } else {
findContainer(id)->setDx( id, dx1, dx2, dxerr) ;
+ }
}
/** method to unpack a StrawDx object */
void unpack(const ExpandedIdentifier& id, float& dx1 , float& dx2, float& dxerr) const {
const StrawDxLayerContainer* container = getContainer(channelId(id)) ;
- if(container==0) std::cout << "ERRRRRRORRRRRR: cannot find container ..." << id << " " << channelId(id) << std::endl ;
+ if(container==0) {
+ MsgStream log(Athena::getMessageSvc(),"StrawDxMultChanContainer");
+ log << MSG::ERROR << "cannot find container channel " << channelId(id) << endmsg;
+ }
dx1 = container->getDx1(id);
dx2 = container->getDx2(id);
dxerr = container->getDxErr(id);
diff --git a/InnerDetector/InDetConditions/TRT_ConditionsData/TRT_ConditionsData/StrawT0MultChanContainer.h b/InnerDetector/InDetConditions/TRT_ConditionsData/TRT_ConditionsData/StrawT0MultChanContainer.h
index 4ac5c161d19d4467adf1299c2e93b88bfc23efea..276e10b100203c1c8f7db2d7df05274927bb2519 100755
--- a/InnerDetector/InDetConditions/TRT_ConditionsData/TRT_ConditionsData/StrawT0MultChanContainer.h
+++ b/InnerDetector/InDetConditions/TRT_ConditionsData/TRT_ConditionsData/StrawT0MultChanContainer.h
@@ -17,6 +17,8 @@
#include "TRT_ConditionsData/StrawT0Container.h"
#include "TRT_ConditionsData/MultChanContainer.h"
#include "AthenaKernel/CondCont.h"
+#include "AthenaKernel/getMessageSvc.h"
+#include "GaudiKernel/MsgStream.h"
namespace TRTCond
{
@@ -51,19 +53,21 @@ namespace TRTCond
/// set t0
void setT0(const ExpandedIdentifier& id, float t0, float t0err) {
- if( id.level()==ExpandedIdentifier::DETECTOR )
+ if( id.level()==ExpandedIdentifier::DETECTOR ) {
findContainer(id)->setT0(t0,t0err) ;
- else if( id.level()==ExpandedIdentifier::BARRELEC )
- std::cout << "Sorry: TRTCond::StrawT0MultChanContainer cannot store containers at BARREL_EC granularity" << std::endl ;
- else
+ } else if( id.level()==ExpandedIdentifier::BARRELEC ) {
+ MsgStream log(Athena::getMessageSvc(),"StrawT0MultChanContainer");
+ log << MSG::WARNING << "Sorry: cannot store containers at BARREL_EC granularity" << endmsg;
+ } else {
findContainer(id)->setT0( id, t0,t0err) ;
+ }
}
-
/// public method to unpack a StrawT0 object
void unpack(const ExpandedIdentifier& id, const StrawT0& sd, float& t0 , float& t0err) const {
const StrawT0LayerContainer* container = getContainer(channelId(id)) ;
- if(not container){
- std::cout << "ERRRRRRORRRRRR: cannot find container ..." << id << " " << channelId(id) << std::endl ;
+ if(not container){
+ MsgStream log(Athena::getMessageSvc(),"StrawT0MultChanContainer");
+ log << MSG::ERROR << "cannot find container channel" << channelId(id) << endmsg ;
} else {
container->unpack( sd,t0,t0err ) ;
}
diff --git a/InnerDetector/InDetConditions/TRT_ConditionsData/TRT_ConditionsData/TRTAliFloat.h b/InnerDetector/InDetConditions/TRT_ConditionsData/TRT_ConditionsData/TRTAliFloat.h
deleted file mode 100755
index 062cd1adeb5da5714632292be750b202a669fb33..0000000000000000000000000000000000000000
--- a/InnerDetector/InDetConditions/TRT_ConditionsData/TRT_ConditionsData/TRTAliFloat.h
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
-*/
-
-#ifndef TRTCONDITIONSDATA_TRTALIFLOAT_H
-#define TRTCONDITIONSDATA_TRTALIFLOAT_H
-// TRTWeiFloat.h - class to hold a pointer to the z/r dependent
-// fine corrections to the Rphi position of TRT wires:
-// Delta(Rphi)= d0 + d1*(y-y0) + d2*(y-y0)*(y-y0) [mm]
-// where y is z(barrel)/r(endcap) and y0 is the middle of the wire
-//
-// This class inherits from DetDescrCond/DetCondFloat.
-// Peter Hansen, started 1/5/04
-//
-#include <vector>
-#include <map>
-#include <algorithm>
-#include "DetDescrConditions/DetCondFloat.h"
-#include "AthenaKernel/CLASS_DEF.h"
-
-class Identifier;
-
-class TRTAliFloat: public DetCondFloat {
- public:
- TRTAliFloat();
- TRTAliFloat(const std::string tag);
-
- void print() const;
- void print2() const;
- int addValue(const Identifier& ident, float d0,
- float d1, float d2);
- int setValue(const Identifier& ident, float d0,
- float d1, float d2);
- int getValue(const Identifier& ident, float& d0, float& d1, float& d2) const;
- Identifier getValue(unsigned int elem, float& d0, float& d1, float& d2) const;
- size_t getMapSize() const;
-
- private:
- static const int m_TRTAli_size=3;
-};
-
-CLASS_DEF(TRTAliFloat,112414883,1)
-
-// inline functions for TRTAliFloat
-
-inline TRTAliFloat::TRTAliFloat() :
-DetCondFloat(m_TRTAli_size, "null") {}
-
-inline TRTAliFloat::TRTAliFloat(const std::string tag) :
-DetCondFloat(m_TRTAli_size, tag) {}
-
-inline size_t TRTAliFloat::getMapSize() const
-{return m_bufmap.size();}
-
-#endif // TRTCONDITIONSDATA_TRTALIFLOAT_H
diff --git a/InnerDetector/InDetConditions/TRT_ConditionsData/TRT_ConditionsData/TRTRtFloat.h b/InnerDetector/InDetConditions/TRT_ConditionsData/TRT_ConditionsData/TRTRtFloat.h
deleted file mode 100755
index 9db9ca826ce4ef4a11e278140e851dd774eb60c3..0000000000000000000000000000000000000000
--- a/InnerDetector/InDetConditions/TRT_ConditionsData/TRT_ConditionsData/TRTRtFloat.h
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
-*/
-
-#ifndef TRTCONDITIONSDATA_TRTRTFLOAT_H
-#define TRTCONDITIONSDATA_TRTRTFLOAT_H
-// TRTRtFloat.h - class to hold a pointer to the TRT space-time calibration
-// constants associated with a TRT_ID key..
-// The constants are of type float:
-// T0 Tzero in units of ns
-// vd The drift velocity (0.2mm to 1.6mm from the wire) in mm/ns
-// vp The propagation velocity in units of the speed of light
-// a0-a3 Coefficients of a third deg pol R(T) in mm with T in ns.
-//
-// This class inherits from DetDescrCond/DetCondFloat.
-// Peter Hansen, started 1/5/04
-//
-#include <vector>
-#include <map>
-#include <algorithm>
-#include "DetDescrConditions/DetCondFloat.h"
-#include "AthenaKernel/CLASS_DEF.h"
-
-class Identifier;
-
-class TRTRtFloat: public DetCondFloat {
- public:
- TRTRtFloat();
- TRTRtFloat(const std::string tag);
-
- void print() const;
- void print2() const;
- int addValue(const Identifier& ident, float T0, float vd, float vp,
- float a0, float a1, float a2,
- float a3);
- int setValue(const Identifier& ident, float T0, float vd, float vp,
- float a0, float a1, float a2,
- float a3);
- int getValue(const Identifier& ident, float& T0, float& vd, float& vp,
- float& a0, float& a1, float& a2,
- float& a3) const;
- Identifier getValue(unsigned int elem, float& T0, float& vd, float& vp,
- float& a0, float& a1, float& a2,
- float& a3) const;
- size_t getMapSize() const;
-
- private:
- static const int m_TRTRt_size=7;
-};
-
-CLASS_DEF(TRTRtFloat,56983368,1)
-
-// inline functions for TRTRtFloat
-
-inline TRTRtFloat::TRTRtFloat() :
-DetCondFloat(m_TRTRt_size, "null") {}
-
-
-inline TRTRtFloat::TRTRtFloat(const std::string tag) :
-DetCondFloat(m_TRTRt_size, tag) {}
-
-inline size_t TRTRtFloat::getMapSize() const
-{return m_bufmap.size();}
-
-#endif // TRTCONDITIONSDATA_TRTRTFLOAT_H
diff --git a/InnerDetector/InDetConditions/TRT_ConditionsData/TRT_ConditionsData/TRTWeiFloat.h b/InnerDetector/InDetConditions/TRT_ConditionsData/TRT_ConditionsData/TRTWeiFloat.h
deleted file mode 100755
index 127b36431f6d6d29700ad4324132034bb8a2755c..0000000000000000000000000000000000000000
--- a/InnerDetector/InDetConditions/TRT_ConditionsData/TRT_ConditionsData/TRTWeiFloat.h
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
-*/
-
-#ifndef TRTCONDITIONSDATA_TRTWEIFLOAT_H
-#define TRTCONDITIONSDATA_TRTWEIFLOAT_H
-// TRTWeiFloat.h - class to hold a pointer to the TRT resolution
-// and high-threshold weight associated with a TRT_ID key..
-// The constants are of type float:
-// res Space resolution in mm of drift time hit
-// htw The weight associated with a high threshold hit
-// In both cases, a zero value means "not recommended for use".
-//
-// This class inherits from DetDescrCond/DetCondFloat.
-// Peter Hansen, started 1/5/04
-//
-#include <vector>
-#include <map>
-#include <algorithm>
-#include "DetDescrConditions/DetCondFloat.h"
-#include "AthenaKernel/CLASS_DEF.h"
-
-class Identifier;
-
-class TRTWeiFloat: public DetCondFloat {
- public:
- TRTWeiFloat();
- TRTWeiFloat(const std::string tag);
-
- void print() const;
- void print2() const;
- int addValue(const Identifier& ident, float res, float htw);
- int setValue(const Identifier& ident, float res, float htw);
- int getValue(const Identifier& ident, float& res, float& htw) const;
- Identifier getValue(unsigned int elem, float& res, float& htw) const;
- size_t getMapSize() const;
-
- private:
- static const int m_TRTWei_size=2;
-};
-
-CLASS_DEF(TRTWeiFloat,174979412,1)
-
-// inline functions for TRTWeiFloat
-
-inline TRTWeiFloat::TRTWeiFloat() :
-DetCondFloat(m_TRTWei_size, "null") {}
-
-
-inline TRTWeiFloat::TRTWeiFloat(const std::string tag) :
-DetCondFloat(m_TRTWei_size, tag) {}
-
-inline size_t TRTWeiFloat::getMapSize() const
-{return m_bufmap.size();}
-
-#endif // TRTCONDITIONSDATA_TRTWEIFLOAT_H
diff --git a/InnerDetector/InDetConditions/TRT_ConditionsData/doc/packagedoc.h b/InnerDetector/InDetConditions/TRT_ConditionsData/doc/packagedoc.h
index a1bb6b70bfb51af9be6c602619befcde38e15fb1..c81c1706a86827f925373ef881b0e5d2b28e3b9c 100644
--- a/InnerDetector/InDetConditions/TRT_ConditionsData/doc/packagedoc.h
+++ b/InnerDetector/InDetConditions/TRT_ConditionsData/doc/packagedoc.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
*/
/**
@@ -10,6 +10,7 @@
@section TRT_ConditionsData_TRT_ConditionsDataIntro Introduction
This package provides TDS objects for storing TRT Conditions data.
+They are all valid for a given IoV and must thus be accessed with ReadCondHandle.
@section TRT_ConditionsData_TRT_ConditionsDataOverview Class Overview
@@ -35,11 +36,13 @@ This package provides TDS objects for storing TRT Conditions data.
- TRTCond::StrawStatusContainer : A NestedContainer of StrawStatus instances
- TRTCond::StrawStatusMultChanContainer : A MultChanContainer
- TRTCond::LinearPacker : Packs a value into a PackedType e.g. a char
- - TRTAlifloat : DEPRECIATED
- - TRTRtfloat : DEPRECIATED
- - TRTWeifloat : DEPRECIATED
- TRTStrawStatusData : A class holding dead/noisy status (to be relaced by TRTCond::StrawStatus)
-
+ - HTcalculator : Calculates the probability of an electron to produce a HT hit
+ - StorePIDId : Holds data used by HTcalculator
+ - TRTCond::HWmap : Finds HV-line of a given straw
+ - TRTCond::AliveStraws : Number of alive straws in various detector elements
+ - TRTCond::ActiveFraction : Basically the same thing
+ - TRTDedxCorrections : Holds corrections to the dE/dx calculation from the ToT
*/
diff --git a/InnerDetector/InDetConditions/TRT_ConditionsData/src/HTcalculator.cxx b/InnerDetector/InDetConditions/TRT_ConditionsData/src/HTcalculator.cxx
index e1327d298bb0075cb5735837bc1451b1e42b4dcf..47ec30255e9900c35e17cfffb6fc1ab51cf6210e 100644
--- a/InnerDetector/InDetConditions/TRT_ConditionsData/src/HTcalculator.cxx
+++ b/InnerDetector/InDetConditions/TRT_ConditionsData/src/HTcalculator.cxx
@@ -2,7 +2,10 @@
Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
*/
#include "TRT_ConditionsData/HTcalculator.h"
-#include "AsgTools/MsgStreamMacros.h"
+#include "AthenaKernel/getMessageSvc.h"
+#include "GaudiKernel/MsgStream.h"
+#include <iostream>
+
/*****************************************************************************\
|*%%% Default Constructor %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*|
@@ -24,7 +27,8 @@ HTcalculator::~HTcalculator(){
void HTcalculator::checkInitialization(){
if( not m_HasBeenInitialized ) {
- //ATH_MSG_WARNING( "The HTcalculator is about to be used uninitialized - Loading default");
+ MsgStream log(Athena::getMessageSvc(),"HTcalculator");
+ log << MSG::WARNING << "The HTcalculator is about to be used uninitialized - Loading default" << endmsg;
setDefaultCalibrationConstants();
m_HasBeenInitialized=1;
}
@@ -106,13 +110,12 @@ float HTcalculator::getProbHT(
// Jared - Temporarily disable ZR corrections, reproducibility issues with calibration
//correctionZR = 1.0;
- /*
- std::cout "check "
+ MsgStream log(Athena::getMessageSvc(),"HTcalculator");
+ log << MSG::DEBUG << "check "
<< " GammaOccupan: " << correctionPGOG
<< " correctionSL: " << correctionSL
<< " correctionZR: " << correctionZR
- << " correctionTW: " << correctionTW << std::endl;
- */
+ << " correctionTW: " << correctionTW << endmsg;
return correctionPGOG * correctionSL * correctionZR * correctionTW;
}
@@ -140,7 +143,7 @@ float HTcalculator::pHTvsPGOG(int TrtPart, int GasType, float p, float mass, flo
double beta0 = m_par_pHTvsPGOG_new[GasType][TrtPart].GetBinValue(3) / ((1.0 + exp_term0)*(1.0 + exp_term0)) * exp_term0 / m_par_pHTvsPGOG_new[GasType][TrtPart].GetBinValue(5);
double pHT_dEdx = alpha0 + beta0*(log10(gamma) - m_par_pHTvsPGOG_new[GasType][TrtPart].GetBinValue(0));
- // High-gamma part (linear at high gamma):
+ // High-gamma part (linear at high gamma):
double exp_term1 = exp(-(par1 - par4)/m_par_pHTvsPGOG_new[GasType][TrtPart].GetBinValue(5));
double alpha1 = m_par_pHTvsPGOG_new[GasType][TrtPart].GetBinValue(2) + m_par_pHTvsPGOG_new[GasType][TrtPart].GetBinValue(3)/(1.0 + exp_term1);
double beta1 = m_par_pHTvsPGOG_new[GasType][TrtPart].GetBinValue(3) / ((1.0 + exp_term1)*(1.0 + exp_term1)) * exp_term1 / m_par_pHTvsPGOG_new[GasType][TrtPart].GetBinValue(5);
@@ -162,16 +165,17 @@ float HTcalculator::pHTvsPGOG(int TrtPart, int GasType, float p, float mass, flo
StatusCode HTcalculator::ReadVectorDB( const CondAttrListVec* channel_values){
- //std::cout << "Set TRT HT PID Parameters from the Vector Database << std::endl;
+ MsgStream log(Athena::getMessageSvc(),"HTcalculator");
+ log << MSG::DEBUG << "Set TRT HT PID Parameters from the Vector Database" << endmsg;
if ( channel_values->size() < 1){
- //ATH_MSG_ERROR(" There are no Pid channels available!!");
+ log << MSG::ERROR << " There are no Pid channels available!!" << endmsg;
return StatusCode::FAILURE;
}
CondAttrListVec::const_iterator first_channel = channel_values->begin();
CondAttrListVec::const_iterator last_channel = channel_values->end();
- //std::cout << "There are " << channel_values->size() << " Channels " << std::endl;
+ log << MSG::DEBUG << "There are " << channel_values->size() << " Channels " << endmsg;
int inichan = 0;
for (; first_channel != last_channel; ++first_channel) {
switch(first_channel->first){
@@ -509,8 +513,8 @@ StatusCode HTcalculator::ReadVectorDB( const CondAttrListVec* channel_values){
}
}
- //std::cout << "We have read " << inichan << " good channels" << std::endl;
- //std::cout << m_par_pHTvsPGOG_new [0][0].GetBinValue(0) << "\t" << m_par_pHTvsPGOG_new [0][0].GetBinValue(1) << " " << m_par_pHTvsPGOG_new [0][0].GetBinValue(2) << std::endl;
+ log << MSG::DEBUG << "We have read " << inichan << " good channels" << endmsg;
+ log << MSG::DEBUG << m_par_pHTvsPGOG_new [0][0].GetBinValue(0) << "\t" << m_par_pHTvsPGOG_new [0][0].GetBinValue(1) << " " << m_par_pHTvsPGOG_new [0][0].GetBinValue(2) << endmsg;
for (int i = 0 ; i < N_DET; i++) {
@@ -528,7 +532,7 @@ StatusCode HTcalculator::ReadVectorDB( const CondAttrListVec* channel_values){
}
m_HasBeenInitialized=1;
- //ATH_MSG_INFO(" TRT PID HT Vector DB loaded: ");
+ log << MSG::INFO << " TRT PID HT Vector DB loaded: " << endmsg;
return StatusCode::SUCCESS;
}
@@ -552,7 +556,8 @@ void HTcalculator::setDefaultCalibrationConstants(){
\*****************************************************************************/
//FIXME
if (m_datainplace) return; // Just to load 1 time
- //std::cout << "Looks like HT PID DB is NOT available, so lets set hard-coded PID calibration constants. Derived from Run1 Data Zee and Zmumu 50 ns. FIXME!!" << std::endl;
+ MsgStream log(Athena::getMessageSvc(),"HTcalculator");
+ log << MSG::WARNING << " HT PID DB is NOT available. Set hard-coded PID calibration constants. Derived from Run1 Data Zee and Zmumu 50 ns." << endmsg;
m_HasBeenInitialized=1;
// Expanding to a 2D fit (gamma,occupancy) for three types of gases: Xenon, Argon, Krypton:
diff --git a/InnerDetector/InDetConditions/TRT_ConditionsData/src/StorePIDinfo.cxx b/InnerDetector/InDetConditions/TRT_ConditionsData/src/StorePIDinfo.cxx
index 27b58316ae542961d05c4eea46deeadda2db452a..12803a51ecc470e1319de035dfc6c33a045aa389 100644
--- a/InnerDetector/InDetConditions/TRT_ConditionsData/src/StorePIDinfo.cxx
+++ b/InnerDetector/InDetConditions/TRT_ConditionsData/src/StorePIDinfo.cxx
@@ -1,9 +1,11 @@
/*
Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
*/
-#include <iostream>
-#include "AsgTools/MsgStreamMacros.h"
#include "TRT_ConditionsData/StorePIDinfo.h"
+#include "AthenaKernel/getMessageSvc.h"
+#include "GaudiKernel/MsgStream.h"
+#include <iostream>
+
StorePIDinfo::StorePIDinfo(){
m_nbins = 0;
@@ -23,7 +25,8 @@ void StorePIDinfo::update( int nbins, float min, float max, std::vector<float> v
m_min = min ;
m_max = max ;
if (values.size()!=m_nbins){
- //ATH_MSG_ERROR(" Different Values of n_bins and vector size!!!")
+ MsgStream log(Athena::getMessageSvc(),"StorePIDinfo");
+ log << MSG::ERROR << " Different Values of n_bins and vector size!!!" << endmsg;
}
m_values.clear();
for (unsigned int i = 0; i<values.size(); i++ ){
@@ -46,19 +49,21 @@ void StorePIDinfo::push_back( float value ){
}
StatusCode StorePIDinfo::check( int gas, int detpart) const{
+ MsgStream log(Athena::getMessageSvc(),"StorePIDinfo");
if ( m_nbins == 0)
{
- std::cout << " StorePIDinfo: No bins in the DB!! Gas: " << gas << " detPart: " << detpart << std::endl;
+
+ log << MSG::ERROR << " StorePIDinfo: No bins in the DB!! Gas: " << gas << " detpart " << detpart << endmsg;
return StatusCode::FAILURE;
}
else if ( m_nbins != m_values.size() )
{
- std::cout << " Different number of PID numbers!!!!! " << gas << " detPart: " << detpart << std::endl;
+ log << MSG::ERROR << " Different number of PID numbers!!!!! " << endmsg;
return StatusCode::FAILURE;
}
else if ( (m_max < m_min) || (m_max == m_min) )
{
- std::cout << " Max is smaller or equal than min!!!" << gas << " detPart: " << detpart << std::endl;
+ log << MSG::ERROR << " Max is smaller or equal than min!!!" << endmsg;
return StatusCode::FAILURE;
}
return StatusCode::SUCCESS;
@@ -74,12 +79,12 @@ float StorePIDinfo::GetBinValue ( int bin) const {
}
int StorePIDinfo::GetBin ( float input ) const {
+
if (input < m_min) return 0;
else if (input >= m_max) return m_nbins-1;
else{
float dr = (m_max-m_min)/m_nbins;
unsigned int bin = int ( (input - m_min)/dr ) ;
- //if (bin >= m_nbins) ATH_MSG_ERROR" Bin number is larger than number of bins!");
return bin;
}
return 0;
diff --git a/InnerDetector/InDetConditions/TRT_ConditionsData/src/TRTAliFloat.cxx b/InnerDetector/InDetConditions/TRT_ConditionsData/src/TRTAliFloat.cxx
deleted file mode 100755
index 0c4cf7e4587d2a2462d5d51952166565ef62d9a5..0000000000000000000000000000000000000000
--- a/InnerDetector/InDetConditions/TRT_ConditionsData/src/TRTAliFloat.cxx
+++ /dev/null
@@ -1,94 +0,0 @@
-/*
- Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
-*/
-
-// TRTAliFloat.cxx
-// class to hold sets of identifiers and corrections to the Rphi for
-// TRT detector elements.
-// Peter Hansen 1/5/04
-
-#include <iostream>
-#include "TRT_ConditionsData/TRTAliFloat.h"
-#include "Identifier/Identifier.h"
-
-int TRTAliFloat::addValue(const Identifier& ident,
- float d0,
- float d1,
- float d2) {
-
- // get index of added objects
- int j=m_buf.size();
-
- // add them in to the buffer
- m_buf.resize(j+m_TRTAli_size);
- m_buf[j]=d0;
- m_buf[j+1]=d1;
- m_buf[j+1]=d2;
- // put new map entry
- m_bufmap[ident]=j;
- return j;
-}
-int TRTAliFloat::setValue(const Identifier& ident,
- float d0,
- float d1,
- float d2) {
- // get index in array
- const int j=this->findindex(ident);
- if(j<0) return j;
- // overwrite values
- m_buf[j]=d0;
- m_buf[j+1]=d1;
- m_buf[j+1]=d2;
- return j;
-}
-int TRTAliFloat::getValue( const Identifier& ident,
- float& d0,
- float& d1,
- float& d2 ) const {
- // get index of array
- const int j=this->findindex(ident);
- if(j<0) return j;
- // read values
- d0=m_buf[j];
- d1=m_buf[j+1];
- d2=m_buf[j+2];
- return j;
-}
-
-Identifier TRTAliFloat::getValue( unsigned int i,
- float& d0,
- float& d1,
- float& d2 ) const {
- // find data of element number i
-
- Identifier ident;
- BufferMap::const_iterator itr=m_bufmap.begin();
- for(unsigned int count=0; count!=i;count++) {++itr;}
- ident=itr->first;
- int j=itr->second;
- d0=m_buf[j];
- d1=m_buf[j+1];
- d2=m_buf[j+2];
- return ident;
-}
-
-void TRTAliFloat::print() const {
- std::cout << "TRTAliFloat " << m_tag << " holds " <<
- m_bufmap.size() << " elements with " << m_size << " floats"
- << std::endl;
-}
-
-void TRTAliFloat::print2() const {
- print();
- int i=0;
- for (BufferMap::const_iterator itr=m_bufmap.begin();
- itr!=m_bufmap.end(); ++itr,++i) {
- int j=itr->second;
- std::cout << "Element " << i << " ident " << (itr->first).getString() <<
- " indx " << j << " values:" << std::endl;
- std::cout << " d0 " << m_buf[j];
- std::cout << " d1 " << m_buf[j+1];
- std::cout << " d2 " << m_buf[j+2];
- std::cout << std::endl;
- }
-}
diff --git a/InnerDetector/InDetConditions/TRT_ConditionsData/src/TRTRtFloat.cxx b/InnerDetector/InDetConditions/TRT_ConditionsData/src/TRTRtFloat.cxx
deleted file mode 100755
index 6ac15923437d4efab6e49651950a7065283c7cba..0000000000000000000000000000000000000000
--- a/InnerDetector/InDetConditions/TRT_ConditionsData/src/TRTRtFloat.cxx
+++ /dev/null
@@ -1,131 +0,0 @@
-/*
- Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
-*/
-
-// TRTRtFloat.cxx
-// class to hold sets of identifiers and vectors of R-t parameters for
-// the TRT.
-// Peter Hansen, started 1/5/04
-
-#include <iostream>
-#include "TRT_ConditionsData/TRTRtFloat.h"
-#include "Identifier/Identifier.h"
-
-int TRTRtFloat::addValue( const Identifier& ident,
- float T0,
- float vd,
- float vp,
- float a0,
- float a1,
- float a2,
- float a3 ) {
-
- // get index of added objects
- int j=m_buf.size();
-
- // add them in to the buffer
- m_buf.resize(j+m_TRTRt_size);
- m_buf[j]=T0;
- m_buf[j+1]=vd;
- m_buf[j+2]=vp;
- m_buf[j+3]=a0;
- m_buf[j+4]=a1;
- m_buf[j+5]=a2;
- m_buf[j+6]=a3;
- // put new map entry
- m_bufmap[ident]=j;
- return j;
-}
-int TRTRtFloat::setValue( const Identifier& ident,
- float T0,
- float vd,
- float vp,
- float a0,
- float a1,
- float a2,
- float a3 ) {
-
- // get index of array
- const int j=this->findindex(ident);
- if(j<0) return j;
- // overwrite values
- m_buf[j]=T0;
- m_buf[j+1]=vd;
- m_buf[j+2]=vp;
- m_buf[j+3]=a0;
- m_buf[j+4]=a1;
- m_buf[j+5]=a2;
- m_buf[j+6]=a3;
- return j;
-}
-int TRTRtFloat::getValue( const Identifier& ident,
- float& T0,
- float& vd,
- float& vp,
- float& a0,
- float& a1,
- float& a2,
- float& a3 ) const {
-
- // get index of array
- const int j=this->findindex(ident);
- if(j<0) return j;
- // read values
- T0=m_buf[j];
- vd=m_buf[j+1];
- vp=m_buf[j+2];
- a0=m_buf[j+3];
- a1=m_buf[j+4];
- a2=m_buf[j+5];
- a3=m_buf[j+6];
- return j;
-}
-
-Identifier TRTRtFloat::getValue( unsigned int i,
- float& T0,
- float& vd,
- float& vp,
- float& a0,
- float& a1,
- float& a2,
- float& a3 ) const {
- // find data of element number i
- Identifier ident;
- BufferMap::const_iterator itr=m_bufmap.begin();
- for(unsigned int count=0; count!=i;count++) {++itr;}
- ident=itr->first;
- int j=itr->second;
- T0=m_buf[j];
- vd=m_buf[j+1];
- vp=m_buf[j+2];
- a0=m_buf[j+3];
- a1=m_buf[j+4];
- a2=m_buf[j+5];
- a3=m_buf[j+6];
- return ident;
-}
-
-void TRTRtFloat::print() const {
- std::cout << "TRTRtFloat " << m_tag << " holds " <<
- m_bufmap.size() << " elements with " << m_size << " floats"
- << std::endl;
-}
-
-void TRTRtFloat::print2() const {
- print();
- int i=0;
- for (BufferMap::const_iterator itr=m_bufmap.begin();
- itr!=m_bufmap.end(); ++itr,++i) {
- int j=itr->second;
- std::cout << "Element " << i << " ident " << (itr->first).getString() <<
- " indx " << j << " values:" << std::endl;
- std::cout << " T0 " << m_buf[j];
- std::cout << " vd " << m_buf[j+1];
- std::cout << " vp " << m_buf[j+2];
- std::cout << " a0 " << m_buf[j+3];
- std::cout << " a1 " << m_buf[j+4];
- std::cout << " a2 " << m_buf[j+5];
- std::cout << " a3 " << m_buf[j+6];
- std::cout << std::endl;
- }
-}
diff --git a/InnerDetector/InDetConditions/TRT_ConditionsData/src/TRTStrawStatusData.cxx b/InnerDetector/InDetConditions/TRT_ConditionsData/src/TRTStrawStatusData.cxx
index 849e8d593da4e227b94a1a67674d04dadea2d670..bd4ea6ceb70ae6dfb29b9948305cfaf3c2fcce8d 100755
--- a/InnerDetector/InDetConditions/TRT_ConditionsData/src/TRTStrawStatusData.cxx
+++ b/InnerDetector/InDetConditions/TRT_ConditionsData/src/TRTStrawStatusData.cxx
@@ -36,15 +36,10 @@ int TRTStrawStatusData::findStatus(const Identifier offID) const
if (it == m_statMap.end()){
stat = 0;
return stat;
- //return (*it).second;
}
else{
stat = (*it).second;
-
- //std::cout << "In TRTStrawStatusData Object : Straw with ID"
- // << offID << " is found with status : "<<std::endl;
return stat;
- //return 0;
}
@@ -54,20 +49,18 @@ int TRTStrawStatusData::findStatus(const Identifier offID) const
std::vector<Identifier> TRTStrawStatusData::scan_entries(int stat) const
{
//this scans the map for all entries with status = stat(1/2/3)
- //these channels are returned in a vector
+ //these channels are returned in a vector
std::vector<Identifier> badChan;
Identifier offID;
int status;
statusMap::const_iterator it;
- //std::cout << "Printing map" << channel_status.size() << std::endl;
for(it=m_statMap.begin(); it!=m_statMap.end(); ++it){
- //std::cout << it->first << it->second << std::endl;
- offID = it->first;
- status = it->second;
+ offID = it->first;
+ status = it->second;
if(status==stat){
badChan.push_back(offID);
diff --git a/InnerDetector/InDetConditions/TRT_ConditionsData/src/TRTWeiFloat.cxx b/InnerDetector/InDetConditions/TRT_ConditionsData/src/TRTWeiFloat.cxx
deleted file mode 100755
index 5708d371cb99fa57d5e7d29d7d7b049d09f92955..0000000000000000000000000000000000000000
--- a/InnerDetector/InDetConditions/TRT_ConditionsData/src/TRTWeiFloat.cxx
+++ /dev/null
@@ -1,87 +0,0 @@
-/*
- Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
-*/
-
-// TRTWeiFloat.cxx
-// class to hold sets of identifiers and vectors of R-t parameters for
-// the TRT.
-// Peter Hansen 1/5/04
-
-#include <iostream>
-#include "TRT_ConditionsData/TRTWeiFloat.h"
-#include "Identifier/Identifier.h"
-
-int TRTWeiFloat::addValue(const Identifier& ident,
- float res,
- float htw) {
-
- // get index of added objects
- int j=m_buf.size();
-
- // add them in to the buffer
- m_buf.resize(j+m_TRTWei_size);
- m_buf[j]=res;
- m_buf[j+1]=htw;
- // put new map entry
- m_bufmap[ident]=j;
- return j;
-}
-int TRTWeiFloat::setValue(const Identifier& ident,
- float res,
- float htw) {
-
- // get index in array
- const int j=this->findindex(ident);
- if(j<0) return j;
- // overwrite values
- m_buf[j]=res;
- m_buf[j+1]=htw;
- return j;
-}
-int TRTWeiFloat::getValue( const Identifier& ident,
- float& res,
- float& htw ) const {
- // get index of array
- const int j=this->findindex(ident);
- if(j<0) return j;
- // read values
- res=m_buf[j];
- htw=m_buf[j+1];
- return j;
-}
-
-Identifier TRTWeiFloat::getValue( unsigned int i,
- float& res,
- float& htw ) const {
- // find data of element number i
- Identifier ident;
- BufferMap::const_iterator itr=m_bufmap.begin();
- for(unsigned int count=0; count!=i;count++) {++itr;}
- ident=itr->first;
- int j=itr->second;
- res=m_buf[j];
- htw=m_buf[j+1];
- return ident;
-}
-
-void TRTWeiFloat::print() const {
-
- std::cout << "TRTWeiFloat " << m_tag << " holds " <<
- m_bufmap.size() << " elements with " << m_size << " floats"
- << std::endl;
-
-}
-
-void TRTWeiFloat::print2() const {
- print();
- int i=0;
- for (BufferMap::const_iterator itr=m_bufmap.begin();
- itr!=m_bufmap.end(); ++itr,++i) {
- int j=itr->second;
- std::cout << "Elem " << i << " ident " << (itr->first).getString() <<
- " indx " << j << " values:";
- std::cout << " res " << m_buf[j];
- std::cout << " htw " << m_buf[j+1];
- std::cout << std::endl;
- }
-}