Geant4 Cross Reference

Cross-Referencing   Geant4
Geant4/examples/extended/field/field04/src/F04SimpleSolenoid.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 /examples/extended/field/field04/src/F04SimpleSolenoid.cc (Version 11.3.0) and /examples/extended/field/field04/src/F04SimpleSolenoid.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 // $Id: F04SimpleSolenoid.cc 68021 2013-03-13 13:36:07Z gcosmo $
 26 //                                                 27 //
 27 /// \file field/field04/src/F04SimpleSolenoid.     28 /// \file field/field04/src/F04SimpleSolenoid.cc
 28 /// \brief Implementation of the F04SimpleSole     29 /// \brief Implementation of the F04SimpleSolenoid class
 29 //                                                 30 //
 30                                                    31 
 31 #include "F04SimpleSolenoid.hh"                <<  32 #include "globals.hh"
                                                   >>  33 
                                                   >>  34 #include "G4GeometryManager.hh"
 32                                                    35 
 33 #include "F04GlobalField.hh"                       36 #include "F04GlobalField.hh"
 34                                                    37 
 35 #include "G4GeometryManager.hh"                <<  38 #include "F04SimpleSolenoid.hh"
 36 #include "globals.hh"                          << 
 37                                                    39 
 38 //....oooOO0OOooo........oooOO0OOooo........oo     40 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 39                                                    41 
 40 F04SimpleSolenoid::F04SimpleSolenoid(G4double  <<  42 F04SimpleSolenoid::F04SimpleSolenoid(G4double Bz, G4double fz,
 41   : F04ElementField(c, lv),                    <<  43                                G4LogicalVolume* lv,
 42     fBfield(Bz),                               <<  44                                G4ThreeVector c) : F04ElementField(c,lv)
 43     fFringeZ(fz),                              <<  45 {
 44     fFieldLength(2. * ((G4Tubs*)fVolume->GetSo <<  46   fBfield  = Bz;
 45     fFieldRadius(((G4Tubs*)fVolume->GetSolid() <<  47   fFringeZ = fz;
 46 {}                                             <<  48 
                                                   >>  49   fFieldLength = 2.*((G4Tubs*)fVolume->GetSolid())->GetZHalfLength()+fFringeZ;
                                                   >>  50   fFieldRadius = ((G4Tubs*)fVolume->GetSolid())->GetOuterRadius();
                                                   >>  51 }
 47                                                    52 
 48 //....oooOO0OOooo........oooOO0OOooo........oo     53 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 49                                                    54 
 50 void F04SimpleSolenoid::AddFieldValue(const G4 <<  55 void F04SimpleSolenoid::AddFieldValue(const G4double point[4],
                                                   >>  56                                             G4double field[6]) const
 51 {                                                  57 {
 52   G4ThreeVector global(point[0], point[1], poi <<  58    G4ThreeVector global(point[0],point[1],point[2]);
 53   G4ThreeVector local;                         <<  59    G4ThreeVector local;
 54                                                    60 
 55   local = fGlobal2local.TransformPoint(global) <<  61    local = fGlobal2local.TransformPoint(global);
 56                                                    62 
 57   if (IsOutside(local)) return;                <<  63    if (IsOutside(local)) return;
 58                                                    64 
 59   G4ThreeVector B(0.0, 0.0, fBfield);          <<  65    G4ThreeVector B(0.0,0.0,fBfield);
 60                                                    66 
 61   B = fGlobal2local.Inverse().TransformAxis(B) <<  67    B = fGlobal2local.Inverse().TransformAxis(B);
 62                                                    68 
 63   field[0] += B[0];                            <<  69    field[0] += B[0];
 64   field[1] += B[1];                            <<  70    field[1] += B[1];
 65   field[2] += B[2];                            <<  71    field[2] += B[2];
 66 }                                                  72 }
 67                                                    73 
 68 //....oooOO0OOooo........oooOO0OOooo........oo     74 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 69                                                    75 
 70 G4bool F04SimpleSolenoid::IsOutside(G4ThreeVec     76 G4bool F04SimpleSolenoid::IsOutside(G4ThreeVector& local) const
 71 {                                                  77 {
 72   //  EInside inside = tubs->Inside(local);    <<  78 //  EInside inside = tubs->Inside(local);
 73   //  return (inside == kOutside);             <<  79 //  return (inside == kOutside);
 74   G4double r = std::sqrt(local.x() * local.x() <<  80   G4double r = std::sqrt(local.x()*local.x()+local.y()*local.y());
 75   return (r > fFieldRadius || std::fabs(local. <<  81   return (r > fFieldRadius || std::fabs(local.z()) > fFieldLength/2.0);
 76 }                                                  82 }
 77                                                    83 
 78 //....oooOO0OOooo........oooOO0OOooo........oo     84 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 79                                                    85 
 80 G4bool F04SimpleSolenoid::IsWithin(G4ThreeVect     86 G4bool F04SimpleSolenoid::IsWithin(G4ThreeVector& local) const
 81 {                                                  87 {
 82   //  EInside inside = tubs->Inside(local);    <<  88 //  EInside inside = tubs->Inside(local);
 83   //  return (inside == kInside);              <<  89 //  return (inside == kInside);
 84   G4double r = std::sqrt(local.x() * local.x() <<  90   G4double r = std::sqrt(local.x()*local.x()+local.y()*local.y());
 85   return (r < fFieldRadius && std::fabs(local. <<  91   return (r < fFieldRadius && std::fabs(local.z()) < fFieldLength/2.0);
 86 }                                                  92 }
 87                                                    93