Changeset 962 for trunk/source/processes/hadronic/models/photolepton_hadron/muon_nuclear/src

Timestamp:

Apr 6, 2009, 12:30:29 PM (15 years ago)

Author:

garnier

Message:

update processes

Location:

trunk/source/processes/hadronic/models/photolepton_hadron/muon_nuclear/src

Files:

• G4MuNuclearInteraction.cc (modified) (11 diffs)
• G4MuonNucleusInteractionModel.cc (modified) (1 diff)
• G4ParametrizedHadronicVertex.cc (modified) (1 diff)

trunk/source/processes/hadronic/models/photolepton_hadron/muon_nuclear/src/G4MuNuclearInteraction.cc

@@ -24 +24 @@
 // ********************************************************************
 //
-//
-// $Id: G4MuNuclearInteraction.cc,v 1.7 2006/11/04 02:15:05 vnivanch Exp $
-// GEANT4 tag $Name:  $
+// $Id: G4MuNuclearInteraction.cc,v 1.12 2009/01/24 11:59:37 vnivanch Exp $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 // $Id: 
@@ -38 +37 @@
 //      added simple model for hadronic vertex, J.P. Wellisch, November 1998
 // --------------------------------------------------------------
-// 26/10/98: new corr.s from R.Kokoulin + cleanup , L.Urban
+// 26/10/1998: new corr.s from R.Kokoulin + cleanup , L.Urban
+// 23/01/2009  V.Ivanchenko Add deregistration
 //
+
 #include "G4MuNuclearInteraction.hh"
 #include "G4UnitsTable.hh"
+#include "G4HadronicProcessStore.hh"
 
 // static members ........
@@ -66 +68 @@
     theMuonPlus ( G4MuonPlus::MuonPlus() ),
     thePionZero (G4PionZero::PionZero() )
-{  }
+{  
+  SetProcessSubType(fHadronInelastic);
+  G4HadronicProcessStore::Instance()->RegisterExtraProcess(this);
+}
  
 G4MuNuclearInteraction::~G4MuNuclearInteraction()
 {
-   if (theMeanFreePathTable) {
-      theMeanFreePathTable->clearAndDestroy();
-      delete theMeanFreePathTable;
-   }
-   if (theCrossSectionTable) {
-      theCrossSectionTable->clearAndDestroy();
-      delete theCrossSectionTable;
-   }
-
-   if (&PartialSumSigma) {
-      PartialSumSigma.clearAndDestroy();
-   }
+  G4HadronicProcessStore::Instance()->DeRegisterExtraProcess(this);
+
+  if (theMeanFreePathTable) {
+    theMeanFreePathTable->clearAndDestroy();
+    delete theMeanFreePathTable;
+  }
+  if (theCrossSectionTable) {
+    theCrossSectionTable->clearAndDestroy();
+    delete theCrossSectionTable;
+  }
+
+  if (&PartialSumSigma) {
+    PartialSumSigma.clearAndDestroy();
+  }
 }
  
 void G4MuNuclearInteraction::SetPhysicsTableBining(G4double lowE,
-                                                  G4double highE, G4int nBins)
+                                                   G4double highE, G4int nBins)
 {
   LowestKineticEnergy = lowE; HighestKineticEnergy = highE ; TotBin = nBins ;
+}
+
+void G4MuNuclearInteraction::PreparePhysicsTable(
+                                    const G4ParticleDefinition& aParticleType)
+{
+  G4HadronicProcessStore::Instance()
+    ->RegisterParticleForExtraProcess(this, &aParticleType);
 }
 
@@ -93 +107 @@
                                     const G4ParticleDefinition& aParticleType)
 {
+  G4HadronicProcessStore::Instance()->PrintInfo(&aParticleType);
+
   G4double LowEdgeEnergy , Value;
   G4PhysicsLogVector* ptrVector;
    
   if (theCrossSectionTable) {
-      theCrossSectionTable->clearAndDestroy() ;
-      delete theCrossSectionTable ;
+    theCrossSectionTable->clearAndDestroy() ;
+    delete theCrossSectionTable ;
   }
 
@@ -111 +127 @@
   {
     ptrVector = new G4PhysicsLogVector(LowestKineticEnergy,
-                                         HighestKineticEnergy,TotBin) ;
+                                       HighestKineticEnergy,TotBin) ;
     AtomicNumber = (*theElementTable )[J]->GetZ() ;
     AtomicWeight = (*theElementTable )[J]->GetA() ;
@@ -119 +135 @@
       LowEdgeEnergy = ptrVector->GetLowEdgeEnergy(i) ;
       Value = ComputeMicroscopicCrossSection(&aParticleType,
-                                                 LowEdgeEnergy,
-                                                 AtomicNumber,AtomicWeight) ;
+                                             LowEdgeEnergy,
+                                             AtomicNumber,AtomicWeight) ;
       ptrVector->PutValue(i,Value) ;
     }
