Changeset 3188 in Sophya for trunk/SophyaExt

Timestamp:

Mar 17, 2007, 10:22:03 PM (19 years ago)

Author:

cmv

Message:

ajout des acces elements par elements cmv 9/03/2007

Location:

trunk/SophyaExt/FitsIOServer

Files:

• fabtcolread.cc (modified) (10 diffs)
• fabtcolread.h (modified) (2 diffs)

trunk/SophyaExt/FitsIOServer/fabtcolread.cc

@@ -1145 +1145 @@
  delete [] arr;
  return Naxis[0]*Naxis[1];
- }
+}
 
 /*! Read image into a TMatrix<int_4> */
@@ -1168 +1168 @@
  delete [] arr;
  return Naxis[0]*Naxis[1];
- }
+}
 
 /*! Read image into a TMatrix<int_8> */
@@ -1190 +1190 @@
  delete [] arr;
  return Naxis[0]*Naxis[1];
- }
+}
 
 /*! Read image into a TMatrix<float> */
@@ -1212 +1212 @@
  delete [] arr;
  return Naxis[0]*Naxis[1];
- }
+}
 
 /*! Read image into a TMatrix<double> */
@@ -1234 +1234 @@
  delete [] arr;
  return Naxis[0]*Naxis[1];
- }
+}
+
+/*! Read image pixel numcol,numrow with numcol=[0,Naxis1[ and numrow=[0,Naxis2[ */
+double FitsImg2DRd::Read(LONGLONG numcol, LONGLONG numrow)
+{
+ int sta=0;
+ if(numcol<0 || numrow<0 || numcol>=Naxis[0] || numrow>=Naxis[1])
+   throw
+     NotAvailableOperation("FitsImg2DRd::Read(col,row): bad col/row number\n");
+
+   LONGLONG deb = numrow*Naxis[0] + numcol + 1;
+   double val = 0.;
+   fits_read_img(GetFitsPtr(),TDOUBLE,deb,1,&NulVal,&val,NULL,&sta);
+
+   if(sta) {
+     FitsOpenFile::printerror(sta);
+     throw
+       NotAvailableOperation("FitsImg2DRd::Read(col,num): Error Reading Fits file\n");
+   }
+
+   return val;
+}
 
 ///////////////////////////////////////////////////////////////////
@@ -1469 +1490 @@
  delete [] arr;
  return Naxis[0]*Naxis[1]*Naxis[2];
- }
+}
 
 /*! Read 3D image into a TArray<int_4> */
@@ -1492 +1513 @@
  delete [] arr;
  return Naxis[0]*Naxis[1]*Naxis[2];
- }
+}
 
 /*! Read 3D image into a TArray<int_8> */
@@ -1514 +1535 @@
  delete [] arr;
  return Naxis[0]*Naxis[1]*Naxis[2];
- }
+}
 
 /*! Read 3D image into a TArray<float> */
@@ -1536 +1557 @@
  delete [] arr;
  return Naxis[0]*Naxis[1]*Naxis[2];
- }
+}
 
 /*! Read 3D image into a TArray<double> */
@@ -1558 +1579 @@
  delete [] arr;
  return Naxis[0]*Naxis[1]*Naxis[2];
- }
+}
+
+/*! Read 3D image pixel i,j,k with i=[0,Naxis1[ , j=[0,Naxis2[ , k=[0,Naxis3[ */
+double FitsImg3DRd::Read(LONGLONG i, LONGLONG j, LONGLONG k)
+{
+ int sta=0;
+ if(i<0 || j<0 || k<0 || i>=Naxis[0] || j>=Naxis[1] || k>=Naxis[2])
+   throw
+     NotAvailableOperation("FitsImg3DRd::Read(i,j,k): bad i/j/k number\n");
+
+   LONGLONG deb = Naxis[0]*(j+Naxis[1]*k)+i+1;
+   double val = 0.;
+   fits_read_img(GetFitsPtr(),TDOUBLE,deb,1,&NulVal,&val,NULL,&sta);
+
+   if(sta) {
+     FitsOpenFile::printerror(sta);
+     throw
+       NotAvailableOperation("FitsImg3DRd::Read(i,j,k): Error Reading Fits file\n");
+   }
+
+   return val;
+}
 
 ///////////////////////////////////////////////////////////////////

trunk/SophyaExt/FitsIOServer/fabtcolread.h

@@ -200 +200 @@
   LONGLONG Read(TMatrix<float>& data);
   LONGLONG Read(TMatrix<double>& data);
+  double   Read(LONGLONG numcol, LONGLONG numrow);
 
   //! Set debug level
@@ -264 +265 @@
   LONGLONG Read(TArray<float>& data);
   LONGLONG Read(TArray<double>& data);
+  double   Read(LONGLONG i, LONGLONG j, LONGLONG k);
 
   //! Set debug level