Geant4 Cross Reference

Cross-Referencing   Geant4
Geant4/geometry/biasing/src/G4WeightWindowAlgorithm.cc

Version: [ ReleaseNotes ] [ 1.0 ] [ 1.1 ] [ 2.0 ] [ 3.0 ] [ 3.1 ] [ 3.2 ] [ 4.0 ] [ 4.0.p1 ] [ 4.0.p2 ] [ 4.1 ] [ 4.1.p1 ] [ 5.0 ] [ 5.0.p1 ] [ 5.1 ] [ 5.1.p1 ] [ 5.2 ] [ 5.2.p1 ] [ 5.2.p2 ] [ 6.0 ] [ 6.0.p1 ] [ 6.1 ] [ 6.2 ] [ 6.2.p1 ] [ 6.2.p2 ] [ 7.0 ] [ 7.0.p1 ] [ 7.1 ] [ 7.1.p1 ] [ 8.0 ] [ 8.0.p1 ] [ 8.1 ] [ 8.1.p1 ] [ 8.1.p2 ] [ 8.2 ] [ 8.2.p1 ] [ 8.3 ] [ 8.3.p1 ] [ 8.3.p2 ] [ 9.0 ] [ 9.0.p1 ] [ 9.0.p2 ] [ 9.1 ] [ 9.1.p1 ] [ 9.1.p2 ] [ 9.1.p3 ] [ 9.2 ] [ 9.2.p1 ] [ 9.2.p2 ] [ 9.2.p3 ] [ 9.2.p4 ] [ 9.3 ] [ 9.3.p1 ] [ 9.3.p2 ] [ 9.4 ] [ 9.4.p1 ] [ 9.4.p2 ] [ 9.4.p3 ] [ 9.4.p4 ] [ 9.5 ] [ 9.5.p1 ] [ 9.5.p2 ] [ 9.6 ] [ 9.6.p1 ] [ 9.6.p2 ] [ 9.6.p3 ] [ 9.6.p4 ] [ 10.0 ] [ 10.0.p1 ] [ 10.0.p2 ] [ 10.0.p3 ] [ 10.0.p4 ] [ 10.1 ] [ 10.1.p1 ] [ 10.1.p2 ] [ 10.1.p3 ] [ 10.2 ] [ 10.2.p1 ] [ 10.2.p2 ] [ 10.2.p3 ] [ 10.3 ] [ 10.3.p1 ] [ 10.3.p2 ] [ 10.3.p3 ] [ 10.4 ] [ 10.4.p1 ] [ 10.4.p2 ] [ 10.4.p3 ] [ 10.5 ] [ 10.5.p1 ] [ 10.6 ] [ 10.6.p1 ] [ 10.6.p2 ] [ 10.6.p3 ] [ 10.7 ] [ 10.7.p1 ] [ 10.7.p2 ] [ 10.7.p3 ] [ 10.7.p4 ] [ 11.0 ] [ 11.0.p1 ] [ 11.0.p2 ] [ 11.0.p3, ] [ 11.0.p4 ] [ 11.1 ] [ 11.1.1 ] [ 11.1.2 ] [ 11.1.3 ] [ 11.2 ] [ 11.2.1 ] [ 11.2.2 ] [ 11.3.0 ]

Diff markup

