Geant4 Cross Reference

Cross-Referencing   Geant4
Geant4/examples/extended/field/field01/include/F01CalorHit.hh

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/field01/include/F01CalorHit.hh (Version 11.3.0) and /examples/extended/field/field01/include/F01CalorHit.hh (Version 9.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 /// \file field/field01/include/F01CalorHit.hh     26 /// \file field/field01/include/F01CalorHit.hh
 27 /// \brief Definition of the F01CalorHit class     27 /// \brief Definition of the F01CalorHit class
 28 //                                                 28 //
 29 //                                                 29 //
                                                   >>  30 // $Id$
 30 //                                                 31 //
 31 //                                             <<  32 // 
 32 //....oooOO0OOooo........oooOO0OOooo........oo <<  33 
 33 //....oooOO0OOooo........oooOO0OOooo........oo <<  34 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
                                                   >>  35 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
 34                                                    36 
 35 #ifndef F01CalorHit_h                              37 #ifndef F01CalorHit_h
 36 #define F01CalorHit_h 1                            38 #define F01CalorHit_h 1
 37                                                    39 
 38 #include "G4Allocator.hh"                      << 
 39 #include "G4THitsCollection.hh"                << 
 40 #include "G4VHit.hh"                               40 #include "G4VHit.hh"
                                                   >>  41 #include "G4THitsCollection.hh"
                                                   >>  42 #include "G4Allocator.hh"
 41                                                    43 
 42 //....oooOO0OOooo........oooOO0OOooo........oo <<  44 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
 43                                                    45 
 44 class F01CalorHit : public G4VHit                  46 class F01CalorHit : public G4VHit
 45 {                                                  47 {
 46   public:                                          48   public:
 47     F01CalorHit() = default;                   << 
 48     F01CalorHit(const F01CalorHit&);           << 
 49     ~F01CalorHit() override = default;         << 
 50                                                << 
 51     const F01CalorHit& operator=(const F01Calo << 
 52     G4bool operator==(const F01CalorHit&) cons << 
 53                                                    49 
 54     inline void* operator new(size_t);         <<  50       F01CalorHit();
 55     inline void operator delete(void*);        <<  51       ~F01CalorHit();
                                                   >>  52       F01CalorHit(const F01CalorHit&);
                                                   >>  53       const F01CalorHit& operator=(const F01CalorHit&);
                                                   >>  54       G4int operator==(const F01CalorHit&) const;
 56                                                    55 
 57     void Print() override;                     <<  56       inline void* operator new(size_t);
                                                   >>  57       inline void  operator delete(void*);
 58                                                    58 
                                                   >>  59       virtual void Print();
                                                   >>  60       
 59   public:                                          61   public:
 60     void AddAbs(G4double de, G4double dl)      <<  62   
 61     {                                          <<  63       void AddAbs(G4double de, G4double dl) {fEdepAbs += de; fTrackLengthAbs += dl;};
 62       fEdepAbs += de;                          <<  64       void AddGap(G4double de, G4double dl) {fEdepGap += de; fTrackLengthGap += dl;};      
 63       fTrackLengthAbs += dl;                   <<  65                  
 64     };                                         <<  66       G4double GetEdepAbs()     { return fEdepAbs; };
 65     void AddGap(G4double de, G4double dl)      <<  67       G4double GetTrackAbs()    { return fTrackLengthAbs; };
 66     {                                          <<  68       G4double GetEdepGap()     { return fEdepGap; };
 67       fEdepGap += de;                          <<  69       G4double GetTrackGap()    { return fTrackLengthGap; };
 68       fTrackLengthGap += dl;                   <<  70      
 69     };                                         << 
 70                                                << 
 71     G4double GetEdepAbs() { return fEdepAbs; } << 
 72     G4double GetTrackAbs() { return fTrackLeng << 
 73     G4double GetEdepGap() { return fEdepGap; } << 
 74     G4double GetTrackGap() { return fTrackLeng << 
 75                                                << 
 76   private:                                         71   private:
 77     G4double fEdepAbs = 0.;                    <<  72   
 78     G4double fTrackLengthAbs = 0.;             <<  73       G4double fEdepAbs, fTrackLengthAbs;
 79     G4double fEdepGap = 0.;                    <<  74       G4double fEdepGap, fTrackLengthGap;
 80     G4double fTrackLengthGap = 0.;             <<  75       
 81 };                                                 76 };
 82                                                    77 
 83 //....oooOO0OOooo........oooOO0OOooo........oo <<  78 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
 84                                                    79 
 85 using F01CalorHitsCollection = G4THitsCollecti <<  80 typedef G4THitsCollection<F01CalorHit> F01CalorHitsCollection;
 86                                                    81 
 87 extern G4ThreadLocal G4Allocator<F01CalorHit>* <<  82 extern G4Allocator<F01CalorHit> F01CalorHitAllocator;
 88                                                    83 
 89 //....oooOO0OOooo........oooOO0OOooo........oo <<  84 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
 90                                                    85 
 91 inline void* F01CalorHit::operator new(size_t)     86 inline void* F01CalorHit::operator new(size_t)
 92 {                                                  87 {
 93   if (!F01CalorHitAllocator) F01CalorHitAlloca <<  88   void* aHit;
 94   return (void*)F01CalorHitAllocator->MallocSi <<  89   aHit = (void*) F01CalorHitAllocator.MallocSingle();
                                                   >>  90   return aHit;
 95 }                                                  91 }
 96                                                    92 
 97 //....oooOO0OOooo........oooOO0OOooo........oo <<  93 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
 98                                                    94 
 99 inline void F01CalorHit::operator delete(void*     95 inline void F01CalorHit::operator delete(void* aHit)
100 {                                                  96 {
101   F01CalorHitAllocator->FreeSingle((F01CalorHi <<  97   F01CalorHitAllocator.FreeSingle((F01CalorHit*) aHit);
102 }                                                  98 }
103                                                    99 
104 #endif                                            100 #endif
                                                   >> 101 
                                                   >> 102 
105                                                   103