--- DarthVader/OrbitalInfo/src/InclinationInfo.cpp 2007/03/15 12:46:04 1.2 +++ DarthVader/OrbitalInfo/src/InclinationInfo.cpp 2007/04/03 11:05:29 1.3 @@ -85,7 +85,7 @@ { } -short int Sign_1(double_t a, Int_t b){ +short int Sign_1(Double_t a, Int_t b){ if(a>0){b=1;} if(a<0){b=-1;} else{b=0;} @@ -97,20 +97,20 @@ void InclinationInfo::QuaternionstoAngle(Quaternions Qua){ - double_t a11 = pow(Qua.quat[0][0],2.)+pow(Qua.quat[0][1],2.)-pow(Qua.quat[0][2],2.)-pow(Qua.quat[0][3],2.); - double_t a12 = 2*(Qua.quat[0][1]*Qua.quat[0][2]+Qua.quat[0][0]*Qua.quat[0][3]); - double_t a13 = 2*(Qua.quat[0][1]*Qua.quat[0][3]-Qua.quat[0][0]*Qua.quat[0][2]); - double_t a21 = 2*(Qua.quat[0][1]*Qua.quat[0][2]-Qua.quat[0][0]*Qua.quat[0][3]); - double_t a22 = pow(Qua.quat[0][0],2.)+pow(Qua.quat[0][2],2.)-pow(Qua.quat[0][1],2.)-pow(Qua.quat[0][3],2.); - double_t a23 = 2*(Qua.quat[0][2]*Qua.quat[0][3]+Qua.quat[0][0]*Qua.quat[0][1]); - double_t a31 = 2*(Qua.quat[0][1]*Qua.quat[0][3]+Qua.quat[0][0]*Qua.quat[0][2]); - double_t a32 = 2*(Qua.quat[0][2]*Qua.quat[0][3]-Qua.quat[0][0]*Qua.quat[0][1]); - double_t a33 = pow(Qua.quat[0][0],2.)+pow(Qua.quat[0][3],2.)-pow(Qua.quat[0][1],2.)-pow(Qua.quat[0][2],2.); - double_t a = 360/(2*TMath::Pi()); - double_t eksi = 0.0000001; - double_t eteta = 0.0000001; - double_t ksteta = a22*a22/(a12*a12+a22*a22); - double_t ksksi = a33*a33/(a33*a33+a31*a31); + Double_t a11 = pow(Qua.quat[0][0],2.)+pow(Qua.quat[0][1],2.)-pow(Qua.quat[0][2],2.)-pow(Qua.quat[0][3],2.); + Double_t a12 = 2*(Qua.quat[0][1]*Qua.quat[0][2]+Qua.quat[0][0]*Qua.quat[0][3]); + Double_t a13 = 2*(Qua.quat[0][1]*Qua.quat[0][3]-Qua.quat[0][0]*Qua.quat[0][2]); + Double_t a21 = 2*(Qua.quat[0][1]*Qua.quat[0][2]-Qua.quat[0][0]*Qua.quat[0][3]); + Double_t a22 = pow(Qua.quat[0][0],2.)+pow(Qua.quat[0][2],2.)-pow(Qua.quat[0][1],2.)-pow(Qua.quat[0][3],2.); + Double_t a23 = 2*(Qua.quat[0][2]*Qua.quat[0][3]+Qua.quat[0][0]*Qua.quat[0][1]); + Double_t a31 = 2*(Qua.quat[0][1]*Qua.quat[0][3]+Qua.quat[0][0]*Qua.quat[0][2]); + Double_t a32 = 2*(Qua.quat[0][2]*Qua.quat[0][3]-Qua.quat[0][0]*Qua.quat[0][1]); + Double_t a33 = pow(Qua.quat[0][0],2.)+pow(Qua.quat[0][3],2.)-pow(Qua.quat[0][1],2.)-pow(Qua.quat[0][2],2.); + Double_t a = 360/(2*TMath::Pi()); + Double_t eksi = 0.0000001; + Double_t eteta = 0.0000001; + Double_t ksteta = a22*a22/(a12*a12+a22*a22); + Double_t ksksi = a33*a33/(a33*a33+a31*a31); Int_t kj1; if (a33<0){kj1=1; @@ -213,7 +213,7 @@ void InclinationInfo::TransAngle(Double_t x0, Double_t y0, Double_t z0, Double_t Vx0, Double_t Vy0, Double_t Vz0, Double_t gamar, Double_t ksir, Double_t tetar, Double_t q0, Double_t q1, Double_t q2, Double_t q3){ - double_t a = 360/(2*TMath::Pi()); + Double_t a = 360/(2*TMath::Pi()); // Points on three axes of Resurs' coordinate system (RCS) Int_t XRCS[3]; Int_t YRCS[3]; Int_t ZRCS[3];