Changeset 297 in Sophya

Timestamp:

May 16, 1999, 3:46:30 AM (26 years ago)

Author:

ansari

Message:

NTuple: Compatibilite NTupleInterface - Reza 15/5/99

Location:

trunk/SophyaLib/NTools

Files:

• ntuple.cc (modified) (9 diffs)
• ntuple.h (modified) (2 diffs)

trunk/SophyaLib/NTools/ntuple.cc

@@ -27 +27 @@
 mNVar = mNEnt = mBlk = mNBlk = 0;
 mVar = NULL;
+mVarD = NULL;
 mNames = NULL;
 mInfo = NULL;
@@ -42 +43 @@
 mNVar = mNEnt = mBlk = mNBlk = 0;
 mVar = NULL;
+mVarD = NULL;
 mNames = NULL;
 mInfo = NULL;
@@ -47 +49 @@
 mNVar = nvar;
 mVar = new r_4[nvar];
+mVarD = new r_8[nvar];
 if (blk < 10) blk = 10;
 mBlk = blk;
@@ -70 +73 @@
 mNVar = mNEnt = mBlk = mNBlk = 0;
 mVar = NULL;
+mVarD = NULL;
 mNames = NULL;
 mInfo = NULL;
@@ -86 +90 @@
 {
 if (mVar) delete[] mVar;
+if (mVarD) delete[] mVarD;
 if (mNames)  delete[] mNames;
 if (mInfo) delete mInfo;
@@ -93 +98 @@
 mNVar = mNEnt = mBlk = mNBlk = 0;
 mVar = NULL;
+mVarD = NULL;
 mNames = NULL;
 return;
@@ -190 +196 @@
 
 
+  
 /* --Methode-- */
 //++
@@ -207 +214 @@
 int offb = n-numb*mBlk;
 memcpy(ret, (mPtr[numb]+offb*mNVar), mNVar*sizeof(r_4));
+return(ret);
+}
+
+/* --Methode-- */
+//++
+r_8* NTuple::GetVecD(int n, r_8* ret)   const
+//
+//      Retourne l'evenement `n' dans le vecteur `ret'.
+//--
+{
+int i;
+if (ret == NULL)   ret = mVarD;
+float *  fr = GetVec(n);
+for(i=0; i<mNVar; i++)   ret[i] = fr[i];
 return(ret);
 }
@@ -337 +358 @@
 mNames = new char[mNVar*LENNAME1];
 mVar = new r_4[mNVar];
+mVarD = new r_8[mNVar];
 s.GetBytes(mNames, mNVar*LENNAME1);
 s.GetI4(mNEnt);

trunk/SophyaLib/NTools/ntuple.h

@@ -41 +41 @@
 
   r_4*              GetVec(int n, r_4* ret=NULL)  const ;
+  r_8*              GetVecD(int n, r_8* ret=NULL)  const ;
 
   void              GetMinMax(int k, float& min, float& max)   const ; 
@@ -64 +65 @@
   int_4 mNVar, mNEnt, mBlk, mNBlk;
   r_4* mVar;
+  r_8* mVarD;
   char* mNames;