Changeset 1340 for trunk/source/processes/hadronic/models/util/src/G4Fancy3DNucleus.cc

Timestamp:

Nov 5, 2010, 3:45:55 PM (14 years ago)

Author:

garnier

Message:

update ti head

File:

• trunk/source/processes/hadronic/models/util/src/G4Fancy3DNucleus.cc (modified) (4 diffs)

trunk/source/processes/hadronic/models/util/src/G4Fancy3DNucleus.cc

@@ -61 +61 @@
 }
 
-
+#if defined(NON_INTEGER_A_Z)
 void G4Fancy3DNucleus::Init(G4double theA, G4double theZ)
+{
+  G4int intZ = G4int(theZ);
+  G4int intA= ( G4UniformRand()>theA-G4int(theA) ) ? G4int(theA) : G4int(theA)+1;
+   // forward to integer Init()
+  Init(intA, intZ);
+
+}
+#endif
+
+void G4Fancy3DNucleus::Init(G4int theA, G4int theZ)
 {
 //  G4cout << "G4Fancy3DNucleus::Init(theA, theZ) called"<<G4endl;
@@ -70 +80 @@
   theRWNucleons.clear();
 
-  myZ = G4int(theZ);
-  myA= ( G4UniformRand()>theA-G4int(theA) ) ? G4int(theA) : G4int(theA)+1;
+  myZ = theZ;
+  myA= theA;
 
   theNucleons = new G4Nucleon[myA];
@@ -144 +154 @@
         if (theRWNucleons.size() < 2 ) return; 
 
-        sort( theRWNucleons.begin(),theRWNucleons.end(),G4Fancy3DNucleusHelperForSortInZ); 
+        std::sort( theRWNucleons.begin(),theRWNucleons.end(),G4Fancy3DNucleusHelperForSortInZ); 
 
 // now copy sorted nucleons to theNucleons array. TheRWNucleons are pointers in theNucleons
@@ -169 +179 @@
 
         if (theRWNucleons.size() < 2 ) return; 
-        sort( theRWNucleons.begin(),theRWNucleons.end(),G4Fancy3DNucleusHelperForSortInZ); 
+        std::sort( theRWNucleons.begin(),theRWNucleons.end(),G4Fancy3DNucleusHelperForSortInZ); 
 
 // now copy sorted nucleons to theNucleons array. TheRWNucleons are pointers in theNucleons