Skip to content
Snippets Groups Projects
Commit aa5588ef authored by Sergei Zharko's avatar Sergei Zharko
Browse files

L1Algo CA track finder iterations: updates

parent 437d931f
No related branches found
No related tags found
1 merge request!738L1 Algo: initialization interface, parameters and refactoring updates
Hide whitespace changes
Inline Side-by-side
reco/L1/L1Algo/L1BaseStationInfo.cxx
+ 6
− 47
View file @ aa5588ef
...@@ -124,53 +124,12 @@ void L1BaseStationInfo::Print(int verbosity) const ...@@ -124,53 +124,12 @@ void L1BaseStationInfo::Print(int verbosity) const
} }
else if (verbosity > 0) { else if (verbosity > 0) {
LOG(info) << "L1BaseStationInfo object: at " << this; LOG(info) << "L1BaseStationInfo object: at " << this;
LOG(info) << "- Station ID: " << fStationID; LOG(info) << "\tStation ID: " << fStationID;
LOG(info) << "- Detector ID: " << static_cast<int>(fDetectorID); LOG(info) << "\tDetector ID: " << static_cast<int>(fDetectorID);
LOG(info) << "- L1Station fields:"; fL1Station.Print(verbosity - 1);
LOG(info) << "--- Station type ID: " << fL1Station.type; LOG(info) << "\tAdditional fields:";
LOG(info) << "--- Time info ID: " << fL1Station.timeInfo; LOG(info) << "\t\tXmax: " << fXmax;
LOG(info) << "--- z position: " << fL1Station.z[0]; LOG(info) << "\t\tYmax: " << fYmax;
LOG(info) << "--- Rmin: " << fL1Station.Rmin[0];
LOG(info) << "--- Rmax: " << fL1Station.Rmax[0];
LOG(info) << "--- Thickness (X), cm: " << fL1Station.materialInfo.thick[0];
LOG(info) << "--- Radiational length (X0), cm: " << fL1Station.materialInfo.RL[0];
if (verbosity > 1) {
LOG(info) << "--- X / X0: " << fL1Station.materialInfo.RadThick[0];
LOG(info) << "--- log(X / X0): " << fL1Station.materialInfo.logRadThick[0];
LOG(info) << "--- Field approximation coefficients:";
LOG(info) << " idx CX CY CZ";
for (int idx = 0; idx < L1Parameters::kMaxNFieldApproxCoefficients; ++idx) {
LOG(info) << std::setw(9) << std::setfill(' ') << idx << ' ' << std::setw(10) << std::setfill(' ')
<< fL1Station.fieldSlice.cx[idx][0] << ' ' << std::setw(10) << std::setfill(' ')
<< fL1Station.fieldSlice.cy[idx][0] << ' ' << std::setw(10) << std::setfill(' ')
<< fL1Station.fieldSlice.cz[idx][0];
}
LOG(info) << "--- Strips geometry:";
LOG(info) << "----- Front:";
LOG(info) << "------- cos(phi): " << fL1Station.frontInfo.cos_phi[0];
LOG(info) << "------- sin(phi): " << fL1Station.frontInfo.sin_phi[0];
LOG(info) << "------- sigma2: " << fL1Station.frontInfo.sigma2[0];
LOG(info) << "----- Back:";
LOG(info) << "------- cos(phi): " << fL1Station.backInfo.cos_phi[0];
LOG(info) << "------- sin(phi): " << fL1Station.backInfo.sin_phi[0];
LOG(info) << "------- sigma2: " << fL1Station.backInfo.sigma2[0];
LOG(info) << "----- XY cov matrix:";
LOG(info) << "------- C00: " << fL1Station.XYInfo.C00[0];
LOG(info) << "------- C10: " << fL1Station.XYInfo.C10[0];
LOG(info) << "------- C11: " << fL1Station.XYInfo.C11[0];
LOG(info) << "----- X layer:";
LOG(info) << "------- cos(phi): " << fL1Station.xInfo.cos_phi[0];
LOG(info) << "------- sin(phi): " << fL1Station.xInfo.sin_phi[0];
LOG(info) << "------- sigma2: " << fL1Station.xInfo.sigma2[0];
LOG(info) << "----- Y layer:";
LOG(info) << "------- cos(phi): " << fL1Station.yInfo.cos_phi[0];
LOG(info) << "------- sin(phi): " << fL1Station.yInfo.sin_phi[0];
LOG(info) << "------- sigma2: " << fL1Station.yInfo.sigma2[0];
LOG(info) << "";
}
LOG(info) << "- Additional fields:";
LOG(info) << "--- Xmax: " << fXmax;
LOG(info) << "--- Ymax: " << fYmax;
} }
} }
......
reco/L1/L1Algo/L1InitManager.cxx
+ 7
− 7
View file @ aa5588ef
...@@ -106,10 +106,10 @@ void L1InitManager::PrintCAIterations(int verbosityLevel) const ...@@ -106,10 +106,10 @@ void L1InitManager::PrintCAIterations(int verbosityLevel) const
void L1InitManager::PushBackCAIteration(const L1CAIteration& iteration) void L1InitManager::PushBackCAIteration(const L1CAIteration& iteration)
{ {
// TODO: probably some checks must be inserted here // TODO: probably some checks must be inserted here
if (!fInitFlags[L1InitManager::kECAIterationsNumberCrosscheck]) { if (!fInitFlags[L1InitManager::keCAIterationsNumberCrosscheck]) {
LOG(error) << "L1InitManager::PushBackCAIteration: attempt to push back a CA track finder iteration before the " LOG(error) << "L1InitManager::PushBackCAIteration: attempt to push back a CA track finder iteration before the "
<< "number of iterations was defined"; << "number of iterations was defined";
assert((fInitFlags[L1InitManager::kECAIterationsNumberCrosscheck])); assert((fInitFlags[L1InitManager::keCAIterationsNumberCrosscheck]));
} }
fCAIterationsContainer.push_back(iteration); fCAIterationsContainer.push_back(iteration);
} }
...@@ -230,7 +230,7 @@ void L1InitManager::SetStationsNumberCrosscheck(L1DetectorID detectorID, int nSt ...@@ -230,7 +230,7 @@ void L1InitManager::SetStationsNumberCrosscheck(L1DetectorID detectorID, int nSt
void L1InitManager::SetCAIterationsNumberCrosscheck(int nIterations) void L1InitManager::SetCAIterationsNumberCrosscheck(int nIterations)
{ {
fCAIterationsNumberCrosscheck = nIterations; fCAIterationsNumberCrosscheck = nIterations;
fInitFlags[L1InitManager::kECAIterationsNumberCrosscheck] = true; fInitFlags[L1InitManager::keCAIterationsNumberCrosscheck] = true;
} }
//----------------------------------------------------------------------------------------------------------------------- //-----------------------------------------------------------------------------------------------------------------------
...@@ -346,18 +346,18 @@ bool L1InitManager::CheckStationsInfo() ...@@ -346,18 +346,18 @@ bool L1InitManager::CheckStationsInfo()
bool L1InitManager::CheckCAIterations() bool L1InitManager::CheckCAIterations()
{ {
// Check number of iterations // Check number of iterations
if (!fInitFlags[L1InitManager::kECAIterations]) { if (!fInitFlags[L1InitManager::keCAIterations]) {
int actualIterationsNumber = fCAIterationsContainer.size(); int actualIterationsNumber = fCAIterationsContainer.size();
int expectedIterationsNumber = fCAIterationsNumberCrosscheck; int expectedIterationsNumber = fCAIterationsNumberCrosscheck;
if (actualIterationsNumber != expectedIterationsNumber) { if (actualIterationsNumber != expectedIterationsNumber) {
LOG(warn) << "L1InitManager::CheckCAIterations: incorrect number of iterations registered: " LOG(warn) << "L1InitManager::CheckCAIterations: incorrect number of iterations registered: "
<< actualIterationsNumber << " of " << expectedIterationsNumber << " expected"; << actualIterationsNumber << " of " << expectedIterationsNumber << " expected";
fInitFlags[L1InitManager::kECAIterations] = false; fInitFlags[L1InitManager::keCAIterations] = false;
} }
else { else {
fInitFlags[L1InitManager::kECAIterations] = true; fInitFlags[L1InitManager::keCAIterations] = true;
} }
} }
return fInitFlags[L1InitManager::kECAIterations]; return fInitFlags[L1InitManager::keCAIterations];
} }
reco/L1/L1Algo/L1Station.cxx
+ 43
− 38
View file @ aa5588ef
...@@ -9,44 +9,49 @@ ...@@ -9,44 +9,49 @@
#include <iomanip> #include <iomanip>
// TODO: Improve log style (S.Zh.) // TODO: Improve log style (S.Zh.)
void L1Station::Print() const void L1Station::Print(int verbosity) const
{ {
LOG(info) << "==== L1Station object at " << this; // TODO: Probably, it would be nice to use constexpr char indent (S.Zh.)
LOG(info) << "- L1Station fields:"; LOG(info) << "\tL1Station object at " << this;
LOG(info) << "--- Station type ID: " << type; LOG(info) << "\t\tStation type ID: " << fL1Station.type;
LOG(info) << "--- z position: " << z[0]; LOG(info) << "\t\tTime info ID: " << fL1Station.timeInfo;
LOG(info) << "--- Rmin: " << Rmin[0]; LOG(info) << "\t\tz position: " << fL1Station.z[0];
LOG(info) << "--- Rmax: " << Rmax[0]; LOG(info) << "\t\tRmin: " << fL1Station.Rmin[0];
LOG(info) << "--- Thickness (X), cm: " << materialInfo.thick[0]; LOG(info) << "\t\tRmax: " << fL1Station.Rmax[0];
LOG(info) << "--- Radiational length (X0), cm: " << materialInfo.RL[0]; // TODO: Insert correct units (S.Zh.)
LOG(info) << "--- X / X0: " << materialInfo.RadThick[0]; LOG(info) << "\t\tThickness (X) : " << fL1Station.materialInfo.thick[0];
LOG(info) << "--- log(X / X0): " << materialInfo.logRadThick[0]; LOG(info) << "\t\tRadiational length (X0): " << fL1Station.materialInfo.RL[0];
LOG(info) << "--- Field approximation coefficients:"; if (verbosity > 0) {
LOG(info) << " idx CX CY CZ"; LOG(info) << "\t\tX / X0: " << fL1Station.materialInfo.RadThick[0];
for (int idx = 0; idx < 21; ++idx) { LOG(info) << "\t\tlog(X / X0): " << fL1Station.materialInfo.logRadThick[0];
LOG(info) << std::setw(9) << std::setfill(' ') << idx << ' ' << std::setw(10) << std::setfill(' ') LOG(info) << "\t\tField approximation coefficients:";
<< fieldSlice.cx[idx][0] << ' ' << std::setw(10) << std::setfill(' ') << fieldSlice.cy[idx][0] << ' ' LOG(info) << " idx CX CY CZ";
<< std::setw(10) << std::setfill(' ') << fieldSlice.cz[idx][0]; for (int idx = 0; idx < L1Parameters::kMaxNFieldApproxCoefficients; ++idx) {
LOG(info) << std::setw(9) << std::setfill(' ') << idx << ' ' << std::setw(10) << std::setfill(' ')
<< fL1Station.fieldSlice.cx[idx][0] << ' ' << std::setw(10) << std::setfill(' ')
<< fL1Station.fieldSlice.cy[idx][0] << ' ' << std::setw(10) << std::setfill(' ')
<< fL1Station.fieldSlice.cz[idx][0];
}
LOG(info) << "\t\tStrips geometry:";
LOG(info) << "\t\t\tFront:";
LOG(info) << "\t\t\t\tcos(phi): " << fL1Station.frontInfo.cos_phi[0];
LOG(info) << "\t\t\t\tsin(phi): " << fL1Station.frontInfo.sin_phi[0];
LOG(info) << "\t\t\t\tsigma2: " << fL1Station.frontInfo.sigma2[0];
LOG(info) << "\t\t\tBack:";
LOG(info) << "\t\t\t\tcos(phi): " << fL1Station.backInfo.cos_phi[0];
LOG(info) << "\t\t\t\tsin(phi): " << fL1Station.backInfo.sin_phi[0];
LOG(info) << "\t\t\t\tsigma2: " << fL1Station.backInfo.sigma2[0];
LOG(info) << "\t\t\tXY cov matrix:";
LOG(info) << "\t\t\t\tC00: " << fL1Station.XYInfo.C00[0];
LOG(info) << "\t\t\t\tC10: " << fL1Station.XYInfo.C10[0];
LOG(info) << "\t\t\t\tC11: " << fL1Station.XYInfo.C11[0];
LOG(info) << "\t\t\tX layer:";
LOG(info) << "\t\t\t\tcos(phi): " << fL1Station.xInfo.cos_phi[0];
LOG(info) << "\t\t\t\tsin(phi): " << fL1Station.xInfo.sin_phi[0];
LOG(info) << "\t\t\t\tsigma2: " << fL1Station.xInfo.sigma2[0];
LOG(info) << "\t\t\tY layer:";
LOG(info) << "\t\t\t\tcos(phi): " << fL1Station.yInfo.cos_phi[0];
LOG(info) << "\t\t\t\tsin(phi): " << fL1Station.yInfo.sin_phi[0];
LOG(info) << "\t\t\t\tsigma2: " << fL1Station.yInfo.sigma2[0];
} }
LOG(info) << "--- Strips geometry:";
LOG(info) << "----- Front:";
LOG(info) << "------- cos(phi): " << frontInfo.cos_phi[0];
LOG(info) << "------- sin(phi): " << frontInfo.sin_phi[0];
LOG(info) << "------- sigma2: " << frontInfo.sigma2[0];
LOG(info) << "----- Back:";
LOG(info) << "------- cos(phi): " << backInfo.cos_phi[0];
LOG(info) << "------- sin(phi): " << backInfo.sin_phi[0];
LOG(info) << "------- sigma2: " << backInfo.sigma2[0];
LOG(info) << "----- XY cov matrix:";
LOG(info) << "------- C00: " << XYInfo.C00[0];
LOG(info) << "------- C10: " << XYInfo.C10[0];
LOG(info) << "------- C11: " << XYInfo.C11[0];
LOG(info) << "----- X layer:";
LOG(info) << "------- cos(phi): " << xInfo.cos_phi[0];
LOG(info) << "------- sin(phi): " << xInfo.sin_phi[0];
LOG(info) << "------- sigma2: " << xInfo.sigma2[0];
LOG(info) << "----- Y layer:";
LOG(info) << "------- cos(phi): " << yInfo.cos_phi[0];
LOG(info) << "------- sin(phi): " << yInfo.sin_phi[0];
LOG(info) << "------- sigma2: " << yInfo.sigma2[0];
} }
reco/L1/L1Algo/L1Station.h
+ 1
− 1
View file @ aa5588ef
...@@ -34,7 +34,7 @@ public: ...@@ -34,7 +34,7 @@ public:
L1XYMeasurementInfo XYInfo {}; L1XYMeasurementInfo XYInfo {};
/// Prints object fields /// Prints object fields
void Print() const; void Print(int verbosity = 0) const;
} _fvecalignment; } _fvecalignment;
......
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