Geant4 Cross Reference

Cross-Referencing   Geant4
Geant4/examples/extended/optical/wls/src/WLSTrajectoryPoint.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/optical/wls/src/WLSTrajectoryPoint.cc (Version 11.3.0) and /examples/extended/optical/wls/src/WLSTrajectoryPoint.cc (Version 10.6.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 //                                                 26 //
 27 /// \file optical/wls/src/WLSTrajectoryPoint.c     27 /// \file optical/wls/src/WLSTrajectoryPoint.cc
 28 /// \brief Implementation of the WLSTrajectory     28 /// \brief Implementation of the WLSTrajectoryPoint class
 29 //                                                 29 //
 30 //                                                 30 //
 31 #include "WLSTrajectoryPoint.hh"                   31 #include "WLSTrajectoryPoint.hh"
 32                                                    32 
 33 #include "G4AttDef.hh"                         << 
 34 #include "G4AttDefStore.hh"                    << 
 35 #include "G4AttValue.hh"                       << 
 36 #include "G4Step.hh"                               33 #include "G4Step.hh"
 37 #include "G4StepStatus.hh"                     << 
 38 #include "G4Track.hh"                              34 #include "G4Track.hh"
 39 #include "G4UIcommand.hh"                      << 
 40 #include "G4UnitsTable.hh"                     << 
 41 #include "G4VProcess.hh"                           35 #include "G4VProcess.hh"
                                                   >>  36 #include "G4StepStatus.hh"
                                                   >>  37 
                                                   >>  38 #include "G4AttDef.hh"
                                                   >>  39 #include "G4AttValue.hh"
                                                   >>  40 #include "G4AttDefStore.hh"
                                                   >>  41 
                                                   >>  42 #include "G4UnitsTable.hh"
                                                   >>  43 
                                                   >>  44 //#define G4ATTDEBUG
                                                   >>  45 #ifdef G4ATTDEBUG
                                                   >>  46 #include "G4AttCheck.hh"
                                                   >>  47 #endif
 42                                                    48 
 43 G4ThreadLocal G4Allocator<WLSTrajectoryPoint>* <<  49 G4ThreadLocal G4Allocator<WLSTrajectoryPoint>* WLSTrajPointAllocator=0;
                                                   >>  50 
                                                   >>  51 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
                                                   >>  52 
                                                   >>  53 WLSTrajectoryPoint::WLSTrajectoryPoint()
                                                   >>  54       : fTime(0.), fMomentum(0.,0.,0.),
                                                   >>  55         fStepStatus(fUndefined), fVolumeName("") { }
 44                                                    56 
 45 //....oooOO0OOooo........oooOO0OOooo........oo     57 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 46                                                    58 
 47 WLSTrajectoryPoint::WLSTrajectoryPoint(const G     59 WLSTrajectoryPoint::WLSTrajectoryPoint(const G4Step* aStep)
 48   : G4TrajectoryPoint(aStep->GetPostStepPoint( <<  60     : G4TrajectoryPoint(aStep->GetPostStepPoint()->GetPosition())
 49 {                                                  61 {
 50   auto postStepPoint = aStep->GetPostStepPoint <<  62       fTime = aStep->GetPostStepPoint()->GetGlobalTime();
 51   fTime = postStepPoint->GetGlobalTime();      <<  63       fMomentum = aStep->GetPostStepPoint()->GetMomentum();
 52   fMomentum = postStepPoint->GetMomentum();    <<  64       fStepStatus = aStep->GetPostStepPoint()->GetStepStatus();
 53   fStepStatus = postStepPoint->GetStepStatus() <<  65       if (aStep->GetPostStepPoint()->GetPhysicalVolume())
 54   if (postStepPoint->GetPhysicalVolume()) {    <<  66       {
 55     fVolumeName = postStepPoint->GetPhysicalVo <<  67          fVolumeName = aStep->GetPostStepPoint()->
 56   }                                            <<  68                               GetPhysicalVolume()->GetName();
 57   else {                                       <<  69       } else {
 58     fVolumeName = G4String(" ");               <<  70          fVolumeName = " ";
 59   }                                            <<  71       }
 60 }                                                  72 }
 61                                                    73 
 62 //....oooOO0OOooo........oooOO0OOooo........oo     74 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 63                                                    75 
 64 WLSTrajectoryPoint::WLSTrajectoryPoint(const G     76 WLSTrajectoryPoint::WLSTrajectoryPoint(const G4Track* aTrack)
 65   : G4TrajectoryPoint(aTrack->GetPosition())   <<  77     : G4TrajectoryPoint(aTrack->GetPosition())
 66 {                                                  78 {
 67   fTime = aTrack->GetGlobalTime();             <<  79       fTime = aTrack->GetGlobalTime();
 68   fMomentum = aTrack->GetMomentum();           <<  80       fMomentum = aTrack->GetMomentum();
 69   fStepStatus = fUndefined;                    <<  81       fStepStatus = fUndefined;
 70   fVolumeName = aTrack->GetVolume()->GetName() <<  82       fVolumeName = aTrack->GetVolume()->GetName();
 71 }                                                  83 }
 72                                                    84 
 73 //....oooOO0OOooo........oooOO0OOooo........oo     85 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 74                                                    86 
 75 WLSTrajectoryPoint::WLSTrajectoryPoint(const W <<  87 WLSTrajectoryPoint::WLSTrajectoryPoint(const WLSTrajectoryPoint &right)
                                                   >>  88     : G4TrajectoryPoint(right)
 76 {                                                  89 {
 77   fTime = right.fTime;                         <<  90       fTime = right.fTime;
 78   fMomentum = right.fMomentum;                 <<  91       fMomentum = right.fMomentum;
 79   fStepStatus = right.fStepStatus;             <<  92       fStepStatus = right.fStepStatus;
 80   fVolumeName = right.fVolumeName;             <<  93       fVolumeName = right.fVolumeName;
 81 }                                                  94 }
 82                                                    95 
 83 //....oooOO0OOooo........oooOO0OOooo........oo     96 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 84                                                    97 
 85 const std::map<G4String, G4AttDef>* WLSTraject <<  98 WLSTrajectoryPoint::~WLSTrajectoryPoint() { }
                                                   >>  99 
                                                   >> 100 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
                                                   >> 101 
                                                   >> 102 const std::map<G4String,G4AttDef>* WLSTrajectoryPoint::GetAttDefs() const
 86 {                                                 103 {
 87   G4bool isNew;                                   104   G4bool isNew;
 88   std::map<G4String, G4AttDef>* store = G4AttD << 105   std::map<G4String,G4AttDef>* store
                                                   >> 106     = G4AttDefStore::GetInstance("TrajectoryPoint",isNew);
 89   if (isNew) {                                    107   if (isNew) {
 90     G4String Pos("Pos");                          108     G4String Pos("Pos");
 91     (*store)[Pos] = G4AttDef(Pos, "Position",  << 109     (*store)[Pos] =
                                                   >> 110       G4AttDef(Pos, "Position", "Physics","G4BestUnit","G4ThreeVector");
 92                                                   111 
 93     G4String Time("Time");                        112     G4String Time("Time");
 94     (*store)[Time] = G4AttDef(Time, "Time", "P << 113     (*store)[Time] =
                                                   >> 114       G4AttDef(Time, "Time", "Physics","G4BestUnit","G4double");
 95                                                   115 
 96     G4String Momentum("Momentum");                116     G4String Momentum("Momentum");
 97     (*store)[Momentum] = G4AttDef(Momentum, "M << 117     (*store)[Momentum] =
                                                   >> 118       G4AttDef(Momentum, "Momentum", "Physics","G4BestUnit","G4ThreeVector");
 98                                                   119 
 99     G4String StepStatus("StepStatus");            120     G4String StepStatus("StepStatus");
100     (*store)[StepStatus] = G4AttDef(StepStatus << 121     (*store)[StepStatus] =
                                                   >> 122       G4AttDef(StepStatus, "StepStatus", "Physics", "", "G4StepStatus");
101                                                   123 
102     G4String VolumeName("VolumeName");            124     G4String VolumeName("VolumeName");
103     (*store)[VolumeName] = G4AttDef(VolumeName << 125     (*store)[VolumeName] =
                                                   >> 126       G4AttDef(VolumeName, "VolumeName", "Physics", "", "G4String");
                                                   >> 127 
104   }                                               128   }
105   return store;                                   129   return store;
106 }                                                 130 }
107                                                   131 
108 //....oooOO0OOooo........oooOO0OOooo........oo    132 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
109                                                   133 
110 std::vector<G4AttValue>* WLSTrajectoryPoint::C    134 std::vector<G4AttValue>* WLSTrajectoryPoint::CreateAttValues() const
111 {                                                 135 {
112   auto values = new std::vector<G4AttValue>;   << 136   std::vector<G4AttValue>* values = new std::vector<G4AttValue>;
                                                   >> 137 
                                                   >> 138   values->push_back(G4AttValue("Time",G4BestUnit(fTime,"Time"),""));
                                                   >> 139 
                                                   >> 140   values->push_back(G4AttValue("Momentum",G4BestUnit(fMomentum,"Momentum"),""));
                                                   >> 141 
                                                   >> 142   values->push_back(G4AttValue("StepStatus",fStepStatus,""));
                                                   >> 143 
                                                   >> 144   values->push_back(G4AttValue("VolumeName",fVolumeName,""));
113                                                   145 
114   values->push_back(G4AttValue("Time", G4BestU << 146 #ifdef G4ATTDEBUG
115   values->push_back(G4AttValue("Momentum", G4B << 147   G4cout << G4AttCheck(values,GetAttDefs());
116   values->push_back(G4AttValue("StepStatus", G << 148 #endif
117   values->push_back(G4AttValue("VolumeName", f << 
118                                                   149 
119   return values;                                  150   return values;
120 }                                                 151 }
121                                                   152