Commit 5d6c9d35 authored by Steve Russell's avatar Steve Russell
Browse files

Fixes to SBend and RBend. User guide updates to come (about 1/2 done).

parent 67d65ee6
...@@ -43,6 +43,8 @@ RBend::RBend(): ...@@ -43,6 +43,8 @@ RBend::RBend():
designEnergy_m(0.0), designEnergy_m(0.0),
designRadius_m(0.0), designRadius_m(0.0),
fieldAmplitude_m(0.0), fieldAmplitude_m(0.0),
bX_m(0.0),
bY_m(0.0),
entranceAngle_m(0.0), entranceAngle_m(0.0),
exitAngle_m(0.0), exitAngle_m(0.0),
gradient_m(0.0), gradient_m(0.0),
...@@ -95,6 +97,8 @@ RBend::RBend(const RBend &right): ...@@ -95,6 +97,8 @@ RBend::RBend(const RBend &right):
designEnergy_m(right.designEnergy_m), designEnergy_m(right.designEnergy_m),
designRadius_m(right.designRadius_m), designRadius_m(right.designRadius_m),
fieldAmplitude_m(right.fieldAmplitude_m), fieldAmplitude_m(right.fieldAmplitude_m),
bX_m(right.bX_m),
bY_m(right.bY_m),
entranceAngle_m(right.entranceAngle_m), entranceAngle_m(right.entranceAngle_m),
exitAngle_m(right.exitAngle_m), exitAngle_m(right.exitAngle_m),
gradient_m(right.gradient_m), gradient_m(right.gradient_m),
...@@ -149,6 +153,8 @@ RBend::RBend(const std::string &name): ...@@ -149,6 +153,8 @@ RBend::RBend(const std::string &name):
designEnergy_m(0.0), designEnergy_m(0.0),
designRadius_m(0.0), designRadius_m(0.0),
fieldAmplitude_m(0.0), fieldAmplitude_m(0.0),
bX_m(0.0),
bY_m(0.0),
entranceAngle_m(0.0), entranceAngle_m(0.0),
exitAngle_m(0.0), exitAngle_m(0.0),
gradient_m(0.0), gradient_m(0.0),
...@@ -478,8 +484,9 @@ void RBend::SetEntranceAngle(double entranceAngle) { ...@@ -478,8 +484,9 @@ void RBend::SetEntranceAngle(double entranceAngle) {
entranceAngle_m = entranceAngle; entranceAngle_m = entranceAngle;
} }
void RBend::SetFieldAmplitude(double fieldAmplitude) { void RBend::SetFieldAmplitude(double k0, double k0s) {
fieldAmplitude_m = fieldAmplitude; bY_m = k0;
bX_m = k0s;
} }
void RBend::SetFieldMapFN(std::string fileName) { void RBend::SetFieldMapFN(std::string fileName) {
...@@ -502,13 +509,6 @@ void RBend::SetRotationAboutZ(double rotation) { ...@@ -502,13 +509,6 @@ void RBend::SetRotationAboutZ(double rotation) {
Orientation_m(2) = rotation; Orientation_m(2) = rotation;
} }
void RBend::SetRotationAboutZ(double k0, double k0s) {
Orientation_m(2) = atan2(k0s, k0);
fieldAmplitude_m = sqrt(pow(k0, 2.0) + pow(k0s, 2.0));
}
void RBend::AdjustFringeFields(double ratio) { void RBend::AdjustFringeFields(double ratio) {
double delta = std::abs(entranceParameter1_m - entranceParameter2_m); double delta = std::abs(entranceParameter1_m - entranceParameter2_m);
...@@ -1070,16 +1070,16 @@ bool RBend::FindIdealBendParameters(double bendLength) { ...@@ -1070,16 +1070,16 @@ bool RBend::FindIdealBendParameters(double bendLength) {
return true; return true;
} else { } else if(bX_m == 0.0) {
// Negative angle is a positive bend rotated 180 degrees. // Negative angle is a positive bend rotated 180 degrees.
if((refCharge > 0.0 && fieldAmplitude_m < 0.0) if((refCharge > 0.0 && bY_m < 0.0)
|| (refCharge < 0.0 && fieldAmplitude_m > 0.0)) { || (refCharge < 0.0 && bY_m > 0.0)) {
gradient_m *= -1.0; gradient_m *= -1.0;
Orientation_m(2) += Physics::pi; Orientation_m(2) += Physics::pi;
} }
fieldAmplitude_m = std::abs(fieldAmplitude_m); fieldAmplitude_m = refCharge * std::abs(bY_m / refCharge);
designRadius_m = std::abs(refBetaGamma * refMass / (Physics::c * fieldAmplitude_m)); designRadius_m = std::abs(refBetaGamma * refMass / (Physics::c * fieldAmplitude_m));
double angle = asin(bendLength / designRadius_m - sin(entranceAngle_m)); double angle = asin(bendLength / designRadius_m - sin(entranceAngle_m));
angle_m = angle + entranceAngle_m; angle_m = angle + entranceAngle_m;
...@@ -1087,6 +1087,23 @@ bool RBend::FindIdealBendParameters(double bendLength) { ...@@ -1087,6 +1087,23 @@ bool RBend::FindIdealBendParameters(double bendLength) {
return false; return false;
} else {
Orientation_m(2) += atan2(bX_m, bY_m);
if(refCharge < 0.0) {
gradient_m *= -1.0;
Orientation_m(2) -= Physics::pi;
}
fieldAmplitude_m = refCharge
* std::abs(sqrt(pow(bY_m, 2.0) + pow(bX_m, 2.0))
/ refCharge);
designRadius_m = std::abs(refBetaGamma * refMass / (Physics::c * fieldAmplitude_m));
double angle = asin(bendLength / designRadius_m - sin(entranceAngle_m));
angle_m = angle + entranceAngle_m;
exitAngle_m = angle_m - entranceAngle_m;
return false;
} }
} }
...@@ -1228,9 +1245,9 @@ void RBend::Print(Inform &msg, double bendAngleX, double bendAngleY) { ...@@ -1228,9 +1245,9 @@ void RBend::Print(Inform &msg, double bendAngleX, double bendAngleY) {
<< " m (in s coordinates)" << " m (in s coordinates)"
<< endl; << endl;
msg << endl msg << endl
<< "Bend Magnet Properties" << "Ideal (Hard Edge) Bend Magnet Properties"
<< endl << endl
<< "======================" << "========================================"
<< endl << endl; << endl << endl;
msg << "Bend angle magnitude: " msg << "Bend angle magnitude: "
<< angle_m << angle_m
...@@ -1262,6 +1279,10 @@ void RBend::Print(Inform &msg, double bendAngleX, double bendAngleY) { ...@@ -1262,6 +1279,10 @@ void RBend::Print(Inform &msg, double bendAngleX, double bendAngleY) {
<< designRadius_m << designRadius_m
<< " m" << " m"
<< endl; << endl;
msg << "Bend design energy: "
<< designEnergy_m
<< " eV"
<< endl;
msg << "Rotation about x axis: " msg << "Rotation about x axis: "
<< Orientation_m(1) << Orientation_m(1)
<< " rad (" << " rad ("
...@@ -1281,9 +1302,9 @@ void RBend::Print(Inform &msg, double bendAngleX, double bendAngleY) { ...@@ -1281,9 +1302,9 @@ void RBend::Print(Inform &msg, double bendAngleX, double bendAngleY) {
<< " degrees)" << " degrees)"
<< endl; << endl;
msg << endl msg << endl
<< "Reference Trajectory Properties" << "Reference Trajectory Properties Through Bend Magnet with Fringe Fields"
<< endl << endl
<< "===============================" << "======================================================================"
<< endl << endl; << endl << endl;
msg << "Reference particle is bent: " msg << "Reference particle is bent: "
<< bendAngleX << bendAngleX
...@@ -1599,6 +1620,15 @@ bool RBend::TreatAsDrift(Inform &msg) { ...@@ -1599,6 +1620,15 @@ bool RBend::TreatAsDrift(Inform &msg) {
<< endl; << endl;
designRadius_m = 0.0; designRadius_m = 0.0;
return true; return true;
} else if(angle_m == 0.0 &&
pow(bX_m, 2.0) + pow(bY_m, 2.0) == 0.0) {
msg << "Warning bend angle/strength is zero. Treating as drift."
<< endl;
designRadius_m = 0.0;
return true;
} else } else
return false; return false;
} }
...@@ -215,7 +215,7 @@ public: ...@@ -215,7 +215,7 @@ public:
void SetBeta(double beta); void SetBeta(double beta);
void SetDesignEnergy(double energy); void SetDesignEnergy(double energy);
void SetEntranceAngle(double entranceAngle); void SetEntranceAngle(double entranceAngle);
void SetFieldAmplitude(double fieldAmplitude); void SetFieldAmplitude(double k0, double k0s);
/* /*
* Set the name of the field map. * Set the name of the field map.
...@@ -232,7 +232,6 @@ public: ...@@ -232,7 +232,6 @@ public:
/// Set rotation about z axis in bend frame. /// Set rotation about z axis in bend frame.
void SetRotationAboutZ(double rotation); void SetRotationAboutZ(double rotation);
void SetRotationAboutZ(double k0, double k0s);
private: private:
...@@ -303,11 +302,12 @@ private: ...@@ -303,11 +302,12 @@ private:
/// (Not currently used.) /// (Not currently used.)
double angle_m; /// Bend angle for reference particle with bend double angle_m; /// Bend angle for reference particle with bend
/// design energy (radians). /// design energy (radians).
double aperture_m; /// Aperture of magnet in non-bend (horizontal) double aperture_m; /// Aperture of magnet in non-bend plane.
/// plane.
double designEnergy_m; /// Bend design energy (eV). double designEnergy_m; /// Bend design energy (eV).
double designRadius_m; /// Bend design radius (m). double designRadius_m; /// Bend design radius (m).
double fieldAmplitude_m; /// Amplitude of magnet field (T). double fieldAmplitude_m; /// Amplitude of magnet field (T).
double bX_m; /// Amplitude of Bx field (T).
double bY_m; /// Amplitude of By field (T).
double entranceAngle_m; /// Angle between incoming reference trajectory double entranceAngle_m; /// Angle between incoming reference trajectory
/// and the entrance face of the magnet (radians). /// and the entrance face of the magnet (radians).
double exitAngle_m; /// Angle between outgoing reference trajectory double exitAngle_m; /// Angle between outgoing reference trajectory
......
...@@ -40,6 +40,8 @@ SBend::SBend(): ...@@ -40,6 +40,8 @@ SBend::SBend():
designEnergy_m(0.0), designEnergy_m(0.0),
designRadius_m(0.0), designRadius_m(0.0),
fieldAmplitude_m(0.0), fieldAmplitude_m(0.0),
bX_m(0.0),
bY_m(0.0),
angleGreaterThanPi_m(false), angleGreaterThanPi_m(false),
entranceAngle_m(0.0), entranceAngle_m(0.0),
exitAngle_m(0.0), exitAngle_m(0.0),
...@@ -90,6 +92,8 @@ SBend::SBend(const SBend &right): ...@@ -90,6 +92,8 @@ SBend::SBend(const SBend &right):
designEnergy_m(right.designEnergy_m), designEnergy_m(right.designEnergy_m),
designRadius_m(right.designRadius_m), designRadius_m(right.designRadius_m),
fieldAmplitude_m(right.fieldAmplitude_m), fieldAmplitude_m(right.fieldAmplitude_m),
bX_m(right.bX_m),
bY_m(right.bY_m),
angleGreaterThanPi_m(right.angleGreaterThanPi_m), angleGreaterThanPi_m(right.angleGreaterThanPi_m),
entranceAngle_m(right.entranceAngle_m), entranceAngle_m(right.entranceAngle_m),
exitAngle_m(right.exitAngle_m), exitAngle_m(right.exitAngle_m),
...@@ -145,6 +149,8 @@ SBend::SBend(const std::string &name): ...@@ -145,6 +149,8 @@ SBend::SBend(const std::string &name):
designEnergy_m(0.0), designEnergy_m(0.0),
designRadius_m(0.0), designRadius_m(0.0),
fieldAmplitude_m(0.0), fieldAmplitude_m(0.0),
bX_m(0.0),
bY_m(0.0),
angleGreaterThanPi_m(false), angleGreaterThanPi_m(false),
entranceAngle_m(0.0), entranceAngle_m(0.0),
exitAngle_m(0.0), exitAngle_m(0.0),
...@@ -443,8 +449,9 @@ void SBend::setExitAngle(double exitAngle) { ...@@ -443,8 +449,9 @@ void SBend::setExitAngle(double exitAngle) {
exitAngle_m = exitAngle; exitAngle_m = exitAngle;
} }
void SBend::SetFieldAmplitude(double fieldAmplitude) { void SBend::SetFieldAmplitude(double k0, double k0s) {
fieldAmplitude_m = fieldAmplitude; bY_m = k0;
bX_m = k0s;
} }
void SBend::SetFieldMapFN(std::string fileName) { void SBend::SetFieldMapFN(std::string fileName) {
...@@ -467,13 +474,6 @@ void SBend::SetRotationAboutZ(double rotation) { ...@@ -467,13 +474,6 @@ void SBend::SetRotationAboutZ(double rotation) {
Orientation_m(2) = rotation; Orientation_m(2) = rotation;
} }
void SBend::SetRotationAboutZ(double k0, double k0s) {
Orientation_m(2) = atan2(k0s, k0);
fieldAmplitude_m = sqrt(pow(k0, 2.0) + pow(k0s, 2.0));
}
void SBend::AdjustFringeFields(double ratio) { void SBend::AdjustFringeFields(double ratio) {
double delta = std::abs(entranceParameter1_m - entranceParameter2_m); double delta = std::abs(entranceParameter1_m - entranceParameter2_m);
...@@ -1034,16 +1034,16 @@ bool SBend::FindIdealBendParameters(double chordLength) { ...@@ -1034,16 +1034,16 @@ bool SBend::FindIdealBendParameters(double chordLength) {
/ (Physics::c * designRadius_m); / (Physics::c * designRadius_m);
return true; return true;
} else { } else if(bX_m == 0.0) {
// Negative angle is a positive bend rotated 180 degrees. // Negative angle is a positive bend rotated 180 degrees.
if((refCharge > 0.0 && fieldAmplitude_m < 0.0) if((refCharge > 0.0 && bY_m < 0.0)
|| (refCharge < 0.0 && fieldAmplitude_m > 0.0)) { || (refCharge < 0.0 && bY_m > 0.0)) {
gradient_m *= -1.0; gradient_m *= -1.0;
Orientation_m(2) += Physics::pi; Orientation_m(2) += Physics::pi;
} }
fieldAmplitude_m = std::abs(fieldAmplitude_m); fieldAmplitude_m = refCharge * std::abs(bY_m / refCharge);
designRadius_m = std::abs(refBetaGamma * refMass / (Physics::c * fieldAmplitude_m)); designRadius_m = std::abs(refBetaGamma * refMass / (Physics::c * fieldAmplitude_m));
double bendAngle = 2.0 * std::asin(chordLength / (2.0 * designRadius_m)); double bendAngle = 2.0 * std::asin(chordLength / (2.0 * designRadius_m));
...@@ -1053,6 +1053,26 @@ bool SBend::FindIdealBendParameters(double chordLength) { ...@@ -1053,6 +1053,26 @@ bool SBend::FindIdealBendParameters(double chordLength) {
angle_m = bendAngle; angle_m = bendAngle;
return false; return false;
} else {
Orientation_m(2) += atan2(bX_m, bY_m);
if(refCharge < 0.0) {
gradient_m *= -1.0;
Orientation_m(2) -= Physics::pi;
}
fieldAmplitude_m = refCharge
* std::abs(sqrt(pow(bY_m, 2.0) + pow(bX_m, 2.0))
/ refCharge);
designRadius_m = std::abs(refBetaGamma * refMass / (Physics::c * fieldAmplitude_m));
double bendAngle = 2.0 * std::asin(chordLength / (2.0 * designRadius_m));
if(angleGreaterThanPi_m)
bendAngle = 2.0 * Physics::pi - bendAngle;
angle_m = bendAngle;
return false;
} }
} }
...@@ -1194,9 +1214,9 @@ void SBend::Print(Inform &msg, double bendAngleX, double bendAngleY) { ...@@ -1194,9 +1214,9 @@ void SBend::Print(Inform &msg, double bendAngleX, double bendAngleY) {
<< " m (in s coordinates)" << " m (in s coordinates)"
<< endl; << endl;
msg << endl msg << endl
<< "Bend Magnet Properties" << "Ideal (Hard Edge) Bend Magnet Properties"
<< endl << endl
<< "======================" << "========================================"
<< endl << endl; << endl << endl;
msg << "Bend angle magnitude: " msg << "Bend angle magnitude: "
<< angle_m << angle_m
...@@ -1228,6 +1248,10 @@ void SBend::Print(Inform &msg, double bendAngleX, double bendAngleY) { ...@@ -1228,6 +1248,10 @@ void SBend::Print(Inform &msg, double bendAngleX, double bendAngleY) {
<< designRadius_m << designRadius_m
<< " m" << " m"
<< endl; << endl;
msg << "Bend design energy: "
<< designEnergy_m
<< " eV"
<< endl;
msg << "Rotation about x axis: " msg << "Rotation about x axis: "
<< Orientation_m(1) << Orientation_m(1)
<< " rad (" << " rad ("
...@@ -1247,9 +1271,9 @@ void SBend::Print(Inform &msg, double bendAngleX, double bendAngleY) { ...@@ -1247,9 +1271,9 @@ void SBend::Print(Inform &msg, double bendAngleX, double bendAngleY) {
<< " degrees)" << " degrees)"
<< endl; << endl;
msg << endl msg << endl
<< "Reference Trajectory Properties" << "Reference Trajectory Properties Through Bend Magnet with Fringe Fields"
<< endl << endl
<< "===============================" << "======================================================================"
<< endl << endl; << endl << endl;
msg << "Reference particle is bent: " msg << "Reference particle is bent: "
<< bendAngleX << bendAngleX
...@@ -1484,7 +1508,7 @@ bool SBend::SetupBendGeometry(Inform &msg, double &startField, double &endField) ...@@ -1484,7 +1508,7 @@ bool SBend::SetupBendGeometry(Inform &msg, double &startField, double &endField)
if(!FindChordLength(msg, chordLength, chordLengthFromMap)) if(!FindChordLength(msg, chordLength, chordLengthFromMap))
return false; return false;
if(TreatAsDrift(msg)) { if(TreatAsDrift(msg, chordLength)) {
startField_m = startField; startField_m = startField;
endField_m = startField + chordLength; endField_m = startField + chordLength;
return true; return true;
...@@ -1558,12 +1582,39 @@ void SBend::SetupPusher(PartBunch *bunch) { ...@@ -1558,12 +1582,39 @@ void SBend::SetupPusher(PartBunch *bunch) {
} }
bool SBend::TreatAsDrift(Inform &msg) { bool SBend::TreatAsDrift(Inform &msg, double chordLength) {
if(designEnergy_m <= 0.0) { if(designEnergy_m <= 0.0) {
msg << "Warning: bend design energy is zero. Treating as drift." msg << "Warning: bend design energy is zero. Treating as drift."
<< endl; << endl;
designRadius_m = 0.0; designRadius_m = 0.0;
return true; return true;
} else if(angle_m == 0.0) {
double refMass = RefPartBunch_m->getM();
double refGamma = designEnergy_m / refMass + 1.0;
double refBetaGamma = sqrt(pow(refGamma, 2.0) - 1.0);
double amplitude = std::abs(fieldAmplitude_m);
double radius = std::abs(refBetaGamma * refMass / (Physics::c * amplitude));
double sinArgument = chordLength / (2.0 * radius);
if(std::abs(sinArgument) > 1.0) {
msg << "Warning: bend strength and defined reference trajectory "
<< "chord length are not consistent. Treating bend as drift."
<< endl;
designRadius_m = 0.0;
return true;
} else
return false;
} else if(angle_m == 0.0 &&
pow(bY_m, 2.0) + pow(bX_m, 2.0) == 0.0) {
msg << "Warning bend angle/strength is zero. Treating as drift."
<< endl;
designRadius_m = 0.0;
return true;
} else } else
return false; return false;
} }
......
...@@ -206,7 +206,7 @@ public: ...@@ -206,7 +206,7 @@ public:
void SetDesignEnergy(double energy); void SetDesignEnergy(double energy);
void SetEntranceAngle(double entranceAngle); void SetEntranceAngle(double entranceAngle);
void setExitAngle(double exitAngle); void setExitAngle(double exitAngle);
void SetFieldAmplitude(double fieldAmplitude); void SetFieldAmplitude(double k0, double k0s);
/* /*
* Set the name of the field map. * Set the name of the field map.
...@@ -223,7 +223,6 @@ public: ...@@ -223,7 +223,6 @@ public:
/// Set rotation about z axis in bend frame. /// Set rotation about z axis in bend frame.
void SetRotationAboutZ(double rotation); void SetRotationAboutZ(double rotation);
void SetRotationAboutZ(double k0, double k0s);
private: private:
...@@ -284,7 +283,7 @@ private: ...@@ -284,7 +283,7 @@ private:
bool SetupDefaultFieldMap(Inform &msg); bool SetupDefaultFieldMap(Inform &msg);
void SetFieldBoundaries(double startField, double endField); void SetFieldBoundaries(double startField, double endField);
void SetupPusher(PartBunch *bunch); void SetupPusher(PartBunch *bunch);
bool TreatAsDrift(Inform &msg); bool TreatAsDrift(Inform &msg, double chordlength);
BorisPusher pusher_m; /// Pusher used to integrate reference particle BorisPusher pusher_m; /// Pusher used to integrate reference particle
/// through the bend. /// through the bend.
...@@ -294,11 +293,12 @@ private: ...@@ -294,11 +293,12 @@ private:
/// (Not currently used.) /// (Not currently used.)
double angle_m; /// Bend angle for reference particle with bend double angle_m; /// Bend angle for reference particle with bend
/// design energy (radians). /// design energy (radians).
double aperture_m; /// Aperture of magnet in non-bend (horizontal) double aperture_m; /// Aperture of magnet in non-bend plane.
/// plane.
double designEnergy_m; /// Bend design energy (eV). double designEnergy_m; /// Bend design energy (eV).
double designRadius_m; /// Bend design radius (m). double designRadius_m; /// Bend design radius (m).
double fieldAmplitude_m; /// Amplitude of magnet field (T). double fieldAmplitude_m; /// Amplitude of magnet field (T).
double bX_m; /// Amplitude of Bx field (T).
double bY_m; /// Amplitude of By field (T).
bool angleGreaterThanPi_m; /// Set to true if bend angle is greater than bool angleGreaterThanPi_m; /// Set to true if bend angle is greater than
/// 180 degrees. /// 180 degrees.
double entranceAngle_m; /// Angle between incoming reference trajectory double entranceAngle_m; /// Angle between incoming reference trajectory
......
...@@ -67,8 +67,8 @@ OpalBend::OpalBend(const char *name, const char *help): ...@@ -67,8 +67,8 @@ OpalBend::OpalBend(const char *name, const char *help):
("FMAPFN", "Filename for the fieldmap"); ("FMAPFN", "Filename for the fieldmap");
itsAttr[GAP] = Attributes::makeReal itsAttr[GAP] = Attributes::makeReal
("GAP", "Full gap height of the magnet (m)", 0.0); ("GAP", "Full gap height of the magnet (m)", 0.0);
itsAttr[APERTURE] = Attributes::makeReal itsAttr[HAPERT] = Attributes::makeReal
("APERTURE", "Non-bend plane magnet aperture (m)", 0.0); ("HAPERT", "Non-bend plane magnet aperture (m)", 0.0);
itsAttr[ROTATION] = Attributes::makeReal itsAttr[ROTATION] = Attributes::makeReal
("ROTATION", "Magnet rotation about z axis in degrees"); ("ROTATION", "Magnet rotation about z axis in degrees");
itsAttr[ALPHA] = Attributes::makeReal itsAttr[ALPHA] = Attributes::makeReal
...@@ -84,9 +84,9 @@ OpalBend::OpalBend(const char *name, const char *help): ...@@ -84,9 +84,9 @@ OpalBend::OpalBend(const char *name, const char *help):
"Set to true if bend angle is greater than 180 degrees", "Set to true if bend angle is greater than 180 degrees",
false); false);
itsAttr[DX] = Attributes::makeReal itsAttr[DX] = Attributes::makeReal
("DX", "Misalignment in x direction",0.0); ("DX", "Misalignment in x direction", 0.0);
itsAttr[DY] = Attributes::makeReal itsAttr[DY] = Attributes::makeReal
("DY", "Misalignment in y direction",0.0); ("DY", "Misalignment in y direction", 0.0);
registerRealAttribute("ANGLE"); registerRealAttribute("ANGLE");
registerRealAttribute("K0L"); registerRealAttribute("K0L");
...@@ -107,7 +107,7 @@ OpalBend::OpalBend(const char *name, const char *help): ...@@ -107,7 +107,7 @@ OpalBend::OpalBend(const char *name, const char *help):
registerRealAttribute("STEPSIZE"); registerRealAttribute("STEPSIZE");
registerStringAttribute("FMAPFN"); registerStringAttribute("FMAPFN");
registerRealAttribute("GAP"); registerRealAttribute("GAP");
registerRealAttribute("APERTURE"); registerRealAttribute("HAPERT");
registerRealAttribute("ROTATION"); registerRealAttribute("ROTATION");
registerRealAttribute("ALPHA"); registerRealAttribute("ALPHA");
registerRealAttribute("BETA"); registerRealAttribute("BETA");
......
...@@ -44,7 +44,7 @@ public: ...@@ -44,7 +44,7 @@ public:
SLICES, STEPSIZE, // Parameters used to determine slicing. SLICES, STEPSIZE, // Parameters used to determine slicing.