Ignore:
Timestamp:
Dec 22, 2010, 3:52:27 PM (14 years ago)
Author:
garnier
Message:

geant4 tag 9.4

Location:
trunk/source/processes/electromagnetic/lowenergy/src
Files:
140 edited

Legend:

Unmodified
Added
Removed

  • trunk/source/processes/electromagnetic/lowenergy/src/G4AnalyticalEcpssrKCrossSection.cc

    r1337 r1347  
    2424// ********************************************************************
    2525//
    26 //$Id: G4AnalyticalEcpssrKCrossSection.cc,v 1.2 2010/06/09 07:15:50 mantero Exp $
    27 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     26//$Id: G4AnalyticalEcpssrKCrossSection.cc,v 1.5 2010/12/15 07:39:10 gunter Exp $
     27// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2828//
    2929
    … …  
    477477
    478478  if (crossSection >= 0) {
    479     return crossSection;
     479    return crossSection * barn;
    480480  }
    481481  else {return 0;}
    … …  
    547547      G4cout << "x1= " << valueT1 << G4endl;
    548548      G4cout << " vector of y for x1" << G4endl;
    549         for_each (aVecMap[(*t1)].begin(),aVecMap[(*t1)].end(), print);
     549        std::for_each (aVecMap[(*t1)].begin(),aVecMap[(*t1)].end(), print);
    550550      G4cout << G4endl;
    551551      G4cout << "x2= " << valueT2 << G4endl;
    552552      G4cout << " vector of y for x2" << G4endl;
    553         for_each (aVecMap[(*t2)].begin(),aVecMap[(*t2)].end(), print);
     553        std::for_each (aVecMap[(*t2)].begin(),aVecMap[(*t2)].end(), print);
    554554
    555555      G4cout << G4endl;

  • trunk/source/processes/electromagnetic/lowenergy/src/G4AnalyticalEcpssrLiCrossSection.cc

    r1337 r1347  
    2424// ********************************************************************
    2525//
    26 //$Id: G4AnalyticalEcpssrLiCrossSection.cc,v 1.2 2010/06/25 09:41:15 gunter Exp $
    27 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     26//$Id: G4AnalyticalEcpssrLiCrossSection.cc,v 1.4 2010/11/22 17:25:45 mantero Exp $
     27// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2828
    2929#include "globals.hh"
    … …  
    353353  if (crossSection_L1 >= 0) {
    354354
    355     return crossSection_L1;
     355    return crossSection_L1 * barn;
    356356  }
    357357 
    … …  
    519519
    520520  if (crossSection_L2 >= 0) {
    521      return crossSection_L2;
     521     return crossSection_L2 * barn;
    522522      }
    523523  else {return 0;}
    … …  
    686686 
    687687  if (crossSection_L3 >= 0) {
    688     return crossSection_L3;
     688    return crossSection_L3 * barn;
    689689  }
    690690  else {return 0;}

  • trunk/source/processes/electromagnetic/lowenergy/src/G4AtomicDeexcitation.cc

    r1337 r1347  
    2626//
    2727// $Id: G4AtomicDeexcitation.cc,v 1.11
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030// Authors: Elena Guardincerri (Elena.Guardincerri@ge.infn.it)
    … …  
    5959
    6060  std::vector<G4DynamicParticle*>* vectorOfParticles;
    61  
    6261  vectorOfParticles = new std::vector<G4DynamicParticle*>;
     62
    6363  G4DynamicParticle* aParticle;
    6464  G4int provShellId = 0;
    … …  
    113113  // Look this in a particular way: only one auger emitted! // ????
    114114  while (provShellId > -2);
    115  
     115
     116  // debug 
     117  // if (vectorOfParticles->size() > 0) {
     118  //   G4cout << " DEEXCITATION!" << G4endl;
     119  // }
     120
    116121  return vectorOfParticles;
    117122}

  • trunk/source/processes/electromagnetic/lowenergy/src/G4AtomicTransitionManager.cc

    r1337 r1347  
    2626//
    2727// $Id: G4AtomicTransitionManager.cc,v 1.2 ????
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030// Authors: Elena Guardincerri (Elena.Guardincerri@ge.infn.it)

  • trunk/source/processes/electromagnetic/lowenergy/src/G4BremsstrahlungCrossSectionHandler.cc

    r1337 r1347  
    2525//
    2626// $Id: G4BremsstrahlungCrossSectionHandler.cc,v 1.12 2009/09/27 10:47:42 sincerti Exp $
    27 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     27// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2828//
    2929// -------------------------------------------------------------------

  • trunk/source/processes/electromagnetic/lowenergy/src/G4BremsstrahlungParameters.cc

    r1337 r1347  
    2626//
    2727// $Id: G4BremsstrahlungParameters.cc,v 1.20 2009/06/10 13:32:36 mantero Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030// Author: Maria Grazia Pia (Maria.Grazia.Pia@cern.ch)

  • trunk/source/processes/electromagnetic/lowenergy/src/G4CompositeEMDataSet.cc

    r1337 r1347  
    2525//
    2626//
    27 // $Id: G4CompositeEMDataSet.cc,v 1.15 2009/09/25 07:41:34 sincerti Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     27// $Id: G4CompositeEMDataSet.cc,v 1.16 2010/11/26 11:51:11 pandola Exp $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030// Author: Maria Grazia Pia (Maria.Grazia.Pia@cern.ch)
    … …  
    196196          message << "G4CompositeEMDataSet::SaveData - component " << (z-minZ) << " not found";
    197197          G4Exception(message.str().c_str());
     198          return false;
    198199        }
    199200

  • trunk/source/processes/electromagnetic/lowenergy/src/G4CrossSectionChargeDecrease.cc

    r1337 r1347  
    2525//
    2626// $Id: G4CrossSectionChargeDecrease.cc,v 1.7 2009/06/11 15:47:08 mantero Exp $
    27 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     27// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2828
    2929#include "G4CrossSectionChargeDecrease.hh"

  • trunk/source/processes/electromagnetic/lowenergy/src/G4CrossSectionChargeDecreasePartial.cc

    r1337 r1347  
    2525//
    2626// $Id: G4CrossSectionChargeDecreasePartial.cc,v 1.3 2009/06/10 13:32:36 mantero Exp $
    27 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     27// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2828
    2929#include "G4CrossSectionChargeDecreasePartial.hh"

  • trunk/source/processes/electromagnetic/lowenergy/src/G4CrossSectionChargeIncrease.cc

    r1337 r1347  
    2525//
    2626// $Id: G4CrossSectionChargeIncrease.cc,v 1.7 2009/06/11 15:47:08 mantero Exp $
    27 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     27// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2828
    2929#include "G4CrossSectionChargeIncrease.hh"

  • trunk/source/processes/electromagnetic/lowenergy/src/G4CrossSectionChargeIncreasePartial.cc

    r1337 r1347  
    2525//
    2626// $Id: G4CrossSectionChargeIncreasePartial.cc,v 1.3 2009/06/10 13:32:36 mantero Exp $
    27 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     27// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2828
    2929#include "G4CrossSectionChargeIncreasePartial.hh"

  • trunk/source/processes/electromagnetic/lowenergy/src/G4CrossSectionChargeTransferCH.cc

    r1337 r1347  
    2626//
    2727// $Id: G4CrossSectionChargeTransferCH.cc,v 1.4 2009/06/10 13:32:36 mantero Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030// Contact Author: Maria Grazia Pia (Maria.Grazia.Pia@cern.ch)

  • trunk/source/processes/electromagnetic/lowenergy/src/G4CrossSectionChargeTransferExp.cc

    r1337 r1347  
    2626//
    2727// $Id: G4CrossSectionChargeTransferExp.cc,v 1.6 2009/06/10 13:32:36 mantero Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030// Contact Author: Maria Grazia Pia (Maria.Grazia.Pia@cern.ch)

  • trunk/source/processes/electromagnetic/lowenergy/src/G4CrossSectionElasticChampion.cc

    r1337 r1347  
    2525//
    2626// $Id: G4CrossSectionElasticChampion.cc,v 1.7 2009/06/11 15:47:08 mantero Exp $
    27 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     27// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2828// -------------------------------------------------------------------
    2929

  • trunk/source/processes/electromagnetic/lowenergy/src/G4CrossSectionElasticScreenedRutherford.cc

    r1337 r1347  
    2626//
    2727// $Id: G4CrossSectionElasticScreenedRutherford.cc,v 1.1 2007/10/12 23:11:41 pia Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030// Contact Author: Maria Grazia Pia (Maria.Grazia.Pia@cern.ch)

  • trunk/source/processes/electromagnetic/lowenergy/src/G4CrossSectionElasticScreenedRutherfordHE.cc

    r1337 r1347  
    2525//
    2626// $Id: G4CrossSectionElasticScreenedRutherfordHE.cc,v 1.5 2009/06/11 15:47:08 mantero Exp $
    27 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     27// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2828
    2929#include "G4CrossSectionElasticScreenedRutherfordHE.hh"

  • trunk/source/processes/electromagnetic/lowenergy/src/G4CrossSectionElasticScreenedRutherfordLE.cc

    r1337 r1347  
    2525//
    2626// $Id: G4CrossSectionElasticScreenedRutherfordLE.cc,v 1.5 2009/06/11 15:47:08 mantero Exp $
    27 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     27// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2828
    2929#include "G4CrossSectionElasticScreenedRutherfordLE.hh"

  • trunk/source/processes/electromagnetic/lowenergy/src/G4CrossSectionExcitationBorn.cc

    r1337 r1347  
    2525//
    2626// $Id: G4CrossSectionExcitationBorn.cc,v 1.7 2009/06/11 15:47:08 mantero Exp $
    27 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     27// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2828
    2929#include "G4CrossSectionExcitationBorn.hh"

  • trunk/source/processes/electromagnetic/lowenergy/src/G4CrossSectionExcitationBornPartial.cc

    r1337 r1347  
    2525//
    2626// $Id: G4CrossSectionExcitationBornPartial.cc,v 1.4 2009/06/10 13:32:36 mantero Exp $
    27 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     27// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2828
    2929#include "G4CrossSectionExcitationBornPartial.hh"

  • trunk/source/processes/electromagnetic/lowenergy/src/G4CrossSectionExcitationEmfietzoglou.cc

    r1337 r1347  
    2525//
    2626// $Id: G4CrossSectionExcitationEmfietzoglou.cc,v 1.8 2009/06/11 15:47:08 mantero Exp $
    27 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     27// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2828
    2929#include "G4CrossSectionExcitationEmfietzoglou.hh"

  • trunk/source/processes/electromagnetic/lowenergy/src/G4CrossSectionExcitationEmfietzoglouPartial.cc

    r1337 r1347  
    2525//
    2626// $Id: G4CrossSectionExcitationEmfietzoglouPartial.cc,v 1.4 2009/06/10 13:32:36 mantero Exp $
    27 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     27// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2828
    2929#include "G4CrossSectionExcitationEmfietzoglouPartial.hh"

  • trunk/source/processes/electromagnetic/lowenergy/src/G4CrossSectionExcitationMillerGreen.cc

    r1337 r1347  
    2525//
    2626// $Id: G4CrossSectionExcitationMillerGreen.cc,v 1.7 2009/06/11 15:47:08 mantero Exp $
    27 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     27// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2828
    2929#include "G4CrossSectionExcitationMillerGreen.hh"

  • trunk/source/processes/electromagnetic/lowenergy/src/G4CrossSectionExcitationMillerGreenPartial.cc

    r1337 r1347  
    2525//
    2626// $Id: G4CrossSectionExcitationMillerGreenPartial.cc,v 1.4 2009/06/10 13:32:36 mantero Exp $
    27 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     27// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2828
    2929#include "G4CrossSectionExcitationMillerGreenPartial.hh"

  • trunk/source/processes/electromagnetic/lowenergy/src/G4CrossSectionHandler.cc

    r1337 r1347  
    2626//
    2727// $Id: G4CrossSectionHandler.cc,v 1.21 2009/09/27 10:47:42 sincerti Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030// Author: Maria Grazia Pia (Maria.Grazia.Pia@cern.ch)

  • trunk/source/processes/electromagnetic/lowenergy/src/G4CrossSectionIonisationBorn.cc

    r1337 r1347  
    2525//
    2626// $Id: G4CrossSectionIonisationBorn.cc,v 1.7 2009/06/11 15:47:08 mantero Exp $
    27 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     27// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2828
    2929#include "G4CrossSectionIonisationBorn.hh"

  • trunk/source/processes/electromagnetic/lowenergy/src/G4CrossSectionIonisationBornElectron.cc

    r1337 r1347  
    2626//
    2727// $Id: G4CrossSectionIonisationBornElectron.cc,v 1.2 2007/11/08 18:51:34 pia Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030// Contact Author: Maria Grazia Pia (Maria.Grazia.Pia@cern.ch)

  • trunk/source/processes/electromagnetic/lowenergy/src/G4CrossSectionIonisationBornPartial.cc

    r1337 r1347  
    2525//
    2626// $Id: G4CrossSectionIonisationBornPartial.cc,v 1.6 2009/06/10 13:32:36 mantero Exp $
    27 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     27// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2828
    2929#include "G4CrossSectionIonisationBornPartial.hh"

  • trunk/source/processes/electromagnetic/lowenergy/src/G4CrossSectionIonisationBornPartialElectron.cc

    r1337 r1347  
    2626//
    2727// $Id: G4CrossSectionIonisationBornPartialElectron.cc,v 1.1 2007/10/15 08:57:54 pia Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030// Contact Author: Maria Grazia Pia (Maria.Grazia.Pia@cern.ch)

  • trunk/source/processes/electromagnetic/lowenergy/src/G4CrossSectionIonisationRudd.cc

    r1337 r1347  
    2525//
    2626// $Id: G4CrossSectionIonisationRudd.cc,v 1.7 2009/06/11 15:47:08 mantero Exp $
    27 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     27// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2828
    2929#include "G4CrossSectionIonisationRudd.hh"

  • trunk/source/processes/electromagnetic/lowenergy/src/G4CrossSectionIonisationRuddPartial.cc

    r1337 r1347  
    2525//
    2626// $Id: G4CrossSectionIonisationRuddPartial.cc,v 1.5 2009/06/10 13:32:36 mantero Exp $
    27 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     27// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2828
    2929#include "G4CrossSectionIonisationRuddPartial.hh"

  • trunk/source/processes/electromagnetic/lowenergy/src/G4CrossSectionKill.cc

    r1337 r1347  
    2626//
    2727// $Id: G4CrossSectionKill.cc,v 1.1 2007/11/09 20:26:12 pia Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030// Contact Author: Maria Grazia Pia (Maria.Grazia.Pia@cern.ch)

  • trunk/source/processes/electromagnetic/lowenergy/src/G4CrossSectionPsCreationChampion.cc

    r1337 r1347  
    2525//
    2626// $Id: G4CrossSectionPsCreationChampion.cc,v 1.2 2009/06/10 13:32:36 mantero Exp $
    27 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     27// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2828// -------------------------------------------------------------------
    2929

  • trunk/source/processes/electromagnetic/lowenergy/src/G4CrossSectionPsCreationChampionPartial.cc

    r1337 r1347  
    2525//
    2626// $Id: G4CrossSectionPsCreationChampionPartial.cc,v 1.2 2009/06/10 13:32:36 mantero Exp $
    27 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     27// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2828// -------------------------------------------------------------------
    2929

  • trunk/source/processes/electromagnetic/lowenergy/src/G4DNABornExcitationModel.cc

    r1340 r1347  
    2525//
    2626// $Id: G4DNABornExcitationModel.cc,v 1.10 2010/08/24 13:51:06 sincerti Exp $
    27 // GEANT4 tag $Name: emlowen-V09-03-54 $
     27// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2828//
    2929

  • trunk/source/processes/electromagnetic/lowenergy/src/G4DNABornIonisationModel.cc

    r1340 r1347  
    2525//
    2626// $Id: G4DNABornIonisationModel.cc,v 1.18 2010/11/03 12:22:36 sincerti Exp $
    27 // GEANT4 tag $Name: emlowen-V09-03-54 $
     27// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2828//
    2929

  • trunk/source/processes/electromagnetic/lowenergy/src/G4DNAChampionElasticModel.cc

    r1340 r1347  
    2424// ********************************************************************
    2525//
    26 // $Id: G4DNAChampionElasticModel.cc,v 1.15 2010/10/17 11:28:51 sincerti Exp $
    27 // GEANT4 tag $Name: emlowen-V09-03-54 $
     26// $Id: G4DNAChampionElasticModel.cc,v 1.16 2010/11/11 22:32:22 sincerti Exp $
     27// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2828//
    2929
    … …  
    4141{
    4242
    43   killBelowEnergy = 0.025*eV; // Minimum e- energy for energy loss by excitation
     43  killBelowEnergy = 4*eV;
    4444  lowEnergyLimit = 0 * eV;
    45   lowEnergyLimitOfModel = 0.025 * eV;
    4645  highEnergyLimit = 1. * MeV;
    4746  SetLowEnergyLimit(lowEnergyLimit);
    … …  
    6463           << G4endl;
    6564  }
     65 
    6666}
    6767
    … …  
    219219  {
    220220      //SI : XS must not be zero otherwise sampling of secondaries method ignored
    221       if (ekin < lowEnergyLimitOfModel) ekin = lowEnergyLimitOfModel;
     221      if (ekin < killBelowEnergy) return DBL_MAX;
    222222      //     
    223223     

  • trunk/source/processes/electromagnetic/lowenergy/src/G4DNAChargeDecrease.cc

    r1337 r1347  
    2525//
    2626// $Id: G4DNAChargeDecrease.cc,v 1.4 2010/03/18 16:36:48 sincerti Exp $
    27 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     27// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2828
    2929#include "G4DNAChargeDecrease.hh"

  • trunk/source/processes/electromagnetic/lowenergy/src/G4DNAChargeIncrease.cc

    r1337 r1347  
    2525//
    2626// $Id: G4DNAChargeIncrease.cc,v 1.4 2010/03/18 16:36:48 sincerti Exp $
    27 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     27// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2828
    2929#include "G4DNAChargeIncrease.hh"

  • trunk/source/processes/electromagnetic/lowenergy/src/G4DNACrossSectionDataSet.cc

    r1337 r1347  
    2727
    2828// $Id: G4DNACrossSectionDataSet.cc,v 1.11 2009/11/12 10:05:30 sincerti Exp $
    29 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     29// GEANT4 tag $Name: geant4-09-04-ref-00 $
    3030//
    3131// Author: Riccardo Capra <capra@ge.infn.it>

  • trunk/source/processes/electromagnetic/lowenergy/src/G4DNADingfelderChargeDecreaseModel.cc

    r1337 r1347  
    2525//
    2626// $Id: G4DNADingfelderChargeDecreaseModel.cc,v 1.9 2010/04/06 11:00:35 sincerti Exp $
    27 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     27// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2828//
    2929

  • trunk/source/processes/electromagnetic/lowenergy/src/G4DNADingfelderChargeIncreaseModel.cc

    r1337 r1347  
    2525//
    2626// $Id: G4DNADingfelderChargeIncreaseModel.cc,v 1.9 2010/04/06 11:00:35 sincerti Exp $
    27 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     27// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2828//
    2929

  • trunk/source/processes/electromagnetic/lowenergy/src/G4DNAElastic.cc

    r1340 r1347  
    2525//
    2626// $Id: G4DNAElastic.cc,v 1.4 2010/09/08 14:07:16 sincerti Exp $
    27 // GEANT4 tag $Name: emlowen-V09-03-54 $
     27// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2828
    2929#include "G4DNAElastic.hh"

  • trunk/source/processes/electromagnetic/lowenergy/src/G4DNAEmfietzoglouExcitationModel.cc

    r1337 r1347  
    2525//
    2626// $Id: G4DNAEmfietzoglouExcitationModel.cc,v 1.10 2010/06/08 21:50:00 sincerti Exp $
    27 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     27// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2828//
    2929

  • trunk/source/processes/electromagnetic/lowenergy/src/G4DNAExcitation.cc

    r1340 r1347  
    2525//
    2626// $Id: G4DNAExcitation.cc,v 1.7 2010/10/08 08:53:17 sincerti Exp $
    27 // GEANT4 tag $Name: emlowen-V09-03-54 $
     27// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2828
    2929#include "G4DNAExcitation.hh"

  • trunk/source/processes/electromagnetic/lowenergy/src/G4DNAGenericIonsManager.cc

    r1340 r1347  
    2525//
    2626// $Id: G4DNAGenericIonsManager.cc,v 1.7 2010/11/03 10:44:26 sincerti Exp $
    27 // GEANT4 tag $Name: emlowen-V09-03-54 $
     27// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2828
    2929#include "G4DNAGenericIonsManager.hh"

  • trunk/source/processes/electromagnetic/lowenergy/src/G4DNAIonisation.cc

    r1340 r1347  
    2525//
    2626// $Id: G4DNAIonisation.cc,v 1.5 2010/09/08 14:30:45 sincerti Exp $
    27 // GEANT4 tag $Name: emlowen-V09-03-54 $
     27// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2828
    2929#include "G4DNAIonisation.hh"

  • trunk/source/processes/electromagnetic/lowenergy/src/G4DNAMillerGreenExcitationModel.cc

    r1340 r1347  
    2525//
    2626// $Id: G4DNAMillerGreenExcitationModel.cc,v 1.11 2010/10/08 08:53:17 sincerti Exp $
    27 // GEANT4 tag $Name: emlowen-V09-03-54 $
     27// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2828//
    2929

  • trunk/source/processes/electromagnetic/lowenergy/src/G4DNARuddIonisationModel.cc

    r1340 r1347  
    2525//
    2626// $Id: G4DNARuddIonisationModel.cc,v 1.21 2010/11/04 14:52:17 sincerti Exp $
    27 // GEANT4 tag $Name: emlowen-V09-03-54 $
     27// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2828//
    2929

  • trunk/source/processes/electromagnetic/lowenergy/src/G4DNAScreenedRutherfordElasticModel.cc

    r1340 r1347  
    2424// ********************************************************************
    2525//
    26 // $Id: G4DNAScreenedRutherfordElasticModel.cc,v 1.14 2010/09/08 14:07:16 sincerti Exp $
    27 // GEANT4 tag $Name: emlowen-V09-03-54 $
     26// $Id: G4DNAScreenedRutherfordElasticModel.cc,v 1.15 2010/11/11 22:32:22 sincerti Exp $
     27// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2828//
    2929
    … …  
    4141{
    4242
    43   killBelowEnergy = 0.025*eV; // Minimum e- energy for energy loss by excitation
     43  killBelowEnergy = 9*eV;
    4444  lowEnergyLimit = 0 * eV;
    4545  intermediateEnergyLimit = 200 * eV; // Switch between two final state models
    … …  
    173173  if (ekin < highEnergyLimit)
    174174  {
     175
     176      if (ekin < killBelowEnergy) return DBL_MAX;
    175177     
    176178      G4double z = 10.;

  • trunk/source/processes/electromagnetic/lowenergy/src/G4DopplerProfile.cc

    r1337 r1347  
    2626//
    2727// $Id: G4DopplerProfile.cc,v 1.3 2009/06/10 13:32:36 mantero Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030// Author: Maria Grazia Pia (Maria.Grazia.Pia@cern.ch)

  • trunk/source/processes/electromagnetic/lowenergy/src/G4DummyFinalState.cc

    r1337 r1347  
    2626//
    2727// $Id: G4DummyFinalState.cc,v 1.2 2007/10/15 08:36:35 pia Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030// Contact Author: Maria Grazia Pia (Maria.Grazia.Pia@cern.ch)

  • trunk/source/processes/electromagnetic/lowenergy/src/G4EMDataSet.cc

    r1337 r1347  
    2525//
    2626//
    27 // $Id: G4EMDataSet.cc,v 1.20 2009/09/25 07:41:34 sincerti Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     27// $Id: G4EMDataSet.cc,v 1.21 2010/12/02 17:37:26 vnivanch Exp $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030// Author: Maria Grazia Pia (Maria.Grazia.Pia@cern.ch)
    … …  
    108108    G4Exception("G4EMDataSet::G4EMDataSet - different size for energies and data (zero case)");
    109109
    110   if (energies == 0) return;
     110  //if (energies == 0) return;
    111111 
    112112  if (energies->size() != data->size())
    … …  
    141141    G4Exception("G4EMDataSet::G4EMDataSet - different size for energies and data (zero case)");
    142142
    143   if (energies == 0) return;
     143  //if (energies == 0) return;
    144144 
    145145  if (energies->size() != data->size())
    … …  
    149149    G4Exception("G4EMDataSet::G4EMDataSet - different size for log energies and log data (zero case)");
    150150
    151   if (log_energies == 0) return;
     151  //if (log_energies == 0) return;
    152152
    153153  if (log_energies->size() != log_data->size())
    … …  
    161161{
    162162  delete algorithm;
    163   if (energies) delete energies;
    164   if (data) delete data;
    165   if (pdf) delete pdf;
    166   if (log_energies) delete log_energies;
    167   if (log_data) delete log_data;
     163  if (energies) { energies->clear(); delete energies; }
     164  if (data) { data->clear(); delete data; }
     165  if (pdf) { pdf->clear(); delete pdf; }
     166  if (log_energies) { log_energies->clear(); delete log_energies; }
     167  if (log_data) { log_data->clear(); delete log_data; }
    168168}
    169169

  • trunk/source/processes/electromagnetic/lowenergy/src/G4FinalStateChargeDecrease.cc

    r1337 r1347  
    2525//
    2626// $Id: G4FinalStateChargeDecrease.cc,v 1.7 2009/06/11 15:47:08 mantero Exp $
    27 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     27// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2828
    2929#include "G4FinalStateChargeDecrease.hh"

  • trunk/source/processes/electromagnetic/lowenergy/src/G4FinalStateChargeIncrease.cc

    r1337 r1347  
    2525//
    2626// $Id: G4FinalStateChargeIncrease.cc,v 1.7 2009/06/11 15:47:08 mantero Exp $
    27 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     27// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2828
    2929#include "G4FinalStateChargeIncrease.hh"

  • trunk/source/processes/electromagnetic/lowenergy/src/G4FinalStateChargeTransferProton.cc

    r1337 r1347  
    2626//
    2727// $Id: G4FinalStateChargeTransferProton.cc,v 1.2 2009/06/10 13:32:36 mantero Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030// Contact Author: Maria Grazia Pia (Maria.Grazia.Pia@cern.ch)

  • trunk/source/processes/electromagnetic/lowenergy/src/G4FinalStateElasticBrennerZaider.cc

    r1337 r1347  
    2525//
    2626// $Id: G4FinalStateElasticBrennerZaider.cc,v 1.11 2009/06/11 15:47:08 mantero Exp $
    27 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     27// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2828
    2929#include "G4FinalStateElasticBrennerZaider.hh"

  • trunk/source/processes/electromagnetic/lowenergy/src/G4FinalStateElasticChampion.cc

    r1337 r1347  
    2525//
    2626// $Id: G4FinalStateElasticChampion.cc,v 1.10 2009/06/11 15:47:08 mantero Exp $
    27 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     27// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2828// -------------------------------------------------------------------
    2929

  • trunk/source/processes/electromagnetic/lowenergy/src/G4FinalStateElasticScreenedRutherford.cc

    r1337 r1347  
    2525//
    2626// $Id: G4FinalStateElasticScreenedRutherford.cc,v 1.7 2009/06/11 15:47:08 mantero Exp $
    27 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     27// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2828
    2929#include "G4FinalStateElasticScreenedRutherford.hh"

  • trunk/source/processes/electromagnetic/lowenergy/src/G4FinalStateExcitationBorn.cc

    r1337 r1347  
    2525//
    2626// $Id: G4FinalStateExcitationBorn.cc,v 1.6 2009/06/11 15:47:08 mantero Exp $
    27 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     27// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2828
    2929#include "G4FinalStateExcitationBorn.hh"

  • trunk/source/processes/electromagnetic/lowenergy/src/G4FinalStateExcitationEmfietzoglou.cc

    r1337 r1347  
    2525//
    2626// $Id: G4FinalStateExcitationEmfietzoglou.cc,v 1.8 2009/06/11 15:47:08 mantero Exp $
    27 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     27// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2828
    2929#include "G4FinalStateExcitationEmfietzoglou.hh"

  • trunk/source/processes/electromagnetic/lowenergy/src/G4FinalStateExcitationMillerGreen.cc

    r1337 r1347  
    2525//
    2626// $Id: G4FinalStateExcitationMillerGreen.cc,v 1.6 2009/06/11 15:47:08 mantero Exp $
    27 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     27// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2828
    2929#include "G4FinalStateExcitationMillerGreen.hh"

  • trunk/source/processes/electromagnetic/lowenergy/src/G4FinalStateIonisationBorn.cc

    r1337 r1347  
    2525//
    2626// $Id: G4FinalStateIonisationBorn.cc,v 1.19 2009/06/11 15:47:08 mantero Exp $
    27 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     27// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2828
    2929#include "G4FinalStateIonisationBorn.hh"

  • trunk/source/processes/electromagnetic/lowenergy/src/G4FinalStateIonisationRudd.cc

    r1337 r1347  
    2525//
    2626// $Id: G4FinalStateIonisationRudd.cc,v 1.11 2009/06/11 15:47:08 mantero Exp $
    27 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     27// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2828
    2929#include "G4FinalStateIonisationRudd.hh"

  • trunk/source/processes/electromagnetic/lowenergy/src/G4FinalStateKill.cc

    r1337 r1347  
    2626//
    2727// $Id: G4FinalStateKill.cc,v 1.1 2007/11/09 20:26:12 pia Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030// Contact Author: Maria Grazia Pia (Maria.Grazia.Pia@cern.ch)

  • trunk/source/processes/electromagnetic/lowenergy/src/G4FinalStateProduct.cc

    r1337 r1347  
    2626//
    2727// $Id: G4FinalStateProduct.cc,v 1.7 2009/06/10 13:32:36 mantero Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030// Contact Author: Maria Grazia Pia (Maria.Grazia.Pia@cern.ch)

  • trunk/source/processes/electromagnetic/lowenergy/src/G4FinalStatePsCreationChampion.cc

    r1337 r1347  
    2525//
    2626// $Id: G4FinalStatePsCreationChampion.cc,v 1.2 2009/06/10 13:32:36 mantero Exp $
    27 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     27// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2828// -------------------------------------------------------------------
    2929

  • trunk/source/processes/electromagnetic/lowenergy/src/G4FluoTransition.cc

    r1337 r1347  
    2626//
    2727// $Id: G4FluoTransition.cc,v 1.2 ????
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030// Author: Elena Guardincerri (Elena.Guardincerri@ge.infn.it)

  • trunk/source/processes/electromagnetic/lowenergy/src/G4Generator2BN.cc

    r1340 r1347  
    2525//
    2626// $Id: G4Generator2BN.cc,v 1.9 2010/10/14 14:01:02 vnivanch Exp $
    27 // GEANT4 tag $Name: emlowen-V09-03-54 $
     27// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2828//
    2929// -------------------------------------------------------------------

  • trunk/source/processes/electromagnetic/lowenergy/src/G4Generator2BS.cc

    r1340 r1347  
    2525//
    2626// $Id: G4Generator2BS.cc,v 1.10 2010/10/14 14:01:02 vnivanch Exp $
    27 // GEANT4 tag $Name: emlowen-V09-03-54 $
     27// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2828//
    2929// -------------------------------------------------------------------

  • trunk/source/processes/electromagnetic/lowenergy/src/G4IonParametrisedLossModel.cc

    r1340 r1347  
    2525//
    2626// $Id: G4IonParametrisedLossModel.cc,v 1.10 2010/11/04 12:21:48 vnivanch Exp $
    27 // GEANT4 tag $Name: emlowen-V09-03-54 $
     27// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2828//
    2929// ===========================================================================

  • trunk/source/processes/electromagnetic/lowenergy/src/G4LinInterpolation.cc

    r1337 r1347  
    2626//
    2727// $Id: G4LinInterpolation.cc,v 1.5 2009/09/25 07:41:34 sincerti Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030// Author: Maria Grazia Pia (Maria.Grazia.Pia@cern.ch)

  • trunk/source/processes/electromagnetic/lowenergy/src/G4LivermoreBremsstrahlungModel.cc

    r1337 r1347  
    2424// ********************************************************************
    2525//
    26 // $Id: G4LivermoreBremsstrahlungModel.cc,v 1.6 2009/06/11 15:47:08 mantero Exp $
    27 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     26// $Id: G4LivermoreBremsstrahlungModel.cc,v 1.8 2010/12/02 16:07:05 vnivanch Exp $
     27// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2828//
    2929// Author: Luciano Pandola
    … …  
    142142      crossSectionHandler = 0;
    143143    }
    144   G4VDataSetAlgorithm* interpolation = new G4SemiLogInterpolation();
     144  G4VDataSetAlgorithm* interpolation = 0;//new G4SemiLogInterpolation();
    145145  crossSectionHandler = new G4BremsstrahlungCrossSectionHandler(energySpectrum,interpolation);
    146146  crossSectionHandler->Initialise(0,LowEnergyLimit(),HighEnergyLimit(),
    … …  
    196196      G4cout << "The cross section handler is not correctly initialized" << G4endl;
    197197      G4Exception();
     198      return 0;
    198199    }
    199200 

  • trunk/source/processes/electromagnetic/lowenergy/src/G4LivermoreComptonModel.cc

    r1337 r1347  
    2525//
    2626// $Id: G4LivermoreComptonModel.cc,v 1.7 2009/06/10 13:32:36 mantero Exp $
    27 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     27// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2828//
    2929//

  • trunk/source/processes/electromagnetic/lowenergy/src/G4LivermoreGammaConversionModel.cc

    r1337 r1347  
    2525//
    2626// $Id: G4LivermoreGammaConversionModel.cc,v 1.8 2009/06/11 15:47:08 mantero Exp $
    27 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     27// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2828//
    2929//

  • trunk/source/processes/electromagnetic/lowenergy/src/G4LivermoreIonisationModel.cc

    r1340 r1347  
    2424// ********************************************************************
    2525//
    26 // $Id: G4LivermoreIonisationModel.cc,v 1.9 2010/10/13 07:28:47 pandola Exp $
    27 // GEANT4 tag $Name: emlowen-V09-03-54 $
     26// $Id: G4LivermoreIonisationModel.cc,v 1.13 2010/12/02 16:06:29 vnivanch Exp $
     27// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2828//
    2929// Author: Luciano Pandola
    … …  
    148148  crossSectionHandler->LoadShellData("ioni/ion-ss-cs-");
    149149  //This is used to retrieve cross section values later on
    150   crossSectionHandler->BuildMeanFreePathForMaterials(&cuts);
    151  
     150  G4VEMDataSet* emdata =
     151    crossSectionHandler->BuildMeanFreePathForMaterials(&cuts);
     152  //The method BuildMeanFreePathForMaterials() is required here only to force
     153  //the building of an internal table: the output pointer can be deleted
     154  delete emdata; 
     155 
    152156  //Fluorescence data
    153157  transitionManager = G4AtomicTransitionManager::Instance();
    … …  
    200204      G4cout << "The cross section handler is not correctly initialized" << G4endl;
    201205      G4Exception();
     206      return 0;
    202207    }
    203208 
    … …  
    393398                          theEnergyDeposit -= e;
    394399                          fvect->push_back(aSecondary);
     400                          aSecondary = 0;
     401                          (*secondaryVector)[i]=0;
    395402                        }
    396403                      else
    … …  
    401408                    }
    402409                }
     410              //secondaryVector = 0;
     411              delete secondaryVector;
    403412            }
    404413        }
    … …  
    617626  size_t binForFluo = fNBinEnergyLoss/10;
    618627
     628  //Used to produce a log-spaced energy grid. To be deleted at the end.
    619629  G4PhysicsLogVector* eVector = new G4PhysicsLogVector(LowEnergyLimit(),HighEnergyLimit(),
    620630                                                       binForFluo);
    … …  
    696706       shellVacancy->AddXsiTable(xsis);
    697707    }
     708  if (eVector)
     709    delete eVector;
    698710}
    699711

  • trunk/source/processes/electromagnetic/lowenergy/src/G4LivermorePhotoElectricModel.cc

    r1340 r1347  
    2525//
    2626// $Id: G4LivermorePhotoElectricModel.cc,v 1.12 2010/10/13 07:15:42 pandola Exp $
    27 // GEANT4 tag $Name: emlowen-V09-03-54 $
     27// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2828//
    2929//

  • trunk/source/processes/electromagnetic/lowenergy/src/G4LivermorePolarizedComptonModel.cc

    r1337 r1347  
    2525//
    2626// $Id: G4LivermorePolarizedComptonModel.cc,v 1.6 2009/05/03 08:29:55 sincerti Exp $
    27 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     27// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2828//
    2929// History:

  • trunk/source/processes/electromagnetic/lowenergy/src/G4LivermorePolarizedGammaConversionModel.cc

    r1197 r1347  
    132132  if(isInitialised) return;
    133133
    134   if(pParticleChange)
    135     fParticleChange = reinterpret_cast<G4ParticleChangeForGamma*>(pParticleChange);
    136   else
    137     fParticleChange = new G4ParticleChangeForGamma();
     134  fParticleChange = GetParticleChangeForGamma();
    138135   
    139136  isInitialised = true;
    … …  
    219216
    220217      //     G4int Z = crossSectionHandler->SelectRandomAtom(couple,photonEnergy);
    221       const G4Element* element = crossSectionHandler->SelectRandomElement(couple,photonEnergy);
     218      //const G4Element* element = crossSectionHandler->SelectRandomElement(couple,photonEnergy);
     219
     220      const G4ParticleDefinition* particle =  aDynamicGamma->GetDefinition();
     221      const G4Element* element = SelectRandomAtom(couple,particle,photonEnergy);
    222222
    223223      if (element == 0)

  • trunk/source/processes/electromagnetic/lowenergy/src/G4LivermorePolarizedPhotoElectricModel.cc

    r1197 r1347  
    5050  // 4 = entering in methods
    5151
     52  SetDeexcitationFlag(true);
     53  ActivateAuger(false);
     54
    5255  G4cout << "Livermore Polarized PhotoElectric is constructed " << G4endl
    5356         << "Energy range: "
    … …  
    6265G4LivermorePolarizedPhotoElectricModel::~G4LivermorePolarizedPhotoElectricModel()
    6366{ 
    64   if (meanFreePathTable)   delete meanFreePathTable;
     67  //  if (meanFreePathTable)   delete meanFreePathTable;
    6568  if (crossSectionHandler) delete crossSectionHandler;
    6669  if (shellCrossSectionHandler) delete shellCrossSectionHandler;
    … …  
    9093
    9194
     95  /*
    9296  // Energy limits
    9397 
    9498  if (LowEnergyLimit() < lowEnergyLimit)
    95     {
    96       G4cout << "G4LivermorePolarizedPhotoElectricModel: low energy limit increased from " <<
    97         LowEnergyLimit()/eV << " eV to " << lowEnergyLimit << " eV" << G4endl;
    98       SetLowEnergyLimit(lowEnergyLimit);
    99     }
    100 
     99  {
     100  G4cout << "G4LivermorePolarizedPhotoElectricModel: low energy limit increased from " <<
     101  LowEnergyLimit()/eV << " eV to " << lowEnergyLimit << " eV" << G4endl;
     102  SetLowEnergyLimit(lowEnergyLimit);
     103  }
     104 
    101105  if (HighEnergyLimit() > highEnergyLimit)
    102     {
    103       G4cout << "G4LivermorePolarizedPhotoElectricModel: high energy limit decreased from " <<
    104         HighEnergyLimit()/GeV << " GeV to " << highEnergyLimit << " GeV" << G4endl;
    105       SetHighEnergyLimit(highEnergyLimit);
    106     }
    107 
     106  {
     107  G4cout << "G4LivermorePolarizedPhotoElectricModel: high energy limit decreased from " <<
     108  HighEnergyLimit()/GeV << " GeV to " << highEnergyLimit << " GeV" << G4endl;
     109  SetHighEnergyLimit(highEnergyLimit);
     110  }
     111  */
     112 
    108113  // Reading of data files - all materials are read
    109114 
    … …  
    114119
    115120  meanFreePathTable = 0;
    116   meanFreePathTable = crossSectionHandler->BuildMeanFreePathForMaterials();
     121  //  meanFreePathTable = crossSectionHandler->BuildMeanFreePathForMaterials();
    117122
    118123  shellCrossSectionHandler = new G4CrossSectionHandler();
    … …  
    125130  if (verboseLevel > 2)
    126131    G4cout << "Loaded cross section files for Livermore Polarized PhotoElectric model" << G4endl;
    127 
     132 
    128133  InitialiseElementSelectors(particle,cuts);
    129134
    … …  
    138143  if(isInitialised) return;
    139144
    140   if(pParticleChange)
     145  /*  if(pParticleChange)
    141146    fParticleChange = reinterpret_cast<G4ParticleChangeForGamma*>(pParticleChange);
    142147  else
    143148    fParticleChange = new G4ParticleChangeForGamma();
    144    
     149  */
     150   
     151  fParticleChange = GetParticleChangeForGamma();
     152 
    145153  isInitialised = true;
    146154}
    … …  
    179187
    180188  G4double photonEnergy = aDynamicGamma->GetKineticEnergy();
    181   // Within energy limit?
    182 
    183   if(photonEnergy <= lowEnergyLimit)
    184     {
    185       fParticleChange->ProposeTrackStatus(fStopAndKill);
    186       fParticleChange->SetProposedKineticEnergy(0.);
     189  G4ThreeVector gammaPolarization0 = aDynamicGamma->GetPolarization(); 
     190  G4ThreeVector photonDirection = aDynamicGamma->GetMomentumDirection();
     191 
     192  // kill incident photon
     193 
     194  fParticleChange->SetProposedKineticEnergy(0.);
     195  fParticleChange->ProposeTrackStatus(fStopAndKill);
     196 
     197  // low-energy gamma is absorpted by this process
     198
     199  if (photonEnergy <= lowEnergyLimit)
     200    {
    187201      fParticleChange->ProposeLocalEnergyDeposit(photonEnergy);
    188202      return;
    189203    }
    190 
    191 
    192   G4ThreeVector gammaPolarization0 = aDynamicGamma->GetPolarization();
    193 
     204 
    194205  // Protection: a polarisation parallel to the
    195206  // direction causes problems;
    196207  // in that case find a random polarization
    197208
    198   G4ThreeVector photonDirection = aDynamicGamma->GetMomentumDirection();
    199 
    200209  // Make sure that the polarization vector is perpendicular to the
    201210  // gamma direction. If not
    202 
     211 
    203212  if(!(gammaPolarization0.isOrthogonal(photonDirection, 1e-6))||(gammaPolarization0.mag()==0))
    204213    { // only for testing now
    … …  
    212221        }
    213222    }
    214 
     223 
    215224  // End of Protection
    216 
     225 
    217226  //  G4double E0_m = photonEnergy / electron_mass_c2 ;
    218227
    219228  // Select randomly one element in the current material
    220229
    221   G4int Z = crossSectionHandler->SelectRandomAtom(couple,photonEnergy);
     230  //  G4int Z = crossSectionHandler->SelectRandomAtom(couple,photonEnergy);
     231
     232  const G4ParticleDefinition* particle =  aDynamicGamma->GetDefinition();
     233  const G4Element* elm = SelectRandomAtom(couple->GetMaterial(),particle,photonEnergy);
     234  G4int Z = (G4int)elm->GetZ();
    222235
    223236  // Select the ionised shell in the current atom according to shell cross sections
    … …  
    229242  G4double bindingEnergy = shell->BindingEnergy();
    230243  G4int shellId = shell->ShellId();
    231 
    232   // Create lists of pointers to DynamicParticles (photons and electrons)
    233   // (Is the electron vector necessary? To be checked)
    234   std::vector<G4DynamicParticle*>* photonVector = 0;
    235   std::vector<G4DynamicParticle*> electronVector;
    236 
    237   G4double energyDeposit = 0.0;
    238 
     244 
    239245  // Primary outgoing  electron
    240 
     246 
    241247  G4double eKineticEnergy = photonEnergy - bindingEnergy;
    242248
    … …  
    256262                                                           electronDirection,
    257263                                                           eKineticEnergy);
    258       electronVector.push_back(electron);
     264      fvect->push_back(electron);
    259265    }
    260266  else
    … …  
    264270 
    265271
    266   G4int nElectrons = electronVector.size();
    267   size_t nTotPhotons = 0;
    268   G4int nPhotons=0;
    269 
    270   const G4ProductionCutsTable* theCoupleTable=
    271     G4ProductionCutsTable::GetProductionCutsTable();
    272   size_t index = couple->GetIndex();
    273   G4double cutg = (*(theCoupleTable->GetEnergyCutsVector(0)))[index];
    274   cutg = std::min(cutForLowEnergySecondaryPhotons,cutg);
    275 
    276   G4double cute = (*(theCoupleTable->GetEnergyCutsVector(1)))[index];
    277   cute = std::min(cutForLowEnergySecondaryPhotons,cute);
    278 
    279   G4DynamicParticle* aPhoton;
    280 
    281   // Generation of fluorescence
    282   // Data in EADL are available only for Z > 5
    283   // Protection to avoid generating photons in the unphysical case of
    284   // shell binding energy > photon energy
    285   if (Z > 5  && (bindingEnergy > cutg || bindingEnergy > cute))
    286     {
    287       photonVector = deexcitationManager.GenerateParticles(Z,shellId);
    288       nTotPhotons = photonVector->size();
    289       for (size_t k=0; k<nTotPhotons; k++)
    290         {
    291           aPhoton = (*photonVector)[k];
    292           if (aPhoton)
    293             {
    294               G4double itsCut = cutg;
    295               if(aPhoton->GetDefinition() == G4Electron::Electron()) itsCut = cute;
    296 
    297               G4double itsEnergy = aPhoton->GetKineticEnergy();
    298 
    299               if (itsEnergy > itsCut && itsEnergy <= bindingEnergy)
     272  // deexcitation
     273  if(DeexcitationFlag() && Z > 5) {
     274    const G4ProductionCutsTable* theCoupleTable=
     275      G4ProductionCutsTable::GetProductionCutsTable();
     276    size_t index = couple->GetIndex();
     277    G4double cutg = (*(theCoupleTable->GetEnergyCutsVector(0)))[index];
     278    //cutg = std::min(cutForLowEnergySecondaryPhotons,cutg);
     279    G4double cute = (*(theCoupleTable->GetEnergyCutsVector(1)))[index];
     280    //cute = std::min(cutForLowEnergySecondaryPhotons,cute);
     281   
     282    //   G4DynamicParticle* aPhoton;
     283   
     284    // Generation of fluorescence
     285    // Data in EADL are available only for Z > 5
     286    // Protection to avoid generating photons in the unphysical case of
     287    // shell binding energy > photon energy
     288    if (bindingEnergy > cutg || bindingEnergy > cute)
     289      {
     290        G4DynamicParticle* aPhoton;
     291        deexcitationManager.SetCutForSecondaryPhotons(cutg);
     292        deexcitationManager.SetCutForAugerElectrons(cute);
     293        std::vector<G4DynamicParticle*>* photonVector =
     294          deexcitationManager.GenerateParticles(Z,shellId);
     295        size_t nTotPhotons = photonVector->size();
     296        for (size_t k=0; k<nTotPhotons; k++)
     297          {
     298            aPhoton = (*photonVector)[k];
     299            if (aPhoton)
     300              {
     301                G4double itsEnergy = aPhoton->GetKineticEnergy();
     302                if (itsEnergy <= bindingEnergy)
    300303                {
    301                   nPhotons++;
    302304                  // Local energy deposit is given as the sum of the
    303305                  // energies of incident photons minus the energies
    304306                  // of the outcoming fluorescence photons
    305307                  bindingEnergy -= itsEnergy;
    306 
     308                  fvect->push_back(aPhoton);
    307309                }
    308               else
    309                 {
    310                   delete aPhoton;
    311                   (*photonVector)[k] = 0;
    312                 }
    313             }
    314         }
    315     }     
     310                else
     311                  {
     312                    delete aPhoton;
     313                    (*photonVector)[k] = 0;
     314                  }
     315              }
     316          }
     317        delete photonVector;
     318      }
     319  }
     320  // excitation energy left
     321  fParticleChange->ProposeLocalEnergyDeposit(bindingEnergy);
     322}
     323
     324/*
    316325  energyDeposit += bindingEnergy;
    317326  // Final state
    318 
     327 
    319328  for (G4int l = 0; l<nElectrons; l++ )
    320     {
    321       aPhoton = electronVector[l];
    322       if(aPhoton) {
    323         fvect->push_back(aPhoton);
    324       }
    325     }
     329  {
     330  aPhoton = electronVector[l];
     331  if(aPhoton) {
     332  fvect->push_back(aPhoton);
     333  }
     334  }
    326335  for ( size_t ll = 0; ll < nTotPhotons; ll++)
    327     {
    328       aPhoton = (*photonVector)[ll];
    329       if(aPhoton) {
    330         fvect->push_back(aPhoton);
    331       }
    332     }
    333 
    334   delete photonVector;
    335 
    336   if (energyDeposit < 0)
    337     {
    338       G4cout << "WARNING - "
    339              << "G4LowEnergyPhotoElectric::PostStepDoIt - Negative energy deposit"
    340              << G4endl;
    341       energyDeposit = 0;
    342     }
    343 
    344   // kill incident photon
     336  {
     337  aPhoton = (*photonVector)[ll];
     338  if(aPhoton) {
     339  fvect->push_back(aPhoton);
     340  }
     341    }
     342   
     343    delete photonVector;
     344   
     345    if (energyDeposit < 0)
     346    {
     347    G4cout << "WARNING - "
     348    << "G4LowEnergyPhotoElectric::PostStepDoIt - Negative energy deposit"
     349    << G4endl;
     350    energyDeposit = 0;
     351    }
     352   
     353    // kill incident photon
    345354  fParticleChange->ProposeMomentumDirection( 0., 0., 0. );
    346355  fParticleChange->SetProposedKineticEnergy(0.);
    … …  
    349358
    350359}
    351 
    352 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
    353 
    354 void G4LivermorePolarizedPhotoElectricModel::SetCutForLowEnSecPhotons(G4double cut)
    355 {
    356   cutForLowEnergySecondaryPhotons = cut;
    357   deexcitationManager.SetCutForSecondaryPhotons(cut);
    358 }
    359 
    360 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
    361 
    362 void G4LivermorePolarizedPhotoElectricModel::SetCutForLowEnSecElectrons(G4double cut)
    363 {
    364   cutForLowEnergySecondaryElectrons = cut;
    365   deexcitationManager.SetCutForAugerElectrons(cut);
    366 }
    367 
    368 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
    369 
    370 void G4LivermorePolarizedPhotoElectricModel::ActivateAuger(G4bool val)
    371 {
    372   deexcitationManager.ActivateAugerElectronProduction(val);
     360*/
     361
     362
     363//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
     364
     365void G4LivermorePolarizedPhotoElectricModel::ActivateAuger(G4bool augerbool)
     366{
     367  if (!DeexcitationFlag() && augerbool)
     368    {
     369      G4cout << "WARNING - G4LivermorePolarizedPhotoElectricModel" << G4endl;
     370      G4cout << "The use of the Atomic Deexcitation Manager is set to false " << G4endl;
     371      G4cout << "Therefore, Auger electrons will be not generated anyway" << G4endl;
     372    }
     373  deexcitationManager.ActivateAugerElectronProduction(augerbool);
     374  if (verboseLevel > 1)
     375    G4cout << "Auger production set to " << augerbool << G4endl;
     376
    373377}
    374378
    … …  
    526530//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
    527531
    528 G4double G4LivermorePolarizedPhotoElectricModel::GetMeanFreePath(const G4Track& track,
    529                                                       G4double,
    530                                                       G4ForceCondition*)
    531 {
    532 
    533   const G4DynamicParticle* photon = track.GetDynamicParticle();
    534   G4double energy = photon->GetKineticEnergy();
    535   G4Material* material = track.GetMaterial();
    536   //  size_t materialIndex = material->GetIndex();
    537 
    538   G4double meanFreePath = DBL_MAX;
    539 
    540   //  if (energy > highEnergyLimit)
    541   //    meanFreePath = meanFreePathTable->FindValue(highEnergyLimit,materialIndex);
    542   //  else if (energy < lowEnergyLimit) meanFreePath = DBL_MAX;
    543   //  else meanFreePath = meanFreePathTable->FindValue(energy,materialIndex);
    544 
    545   G4double cross = shellCrossSectionHandler->ValueForMaterial(material,energy);
    546   if(cross > 0.0) meanFreePath = 1.0/cross;
    547 
    548   return meanFreePath;
    549 
    550 
    551 }
    552 
    553 
     532/*
     533   G4double G4LivermorePolarizedPhotoElectricModel::GetMeanFreePath(const G4Track& track,
     534   G4double,
     535   G4ForceCondition*)
     536   {
     537   
     538   const G4DynamicParticle* photon = track.GetDynamicParticle();
     539   G4double energy = photon->GetKineticEnergy();
     540   G4Material* material = track.GetMaterial();
     541   //  size_t materialIndex = material->GetIndex();
     542   
     543   G4double meanFreePath = DBL_MAX;
     544   
     545   //  if (energy > highEnergyLimit)
     546   //    meanFreePath = meanFreePathTable->FindValue(highEnergyLimit,materialIndex);
     547   //  else if (energy < lowEnergyLimit) meanFreePath = DBL_MAX;
     548   //  else meanFreePath = meanFreePathTable->FindValue(energy,materialIndex);
     549   
     550   G4double cross = shellCrossSectionHandler->ValueForMaterial(material,energy);
     551   if(cross > 0.0) meanFreePath = 1.0/cross;
     552   
     553   return meanFreePath;
     554   
     555   
     556   }
     557*/
     558
     559

  • trunk/source/processes/electromagnetic/lowenergy/src/G4LivermorePolarizedRayleighModel.cc

    r1337 r1347  
    2525//
    2626// $Id: G4LivermorePolarizedRayleighModel.cc,v 1.5 2009/05/02 15:20:53 sincerti Exp $
    27 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     27// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2828//
    2929// History:

  • trunk/source/processes/electromagnetic/lowenergy/src/G4LivermoreRayleighModel.cc

    r1337 r1347  
    2525//
    2626// $Id: G4LivermoreRayleighModel.cc,v 1.8 2009/09/23 16:54:06 flongo Exp $
    27 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     27// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2828//
    2929// Author: Sebastien Inserti

  • trunk/source/processes/electromagnetic/lowenergy/src/G4LogLogInterpolation.cc

    r1337 r1347  
    2626//
    2727// $Id: G4LogLogInterpolation.cc,v 1.16 2009/09/25 07:41:34 sincerti Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030// Author: Maria Grazia Pia (Maria.Grazia.Pia@cern.ch)

  • trunk/source/processes/electromagnetic/lowenergy/src/G4LowEnergyBremsstrahlung.cc

    r1337 r1347  
    2525//
    2626// $Id: G4LowEnergyBremsstrahlung.cc,v 1.74 2009/06/11 15:47:08 mantero Exp $
    27 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     27// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2828//
    2929// --------------------------------------------------------------

  • trunk/source/processes/electromagnetic/lowenergy/src/G4LowEnergyCompton.cc

    r1337 r1347  
    2525//
    2626// $Id: G4LowEnergyCompton.cc,v 1.50 2009/06/11 15:47:08 mantero Exp $
    27 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     27// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2828//
    2929// Author: A. Forti

  • trunk/source/processes/electromagnetic/lowenergy/src/G4LowEnergyGammaConversion.cc

    r1337 r1347  
    2727///
    2828// $Id: G4LowEnergyGammaConversion.cc,v 1.39 2009/06/11 15:47:08 mantero Exp $
    29 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     29// GEANT4 tag $Name: geant4-09-04-ref-00 $
    3030//
    3131//

  • trunk/source/processes/electromagnetic/lowenergy/src/G4LowEnergyIonisation.cc

    r1337 r1347  
    2525//
    2626// $Id: G4LowEnergyIonisation.cc,v 1.106 2009/06/11 15:47:08 mantero Exp $
    27 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     27// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2828//
    2929// --------------------------------------------------------------

  • trunk/source/processes/electromagnetic/lowenergy/src/G4LowEnergyPhotoElectric.cc

    r1337 r1347  
    2626//
    2727// $Id: G4LowEnergyPhotoElectric.cc,v 1.59 2009/06/11 15:47:08 mantero Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030// Author: A. Forti

  • trunk/source/processes/electromagnetic/lowenergy/src/G4LowEnergyPolarizedCompton.cc

    r1337 r1347  
    2626//
    2727// $Id: G4LowEnergyPolarizedCompton.cc,v 1.28 2009/06/11 15:47:08 mantero Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030// ------------------------------------------------------------

  • trunk/source/processes/electromagnetic/lowenergy/src/G4LowEnergyPolarizedRayleigh.cc

    r1337 r1347  
    2525//
    2626// $Id: G4LowEnergyPolarizedRayleigh.cc,v 1.10 2009/06/11 15:47:08 mantero Exp $
    27 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     27// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2828//
    2929// --------------------------------------------------------------

  • trunk/source/processes/electromagnetic/lowenergy/src/G4LowEnergyRayleigh.cc

    r1337 r1347  
    2727//
    2828// $Id: G4LowEnergyRayleigh.cc,v 1.40 2009/06/11 15:47:08 mantero Exp $
    29 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     29// GEANT4 tag $Name: geant4-09-04-ref-00 $
    3030//
    3131// Author: A. Forti

  • trunk/source/processes/electromagnetic/lowenergy/src/G4OrlicLiCrossSection.cc

    r1337 r1347  
    2424// ********************************************************************
    2525//
    26 //$Id: G4OrlicLiCrossSection.cc,v 1.5 2010/06/06 23:40:35 mantero Exp $
    27 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     26//$Id: G4OrlicLiCrossSection.cc,v 1.6 2010/11/22 18:32:00 mantero Exp $
     27// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2828//
    2929// Author: Haifa Ben Abdelouahed
    … …  
    218218
    219219  if (L1crossSection >= 0) {
    220     return L1crossSection;
     220    return L1crossSection * barn;
    221221  }
    222222  else {return 0;}
    … …  
    342342
    343343  if (L2crossSection >= 0) {
    344     return L2crossSection;
     344    return L2crossSection * barn;
    345345  }
    346346  else {return 0;}
    … …  
    461461   }
    462462  if (L3crossSection >= 0) {
    463     return L3crossSection;
     463    return L3crossSection * barn;
    464464  }
    465465  else {return 0;}

  • trunk/source/processes/electromagnetic/lowenergy/src/G4PaulKCrossSection.cc

    r1315 r1347  
    101101    {
    102102     
    103       sigma = protonDataSetMap[zTarget]->FindValue(energyIncident/MeV) / barn;
     103      sigma = protonDataSetMap[zTarget]->FindValue(energyIncident/MeV);
    104104     
    105105    }
    … …  
    109109        {
    110110         
    111           sigma = alphaDataSetMap[zTarget]->FindValue(energyIncident/MeV) / barn;
     111          sigma = alphaDataSetMap[zTarget]->FindValue(energyIncident/MeV);
    112112         
    113113        }
    … …  
    120120 
    121121 
    122  
     122  // sigma is in internal units (mm^2)
    123123  return sigma;
    124124}

  • trunk/source/processes/electromagnetic/lowenergy/src/G4Penelope08ComptonModel.cc

    r1340 r1347  
    2525//
    2626// $Id: G4Penelope08ComptonModel.cc,v 1.7 2010/07/28 07:09:16 pandola Exp $
    27 // GEANT4 tag $Name: emlowen-V09-03-54 $
     27// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2828//
    2929// Author: Luciano Pandola

  • trunk/source/processes/electromagnetic/lowenergy/src/G4Penelope08GammaConversionModel.cc

    r1340 r1347  
    2525//
    2626// $Id: G4Penelope08GammaConversionModel.cc,v 1.4 2010/07/28 07:09:16 pandola Exp $
    27 // GEANT4 tag $Name: emlowen-V09-03-54 $
     27// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2828//
    2929// Author: Luciano Pandola

  • trunk/source/processes/electromagnetic/lowenergy/src/G4Penelope08PhotoElectricModel.cc

    r1340 r1347  
    2525//
    2626// $Id: G4Penelope08PhotoElectricModel.cc,v 1.5 2010/07/28 07:09:16 pandola Exp $
    27 // GEANT4 tag $Name: emlowen-V09-03-54 $
     27// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2828//
    2929// Author: Luciano Pandola

  • trunk/source/processes/electromagnetic/lowenergy/src/G4Penelope08RayleighModel.cc

    r1340 r1347  
    2525//
    2626// $Id: G4Penelope08RayleighModel.cc,v 1.3 2010/07/28 07:09:16 pandola Exp $
    27 // GEANT4 tag $Name: emlowen-V09-03-54 $
     27// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2828//
    2929// Author: Luciano Pandola

  • trunk/source/processes/electromagnetic/lowenergy/src/G4PenelopeAnnihilationModel.cc

    r1337 r1347  
    2525//
    2626// $Id: G4PenelopeAnnihilationModel.cc,v 1.4 2009/06/10 13:32:36 mantero Exp $
    27 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     27// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2828//
    2929// Author: Luciano Pandola

  • trunk/source/processes/electromagnetic/lowenergy/src/G4PenelopeBremsstrahlung.cc

    r1337 r1347  
    2525//
    2626// $Id: G4PenelopeBremsstrahlung.cc,v 1.21 2009/06/11 15:47:08 mantero Exp $
    27 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     27// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2828//
    2929// --------------------------------------------------------------

  • trunk/source/processes/electromagnetic/lowenergy/src/G4PenelopeBremsstrahlungAngular.cc

    r1337 r1347  
    2424// ********************************************************************
    2525//
    26 // $Id: G4PenelopeBremsstrahlungAngular.cc,v 1.8 2009/06/10 13:32:36 mantero Exp $
    27 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     26// $Id: G4PenelopeBremsstrahlungAngular.cc,v 1.10 2010/12/01 15:20:20 pandola Exp $
     27// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2828//
    2929// --------------------------------------------------------------
    … …  
    7878      G4String excep = "G4PenelopeBremsstrahlungAngular - G4LEDATA environment variable not set!";
    7979      G4Exception(excep);
     80      return;
    8081    }
    8182  G4String pathString(path);
    … …  
    9394  while(i != -1) {
    9495    file >> i >> j >> k >> a1 >> a2;
    95     if (i > -1){
    96       QQ1[i][j][k]=a1;
    97       QQ2[i][j][k]=a2;
    98     }
     96    if (i > -1 && j > -1 && k >- 1)
     97      {
     98        QQ1[i][j][k]=a1;
     99        QQ2[i][j][k]=a2;
     100      }
    99101  }
    100102  file.close();

  • trunk/source/processes/electromagnetic/lowenergy/src/G4PenelopeBremsstrahlungContinuous.cc

    r1337 r1347  
    2424// ********************************************************************
    2525//
    26 // $Id: G4PenelopeBremsstrahlungContinuous.cc,v 1.12 2009/06/10 13:32:36 mantero Exp $
    27 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     26// $Id: G4PenelopeBremsstrahlungContinuous.cc,v 1.13 2010/11/25 09:43:47 pandola Exp $
     27// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2828//
    2929// --------------------------------------------------------------
    … …  
    8989     G4String excep = "G4PenelopeBremsstrahlungContinuous - G4LEDATA environment variable not set!";
    9090     G4Exception(excep);
     91     return;
    9192   }
    9293 G4String pathString(path);

  • trunk/source/processes/electromagnetic/lowenergy/src/G4PenelopeBremsstrahlungModel.cc

    r1337 r1347  
    2424// ********************************************************************
    2525//
    26 // $Id: G4PenelopeBremsstrahlungModel.cc,v 1.7 2009/06/11 15:47:08 mantero Exp $
    27 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     26// $Id: G4PenelopeBremsstrahlungModel.cc,v 1.8 2010/11/25 09:44:05 pandola Exp $
     27// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2828//
    2929// Author: Luciano Pandola
    … …  
    183183   
    184184  //This is used to retrieve cross section values later on
    185   crossSectionHandler->BuildMeanFreePathForMaterials();
    186    
     185  G4VEMDataSet* emdata =
     186    crossSectionHandler->BuildMeanFreePathForMaterials();
     187  //The method BuildMeanFreePathForMaterials() is required here only to force
     188  //the building of an internal table: the output pointer can be deleted
     189  delete emdata;   
     190
    187191  if (verboseLevel > 2)
    188192    G4cout << "Loaded cross section files for PenelopeBremsstrahlungModel" << G4endl;

  • trunk/source/processes/electromagnetic/lowenergy/src/G4PenelopeCompton.cc

    r1337 r1347  
    2525//
    2626// $Id: G4PenelopeCompton.cc,v 1.36 2009/06/11 15:47:08 mantero Exp $
    27 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     27// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2828//
    2929// Author: Luciano Pandola

  • trunk/source/processes/electromagnetic/lowenergy/src/G4PenelopeComptonModel.cc

    r1337 r1347  
    2424// ********************************************************************
    2525//
    26 // $Id: G4PenelopeComptonModel.cc,v 1.9 2010/03/26 09:32:50 pandola Exp $
    27 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     26// $Id: G4PenelopeComptonModel.cc,v 1.11 2010/12/01 15:20:26 pandola Exp $
     27// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2828//
    2929// Author: Luciano Pandola
    … …  
    108108{ 
    109109  std::map <G4int,G4DataVector*>::iterator i;
    110   for (i=ionizationEnergy->begin();i != ionizationEnergy->end();i++)
    111     if (i->second) delete i->second;
    112   for (i=hartreeFunction->begin();i != hartreeFunction->end();i++)
    113     if (i->second) delete i->second;
    114   for (i=occupationNumber->begin();i != occupationNumber->end();i++)
    115     if (i->second) delete i->second;
    116 
    117 
    118110  if (ionizationEnergy)
    119     delete ionizationEnergy;
     111    {
     112      for (i=ionizationEnergy->begin();i != ionizationEnergy->end();i++)
     113        if (i->second) delete i->second;
     114      delete ionizationEnergy;
     115    }
    120116  if (hartreeFunction)
    121     delete hartreeFunction;
     117    {
     118      for (i=hartreeFunction->begin();i != hartreeFunction->end();i++)
     119        if (i->second) delete i->second;
     120      delete hartreeFunction;
     121    }
    122122  if (occupationNumber)
    123     delete occupationNumber;
     123    {
     124      for (i=occupationNumber->begin();i != occupationNumber->end();i++)
     125        if (i->second) delete i->second;
     126      delete occupationNumber;
     127    }
    124128}
    125129
    … …  
    265269
    266270  const G4int nmax = 64;
    267   G4double rn[nmax],pac[nmax];
     271  G4double rn[nmax]={0.0};
     272  G4double pac[nmax]={0.0};
    268273 
    269274  G4double ki,ki1,ki2,ki3,taumin,a1,a2;
    … …  
    629634      G4String excep = "G4PenelopeComptonModel - G4LEDATA environment variable not set!";
    630635      G4Exception(excep);
     636      return;
    631637    }
    632638  G4String pathString(path);
    … …  
    648654      G4String excep = "G4PenelopeComptonModel: problem with reading data from file";
    649655      G4Exception(excep);
     656      return;
    650657    }
    651658
    652659  do{
    653660    G4double harOfElectronsBelowThreshold = 0;
    654     G4int nbOfElectronsBelowThreshold = 0;
     661    G4int nbOfElectronsBelowThreshold = 0;
     662    file >> Z >> nLevels;
     663    //Check for nLevels validity, before using it in a loop
     664    if (nLevels<0 || nLevels>64)
     665      {
     666        G4String excep = "G4PenelopeComptonModel: corrupted data file?";
     667        G4Exception(excep);
     668        return;
     669      }
    655670    G4DataVector* occVector = new G4DataVector;
    656671    G4DataVector* harVector = new G4DataVector;
    657672    G4DataVector* bindingEVector = new G4DataVector;
    658     file >> Z >> nLevels;
    659673    for (G4int h=0;h<nLevels;h++)
    660674      {

  • trunk/source/processes/electromagnetic/lowenergy/src/G4PenelopeCrossSectionHandler.cc

    r819 r1347  
    7272                        const G4DataVector* energyCuts)
    7373{
    74   G4int verbose = 0;
     74  //G4int verbose = 0;
    7575  std::vector<G4VEMDataSet*>* set = new std::vector<G4VEMDataSet*>;
    7676
    … …  
    9494    G4int nElements = material->GetNumberOfElements();
    9595
     96    /*
    9697    if(verbose > 0) {
    9798      G4cout << "Penelope CS for " << m << "th material "
    … …  
    99100             << "  eEl= " << nElements << G4endl;
    100101    }
     102    */
    101103
    102104    G4double tcut  = (*energyCuts)[m];
    … …  
    124126            value += cross * p * density;
    125127
     128            /*
    126129            if(verbose>0 && m == 0 && e>=1. && e<=0.) {
    127130              G4cout << "G4PenIonCrossSH: e(MeV)= " << e/MeV
    … …  
    134137                     << G4endl;
    135138            }
     139           */
    136140
    137141        }

  • trunk/source/processes/electromagnetic/lowenergy/src/G4PenelopeGammaConversionModel.cc

    r1337 r1347  
    2424// ********************************************************************
    2525//
    26 // $Id: G4PenelopeGammaConversionModel.cc,v 1.6 2009/06/11 15:47:08 mantero Exp $
    27 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     26// $Id: G4PenelopeGammaConversionModel.cc,v 1.7 2010/11/25 09:45:13 pandola Exp $
     27// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2828//
    2929// Author: Luciano Pandola
    … …  
    5050#include "G4Positron.hh"
    5151#include "G4CrossSectionHandler.hh"
     52#include "G4VEMDataSet.hh"
    5253
    5354//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
    … …  
    105106  crossSectionHandler->LoadData(crossSectionFile);
    106107  //This is used to retrieve cross section values later on
    107   crossSectionHandler->BuildMeanFreePathForMaterials();
     108  G4VEMDataSet* emdata =
     109    crossSectionHandler->BuildMeanFreePathForMaterials();
     110  //The method BuildMeanFreePathForMaterials() is required here only to force
     111  //the building of an internal table: the output pointer can be deleted
     112  delete emdata;
    108113
    109114  if (verboseLevel > 2)
    … …  
    417422          G4String excep = "G4PenelopeGammaConversionModel - G4LEDATA environment variable not set!";
    418423          G4Exception(excep);
     424          return result;
    419425        }
    420426      G4String pathString(path);

  • trunk/source/processes/electromagnetic/lowenergy/src/G4PenelopeIonisation.cc

    r1337 r1347  
    2525//
    2626// $Id: G4PenelopeIonisation.cc,v 1.22 2009/06/11 15:47:08 mantero Exp $
    27 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     27// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2828//
    2929// --------------------------------------------------------------

  • trunk/source/processes/electromagnetic/lowenergy/src/G4PenelopeIonisationModel.cc

    r1337 r1347  
    2424// ********************************************************************
    2525//
    26 // $Id: G4PenelopeIonisationModel.cc,v 1.16 2010/04/29 07:28:50 pandola Exp $
    27 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     26// $Id: G4PenelopeIonisationModel.cc,v 1.18 2010/12/01 15:20:35 pandola Exp $
     27// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2828//
    2929// Author: Luciano Pandola
    … …  
    128128 
    129129  std::map <G4int,G4DataVector*>::iterator i;
    130   for (i=ionizationEnergy->begin();i != ionizationEnergy->end();i++)
    131     if (i->second) delete i->second;
    132   for (i=resonanceEnergy->begin();i != resonanceEnergy->end();i++)
    133     if (i->second) delete i->second;
    134   for (i=occupationNumber->begin();i != occupationNumber->end();i++)
    135     if (i->second) delete i->second;
    136   for (i=shellFlag->begin();i != shellFlag->end();i++)
    137     if (i->second) delete i->second;
    138 
    139130  if (ionizationEnergy)
    140     delete ionizationEnergy;
     131    {
     132      for (i=ionizationEnergy->begin();i != ionizationEnergy->end();i++)
     133        if (i->second) delete i->second;
     134      delete ionizationEnergy;
     135    }
    141136  if (resonanceEnergy)
    142     delete resonanceEnergy;
     137    {
     138      for (i=resonanceEnergy->begin();i != resonanceEnergy->end();i++)
     139        if (i->second) delete i->second;
     140      delete resonanceEnergy;
     141    }
    143142  if (occupationNumber)
    144     delete occupationNumber;
     143    {
     144      for (i=occupationNumber->begin();i != occupationNumber->end();i++)
     145        if (i->second) delete i->second;
     146      delete occupationNumber;
     147    }
    145148  if (shellFlag)
    146     delete shellFlag;
     149    {
     150      for (i=shellFlag->begin();i != shellFlag->end();i++)
     151        if (i->second) delete i->second;
     152      delete shellFlag;
     153    }
    147154}
    148155
    … …  
    184191  crossSectionHandler->LoadData(crossSectionFile);
    185192  //This is used to retrieve cross section values later on
    186   crossSectionHandler->BuildMeanFreePathForMaterials();
    187  
     193  G4VEMDataSet* emdata = 
     194    crossSectionHandler->BuildMeanFreePathForMaterials();
     195  //The method BuildMeanFreePathForMaterials() is required here only to force
     196  //the building of an internal table: the output pointer can be deleted
     197  delete emdata;
     198
    188199  if (verboseLevel > 2)
    189200    G4cout << "Loaded cross section files for PenelopeIonisationModel" << G4endl;
    … …  
    634645      G4String excep = "G4PenelopeIonisationModel - G4LEDATA environment variable not set!";
    635646      G4Exception(excep);
     647      return;
    636648    }
    637649  G4String pathString(path);
    … …  
    649661      G4String excep = "G4PenelopeIonisationModel: problem with reading data from file";
    650662      G4Exception(excep);
     663      return;
    651664    }
    652665
    … …  
    655668
    656669 do{
     670   file >> Z >> nLevels;
     671   //Check for nLevels validity, before using it in a loop
     672   if (nLevels<0 || nLevels>64)
     673     {
     674       G4String excep = "G4PenelopeIonisationModel: corrupted data file ?";
     675       G4Exception(excep);
     676       return;
     677     }
     678   //Allocate space for storage
    657679   G4DataVector* occVector = new G4DataVector;
    658680   G4DataVector* ionEVector = new G4DataVector;
    659681   G4DataVector* resEVector = new G4DataVector;
    660682   G4DataVector* shellIndVector = new G4DataVector;
    661    file >> Z >> nLevels;
     683   //
    662684   G4double a1,a2,a3,a4;
    663685   G4int k1,k2,k3;
    … …  
    16591681
    16601682  size_t nOfBins = 200;
     1683  //Temporary vector, a quick way to produce a log-spaced energy grid
    16611684  G4PhysicsLogVector* theLogVector = new G4PhysicsLogVector(LowEnergyLimit(),
    16621685                                                            HighEnergyLimit(),
    … …  
    17121735    set->push_back(setForMat);
    17131736  }
     1737  delete theLogVector;
    17141738  return set;
    17151739}

  • trunk/source/processes/electromagnetic/lowenergy/src/G4PenelopeOscillatorManager.cc

    r1340 r1347  
    10481048      G4String excep = "G4PenelopeOscillatorManager - G4LEDATA environment variable not set!";
    10491049      G4Exception(excep);
     1050      return;
    10501051    }
    10511052  G4String pathString(path);

  • trunk/source/processes/electromagnetic/lowenergy/src/G4PenelopePhotoElectric.cc

    r1337 r1347  
    2626//
    2727// $Id: G4PenelopePhotoElectric.cc,v 1.16 2009/06/11 15:47:08 mantero Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030// Author: L. Pandola

  • trunk/source/processes/electromagnetic/lowenergy/src/G4PenelopePhotoElectricModel.cc

    r1337 r1347  
    2424// ********************************************************************
    2525//
    26 // $Id: G4PenelopePhotoElectricModel.cc,v 1.12 2010/03/26 09:32:50 pandola Exp $
    27 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     26// $Id: G4PenelopePhotoElectricModel.cc,v 1.13 2010/11/26 11:51:11 pandola Exp $
     27// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2828//
    2929// Author: Luciano Pandola
    … …  
    6262#include "G4Gamma.hh"
    6363#include "G4Electron.hh"
     64#include "G4VEMDataSet.hh"
    6465
    6566//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
    … …  
    127128  shellCrossSectionHandler->LoadShellData(crossSectionFile);
    128129  //This is used to retrieve cross section values later on
    129   crossSectionHandler->BuildMeanFreePathForMaterials();
     130  G4VEMDataSet* emdata =
     131    crossSectionHandler->BuildMeanFreePathForMaterials();
     132  //The method BuildMeanFreePathForMaterials() is required here only to force
     133  //the building of an internal table: the output pointer can be deleted
     134  delete emdata;
    130135
    131136  if (verboseLevel > 2)

  • trunk/source/processes/electromagnetic/lowenergy/src/G4PenelopeRayleigh.cc

    r1337 r1347  
    2727//
    2828// $Id: G4PenelopeRayleigh.cc,v 1.19 2009/06/11 15:47:08 mantero Exp $
    29 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     29// GEANT4 tag $Name: geant4-09-04-ref-00 $
    3030//
    3131// Author: L. Pandola (luciano.pandola@cern.ch)

  • trunk/source/processes/electromagnetic/lowenergy/src/G4PenelopeRayleighModel.cc

    r1337 r1347  
    2424// ********************************************************************
    2525//
    26 // $Id: G4PenelopeRayleighModel.cc,v 1.7 2009/12/21 12:49:01 pandola Exp $
    27 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     26// $Id: G4PenelopeRayleighModel.cc,v 1.8 2010/11/26 11:51:11 pandola Exp $
     27// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2828//
    2929// Author: Luciano Pandola
    … …  
    508508    {
    509509      G4cout << "G4PenelopeRayleighModel::InitialiseSampling(), something wrong" << G4endl;
    510       G4cout << "It looks like G4PenelopeRayleighModel::PrepareConstants() has not been called" << G4endl;
     510      G4cout << "It looks like G4PenelopeRayleighModel::PrepareConstants() has not been called"
     511             << G4endl;
    511512      G4Exception();
     513      return;
    512514    }
    513515  if (!SamplingTable.count(theMaterial)) //material not defined yet

  • trunk/source/processes/electromagnetic/lowenergy/src/G4PenelopeSamplingData.cc

    r1337 r1347  
    2525//
    2626// $Id: G4PenelopeSamplingData.cc,v 1.1 2010/03/17 14:18:50 pandola Exp $
    27 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     27// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2828//
    2929// Author: Luciano Pandola

  • trunk/source/processes/electromagnetic/lowenergy/src/G4RangeTest.cc

    r1337 r1347  
    2626//
    2727// $Id: G4RangeTest.cc,v 1.9 2009/06/10 13:32:36 mantero Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030// Author: Maria Grazia Pia (Maria.Grazia.Pia@cern.ch)

  • trunk/source/processes/electromagnetic/lowenergy/src/G4RayleighScattering.cc

    r1337 r1347  
    2525//
    2626// $Id: G4RayleighScattering.cc,v 1.2 2009/03/18 13:45:51 pandola Exp $
    27 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     27// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2828//
    2929//

  • trunk/source/processes/electromagnetic/lowenergy/src/G4SemiLogInterpolation.cc

    r1337 r1347  
    2626//
    2727// $Id: G4SemiLogInterpolation.cc,v 1.8 2009/09/25 07:41:34 sincerti Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030// Author: Maria Grazia Pia (Maria.Grazia.Pia@cern.ch)

  • trunk/source/processes/electromagnetic/lowenergy/src/G4ShellData.cc

    r1337 r1347  
    2626//
    2727// $Id: G4ShellData.cc,v 1.11 2009/06/10 13:32:36 mantero Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030// Author: Maria Grazia Pia (Maria.Grazia.Pia@cern.ch)

  • trunk/source/processes/electromagnetic/lowenergy/src/G4ShellEMDataSet.cc

    r1337 r1347  
    2626//
    2727// $Id: G4ShellEMDataSet.cc,v 1.18 2009/09/25 07:41:34 sincerti Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030// Author: Maria Grazia Pia (Maria.Grazia.Pia@cern.ch)

  • trunk/source/processes/electromagnetic/lowenergy/src/G4VCrossSectionHandler.cc

    r1337 r1347  
    2525//
    2626//
    27 // $Id: G4VCrossSectionHandler.cc,v 1.19 2009/09/25 07:41:34 sincerti Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     27// $Id: G4VCrossSectionHandler.cc,v 1.20 2010/12/02 17:39:47 vnivanch Exp $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030// Author: Maria Grazia Pia (Maria.Grazia.Pia@cern.ch)
    … …  
    152152  else
    153153    {
     154      delete interpolation;
    154155      interpolation = CreateInterpolation();
    155156    }
    … …  
    497498  G4VDataSetAlgorithm* algo = CreateInterpolation();
    498499  G4VEMDataSet* materialSet = new G4CompositeEMDataSet(algo);
     500  //G4cout << "G4VCrossSectionHandler  new dataset " << materialSet << G4endl;
    499501
    500502  G4DataVector* energies;

  • trunk/source/processes/electromagnetic/lowenergy/src/G4VLowEnergyDiscretePhotonProcess.cc

    r1337 r1347  
    2525//
    2626// $Id: G4VLowEnergyDiscretePhotonProcess.cc,v 1.6 2009/06/10 13:32:36 mantero Exp $
    27 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     27// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2828//
    2929// --------------------------------------------------------------

  • trunk/source/processes/electromagnetic/lowenergy/src/G4VeLowEnergyLoss.cc

    r1337 r1347  
    2626//
    2727// $Id: G4VeLowEnergyLoss.cc,v 1.27 2009/07/23 09:15:37 vnivanch Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030//

  • trunk/source/processes/electromagnetic/lowenergy/src/G4VecpssrKModel.cc

    r1337 r1347  
    2525//
    2626//$Id: G4VecpssrKModel.cc,v 1.2 2010/06/06 23:52:28 mantero Exp $
    27 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     27// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2828//
    2929// Author: Haifa Ben Abdelouahed

  • trunk/source/processes/electromagnetic/lowenergy/src/G4VecpssrLiModel.cc

    r1337 r1347  
    2525//
    2626//$Id: G4VecpssrLiModel.cc,v 1.2 2010/06/06 23:52:28 mantero Exp $
    27 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     27// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2828//
    2929// Author: Haifa Ben Abdelouahed

  • trunk/source/processes/electromagnetic/lowenergy/src/G4WaterExcitationStructure.cc

    r1337 r1347  
    2626//
    2727// $Id: G4WaterExcitationStructure.cc,v 1.1 2007/10/15 08:57:54 pia Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030// Contact Author: Maria Grazia Pia (Maria.Grazia.Pia@cern.ch)

  • trunk/source/processes/electromagnetic/lowenergy/src/G4WaterIonisationStructure.cc

    r1337 r1347  
    2626//
    2727// $Id: G4WaterIonisationStructure.cc,v 1.1 2007/11/08 20:39:35 pia Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030// Contact Author: Maria Grazia Pia (Maria.Grazia.Pia@cern.ch)

  • trunk/source/processes/electromagnetic/lowenergy/src/G4eBremsstrahlungSpectrum.cc

    r1337 r1347  
    2525//
    2626// $Id: G4eBremsstrahlungSpectrum.cc,v 1.16 2009/06/10 13:32:36 mantero Exp $
    27 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     27// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2828//
    2929// -------------------------------------------------------------------

  • trunk/source/processes/electromagnetic/lowenergy/src/G4eCrossSectionExcitationEmfietzoglou.cc

    r1337 r1347  
    2626//
    2727// $Id: G4eCrossSectionExcitationEmfietzoglou.cc,v 1.1 2007/05/04 10:16:06 pia Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030
    3131// $Id: G4eCrossSectionExcitationEmfietzoglou.cc,v 1.1 2007/05/04 10:16:06 pia Exp $
    32 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     32// GEANT4 tag $Name: geant4-09-04-ref-00 $
    3333//
    3434// Contact Author: Maria Grazia Pia (Maria.Grazia.Pia@cern.ch)

  • trunk/source/processes/electromagnetic/lowenergy/src/G4eCrossSectionScreenedRutherford.cc

    r1337 r1347  
    2626//
    2727// $Id: G4eCrossSectionScreenedRutherford.cc,v 1.3 2007/10/12 12:27:19 pia Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030// Contact Author: Maria Grazia Pia (Maria.Grazia.Pia@cern.ch)

  • trunk/source/processes/electromagnetic/lowenergy/src/G4eIonisationCrossSectionHandler.cc

    r1337 r1347  
    2525//
    2626// $Id: G4eIonisationCrossSectionHandler.cc,v 1.15 2009/09/27 10:47:42 sincerti Exp $
    27 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     27// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2828//
    2929// -------------------------------------------------------------------

  • trunk/source/processes/electromagnetic/lowenergy/src/G4eIonisationParameters.cc

    r1337 r1347  
    2626//
    2727// $Id: G4eIonisationParameters.cc,v 1.25 2009/06/10 13:32:36 mantero Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030// Author: Maria Grazia Pia (Maria.Grazia.Pia@cern.ch)

  • trunk/source/processes/electromagnetic/lowenergy/src/G4eIonisationSpectrum.cc

    r1337 r1347  
    2525//
    2626// $Id: G4eIonisationSpectrum.cc,v 1.27 2009/06/10 13:32:36 mantero Exp $
    27 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     27// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2828//
    2929// -------------------------------------------------------------------

  • trunk/source/processes/electromagnetic/lowenergy/src/G4eLowEnergyLoss.cc

    r1337 r1347  
    2626//
    2727// $Id: G4eLowEnergyLoss.cc,v 1.37 2009/07/23 09:15:37 vnivanch Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929// 
    3030// -----------------------------------------------------------

  • trunk/source/processes/electromagnetic/lowenergy/src/G4empCrossSection.cc

    r1337 r1347  
    2424// ********************************************************************
    2525//
    26 //$Id: G4empCrossSection.cc,v 1.2 2009/06/25 15:52:08 mantero Exp $
    27 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     26//$Id: G4empCrossSection.cc,v 1.3 2010/11/12 18:09:44 mantero Exp $
     27// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2828//
    2929//         

  • trunk/source/processes/electromagnetic/lowenergy/src/G4hLowEnergyIonisation.cc

    r1315 r1347  
    174174  shellCS = new G4teoCrossSection("analytical");
    175175
     176  deexcitationManager.InitialiseForNewRun();
     177  deexcitationManager.SetAugerActive(false);
     178  deexcitationManager.SetPIXEActive(true);
     179
    176180}
    177181
    … …  
    990994  if(newpart != 0) {
    991995
     996    //    G4cout << "AlongStep DEEXCTATION!!!" << G4endl; //debug
    992997    size_t nSecondaries = newpart->size();
    993998    aParticleChange.SetNumberOfSecondaries(nSecondaries);
    … …  
    12961301              ||  bindingEnergy >= minElectronEnergy) ) {
    12971302       
    1298         G4int shellId = atomicShell->ShellId();
    1299         secondaryVector = deexcitationManager.GenerateParticles(Z, shellId);
     1303        //      G4int shellId = atomicShell->ShellId();
     1304        deexcitationManager.GenerateParticles(secondaryVector, atomicShell, Z, minGammaEnergy, minElectronEnergy);
    13001305       
    13011306        if (secondaryVector != 0) {
    1302          
     1307          // debug        G4cout << "DEEXCTATION!!!" << G4endl; //debug 
    13031308          nSecondaries = secondaryVector->size();
    13041309          for (size_t i = 0; i<nSecondaries; i++) {
    … …  
    14501455
    14511456  // create vector of tracks of secondary particles
    1452 
     1457 
    14531458  std::vector<G4DynamicParticle*>* partVector =
    14541459         new std::vector<G4DynamicParticle*>;
    1455   std::vector<G4DynamicParticle*>* secVector = 0;
     1460  std::vector<G4DynamicParticle*>* secVector = new std::vector<G4DynamicParticle*>;
    14561461  G4DynamicParticle* aSecondary = 0;
    14571462  G4ParticleDefinition* type = 0;
    14581463  G4double e, tkin, grej;
    14591464  G4ThreeVector position;
    1460   G4int shell, shellId;
     1465  G4int shell;
    14611466
    14621467  // sample secondaries
    … …  
    14821487        } while( G4UniformRand() > grej );
    14831488
     1489        // Atom total cross section     
     1490        shellCS->SetTotalCS(totalCrossSectionMap[Z]); 
     1491       
    14841492        shell = shellCS->SelectRandomShell(Z,incidentEnergy,hMass,tkin);
    1485 
    1486         shellId = transitionManager->Shell(Z, shell)->ShellId();
     1493       
     1494        //        shellId = transitionManager->Shell(Z, shell)->ShellId();
    14871495        G4double maxE = transitionManager->Shell(Z, shell)->BindingEnergy();
    1488 
    1489         if (maxE>minGammaEnergy || maxE>minElectronEnergy ) {
    1490           secVector = deexcitationManager.GenerateParticles(Z, shellId);
    1491         } else {
    1492           secVector = 0;
    1493         }
    1494 
    1495         if (secVector) {
    1496 
    1497           for (size_t l = 0; l<secVector->size(); l++) {
    1498 
    1499             aSecondary = (*secVector)[l];
    1500             if(aSecondary) {
    1501 
    1502               e = aSecondary->GetKineticEnergy();
    1503               type = aSecondary->GetDefinition();
    1504               if ( etot + e <= eLoss &&
    1505                    ( (type == G4Gamma::Gamma() && e > minGammaEnergy ) ||
    1506                    (type == G4Electron::Electron() && e > minElectronEnergy) ) ) {
    1507 
    1508                      etot += e;
    1509                      partVector->push_back(aSecondary);
    1510 
    1511               } else {
    1512                      delete aSecondary;
     1496       
     1497        if (maxE>minGammaEnergy || maxE>minElectronEnergy )
     1498          {
     1499          deexcitationManager.GenerateParticles(secVector, transitionManager->Shell(Z, shell), Z, minGammaEnergy, minElectronEnergy);
     1500          }
     1501
     1502          if (!(secVector->empty())) {
     1503            size_t secN = secVector->size();
     1504            for (size_t l = 0; l<secN; l++) {
     1505             
     1506              aSecondary = (*secVector)[l];
     1507              if(aSecondary) {
     1508               
     1509                e = aSecondary->GetKineticEnergy();
     1510                type = aSecondary->GetDefinition();
     1511                if ( etot + e <= eLoss &&
     1512                     ( (type == G4Gamma::Gamma() && e > minGammaEnergy ) ||
     1513                       (type == G4Electron::Electron() && e > minElectronEnergy) ) )
     1514                  {
     1515                    etot += e;
     1516                    partVector->push_back(aSecondary); 
     1517                  }
     1518                else
     1519                  {
     1520                    delete aSecondary;
     1521                  }
     1522                aSecondary = 0;
    15131523              }
     1524              (*secVector)[l] = 0;
     1525              delete (*secVector)[l];
    15141526            }
     1527           
     1528            //      secVector = 0;
     1529
    15151530          }
    1516           delete secVector;
    1517         }
    15181531      }
    15191532    }
    15201533  }
     1534
     1535  delete secVector;
    15211536
    15221537  if(partVector->empty()) {
    … …  
    20132028void G4hLowEnergyIonisation::ActivateAugerElectronProduction(G4bool val)
    20142029{
    2015   deexcitationManager.ActivateAugerElectronProduction(val);
     2030  deexcitationManager.SetAugerActive(val);
    20162031}
    20172032

  • trunk/source/processes/electromagnetic/lowenergy/src/G4hLowEnergyLoss.cc

    r1337 r1347  
    2626//
    2727// $Id: G4hLowEnergyLoss.cc,v 1.30 2009/07/23 09:15:37 vnivanch Exp $
    28 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     28// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2929//
    3030// -----------------------------------------------------------

  • trunk/source/processes/electromagnetic/lowenergy/src/G4hShellCrossSectionDoubleExp.cc

    r1337 r1347  
    4242// -------------------------------------------------------------------
    4343// $Id: G4hShellCrossSectionDoubleExp.cc,v 1.11 2010/02/05 08:54:12 sincerti Exp $
    44 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     44// GEANT4 tag $Name: geant4-09-04-ref-00 $
    4545
    4646#include "globals.hh"

  • trunk/source/processes/electromagnetic/lowenergy/src/G4hShellCrossSectionDoubleExpData.cc

    r1337 r1347  
    3434// -------------------------------------------------------------------
    3535// $Id: G4hShellCrossSectionDoubleExpData.cc,v 1.5 2009/06/10 13:32:36 mantero Exp $
    36 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     36// GEANT4 tag $Name: geant4-09-04-ref-00 $
    3737
    3838#include "G4hShellCrossSectionDoubleExpData.hh"

  • trunk/source/processes/electromagnetic/lowenergy/src/G4hShellCrossSectionExp.cc

    r1337 r1347  
    4242// -------------------------------------------------------------------
    4343// $Id: G4hShellCrossSectionExp.cc,v 1.7 2009/06/10 13:32:36 mantero Exp $
    44 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     44// GEANT4 tag $Name: geant4-09-04-ref-00 $
    4545
    4646#include "globals.hh"

  • trunk/source/processes/electromagnetic/lowenergy/src/G4hShellCrossSectionExpData.cc

    r1337 r1347  
    3434// -------------------------------------------------------------------
    3535// $Id: G4hShellCrossSectionExpData.cc,v 1.4 2009/06/10 13:32:36 mantero Exp $
    36 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     36// GEANT4 tag $Name: geant4-09-04-ref-00 $
    3737
    3838#include "G4hShellCrossSectionExpData.hh"

  • trunk/source/processes/electromagnetic/lowenergy/src/G4teoCrossSection.cc

    r1337 r1347  
    2424// ********************************************************************
    2525//
    26 //$Id: G4teoCrossSection.cc,v 1.6 2010/06/06 23:40:35 mantero Exp $
    27 // GEANT4 tag $Name: geant4-09-04-beta-01 $
     26//$Id: G4teoCrossSection.cc,v 1.8 2010/11/22 22:48:30 mantero Exp $
     27// GEANT4 tag $Name: geant4-09-04-ref-00 $
    2828//
    2929//         
    … …  
    128128
    129129  totalCS = val;
    130 
     130  //  G4cout << "totalXS set to: " << val / barn << " barns" << G4endl;
    131131}
    132132
Note: See TracChangeset for help on using the changeset viewer.