Changeset 413 in Sophya for trunk/Poubelle

Timestamp:

Sep 22, 1999, 4:38:57 PM (26 years ago)

Author:

ansari

Message:

nouvelles toi

Location:

trunk/Poubelle/archTOI.old

Files:

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

trunk/Poubelle/archTOI.old/archeopsfile.cc

@@ -772 +772 @@
 }
 
+int ArcheopsFile::getBoloCompBlockNum() {
+  if (!lastBolo()) return -1;
+  return numero_block(lastBoloComp());
+}
+
 int ArcheopsFile::getReglageBlockNum() {
   if (!lastReglage()) return -1;
@@ -787 +792 @@
   return numero_block(lastSST());
 }
+
+int ArcheopsFile::getSSTCompBlockNum() {
+  if (!lastSST()) return -1;
+  return numero_block(lastSSTComp());
+}
+
 
 

trunk/Poubelle/archTOI.old/archeopsfile.h

@@ -129 +129 @@
   int getReglageBlockNum();
   int getBoloBlockNum();
+  int getBoloCompBlockNum();
   long getRawBolo(int ibolo, int imesure);   // donnee brute, avec seulement soustraction offset
   double getMuVBolo(int ibolo, int imesure); // microvolts, filtre avec filtre carre
@@ -145 +146 @@
   // SST, gyros, etc
   int getSSTBlockNum();
+  int getSSTCompBlockNum();
   void needSSTProcessMask(int mask);
   long getSSTRawSignal(int iDiode, int imesure);

trunk/Poubelle/archTOI.old/toiiter.cc

@@ -629 +629 @@
      case sstStarT:
        return file->blockNum() == file->getSSTBlockNum();
+     case sstChannelCN:
+     case sstDiodeCN:
+       return file->blockNum() == file->getSSTCompBlockNum();
      case gyroRaw:
      case gyroTens: