Changeset 3493 in Sophya for trunk/SophyaExt/FitsIOServer

Timestamp:

Apr 30, 2008, 3:12:10 PM (17 years ago)

Author:

ansari

Message:

1/ Ajout methodes FitsArrayHandler<T>::ReadAtOffset() WriteAtOffset() pour lecture/ecriture de tableaux <> HDU IMAGE par morceaux
2/ Ajout entete commentaire avec copyright LAL+DAPNIA dans les fichiers .h

Reza 30/04/2008

Location:

trunk/SophyaExt/FitsIOServer

Files:

• fabtcolread.h (modified) (1 diff)
• fabtwriter.h (modified) (1 diff)
• fboloread.h (modified) (1 diff)
• fbtntintf.h (modified) (1 diff)
• fiosinit.cc (modified) (1 diff)
• fiosinit.h (modified) (2 diffs)
• fitsarrhand.h (modified) (5 diffs)
• fitsblkrw.h (modified) (3 diffs)
• fitsfile.h (modified) (1 diff)
• fitsgenedata.h (modified) (1 diff)
• fitshandler.h (modified) (1 diff)
• fitshdtable.h (modified) (1 diff)
• fitshisterr.h (modified) (1 diff)
• fitshistos.h (modified) (1 diff)
• fitsinoutfile.h (modified) (2 diffs)
• fitsioserver.h (modified) (1 diff)
• fitslocalmap.h (modified) (1 diff)
• fitsmanager.h (modified) (1 diff)
• fitsntuple.h (modified) (1 diff)
• fitsspherehealpix.h (modified) (1 diff)
• fitsspherethetaphi.h (modified) (1 diff)
• fitsswapper.h (modified) (1 diff)
• swfitsdtable.h (modified) (2 diffs)

trunk/SophyaExt/FitsIOServer/fabtcolread.h

@@ +1 @@
+/*    
+   --- SOPHYA software - FitsIOServer module ---
+   C. Magneville, 2001 
+   (C) UPS+LAL IN2P3/CNRS     (C) DAPNIA-SPP/CEA 
+*/
 /* Interface Fits BINARY/ASCII Table Column Reader    cmv 26/09/2001 */
 #ifndef FABTCOLREAD_H_SEEN

trunk/SophyaExt/FitsIOServer/fabtwriter.h

@@ +1 @@
+/*    
+   --- SOPHYA software - FitsIOServer module ---
+   C. Magneville, 2001 
+   (C) UPS+LAL IN2P3/CNRS     (C) DAPNIA-SPP/CEA 
+*/
 /* Interface Fits BINARY/ASCII Table Writer    cmv 26/09/2001 */
 #ifndef FABTWRITER_H_SEEN

trunk/SophyaExt/FitsIOServer/fboloread.h

@@ +1 @@
+/*    
+   --- SOPHYA software - FitsIOServer module ---
+   C. Magneville, 2001 
+   (C) UPS+LAL IN2P3/CNRS     (C) DAPNIA-SPP/CEA 
+*/
 /* Interface Fits pour bolometre    cmv 29/09/2001 */
 #ifndef FBOLOREAD_H_SEEN

trunk/SophyaExt/FitsIOServer/fbtntintf.h

@@ +1 @@
+/*    
+   --- SOPHYA software - FitsIOServer module ---
+   C. Magneville, 2001 
+   (C) UPS+LAL IN2P3/CNRS     (C) DAPNIA-SPP/CEA 
+*/
 /* Interface Fits BINARY/ASCII Table     cmv 21/05/2001 */
 #ifndef FBTNTINTF_H_SEEN

trunk/SophyaExt/FitsIOServer/fiosinit.cc

@@ -26 +26 @@
 int FitsIOServerInitiator::FgInit = 0;
 
+// ---> Reporter ce numero de version ds fitsinoutfile.h (methode Version())
 // Module version number - 2.0 , Jul 2006
 // Module version number - 2.1 , Fev 2007 (version ll (LONGLONG) de cfitsio)
-#define MOD_VERS   2.1
+// Module version number - 2.12 , Avr 2008 (Lecture-ecriture tableaux avec offset)
+
+#define MOD_VERS   2.12
 
 FitsIOServerInitiator::FitsIOServerInitiator()

trunk/SophyaExt/FitsIOServer/fiosinit.h

@@ -1 @@
-// This may look like C code, but it is really -*- C++ -*-
+/*    
+   --- SOPHYA software - FitsIOServer module ---
+   Guy Le Meur, R. Ansari , 2000-2006 
+   (C) UPS+LAL IN2P3/CNRS     (C) DAPNIA-SPP/CEA 
+*/
 // Classe d'initialiseur du module FitsIOServer
 