Differences between /geometry/biasing/src/G4WeightWindowAlgorithm.cc (Version 11.3.0) and /geometry/biasing/src/G4WeightWindowAlgorithm.cc (Version 8.1.p2)


  1 //                                                  1 //
  2 // *******************************************      2 // ********************************************************************
  3 // * License and Disclaimer                         3 // * License and Disclaimer                                           *
  4 // *                                                4 // *                                                                  *
  5 // * The  Geant4 software  is  copyright of th      5 // * The  Geant4 software  is  copyright of the Copyright Holders  of *
  6 // * the Geant4 Collaboration.  It is provided      6 // * the Geant4 Collaboration.  It is provided  under  the terms  and *
  7 // * conditions of the Geant4 Software License      7 // * conditions of the Geant4 Software License,  included in the file *
  8 // * LICENSE and available at  http://cern.ch/      8 // * LICENSE and available at  http://cern.ch/geant4/license .  These *
  9 // * include a list of copyright holders.           9 // * include a list of copyright holders.                             *
 10 // *                                               10 // *                                                                  *
 11 // * Neither the authors of this software syst     11 // * Neither the authors of this software system, nor their employing *
 12 // * institutes,nor the agencies providing fin     12 // * institutes,nor the agencies providing financial support for this *
 13 // * work  make  any representation or  warran     13 // * work  make  any representation or  warranty, express or implied, *
 14 // * regarding  this  software system or assum     14 // * regarding  this  software system or assume any liability for its *
 15 // * use.  Please see the license in the file      15 // * use.  Please see the license in the file  LICENSE  and URL above *
 16 // * for the full disclaimer and the limitatio     16 // * for the full disclaimer and the limitation of liability.         *
 17 // *                                               17 // *                                                                  *
 18 // * This  code  implementation is the result      18 // * This  code  implementation is the result of  the  scientific and *
 19 // * technical work of the GEANT4 collaboratio     19 // * technical work of the GEANT4 collaboration.                      *
 20 // * By using,  copying,  modifying or  distri     20 // * By using,  copying,  modifying or  distributing the software (or *
 21 // * any work based  on the software)  you  ag     21 // * any work based  on the software)  you  agree  to acknowledge its *
 22 // * use  in  resulting  scientific  publicati     22 // * use  in  resulting  scientific  publications,  and indicate your *
 23 // * acceptance of all terms of the Geant4 Sof     23 // * acceptance of all terms of the Geant4 Software license.          *
 24 // *******************************************     24 // ********************************************************************
 25 //                                                 25 //
 26 // G4WeightWindowAlgorithm implementation      << 
 27 //                                                 26 //
 28 // Author: Michael Dressel (CERN), 2003        <<  27 // $Id: G4WeightWindowAlgorithm.cc,v 1.8 2006/06/29 18:18:01 gunter Exp $
                                                   >>  28 // GEANT4 tag $Name: geant4-08-01-patch-01 $
                                                   >>  29 //
                                                   >>  30 // ----------------------------------------------------------------------
                                                   >>  31 // GEANT 4 class source file
                                                   >>  32 //
                                                   >>  33 // G4WeightWindowAlgorithm.cc
                                                   >>  34 //
 29 // -------------------------------------------     35 // ----------------------------------------------------------------------
 30 #include "G4WeightWindowAlgorithm.hh"              36 #include "G4WeightWindowAlgorithm.hh"
 31 #include "Randomize.hh"                            37 #include "Randomize.hh"
 32                                                    38 
                                                   >>  39 
 33 G4WeightWindowAlgorithm::                          40 G4WeightWindowAlgorithm::
 34 G4WeightWindowAlgorithm(G4double upperLimitFac <<  41 G4WeightWindowAlgorithm(G4double upperLimitFaktor,
 35                         G4double survivalFacto <<  42       G4double survivalFaktor,
 36                         G4int maxNumberOfSplit <<  43       G4int maxNumberOfSplits) :
 37   : fUpperLimitFactor(upperLimitFactor),       <<  44   fUpperLimitFaktor(upperLimitFaktor),
 38     fSurvivalFactor(survivalFactor),           <<  45   fSurvivalFaktor(survivalFaktor),
 39     fMaxNumberOfSplits(maxNumberOfSplits)      <<  46   fMaxNumberOfSplits(maxNumberOfSplits)
 40 {                                              <<  47 {}
 41 }                                              <<  48 
                                                   >>  49 G4WeightWindowAlgorithm::~G4WeightWindowAlgorithm()
                                                   >>  50 {}
                                                   >>  51 
 42                                                    52 
 43 G4WeightWindowAlgorithm::~G4WeightWindowAlgori << 
 44                                                    53 
 45 G4Nsplit_Weight                                    54 G4Nsplit_Weight 
 46 G4WeightWindowAlgorithm::Calculate(G4double in     55 G4WeightWindowAlgorithm::Calculate(G4double init_w,
 47                                    G4double lo <<  56            G4double lowerWeightBound) const {
 48 {                                              <<  57 
 49   G4double survivalWeight = lowerWeightBound * <<  58   G4double survivalWeight = lowerWeightBound * fSurvivalFaktor;
 50   G4double upperWeight = lowerWeightBound * fU <<  59   G4double upperWeight = lowerWeightBound * fUpperLimitFaktor;
 51                                                    60 
 52   // initialize return value for case weight i     61   // initialize return value for case weight in window
 53   //                                           << 
 54   G4Nsplit_Weight nw;                              62   G4Nsplit_Weight nw;
 55   nw.fN = 1;                                       63   nw.fN = 1;
 56   nw.fW = init_w;                                  64   nw.fW = init_w;
 57                                                    65 
 58   if (init_w > upperWeight)                    <<  66   if (init_w > upperWeight) {
 59   {                                            << 
 60     // splitting                                   67     // splitting
 61     //                                         <<  68 
 62     G4double temp_wi_ws = init_w/upperWeight;  <<  69     G4double wi_ws = init_w/survivalWeight;
 63     auto  split_i = static_cast<G4int>(temp_wi <<  70     G4int int_wi_ws = static_cast<int>(wi_ws);
 64     if(split_i != temp_wi_ws)  { ++split_i; }  << 
 65     G4double wi_ws = init_w/split_i;           << 
 66                                                    71 
 67     // values in case integer mode or in csae      72     // values in case integer mode or in csae of double
 68     // mode and the lower number of splits wil     73     // mode and the lower number of splits will be diced
 69     //                                         <<  74     nw.fN = int_wi_ws;
 70     nw.fN = split_i;                           <<  75     nw.fW = survivalWeight; 
 71     nw.fW = wi_ws;                             <<  76 
 72                                                <<  77     if (wi_ws <= fMaxNumberOfSplits) {
 73 //TB     if (wi_ws <= fMaxNumberOfSplits) {    <<  78       if (wi_ws > int_wi_ws) {
 74 //TB       if (wi_ws > int_wi_ws) {            <<  79   // double mode
 75 //TB         // double mode                    <<  80   G4double p2 =  wi_ws - int_wi_ws;
 76 //TB         G4double p2 =  wi_ws - int_wi_ws; <<  81   G4double r = G4UniformRand();
 77 //TB         G4double r = G4UniformRand();     <<  82   if (r<p2) {
 78 //TB         if (r<p2) {                       <<  83     nw.fN = int_wi_ws + 1;
 79 //TB           nw.fN = int_wi_ws + 1;          <<  84   }
 80 //TB         }                                 <<  85       }
 81 //TB       }                                   <<  86     }
 82 //TB     }                                     <<  87     else {
 83 //TB     else {                                <<  88       // fMaxNumberOfSplits < wi_ws
 84 //TB       // fMaxNumberOfSplits < wi_ws       <<  89       nw.fN = fMaxNumberOfSplits;
 85 //TB       nw.fN = fMaxNumberOfSplits;         <<  90       nw.fW = init_w/fMaxNumberOfSplits;
 86 //TB       nw.fW = init_w/fMaxNumberOfSplits;  <<  91     }
 87 //TB     }                                     <<  92 
 88                                                <<  93 
 89   }                                            <<  94   } else if (init_w < lowerWeightBound) {
 90   else if (init_w < lowerWeightBound)  // Russ <<  95     // Russian roulette
 91   {                                            << 
 92     G4double wi_ws = init_w/survivalWeight;        96     G4double wi_ws = init_w/survivalWeight;
 93     G4double p = std::max(wi_ws,1./fMaxNumberO     97     G4double p = std::max(wi_ws,1./fMaxNumberOfSplits);
 94     G4double r = G4UniformRand();                  98     G4double r = G4UniformRand();
 95     if (r<p)                                   <<  99     if (r<p){
 96     {                                          << 
 97       nw.fW = init_w/p;                           100       nw.fW = init_w/p;
 98       nw.fN = 1;                                  101       nw.fN = 1;
 99     }                                          << 102     } else {
100     else                                       << 
101     {                                          << 
102       nw.fW = 0;                                  103       nw.fW = 0;
103       nw.fN = 0;                                  104       nw.fN = 0;
104     }                                             105     }
105   }                                               106   } 
106   // else do nothing                              107   // else do nothing
107                                                << 108   
                                                   >> 109   
108   return nw;                                      110   return nw;
109 }                                                 111 }
110                                                   112 
111                                                   113