Changeset 1225 in Sophya

Timestamp:

Oct 11, 2000, 7:27:23 PM (25 years ago)

Author:

ansari

Message:

Ajout de datatype.cc .h , correction ds MuTyV et DVList - CMV+Reza 11/10/2000

Location:

trunk/SophyaLib/BaseTools

Files:

• Makefile (modified) (2 diffs)
• datatype.cc (added)
• datatype.h (added)
• dvlist.cc (modified) (4 diffs)
• mutyv.cc (modified) (3 diffs)
• objlist.list (modified) (1 diff)
• sversion.h (modified) (1 diff)

trunk/SophyaLib/BaseTools/Makefile

@@ -3 +3 @@
 all: $(LIB)libSysTools.a
 clean:
-        rm -f $(OBJ)ctimer.o $(OBJ)datacards.o $(OBJ)dvlist.o $(OBJ)fiondblock.o $(OBJ)mutyv.o $(OBJ)ndatablock.o $(OBJ)pdlmgr.o $(OBJ)periodic.o $(OBJ)pexceptions.o $(OBJ)ppersist.o $(OBJ)psighand.o $(OBJ)sophyainit.o $(OBJ)utils.o $(OBJ)gnumd5.o $(OBJ)srandgen.o $(OBJ)strutil.o $(OBJ)timing.o
+        rm -f $(OBJ)ctimer.o $(OBJ)datacards.o $(OBJ)datatype.o $(OBJ)dvlist.o $(OBJ)fiondblock.o $(OBJ)mutyv.o $(OBJ)ndatablock.o $(OBJ)pdlmgr.o $(OBJ)periodic.o $(OBJ)pexceptions.o $(OBJ)ppersist.o $(OBJ)psighand.o $(OBJ)sophyainit.o $(OBJ)utils.o $(OBJ)gnumd5.o $(OBJ)srandgen.o $(OBJ)strutil.o $(OBJ)timing.o
         rm -f $(LIB)libSysTools.a
-$(LIB)libSysTools.a : $(OBJ)ctimer.o $(OBJ)datacards.o $(OBJ)dvlist.o $(OBJ)fiondblock.o $(OBJ)gnumd5.o $(OBJ)mutyv.o $(OBJ)ndatablock.o $(OBJ)pdlmgr.o $(OBJ)periodic.o $(OBJ)pexceptions.o $(OBJ)ppersist.o $(OBJ)psighand.o $(OBJ)sophyainit.o $(OBJ)srandgen.o $(OBJ)strutil.o $(OBJ)timing.o $(OBJ)utils.o
+$(LIB)libSysTools.a : $(OBJ)ctimer.o $(OBJ)datacards.o $(OBJ)datatype.o $(OBJ)dvlist.o $(OBJ)fiondblock.o $(OBJ)gnumd5.o $(OBJ)mutyv.o $(OBJ)ndatablock.o $(OBJ)pdlmgr.o $(OBJ)periodic.o $(OBJ)pexceptions.o $(OBJ)ppersist.o $(OBJ)psighand.o $(OBJ)sophyainit.o $(OBJ)srandgen.o $(OBJ)strutil.o $(OBJ)timing.o $(OBJ)utils.o
         $(ARCXX) $(ARCXXFLAGS) $@ $?
 ifeq ($(CXX),cxx)
@@ -13 +13 @@
 $(OBJ)ctimer.o: ctimer.cc machdefs.h ctimer.h
 $(OBJ)datacards.o: datacards.cc machdefs.h datacards.h pexceptions.h
+$(OBJ)datatype.o: datatype.cc datatype.h machdefs.h
 $(OBJ)dvlist.o: dvlist.cc machdefs.h dvlist.h objfio.h anydataobj.h \
  ppersist.h pexceptions.h gnumd5.h mutyv.h strutil.h

trunk/SophyaLib/BaseTools/dvlist.cc

@@ -199 +199 @@
 ValList::const_iterator it = mvlist.find(key);
 if (it == mvlist.end())  return(def);
-return((*it).second.elval.iv);
+return( (int_8)((*it).second.elval) );
 }
 
@@ -209 +209 @@
 ValList::const_iterator it = mvlist.find(key);
 if (it == mvlist.end())  return(def);
-return((*it).second.elval.dv);
+return( (r_8)((*it).second.elval) );
 }
 
@@ -219 +219 @@
 ValList::const_iterator it = mvlist.find(key);
 if (it == mvlist.end())  return(def);
-return((*it).second.elval.dv);
+return( (complex<r_8>)((*it).second.elval) );
 }
 
@@ -229 +229 @@
 ValList::const_iterator it = mvlist.find(key);
 if (it == mvlist.end())  return(def);
-return(*((*it).second.elval.strv));
+return( (string)((*it).second.elval) );
 }
 

trunk/SophyaLib/BaseTools/mutyv.cc

@@ -70 +70 @@
 {
   typ = a.typ;  iv = a.iv;  dv = a.dv;  dv_im = a.dv_im; 
-  if (typ == 'S')  strv = new string(*(a.strv));
-  else strv = NULL;
+  if (typ == 'S')  { 
+    if (strv) *strv = *(a.strv);  
+    else strv = new string(*(a.strv));
+  }
   return(*this);
 }
@@ -79 +81 @@
 {
   typ = 'S';
-  strv = new string(s);
+  if (strv) *strv = s;  
+  else strv = new string(s);
   mutyv_decodestr(s, dv, dv_im);
   iv = (int_8)dv;
@@ -89 +92 @@
 {
   typ = 'S';
-  strv = new string(s);
+  if (strv) *strv = s;  
+  else strv = new string(s);
   mutyv_decodestr(s.c_str(), dv, dv_im);
   iv = (int_8)dv;

trunk/SophyaLib/BaseTools/objlist.list

@@ -1 +1 @@
 ctimer.o
 datacards.o
+datatype.o
 dvlist.o
 fiondblock.o

trunk/SophyaLib/BaseTools/sversion.h

@@ -3 +3 @@
 
 #define SOPHYA_VERSION   0.9 
-#define SOPHYA_REVISION  91
-#define SOPHYA_TAG       "V_Aou2000"
+#define SOPHYA_REVISION  93
+#define SOPHYA_TAG       "V_Sep2000"
 
 #endif