Changeset 2360 in Sophya for trunk/ArchTOIPipe

Timestamp:

Apr 4, 2003, 4:17:37 PM (22 years ago)

Author:

cecile

Message:

OK

Location:

trunk/ArchTOIPipe

Files:

• Kernel/fitsringrdr.cc (modified) (5 diffs)
• ProcWSophya/ring2cout.cc (modified) (4 diffs)

trunk/ArchTOIPipe/Kernel/fitsringrdr.cc

@@ -2 +2 @@
 //                               Christophe Magneville
 //                               Reza Ansari
-// $Id: fitsringrdr.cc,v 1.3 2003-04-01 13:27:48 aubourg Exp $
+// $Id: fitsringrdr.cc,v 1.4 2003-04-04 14:17:03 cecile Exp $
 
 #include "fitsringrdr.h"
@@ -29 +29 @@
   Buff_Sz = (buffsz>0) ? buffsz: 1024;
   return;
+}
+
+void FITSRingReader::setNRings(long n) {
+  nRings = n;
 }
 
@@ -131 +135 @@
     sprintf(xname, "CRing_%d", ring);
 
-
     fits_lock();
     fits_movabs_hdu(fptr, ring+2, NULL, &fstatus);
@@ -141 +144 @@
     fits_read_key(fptr, TLONG, "NSAMPLES", &nSamples, commt, &fstatus);
     fits_unlock();
-
+    wontNeedBefore(ring*nSamples);
+    cout << "!!!!!!! RING " << ring << endl;
+    
     for (int i=0; i<nSamples; i++) {
       double data;
@@ -154 +159 @@
   
   fits_lock();
-  if (fptr) {
-    fits_close_file(fptr,&fstatus);
-    fptr = NULL;
-  }
+  fits_report_error(stderr, fstatus);
+  fits_close_file(fptr,&fstatus);
   fits_unlock();
 }

trunk/ArchTOIPipe/ProcWSophya/ring2cout.cc

@@ -3 +3 @@
 //                               Christophe Magneville
 //                               Reza Ansari
-// $Id: ring2cout.cc,v 1.3 2003-04-01 13:27:48 aubourg Exp $
+// $Id: ring2cout.cc,v 1.4 2003-04-04 14:17:37 cecile Exp $
 
 #include "toimanager.h"
@@ -13 +13 @@
 
 ////////////////////////////////////////////////////////////////////////
-Ring2cout::Ring2cout(long n)
-  :totnscount(0), nRings(1)
+Ring2cout::Ring2cout(long ns, long nr)
+  :totnscount(0)
 {
-  setNSamples(n);
+  setNSamples(ns);
+  setNRings(nr);
 }
 
@@ -40 +41 @@
 void Ring2cout::run() {
 
-  cout << "///////////////////////////////// coucou !" << endl;
-  
-  
-
 //---------------------------------------------------------
 try {
   uint_4 mSnRead=0, mSnFilled=0, BadCoorRange=0;
+
+  cout << " ring " << Nrings << " ns " << Nsamples<< endl;
   double ctheta[Nsamples],cphi[Nsamples],val[Nsamples];
-
-  for (int k=0; k<nRings; k++) {
+  for (int k=0; k<Nrings; k++) {
     
     getData(0,k*Nsamples,Nsamples,ctheta);
@@ -55 +53 @@
     getData(2,k*Nsamples,Nsamples,val);
     mSnRead ++;
-    wontNeedBefore(k*Nsamples);
     
-    cout << " ring " << k << endl;
-    for (int i=i; i< Nsamples;i++)
-      cout << ctheta[i] << " " << cphi[i]<< " " << val[i]<< endl;
-    totnscount++;
+    for (int i=0; i< Nsamples;i++)
+      cout << Nrings << " " << k <<" " << i <<" " << ctheta[i] << " " << cphi[i]<< " " << val[i]<< endl;
+    totnscount+=Nsamples;
     
   }
-  
-  cout<<"RING2Toi::run: Samples Read "<<mSnRead
+ 
+  cout<<"RING2cout::run: Samples Read "<<mSnRead
       <<" Filled "<<mSnFilled
       <<" BadCoorRange="<<BadCoorRange<<endl;