Changeset 1196 for trunk/source/processes/hadronic/models/util/include

Timestamp:

Nov 25, 2009, 5:13:58 PM (16 years ago)

Author:

garnier

Message:

update CVS release candidate geant4.9.3.01

Location:

trunk/source/processes/hadronic/models/util/include

Files:

• G4Fancy3DNucleus.hh (modified) (1 diff)
• G4Nucleon.hh (modified) (1 diff)

trunk/source/processes/hadronic/models/util/include/G4Fancy3DNucleus.hh

@@ -85 +85 @@
       void DoTranslation(const G4ThreeVector & theShift);
       const G4VNuclearDensity * GetNuclearDensity() const;
-      void SortNucleonsInZ();
+      void SortNucleonsIncZ();            // on increased Z-coordinates Uzhi 29.08.08
+      void SortNucleonsDecZ();            // on decreased Z-coordinates Uzhi 29.08.08
       
   private:

trunk/source/processes/hadronic/models/util/include/G4Nucleon.hh

@@ -80 +80 @@
            void Boost(const G4LorentzVector & aMomentum);
 
-    inline void Hit(G4VSplitableHadron * aHit) { theSplitableHadron=aHit;}
+    inline void Hit(G4VSplitableHadron *aHit) { theSplitableHadron=aHit;}
+//    inline void Hit(G4int ) { isHit=true;}    
     inline void Hit(G4int ) 
     { 
       theSplitableHadron=reinterpret_cast<G4VSplitableHadron *>(1111); 
-      // G4cout << "$%$#%@%$#@%@%%% "<<theSplitableHadron<<G4endl;
     }
     inline G4VSplitableHadron * GetSplitableHadron() const { return theSplitableHadron;}
-    
-    inline G4bool AreYouHit() const 
-    { 
-      G4bool result = true;
-      if (theSplitableHadron==NULL) result = false;
-      return result;
-    }
-  
+    inline G4bool AreYouHit() const {  return theSplitableHadron!=0;}
+
   private: