Changeset 410 in Sophya

Timestamp:

Sep 22, 1999, 2:35:06 PM (26 years ago)

Author:

ansari

Message:

nouvelles toi

Location:

trunk/Poubelle/archTOI.old

Files:

• archeopsfile.cc (modified) (3 diffs)
• archeopsfile.h (modified) (2 diffs)
• toiiter.cc (modified) (5 diffs)
• toiiter.h (modified) (1 diff)
• toisvr.cc (modified) (1 diff)

trunk/Poubelle/archTOI.old/archeopsfile.cc

@@ -777 +777 @@
 }
 
+int ArcheopsFile::getDilutionBlockNum() {
+  if (!lastDilution()) return -1;
+  return numero_block(lastDilution());
+}
+
 
 int ArcheopsFile::getSSTBlockNum() {
@@ -938 +943 @@
 }
 
+double ArcheopsFile::getBoloRes(int ibolo, int imesure) {
+  double i = getDACI(ibolo); // microAmps
+  double v = getMuVBolo2T(ibolo, imesure); // microVolts
+  double r = v/i; // Ohms
+  return r;
+}
+
+// Dilution
+
+int4 ArcheopsFile::getADCDil(int iADC) {
+  block_type_dilution* blk = lastDilution();
+  if (!blk) return 0;
+  if (iADC < 0 || iADC > 47) return 0;
+  return blk->ADC_dil[iADC];
+}
+
+int4 ArcheopsFile::getSwitchDil() {
+  block_type_dilution* blk = lastDilution();
+  if (!blk) return 0;
+  return blk->switch_dil;
+}
+
+
 // SST, gyros...
 
@@ -951 +979 @@
   return blockSet->sstHandler.getRawSignal(imesure, idiode);
 }
+
+long ArcheopsFile::getSSTSignalCN(int idiode, int imesure) {
+
+}
+
+long ArcheopsFile::getSSTRawSignalCN(int idiode, int imesure) {
+
+}
+
+
 
 double ArcheopsFile::getSSTStarZ(int istar, int imesure) {

trunk/Poubelle/archTOI.old/archeopsfile.h

@@ -134 +134 @@
   double getGainAmpli(int ibolo);
   double getDACV(int ibolo); // offset en microvolt
-  double getDACI(int ibolo); // courant en picoAmps
+  double getDACI(int ibolo); // courant en microAmps
   double getMuVBolo2T(int ibolo, int imesure); // avec soustraction dacV
+  double getBoloRes(int ibolo, int imesure); // Ohms
+  
+  // Dilution
+  int getDilutionBlockNum();
+  int4 getADCDil(int iADC);
+  int4 getSwitchDil();
   
   // SST, gyros, etc
@@ -142 +148 @@
   long getSSTRawSignal(int iDiode, int imesure);
   long getSSTSignal(int iDiode, int imesure);
+  long getSSTRawSignalCN(int iDiode, int imesure);
+  long getSSTSignalCN(int iDiode, int imesure);
   double getSSTStarZ(int iStar, int imesure);
   double getSSTStarF(int iStar, int imesure);

trunk/Poubelle/archTOI.old/toiiter.cc

@@ -214 +214 @@
       case boloTens2:
       case boloRaw:
+      case boloRawCN:
+        trigMask |= block_bolo_mask;
+        break;
+      case boloTens2T:
       case boloRes:
       case boloTemp:
-      case boloRawCN:
-      case boloTens2T:
-        trigMask |= block_bolo_mask;
-        break;
+         trigMask |= block_bolo_mask | block_reglage_mask;
+        break;
+     case dilDAC:
+      case dilSwitch:
+        trigMask |= block_dilution_mask;
       case boloGainAmpli:
       case boloDACV:
@@ -445 +450 @@
    case boloDACI:
      return file->lastReglage() != NULL;
+   case dilDAC:
+   case dilSwitch:
+     return file->lastDilution() != NULL;
    case sstDiode:
    case sstChannel:
@@ -531 +539 @@
    case boloDACI:
      return file->getDACI(index);
+   case boloTens2T:
+     return file->getMuVBolo2T(index, imes);
+   case boloRes:
+     return file->getBoloRes(index, imes);
+   case dilDAC:
+     return file->getADCDil(index);
+   case dilSwitch:
+     return file->getSwitchDil();
    case sstDiode:
      return file->getSSTSignal(index, imes);
@@ -589 +605 @@
      case boloTens:
      case boloTens2:
+     case boloTens2T:
+     case boloRes:
        return file->blockNum() == file->getBoloBlockNum();
      case boloRaw:
@@ -597 +615 @@
      case boloDACV:
        return file->blockNum() == file->getReglageBlockNum() && imes==0;
+     case dilDAC:
+     case dilSwitch:
+       return file->blockNum() == file->getDilutionBlockNum() && imes==0;
      case sstChannel:
      case sstDiode:

trunk/Poubelle/archTOI.old/toiiter.h

@@ -21 +21 @@
   boloTens2,     // tension en microVolts, avec soustraction offset filtre
   boloRaw,       // tension brute en microVolts, non filtree indexe par bolometre, sans chgt signe
-  boloRes,       // Resistance, ohms
   boloTemp,      // Kelvins, need R(T) -> N/A
   boloGainAmpli, // gain de l'ampli du bolo
   boloDACV,      // tension de reference du DAC (microVolts)
-  boloDACI,      // courant (picoAmps)
+  boloDACI,      // courant (microAmps)
   boloRawCN,     // compression noise on bolo raw
   boloTens2T,    // total, microVolts, avec consigne DAC
+  boloRes,       // Resistance, ohms
+  dilDAC,        // dilution DAC, index = 0-47
+  dilSwitch,     // dilution, mot de 32 bits
   sstDiode,      // signal brut SST, indice = diode, 0-45
   sstChannel,    // signal brut SST, indice = canal, 0-47

trunk/Poubelle/archTOI.old/toisvr.cc

@@ -109 +109 @@
     else tsttoi(boloTens2T)
     else tsttoi(boloRawCN)
+    else tsttoi(dilDAC)
+    else tsttoi(dilSwitch)
     else tsttoi(sstDiode)
     else tsttoi(sstChannel)