Changeset 1480 in Sophya for trunk/ArchTOIPipe/Kernel

Timestamp:

Apr 27, 2001, 11:33:51 AM (24 years ago)

Author:

aubourg

Message:

join & merge

Location:

trunk/ArchTOIPipe/Kernel

Files:

• Makefile.in (modified) (2 diffs)
• fitstoirdr.cc (modified) (6 diffs)
• fitstoirdr.h (modified) (3 diffs)

trunk/ArchTOIPipe/Kernel/Makefile.in

@@ -62 +62 @@
 endif
 
+ifeq ($(CXX), cxx)
+  CXXFLAGS := $(CXXFLAGS) -ptr ../cxx_repository
+endif
+
 SRCFILES = toi.cc toimanager.cc toiprocessor.cc toiseqbuff.cc \
-           fitstoirdr.cc fitstoiwtr.cc asciitoiwtr.cc
+           fitstoirdr.cc fitstoiwtr.cc asciitoiwtr.cc \
+           toiregwindow.cc
 
 FILES=$(patsubst %.c,%.o,$(SRCFILES:.cc=.o))
@@ -72 +77 @@
 libatkern.a: $(FILES)
         $(AR) -cr libatkern.a $(FILES)
-        ln libatkern.a ../libatkern.a
+        ln -f libatkern.a ../libatkern.a
 
 clean:

trunk/ArchTOIPipe/Kernel/fitstoirdr.cc

@@ -6 +6 @@
 FITSTOIReader::FITSTOIReader(string fn) {
   fname = fn;
+  allfn.push_back(fn);
   cout << "FITSTOIReader::FITSTOIReader" << endl;
   cout << "FITSTOIReader::inited " << inited << endl;
   name = "rdr";
+  fptr = NULL;
 }
 
@@ -25 +27 @@
 }
 
-void FITSTOIReader::init() {
+void FITSTOIReader::openFile(string fn) {
   fits_lock();
-  cout << "FITSTOIReader::init FileName=" << fname << endl;
+  if (fptr) {
+    fits_close_file(fptr,&fstatus);
+    fptr = NULL;
+  }
+  fname = fn;
+  cout << "FITSTOIReader::open FileName=" << fname << endl;
   fstatus = 0;
   // Open file
@@ -48 +55 @@
   fits_movabs_hdu(fptr, 2, NULL, &fstatus);
   
-  int ncols;
   fits_get_num_cols(fptr,&ncols,&fstatus);
   fits_get_num_rows(fptr,&nrows,&fstatus);
 
   cout << "FITSTOIReader cols = " << ncols << " rows=" << nrows << endl;
+  int anyNul;
+  double y;
+  fits_read_col_dbl(fptr,1,1,1,1,0,&y,&anyNul,&fstatus);
+  firstSn = (int) (y+.1);
+  fits_unlock();  
+}
 
+void FITSTOIReader::init() {
+  openFile(allfn.front());
+
+  fits_lock();
   // Dans cette version, on s'attend a ce que la premiere colonne soit le samplenum
   for (int i=1; i<ncols; i++) {
@@ -64 +80 @@
     declareOutput(colname);
   }
-  int anyNul;
-  double y;
-  fits_read_col_dbl(fptr,1,1,1,1,0,&y,&anyNul,&fstatus);
-  firstSn = (int) (y+.1);
   fits_unlock();
+
+  snBegin = firstSn;
+
+  openFile(allfn.back());
+  snEnd = firstSn+nrows-1;
+  cout << "FITSTOIReader range " << snBegin << " -> " << snEnd << endl;
 }
 
@@ -74 +92 @@
   TOIManager* mgr = TOIManager::getManager();
   int firstReq = mgr->getRequestedBegin();
-  return firstSn > firstReq ? firstSn : firstReq;
+  return snBegin > firstReq ? snBegin : firstReq;
 }
 
@@ -80 +98 @@
   TOIManager* mgr = TOIManager::getManager();
   int lastReq = mgr->getRequestedEnd();
-  int lastSn  = firstSn + nrows - 1;
-  return lastSn < lastReq ? lastSn : lastReq;
+  return snEnd < lastReq ? snEnd : lastReq;
 }
 
+void FITSTOIReader::addFile(string fn) {
+  allfn.push_back(fn);
+}
 
 void FITSTOIReader::run() {
+  for (vector<string>::iterator i=allfn.begin(); i!=allfn.end(); i++) {
+    openFile(*i);
+    run1();
+  }
+}
+
+void FITSTOIReader::run1() {
   // Il faudrait optimiser en fonction de ce qui a ete demande comme samplenum,
   // mais cela implique de gerer aussi bien echant uniforme que non.

trunk/ArchTOIPipe/Kernel/fitstoirdr.h

@@ -6 +6 @@
 #include "toiprocessor.h"
 #include <string>
+#include <vector>
 #include "fitsio.h"
 
@@ -13 +14 @@
   FITSTOIReader(string fn);
   ~FITSTOIReader();
+
+  virtual void addFile(string fn);
+
   virtual void init();  
   virtual void run();  
@@ -20 +24 @@
   virtual int   calcMaxOut();
 
+  virtual void run1();
+  virtual void openFile(string fn);
+
 private:
-  string fname;
-  fitsfile *fptr;
-  int fstatus;
-  long nrows;
-  int firstSn;
+  fitsfile* fptr;
+  int       fstatus;
+  string    fname;   // current file
+  long      nrows;   // current file
+  int       firstSn; // current file
+
+  int       ncols;    
+  int       snBegin; // first file
+  int       snEnd;   // last file
+  
+  vector<string> allfn;
+
 };