@@ -6 +10 @@
 
 
-// Classe d''initialisation pour les modules de PEIDA++
+// Classe d''initialisation pour les modules de SOPHYA
 #include "sophyainit.h"
 

trunk/SophyaExt/FitsIOServer/fitsarrhand.h

@@ +1 @@
+/*    
+   --- SOPHYA software - FitsIOServer module ---
+   R. Ansari , 2005-2008 
+   (C) UPS+LAL IN2P3/CNRS     (C) DAPNIA-SPP/CEA 
+*/
 #ifndef FITSARRHAND_H
 #define FITSARRHAND_H
@@ -64 +69 @@
 
   //----- Ecriture
+  //! Writes the complete array as an IMAGE HDU
   virtual void     Write(FitsInOutFile& os)
     {
-      if ( dobj == NULL) 
-        throw NullPtrError("FitsArrayHandler<T>::Write() dobj=NULL ");
+      if (( dobj == NULL) || (dobj->Size() < 1))  
+          throw NullPtrError("FitsArrayHandler<T>::Write() dobj=NULL or dobj->Size()=0");
+        
       LONGLONG naxes[BASEARRAY_MAXNDIMS] = {0,0,0,0,0};
       for(int_4 id=0; id<dobj->NbDimensions(); id++) 
@@ -81 +88 @@
 
   //----- Lecture
+  //! Resize the array and reads the complete IMAGE HDU to the array
   virtual void     Read(FitsInOutFile& is)
     {
@@ -97 +105 @@
       }
       sa_size_t sz[BASEARRAY_MAXNDIMS];
-      if (naxis > BASEARRAY_MAXNDIMS) naxis = BASEARRAY_MAXNDIMS;
+      if (naxis > BASEARRAY_MAXNDIMS) { 
+        cerr << "FitsArrayHandler<T>::Read()/Warning FITS NAXIS=" << naxis 
+                 << " > BASEARRAY_MAXNDIMS=" << BASEARRAY_MAXNDIMS << endl;
+        naxis = BASEARRAY_MAXNDIMS;
+      }
       for(int_4 id=0; id<naxis; id++) sz[id] = naxes[id];
       dobj->SetSize(naxis, sz, 1, false);
       FitsBlockRW<T>::ReadImageData(is, dobj->Data(), dobj->Size());
       is.GetHeaderRecords(dobj->Info());
+    }
+
+  //----- Lecture avec specification d'offset et taille donnee par le tableau
+  /*!  \brief Reads from the fits file into the array, at the specified offset 
+  
+     The array should be allocated and its size is used to define the number of 
+     pixels to be read. 
+     \warning The offset should be specified with SOPHYA/C array index convention 
+     (starting at zero) - and NOT the cfitsio/fortran convention. 
+     The offset should contain as many elements as the fits NAXIS keyword.
+  */
+  virtual void     ReadAtOffset(FitsInOutFile& is, sa_size_t* offset)
+    {
+    if (( dobj == NULL) || (dobj->Size() < 1))  
+          throw NullPtrError("FitsArrayHandler<T>::ReadAtOffset() dobj=NULL or dobj->Size()=0");
+        
+    LONGLONG naxes[BASEARRAY_MAXNDIMS];
+    int naxis=BASEARRAY_MAXNDIMS;
+    is.GetImageHDUInfo(naxis, naxes);
+    LONGLONG fpix[15]; 
+    int namx = (naxis < 15) ? naxis : 15;
+    for(int i=0; i<namx; i++) fpix[i] = offset[i]+1;
+    FitsBlockRW<T>::ReadImageData(is, dobj->Data(), dobj->Size(), fpix);
+    is.GetHeaderRecords(dobj->Info());
+    }
+
+  //----- Ecriture avec specification d'offset et taille donnee par le tableau
+  /*!  \brief Writes the array to the fits file, at the specified offset 
+  
+     The array should be allocated and its size is used to define the number of 
+     pixels to be read. 
+     \warning The offset should be specified with SOPHYA/C array index convention 
+     (starting at zero) - and NOT the cfitsio/fortran convention. 
+     The offset should contain as many elements as the fits NAXIS keyword.
+     \warning The IMAGE HDU should be already created using FitsInOutFile::CreateImageHDU().
+  */
+  virtual void     WriteAtOffset(FitsInOutFile& os, sa_size_t* offset)
+    {
+    if (( dobj == NULL) || (dobj->Size() < 1))  
+          throw NullPtrError("FitsArrayHandler<T>::ReadAtOffset() dobj=NULL or dobj->Size()=0");
+
+    LONGLONG naxes[BASEARRAY_MAXNDIMS];
+    int naxis=BASEARRAY_MAXNDIMS;
+    os.GetImageHDUInfo(naxis, naxes);
+    LONGLONG fpix[15]; 
+    int namx = (naxis < 15) ? naxis : 15;
+    for(int i=0; i<namx; i++) fpix[i] = offset[i]+1;
+    FitsBlockRW<T>::WriteImageData(os, dobj->Data(), dobj->Size(), fpix);       
     }
 
@@ -110 +170 @@
 
 
+//! operator << overload to write a TArray<T> to a fits IMAGE HDU
 template <class T>
 inline FitsInOutFile& operator << (FitsInOutFile& os, TArray<T> const & obj)
 { FitsArrayHandler<T> fio(const_cast< TArray<T> &>(obj));  fio.Write(os);  return os; }
 
+//! operator >> overload to read a TArray<T> from a fits IMAGE HDU
 template <class T>
 inline FitsInOutFile& operator >> (FitsInOutFile& is, TArray<T> & obj)

trunk/SophyaExt/FitsIOServer/fitsblkrw.h

@@ +1 @@
+/*    
+   --- SOPHYA software - FitsIOServer module ---
+   R. Ansari , 2005-2008 
+   (C) UPS+LAL IN2P3/CNRS     (C) DAPNIA-SPP/CEA 
+*/
 #ifndef FITSBLKRW_H
 #define FITSBLKRW_H
@@ -20 +25 @@
 {
   int status = 0;
-  LONGLONG fpix[5] = {1,1,1,1,1};
+  LONGLONG fpix[15] = {1,1,1,1,1, 1,1,1,1,1, 1,1,1,1,1};
   if (fpixel == NULL) fpixel = fpix;
   T * ncd = const_cast<T *>(d);
@@ -40 +45 @@
 {
   int status = 0;
-  LONGLONG fpix[5] = {1,1,1,1,1};
+  LONGLONG fpix[15] = {1,1,1,1,1, 1,1,1,1,1, 1,1,1,1,1};
   if (fpixel == NULL) fpixel = fpix;
   int anynul = 0;

trunk/SophyaExt/FitsIOServer/fitsfile.h

@@ +1 @@
+/*    
+   --- SOPHYA software - FitsIOServer module ---
+   Guy Le Meur 09/2000    R. Ansari , 2006 
+   (C) UPS+LAL IN2P3/CNRS     (C) DAPNIA-SPP/CEA 
+*/
 #ifndef FITSFILE_H
 #define FITSFILE_H

trunk/SophyaExt/FitsIOServer/fitsgenedata.h

@@ +1 @@
+/*    
+   --- SOPHYA software - FitsIOServer module ---
+   C. Magneville, 2006 
+   (C) UPS+LAL IN2P3/CNRS     (C) DAPNIA-SPP/CEA 
+*/
 #ifndef FITSGENDATAHAND_H
 #define FITSGENDATAHAND_H

trunk/SophyaExt/FitsIOServer/fitshandler.h

@@ +1 @@
+/*    
+   --- SOPHYA software - FitsIOServer module ---
+   R. Ansari, 2005 
+   (C) UPS+LAL IN2P3/CNRS     (C) DAPNIA-SPP/CEA 
+*/
 #ifndef FITSHANDLER_H
 #define FITSHANDLER_H

trunk/SophyaExt/FitsIOServer/fitshdtable.h

@@ +1 @@
+/*    
+   --- SOPHYA software - FitsIOServer module ---
+   R. Ansari , 2005
+   (C) UPS+LAL IN2P3/CNRS     (C) DAPNIA-SPP/CEA 
+*/
 #ifndef FITSDTABLEHAND_H
 #define FITSDTABLEHAND_H

trunk/SophyaExt/FitsIOServer/fitshisterr.h

@@ +1 @@
+/*    
+   --- SOPHYA software - FitsIOServer module ---
+   C. Magneville, 2007
+   (C) UPS+LAL IN2P3/CNRS     (C) DAPNIA-SPP/CEA 
+*/
 #ifndef FITSHISTERRHAND_H
 #define FITSHISTERRHAND_H

trunk/SophyaExt/FitsIOServer/fitshistos.h

@@ +1 @@
+/*    
+   --- SOPHYA software - FitsIOServer module ---
+   C. Magneville, 2006 
+   (C) UPS+LAL IN2P3/CNRS     (C) DAPNIA-SPP/CEA 
+*/
 #ifndef FITSHISTOHAND_H
 #define FITSHISTOHAND_H

trunk/SophyaExt/FitsIOServer/fitsinoutfile.h

@@ +1 @@
+/*    
+   --- SOPHYA software - FitsIOServer module ---
+   R. Ansari , 2005-2008 
+   (C) UPS+LAL IN2P3/CNRS     (C) DAPNIA-SPP/CEA 
+*/
 #ifndef FITSINOUTFILE_H
 #define FITSINOUTFILE_H
@@ -98 +103 @@
  static float      cfitsioVersion();
  //! Return the SOPHYA FitsIOServer version 
- static float      Version() { return 2.0; }
+ static float      Version() { return 2.12; }
 
  //! Return the file name as specified in the constructor (or Open) 

trunk/SophyaExt/FitsIOServer/fitsioserver.h

@@ +1 @@
+/*    
+   --- SOPHYA software - FitsIOServer module ---
+   R. Ansari, C. Magneville, 2000-2008 
+   (C) UPS+LAL IN2P3/CNRS     (C) DAPNIA-SPP/CEA 
+*/
 #ifndef FITSIOSERVER_SEEN
 #define FITSIOSERVER_SEEN

trunk/SophyaExt/FitsIOServer/fitslocalmap.h

@@ -1 @@
-// Guy Le Meur 08/2000
-
-
+/*    
+   --- SOPHYA software - FitsIOServer module ---
+   Guy Le Meur 08/2000    R. Ansari , 2006 
+   (C) UPS+LAL IN2P3/CNRS     (C) DAPNIA-SPP/CEA 
+*/
 #ifndef FITSLOCALMAP_SEEN
 #define FITSLOCALMAP_SEEN

trunk/SophyaExt/FitsIOServer/fitsmanager.h

@@ +1 @@
+/*    
+   --- SOPHYA software - FitsIOServer module ---
+   R. Ansari , 2005 
+   (C) UPS+LAL IN2P3/CNRS     (C) DAPNIA-SPP/CEA 
+*/
 #ifndef FITSMANAGER_H
 #define FITSMANAGER_H

trunk/SophyaExt/FitsIOServer/fitsntuple.h

@@ -1 @@
-// Guy Le Meur 03/2000
+/*    
+   --- SOPHYA software - FitsIOServer module ---
+   Guy Le Meur 03/2000    R. Ansari , 2006 
+   (C) UPS+LAL IN2P3/CNRS     (C) DAPNIA-SPP/CEA 
+*/
 
 

trunk/SophyaExt/FitsIOServer/fitsspherehealpix.h

@@ +1 @@
+/*    
+   --- SOPHYA software - FitsIOServer module ---
+   Guy Le Meur 03/2000    R. Ansari , 2006 
+   (C) UPS+LAL IN2P3/CNRS     (C) DAPNIA-SPP/CEA 
+*/
 #ifndef FITSSPHEREHEALPIX_SEEN
 #define FITSSPHEREHEALPIX_SEEN
 
-
-// Guy Le Meur 03/2000
 
 

trunk/SophyaExt/FitsIOServer/fitsspherethetaphi.h

@@ +1 @@
+/*    
+   --- SOPHYA software - FitsIOServer module ---
+   Guy Le Meur 10/2001     R. Ansari , 2006
+   (C) UPS+LAL IN2P3/CNRS     (C) DAPNIA-SPP/CEA 
+*/
 #ifndef FITSSPHERETHETAPHI_SEEN
 #define FITSSPHERETHETAPHI_SEEN
-
-
-// Guy Le Meur 10/2001
 
 

trunk/SophyaExt/FitsIOServer/fitsswapper.h

@@ -1 @@
-// This may look like C code, but it is really -*- C++ -*-
-// Gestion de block de donnees swapable
-//          C. Magneville R. Ansari  Mai 2005
-// LAL (Orsay) / IN2P3-CNRS  DAPNIA/SPP (Saclay) / CEA
+/*    
+   --- SOPHYA software - FitsIOServer module ---
+   R. Ansari,  C. Magneville,   Mai 2005 
+   (C) UPS+LAL IN2P3/CNRS     (C) DAPNIA-SPP/CEA 
+*/
 #ifndef FITSSWAPPER_H
 #define FITSSWAPPER_H

trunk/SophyaExt/FitsIOServer/swfitsdtable.h

@@ -1 @@
-// This may look like C code, but it is really -*- C++ -*-
-// Class DataTable  (Row-Column data table in memory) 
-//   R. Ansari -  Avril 2005
-//   (C)  LAL-IN2P3/CNRS    CEA-DAPNIA  
+/*    
+   --- SOPHYA software - FitsIOServer module ---
+   R. Ansari , 2005-2008 
+   (C) UPS+LAL IN2P3/CNRS     (C) DAPNIA-SPP/CEA 
+*/
 
 #ifndef SWFITSDTABLE_H_SEEN
@@ -15 +16 @@
 namespace SOPHYA {
 
-//! An implementation of BaseDataTable with using FITS files as swap space.
+//! An implementation of BaseDataTable  using FITS files as swap space.
 class SwFitsDataTable : public BaseDataTable {
 public: