Changeset 1347 for trunk/source/processes/electromagnetic/xrays

Timestamp:

Dec 22, 2010, 3:52:27 PM (14 years ago)

Author:

garnier

Message:

geant4 tag 9.4

Location:

trunk/source/processes/electromagnetic/xrays

Files:

• History (modified) (2 diffs)
• src/G4Scintillation.cc (modified) (2 diffs)
• test/testG4ForwardXrayTR.cc (modified) (1 diff)
• test/testG4HeatedKleinNishina.cc (modified) (4 diffs)

trunk/source/processes/electromagnetic/xrays/History

@@ -1 @@
-$Id: History,v 1.77 2010/11/03 19:22:54 gum Exp $
+$Id: History,v 1.78 2010/11/09 21:51:07 gum Exp $
 -------------------------------------------------------------------
 
@@ -17 +17 @@
      * Reverse chronological order (last date on top), please *
      ----------------------------------------------------------
+
+09 November 10: P. Gumplinger (xrays-V09-03-06)
+- fix coding error in G4Scintillation.cc
 
 03 November 10: P. Gumplinger (xrays-V09-03-05)

trunk/source/processes/electromagnetic/xrays/src/G4Scintillation.cc

@@ -25 +25 @@
 //
 //
-// $Id: G4Scintillation.cc,v 1.36 2010/11/03 19:23:48 gum Exp $
-// GEANT4 tag $Name: xrays-V09-03-05 $
+// $Id: G4Scintillation.cc,v 1.38 2010/12/15 07:39:26 gunter Exp $
+// GEANT4 tag $Name: geant4-09-04-ref-00 $
 //
 ////////////////////////////////////////////////////////////////////////
@@ -282 +282 @@
         } else {
            // The default linear scintillation process
-           G4double ScintillationYield = aMaterialPropertiesTable->
+           ScintillationYield = aMaterialPropertiesTable->
                                       GetConstProperty("SCINTILLATIONYIELD");
 

trunk/source/processes/electromagnetic/xrays/test/testG4ForwardXrayTR.cc

@@ -26 +26 @@
 //
 // $Id: testG4ForwardXrayTR.cc,v 1.7 2006/06/29 19:56:33 gunter Exp $
-// GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
+// GEANT4 tag $Name: geant4-09-04-ref-00 $
 //
 

trunk/source/processes/electromagnetic/xrays/test/testG4HeatedKleinNishina.cc

@@ -61 +61 @@
 #include "G4HeatedKleinNishinaCompton.hh"
 #include "G4PEEffectModel.hh"
+#include "G4PairProductionRelModel.hh"
+#include "G4BetheHeitlerModel.hh"
 
 
@@ -102 +104 @@
   G4int choice;
   // G4cin >> choice;
-  choice = 54;
+  choice = 6;
 
 
@@ -298 +300 @@
   kinEnergy = 25.0*GeV;
 
-  // G4VEmModel* comp = new G4KleinNishinaCompton();
-  G4VEmModel* comp = new G4HeatedKleinNishinaCompton();
+  G4VEmModel* comp = new G4KleinNishinaCompton();
+  // G4VEmModel* comp = new G4HeatedKleinNishinaCompton();
   G4VEmModel* photo = new G4PEEffectModel();
-
+  G4VEmModel* pair = new G4PairProductionRelModel(theParticleDefinition,"pp");
+  G4VEmModel* bhpair = new G4BetheHeitlerModel(theParticleDefinition,"bhpp");
 
   G4DynamicParticle*  theDynamicParticle = new G4DynamicParticle(theParticleDefinition,
@@ -326 +329 @@
 
 
+  //  energyMscXR = 2*MeV;
+  //xsc = pair->ComputeCrossSectionPerAtom(theParticleDefinition, energyMscXR, G4double(Z ) );
+
 
   iMax = 130;
 
   writef<<iMax<<G4endl;
+
+
+
 
   for( i = 0; i < iMax; i++ )
   {
     energyMscXR = std::exp(i*0.2)*0.001*keV;
-    //xsc = comp->ComputeCrossSectionPerAtom(theParticleDefinition,energyMscXR,G4double(Z ) );
-    xsc = photo->ComputeCrossSectionPerAtom(theParticleDefinition,energyMscXR,G4double(Z ) );
+    // xsc = comp->ComputeCrossSectionPerAtom(theParticleDefinition,energyMscXR,G4double(Z ) );
+    // xsc = photo->ComputeCrossSectionPerAtom(theParticleDefinition, energyMscXR, G4double(Z ) );
+    // xsc = pair->ComputeCrossSectionPerAtom(theParticleDefinition, energyMscXR, G4double(Z ) );
+    xsc = bhpair->ComputeCrossSectionPerAtom(theParticleDefinition, energyMscXR, G4double(Z ) );
     G4cout<<energyMscXR/MeV<<"\t\t"<<xsc/barn<<G4endl;
     writef<<energyMscXR/MeV<<"\t\t"<<xsc/barn<<G4endl;