Geant4 Cross Reference

Cross-Referencing   Geant4
Geant4/tracking/src/G4VTrajectory.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/G4VTrajectory.cc (Version 11.3.0) and /tracking/src/G4VTrajectory.cc (Version 9.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 // G4VTrajectory class implementation          <<  26 //
                                                   >>  27 // $Id: G4VTrajectory.cc 67009 2013-01-29 16:00:21Z gcosmo $
                                                   >>  28 //
                                                   >>  29 // ---------------------------------------------------------------
                                                   >>  30 //
                                                   >>  31 // G4VTrajectory.cc
 27 //                                                 32 //
 28 // Contact:                                        33 // Contact:
 29 //   Questions and comments to this code shoul     34 //   Questions and comments to this code should be sent to
 30 //     Katsuya Amako  (e-mail: Katsuya.Amako@k     35 //     Katsuya Amako  (e-mail: Katsuya.Amako@kek.jp)
 31 //     Makoto  Asai   (e-mail: asai@slac.stanf <<  36 //     Makoto  Asai   (e-mail: asai@kekvax.kek.jp)
 32 //     Takashi Sasaki (e-mail: Takashi.Sasaki@     37 //     Takashi Sasaki (e-mail: Takashi.Sasaki@kek.jp)
 33 // ------------------------------------------- <<  38 //
                                                   >>  39 // ---------------------------------------------------------------
 34                                                    40 
 35 #include "G4VTrajectory.hh"                        41 #include "G4VTrajectory.hh"
 36                                                <<  42 #include "G4VTrajectoryPoint.hh"
 37 #include "G4AttCheck.hh"                       << 
 38 #include "G4AttDef.hh"                         << 
 39 #include "G4AttDefStore.hh"                        43 #include "G4AttDefStore.hh"
                                                   >>  44 #include "G4AttDef.hh"
 40 #include "G4AttValue.hh"                           45 #include "G4AttValue.hh"
 41 #include "G4Colour.hh"                         <<  46 #include "G4AttCheck.hh"
 42 #include "G4Polyline.hh"                       << 
 43 #include "G4Polymarker.hh"                     << 
 44 #include "G4VTrajectoryPoint.hh"               << 
 45 #include "G4VVisManager.hh"                        47 #include "G4VVisManager.hh"
 46 #include "G4VisAttributes.hh"                      48 #include "G4VisAttributes.hh"
                                                   >>  49 #include "G4Polyline.hh"
                                                   >>  50 #include "G4Polymarker.hh"
                                                   >>  51 #include "G4Colour.hh"
 47                                                    52 
 48 G4bool G4VTrajectory::operator==(const G4VTraj <<  53 G4VTrajectory::G4VTrajectory() {;}
                                                   >>  54 G4VTrajectory::~G4VTrajectory() {;}
 49                                                    55 
 50 G4VTrajectory* G4VTrajectory::CloneForMaster() <<  56 G4bool G4VTrajectory::operator == (const G4VTrajectory& right) const
 51 {                                                  57 {
 52   // Base-class method must not be invoked.    <<  58   return (this==&right);
 53   // Each concrete class should implement its  << 
 54    G4Exception("G4VTrajectory::CloneForMaster( << 
 55      "CloneForMaster() of G4VTrajectory base-c << 
 56    return nullptr;                             << 
 57 }                                                  59 }
 58                                                    60 
 59 void G4VTrajectory::ShowTrajectory(std::ostrea     61 void G4VTrajectory::ShowTrajectory(std::ostream& os) const
 60 {                                                  62 {
 61   // Makes use of attribute values implemented     63   // Makes use of attribute values implemented in the concrete class.
 62   // Note: the user needs to follow with new-l     64   // Note: the user needs to follow with new-line or end-of-string,
 63   // depending on the nature of os             <<  65   // depending on the nature of os.
 64                                                    66 
 65   std::vector<G4AttValue>* attValues = CreateA     67   std::vector<G4AttValue>* attValues = CreateAttValues();
 66   const std::map<G4String, G4AttDef>* attDefs  <<  68   const std::map<G4String,G4AttDef>* attDefs = GetAttDefs();
 67                                                    69 
 68   // Ensure validity...                            70   // Ensure validity...
 69   //                                           <<  71   if (G4AttCheck(attValues,attDefs).Check("G4VTrajectory::ShowTrajectory")) {
 70   if (G4AttCheck(attValues, attDefs).Check("G4 << 
 71     return;                                        72     return;
 72   }                                                73   }
 73                                                    74 
 74   os << "Trajectory:";                             75   os << "Trajectory:";
 75                                                    76 
 76   for (const auto& attValue : *attValues) {    <<  77   std::vector<G4AttValue>::iterator iAttVal;
 77     auto iAttDef = attDefs->find(attValue.GetN <<  78   for (iAttVal = attValues->begin();
 78     os << "\n  " << iAttDef->second.GetDesc()  <<  79        iAttVal != attValues->end(); ++iAttVal) {
 79        << "): " << attValue.GetValue();        <<  80     std::map<G4String,G4AttDef>::const_iterator iAttDef =
                                                   >>  81       attDefs->find(iAttVal->GetName());
                                                   >>  82     os << "\n  " << iAttDef->second.GetDesc()
                                                   >>  83        << " (" << iAttVal->GetName()
                                                   >>  84        << "): " << iAttVal->GetValue();
 80   }                                                85   }
 81                                                    86 
 82   delete attValues;  // AttValues must be dele     87   delete attValues;  // AttValues must be deleted after use.
 83                                                    88 
 84   // Now do trajectory points...               <<  89   //Now do trajectory points...
                                                   >>  90   for (G4int i = 0; i < GetPointEntries(); i++) {
 85                                                    91 
 86   for (G4int i = 0; i < GetPointEntries(); ++i << 
 87     G4VTrajectoryPoint* aTrajectoryPoint = Get     92     G4VTrajectoryPoint* aTrajectoryPoint = GetPoint(i);
 88     attValues = aTrajectoryPoint->CreateAttVal     93     attValues = aTrajectoryPoint->CreateAttValues();
 89     attDefs = aTrajectoryPoint->GetAttDefs();      94     attDefs = aTrajectoryPoint->GetAttDefs();
 90                                                    95 
 91     // Ensure validity...                          96     // Ensure validity...
 92     //                                         <<  97     if (G4AttCheck(attValues,attDefs).Check("G4VTrajectory::ShowTrajectory")) {
 93     if (G4AttCheck(attValues, attDefs).Check(" << 
 94       return;                                      98       return;
 95     }                                              99     }
 96                                                   100 
 97     for (const auto& attValue : *attValues) {  << 101     for (iAttVal = attValues->begin();
 98       const auto iAttDef = attDefs->find(attVa << 102    iAttVal != attValues->end(); ++iAttVal) {
 99       os << "\n    " << iAttDef->second.GetDes << 103       std::map<G4String,G4AttDef>::const_iterator iAttDef =
100          << "): " << attValue.GetValue();      << 104   attDefs->find(iAttVal->GetName());
                                                   >> 105       os << "\n    " << iAttDef->second.GetDesc()
                                                   >> 106    << " (" << iAttVal->GetName()
                                                   >> 107    << "): " << iAttVal->GetValue();
101     }                                             108     }
102                                                   109 
103     delete attValues;  // AttValues must be de    110     delete attValues;  // AttValues must be deleted after use.
104   }                                               111   }
105   os << std::endl;                             << 
106 }                                                 112 }
107                                                   113 
                                                   >> 114 /***
108 void G4VTrajectory::DrawTrajectory() const        115 void G4VTrajectory::DrawTrajectory() const
109 {                                                 116 {
110   G4VVisManager* pVVisManager = G4VVisManager:    117   G4VVisManager* pVVisManager = G4VVisManager::GetConcreteInstance();
111                                                   118 
112   if (pVVisManager != nullptr) {               << 119   if (0 != pVVisManager) {
113     pVVisManager->DispatchToModel(*this);         120     pVVisManager->DispatchToModel(*this);
                                                   >> 121   }
                                                   >> 122 }
                                                   >> 123 ***/
                                                   >> 124 
                                                   >> 125 void G4VTrajectory::DrawTrajectory(G4int i_mode) const
                                                   >> 126 {
                                                   >> 127   G4VVisManager* pVVisManager = G4VVisManager::GetConcreteInstance();
                                                   >> 128 
                                                   >> 129   static G4bool warnedAboutIMode = false;
                                                   >> 130   if (!warnedAboutIMode && i_mode != 0) {
                                                   >> 131     G4Exception
                                                   >> 132         ("G4VTrajectory::DrawTrajectory()",
                                                   >> 133          "Tracking0100", JustWarning,
                                                   >> 134          "DEPRECATED! The use of i_mode argument in DrawTrajectory()"
                                                   >> 135          "\n  is deprecated and will be removed at the next major release.");
                                                   >> 136     warnedAboutIMode = true;
                                                   >> 137   }
                                                   >> 138 
                                                   >> 139   if (0 != pVVisManager) {
                                                   >> 140     pVVisManager->DispatchToModel(*this, i_mode);
114   }                                               141   }
115 }                                                 142 }
116                                                   143