Geant4 Cross Reference

Cross-Referencing   Geant4
Geant4/digits_hits/digits/src/G4DCofThisEvent.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 /digits_hits/digits/src/G4DCofThisEvent.cc (Version 11.3.0) and /digits_hits/digits/src/G4DCofThisEvent.cc (Version 10.2)


  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 // G4DCofThisEvent                             <<  26 //
 27 // ------------------------------------------- <<  27 // $Id: G4DCofThisEvent.cc 81087 2014-05-20 15:44:27Z gcosmo $
                                                   >>  28 //
 28                                                    29 
 29 #include "G4DCofThisEvent.hh"                      30 #include "G4DCofThisEvent.hh"
 30                                                << 
 31 #include <algorithm>                               31 #include <algorithm>
 32                                                    32 
 33 G4Allocator<G4DCofThisEvent>*& anDCoTHAllocato <<  33 G4ThreadLocal G4Allocator<G4DCofThisEvent> *anDCoTHAllocator_G4MT_TLS_ = 0;
 34 {                                              << 
 35   G4ThreadLocalStatic G4Allocator<G4DCofThisEv << 
 36   return _instance;                            << 
 37 }                                              << 
 38                                                    34 
 39 G4DCofThisEvent::G4DCofThisEvent() { DC = new  <<  35 G4DCofThisEvent::G4DCofThisEvent()
                                                   >>  36 { if (!anDCoTHAllocator_G4MT_TLS_) anDCoTHAllocator_G4MT_TLS_ = new G4Allocator<G4DCofThisEvent>  ;
                                                   >>  37   DC = new std::vector<G4VDigiCollection*>;
                                                   >>  38 }
 40                                                    39 
 41 G4DCofThisEvent::G4DCofThisEvent(G4int cap)        40 G4DCofThisEvent::G4DCofThisEvent(G4int cap)
 42 {                                              <<  41 { if (!anDCoTHAllocator_G4MT_TLS_) anDCoTHAllocator_G4MT_TLS_ = new G4Allocator<G4DCofThisEvent>  ;
 43   DC = new std::vector<G4VDigiCollection*>(cap <<  42   DC = new std::vector<G4VDigiCollection*>;
                                                   >>  43   for(G4int i=0;i<cap;i++)
                                                   >>  44   {
                                                   >>  45     DC->push_back((G4VDigiCollection*)0);
                                                   >>  46   }
 44 }                                                  47 }
 45                                                    48 
 46 G4DCofThisEvent::~G4DCofThisEvent()                49 G4DCofThisEvent::~G4DCofThisEvent()
 47 {                                              <<  50 { if (!anDCoTHAllocator_G4MT_TLS_) anDCoTHAllocator_G4MT_TLS_ = new G4Allocator<G4DCofThisEvent>  ;
 48   for (const G4VDigiCollection* d : *DC) {     <<  51   //DC->clearAndDestroy();
 49     delete d;                                  <<  52   for(size_t i=0;i<DC->size();i++)
 50   }                                            <<  53   { delete (*DC)[i]; }
                                                   >>  54   DC->clear();
 51   delete DC;                                       55   delete DC;
 52 }                                                  56 }
 53                                                    57 
 54 void G4DCofThisEvent::AddDigiCollection(G4int  <<  58 void G4DCofThisEvent::AddDigiCollection(G4int DCID,G4VDigiCollection * aDC)
 55 {                                              <<  59 { if (!anDCoTHAllocator_G4MT_TLS_) anDCoTHAllocator_G4MT_TLS_ = new G4Allocator<G4DCofThisEvent>  ;
 56   if (DCID >= 0 && DCID < G4int(DC->size())) { <<  60   if(DCID>=0 && DCID<G4int(DC->size()))
 57     (*DC)[DCID] = aDC;                         <<  61   { (*DC)[DCID] = aDC; }
 58   }                                            << 
 59 }                                                  62 }
 60                                                    63 
 61 G4DCofThisEvent::G4DCofThisEvent(const G4DCofT     64 G4DCofThisEvent::G4DCofThisEvent(const G4DCofThisEvent& rhs)
 62 {                                                  65 {
 63   DC = new std::vector<G4VDigiCollection*>(rhs <<  66     if ( !anDCoTHAllocator_G4MT_TLS_ ) anDCoTHAllocator_G4MT_TLS_ = new G4Allocator<G4DCofThisEvent>;
 64   for (unsigned int i = 0; i < rhs.DC->size(); <<  67     DC = new std::vector<G4VDigiCollection*>(rhs.DC->size());
 65     *(DC->at(i)) = *(rhs.DC->at(i));           <<  68     for ( unsigned int i = 0 ; i < rhs.DC->size() ; ++i )
                                                   >>  69         *(DC->at(i)) = *(rhs.DC->at(i));
 66 }                                                  70 }
 67                                                    71 
 68 G4DCofThisEvent& G4DCofThisEvent::operator=(co     72 G4DCofThisEvent& G4DCofThisEvent::operator=(const G4DCofThisEvent& rhs)
 69 {                                                  73 {
 70   if (this == &rhs) return *this;              <<  74     if ( this == &rhs ) return *this;
 71                                                <<  75     if ( !anDCoTHAllocator_G4MT_TLS_ ) anDCoTHAllocator_G4MT_TLS_ = new G4Allocator<G4DCofThisEvent>;
 72   for (const G4VDigiCollection* d : *DC) {     <<  76     for ( std::vector<G4VDigiCollection*>::const_iterator it = DC->begin() ;
 73     delete d;                                  <<  77          it != DC->end() ; ++it )
 74   }                                            <<  78     {
 75   DC->resize(rhs.DC->size());                  <<  79         delete *it;
 76   for (unsigned int i = 0; i < rhs.DC->size(); <<  80     }
 77     *(DC->at(i)) = *(rhs.DC->at(i));           <<  81     DC->resize(rhs.DC->size());
 78   return *this;                                <<  82     for ( unsigned int i = 0 ; i < rhs.DC->size() ; ++i )
                                                   >>  83         *(DC->at(i)) = *(rhs.DC->at(i));
                                                   >>  84     return *this;
 79 }                                                  85 }
                                                   >>  86 
 80                                                    87