--- DarthVader/OrbitalInfo/src/OrbitalInfo.cpp 2008/10/31 15:49:00 1.12 +++ DarthVader/OrbitalInfo/src/OrbitalInfo.cpp 2008/11/11 10:46:44 1.13 @@ -7,13 +7,21 @@ OrbitalInfoTrkVar::OrbitalInfoTrkVar(){ this->Clear(); + // Eij = new TMatrixD(3,3); + // Sij = new TMatrixD(3,3); } void OrbitalInfoTrkVar::Clear(Option_t *t){ trkseqno = 0; pitch = -1000.; + Eij.Zero(); + Sij.Zero(); } +void OrbitalInfoTrkVar::Delete(Option_t *t){ + // if ( Eij ) Eij->Delete(); + // if ( Sij ) Sij->Delete(); +} OrbitalInfo::OrbitalInfo(){ OrbitalInfoTrk = 0; //ELENA @@ -22,6 +30,7 @@ void OrbitalInfo::Delete(Option_t *t){ //ELENA // + // if ( Iij ) Iij->Delete(); if(OrbitalInfoTrk){ OrbitalInfoTrk->Delete(); //ELENA delete OrbitalInfoTrk; //ELENA @@ -30,7 +39,8 @@ }; //ELENA void OrbitalInfo::Set(){//ELENA - if ( !OrbitalInfoTrk ) OrbitalInfoTrk = new TClonesArray("OrbitalInfoTrkVar",2); //ELENA + if ( !OrbitalInfoTrk ) OrbitalInfoTrk = new TClonesArray("OrbitalInfoTrkVar",2); //ELENA} + // if ( !Iij ) Iij = new TMatrixD(3,3); }//ELENA OrbitalInfoTrkVar *OrbitalInfo::GetOrbitalInfoTrkVar(Int_t itrk){ @@ -66,19 +76,21 @@ BB0 = -1000.; L = -1000.; - londip = -1000.; - latdip = -1000.; - altdip = -1000.; - - loncgm = -1000.; - latcgm = -1000.; - altcgm = -1000.; - - loncbm = -1000.; - latcbm = -1000.; - altcbm = -1000.; - - std::fill_n(cutoff, 20, 0.); +// londip = -1000.; +// latdip = -1000.; +// altdip = -1000.; + +// loncgm = -1000.; +// latcgm = -1000.; +// altcgm = -1000.; + +// loncbm = -1000.; +// latcbm = -1000.; +// altcbm = -1000.; + + // std::fill_n(cutoff, 20, 0.); + // std::fill_n(cutoff, 2, 0.); + cutoffsvl = 0.; // Quaternions q0 = -1000.; @@ -96,9 +108,9 @@ // phimag = -1000.; // ethamag = -1000.; - pamzenitangle = -1000.; - pamBangle = -1000.; - + // pamzenitangle = -1000.; + // pamBangle = -1000.; + Iij.Zero(); mode = 0; // std::fill_n(goodAttitude, 5, 0); @@ -123,19 +135,20 @@ l2->BB0 = BB0; l2->L = L; - l2->londip = londip; - l2->latdip = latdip; - l2->altdip = altdip; - - l2->loncgm = loncgm; - l2->latcgm = latcgm; - l2->altcgm = altcgm; - - l2->loncbm = loncbm; - l2->latcbm = latcbm; - l2->altcbm = altcbm; +// l2->londip = londip; +// l2->latdip = latdip; +// l2->altdip = altdip; + +// l2->loncgm = loncgm; +// l2->latcgm = latcgm; +// l2->altcgm = altcgm; + +// l2->loncbm = loncbm; +// l2->latcbm = latcbm; +// l2->altcbm = altcbm; - memcpy(l2->cutoff, cutoff, sizeof(cutoff)); + l2->cutoffsvl = cutoffsvl; +// memcpy(l2->cutoffsvl, cutoffsvl, sizeof(cutoffsvl)); // Quaternions l2->q0 = q0; @@ -173,19 +186,20 @@ BB0 = l2->BB0; L = l2->L; - londip = l2->londip; - latdip = l2->latdip; - altdip = l2->altdip; - - loncgm = l2->loncgm; - latcgm = l2->latcgm; - altcgm = l2->altcgm; - - loncbm = l2->loncbm; - latcbm = l2->latcbm; - altcbm = l2->altcbm; +// londip = l2->londip; +// latdip = l2->latdip; +// altdip = l2->altdip; + +// loncgm = l2->loncgm; +// latcgm = l2->latcgm; +// altcgm = l2->altcgm; + +// loncbm = l2->loncbm; +// latcbm = l2->latcbm; +// altcbm = l2->altcbm; - memcpy(cutoff, l2->cutoff, sizeof(l2->cutoff)); +// memcpy(cutoff, l2->cutoff, sizeof(l2->cutoff)); + l2->cutoffsvl = cutoffsvl; // Quaternions q0 = l2->q0;