Changeset 634 in Sophya for trunk

Timestamp:

Nov 25, 1999, 9:34:50 AM (26 years ago)

Author:

ansari

Message:

linux-ppc, gcc 2.95.1

Location:

trunk/Poubelle/archTOI.old

Files:

• archtoi.cc (modified) (1 diff)
• archtoimain.cc (modified) (2 diffs)
• asigps.cc (modified) (1 diff)
• gyrocalibrator.cc (modified) (3 diffs)
• toi.cc (modified) (5 diffs)
• toiboloproducer.cc (modified) (5 diffs)
• toiboloproducer.h (modified) (1 diff)

trunk/Poubelle/archTOI.old/archtoi.cc

@@ -109 +109 @@
 {
   if (format == ascii_fmt) {
-    openFile   = &openFile_A;
-    outHeader  = &outHeader_A;
-    outValue   = &outValue_A;
-    endLine    = &endLine_A;
-    closeFile  = &closeFile_A;
+    openFile   = &ArchTOI::openFile_A;
+    outHeader  = &ArchTOI::outHeader_A;
+    outValue   = &ArchTOI::outValue_A;
+    endLine    = &ArchTOI::endLine_A;
+    closeFile  = &ArchTOI::closeFile_A;
   } else { // fits_fmt 
-    openFile   = &openFile_F;
-    outHeader  = &outHeader_F;
-    outValue   = &outValue_F;
-    endLine    = &endLine_F;
-    closeFile  = &closeFile_F;
+    openFile   = &ArchTOI::openFile_F;
+    outHeader  = &ArchTOI::outHeader_F;
+    outValue   = &ArchTOI::outValue_F;
+    endLine    = &ArchTOI::endLine_F;
+    closeFile  = &ArchTOI::closeFile_F;
   }
   

trunk/Poubelle/archTOI.old/archtoimain.cc

@@ -32 +32 @@
     }
     
-//    ProfilerInit(collectDetailed, bestTimeBase, 10000, 200);
+ //   ProfilerInit(collectDetailed, bestTimeBase, 10000, 200);
 
     if (argv[1] == string("-h")) {
@@ -49 +49 @@
     }
     
-//    ProfilerDump("\pprofiler.data");
+ //   ProfilerDump("\pprofiler.data");
     return(0);
 }

trunk/Poubelle/archTOI.old/asigps.cc

@@ -4 +4 @@
 #include "asigps.h"
 #include <fstream.h>
+#include <stdio.h>
 
 ASIGPS::ASIGPS(string const& filename) {

trunk/Poubelle/archTOI.old/gyrocalibrator.cc

@@ -139 +139 @@
     }
   }
+  
+  // Si nos fournisseurs ne peuvent pas, nous non plus...
+  map<TOI, TOIProducer*> & m = (*(neededTOIs.begin())).second;
+  for (map<TOI, TOIProducer*>::iterator i = m.begin(); i != m.end(); i++) {
+    TOI const& inToi = (*i).first;
+    TOIProducer* prod =  (*i).second;
+    if (!prod->canGetValue(sampleNum, inToi) && !prod->canGetValueLater(sampleNum, inToi)) return false;
+
+  }
+  
   if (lastFence1<0 || lastFence2<0) return true;
   if (sampleNum > lastFence2) return true;
@@ -170 +180 @@
 
 
-void GyroCalibrator::propagateLowBound(TOI const&, long /*sampleNum*/) {
+void GyroCalibrator::propagateLowBound(TOI const& toi, long sampleNum) {
    if (startSample < lastFence1) {
      if (gyro[0].size() > lastFence1 - startSample) {
@@ -180 +190 @@
      }
    }
+   TOIPullProducer::propagateLowBound(toi, sampleNum);
 }
 

trunk/Poubelle/archTOI.old/toi.cc

@@ -5 +5 @@
 #include "tokenizer.h"
 #include "archexc.h"
+#include <stdio.h>
 
 vector<TOI> TOI::alltois;
 
 TOI::TOI(string n, int i, string opts, string u) 
-: name(n), index(i), unit(u)
+: name(n), index(i), unit(u), ref(-1)
 {
   options = Tokenizer(opts).getTokenSet();
@@ -16 +17 @@
 
 TOI::TOI(string n, int i, string opts, string u, string reqopts) 
-: name(n), index(i), unit(u)
+: name(n), index(i), unit(u), ref(-1)
 {
   options = Tokenizer(opts).getTokenSet();
@@ -25 +26 @@
 
 TOI::TOI(string n, int i, set<string> opts, string u) 
-: name(n), options(opts), index(i), unit(u)
+: name(n), options(opts), index(i), unit(u), ref(-1)
 {
   findref();
@@ -31 +32 @@
 
 TOI::TOI(string s, string u) 
-: index(unspec), unit(u)
+: index(unspec), unit(u), ref(-1)
 {
   vector<string> v = Tokenizer(s).getTokenVector();
@@ -48 +49 @@
 }
 
+// $CHECK$ a optimiser avec hash ou arbre... 
 void TOI::findref() {
   for (vector<TOI>::iterator i = alltois.begin();

trunk/Poubelle/archTOI.old/toiboloproducer.cc

@@ -11 +11 @@
 
 TOIBoloProducer::TOIBoloProducer() {
-  possibleTOIs.insert(TOI(boloMuV, TOI::all, "linfilt sqfilt", "microVolts"));  
+  possibleTOIs.insert(TOI(boloMuV, TOI::all, "linfilt sqfilt total", "microVolts"));  
 }
 
@@ -24 +24 @@
 
 void TOIBoloProducer::dataFeed(TOIProducer* source, TOI const& toi, long sampleNum, double value) {
+ if (toi.name == "boloDACV") {
+    boloDacV[toi.index] = value;
+ }
+
+ if (toi.name == "boloRawMuV") {
   if (source->canGetValue(sampleNum-1, toi)) {
     value = (value + source->getValue(sampleNum-1, toi))/2.;
@@ -31 +36 @@
 
     TOI toi2(boloMuV, toi.index, "sqfilt", toi.unit);
-    computedValue(toi2, sampleNum, value);
+    if (isProducing(toi2))
+      computedValue(toi2, sampleNum, value);
+      
+    toi2.options.insert("total"); toi2.findref();
+    if (isProducing(toi2)) {
+      computedValue(toi2, sampleNum, boloDacV[toi.index] - value);
+    }
   }
   
@@ -51 +62 @@
     if (isProducing(toi2))
       computedValue(toi2, sampleNum - filtHalfRange, y);
+    toi2.options.insert("total"); toi2.findref();
+    if (isProducing(toi2)) {
+      computedValue(toi2, sampleNum - filtHalfRange, boloDacV[toi.index] - y);
+    }
     TOI toi3(boloMuV, toi.index, "", toi.unit);
     if (isProducing(toi3))
       computedValue(toi3, sampleNum - filtHalfRange, y);
+    toi2.options.insert("total"); toi2.findref();
+    if (isProducing(toi3)) {
+      computedValue(toi3, sampleNum - filtHalfRange, boloDacV[toi.index] - y);
+    }
   }
+ }
 }
 
@@ -61 +81 @@
   if (toi.name == boloMuV) {
     TOI toi2("boloRawMuV", toi.index);
-    //toi2.name = "boloRawMuV";
     t.insert(toi2);
   } else {
     throw ArchExc("Cannot produce "+toi.name);
+  }
+  if (toi.options.find("total") != toi.options.end()) {
+    TOI toi2("boloDACV", toi.index);
+    t.insert(toi2);
   }
   return t;

trunk/Poubelle/archTOI.old/toiboloproducer.h

@@ -18 +18 @@
   virtual set<TOI>     reqTOIFor(TOI const&);
   virtual void         propagateLowBound(TOI const&, long sampleNum);
+  map<int, double>     boloDacV;
   
   static int filtHalfRange;