Geant4 Cross Reference

Cross-Referencing   Geant4
Geant4/tracking/src/G4SmoothTrajectoryPoint.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 /tracking/src/G4SmoothTrajectoryPoint.cc (Version 11.3.0) and /tracking/src/G4SmoothTrajectoryPoint.cc (Version 10.6.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 // G4SmoothTrajectoryPoint class implementatio << 
 27 //                                                 26 //
 28 // Contact:                                    <<  27 //
 29 //   Questions and comments to this code shoul <<  28 //
 30 //     Katsuya Amako  (e-mail: Katsuya.Amako@k <<  29 // ---------------------------------------------------------------
 31 //     Makoto  Asai   (e-mail: asai@slac.stanf <<  30 //
 32 //     Takashi Sasaki (e-mail: Takashi.Sasaki@ <<  31 // G4SmoothTrajectoryPoint.cc
 33 // ------------------------------------------- <<  32 //
                                                   >>  33 // ---------------------------------------------------------------
 34                                                    34 
 35 #include "G4SmoothTrajectoryPoint.hh"              35 #include "G4SmoothTrajectoryPoint.hh"
 36                                                    36 
 37 #include "G4AttDef.hh"                         << 
 38 #include "G4AttDefStore.hh"                        37 #include "G4AttDefStore.hh"
                                                   >>  38 #include "G4AttDef.hh"
 39 #include "G4AttValue.hh"                           39 #include "G4AttValue.hh"
 40 #include "G4UnitsTable.hh"                         40 #include "G4UnitsTable.hh"
 41                                                    41 
 42 // #define G4ATTDEBUG                          <<  42 //#define G4ATTDEBUG
 43 #ifdef G4ATTDEBUG                                  43 #ifdef G4ATTDEBUG
 44 #  include "G4AttCheck.hh"                     <<  44 #include "G4AttCheck.hh"
 45 #endif                                             45 #endif
 46                                                    46 
 47 G4Allocator<G4SmoothTrajectoryPoint>*& aSmooth     47 G4Allocator<G4SmoothTrajectoryPoint>*& aSmoothTrajectoryPointAllocator()
 48 {                                                  48 {
 49   G4ThreadLocalStatic G4Allocator<G4SmoothTraj <<  49     G4ThreadLocalStatic G4Allocator<G4SmoothTrajectoryPoint>* _instance = nullptr;
 50   return _instance;                            <<  50     return _instance;
 51 }                                                  51 }
 52                                                    52 
 53 G4SmoothTrajectoryPoint::G4SmoothTrajectoryPoi <<  53 G4SmoothTrajectoryPoint::G4SmoothTrajectoryPoint()
                                                   >>  54 : fAuxiliaryPointVector(0)
                                                   >>  55 {
                                                   >>  56   fPosition = G4ThreeVector(0.,0.,0.);
                                                   >>  57 }
 54                                                    58 
 55 G4SmoothTrajectoryPoint::G4SmoothTrajectoryPoi <<  59 G4SmoothTrajectoryPoint::G4SmoothTrajectoryPoint(G4ThreeVector pos)
 56   G4ThreeVector pos, std::vector<G4ThreeVector <<  60 : fAuxiliaryPointVector(0)
 57   : fPosition(pos), fAuxiliaryPointVector(auxi <<  61 {
 58 {}                                             <<  62   fPosition = pos;
                                                   >>  63 }
 59                                                    64 
 60 G4SmoothTrajectoryPoint::G4SmoothTrajectoryPoi <<  65 G4SmoothTrajectoryPoint::G4SmoothTrajectoryPoint(G4ThreeVector pos,
 61   : fPosition(right.fPosition), fAuxiliaryPoin <<  66              std::vector<G4ThreeVector>* auxiliaryPoints)
                                                   >>  67 : fPosition(pos),
                                                   >>  68   fAuxiliaryPointVector(auxiliaryPoints)
 62 {}                                                 69 {}
 63                                                    70 
 64 G4SmoothTrajectoryPoint::~G4SmoothTrajectoryPo <<  71 G4SmoothTrajectoryPoint::G4SmoothTrajectoryPoint(const G4SmoothTrajectoryPoint &right)
                                                   >>  72 : G4VTrajectoryPoint(),
                                                   >>  73   fPosition(right.fPosition),fAuxiliaryPointVector(right.fAuxiliaryPointVector)
                                                   >>  74 {
                                                   >>  75 }
                                                   >>  76 
                                                   >>  77 G4SmoothTrajectoryPoint::~G4SmoothTrajectoryPoint()
                                                   >>  78 {
                                                   >>  79   if(fAuxiliaryPointVector) {
                                                   >>  80     delete fAuxiliaryPointVector;
                                                   >>  81   }
                                                   >>  82 }
                                                   >>  83 
 65                                                    84 
 66 const std::map<G4String, G4AttDef>* G4SmoothTr <<  85 const std::map<G4String,G4AttDef>*
                                                   >>  86 G4SmoothTrajectoryPoint::GetAttDefs() const
 67 {                                                  87 {
 68   G4bool isNew;                                    88   G4bool isNew;
 69   std::map<G4String, G4AttDef>* store =        <<  89   std::map<G4String,G4AttDef>* store
 70     G4AttDefStore::GetInstance("G4SmoothTrajec <<  90     = G4AttDefStore::GetInstance("G4SmoothTrajectoryPoint",isNew);
 71   if (isNew) {                                     91   if (isNew) {
 72     G4String Pos("Pos");                           92     G4String Pos("Pos");
 73     (*store)[Pos] = G4AttDef(Pos, "Step Positi <<  93     (*store)[Pos] = G4AttDef(Pos, "Step Position",
                                                   >>  94            "Physics","G4BestUnit","G4ThreeVector");
 74     G4String Aux("Aux");                           95     G4String Aux("Aux");
 75     (*store)[Aux] =                            <<  96     (*store)[Aux] = G4AttDef(Aux, "Auxiliary Point Position",
 76       G4AttDef(Aux, "Auxiliary Point Position" <<  97            "Physics","G4BestUnit","G4ThreeVector");
 77   }                                                98   }
 78   return store;                                    99   return store;
 79 }                                                 100 }
 80                                                   101 
 81 std::vector<G4AttValue>* G4SmoothTrajectoryPoi    102 std::vector<G4AttValue>* G4SmoothTrajectoryPoint::CreateAttValues() const
 82 {                                                 103 {
 83   auto values = new std::vector<G4AttValue>;   << 104   std::vector<G4AttValue>* values = new std::vector<G4AttValue>;
 84                                                   105 
 85   if (fAuxiliaryPointVector != nullptr) {      << 106   if (fAuxiliaryPointVector) {
 86     for (const auto& iAux : *fAuxiliaryPointVe << 107     std::vector<G4ThreeVector>::iterator iAux;
 87       values->push_back(G4AttValue("Aux", G4Be << 108     for (iAux = fAuxiliaryPointVector->begin();
                                                   >> 109    iAux != fAuxiliaryPointVector->end(); ++iAux) {
                                                   >> 110       values->push_back(G4AttValue("Aux",G4BestUnit(*iAux,"Length"),""));
 88     }                                             111     }
 89   }                                               112   }
 90                                                   113 
 91   values->push_back(G4AttValue("Pos", G4BestUn << 114   values->push_back(G4AttValue("Pos",G4BestUnit(fPosition,"Length"),""));
 92                                                   115 
 93 #ifdef G4ATTDEBUG                                 116 #ifdef G4ATTDEBUG
 94   G4cout << G4AttCheck(values, GetAttDefs());  << 117   G4cout << G4AttCheck(values,GetAttDefs());
 95 #endif                                            118 #endif
 96                                                   119 
 97   return values;                                  120   return values;
 98 }                                                 121 }
 99                                                   122