Changeset 1082 in Sophya

Timestamp:

Jul 24, 2000, 2:51:50 PM (25 years ago)

Author:

ansari

Message:

Adaptation modifs MuTyV - Reza 24/7/2000

Location:

trunk

Files:

• SophyaExt/FitsIOServer/fitsfile.cc (modified) (3 diffs)
• SophyaExt/FitsIOServer/fitsioserver.cc (modified) (9 diffs)
• SophyaProg/Tests/tnt.cc (modified) (3 diffs)

trunk/SophyaExt/FitsIOServer/fitsfile.cc

@@ -903 +903 @@
         case 'I' :
           {
-            int ival=(*it).second.elval.mtv.iv;
+            int ival=(*it).second.elval.iv;
             strncpy(comment,(*it).second.elcomm.c_str(),FLEN_COMMENT );
             fits_write_key(fptr_,TINT,keyname,&ival,comment,&status);
@@ -910 +910 @@
         case 'D' :
           {
-            double dval=(*it).second.elval.mtv.dv;
+            double dval=(*it).second.elval.dv;
             strncpy(comment,(*it).second.elcomm.c_str(),FLEN_COMMENT );
             fits_write_key(fptr_,TDOUBLE,keyname,&dval,comment,&status);
@@ -918 +918 @@
           {
             char strval[128];
-            strncpy(strval,(*it).second.elval.mtv.strv,127);
+            strncpy(strval,(*it).second.elval.strv->c_str(),127);
             strncpy(comment,(*it).second.elcomm.c_str(),FLEN_COMMENT );
             fits_write_key(fptr_,TSTRING,keyname,&strval,comment,&status);

trunk/SophyaExt/FitsIOServer/fitsioserver.cc

@@ -996 +996 @@
         case 'I' :
           {
-            int ival=(*it).second.elval.mtv.iv;
+            int ival=(*it).second.elval.iv;
             strcpy(comment,"I entier");
             fits_write_key(fptr,TINT,keyname,&ival,comment,&status);
@@ -1003 +1003 @@
         case 'D' :
           {
-            double dval=(*it).second.elval.mtv.dv;
+            double dval=(*it).second.elval.dv;
             strcpy(comment,"D double");
             fits_write_key(fptr,TDOUBLE,keyname,&dval,comment,&status);
@@ -1011 +1011 @@
           {
             char strval[128];
-            strncpy(strval,(*it).second.elval.mtv.strv,127);
+            strncpy(strval,(*it).second.elval.strv->c_str(),127);
             strcpy(comment,"S character string");
             fits_write_key(fptr,TSTRING,keyname,&strval,comment,&status);
@@ -1407 +1407 @@
         {
         case TINT :
-          ival=(*it).second.elval.mtv.iv;
+          ival=(*it).second.elval.iv;
           strcpy(comment,"I entier");
 //DBG          cerr << " Writing I " << (string)keyname << " = " << ival << endl;
@@ -1413 +1413 @@
           break;
         case TDOUBLE :
-          dval=(*it).second.elval.mtv.dv;
+          dval=(*it).second.elval.dv;
           strcpy(comment,"D double");
 //DBG          cerr << " Writing D " << (string)keyname << " = " << dval << endl;
@@ -1419 +1419 @@
           break;
         case TSTRING :
-          strncpy(strval, (*it).second.elval.mtv.strv, 128); strval[127] = '\0';
+          strncpy(strval, (*it).second.elval.strv->c_str(), 128); strval[127] = '\0';
           strcpy(comment,"S character string");
 //DBG          cerr << " Writing S " << (string)keyname << " = " << (string)strval << endl;
@@ -1598 +1598 @@
         {
         case TINT :
-          ival=(*it).second.elval.mtv.iv;
+          ival=(*it).second.elval.iv;
           strcpy(comment," ");
 //DBG          cerr << " Writing I " << (string)keyname << " = " << ival << endl;
@@ -1604 +1604 @@
           break;
         case TDOUBLE :
-          dval=(*it).second.elval.mtv.dv;
+          dval=(*it).second.elval.dv;
           strcpy(comment," ");
 //DBG          cerr << " Writing D " << (string)keyname << " = " << dval << endl;
@@ -1610 +1610 @@
           break;
         case TSTRING :
-          strncpy(strval, (*it).second.elval.mtv.strv, 128); strval[127] = '\0';
+          strncpy(strval, (*it).second.elval.strv->c_str(), 128); strval[127] = '\0';
           strcpy(comment," ");
 //DBG          cerr << " Writing S " << (string)keyname << " = " << (string)strval << endl;

trunk/SophyaProg/Tests/tnt.cc

@@ -96 +96 @@
 dvl.SetD("DV1-0.2", 0.2);
 dvl.SetD("DV2-4.5", 4.5);
+dvl.SetZ("ZV", complex<r_8>(2.0,-1.44));
 
 dvl.SetI("IVV3-783", 783);
@@ -113 +114 @@
 float f = dvl("DVV3");
 int i = dvl("IVV3-783");
+complex<r_8> z = dvl("ZV");
 
 printf("\n \n Essai1 (IVV3 DVV3 DV2= ) %d  %.20g  %g \n", i, f, (float)d);
+printf("\n \n Essai ZV= (%.2g  %g I) \n", z.real(), z.imag());
 cout << "Test Comment/IntegerValue: " << dvl.GetComment("IntegerValue") << endl;
 cout << "Test Comment/DVV3: " << dvl.GetComment("DVV3") << endl;
@@ -135 +138 @@
  double df1 = (double)( dvlr["DVV3"] );
  double df2 = (double)3.141592652141592652 - df1;
- cout << " Test Precision : Pi-Pi= " << df1  << "DVV3= " << df1 << endl;
+ cout << " Test Precision : Pi-Pi= " << df2  << "DVV3= " << df1 << endl;
 
  cout << dvlr;