--- DarthVader/OrbitalInfo/src/OrbitalInfo.cpp 2007/03/15 12:42:47 1.7 +++ DarthVader/OrbitalInfo/src/OrbitalInfo.cpp 2007/04/18 14:06:50 1.9 @@ -37,16 +37,16 @@ q3 = -1000.; // Euler angles (nadir reference frame) -// theta = -1000.; -// phi = -1000.; -// etha = -1000.; - - // Euler angles (local field reference frame) -// thetamag = -1000.; -// phimag = -1000.; -// ethamag = -1000.; - - std::fill_n(goodAttitude, 5, 0); + theta = -1000.; + phi = -1000.; + etha = -1000.; + +// // Euler angles (local field reference frame) +// thetamag = -1000.; +// phimag = -1000.; +// ethamag = -1000.; + mode = 0; +// std::fill_n(goodAttitude, 5, 0); } @@ -87,16 +87,17 @@ q3 = -1000.; // Euler angles (nadir reference frame) - // theta = -1000.; - // phi = -1000.; - // etha = -1000.; + theta = -1000.; + phi = -1000.; + etha = -1000.; // Euler angles (local field reference frame) - //thetamag = -1000.; - // phimag = -1000.; - //ethamag = -1000.; + // thetamag = -1000.; + // phimag = -1000.; + // ethamag = -1000.; - std::fill_n(goodAttitude, 5, 0); + mode = 0; + // std::fill_n(goodAttitude, 5, 0); } /** @@ -139,16 +140,17 @@ l2->q3 = q3; // Euler angles (nadir reference frame) - // l2->theta = theta; - // l2->phi = phi; - // l2->etha = etha; + l2->theta = theta; + l2->phi = phi; + l2->etha = etha; + l2->mode = mode; // Euler angles (local field reference frame) - // l2->thetamag = thetamag; - // l2->phimag = phimag; - // l2->ethamag = ethamag; +// l2->thetamag = thetamag; +// l2->phimag = phimag; +// l2->ethamag = ethamag; - memcpy(l2->goodAttitude, goodAttitude, sizeof(goodAttitude)); +// memcpy(l2->goodAttitude, goodAttitude, sizeof(goodAttitude)); } void OrbitalInfo::SetFromLevel2Struct(cOrbitalInfo *l2){ @@ -188,16 +190,17 @@ q3 = l2->q3; // Euler angles (nadir reference frame) - //theta = l2->theta; - //phi = l2->phi; - //etha = l2->etha; + theta = l2->theta; + phi = l2->phi; + etha = l2->etha; + mode = l2->mode; // Euler angles (local field reference frame) - //thetamag = l2->thetamag; - //phimag = l2->phimag; - //ethamag = l2->ethamag; +// thetamag = l2->thetamag; +// phimag = l2->phimag; +// ethamag = l2->ethamag; - memcpy(goodAttitude, l2->goodAttitude, sizeof(l2->goodAttitude)); +// memcpy(goodAttitude, l2->goodAttitude, sizeof(l2->goodAttitude)); } ClassImp(OrbitalInfo)