diff --git a/DetectorDescription/GeoModel/GeoModelSvc/src/RDBMaterialManager.cxx b/DetectorDescription/GeoModel/GeoModelSvc/src/RDBMaterialManager.cxx index 988191de12501bf2105e9045baa3e468d234a0f5..2c32f3f63b25a4ae8d1aed8f37f6f887eff38a03 100644 --- a/DetectorDescription/GeoModel/GeoModelSvc/src/RDBMaterialManager.cxx +++ b/DetectorDescription/GeoModel/GeoModelSvc/src/RDBMaterialManager.cxx @@ -213,7 +213,7 @@ StatusCode RDBMaterialManager::readMaterialsFromDB(ISvcLocator* pSvcLocator) if(m_sctmaterials->size()==0) { if(log.level()<=MSG::WARNING) log << MSG::WARNING << " Getting SCTMaterials with default tag" <<endmsg; - m_trackermaterials = iAccessSvc->getRecordsetPtr("SCTMaterials","SCTMaterials-00", "", "FASERDD"); + m_sctmaterials = iAccessSvc->getRecordsetPtr("SCTMaterials","SCTMaterials-00", "", "FASERDD"); } // TrackerMatComponents and TrackerMaterials tables in DB are empty // --- Tracker materials @@ -444,13 +444,13 @@ GeoMaterial* RDBMaterialManager::getMaterial(const std::string & name) { tmp_matcomponents = m_scintmatcomponents; data_id = "SCINTMATERIALS_DATA_ID"; } - else if(name.find("tracker",0) == 0) - { - detector = "tracker"; - tmp_materials = m_trackermaterials; - tmp_matcomponents = m_trackermatcomponents; - data_id = "TRACKERMATERIALS_DATA_ID"; - } + // else if(name.find("tracker",0) == 0) + // { + // detector = "tracker"; + // tmp_materials = m_trackermaterials; + // tmp_matcomponents = m_trackermatcomponents; + // data_id = "TRACKERMATERIALS_DATA_ID"; + // } else if(name.find("sct",0) == 0) { detector = "sct"; @@ -459,13 +459,13 @@ GeoMaterial* RDBMaterialManager::getMaterial(const std::string & name) { data_id = "SCTMATERIALS_DATA_ID"; } - else if(name.find("calo",0) == 0) - { - detector = "calo"; - tmp_materials = m_calomaterials; - tmp_matcomponents = m_calomatcomponents; - data_id = "CALOMATERIALS_DATA_ID"; - } + // else if(name.find("calo",0) == 0) + // { + // detector = "calo"; + // tmp_materials = m_calomaterials; + // tmp_matcomponents = m_calomatcomponents; + // data_id = "CALOMATERIALS_DATA_ID"; + // } else {return 0 ;} for( ind = 0; ind < tmp_materials->size(); ind++) @@ -625,13 +625,13 @@ const GeoMaterial* RDBMaterialManager:: getMaterial(const std::string &name) co tmp_matcomponents = m_scintmatcomponents; data_id = "SCINTMATERIALS_DATA_ID"; } - else if(name.find("tracker",0) == 0) - { - detector = "tracker"; - tmp_materials = m_trackermaterials; - tmp_matcomponents = m_trackermatcomponents; - data_id = "TRACKERMATERIALS_DATA_ID"; - } + // else if(name.find("tracker",0) == 0) + // { + // detector = "tracker"; + // tmp_materials = m_trackermaterials; + // tmp_matcomponents = m_trackermatcomponents; + // data_id = "TRACKERMATERIALS_DATA_ID"; + // } else if(name.find("sct",0) == 0) { detector = "sct"; @@ -639,13 +639,13 @@ const GeoMaterial* RDBMaterialManager:: getMaterial(const std::string &name) co tmp_matcomponents = m_sctmatcomponents; data_id = "SCTMATERIALS_DATA_ID"; } - else if(name.find("calo",0) == 0) - { - detector = "calo"; - tmp_materials = m_calomaterials; - tmp_matcomponents = m_calomatcomponents; - data_id = "CALOMATERIALS_DATA_ID"; - } + // else if(name.find("calo",0) == 0) + // { + // detector = "calo"; + // tmp_materials = m_calomaterials; + // tmp_matcomponents = m_calomatcomponents; + // data_id = "CALOMATERIALS_DATA_ID"; + // } else {return 0 ;} for( ind = 0; ind < tmp_materials->size(); ind++) diff --git a/DetectorDescription/GeoModel/GeoModelSvc/src/RDBMaterialManager.h b/DetectorDescription/GeoModel/GeoModelSvc/src/RDBMaterialManager.h index 4e64f5dccf0b837d3093e7245dc09eb298a6b5d0..49bafe149abb22395efada29bde49c23c7c8c67a 100644 --- a/DetectorDescription/GeoModel/GeoModelSvc/src/RDBMaterialManager.h +++ b/DetectorDescription/GeoModel/GeoModelSvc/src/RDBMaterialManager.h @@ -87,12 +87,12 @@ class RDBMaterialManager: public StoredMaterialManager { IRDBRecordset_ptr m_neutrinomatcomponents; IRDBRecordset_ptr m_scintmaterials; IRDBRecordset_ptr m_scintmatcomponents; - IRDBRecordset_ptr m_trackermaterials; - IRDBRecordset_ptr m_trackermatcomponents; + // IRDBRecordset_ptr m_trackermaterials; + // IRDBRecordset_ptr m_trackermatcomponents; IRDBRecordset_ptr m_sctmaterials; IRDBRecordset_ptr m_sctmatcomponents; - IRDBRecordset_ptr m_calomaterials; - IRDBRecordset_ptr m_calomatcomponents; + // IRDBRecordset_ptr m_calomaterials; + // IRDBRecordset_ptr m_calomatcomponents; mutable std::vector < GeoElement *> m_elementVector; mutable StoredMaterialManager::MaterialMap m_materialMap;