Changeset 1340 for trunk/source/processes/electromagnetic/standard/src/G4PAIPhotonModel.cc

Timestamp:

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

Author:

garnier

Message:

update ti head

File:

• trunk/source/processes/electromagnetic/standard/src/G4PAIPhotonModel.cc (modified) (7 diffs)

trunk/source/processes/electromagnetic/standard/src/G4PAIPhotonModel.cc

@@ -24 +24 @@
 // ********************************************************************
 //
-// $Id: G4PAIPhotonModel.cc,v 1.24 2010/06/03 07:28:39 grichine Exp $
-// GEANT4 tag $Name: geant4-09-04-beta-01 $
+// $Id: G4PAIPhotonModel.cc,v 1.25 2010/10/26 09:16:50 vnivanch Exp $
+// GEANT4 tag $Name: emstand-V09-03-24 $
 //
 // -------------------------------------------------------------------
@@ -83 +83 @@
   fTaulim(8.4146e-3)
 {
-  if(p) SetParticle(p);
-
   fVerbose  = 0;
   fElectron = G4Electron::Electron();
@@ -90 +88 @@
 
   fProtonEnergyVector = new G4PhysicsLogVector(fLowestKineticEnergy,
-                                                           fHighestKineticEnergy,
-                                                           fTotBin);
+                                               fHighestKineticEnergy,
+                                               fTotBin);
   fPAItransferTable     = 0;
   fPAIphotonTable       = 0;
@@ -104 +102 @@
   fdNdxCutPhotonVector  = 0;
   fdNdxCutPlasmonVector = 0;
+
+  fSandiaIntervalNumber = 0;
+  fMatIndex = 0;
+
+  if(p) { SetParticle(p); }
+  else  { SetParticle(fElectron); }
 
   isInitialised      = false;
@@ -161 +165 @@
                                    const G4DataVector&)
 {
-  G4cout<<"G4PAIPhotonModel::Initialise for "<<p->GetParticleName()<<G4endl;
-  if(isInitialised) return;
+  //  G4cout<<"G4PAIPhotonModel::Initialise for "<<p->GetParticleName()<<G4endl;
+  if(isInitialised) { return; }
   isInitialised = true;
 
@@ -229 +233 @@
 {
   G4int i, j, numberOfElements ;
-  static const G4MaterialTable* theMaterialTable = G4Material::GetMaterialTable();
+  const G4MaterialTable* theMaterialTable = G4Material::GetMaterialTable();
 
   G4SandiaTable thisMaterialSandiaTable(fMatIndex) ;
@@ -264 +268 @@
     }
   }
-  // delete[] thisMaterialZ ;
+  delete[] thisMaterialZ ;
 }