Changeset 2845 in Sophya

Timestamp:

Nov 21, 2005, 9:31:32 AM (20 years ago)

Author:

ansari

Message:

modifs test nouveau fits suite codage I/O colonnes string et complex - Reza 21/11/2005

Location:

trunk/SophyaProg/Tests

Files:

• tfitsdt.cc (modified) (4 diffs)
• tnfits.cc (modified) (3 diffs)

trunk/SophyaProg/Tests/tfitsdt.cc

@@ -40 +40 @@
     dt.AddFloatColumn("f_sin");
     dt.AddDoubleColumn("f_x2");
+    dt.AddStringColumn("str_line");
+    dt.AddComplexColumn("cmplx_cos_sin");
     MuTyV rec[10];
+    char sbuff[32];
     cout << " Filling ... (NLines=" << NL << ")" << endl;
     for(int k = 0; k<NL; k++) {
@@ -49 +52 @@
       rec[2] = sin(x);
       rec[3] = x*x;
+      sprintf(sbuff, "SL-%d", k);
+      rec[4] = sbuff;
+      double sx = sin(x);
+      double cx = cos(x);
+      rec[5] = complex<r_4>(cx, sx);
       dt.AddLine(rec);
     }
@@ -69 +77 @@
     cout << dtr;
     cout << "2.b/  dtr.LineHeaderToString() dtr.LineToString(k)   : " << endl;
-    cout << dtr.LineHeaderToString() ;
+    cout << dtr.LineHeaderToString() << endl;
     for(int k = 0; k<NL; k+=NL/12) 
       cout << "Line[" << k << "] " << dtr.LineToString(k) << endl ;  
@@ -76 +84 @@
     fios >> dtra;
     cout << dtra;
+    cout << dtra.LineHeaderToString() << endl;
+    for(int k = 0; k<NL; k+=NL/12) 
+      cout << "Line[" << k << "] " << dtra.LineToString(k) << endl ;  
     
   }

trunk/SophyaProg/Tests/tnfits.cc

@@ -82 +82 @@
       float data[100];
       double data2[100];
+      string sdata[100];
+      MuTyV mtv;
       for(int kk=0; kk<100; kk++) { 
         data[kk] = kk/5.;
         data2[kk] = cos(data[kk]);
+        mtv = kk;
+        sdata[kk] = "Str_KK=";
+        sdata[kk] += (string)(mtv);
       }
       cout << " CurrHDU-2 : " << fiosc.CurrentHDU() 
@@ -99 +104 @@
       ttype.push_back("Col1");
       ttype.push_back("Col2");
+      ttype.push_back("Col3");
       tform.push_back("E");
       tform.push_back("D");
+      tform.push_back("18A");
+      tunit.push_back("");
       tunit.push_back("");
       tunit.push_back("");
@@ -118 +126 @@
       FitsBlockRW<float>::WriteColumnData(fiosc, 1, 1, 1, data, 100);
       FitsBlockRW<double>::WriteColumnData(fiosc, 2, 1, 1, data2, 100);
-      
+      FitsBlockRW<string>::WriteColumnData(fiosc, 3, 1, 1, sdata, 100);
+            
       // Ecriture entete
       DVList  dvl;