Commit 587562d7 authored by kraus's avatar kraus
Browse files

more meaningful names for reseting the reinitialization flags

parent f679e6b2
......@@ -233,13 +233,8 @@ public:
/// Set rotation about z axis in bend frame.
void SetRotationAboutZ(double rotation);
void doReinitialize() {
reinitialize_m = true;
}
void doRecalcRefTraj() {
recalcRefTraj_m = true;
}
void resetReinitializeFlag();
void resetRecalcRefTrajFlag();
private:
......@@ -414,4 +409,14 @@ private:
static int RBend_counter_m;
};
inline
void RBend::resetReinitializeFlag() {
reinitialize_m = true;
}
inline
void RBend::resetRecalcRefTrajFlag() {
recalcRefTraj_m = true;
}
#endif // CLASSIC_RBend_HH
\ No newline at end of file
......@@ -224,13 +224,8 @@ public:
/// Set rotation about z axis in bend frame.
void SetRotationAboutZ(double rotation);
void doReinitialize() {
reinitialize_m = true;
}
void doRecalcRefTraj() {
recalcRefTraj_m = true;
}
void resetReinitializeFlag();
void resetRecalcRefTrajFlag();
private:
......@@ -405,4 +400,14 @@ private:
double sinExitAngle_m;
};
inline
void SBend::resetReinitializeFlag() {
reinitialize_m = true;
}
inline
void SBend::resetRecalcRefTrajFlag() {
recalcRefTraj_m = true;
}
#endif // CLASSIC_SBend_HH
\ No newline at end of file
......@@ -1291,15 +1291,15 @@ void ParallelTTracker::executeAutoPhase(int numRefs, double zStop) {
FieldList sbends = itsOpalBeamline_m.getElementByType("SBend");
for (FieldList::iterator it = sbends.begin(); it != sbends.end(); ++ it) {
SBend* bend = static_cast<SBend*>(it->getElement().get());
bend->doReinitialize();
bend->doRecalcRefTraj();
bend->resetReinitializeFlag();
bend->resetRecalcRefTrajFlag();
}
FieldList rbends = itsOpalBeamline_m.getElementByType("RBend");
for (FieldList::iterator it = rbends.begin(); it != rbends.end(); ++ it) {
RBend* bend = static_cast<RBend*>(it->getElement().get());
bend->doReinitialize();
bend->doRecalcRefTraj();
bend->resetReinitializeFlag();
bend->resetRecalcRefTrajFlag();
}
localTrackSteps_m = maxStepsSave;
......
Markdown is supported
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