--- DarthVader/OrbitalInfo/src/OrbitalInfo.cpp	2012/06/07 14:04:00	1.15
+++ DarthVader/OrbitalInfo/src/OrbitalInfo.cpp	2014/03/28 20:47:15	1.16
@@ -14,6 +14,8 @@
 void OrbitalInfoTrkVar::Clear(Option_t *t){
   trkseqno = 0;
   pitch = -1000.;
+  sunangle = -1000;
+  sunmagangle = -1000;
   cutoff = -1000.;
   Eij.Zero();
   Sij.Zero();
@@ -35,6 +37,8 @@
   //
   pitch = t.pitch;
   cutoff = t.cutoff;
+  sunangle=t.sunangle;
+  sunmagangle=t.sunmagangle;
   //
   Eij.ResizeTo(t.Eij);	
   Eij = t.Eij;	
@@ -83,6 +87,7 @@
   lon = -1000.;
   lat = -1000.;
   alt = -1000.;
+  V.SetXYZ(-1000.,-1000.,-1000.);
 
   Bnorth = -1000.;
   Beast = -1000.;
@@ -92,17 +97,8 @@
   BB0 = -1000.;
   L = -1000.;
 
-//   londip = -1000.;
-//   latdip = -1000.;
-//   altdip = -1000.;
-
-//   loncgm = -1000.;
-//   latcgm = -1000.;
-//   altcgm = -1000.;
-
-//   loncbm = -1000.;
-//   latcbm = -1000.;
-//   altcbm = -1000.;
+   londip = -1000.;
+   latdip = -1000.;
 
   //  std::fill_n(cutoff, 20, 0.);
   //  std::fill_n(cutoff, 2, 0.);
@@ -119,16 +115,12 @@
   phi = -1000.;
   etha = -1000.;
 
-  // Euler angles (local field reference frame)
-  //  thetamag = -1000.;
-  //  phimag = -1000.;
-  //  ethamag = -1000.;
-
-  //  pamzenitangle = -1000.;
-  //  pamBangle = -1000.;
   Iij.Zero();
 
   mode = 0;
+  qkind = -1000;
+  errq =  -1000;
+  azim =  -1000;
   //  std::fill_n(goodAttitude, 5, 0);
 }
 
@@ -143,6 +135,7 @@
   l2->lon = lon;
   l2->lat = lat;
   l2->alt = alt;
+  l2->V = V;
 
   l2->Bnorth = Bnorth;
   l2->Beast = Beast;
@@ -152,17 +145,8 @@
   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->cutoffsvl = cutoffsvl;
 //  memcpy(l2->cutoffsvl, cutoffsvl, sizeof(cutoffsvl));
@@ -179,10 +163,9 @@
   l2->etha = etha;
 
   l2->mode = mode;
-  // Euler angles (local field reference frame)
-//   l2->thetamag = thetamag;
-//   l2->phimag = phimag;
-//   l2->ethamag = ethamag;
+  l2->qkind = qkind;
+  l2->errq = errq;
+  l2->azim = azim;
 
 //   memcpy(l2->goodAttitude, goodAttitude, sizeof(goodAttitude));
 }
@@ -195,6 +178,7 @@
   lon = l2->lon;
   lat = l2->lat;
   alt = l2->alt;
+  V = l2->V;
 
   l2->Bnorth = Bnorth;
   l2->Beast = Beast;
@@ -204,17 +188,8 @@
   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;
 
 //  memcpy(cutoff, l2->cutoff, sizeof(l2->cutoff));
   l2->cutoffsvl = cutoffsvl;
@@ -231,10 +206,9 @@
   etha = l2->etha;
 
   mode = l2->mode;
-  // Euler angles (local field reference frame)
-//   thetamag = l2->thetamag;
-//   phimag = l2->phimag;
-//   ethamag = l2->ethamag;
+  qkind = l2->qkind;
+  errq = l2->errq;
+  azim = l2->azim;
 
 //   memcpy(goodAttitude, l2->goodAttitude, sizeof(l2->goodAttitude));
 }