Skip to content
Snippets Groups Projects
Commit 1fbca465 authored by Dave Casper's avatar Dave Casper
Browse files

Revert to a version that compiles and runs by disabling unfinished code

parent 09afc339
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 88 additions and 86 deletions
DetectorDescription/FaserDetDescr/FaserDetDescr/FaserDetDescrDict.h
+ 1
− 1
View file @ 1fbca465
......@@ -11,7 +11,7 @@
#include "FaserDetDescr/FaserRegion.h"
#include "FaserDetDescr/FaserDetectorIDBase.h"
#include "FaserDetDescr/FaserDetectorID.h"
// #include "FaserDetDescr/FaserDetectorID.h"
namespace FaserDetDescr {
// Athena namespace autoloading trigger for ROOT6
......
DetectorDescription/FaserDetDescr/FaserDetDescr/FaserDetectorID.h
+ 59
− 59
View file @ 1fbca465
......@@ -106,18 +106,18 @@ public:
/// @name Creators for station, ids and pmt ids
//@{
/// For a single module
Identifier module_id( int station,
virtual Identifier module_id( int station,
int plane,
int module ) const;
int module ) const = 0;
/// For a module from a submodule id
Identifier module_id ( const Identifier& submodule_id ) const;
/// For a single submodule
Identifier submodule_id ( int station,
virtual Identifier submodule_id ( int station,
int plane,
int module,
int submodule ) const;
int submodule ) const = 0;
/// For a single submodule from a sensor id
Identifier submodule_id ( const Identifier& sensor_id ) const;
......@@ -126,11 +126,11 @@ public:
Identifier submodule_id( IdentifierHash submodule_hash) const;
/// For an individual sensor
Identifier sensor_id ( int station,
virtual Identifier sensor_id ( int station,
int plane,
int module,
int submodule,
int sensor ) const;
int sensor ) const = 0;
Identifier sensor_id ( const Identifier& submodule_id,
......@@ -305,22 +305,22 @@ private:
CLASS_DEF(FaserDetectorID, 125694213, 1)
//----------------------------------------------------------------------------
inline Identifier
FaserDetectorID::module_id ( int station,
int plane,
int module ) const
{
// inline Identifier
// FaserDetectorID::module_id ( int station,
// int plane,
// int module ) const
// {
// Build identifier
Identifier result((Identifier::value_type)0);
// // Build identifier
// Identifier result((Identifier::value_type)0);
// Pack fields independently
m_scint_impl.pack (scint_field_value(), result);
m_veto_impl.pack (veto_field_value(), result);
m_station_impl.pack (station, result);
// // Pack fields independently
// m_scint_impl.pack (scint_field_value(), result);
// m_veto_impl.pack (veto_field_value(), result);
// m_station_impl.pack (station, result);
return result;
}
// return result;
// }
//----------------------------------------------------------------------------
inline Identifier
......@@ -334,25 +334,25 @@ FaserDetectorID::module_id ( const Identifier& submodule_id ) const
}
//----------------------------------------------------------------------------
inline Identifier
FaserDetectorID::submodule_id ( int station,
int plane,
int module,
int submodule ) const
{
// Build identifier
Identifier result((Identifier::value_type)0);
// Pack fields independently
m_scint_impl.pack (scint_field_value(), result);
m_veto_impl.pack (veto_field_value(), result);
m_station_impl.pack (station, result);
m_plane_impl.pack (plane, result);
m_module_impl.pack (module, result);
m_submodule_impl.pack(submodule, result);
return result;
}
// inline Identifier
// FaserDetectorID::submodule_id ( int station,
// int plane,
// int module,
// int submodule ) const
// {
// // Build identifier
// Identifier result((Identifier::value_type)0);
// // Pack fields independently
// m_scint_impl.pack (scint_field_value(), result);
// m_veto_impl.pack (veto_field_value(), result);
// m_station_impl.pack (station, result);
// m_plane_impl.pack (plane, result);
// m_module_impl.pack (module, result);
// m_submodule_impl.pack(submodule, result);
// return result;
// }
//----------------------------------------------------------------------------
inline Identifier
......@@ -379,27 +379,27 @@ FaserDetectorID::submodule_hash (Identifier submodule_id) const
}
//----------------------------------------------------------------------------
inline Identifier
FaserDetectorID::sensor_id ( int station,
int plane,
int module,
int submodule,
int sensor ) const
{
// Build identifier
Identifier result((Identifier::value_type)0);
// Pack fields independently
m_scint_impl.pack (scint_field_value(), result);
m_veto_impl.pack (veto_field_value(), result);
m_station_impl.pack (station, result);
m_plane_impl.pack (plane, result);
m_module_impl.pack (module, result);
m_submodule_impl.pack(submodule, result);
m_sensor_impl.pack (sensor, result);
return result;
}
// inline Identifier
// FaserDetectorID::sensor_id ( int station,
// int plane,
// int module,
// int submodule,
// int sensor ) const
// {
// // Build identifier
// Identifier result((Identifier::value_type)0);
// // Pack fields independently
// m_scint_impl.pack (scint_field_value(), result);
// m_veto_impl.pack (veto_field_value(), result);
// m_station_impl.pack (station, result);
// m_plane_impl.pack (plane, result);
// m_module_impl.pack (module, result);
// m_submodule_impl.pack(submodule, result);
// m_sensor_impl.pack (sensor, result);
// return result;
// }
//----------------------------------------------------------------------------
inline Identifier
......
DetectorDescription/FaserDetDescr/FaserDetDescr/selection.xml
+ 1
− 1
View file @ 1fbca465
......@@ -2,5 +2,5 @@
<enum pattern="FaserDetDescr::*"/>
<class name="FaserDetDescr::ROOT6_NamespaceAutoloadHook" />
<class name="FaserDetectorIDBase" />
<class name="FaserDetectorID" />
<!-- <class name="FaserDetectorID" /> -->
</lcgdict>
DetectorDescription/FaserDetDescr/src/FaserDetectorID.cxx
+ 16
− 14
View file @ 1fbca465
......@@ -43,9 +43,9 @@ FaserDetectorID::FaserDetectorID(void)
m_MODULE_INDEX(4),
m_SUBMODULE_INDEX(5),
m_SENSOR_INDEX(6),
m_dict(0),
m_submodule_hash_max(0),
m_sensor_hash_max(0),
m_dict(0)
m_sensor_hash_max(0)
{
}
......@@ -59,18 +59,20 @@ FaserDetectorID::init_hashes(void)
//
MsgStream log(m_msgSvc, "FaserDetectorID");
// wafer hash
m_plate_hash_max = m_full_plate_range.cardinality();
m_plate_vec.resize(m_plate_hash_max);
m_submodule_hash_max = m_full_submodule_range.cardinality();
m_submodule_vec.resize(m_submodule_hash_max);
unsigned int nids = 0;
std::set<Identifier> ids;
for (unsigned int i = 0; i < m_full_plate_range.size(); ++i) {
const Range& range = m_full_plate_range[i];
for (unsigned int i = 0; i < m_full_submodule_range.size(); ++i) {
const Range& range = m_full_submodule_range[i];
Range::const_identifier_factory first = range.factory_begin();
Range::const_identifier_factory last = range.factory_end();
for (; first != last; ++first) {
const ExpandedIdentifier& exp_id = (*first);
Identifier id = plate_id(exp_id[m_STATION_INDEX],
exp_id[m_PLATE_INDEX]);
Identifier id = submodule_id(exp_id[m_STATION_INDEX],
exp_id[m_PLANE_INDEX],
exp_id[m_MODULE_INDEX],
exp_id[m_SUBMODULE_INDEX]);
if(!(ids.insert(id)).second) {
log << MSG::ERROR << " FaserDetectorID::init_hashes "
<< " Error: duplicated id for plate id. nid " << nids
......@@ -81,10 +83,10 @@ FaserDetectorID::init_hashes(void)
nids++;
}
}
if(ids.size() != m_plate_hash_max) {
if(ids.size() != m_submodule_hash_max) {
log << MSG::ERROR << " FaserDetectorID::init_hashes "
<< " Error: set size NOT EQUAL to hash max. size " << ids.size()
<< " hash max " << m_plate_hash_max
<< " hash max " << m_submodule_hash_max
<< endmsg;
return (1);
}
......@@ -92,13 +94,13 @@ FaserDetectorID::init_hashes(void)
nids = 0;
std::set<Identifier>::const_iterator first = ids.begin();
std::set<Identifier>::const_iterator last = ids.end();
for (; first != last && nids < m_plate_vec.size(); ++first) {
m_plate_vec[nids] = (*first);
for (; first != last && nids < m_submodule_vec.size(); ++first) {
m_submodule_vec[nids] = (*first);
nids++;
}
// pmt hash - we do not keep a vec for the strips
m_pmt_hash_max = m_full_pmt_range.cardinality();
// sensor hash - we do not keep a vec for the sensors
m_sensor_hash_max = m_full_sensor_range.cardinality();
return (0);
}
......
Scintillator/ScintDetDescr/ScintIdentifier/CMakeLists.txtSave → Scintillator/ScintDetDescr/ScintIdentifier/CMakeLists.txt
+ 11
− 11
View file @ 1fbca465
......@@ -19,21 +19,21 @@ atlas_depends_on_subdirs( PUBLIC
find_package( ROOT COMPONENTS Core Tree MathCore Hist RIO pthread )
# Component(s) in the package:
atlas_add_library( ScintIdentifier
src/VetoID.cxx
#atlas_add_library( ScintIdentifier
# src/VetoID.cxx
# src/TriggerID.cxx
# src/PreshowerID.cxx
# src/ScintillatorID.cxx
PUBLIC_HEADERS ScintIdentifier
PRIVATE_INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
LINK_LIBRARIES AthenaKernel FaserDetDescr IdDict Identifier
PRIVATE_LINK_LIBRARIES ${ROOT_LIBRARIES} IdDictParser GaudiKernel )
# PUBLIC_HEADERS ScintIdentifier
# PRIVATE_INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
# LINK_LIBRARIES AthenaKernel FaserDetDescr IdDict Identifier
# PRIVATE_LINK_LIBRARIES ${ROOT_LIBRARIES} IdDictParser GaudiKernel )
atlas_add_dictionary( ScintIdentifierDict
ScintIdentifier/ScintIdentifierDict.h
ScintIdentifier/selection.xml
INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
LINK_LIBRARIES ${ROOT_LIBRARIES} FaserDetDescr IdDict Identifier IdDictParser GaudiKernel ScintIdentifier )
#atlas_add_dictionary( ScintIdentifierDict
# ScintIdentifier/ScintIdentifierDict.h
# ScintIdentifier/selection.xml
# INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
# LINK_LIBRARIES ${ROOT_LIBRARIES} FaserDetDescr IdDict Identifier IdDictParser GaudiKernel ScintIdentifier )
#atlas_add_executable( test_indet_id
# test/test_indet_id.cxx
......
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