Changeset 407 in Sophya for trunk/Poubelle/archTOI.old/archtoi.cc

Timestamp:

Sep 18, 1999, 2:08:23 PM (26 years ago)

Author:

ansari

Message:

apres grenoble

File:

• trunk/Poubelle/archTOI.old/archtoi.cc (modified) (8 diffs)

trunk/Poubelle/archTOI.old/archtoi.cc

@@ -12 +12 @@
 #include "archtoi.h"
 #include "archparam.h"
-#include "asigps.h"
 
 using namespace std; 
@@ -39 +38 @@
 {
   init();
-  readReq(str);
+  svr.readReq(str);
 }
 
@@ -47 +46 @@
   init();
   ifstream str(filename.c_str());
-  readReq(str);
+  svr.readReq(str);
 }
 
@@ -57 +56 @@
   fptr = NULL;
   ostr = NULL;
-}
-
-void ArchTOI::readReq(istream& str)
-{
-   string line;
-   while (str) {
-     getline(str,line);
-     if (!str) break;
-     if (line[0] == '@') processTOIReq(line);
-     else if (line[0] == '#') 
-       if (!processOption(line)) break;
-   }
-}
-
-#define tsttoi(toi)   if (key == "@"#toi) kind = toi;
-
-void ArchTOI::processTOIReq(string line)
-{
-  // find TOI kind, index and options
-  TOIKind kind= (TOIKind)-1;
-  int index=-1;
-  bool interp=false;
-  bool repet =false;
-  bool flag  =false;
-  bool notrig=false;
-  int x = line.find(' ');
-  string key = line.substr(0, x);
-  string opts = (x>0) ? line.substr(x) : string("");
-  tsttoi(sampleNum)
-  else tsttoi(internalTime)
-  else tsttoi(mjd)
-  else tsttoi(boloTens)
-  else tsttoi(boloRaw)
-  else tsttoi(sstDiode)
-  else tsttoi(sstChannel)
-  else tsttoi(sstStarCnt)
-  else tsttoi(sstStarZ)
-  else tsttoi(sstStarF)
-  else tsttoi(sstStarT)
-  else tsttoi(gyroRaw)
-  else tsttoi(gpsTime)
-  else tsttoi(longitude)
-  else tsttoi(latitude)
-  else tsttoi(altitude)
-  else tsttoi(tsid)
-  else tsttoi(azimut)
-  else tsttoi(alphaAxis)
-  else tsttoi(deltaAxis)
-  else tsttoi(alphaBolo)
-  else tsttoi(deltaBolo)
-  else {
-    cerr << "*Warning, unrecognized TOI " << line << endl;
-    return;
-  }
-  if (kind  == sampleNum) notrig = true;
-  while (opts != "") {
-    if (opts[0] == ' ') {
-      opts = opts.substr(opts.find_first_not_of(' '));
-      if (opts == "") break;
-    }
-    x = opts.find(' ');
-    string opt = opts.substr(0, x);
-    opts = (x>0) ? opts.substr(x) : string("");
-    if (opt[0]>='0' && opt[0]<='9') {
-      index = atoi(opt.c_str());
-    } else if (opt == "notrig") {
-      notrig = true;
-    } else if (opt == "repet") {
-      repet = true; interp = false;
-    } else if (opt == "interp") {
-      interp = true; repet = false;
-    } else if (opt == "flag") {
-      flag = true;
-    }
-  }
+  requestVersion = "";
+  svr.registerReqHandler(this);
+}
+
+
+bool ArchTOI::processTOIReq(string line, string toiname, TOIKind /*kind*/, int index, 
+                            bool interp, bool repet, bool flag, bool /*notrig*/)
+{
   headertoi.push_back(line);
-  string toiname = key.substr(1); 
   if (index>=0) {
     char idx[10]; 
@@ -144 +75 @@
   toinames.push_back(toiname);
   toiflags.push_back(flg((flag?hasflag:0)+((!repet&&!interp)?useNA:0)));
-  if (index<0) index=0;
-  svr.AddInfo(kind, index, !notrig, interp);
+  return true;
 } 
 
-bool ArchTOI::processOption(string line)
-{
-  int x = line.find(' ');
-  string key = line.substr(0, x);
-  string arg = (x>0) ? line.substr(x) : string("");
+bool ArchTOI::processOption(string key, string arg)
+{
+  string line=key; if (arg != "") line = line + " " + arg;
+  headeropt.push_back(line);
   if (arg.length()>0 && arg[0] == ' ') {
     arg = arg.substr(arg.find_first_not_of(' '));
@@ -160 +89 @@
   } else if (key == "#FITS") {
     format = fits_fmt;
-  } else if (key == "#TRANGE") {
-    double tmin, tmax;
-    sscanf(arg.c_str(), "%lg %lg", &tmin, &tmax);
-    svr.SetTimeInterval(tmin, tmax);
-  } else if (key == "#PATH") {
-    svr.SetDirectory(arg);
-  } else if (key == "#FILE") {
-    svr.AddFile(arg);
   } else if (key == "#UNDEF") {
     undef=arg;
   } else if (key == "#ALLBOLOS") {
     allBolos=true;
-  } else if (key == "#RECORDER") {
-    svr.OnBoardRecorderFiles(true);
-  } else if (key == "#MJD0") {
-    double t0;
-    sscanf(arg.c_str(), "%lg", &t0);
-    archParam.acq.tBlock0 = t0;
-  } else if (key == "#PERECH") {
-    double t0;
-    sscanf(arg.c_str(), "%lg", &t0);
-    archParam.acq.perEch = t0;
-  } else if (key == "#ASIGPS") {
-    ASIGPS* gps = new ASIGPS(arg);
-    gps->FitsDump("GPSDump.fits");
-    svr.UseAuxGPS(gps);
-  } else if (key == "#END") {
+  } else if (key == "#REQVERSION") {
+    requestVersion = arg;
+  } else if (key == "#COMMENT") {
+    comments.push_back(arg);
+  } else {
     return false;
-  } else {
-    cerr << "*Warning, unrecognized option " << line << endl;
-    return true;
-  }
-  
-  headeropt.push_back(line);
+  }
+  
   return true;
 }
@@ -215 +122 @@
   
   cout << "starting query" << endl;
-  TOIIter iter = svr.DoQuery();
+  TOIIter iter = svr.doQuery();
   (this->*openFile)(outfilename);
   (this->*outHeader)(iter);
@@ -388 +295 @@
     //fits_write_key(fptr, TINT, "BOLO", &j, NULL, &fitsStatus);
   }
+  fits_write_key_str(fptr, "TOIVERS", ARCHTOI_VERS, "Archtoi version",&fitsStatus);
+  fits_write_key_str(fptr, "TOITAG", ARCHTOI_TAG, "Archtoi cvs tag",&fitsStatus);
+  if (requestVersion != "")
+    fits_write_key_str(fptr, "REQVERS", (char*) requestVersion.c_str(), 
+                       "Request options version",&fitsStatus);
   fits_write_comment(fptr, "Generated with archtoi " ARCHTOI_VERS, &fitsStatus);
   char line[80];
   sprintf(line, "using archeops.h %d", version_num);
   fits_write_comment(fptr, line, &fitsStatus);
+  for (list<string>::iterator i = comments.begin(); i!=comments.end(); i++)
+    fits_write_comment(fptr, (char*)((*i).c_str()), &fitsStatus);
   
   fitsLine = 1;