--- quicklook/OrbitalRate/src/OrbitalRate.cpp	2007/03/15 12:34:28	1.6
+++ quicklook/OrbitalRate/src/OrbitalRate.cpp	2007/11/04 16:01:37	1.9
@@ -324,11 +324,12 @@
     exit(EXIT_FAILURE);
   }
 
-  //Get the Julian date of the Resours offset
+  // Here I do: resurs offset + timesync
   TDatime offRes = TDatime(offDate, offTime);
-  // Add to the Resours Offset the timesync.  This is now the date at
-  // the moment of the timesync.
-  offRes.Set(offRes.Convert() + (UInt_t) timesync);
+  TTimeStamp offResTS = TTimeStamp(offRes.GetYear(), offRes.GetMonth(), offRes.GetDay(), offRes.GetHour(), offRes.GetMinute(), offRes.GetSecond(), 0, kTRUE, timesync);
+//   cout<<"timesync="<<timesync<<"  obt_timesync="<<obt_timesync<<endl;
+//   cout<<"offResTS.GetSec()="<<offResTS.GetSec()<<endl;
+//   cout<<"offResTS.AsString()="<<offResTS.AsString()<<endl<<endl;
 
   // Now I need a pointer to a cTle object.  The class misses a
   // constructor without arguments, so we have to give it a dummy TLE.
@@ -339,27 +340,29 @@
 
   // If we have to use a TLE file, call getTle().
   if (tleFile != "")
-    tle1 = getTle(tleFile, offRes);
+    tle1 = getTle(tleFile, offResTS); // modify getTle() to use offResTS!
+  else
+    cout<<"OrbitalRate: Warning!!! No tle file supplied.\n";
+
+  // Here I do: resurs offset + timesync - obt of the timesync
+  //  cout<<"here0 "<<offResTS.GetSec()<<endl;
+  //  offResTS.Set(offResTS.GetSec() - obt_timesync, kTRUE, 0, kFALSE);
+  offResTS.Set(offResTS.GetSec() - obt_timesync, kFALSE, 0, kFALSE);
+  //  cout<<"here1 "<<offResTS.GetSec()<<endl;
 
   cOrbit       orbit(*tle1);
   cEci         eci;
   cCoordGeo    coo;
 
-  // offRes is now "offset date" + timesync.  Now I subtract the obt
-  // of the timesync.  Remember that the time of the event from the
-  // tle date is:
-  // tle date - (offset date + timesync - obt timesync + obt event).
-  offRes.Set(offRes.Convert() - (UInt_t) obt_timesync);
-
-  // Get the Julian date of the TLE epoch
-  string datetime = getTleDatetime(tle1);
-  TDatime tledate = TDatime(datetime.c_str());
-
+  // Here I do: resurs offset + timesync - obt of the timesync - tle time
+  TTimeStamp tledate = getTleDatetime(tle1);
   cJulian jdatetime = cJulian((int) (tle1->getField(cTle::FLD_EPOCHYEAR)+2e3), tle1->getField(cTle::FLD_EPOCHDAY));
   int pYear, pMon; double pDOM;
   jdatetime.getComponent(&pYear, &pMon, &pDOM);
-
-  offsetTime = ((Long64_t) offRes.Convert() - (Long64_t) tledate.Convert());
+  offsetTime = ((Long64_t) offResTS.GetSec() - (Long64_t) tledate.GetSec());
+//   cerr<<"offsetTime="<<offsetTime<<endl
+//       <<"offResTS.GetSec()="<<offResTS.GetSec()<<endl
+//       <<"tledate.GetSec()="<<tledate.GetSec()<<endl<<endl;
 
   /********** Magnetic Field **************/
   // Check that all this is correct!
@@ -368,9 +371,8 @@
   // I can now compute the magnetic dipole moment at the actual date,
   // using the cJulian date.  I don't to recompute it for every event
   // beacause changes are not relevant at all.
-  Int_t y = tledate.GetYear();
-  Int_t m = tledate.GetMonth();
-  Int_t d = tledate.GetDay();
+  UInt_t y, m, d;
+  tledate.GetDate(kTRUE, 0, &y, &m, &d);
   float year = (float) y + (m*31+d)/365;
 
   // Initialize common data for geopack
@@ -428,6 +430,7 @@
       // event and the tle date.  I use seconds and not milliseconds
       // because the indetermination on the timesync is about 1s.
       timeElapsedFromTLE = offsetTime + obt/1000;
+      if(!i) cerr<<"1st event: timeElapsedFromTLE="<<timeElapsedFromTLE<<endl;
 
       // I also need the abstime in seconds rounded to the lower
       // value.  Every second, we set a_second_is_over to true.  Only
@@ -730,7 +733,7 @@
 // Scale() and Merge()).
 //
 // This function depends on InitStyle();
-int printHist(TH2F *h, TString mapFile, TString outDirectory, TString outputFilename, char *title, int width, int height, bool use_log, bool bool_shift)
+int printHist(TH2F *h, TString mapFile, TString outDirectory, TString outputFilename, const char *title, int width, int height, bool use_log, bool bool_shift)
 {
   InitStyle();
 
@@ -828,7 +831,7 @@
 // querying the database with the RESURS DK-1 id number 29228,
 // selecting the widest timespan, including the satellite name in the
 // results.
-cTle *getTle(TString tleFile, TDatime offRes)
+cTle *getTle(TString tleFile, TTimeStamp offResTS)
 {
   Float_t tledatefromfile, tledatefromroot;
   fstream tlefile(tleFile.Data(), ios::in);
@@ -858,7 +861,10 @@
   // Sort by date
   sort(ctles.begin(), ctles.end(), compTLE);
 
-  tledatefromroot = (offRes.GetYear()-2000)*1e3 + (offRes.Convert() - (TDatime(offRes.GetYear(), 1, 1, 0, 0, 0)).Convert())/ (24.*3600.);
+  UInt_t year, month, day;
+  offResTS.GetDate(kTRUE, 0, &year, &month, &day);
+  TTimeStamp firstofjan = TTimeStamp(year, 1, 1, 0, 0, 0);
+  tledatefromroot = (year-2000)*1e3 + (offResTS.GetSec() - firstofjan.GetSec())/(24.*3600.);
 
   for(iter = ctles.begin(); iter != ctles.end(); iter++) {
     cTle *tle = *iter;
@@ -902,7 +908,7 @@
 
 // Look for a timesync in the TFile rootFile.  Set timesync and
 // obt_timesync.  Returns 1 if timesync is found, 0 otherwise.
-int lookforTimesync(TFile *rootFile, Float_t *timesync, Float_t *obt_timesync) {
+UInt_t lookforTimesync(TFile *rootFile, Float_t *timesync, Float_t *obt_timesync) {
   *timesync = -1;  // will be != -1 if found
 
   ULong64_t        	nevents    = 0;
@@ -973,8 +979,10 @@
 }
 
 
-// Return a string like YYYY-MM-DD hh:mm:ss, a datetime format.
-string getTleDatetime(cTle *tle)
+//
+// Returns the tle date as a TTimeStamp object.
+//
+TTimeStamp getTleDatetime(cTle *tle)
 {
   int year, mon, day, hh, mm, ss;
   double dom; // day of month (is double!)
@@ -994,9 +1002,9 @@
   ss = (int) floor( ((((dom - day) * 24 - hh) * 60 - mm) * 60));
   //  ms = (int) floor( (((((dom - day) * 24 - hh) * 60 - mm) * 60) - ss) * 1000);
 
-  date << year << "-" << mon << "-" << day << " " << hh << ":" << mm << ":" << ss;
+  TTimeStamp t = TTimeStamp(year, mon, day, hh, mm, ss, 0, true);
 
-  return date.str();
+  return t;
 }
 
 //