Geant4 Cross Reference

Cross-Referencing   Geant4
Geant4/geometry/magneticfield/src/G4CachedMagneticField.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/magneticfield/src/G4CachedMagneticField.cc (Version 11.3.0) and /geometry/magneticfield/src/G4CachedMagneticField.cc (Version 10.4.p1)


  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 // G4CachedMagneticField implementation        << 
 27 //                                                 26 //
 28 // Author: J.Apostolakis, 20 July 2009.        <<  27 // $Id: G4CachedMagneticField.cc 96751 2016-05-04 09:39:38Z gcosmo $
                                                   >>  28 //
 29 // -------------------------------------------     29 // --------------------------------------------------------------------
 30                                                    30 
 31 #include "G4CachedMagneticField.hh"                31 #include "G4CachedMagneticField.hh"
 32                                                    32 
 33 G4CachedMagneticField::G4CachedMagneticField(G <<  33 G4CachedMagneticField::G4CachedMagneticField(G4MagneticField *pMagField, 
 34                                              G <<  34                G4double         distance)
 35   : fpMagneticField(pMagField), fDistanceConst <<  35   : G4MagneticField(), 
 36     fLastLocation(DBL_MAX,DBL_MAX,DBL_MAX), fL <<  36     fLastLocation(DBL_MAX,DBL_MAX,DBL_MAX),
                                                   >>  37     fLastValue(DBL_MAX,DBL_MAX,DBL_MAX),
                                                   >>  38     fCountCalls(0),  fCountEvaluations(0)
 37 {                                                  39 {
 38   ClearCounts();                               <<  40   fpMagneticField= pMagField;
                                                   >>  41   fDistanceConst= distance;
                                                   >>  42 
                                                   >>  43   // G4cout << " Cached-B-Field constructor> Distance = " << distance << G4endl;
                                                   >>  44   this->ClearCounts(); 
 39 }                                                  45 }
 40                                                    46 
 41 G4Field* G4CachedMagneticField::Clone() const      47 G4Field* G4CachedMagneticField::Clone() const
 42 {                                                  48 {
 43   // Cannot use copy constructor: need to clon <<  49   // Cannot use copy constructor: I need to clone the associated magnetic field
 44                                                <<  50   G4MagneticField* aF = static_cast<G4MagneticField*>(fpMagneticField->Clone());
 45   auto  aF = static_cast<G4MagneticField*>(fpM <<  51   G4CachedMagneticField* cloned = new G4CachedMagneticField(aF, fDistanceConst);
 46   auto  cloned = new G4CachedMagneticField(aF, << 
 47                                                    52 
 48   cloned->fLastLocation = fLastLocation;           53   cloned->fLastLocation = fLastLocation;
 49   cloned->fLastValue = fLastValue;                 54   cloned->fLastValue = fLastValue;
 50   return cloned;                                   55   return cloned;
 51 }                                                  56 }
 52                                                    57 
 53 G4CachedMagneticField::~G4CachedMagneticField( <<  58 G4CachedMagneticField::~G4CachedMagneticField()
                                                   >>  59 {
                                                   >>  60 }
 54                                                    61 
 55 void                                               62 void
 56 G4CachedMagneticField::ReportStatistics()          63 G4CachedMagneticField::ReportStatistics()
 57 {                                                  64 {
 58   G4cout << " Cached field: " << G4endl            65   G4cout << " Cached field: " << G4endl
 59          << "   Number of calls:        " << f <<  66    << "   Number of calls:        " << fCountCalls << G4endl
 60          << "   Number of evaluations : " << f <<  67    << "   Number of evaluations : " << fCountEvaluations << G4endl;                     
 61 }                                                  68 }
 62                                                    69 
 63 G4CachedMagneticField::                        <<  70 G4CachedMagneticField::G4CachedMagneticField(const G4CachedMagneticField &rightCMF)
 64 G4CachedMagneticField(const G4CachedMagneticFi << 
 65   : G4MagneticField(rightCMF)                      71   : G4MagneticField(rightCMF)
 66 {                                                  72 {
 67   fpMagneticField= rightCMF.fpMagneticField;       73   fpMagneticField= rightCMF.fpMagneticField;  // NOTE: sharing pointer here!
 68   fDistanceConst = rightCMF.fDistanceConst;        74   fDistanceConst = rightCMF.fDistanceConst;
 69   fLastLocation  = rightCMF.fLastLocation;         75   fLastLocation  = rightCMF.fLastLocation;
 70   fLastValue     = rightCMF.fLastValue;            76   fLastValue     = rightCMF.fLastValue;
 71   ClearCounts();                               <<  77   this->ClearCounts(); 
 72 }                                                  78 }
 73                                                    79 
 74 G4CachedMagneticField&                         <<  80 G4CachedMagneticField& G4CachedMagneticField::operator = (const G4CachedMagneticField &p)
 75 G4CachedMagneticField::operator = (const G4Cac << 
 76 {                                                  81 {
 77   if (&p == this) { return *this; }            <<  82   if (&p == this) return *this;
 78   G4MagneticField::operator=(p);                   83   G4MagneticField::operator=(p);
 79   fpMagneticField= p.fpMagneticField;  // NOTE     84   fpMagneticField= p.fpMagneticField;  // NOTE: sharing pointer here!
 80   fDistanceConst = p.fDistanceConst;               85   fDistanceConst = p.fDistanceConst;
 81   fLastLocation  = p.fLastLocation;                86   fLastLocation  = p.fLastLocation;
 82   fLastValue     = p.fLastValue;                   87   fLastValue     = p.fLastValue;
 83   ClearCounts();                               <<  88   this->ClearCounts(); 
 84   return *this;                                    89   return *this;
 85 }                                                  90 }
 86                                                    91 
 87 void                                               92 void
 88 G4CachedMagneticField::GetFieldValue( const G4     93 G4CachedMagneticField::GetFieldValue( const G4double Point[4],
 89                                             G4 <<  94                                             G4double *Bfield ) const
 90 {                                                  95 {
 91   G4ThreeVector newLocation( Point[0], Point[1     96   G4ThreeVector newLocation( Point[0], Point[1], Point[2] );
 92                                                    97 
                                                   >>  98   // G4cout << "Cache-B-field called at " << newLocation << G4endl;
                                                   >>  99 
 93   G4double      distSq= (newLocation-fLastLoca    100   G4double      distSq= (newLocation-fLastLocation).mag2();
 94   ++fCountCalls;                               << 101   fCountCalls++;
 95   if( distSq < fDistanceConst*fDistanceConst ) << 102   if( distSq < fDistanceConst*fDistanceConst ) { 
 96   {                                            << 
 97      Bfield[0] = fLastValue.x();                  103      Bfield[0] = fLastValue.x();
 98      Bfield[1] = fLastValue.y();                  104      Bfield[1] = fLastValue.y();
 99      Bfield[2] = fLastValue.z();                  105      Bfield[2] = fLastValue.z();
100   }                                            << 106   }else{
101   else                                         << 107      // G4CachedMagneticField* thisNonC= const_cast<G4CachedMagneticField*>(this);
102   {                                            << 
103      fpMagneticField->GetFieldValue( Point, Bf    108      fpMagneticField->GetFieldValue( Point, Bfield );
104      ++fCountEvaluations;                      << 109      // G4cout << " Evaluating. " << G4endl;
105      fLastLocation = G4ThreeVector( Point[0],  << 110      fCountEvaluations++;
106      fLastValue    = G4ThreeVector( Bfield[0], << 111      // thisNonC->
                                                   >> 112      fLastLocation= G4ThreeVector( Point[0],  Point[1],  Point[2] );
                                                   >> 113      // thisNonC->
                                                   >> 114      fLastValue=    G4ThreeVector( Bfield[0], Bfield[1], Bfield[2] );
107   }                                               115   }
108 }                                                 116 }
109                                                   117