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

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

Files:

• History (modified) (1 diff)
• include/G4Fancy3DNucleus.hh (modified) (1 diff)
• include/G4Nucleon.hh (modified) (1 diff)
• src/G4Fancy3DNucleus.cc (modified) (11 diffs)
• src/G4KineticTrack.cc (modified) (1 diff)
• src/G4Nucleon.cc (modified) (1 diff)

trunk/source/processes/hadronic/models/util/History

@@ -14 +14 @@
      * Please list in reverse chronological order (last date on top)
      ---------------------------------------------------------------
+
+19 November 2009 Gunter Folger     hadr-mod-util-V09-02-04
+-  Restore methods storing/retrieving G4SplitableHadron*, 
+   now in use in FTF
+
+13-November 2009 Gunter Folger     hadr-mod-util-V09-02-03
+--------------------------------------------------------
+- Correct use of G4ThreeVector, ie. avoid vector=0;
+
+19 December 2008 V, Uzhinsky (hadr-mod-util-V09-02-02)
+--------------------------------------------------------
+New method (SortNucleonsDecZ()) for sorting nucleons on decreasing Z-coordanates 
+is inserted in G4Fancy3DNucleus class. It is needed for nucleus-nucleus collision.
+SortNucleonsInc() is re-named in SortNucleonsIncZ().
+
+12 December 2008 Gunter Folger    (hadr-mod-util-V09-02-01)
+-------------------------------------------------------
+-  Correct G4Nucleon: typo, and ctor need to init isHit
+
+10 December 2008 Gunter Folger    (hadr-mod-util-V09-02-00)
+-------------------------------------------------------
+-  G4Nucleon.hh: Hit was storing G4SplitableHadron*, but this is no
+   longer used. Can use bool isHit instead. Avoids confusing reinterpret_cast. 
 
 24 October 2008 Dennis Wright (hadr-mod-util-V09-01-07)

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:
 

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

@@ -68 +68 @@
   if(theNucleons) delete [] theNucleons;
 
-// this was delected already:
-//  std::for_each(theRWNucleons.begin(), theRWNucleons.end(), DeleteNucleon());
   theRWNucleons.clear();
 
@@ -119 +117 @@
 }
 
-
 const std::vector<G4Nucleon *> & G4Fancy3DNucleus::GetNucleons()
 {
@@ -132 +129 @@
 }
 
+//void G4Fancy3DNucleus::SortNucleonsIncZ() // on increased Z-coordinates Uzhi 29.08.08
+
    bool G4Fancy3DNucleusHelperForSortInZ(const G4Nucleon* nuc1, const G4Nucleon* nuc2)
 {
@@ -137 +136 @@
 }    
 
-void G4Fancy3DNucleus::SortNucleonsInZ()
+//void G4Fancy3DNucleus::SortNucleonsInZ()
+void G4Fancy3DNucleus::SortNucleonsIncZ() // on increased Z-coordinates Uzhi 29.08.08
 {
         
@@ -162 +162 @@
 }
 
+void G4Fancy3DNucleus::SortNucleonsDecZ() // on decreased Z-coordinates Uzhi 29.08.08
+{
+        G4Nucleon * sortedNucleons = new G4Nucleon[myA];
+        
+        GetNucleons();   // make sure theRWNucleons is initialised
+
+        if (theRWNucleons.size() < 2 ) return; 
+        sort( theRWNucleons.begin(),theRWNucleons.end(),G4Fancy3DNucleusHelperForSortInZ); 
+
+// now copy sorted nucleons to theNucleons array. TheRWNucleons are pointers in theNucleons
+//  so we need to copy to new, and then swap. 
+        for ( unsigned int i=0; i<theRWNucleons.size(); i++ )
+        {
+           sortedNucleons[i]= *(theRWNucleons[myA-1-i]);  // Uzhi 29.08.08
+        }
+        theRWNucleons.clear();   // about to delete array elements these point to....
+        delete [] theNucleons;
+        theNucleons=sortedNucleons;
+
+        return;
+}
 
 G4double G4Fancy3DNucleus::BindingEnergy()
@@ -300 +321 @@
         G4double arand[600];
         G4double *prand=arand;
-//      G4int Attempt=0;
         while ( i < myA )
         {
            do
            {    
-//              ++Attempt;
                 if ( jr < 3 ) 
                 {
@@ -350 +369 @@
            }
         }
-//      G4cout << "Att " << myA << " " << Attempt << G4endl;
 
 }
@@ -384 +402 @@
               {
                   G4cerr << "G4Fancy3DNucleus: difficulty finding proton momentum" << G4endl;
-                  mom=0;
+                  mom=G4ThreeVector(0,0,0);
               }
 
@@ -400 +418 @@
 //     ;
 //     G4cout << "final sum / mag() " << sum << " / " << sum.mag() << G4endl;
-
 
     G4double energy;
@@ -531 +548 @@
         // Now we have a nucleon with a bigger Fermi Momentum.
         // Exchange with last nucleon.. and iterate.
-//      G4cout << " Nucleon to swap with : " << swapit << G4endl;
-//      G4cout << " Fermi momentum test, and better.. " << PFermi << " / "
-//             << theFermi.GetFermiMomentum(density) << G4endl;
-//      cout << theNucleons[swapit]<< G4endl << theNucleons[myA-1] << G4endl;
-//      cout << momentum[swapit] << G4endl << momentum[myA-1] << G4endl;
         G4Nucleon swap= theNucleons[swapit];
         G4ThreeVector mom_swap=momentum[swapit];
@@ -545 +557 @@
         momentum[myA-1]=mom_swap;
         pFermiM[myA-1]=pf;
-//      cout << "after swap" <<G4endl<< theNucleons[swapit] << G4endl << theNucleons[myA-1] << G4endl;
-//      cout << momentum[swapit] << G4endl << momentum[myA-1] << G4endl;
         return ReduceSum(momentum,pFermiM);
 }

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

@@ -487 +487 @@
 //   Select a possible decay channel
 //
-  //  G4int index1;
-  //  for (index1 = nChannels - 1; index1 >= 0; index1--)
-    //  cout << "DECAY Actual Width IND/ActualW " << index1 << "  " << theActualWidth[index1] << G4endl;
-    //  cout << "DECAY Actual Mass " << theActualMass << G4endl;
+/*
+    G4int index1;
+    for (index1 = nChannels - 1; index1 >= 0; index1--)
+      G4cout << "DECAY Actual Width IND/ActualW " << index1 << "  " << theActualWidth[index1] << G4endl;
+      G4cout << "DECAY Actual Mass " << theActualMass << G4endl;
+*/
  
  G4int chargeBalance = G4lrint(theDefinition->GetPDGCharge() );     

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

@@ -37 +37 @@
 
 G4Nucleon::G4Nucleon()
-: theBindingE(0.) , theParticleType(NULL), theSplitableHadron(NULL)
+: theBindingE(0.) , theParticleType(0), theSplitableHadron(0)
 {}