Changeset 2782 in Sophya for trunk/SophyaExt/FitsIOServer

Timestamp:

May 30, 2005, 4:45:47 PM (20 years ago)

Author:

ansari

Message:

Ajout classe Swapper sur fichiers FITS - CMV+Reza 30 Mai 2005

Location:

trunk/SophyaExt/FitsIOServer

Files:

• Makefile (modified) (2 diffs)
• fabtwriter.h (modified) (1 diff)
• fitsswapper.cc (added)
• fitsswapper.h (added)
• objlist.list (modified) (1 diff)
• smakefile (modified) (2 diffs)

trunk/SophyaExt/FitsIOServer/Makefile

@@ -4 +4 @@
  
 clean:
-         rm -f $(SOPHYAOBJP)datacirclefits.o $(SOPHYAOBJP)fabtcolread.o $(SOPHYAOBJP)fabtwriter.o $(SOPHYAOBJP)fboloread.o $(SOPHYAOBJP)fbtntintf.o $(SOPHYAOBJP)fitsautoreader.o $(SOPHYAOBJP)fitsbntbllineRW.o $(SOPHYAOBJP)fitsfile.o $(SOPHYAOBJP)fitslocalmap.o $(SOPHYAOBJP)fitsntuple.o $(SOPHYAOBJP)fitsspherehealpix.o $(SOPHYAOBJP)fitsspherethetaphi.o $(SOPHYAOBJP)fitstarray.o $(SOPHYAOBJP)fitsxntuple.o
+         rm -f $(SOPHYAOBJP)datacirclefits.o $(SOPHYAOBJP)fabtcolread.o $(SOPHYAOBJP)fabtwriter.o $(SOPHYAOBJP)fboloread.o $(SOPHYAOBJP)fbtntintf.o $(SOPHYAOBJP)fitsautoreader.o $(SOPHYAOBJP)fitsbntbllineRW.o $(SOPHYAOBJP)fitsfile.o $(SOPHYAOBJP)fitslocalmap.o $(SOPHYAOBJP)fitsntuple.o $(SOPHYAOBJP)fitsspherehealpix.o $(SOPHYAOBJP)fitsspherethetaphi.o $(SOPHYAOBJP)fitsswapper.o $(SOPHYAOBJP)fitstarray.o $(SOPHYAOBJP)fitsxntuple.o
         rm -f $(SOPHYALIBP)libFitsIOServer.a
  
-$(SOPHYALIBP)libFitsIOServer.a : $(SOPHYAOBJP)datacirclefits.o $(SOPHYAOBJP)fabtcolread.o $(SOPHYAOBJP)fabtwriter.o $(SOPHYAOBJP)fboloread.o $(SOPHYAOBJP)fbtntintf.o $(SOPHYAOBJP)fitsautoreader.o $(SOPHYAOBJP)fitsbntbllineRW.o $(SOPHYAOBJP)fitsfile.o $(SOPHYAOBJP)fitslocalmap.o $(SOPHYAOBJP)fitsntuple.o $(SOPHYAOBJP)fitsspherehealpix.o $(SOPHYAOBJP)fitsspherethetaphi.o $(SOPHYAOBJP)fitstarray.o $(SOPHYAOBJP)fitsxntuple.o
+$(SOPHYALIBP)libFitsIOServer.a : $(SOPHYAOBJP)datacirclefits.o $(SOPHYAOBJP)fabtcolread.o $(SOPHYAOBJP)fabtwriter.o $(SOPHYAOBJP)fboloread.o $(SOPHYAOBJP)fbtntintf.o $(SOPHYAOBJP)fitsautoreader.o $(SOPHYAOBJP)fitsbntbllineRW.o $(SOPHYAOBJP)fitsfile.o $(SOPHYAOBJP)fitslocalmap.o $(SOPHYAOBJP)fitsntuple.o $(SOPHYAOBJP)fitsspherehealpix.o $(SOPHYAOBJP)fitsspherethetaphi.o $(SOPHYAOBJP)fitsswapper.o $(SOPHYAOBJP)fitstarray.o $(SOPHYAOBJP)fitsxntuple.o
         $(AR) $(ARFLAGS) $@ $? 
         touch $(SOPHYAINCP)/SophyaConfInfo/libextsophya.objlist
@@ -312 +312 @@
         $(CXXCOMPILE) $(CXXTEMPFLG) -o $@  fitsspherethetaphi.cc
  
+$(SOPHYAOBJP)fitsswapper.o: fitsswapper.cc fitsswapper.h \
+  $(SOPHYAINCP)machdefs.h \
+  $(SOPHYAINCP)swsegdb.h \
+  $(SOPHYAINCP)segdatablock.h \
+  $(SOPHYAINCP)anydataobj.h \
+  $(SOPHYAINCP)pexceptions.h \
+  $(SOPHYAINCP)FitsIO/fitsio.h \
+  $(SOPHYAINCP)FitsIO/longnam.h \
+  $(SOPHYAINCP)sopnamsp.h
+        $(CXXCOMPILE) $(CXXTEMPFLG) -o $@  fitsswapper.cc
+ 
 $(SOPHYAOBJP)fitstarray.o: fitstarray.cc \
   $(SOPHYAINCP)sopnamsp.h \

trunk/SophyaExt/FitsIOServer/fabtwriter.h

