Geant4 Cross Reference

Cross-Referencing   Geant4
Geant4/analysis/xml/src/G4XmlAnalysisReader.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 /analysis/xml/src/G4XmlAnalysisReader.cc (Version 11.3.0) and /analysis/xml/src/G4XmlAnalysisReader.cc (Version 11.1.1)


  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 // Author: Ivana Hrivnacova, 25/07/2014 (ivana     27 // Author: Ivana Hrivnacova, 25/07/2014 (ivana@ipno.in2p3.fr)
 28                                                    28 
 29 #include "G4XmlAnalysisReader.hh"                  29 #include "G4XmlAnalysisReader.hh"
 30 #include "G4XmlRFileManager.hh"                    30 #include "G4XmlRFileManager.hh"
 31 #include "G4XmlRNtupleManager.hh"                  31 #include "G4XmlRNtupleManager.hh"
 32 #include "G4AnalysisUtilities.hh"                  32 #include "G4AnalysisUtilities.hh"
 33 #include "G4ThreadLocalSingleton.hh"               33 #include "G4ThreadLocalSingleton.hh"
 34 #include "G4Threading.hh"                          34 #include "G4Threading.hh"
 35                                                    35 
 36 using namespace G4Analysis;                        36 using namespace G4Analysis;
 37                                                    37 
 38 //____________________________________________     38 //_____________________________________________________________________________
 39 G4XmlAnalysisReader* G4XmlAnalysisReader::Inst     39 G4XmlAnalysisReader* G4XmlAnalysisReader::Instance()
 40 {                                                  40 {
 41   static G4ThreadLocalSingleton<G4XmlAnalysisR     41   static G4ThreadLocalSingleton<G4XmlAnalysisReader> instance;
 42   return instance.Instance();                      42   return instance.Instance();
 43 }                                                  43 }
 44                                                    44 
 45 //____________________________________________     45 //_____________________________________________________________________________
 46 G4XmlAnalysisReader::G4XmlAnalysisReader()         46 G4XmlAnalysisReader::G4XmlAnalysisReader()
 47  : G4ToolsAnalysisReader("Xml")                    47  : G4ToolsAnalysisReader("Xml")
 48 {                                                  48 {
 49   if ( ! G4Threading::IsWorkerThread() ) fgMas     49   if ( ! G4Threading::IsWorkerThread() ) fgMasterInstance = this;
 50                                                    50 
 51   // Create managers                               51   // Create managers
 52   fNtupleManager = std::make_shared<G4XmlRNtup     52   fNtupleManager = std::make_shared<G4XmlRNtupleManager>(fState);
 53   fFileManager = std::make_shared<G4XmlRFileMa     53   fFileManager = std::make_shared<G4XmlRFileManager>(fState);
 54   fNtupleManager->SetFileManager(fFileManager)     54   fNtupleManager->SetFileManager(fFileManager);
 55                                                    55 
 56   // Set managers to base class                    56   // Set managers to base class
 57   SetNtupleManager(fNtupleManager);                57   SetNtupleManager(fNtupleManager);
 58   SetFileManager(fFileManager);                    58   SetFileManager(fFileManager);
 59 }                                                  59 }
 60                                                    60 
 61 //____________________________________________     61 //_____________________________________________________________________________
 62 G4XmlAnalysisReader::~G4XmlAnalysisReader()        62 G4XmlAnalysisReader::~G4XmlAnalysisReader()
 63 {                                                  63 {
 64   if ( fState.GetIsMaster() ) fgMasterInstance     64   if ( fState.GetIsMaster() ) fgMasterInstance = nullptr;
 65 }                                                  65 }
 66                                                    66 
 67 //                                                 67 //
 68 // private methods                                 68 // private methods
 69 //                                                 69 //
 70                                                    70 
 71 //____________________________________________     71 //_____________________________________________________________________________
 72 G4bool G4XmlAnalysisReader::Reset()                72 G4bool G4XmlAnalysisReader::Reset()
 73 {                                                  73 {
 74 // Reset histograms and ntuple                     74 // Reset histograms and ntuple
 75                                                    75 
 76   auto result = true;                              76   auto result = true;
 77                                                    77 
 78   result &= G4ToolsAnalysisReader::Reset();        78   result &= G4ToolsAnalysisReader::Reset();
 79   result &= fNtupleManager->Reset();               79   result &= fNtupleManager->Reset();
 80                                                    80 
 81   return result;                                   81   return result;
 82 }                                                  82 }
 83                                                    83 
 84 //                                                 84 //
 85 // protected methods                               85 // protected methods
 86 //                                                 86 //
 87                                                    87 
 88 //____________________________________________     88 //_____________________________________________________________________________
 89 G4bool  G4XmlAnalysisReader::CloseFilesImpl(G4     89 G4bool  G4XmlAnalysisReader::CloseFilesImpl(G4bool reset)
 90 {                                                  90 {
 91   Message(kVL4, "close", "files");                 91   Message(kVL4, "close", "files");
 92                                                    92 
 93   auto result = true;                              93   auto result = true;
 94                                                    94 
 95   if (reset) {                                     95   if (reset) {
 96     result &= Reset();                             96     result &= Reset();
 97   }                                                97   }
 98                                                    98 
 99   fFileManager->CloseFiles();                      99   fFileManager->CloseFiles();
100                                                   100 
101   Message(kVL2, "close", "files", "", result);    101   Message(kVL2, "close", "files", "", result);
102                                                   102 
103   return result;                                  103   return result;
104 }                                                 104 }
105                                                   105