Changeset 1155 in Sophya

Timestamp:

Aug 29, 2000, 6:08:46 PM (25 years ago)

Author:

ansari

Message:

Introduction numero de version ds ecriture PPersist NTuple - Reza 29/8/2000

File:

• trunk/SophyaLib/HiStats/ntuple.cc (modified) (3 diffs)

trunk/SophyaLib/HiStats/ntuple.cc

@@ -545 +545 @@
 //--
 {
-char strg[256];
-if (dobj->mInfo)  sprintf(strg, "NVar=%6d  NEnt=%9d  BlkSz=%6d NBlk=%6d  HasInfo", 
-                          (int)dobj->mNVar, (int)dobj->mNEnt, (int)dobj->mBlk, (int)dobj->mNBlk);
-else sprintf(strg, "NVar=%6d  NEnt=%9d  BlkSz=%6d NBlk=%6d ", 
-                   (int)dobj->mNVar, (int)dobj->mNEnt, (int)dobj->mBlk, (int)dobj->mNBlk);
-s.PutLine(strg);
-s.PutI4(dobj->mNVar);
+if (dobj == NULL)   return;
+
+// On ecrit cette chaine pour compatibilite avec l'ancienne version 
+string strg = "NTuple";
+s.Put(strg);
+
+//  On ecrit 3 uint_4 .... 
+//  0: Numero de version,  1 : non nul -> has info,  2 : reserve
+uint_4 itab[3];
+itab[0] = 2;  // Numero de version a 1
+itab[1] = itab[2] = 0;
+if (dobj->mInfo)  itab[1] = 1;
+s.Put(itab, 3);
+
+s.Put(dobj->mNVar);
 s.PutBytes(dobj->mNames, dobj->mNVar*LENNAME1);
-s.PutI4(dobj->mNEnt);
-s.PutI4(dobj->mBlk);
-s.PutI4(dobj->mNBlk);
+s.Put(dobj->mNEnt);
+s.Put(dobj->mBlk);
+s.Put(dobj->mNBlk);
 if (dobj->mInfo)  s << (*(dobj->mInfo));
 int jb;
 for(jb=0; jb<dobj->mNBlk; jb++)
-  s.PutR4s(dobj->mPtr[jb], dobj->mNVar*dobj->mBlk); 
+  s.Put(dobj->mPtr[jb], dobj->mNVar*dobj->mBlk); 
 return;
 }
@@ -571 +579 @@
 {
 
-dobj->Clean();
-
-char strg[256];
-s.GetLine(strg, 255);
-// Pour savoir s'il y avait un DVList Info associe
+if (dobj == NULL) dobj = new NTuple;
+else dobj->Clean();
+
 bool hadinfo = false;
-if (strncmp(strg+strlen(strg)-7, "HasInfo", 7) == 0)  hadinfo = true;
-
-s.GetI4(dobj->mNVar);
+string strg;
+s.Get(strg);
+if (strg == "NTuple") {
+  uint_4 itab[3];
+  s.Get(itab, 3);
+  if (itab[1] != 0) hadinfo = true;
+}
+else {
+// Ancienne version de PPF NTuple - Pour savoir s'il y avait un DVList Info associe
+  char buff[256];
+  strcpy(buff, strg.c_str());
+  if (strncmp(buff+strlen(buff)-7, "HasInfo", 7) == 0)  hadinfo = true;
+}
+s.Get(dobj->mNVar);
 dobj->mNames = new char[dobj->mNVar*LENNAME1];
 dobj->mVar = new r_4[dobj->mNVar];
 dobj->mVarD = new r_8[dobj->mNVar];
 s.GetBytes(dobj->mNames, dobj->mNVar*LENNAME1);
-s.GetI4(dobj->mNEnt);
-s.GetI4(dobj->mBlk);
-s.GetI4(dobj->mNBlk);
+s.Get(dobj->mNEnt);
+s.Get(dobj->mBlk);
+s.Get(dobj->mNBlk);
 
 if (hadinfo) {    // Lecture eventuelle du DVList Info
@@ -597 +614 @@
   r_4* pt = new r_4[dobj->mNVar*dobj->mBlk];
   dobj->mPtr.push_back(pt);
-  s.GetR4s(dobj->mPtr[jb], dobj->mNVar*dobj->mBlk); 
+  s.Get(dobj->mPtr[jb], dobj->mNVar*dobj->mBlk); 
 }