@@ -45 +45 @@
   inline unsigned long GetNOverFlow(void) {return NOverFlow;}
 
+  //! Return the c-fitsio file pointer
+  inline fitsfile * GetFitsPtr() { return FitsPtr; }
 protected:
   struct KeyDouble {string keyname; double val; string comment;};

trunk/SophyaExt/FitsIOServer/objlist.list

@@ -11 +11 @@
 fitsspherehealpix.o
 fitsspherethetaphi.o
+fitsswapper.o
 fitstarray.o
 fitsxntuple.o

trunk/SophyaExt/FitsIOServer/smakefile

@@ -1 +1 @@
 include $(SOPHYABASE)/include/sophyamake.inc
+
  
 all: $(SOPHYALIBP)libFitsIOServer.a
  
 clean:
-         rm -f $(SOPHYAOBJP)datacirclefits.o $(SOPHYAOBJP)fabtcolread.o $(SOPHYAOBJP)fabtwriter.o $(SOPHYAOBJP)fboloread.o $(SOPHYAOBJP)fbtntintf.o $(SOPHYAOBJP)fitsautoreader.o $(SOPHYAOBJP)fitsbntbllineRW.o $(SOPHYAOBJP)fitsfile.o $(SOPHYAOBJP)fitslocalmap.o $(SOPHYAOBJP)fitsntuple.o $(SOPHYAOBJP)fitsspherehealpix.o $(SOPHYAOBJP)fitsspherethetaphi.o $(SOPHYAOBJP)fitstarray.o $(SOPHYAOBJP)fitsxntuple.o
+         rm -f $(SOPHYAOBJP)datacirclefits.o $(SOPHYAOBJP)fabtcolread.o $(SOPHYAOBJP)fabtwriter.o $(SOPHYAOBJP)fboloread.o $(SOPHYAOBJP)fbtntintf.o $(SOPHYAOBJP)fitsautoreader.o $(SOPHYAOBJP)fitsbntbllineRW.o $(SOPHYAOBJP)fitsfile.o $(SOPHYAOBJP)fitslocalmap.o $(SOPHYAOBJP)fitsntuple.o $(SOPHYAOBJP)fitsspherehealpix.o $(SOPHYAOBJP)fitsspherethetaphi.o $(SOPHYAOBJP)fitsswapper.o $(SOPHYAOBJP)fitstarray.o $(SOPHYAOBJP)fitsxntuple.o
         rm -f $(SOPHYALIBP)libFitsIOServer.a
  
-$(SOPHYALIBP)libFitsIOServer.a : $(SOPHYAOBJP)datacirclefits.o $(SOPHYAOBJP)fabtcolread.o $(SOPHYAOBJP)fabtwriter.o $(SOPHYAOBJP)fboloread.o $(SOPHYAOBJP)fbtntintf.o $(SOPHYAOBJP)fitsautoreader.o $(SOPHYAOBJP)fitsbntbllineRW.o $(SOPHYAOBJP)fitsfile.o $(SOPHYAOBJP)fitslocalmap.o $(SOPHYAOBJP)fitsntuple.o $(SOPHYAOBJP)fitsspherehealpix.o $(SOPHYAOBJP)fitsspherethetaphi.o $(SOPHYAOBJP)fitstarray.o $(SOPHYAOBJP)fitsxntuple.o
+$(SOPHYALIBP)libFitsIOServer.a : $(SOPHYAOBJP)datacirclefits.o $(SOPHYAOBJP)fabtcolread.o $(SOPHYAOBJP)fabtwriter.o $(SOPHYAOBJP)fboloread.o $(SOPHYAOBJP)fbtntintf.o $(SOPHYAOBJP)fitsautoreader.o $(SOPHYAOBJP)fitsbntbllineRW.o $(SOPHYAOBJP)fitsfile.o $(SOPHYAOBJP)fitslocalmap.o $(SOPHYAOBJP)fitsntuple.o $(SOPHYAOBJP)fitsspherehealpix.o $(SOPHYAOBJP)fitsspherethetaphi.o $(SOPHYAOBJP)fitsswapper.o $(SOPHYAOBJP)fitstarray.o $(SOPHYAOBJP)fitsxntuple.o
         $(AR) $(ARFLAGS) $@ $? 
         touch $(SOPHYAINCP)/SophyaConfInfo/libextsophya.objlist
@@ -312 +313 @@
         $(CXXCOMPILE) $(CXXTEMPFLG) -o $@  fitsspherethetaphi.cc
  
+$(SOPHYAOBJP)fitsswapper.o: fitsswapper.cc fitsswapper.h \
+  $(SOPHYAINCP)machdefs.h \
+  $(SOPHYAINCP)swsegdb.h \
+  $(SOPHYAINCP)segdatablock.h \
+  $(SOPHYAINCP)anydataobj.h \
+  $(SOPHYAINCP)pexceptions.h \
+  $(SOPHYAINCP)FitsIO/fitsio.h \
+  $(SOPHYAINCP)FitsIO/longnam.h \
+  $(SOPHYAINCP)sopnamsp.h
+        $(CXXCOMPILE) $(CXXTEMPFLG) -o $@  fitsswapper.cc
+ 
 $(SOPHYAOBJP)fitstarray.o: fitstarray.cc \
   $(SOPHYAINCP)sopnamsp.h \