Skip to content

Commit

Permalink
Default values in CreateFCCeeCaloNeighbours.cpp
Browse files Browse the repository at this point in the history
  • Loading branch information
kjvbrt committed Oct 24, 2023
1 parent 6099dea commit c57005d
Show file tree
Hide file tree
Showing 2 changed files with 21 additions and 21 deletions.
6 changes: 3 additions & 3 deletions RecCalorimeter/src/components/CalibrateBenchmarkMethod.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -113,8 +113,8 @@ StatusCode CalibrateBenchmarkMethod::execute() {
double energyInLastECalLayer = 0;
double energyInBoth = 0.;

int ecal_index;
int hcal_index;
int ecal_index = -1;
int hcal_index = -1;

for (double& eneEcal : m_energyInECalLayer){
eneEcal = 0.;
Expand Down Expand Up @@ -272,4 +272,4 @@ StatusCode CalibrateBenchmarkMethod::finalize() {
m_parameters->SetBinError(4, ys[3]);

return GaudiAlgorithm::finalize();
}
}
36 changes: 18 additions & 18 deletions RecFCCeeCalorimeter/src/components/CreateFCCeeCaloNeighbours.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -31,22 +31,22 @@ StatusCode CreateFCCeeCaloNeighbours::initialize() {
std::unordered_map<uint64_t, std::vector<uint64_t>> map;

// will be used for volume connecting
int eCalLastLayer;
//int eCalLastLayer;
std::pair<int, int> extremaECalLastLayerModule;
std::pair<int, int> extremaECalLastLayerTheta;
double eCalThetaOffset = 0;
double eCalThetaSize = 0;
//double eCalThetaOffset = 0;
//double eCalThetaSize = 0;
//double eCalPhiOffset = 0;
double eCalModuleSize = 0;
double hCalThetaOffset = 0;
double hCalThetaSize = 0;
double hCalPhiOffset = 0;
dd4hep::DDSegmentation::BitFieldCoder* decoderECalBarrel = nullptr;
//double eCalModuleSize = 0;
//double hCalThetaOffset = 0;
//double hCalThetaSize = 0;
//double hCalPhiOffset = 0;
//dd4hep::DDSegmentation::BitFieldCoder* decoderECalBarrel = nullptr;
// will be used for volume connecting
std::pair<int, int> extremaHCalFirstLayerPhi;
std::pair<int, int> extremaHCalFirstLayerTheta;
std::pair<int, int> extremaHCalFirstLayerZ;
dd4hep::DDSegmentation::BitFieldCoder* decoderHCalBarrel = nullptr;
//dd4hep::DDSegmentation::BitFieldCoder* decoderHCalBarrel = nullptr;

////////////////////////////////////
/// SEGMENTED THETA-MODULE VOLUMES ///
Expand Down Expand Up @@ -75,17 +75,17 @@ StatusCode CreateFCCeeCaloNeighbours::initialize() {
// retrieve decoders and other info needed for volume (ECal-HCal) connection
auto decoder = m_geoSvc->getDetector()->readout(m_readoutNamesSegmented[iSys]).idSpec().decoder();
if (m_fieldNamesSegmented[iSys] == "system" && m_fieldValuesSegmented[iSys] == 5) {
decoderECalBarrel = decoder;
eCalThetaSize = segmentation->gridSizeTheta();
eCalModuleSize = 2 * M_PI / segmentation->nModules();
//decoderECalBarrel = decoder;
//eCalThetaSize = segmentation->gridSizeTheta();
//eCalModuleSize = 2 * M_PI / segmentation->nModules();
//eCalModuleSize = 2 * M_PI / segmentation->phiBins();
eCalThetaOffset = segmentation->offsetTheta();
//eCalThetaOffset = segmentation->offsetTheta();
//eCalPhiOffset = segmentation->offsetPhi();
}
if (m_fieldNamesSegmented[iSys] == "system" && m_fieldValuesSegmented[iSys] == 8) {
decoderHCalBarrel = decoder;
hCalThetaSize = segmentation->gridSizeTheta();
hCalThetaOffset = segmentation->offsetTheta();
//decoderHCalBarrel = decoder;
//hCalThetaSize = segmentation->gridSizeTheta();
//hCalThetaOffset = segmentation->offsetTheta();
//hCalPhiOffset = segmentation->offsetPhi();
}

Expand Down Expand Up @@ -117,7 +117,7 @@ StatusCode CreateFCCeeCaloNeighbours::initialize() {
// should 5 be systemValuesModuleTheta instead?
if (ilayer == (m_activeVolumesNumbersSegmented[iSys] - 1) && m_fieldNamesSegmented[iSys] == "system" &&
m_fieldValuesSegmented[iSys] == 5) {
eCalLastLayer = m_activeVolumesNumbersSegmented[iSys] - 1;
//eCalLastLayer = m_activeVolumesNumbersSegmented[iSys] - 1;
extremaECalLastLayerModule = std::make_pair(0, numCells[0] - 1);
extremaECalLastLayerTheta = std::make_pair(numCells[2], numCells[1] + numCells[2] - 1);
}
Expand Down Expand Up @@ -194,7 +194,7 @@ StatusCode CreateFCCeeCaloNeighbours::initialize() {
auto decoder = m_geoSvc->getDetector()->readout(m_readoutNamesNested[iSys]).idSpec().decoder();
// will be used for volume connecting
if (m_fieldNameNested == "system" && m_fieldValuesNested[iSys] == 8) {
decoderHCalBarrel = decoder;
//decoderHCalBarrel = decoder;
}
//hCalPhiOffset = m_hCalPhiOffset;
// Get VolumeID
Expand Down

0 comments on commit c57005d

Please sign in to comment.