@@ -130 +146 @@
   const G4MaterialTable* theMaterialTable = G4Material::GetMaterialTable() ;
   if (theMeanFreePathTable) {
-     theMeanFreePathTable->clearAndDestroy();
-     delete theMeanFreePathTable;
+    theMeanFreePathTable->clearAndDestroy();
+    delete theMeanFreePathTable;
   }
   theMeanFreePathTable = new G4PhysicsTable(G4Material::GetNumberOfMaterials());
@@ -142 +158 @@
   { 
     ptrVector = new G4PhysicsLogVector(LowestKineticEnergy,
-                                         HighestKineticEnergy,
-                                         TotBin ) ;
+                                       HighestKineticEnergy,
+                                       TotBin ) ;
 
     const G4Material* material= (*theMaterialTable)[K];
@@ -167 +183 @@
 void G4MuNuclearInteraction::ComputePartialSumSigma(
                                    const G4ParticleDefinition* ParticleType,
-                                               G4double KineticEnergy,
-                                               const G4Material* aMaterial)
+                                   G4double KineticEnergy,
+                                   const G4Material* aMaterial)
 
 // Build the table of cross section per element. The table is built for MATERIALS.
@@ -183 +199 @@
 
    for ( G4int Ielem=0 ; Ielem < NbOfElements ; Ielem++ )
-      {             
-        SIGMA += theAtomNumDensityVector[Ielem] * 
-               ComputeMicroscopicCrossSection( ParticleType, KineticEnergy,
-                                        (*theElementVector)[Ielem]->GetZ(),
-                                        (*theElementVector)[Ielem]->GetA()) ;
-        PartialSumSigma[Imate]->push_back(SIGMA);
-      }
+     {             
+       SIGMA += theAtomNumDensityVector[Ielem] * 
+         ComputeMicroscopicCrossSection( ParticleType, KineticEnergy,
+                                         (*theElementVector)[Ielem]->GetZ(),
+                                         (*theElementVector)[Ielem]->GetA()) ;
+       PartialSumSigma[Imate]->push_back(SIGMA);
+     }
 }
 
@@ -529 +545 @@
   // select randomly 1 element within the material
 
-  const G4int Index = aMaterial->GetIndex();
-  const G4int NumberOfElements = aMaterial->GetNumberOfElements();
+  G4int Index = aMaterial->GetIndex();
+  G4int NumberOfElements = aMaterial->GetNumberOfElements();
   const G4ElementVector* theElementVector = aMaterial->GetElementVector();
+  if(1 == NumberOfElements) return ((*theElementVector)[0]);
 
   G4double rval = G4UniformRand()*((*PartialSumSigma[Index])[NumberOfElements-1]);
-  for ( G4int i=0; i < NumberOfElements; i++ )
+  for ( G4int i=0; i < NumberOfElements; i++ ) {
     if (rval <= (*PartialSumSigma[Index])[i]) return ((*theElementVector)[i]);
-  G4cout << " WARNING !!! - The Material '"<< aMaterial->GetName()
-       << "' has no elements, NULL pointer returned." << G4endl;
-  return 0;
-}
+  }
+  G4cout << "G4MuNuclearInteraction WARNING !!! no element selected for '"
+         << aMaterial->GetName()
+         << " 1st element returned." << G4endl;
+  return ((*theElementVector)[0]);
+}
+
 void G4MuNuclearInteraction::PrintInfoDefinition()
 {

trunk/source/processes/hadronic/models/photolepton_hadron/muon_nuclear/src/G4MuonNucleusInteractionModel.cc

@@ -26 +26 @@
 //
 // $Id: G4MuonNucleusInteractionModel.cc,v 1.6 2006/06/29 20:57:36 gunter Exp $
-// GEANT4 tag $Name:  $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 // --------------------------------------------------------------

trunk/source/processes/hadronic/models/photolepton_hadron/muon_nuclear/src/G4ParametrizedHadronicVertex.cc

@@ -26 +26 @@
 //
 // $Id: G4ParametrizedHadronicVertex.cc,v 1.6 2006/06/29 20:57:40 gunter Exp $
-// GEANT4 tag $Name:  $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 // --------------------------------------------------------------