Changeset 972 in Sophya for trunk/SophyaExt

Timestamp:

Apr 27, 2000, 6:12:10 PM (25 years ago)

Author:

ansari

Message:

mise a jour 27/04/00 GLM

Location:

trunk/SophyaExt/FitsIOServer

Files:

• fitsfile.cc (modified) (1 diff)
• fitsntuple.cc (modified) (2 diffs)
• fitsntuple.h (modified) (2 diffs)
• fitsspherehealpix.cc (modified) (6 diffs)
• fitsspherehealpix.h (modified) (1 diff)
• fitstarray.cc (modified) (3 diffs)
• fitstarray.h (modified) (1 diff)
• fitsxntuple.cc (modified) (2 diffs)
• fitsxntuple.h (modified) (2 diffs)

trunk/SophyaExt/FitsIOServer/fitsfile.cc

@@ -126 +126 @@
       if (naxis > 0 )       // there is an image
         {
-          hdutype_ == IMAGE_HDU;
+          hdutype_ = IMAGE_HDU;
           GetImageParameters (fptr_, bitpix_, naxis_, naxisn_);
           nbData_ =  1;

trunk/SophyaExt/FitsIOServer/fitsntuple.cc

@@ -43 +43 @@
 }
 
-void FITS_NTuple::Write(char outputfile[], int hdunum)
+void FITS_NTuple::Write(char outputfile[], bool OldFile)
 {
-  WriteF(outputfile, hdunum);
+  WriteF(outputfile, OldFile);
 }
 
-void FITS_NTuple::ReadFromFits(const FitsFile& fn)
+void FITS_NTuple::ReadFromFits(FitsFile& fn)
 {
   if (!fn.IsFitsTable())
@@ -115 +115 @@
   dobj_->Info()=fn.DVListFromFits();
 }
-void FITS_NTuple::WriteToFits(const FitsFile& fn)
+void FITS_NTuple::WriteToFits(FitsFile& fn)
 {
   if(dobj_ == NULL) 

trunk/SophyaExt/FitsIOServer/fitsntuple.h

@@ -23 +23 @@
 FITS_NTuple(const NTuple & obj);
 virtual ~FITS_NTuple();
-void Write(char outputfile[], int hdunum=2);
+void Write(char outputfile[], bool OldFile=false);
 inline operator NTuple() { return(*dobj_); }
 
@@ -29 +29 @@
 
   // implementation de FitsFile
-virtual void ReadFromFits(const FitsFile& fn);
-virtual void WriteToFits(const FitsFile& fn);
+virtual void ReadFromFits(FitsFile& fn);
+virtual void WriteToFits(FitsFile& fn);
 
 float*  getColFromObj(int colNr);

trunk/SophyaExt/FitsIOServer/fitsspherehealpix.cc

@@ -69 +69 @@
 
 template <class T>
-void FITS_SphereHEALPix<T>::Write(char outputfile[],int hdunum)
-{
-  WriteF(outputfile, hdunum);
+void FITS_SphereHEALPix<T>::Write(char outputfile[], bool OldFile)
+{
+  WriteF(outputfile, OldFile);
 }
 template <class T>
@@ -80 +80 @@
 
 template <class T>
-void FITS_SphereHEALPix<T>::WriteToFits(const FitsFile& fn)
+void FITS_SphereHEALPix<T>::WriteToFits(FitsFile& fn)
 {
   if(dobj_ == NULL) 
@@ -94 +94 @@
   dvl["COORDSYS"]= description;
 
+  dvl["PIXTYPE"] = "HEALPIX";
+  dvl.SetComment("PIXTYPE", "HEALPIX Pixelization");
   dvl["ORDERING"]= dobj_->TypeOfMap();
+  dvl.SetComment("ORDERING", "Pixel ordering scheme, either RING or NESTED");
   
   int nSide= dobj_->SizeIndex();
   dvl["NSIDE"]= nSide;
+  dvl.SetComment("NSIDE","Resolution parameter for HEALPIX" );
 
   int nPix= dobj_->NbPixels();
   dvl["FIRSTPIX"]= 0;
+  dvl.SetComment("FIRSTPIX", "First pixel # (0 based)");
   dvl["LASTPIX"]= nPix-1;
+  dvl.SetComment("LASTPIX", "Last pixel # (0 based)");
   dvl["Content"]= "SphereHEALPix";
   dvl["EXTNAME"]= "SIMULATION";
@@ -131 +137 @@
 
 template <class T> 
-void FITS_SphereHEALPix<T>::ReadFromFits(const FitsFile& fn)
+void FITS_SphereHEALPix<T>::ReadFromFits(FitsFile& fn)
 {
   if(dobj_ == NULL) 
@@ -164 +170 @@
   int id= SphereCoordSys_NEUTRAL;
   string description= "NEUTRAL SphereCoordSystem";
-  const char* coordsys= dvl.GetS("COORDSYS").c_str();    
-  if(strncmp(coordsys,"ROTATION",8) == 0)
+  string coordsys= dvl.GetS("COORDSYS");    
+  if(coordsys.compare(0,7,"ROTATION",0,7) == 0)
     {
       id= SphereCoordSys_ROTATION;
       description= "ROTATION SphereCoordSystem";
     } 
-  else if(strncmp(coordsys,"OTHER",5) == 0)
+  else if(coordsys.compare(0,4,"OTHER",0,4) == 0)
     {
       id= SphereCoordSys_OTHER;
@@ -177 +183 @@
   dobj_->SetCoordSys(new SphereCoordSys(id,description));   
 
-  const char* ordering= dvl.GetS("ORDERING").c_str();
-  if(strncmp(ordering,"RING",4) != 0)
+  string ordering= dvl.GetS("ORDERING");
+  if(ordering.compare(0,3,"RING",0,3) != 0)
     { 
       cout << " ORDERING= " << ordering << endl;

trunk/SophyaExt/FitsIOServer/fitsspherehealpix.h

@@ -29 +29 @@
 virtual void        SetDataObj(AnyDataObj & o);
 
-inline operator SphereHEALPix<T>() {return(*dobj_); }
+inline operator SphereHEALPix<T>() { return(*dobj_); }
  void Read(char inputfile[],int hdunum=2);
-void Write(char outputfile[], int hdunum=2);
+void Write(char outputfile[], bool Oldfile=false);
 
 protected:
 
-virtual void ReadFromFits(const FitsFile& fn);
-virtual void WriteToFits(const FitsFile& fn);
+virtual void ReadFromFits(FitsFile& fn);
+virtual void WriteToFits(FitsFile& fn);
 SphereHEALPix<T>* dobj_;
 bool ownobj;

trunk/SophyaExt/FitsIOServer/fitstarray.cc

@@ -46 +46 @@
 
 template <class T>
-void FITS_TArray<T>::Write(char outputfile[])
+void FITS_TArray<T>::Write(char outputfile[], bool OldFile)
 {
-  WriteF(outputfile);
+  WriteF(outputfile, OldFile);
 }
 
@@ -60 +60 @@
 
 template <class T>
-void FITS_TArray<T>::ReadFromFits(const FitsFile& fn)
+void FITS_TArray<T>::ReadFromFits(FitsFile& fn)
 {
 
@@ -91 +91 @@
 
   template <class T>
-void FITS_TArray<T>::WriteToFits(const FitsFile& fn)  
+void FITS_TArray<T>::WriteToFits(FitsFile& fn)  
 {
   if(dobj_ == NULL) return;

trunk/SophyaExt/FitsIOServer/fitstarray.h

@@ -31 +31 @@
 virtual AnyDataObj* DataObj();
 inline operator TArray<T>() { return(*dobj_); }
-void Write(char outputfile[]);
+void Write(char outputfile[], bool OldFile=false);
 
 protected :
 
-void ReadFromFits(const FitsFile& fn);
-void WriteToFits(const FitsFile& fn);
+void ReadFromFits(FitsFile& fn);
+void WriteToFits(FitsFile& fn);
 
   TArray<T> * dobj_;

trunk/SophyaExt/FitsIOServer/fitsxntuple.cc

@@ -60 +60 @@
   if (ownobj && dobj_ != NULL) delete dobj_;
 }
-void FITS_XNTuple::Write(char outputfile[],int hdunum)
+void FITS_XNTuple::Write(char outputfile[], bool OldFile)
 {       
-  WriteF(outputfile, hdunum);
+  WriteF(outputfile, OldFile);
 } 
  
-void FITS_XNTuple::ReadFromFits(const FitsFile& fn)
+void FITS_XNTuple::ReadFromFits(FitsFile& fn)
 {   
   if (!fn.IsFitsTable())
@@ -230 +230 @@
 
 }
-void FITS_XNTuple::WriteToFits(const FitsFile& fn)
+void FITS_XNTuple::WriteToFits(FitsFile& fn)
 {
   if(dobj_ == NULL) 

trunk/SophyaExt/FitsIOServer/fitsxntuple.h

@@ -23 +23 @@
 FITS_XNTuple(const XNTuple & obj);
 ~FITS_XNTuple();
-void Write(char outputfile[], int hdunum=2);
+void Write(char outputfile[], bool OldFile=false);
 inline operator XNTuple() { return(*dobj_); }
 
@@ -29 +29 @@
 
   // implementation de FitsFile
-  virtual void  ReadFromFits(const FitsFile& fn);
-virtual void    WriteToFits(const FitsFile& fn);
+  virtual void  ReadFromFits(FitsFile& fn);
+virtual void    WriteToFits(FitsFile& fn);
 void*   getColFromObj(int colNr);
 double* getColDFromObj(int colNr);