Changeset 2353 in Sophya for trunk/ArchTOIPipe/Kernel

Timestamp:

Mar 26, 2003, 10:18:44 AM (23 years ago)

Author:

cecile

Message:

* empty log message *

Location:

trunk/ArchTOIPipe/Kernel

Files:

• fitsringrdr.cc (modified) (5 diffs)
• fitsringrdr.h (modified) (3 diffs)

trunk/ArchTOIPipe/Kernel/fitsringrdr.cc

@@ -2 +2 @@
 //                               Christophe Magneville
 //                               Reza Ansari
-// $Id: fitsringrdr.cc,v 1.1 2003-03-24 10:59:45 cecile Exp $
+// $Id: fitsringrdr.cc,v 1.2 2003-03-26 09:18:44 cecile Exp $
 
 #include "fitsringrdr.h"
@@ -15 +15 @@
   allfn.push_back(fn);
   cout<<"FITSRingReader::FITSRingReader"<<endl;
+  cout<<"FITSTOIReader::inited "<<inited<<" bsz="<<Buff_Sz<<endl;
   name = "rdr";
   fptr = NULL;
+  totnscount = 0;
 }
 
@@ -23 +25 @@
 
 
+void FITSRingReader::setBufferSize(int buffsz)
+{
+  Buff_Sz = (buffsz>0) ? buffsz: 1024;
+  return;
+}
+
 void FITSRingReader::openFile(string fn) {
+  cout << "(((((((((((((((((((((((((((((((((((((((((((" << endl;
+  
   fits_lock();
   if (fptr) {
@@ -65 +75 @@
 
 }
+
+int FITSRingReader::calcMinOut() {
+  chkinit();
+  TOIManager* mgr = TOIManager::getManager();
+  int firstReq = mgr->getRequestedBegin();
+  return snBegin > firstReq ? snBegin : firstReq;
+}
+
+int FITSRingReader::calcMaxOut() {
+  chkinit();
+  TOIManager* mgr = TOIManager::getManager();
+  int lastReq = mgr->getRequestedEnd();
+  return snEnd < lastReq ? snEnd : lastReq;
+}
+
+
+// ajout vf 31/07/2002
+bool FITSRingReader::checkSampleLimits(long& min, long& max, int pass)
+{
+  bool sample_ok=true;
+  chkinit();
+  return TOIProcessor::checkSampleLimits(min, max, pass);
+}
+
+void FITSRingReader::calcSampleLimits(long& min, long& max)
+{
+  chkinit(); 
+  cout << "calc  " << name << " in  " << min << " - " << max << " ; " << snBegin << " - " << snEnd << endl;
+  
+  min=min<snMin?snMin:min;
+  max=max>snMax?snMax:max;
+  snBegin=snMin;
+  snEnd=snMax;
+  cout << "calc  " << name << " out " << min << " - " << max << " ; " << snBegin << " - " << snEnd << endl;
+  //cout << "fitstoirdr : limites temporaires calculees : " << snBegin << " , " << snEnd << endl;
+
+}
+// fin ajout vf
+
+
+
 void FITSRingReader::run() {
 
@@ -108 +159 @@
   fits_unlock();
 }
+
+
+// affichage des limites
+void FITSRingReader::printLimits()
+{
+  cout << "fitsringrdr " << name <<" : limites calculees : " << snBegin << " , " << snEnd << endl;
+}
+

trunk/ArchTOIPipe/Kernel/fitsringrdr.h

@@ -6 +6 @@
 //                               Christophe Magneville
 //                               Reza Ansari
-// $Id: fitsringrdr.h,v 1.1 2003-03-24 10:59:45 cecile Exp $
+// $Id: fitsringrdr.h,v 1.2 2003-03-26 09:18:44 cecile Exp $
 
 #ifndef FITSRINGRDR_H
 #define FITSRINGRDR_H
 
-#include "toi.h"
+#include "config.h"
 #include "toiprocessor.h"
+#include <string>
+#include <vector>
+#include <map>
 #include "fitsio.h"
+#include "flagtoidef.h"
 
 class FITSRingReader : public TOIProcessor {
@@ -26 +30 @@
   void  init();
   void  run();
+
+  inline int_8  ProcessedSampleCount() const { return totnscount; }
+  virtual void printLimits();
+
+protected:
+  virtual int   calcMinOut();
+  virtual int   calcMaxOut();
   
-protected:
+  // ajout vf 31/07/2002
+  virtual bool checkSampleLimits(long& min, long& max, int pass);
+  virtual void calcSampleLimits(long& min, long& max);
+  virtual bool checkSampleLimits(int pass) {return TOIProcessor::checkSampleLimits(pass);}
+
   virtual void openFile(string fn);
+
+private:
   int nSamples;
   long nRings;
@@ -37 +54 @@
   int Buff_Sz; // buffer size = nSamples
   vector<string> allfn;
+  int_8 totnscount;   // Nombre total d'echantillon processe
 };