Changeset 972 in Sophya
- Timestamp:
- Apr 27, 2000, 6:12:10 PM (25 years ago)
- Location:
- trunk/SophyaExt/FitsIOServer
- Files:
-
- 9 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/SophyaExt/FitsIOServer/fitsfile.cc
r971 r972 126 126 if (naxis > 0 ) // there is an image 127 127 { 128 hdutype_ = =IMAGE_HDU;128 hdutype_ = IMAGE_HDU; 129 129 GetImageParameters (fptr_, bitpix_, naxis_, naxisn_); 130 130 nbData_ = 1; -
trunk/SophyaExt/FitsIOServer/fitsntuple.cc
r923 r972 43 43 } 44 44 45 void FITS_NTuple::Write(char outputfile[], int hdunum)45 void FITS_NTuple::Write(char outputfile[], bool OldFile) 46 46 { 47 WriteF(outputfile, hdunum);47 WriteF(outputfile, OldFile); 48 48 } 49 49 50 void FITS_NTuple::ReadFromFits( constFitsFile& fn)50 void FITS_NTuple::ReadFromFits(FitsFile& fn) 51 51 { 52 52 if (!fn.IsFitsTable()) … … 115 115 dobj_->Info()=fn.DVListFromFits(); 116 116 } 117 void FITS_NTuple::WriteToFits( constFitsFile& fn)117 void FITS_NTuple::WriteToFits(FitsFile& fn) 118 118 { 119 119 if(dobj_ == NULL) -
trunk/SophyaExt/FitsIOServer/fitsntuple.h
r860 r972 23 23 FITS_NTuple(const NTuple & obj); 24 24 virtual ~FITS_NTuple(); 25 void Write(char outputfile[], int hdunum=2);25 void Write(char outputfile[], bool OldFile=false); 26 26 inline operator NTuple() { return(*dobj_); } 27 27 … … 29 29 30 30 // implementation de FitsFile 31 virtual void ReadFromFits( constFitsFile& fn);32 virtual void WriteToFits( constFitsFile& fn);31 virtual void ReadFromFits(FitsFile& fn); 32 virtual void WriteToFits(FitsFile& fn); 33 33 34 34 float* getColFromObj(int colNr); -
trunk/SophyaExt/FitsIOServer/fitsspherehealpix.cc
r921 r972 69 69 70 70 template <class T> 71 void FITS_SphereHEALPix<T>::Write(char outputfile[], int hdunum)72 { 73 WriteF(outputfile, hdunum);71 void FITS_SphereHEALPix<T>::Write(char outputfile[], bool OldFile) 72 { 73 WriteF(outputfile, OldFile); 74 74 } 75 75 template <class T> … … 80 80 81 81 template <class T> 82 void FITS_SphereHEALPix<T>::WriteToFits( constFitsFile& fn)82 void FITS_SphereHEALPix<T>::WriteToFits(FitsFile& fn) 83 83 { 84 84 if(dobj_ == NULL) … … 94 94 dvl["COORDSYS"]= description; 95 95 96 dvl["PIXTYPE"] = "HEALPIX"; 97 dvl.SetComment("PIXTYPE", "HEALPIX Pixelization"); 96 98 dvl["ORDERING"]= dobj_->TypeOfMap(); 99 dvl.SetComment("ORDERING", "Pixel ordering scheme, either RING or NESTED"); 97 100 98 101 int nSide= dobj_->SizeIndex(); 99 102 dvl["NSIDE"]= nSide; 103 dvl.SetComment("NSIDE","Resolution parameter for HEALPIX" ); 100 104 101 105 int nPix= dobj_->NbPixels(); 102 106 dvl["FIRSTPIX"]= 0; 107 dvl.SetComment("FIRSTPIX", "First pixel # (0 based)"); 103 108 dvl["LASTPIX"]= nPix-1; 109 dvl.SetComment("LASTPIX", "Last pixel # (0 based)"); 104 110 dvl["Content"]= "SphereHEALPix"; 105 111 dvl["EXTNAME"]= "SIMULATION"; … … 131 137 132 138 template <class T> 133 void FITS_SphereHEALPix<T>::ReadFromFits( constFitsFile& fn)139 void FITS_SphereHEALPix<T>::ReadFromFits(FitsFile& fn) 134 140 { 135 141 if(dobj_ == NULL) … … 164 170 int id= SphereCoordSys_NEUTRAL; 165 171 string description= "NEUTRAL SphereCoordSystem"; 166 const char* coordsys= dvl.GetS("COORDSYS").c_str();167 if( strncmp(coordsys,"ROTATION",8) == 0)172 string coordsys= dvl.GetS("COORDSYS"); 173 if(coordsys.compare(0,7,"ROTATION",0,7) == 0) 168 174 { 169 175 id= SphereCoordSys_ROTATION; 170 176 description= "ROTATION SphereCoordSystem"; 171 177 } 172 else if( strncmp(coordsys,"OTHER",5) == 0)178 else if(coordsys.compare(0,4,"OTHER",0,4) == 0) 173 179 { 174 180 id= SphereCoordSys_OTHER; … … 177 183 dobj_->SetCoordSys(new SphereCoordSys(id,description)); 178 184 179 const char* ordering= dvl.GetS("ORDERING").c_str();180 if( strncmp(ordering,"RING",4) != 0)185 string ordering= dvl.GetS("ORDERING"); 186 if(ordering.compare(0,3,"RING",0,3) != 0) 181 187 { 182 188 cout << " ORDERING= " << ordering << endl; -
trunk/SophyaExt/FitsIOServer/fitsspherehealpix.h
r921 r972 29 29 virtual void SetDataObj(AnyDataObj & o); 30 30 31 inline operator SphereHEALPix<T>() { return(*dobj_); }31 inline operator SphereHEALPix<T>() { return(*dobj_); } 32 32 void Read(char inputfile[],int hdunum=2); 33 void Write(char outputfile[], int hdunum=2);33 void Write(char outputfile[], bool Oldfile=false); 34 34 35 35 protected: 36 36 37 virtual void ReadFromFits( constFitsFile& fn);38 virtual void WriteToFits( constFitsFile& fn);37 virtual void ReadFromFits(FitsFile& fn); 38 virtual void WriteToFits(FitsFile& fn); 39 39 SphereHEALPix<T>* dobj_; 40 40 bool ownobj; -
trunk/SophyaExt/FitsIOServer/fitstarray.cc
r923 r972 46 46 47 47 template <class T> 48 void FITS_TArray<T>::Write(char outputfile[] )48 void FITS_TArray<T>::Write(char outputfile[], bool OldFile) 49 49 { 50 WriteF(outputfile );50 WriteF(outputfile, OldFile); 51 51 } 52 52 … … 60 60 61 61 template <class T> 62 void FITS_TArray<T>::ReadFromFits( constFitsFile& fn)62 void FITS_TArray<T>::ReadFromFits(FitsFile& fn) 63 63 { 64 64 … … 91 91 92 92 template <class T> 93 void FITS_TArray<T>::WriteToFits( constFitsFile& fn)93 void FITS_TArray<T>::WriteToFits(FitsFile& fn) 94 94 { 95 95 if(dobj_ == NULL) return; -
trunk/SophyaExt/FitsIOServer/fitstarray.h
r863 r972 31 31 virtual AnyDataObj* DataObj(); 32 32 inline operator TArray<T>() { return(*dobj_); } 33 void Write(char outputfile[] );33 void Write(char outputfile[], bool OldFile=false); 34 34 35 35 protected : 36 36 37 void ReadFromFits( constFitsFile& fn);38 void WriteToFits( constFitsFile& fn);37 void ReadFromFits(FitsFile& fn); 38 void WriteToFits(FitsFile& fn); 39 39 40 40 TArray<T> * dobj_; -
trunk/SophyaExt/FitsIOServer/fitsxntuple.cc
r923 r972 60 60 if (ownobj && dobj_ != NULL) delete dobj_; 61 61 } 62 void FITS_XNTuple::Write(char outputfile[], int hdunum)62 void FITS_XNTuple::Write(char outputfile[], bool OldFile) 63 63 { 64 WriteF(outputfile, hdunum);64 WriteF(outputfile, OldFile); 65 65 } 66 66 67 void FITS_XNTuple::ReadFromFits( constFitsFile& fn)67 void FITS_XNTuple::ReadFromFits(FitsFile& fn) 68 68 { 69 69 if (!fn.IsFitsTable()) … … 230 230 231 231 } 232 void FITS_XNTuple::WriteToFits( constFitsFile& fn)232 void FITS_XNTuple::WriteToFits(FitsFile& fn) 233 233 { 234 234 if(dobj_ == NULL) -
trunk/SophyaExt/FitsIOServer/fitsxntuple.h
r860 r972 23 23 FITS_XNTuple(const XNTuple & obj); 24 24 ~FITS_XNTuple(); 25 void Write(char outputfile[], int hdunum=2);25 void Write(char outputfile[], bool OldFile=false); 26 26 inline operator XNTuple() { return(*dobj_); } 27 27 … … 29 29 30 30 // implementation de FitsFile 31 virtual void ReadFromFits( constFitsFile& fn);32 virtual void WriteToFits( constFitsFile& fn);31 virtual void ReadFromFits(FitsFile& fn); 32 virtual void WriteToFits(FitsFile& fn); 33 33 void* getColFromObj(int colNr); 34 34 double* getColDFromObj(int colNr);
Note:
See TracChangeset
for help on using the changeset viewer.