Skip to content
Snippets Groups Projects
Commit b6587dad authored by Mark Jones's avatar Mark Jones
Browse files

Add fThetaCentralOffset, fOopCentralOffset, fPCentralOffset

Add fTheta_lab
Do offsets in THcHallCSpectrometer::ReadDatabase
parent 49b5e3f8
No related branches found
No related tags found
No related merge requests found
...@@ -140,11 +140,20 @@ Int_t THcHallCSpectrometer::ReadDatabase( const TDatime& date ) ...@@ -140,11 +140,20 @@ Int_t THcHallCSpectrometer::ReadDatabase( const TDatime& date )
{"theta_offset",&fThetaOffset,kDouble}, {"theta_offset",&fThetaOffset,kDouble},
{"phi_offset",&fPhiOffset,kDouble}, {"phi_offset",&fPhiOffset,kDouble},
{"delta_offset",&fDeltaOffset,kDouble}, {"delta_offset",&fDeltaOffset,kDouble},
{"thetacentral_offset",&fThetaCentralOffset,kDouble},
{"_oopcentral_offset",&fOopCentralOffset,kDouble},
{"pcentral_offset",&fPCentralOffset,kDouble},
{"pcentral",&fPCentral,kDouble}, {"pcentral",&fPCentral,kDouble},
{"theta_lab",&fTheta_lab,kDouble},
{0} {0}
}; };
gHcParms->LoadParmValues((DBRequest*)&list,prefix); gHcParms->LoadParmValues((DBRequest*)&list,prefix);
//
cout << " fPcentral = " << fPCentral << " " <<fPCentralOffset << endl;
cout << " fThate_lab = " << fTheta_lab << " " <<fThetaCentralOffset << endl;
fPCentral= fPCentral*(1.+fPCentralOffset/100.);
fTheta_lab=fTheta_lab + fThetaCentralOffset*(180./3.14159);
//
ifstream ifile; ifstream ifile;
ifile.open(reconCoeffFilename.c_str()); ifile.open(reconCoeffFilename.c_str());
if(!ifile.is_open()) { if(!ifile.is_open()) {
......
...@@ -41,10 +41,14 @@ protected: ...@@ -41,10 +41,14 @@ protected:
Double_t fDetOffset_x; Double_t fDetOffset_x;
Double_t fDetOffset_y; Double_t fDetOffset_y;
Double_t fZTrueFocus; Double_t fZTrueFocus;
Double_t fThetaOffset; Double_t fThetaOffset; // Zero order term in yptar optics matrix (rad)
Double_t fPhiOffset; Double_t fPhiOffset; // Zero order term in xptar optics matrix (rad)
Double_t fDeltaOffset; Double_t fDeltaOffset; // Zero order term in delta optics matrix (%)
Double_t fPCentral; Double_t fThetaCentralOffset; // Offset of Central spectrometer angle (rad)
Double_t fOopCentralOffset; //Offset of central out-of-plane angle (rad)
Double_t fPCentralOffset; // Offset Central spectrometer momentum (%)
Double_t fPCentral; // Central spectrometer momentum (GeV)
Double_t fTheta_lab; // Central spectrometer angle (deg)
// THaScintillator *sc_ref; // calculate time track hits this plane // THaScintillator *sc_ref; // calculate time track hits this plane
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment