Changeset 408 in Sophya for trunk/Poubelle

Timestamp:

Sep 22, 1999, 10:57:36 AM (26 years ago)

Author:

ansari

Message:

nouvelles toi

Location:

trunk/Poubelle/archTOI.old

Files:

• archeopsfile.cc (modified) (1 diff)
• archeopsfile.h (modified) (1 diff)
• archtoi.cc (modified) (1 diff)
• toiiter.cc (modified) (4 diffs)
• toiiter.h (modified) (1 diff)
• toisvr.cc (modified) (2 diffs)

trunk/Poubelle/archTOI.old/archeopsfile.cc

@@ -881 +881 @@
 }
 
+double ArcheopsFile::getMuVBolo2(int ibolo, int imesure) { // microvolts, filtre 
+  // On commence par trouver la valeur d'offset, en fittant une droite sur les soustractions
+  if (!lastBolo() || !llastBolo()) return 0;
+  block_type_reglage* reglage = lastReglage();
+  block_type_param*   param = lastParam();
+  if (!reglage) return 0;
+  if (!param) return 0;
+  double sumx=0, sumy=0, sumxy=0, sumx2=0;
+  int n=20;
+  int s = imesure % 2 ? 1 : -1;
+  for (int i=1; i<=n; i++) {
+    double x = -i;
+    double y = s*(getRawBolo(ibolo, imesure-i+1) - getRawBolo(ibolo, imesure-i))/2;
+    s = -s;
+    sumx += x;
+    sumy += y;
+    sumxy += x*y;
+    sumx2 += x*x;
+  }
+  double a = (sumxy/n - (sumx/n)*(sumy/n)) / (sumx2/n - (sumx/n)*(sumx/n));
+  double b = (sumy/n) - a*(sumx/n);
+  s = imesure % 2 ? 1 : -1;
+  double y = getRawBolo(ibolo, imesure);
+  y = y-s*b;
+  return bol_micro_volt(y,(double)param->param.bolo[ibolo].bolo_gain*gain_ampli(reglage->reglage.bolo[ibolo]));
+}
+
 double ArcheopsFile::getGainAmpli(int ibolo) {
      return gain_ampli(lastReglage()->reglage.bolo[ibolo]);
 }
+
+#define capa(uu)        ((parametr.bolo[uu].bolo_bebo==10)?0.000868 * (double)parametr.bolo[uu].bolo_capa:0.001 * (double)parametr.bolo[uu].bolo_capa)          // capa en pF
+#define pt_micA(uu)     ((4096. * 22. * 20.) / capa(uu) )                       //  pts / micro Amperes
+
+
+#define pt_micV(uu)     (((double)parametr.bolo[uu].bolo_diviseur) / 2441.)     // pts / microvolt
+
+
+double ArcheopsFile::getDACV(int ibolo) {
+  double dacV = dac_V(lastReglage()->reglage.bolo[ibolo]);
+  param_bolo& parametr = lastParam()->param;
+  return dacV / pt_micV(ibolo);
+}
+
+double ArcheopsFile::getDACI(int ibolo) {
+  double dacI = dac_I(lastReglage()->reglage.bolo[ibolo]);
+  param_bolo& parametr = lastParam()->param;
+  return dacI / pt_micA(ibolo);
+}
+
 
 // SST, gyros...

trunk/Poubelle/archTOI.old/archeopsfile.h

@@ -131 +131 @@
   long getRawBolo(int ibolo, int imesure);   // donnee brute, avec seulement soustraction offset
   double getMuVBolo(int ibolo, int imesure); // microvolts, filtre avec filtre carre
+  double getMuVBolo2(int ibolo, int imesure); // microvolts, filtre +sioux
   double getGainAmpli(int ibolo);
+  double getDACV(int ibolo); // offset en microvolt
+  double getDACI(int ibolo); // courant en picoAmps
   
   // SST, gyros, etc

trunk/Poubelle/archTOI.old/archtoi.cc

@@ -94 +94 @@
     allBolos=true;
   } else if (key == "#REQVERSION") {
+    if (requestVersion != "") {
+      cerr << "Error. Duplicate #REQVERSION option" << endl;
+      exit(-1);
+    }
     requestVersion = arg;
   } else if (key == "#COMMENT") {

trunk/Poubelle/archTOI.old/toiiter.cc

@@ -221 +221 @@
         break;
       case boloGainAmpli:
+      case boloDACV:
+      case boloDACI:
         trigMask |= block_reglage_mask;
         break;
@@ -440 +442 @@
      return file->lastBolo() != NULL;
    case boloGainAmpli:
+   case boloDACV:
+   case boloDACI:
      return file->lastReglage() != NULL;
    case sstDiode:
@@ -517 +521 @@
    case boloTens:
      return file->getMuVBolo(index, imes);
+   case boloTens2:
+     return file->getMuVBolo2(index, imes);
    case boloRaw:
      return file->getRawBolo(index, imes);
    case boloGainAmpli:
      return file->getGainAmpli(index);
+   case boloDACV:
+     return file->getDACV(index);
+   case boloDACI:
+     return file->getDACI(index);
    case sstDiode:
      return file->getSSTSignal(index, imes);
@@ -578 +588 @@
        return true;
      case boloTens:
+     case boloTens2:
        return file->blockNum() == file->getBoloBlockNum();
      case boloRaw:
        return file->blockNum() == file->getBoloBlockNum();
      case boloGainAmpli:
+       return file->blockNum() == file->getReglageBlockNum() && imes==0;
+     case boloDACI:
+     case boloDACV:
        return file->blockNum() == file->getReglageBlockNum() && imes==0;
      case sstChannel:

trunk/Poubelle/archTOI.old/toiiter.h

@@ -24 +24 @@
   boloTemp,      // Kelvins, need R(T) -> N/A
   boloGainAmpli, // gain de l'ampli du bolo
+  boloDACV,      // tension de reference du DAC (microVolts)
+  boloDACI,      // courant (picoAmps)
   boloRawCN,     // compression noise on bolo raw
   boloTens2T,    // total, microVolts, avec consigne DAC

trunk/Poubelle/archTOI.old/toisvr.cc

@@ -105 +105 @@
     else tsttoi(boloTemp)
     else tsttoi(boloGainAmpli)
+    else tsttoi(boloDACV)
+    else tsttoi(boloDACI)
     else tsttoi(boloTens2T)
     else tsttoi(boloRawCN)
@@ -202 +204 @@
     gps->FitsDump("GPSDump.fits");
     useAuxGPS(gps);
+  } else if (key == "#INCLUDE") {
+    readReq(ifstream(arg.c_str()));
   } else {
     // cerr << "*Warning, unrecognized option " << line << endl;