Changeset 1800 in Sophya for trunk/ArchTOIPipe/Kernel

Timestamp:

Nov 29, 2001, 7:19:32 PM (24 years ago)

Author:

aubourg

Message:

GPH 424.1

Location:

trunk/ArchTOIPipe/Kernel

Files:

• fitstoirdr.cc (modified) (4 diffs)
• toiprocessor.h (modified) (4 diffs)

trunk/ArchTOIPipe/Kernel/fitstoirdr.cc

@@ -3 +3 @@
 //                               Christophe Magneville
 //                               Reza Ansari
-// $Id: fitstoirdr.cc,v 1.22 2001-11-26 15:13:48 aubourg Exp $
+// $Id: fitstoirdr.cc,v 1.23 2001-11-29 18:19:32 aubourg Exp $
 
 #include "fitstoirdr.h"
@@ -112 +112 @@
 
   snBegin = firstSn;
-  /*  if (forceMinIn > 0 && forceMinIn > snBegin) {
-    snBegin = forceMinIn;
-  }
-  */
+  if (forcedMinIn > 0 && forcedMinIn > snBegin) {
+    snBegin = forcedMinIn;
+  }
   openFile(allfn.back());
   snEnd = firstSn+nrows-1;
-  /*  if (forceMaxIn > 0 && forceMaxIn < snEnd) {
-    snEnd = forceMaxIn;
-    }*/
+  if (forcedMaxIn > 0 && forcedMaxIn < snEnd) {
+    snEnd = forcedMaxIn;
+  }
   cout << "FITSTOIReader range " << snBegin << " -> " << snEnd << endl;
 }
 
 int FITSTOIReader::calcMinOut() {
+  chkinit();
   TOIManager* mgr = TOIManager::getManager();
   int firstReq = mgr->getRequestedBegin();
@@ -131 +131 @@
 
 int FITSTOIReader::calcMaxOut() {
+  chkinit();
   TOIManager* mgr = TOIManager::getManager();
   int lastReq = mgr->getRequestedEnd();
@@ -259 +260 @@
    TOIManager* mgr = TOIManager::getManager();
    if(samplenum[0] > mgr->getRequestedEnd()) break;
+   if(samplenum[0] > forcedMaxIn) break;
    if(samplenum[ifin-ideb] < mgr->getRequestedBegin()) continue;
+   if(samplenum[ifin-ideb] < forcedMinIn) continue;
    if (ip == 0) { 
      for(int k=0; k<getNOut(); k++) {

trunk/ArchTOIPipe/Kernel/toiprocessor.h

@@ -5 +5 @@
 //                               Christophe Magneville
 //                               Reza Ansari
-// $Id: toiprocessor.h,v 1.17 2001-11-26 15:13:48 aubourg Exp $
+// $Id: toiprocessor.h,v 1.18 2001-11-29 18:19:32 aubourg Exp $
 
 
@@ -47 +47 @@
 public:
   virtual void run();
+
+  virtual int   getMinOut();
+  virtual int   getMaxOut();
   // Les methodes qui suivent peut etre appelees par run
 protected:
@@ -83 +86 @@
   virtual int   calcMinOut(); // Protected ?
   virtual int   calcMaxOut(); // Protected ?
-
-  virtual int   getMinOut();
-  virtual int   getMaxOut();
   int           minOut;    // Cache for calcMinOut() value. Protected ?
   int           maxOut;    // Cache for calcMaxOut() value. Protected ?
@@ -135 +135 @@
   TOIProcessor();
   virtual ~TOIProcessor();
+  
+  void setMinSn(int n) {forcedMinIn = n;}
+  void setMaxSn(int n) {forcedMaxIn = n;}
 
 protected: