Geant4 Cross Reference

Cross-Referencing   Geant4
Geant4/processes/electromagnetic/dna/management/src/G4VITProcess.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 /processes/electromagnetic/dna/management/src/G4VITProcess.cc (Version 11.3.0) and /processes/electromagnetic/dna/management/src/G4VITProcess.cc (Version 10.0.p3)


  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: G4VITProcess.cc 82326 2014-06-16 09:19:18Z gcosmo $
 26 //                                                 27 //
 27 #include "G4VITProcess.hh"                         28 #include "G4VITProcess.hh"
 28                                                << 
 29 #include "G4IT.hh"                             << 
 30 #include "G4SystemOfUnits.hh"                      29 #include "G4SystemOfUnits.hh"
 31 #include "G4TrackingInformation.hh"            <<  30 #include "G4IT.hh"
 32                                                << 
 33 #include <memory>                              << 
 34                                                    31 
 35 /*G4ThreadLocal*/size_t *G4VITProcess::fNbProc <<  32 /*G4ThreadLocal*/ size_t *G4VITProcess::fNbProcess = 0;
 36                                                    33 
 37 G4VITProcess::G4VITProcess(const G4String& nam     34 G4VITProcess::G4VITProcess(const G4String& name, G4ProcessType type) :
 38     G4VProcess(name, type)                     <<  35     G4VProcess( name, type )//,
 39 //    fpState (0)//,                           <<  36         //fProcessID(fNbProcess)
 40 //fProcessID(fNbProcess)                       <<  37 {
 41 {                                              <<  38         if (!fNbProcess) fNbProcess = new size_t (0);
 42   fpState.reset();                             <<  39         fProcessID = *fNbProcess;
 43   if(fNbProcess == nullptr) fNbProcess = new s <<  40         (*fNbProcess)++;
 44   fProcessID = *fNbProcess;                    <<  41         SetInstantiateProcessState(true);
 45   (*fNbProcess)++;                             <<  42         currentInteractionLength            = 0;
 46   SetInstantiateProcessState(true);            <<  43         theInteractionTimeLeft              = 0;
 47   currentInteractionLength = nullptr;          <<  44         theNumberOfInteractionLengthLeft    = 0;
 48   theInteractionTimeLeft = nullptr;            <<  45         fProposesTimeStep = false;
 49   theNumberOfInteractionLengthLeft = nullptr;  << 
 50   fProposesTimeStep = false;                   << 
 51 }                                                  46 }
 52                                                    47 
 53 G4VITProcess::G4ProcessState::G4ProcessState()     48 G4VITProcess::G4ProcessState::G4ProcessState()
 54 {                                                  49 {
 55   theNumberOfInteractionLengthLeft = -1.0;     <<  50     theNumberOfInteractionLengthLeft = -1.0 ;
 56   theInteractionTimeLeft = -1.0;               <<  51     theInteractionTimeLeft           = -1.0 ;
 57   currentInteractionLength = -1.0;             <<  52     currentInteractionLength         = -1.0 ;
 58 }                                                  53 }
 59                                                    54 
 60 G4VITProcess::G4ProcessState::~G4ProcessState(     55 G4VITProcess::G4ProcessState::~G4ProcessState()
 61 = default;                                     <<  56 {;}
 62                                                    57 
 63 G4VITProcess::~G4VITProcess()                      58 G4VITProcess::~G4VITProcess()
 64 = default;                                     <<  59 {
                                                   >>  60     //dtor
                                                   >>  61     // As the owner, G4IT should delete fProcessState
                                                   >>  62 }
 65                                                    63 
 66 G4VITProcess::G4VITProcess(const G4VITProcess& <<  64 G4VITProcess::G4VITProcess(const G4VITProcess& other)  : G4VProcess(other), fProcessID(other.fProcessID)
 67     G4VProcess(other), fProcessID(other.fProce << 
 68 {                                                  65 {
 69   //copy ctor                                  <<  66   //copy ctor
 70   //fpState                             = 0 ;  <<  67         currentInteractionLength            = 0;
 71   currentInteractionLength            = nullpt <<  68         theInteractionTimeLeft              = 0;
 72   theInteractionTimeLeft              = nullpt <<  69         theNumberOfInteractionLengthLeft    = 0;
 73   theNumberOfInteractionLengthLeft    = nullpt <<  70         fInstantiateProcessState            = other.fInstantiateProcessState;
 74   fInstantiateProcessState            = other. <<  71         fProposesTimeStep                   = other.fProposesTimeStep;
 75   fProposesTimeStep                   = other. << 
 76 }                                                  72 }
 77                                                    73 
 78 G4VITProcess& G4VITProcess::operator=(const G4     74 G4VITProcess& G4VITProcess::operator=(const G4VITProcess& rhs)
 79 {                                                  75 {
 80   if (this == &rhs) return *this; // handle se <<  76   if (this == &rhs) return *this; // handle self assignment
 81   //assignment operator                        <<  77   //assignment operator
 82   return *this;                                <<  78   return *this;
 83 }                                                  79 }
 84                                                    80 
 85 void G4VITProcess::StartTracking(G4Track* trac     81 void G4VITProcess::StartTracking(G4Track* track)
 86 {                                                  82 {
 87   G4TrackingInformation* trackingInfo = GetIT( <<  83     G4TrackingInformation* trackingInfo = GetIT(track)->GetTrackingInfo();
 88   if(InstantiateProcessState())                <<  84     if(InstantiateProcessState())
 89   {                                            <<  85     {
 90     //        fpState = new G4ProcessState();  <<  86         fpState.reset(new G4ProcessState());
 91     fpState = std::make_shared<G4ProcessState> <<  87     }
 92   }                                            <<  88 
 93                                                <<  89     theNumberOfInteractionLengthLeft    = &(fpState->theNumberOfInteractionLengthLeft );
 94   theNumberOfInteractionLengthLeft    = &(fpSt <<  90     theInteractionTimeLeft              = &(fpState->theInteractionTimeLeft           );
 95   theInteractionTimeLeft              = &(fpSt <<  91     currentInteractionLength            = &(fpState->currentInteractionLength         );
 96   currentInteractionLength            = &(fpSt <<  92     trackingInfo->RecordProcessState(fpState,fProcessID);
 97   trackingInfo->RecordProcessState(fpState,fPr <<  93   fpState.reset();
 98   //    fpState = 0;                           << 
 99   fpState.reset();                             << 
100 }                                                  94 }
101                                                    95 
102                                                    96