Changeset 2858 in Sophya for trunk/SophyaProg

Timestamp:

Dec 13, 2005, 9:17:38 AM (20 years ago)

Author:

ansari

Message:

Adaptation prog test FitsSwapper aux modifs de la classe - Reza 13/12/2005

File:

• trunk/SophyaProg/Tests/tswfits.cc (modified) (4 diffs)

trunk/SophyaProg/Tests/tswfits.cc

@@ -7 +7 @@
 #include "histinit.h"
 #include "dvlist.h"
-#include "datatable.h"
-#include "swppfdtable.h"
-#include "fabtwriter.h"
-#include "fabtcolread.h"
+// #include "datatable.h"
+// #include "swppfdtable.h"
 #include "fitsswapper.h"
 
@@ -28 +26 @@
   }
   catch(PThrowable exc ) {
-    cerr << "tnt-main() , Catched exception: \n" << exc.Msg() << endl;
+    cerr << "tswfits-main() , Catched exception: \n" << exc.Msg() << endl;
   }
   catch(std::exception ex) {
-    cerr << "tnt-main() , Catched exception ! " << (string)(ex.what()) << endl;
+    cerr << "tswfits-main() , Catched exception ! " << (string)(ex.what()) << endl;
   }
   catch(...) {
-    cerr << "tnt-main() , Catched ... ! " << endl;
+    cerr << "tswfits-main() , Catched ... ! " << endl;
   }
 }
@@ -46 +44 @@
     {
       cout << " Creation FITSDataSwapper<double> swout(so) avec swseg.fits " << endl;
-      FitsABTWriter so("!swseg.fits", BINARY_TBL, 0);
-      so.SetExtName("SwapMyExt");
-      int col = so.AddCol("SwapColD", NULL, "unit1", TDOUBLE);  
-      so.Write(col, 0, 88888);
-      so.Print();
+      vector<string> ttype, tform, tunit;
+      ttype.push_back("D-Col1");
+      tform.push_back("D");
+      tunit.push_back("");
+      //      ttype.push_back("I-Col2");
+      //      tform.push_back("J");
+      //      tunit.push_back("");
+      string tblnm = "SwapMyExt";
+      FitsInOutFile fiosc("!swseg.fits", FitsInOutFile::Fits_Create);
+      //      fiosc.MoveAbsToHDU(2);
+      cout << " DBG-Appel CreateTable ... " << endl;
+      fiosc.CreateTable(BINARY_TBL, "rzbintbl", ttype, tform, tunit);
       cout << " ---- Appel a FITSDataSwapper<double> --- " << endl;
-      FITSDataSwapper<double> swout(so.GetFitsPtr(),0 );
+      FITSDataSwapper<double> swout(&fiosc, 1);
       SwSegDataBlock<double> swsd(swout, SWSEGSZ, 3);
+      //      FITSDataSwapper<int_4> swout(&fiosc, 1);
+      //      SwSegDataBlock<int_4> swsd(swout, SWSEGSZ, 3);
       double * fp = swsd.GetSegment(0);
       fp[0] = 6.54321;   fp[1] = 65.4321;  fp[2] = 654.321;  fp[3] = 6543.21;
@@ -67 +74 @@
     {
       cout << "6/ Creation PPFDataSwapper<float> avec lecture depuis swseg.ppf " << endl;
-      FitsOpenFile si("swseg.fits");
-      si.MoveToFirst(BINARY_TBL);
-      FITSDataSwapper<double> swin(si.GetFitsPtr(), 0);
+      FitsInOutFile si("swseg.fits", FitsInOutFile::Fits_RO);
+      si.MoveAbsToHDU(2);
+      FITSDataSwapper<double> swin(&si, 1);
       SwSegDataBlock<double> swsd(swin, tags, SWSEGSZ);
       cout <<"7/ Recopie ds SegDataBlock<float> depuis SwSegDataBlock<float> et print" << endl;