Merge branch 'star-bnl:main' into main

Author: klendathu2k

StRoot/St_geant_Maker/GtHash.cxx

@@ -1,11 +1,11 @@
-#include "TMath.h"
 #include "GtHash.h"
+#include "TString.h"
 
 class GtCradle : public TObject 
 {
 public:
   Int_t  	fNWords; 		// number of words in array
-  ULong_t	*fArray; 		// array
+  UInt_t	*fArray; 		// array
   void 		*fPointer;		// user pointer
 
 GtCradle(int n); 
@@ -19,26 +19,26 @@ GtCradle(int n);
 GtCradle::GtCradle(int n)
 {
  fNWords = n;
- fArray  = new ULong_t[fNWords]; 
+ fArray  = new UInt_t[fNWords]; 
  fPointer=0;
 }
 
 Bool_t GtCradle::IsEqual(const TObject* obj) const
 { 
   GtCradle *He = (GtCradle*)obj;
   if (fNWords != He->fNWords) return 0; 
-  ULong_t *me  = fArray;
-  ULong_t *he  = He->fArray;
+  UInt_t *me  = fArray;
+  UInt_t *he  = He->fArray;
   if (me[0]   != he[0]) return 0; 
   for (int i=1; i<fNWords; i++) if (me[i]!=he[i]) return 0;
   return 1;
 }
 ULong_t GtCradle::Hash() const
 { 
-  ULong_t *me = (ULong_t *)fArray;
-  ULong_t ret = fNWords;
+  UInt_t *me = (UInt_t *)fArray;
+  UInt_t ret = fNWords;
 //VP  for (int i=0; i<fNWords; i++) ret ^= me[i];
-  ret = TMath::Hash(me,fNWords*sizeof(ULong_t));
+  ret = TString::Hash(me,fNWords*sizeof(UInt_t));
 
   return ret;
 }
@@ -50,7 +50,7 @@ void *GtHash::GetPointer(void *array,Int_t narray)
     if (fPoka) delete fPoka;
     fPoka = new GtCradle(narray);}
 
-  memcpy(fPoka->fArray,array,narray*sizeof(ULong_t));
+  memcpy(fPoka->fArray,array,narray*sizeof(UInt_t));
 
   fFound = (GtCradle*)FindObject(fPoka);
   if (!fFound) return 0;