Changeset 432 in Sophya for trunk/Poubelle/archTOI.old/toisvr.cc

Timestamp:

Sep 24, 1999, 4:06:09 PM (26 years ago)

Author:

ansari

Message:

en cours

File:

• trunk/Poubelle/archTOI.old/toisvr.cc (modified) (9 diffs)

trunk/Poubelle/archTOI.old/toisvr.cc

@@ -36 +36 @@
 
   
-void TOISvr::setTimeInterval(double tStart, double tEnd) {
+void TOISvr::setMJDInterval(double tStart, double tEnd) {
   if (tStart>0) iter.tStart = tStart;
   if (tEnd>0)   iter.tEnd = tEnd;
 }
+
+void TOISvr::setUTCInterval(double tStart, double tEnd) {
+  if (tStart>0) iter.utcStart = tStart;
+  if (tEnd>0)   iter.utcEnd = tEnd;
+}
+
+void TOISvr::setSNInterval(long tStart, long tEnd) {
+  if (tStart>0) iter.sStart = tStart;
+  if (tEnd>0)   iter.sEnd = tEnd;
+}
+
 
 void TOISvr::setUnderSample(int n) {
@@ -110 +121 @@
     else tsttoi(internalTime)
     else tsttoi(mjd)
-    else tsttoi(boloTens)
-    else tsttoi(boloTens2)
-    else tsttoi(boloRaw)
+    else tsttoi(mutc)
+    else tsttoi(boloMuV)
+    else tsttoi(boloMuV2)
+    else tsttoi(boloRawMuV)
     else tsttoi(boloRes)
     else tsttoi(boloTemp)
@@ -118 +130 @@
     else tsttoi(boloDACV)
     else tsttoi(boloDACI)
-    else tsttoi(boloTens2T)
-    else tsttoi(boloRawCN)
-    else tsttoi(boloTensCN)
+    else tsttoi(boloMuV2T)
+    else tsttoi(boloRawMuVCN)
     else tsttoi(dilDAC)
     else tsttoi(dilSwitch)
+    else tsttoi(serviceTemp)
     else tsttoi(sstDiode)
     else tsttoi(sstChannel)
@@ -132 +144 @@
     else tsttoi(sstStarT)
     else tsttoi(gyroRaw)
-    else tsttoi(gyroTens)
+    else tsttoi(gyroV)
     else tsttoi(gyroSpeed)
     else tsttoi(gpsTime)
@@ -139 +151 @@
     else tsttoi(altitude)
     else tsttoi(tsid)
-    else tsttoi(azimutBolo)
-    else tsttoi(alphaAxis)
-    else tsttoi(deltaAxis)
+    else tsttoi(azimuthBolo)
+    else tsttoi(alphaRotAxis)
+    else tsttoi(deltaRotAxis)
     else tsttoi(alphaSst)
     else tsttoi(deltaSst)
+    else tsttoi(alphaZenith)
+    else tsttoi(deltaZenith)
+    else tsttoi(alphaFPAxis)
+    else tsttoi(deltaFPAxis)
     else tsttoi(alphaBolo)
     else tsttoi(deltaBolo)
@@ -150 +166 @@
       return false;
     }
-    if (kind  == sampleNum || kind == mjd) notrig = true;
+    if (kind  == sampleNum || kind == mjd || kind == mutc) notrig = true;
     string toiname = keyw.substr(1); 
     while (args != "") {
       if (args[0] == ' ') {
-        args = args.substr(args.find_first_not_of(' '));
+        x = args.find_first_not_of(' ');
+        if (x==string::npos) break;
+        args = args.substr(x);
         if (args == "") break;
       }
@@ -196 +214 @@
     arg = arg.substr(arg.find_first_not_of(' '));
   }
-  if (key == "#TRANGE") {
+  if (key == "#MJDRANGE") {
     double tmin, tmax;
     sscanf(arg.c_str(), "%lg %lg", &tmin, &tmax);
-    setTimeInterval(tmin, tmax);
+    setMJDInterval(tmin, tmax);
+  } else if (key == "#UTCRANGE") {
+    double tmin, tmax;
+    sscanf(arg.c_str(), "%lg %lg", &tmin, &tmax);
+    setUTCInterval(tmin, tmax);
+  } else if (key == "#SNRANGE") {
+    long tmin, tmax;
+    sscanf(arg.c_str(), "%ld %ld", &tmin, &tmax);
+    setSNInterval(tmin, tmax);
   } else if (key == "#PATH") {
     setDirectory(arg);
@@ -212 +238 @@
     sscanf(arg.c_str(), "%lg", &t0);
     archParam.acq.tBlock0 = t0;
+  } else if (key == "#UTCORIGIN") {
+    double t0;
+    sscanf(arg.c_str(), "%lg", &t0);
+    archParam.acq.utcOrigin = t0;
   } else if (key == "#PERECH") {
     double t0;
@@ -235 +265 @@
   processRequest("#MJD0 1376.8358818");
   processRequest("#PERECH 0.005836818076");
+  processRequest("#UTCORIGIN 1376.5");
   processRequest("#ASIGPS ASI_GPS_archeops1999.ascii");
   processRequest("#COMMENT Archtoi -- 23 september 1999 -- Eric Aubourg CEA/DAPNIA");