Changeset 2361 in Sophya for trunk/ArchTOIPipe/Kernel/fitsringrdr.cc

Timestamp:

Apr 17, 2003, 3:47:34 PM (22 years ago)

Author:

cecile

Message:

nouveaux tuyaux de ring : theta, phi puis Nsamples mesures

File:

• trunk/ArchTOIPipe/Kernel/fitsringrdr.cc (modified) (4 diffs)

trunk/ArchTOIPipe/Kernel/fitsringrdr.cc

@@ -2 +2 @@
 //                               Christophe Magneville
 //                               Reza Ansari
-// $Id: fitsringrdr.cc,v 1.4 2003-04-04 14:17:03 cecile Exp $
+// $Id: fitsringrdr.cc,v 1.5 2003-04-17 13:47:34 cecile Exp $
 
 #include "fitsringrdr.h"
@@ -74 +74 @@
 void FITSRingReader::init() {
 
-  declareOutput("CircTheta");
-  declareOutput("CircPhi");
   declareOutput("signal");
-  openFile(fname);
+  openFile(fname);  
 }
 
@@ -121 +119 @@
 
 void FITSRingReader::run() {
+    cout << "!!!!!!! RING " <<  endl;
 
   fits_lock();
@@ -142 +141 @@
     fits_read_key(fptr, TDOUBLE, "CIRPHI", &phi, commt, &fstatus);
     fits_read_key(fptr, TDOUBLE, "CIRAPER", &aperture, commt, &fstatus);
-    fits_read_key(fptr, TLONG, "NSAMPLES", &nSamples, commt, &fstatus);
+    fits_read_key(fptr, TLONG,   "NSAMPLES", &nSamples, commt, &fstatus);
     fits_unlock();
-    wontNeedBefore(ring*nSamples);
+    wontNeedBefore(ring*(nSamples+2));
     cout << "!!!!!!! RING " << ring << endl;
     
+    double data;
+    fits_lock();
+    putData(0, ring*(nSamples+2)+0,theta);
+    putData(0, ring*(nSamples+2)+1,phi);
+    fits_unlock();      
     for (int i=0; i<nSamples; i++) {
-      double data;
       fits_lock();
       fits_read_col_dbl(fptr,1,i+1,1,1,0,&data,&anyNul,&fstatus);
-      putData(0, ring*nSamples+i,theta);
-      putData(1, ring*nSamples+i,phi);
-      putData(2, ring*nSamples+i,data);
+      putData(0, ring*(nSamples+2)+2+i,data);
       fits_unlock();      
     }