lars/geant4
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Import Geant4 11.0.0 source tree

Browse Source
This commit is contained in:
Gabriele Cosmo
2021-12-10 14:46:44 +01:00
committed by Ben Morgan
parent 6399a014b6
commit 80e2389dd8
3932 changed files with 202519 additions and 246221 deletions
Download Patch File Download Diff File Expand all files Collapse all files
examples/extended/physicslists/shared/History
+10
View File
@@ -14,6 +14,16 @@ track of all tags.
* Reverse chronological order (last date on top), please *
----------------------------------------------------------
06/10/21 I. Hrivnacova (physicslistsShared-V10-07-01)
- Migration to new G4AnalysisManager.hh header;
define the default output file type (root),
removed Analysis.hh.
19/07/21 I. Hrivnacova (physicslistsShared-V10-07-00)
- Updated for changes in the analysis category:
removed deleting of the analysis manager,
as this is now done by the Geant4 kernel.
10/11/20 I. Hrivnacova (physicslistsShared-V10-06-00)
- Removed trailing whitespaces
examples/extended/physicslists/shared/include/Analysis.hh
-37
View File
@@ -1,37 +0,0 @@
//
// ********************************************************************
// * License and Disclaimer *
// * *
// * The Geant4 software is copyright of the Copyright Holders of *
// * the Geant4 Collaboration. It is provided under the terms and *
// * conditions of the Geant4 Software License, included in the file *
// * LICENSE and available at http://cern.ch/geant4/license . These *
// * include a list of copyright holders. *
// * *
// * Neither the authors of this software system, nor their employing *
// * institutes,nor the agencies providing financial support for this *
// * work make any representation or warranty, express or implied, *
// * regarding this software system or assume any liability for its *
// * use. Please see the license in the file LICENSE and URL above *
// * for the full disclaimer and the limitation of liability. *
// * *
// * This code implementation is the result of the scientific and *
// * technical work of the GEANT4 collaboration. *
// * By using, copying, modifying or distributing the software (or *
// * any work based on the software) you agree to acknowledge its *
// * use in resulting scientific publications, and indicate your *
// * acceptance of all terms of the Geant4 Software license. *
// ********************************************************************
//
//
/// \file Analysis.hh
/// \brief Selection of the analysis technology
#ifndef Analysis_h
#define Analysis_h 1
#include "g4root.hh"
//#include "g4csv.hh"
//#include "g4xml.hh"
#endif
examples/extended/physicslists/shared/include/RunAction.hh
+1 -2
View File
@@ -46,8 +46,7 @@ class G4Run;
/// - Track length in absorber
/// - Track length in gap
/// The same values are also saved in the ntuple.
/// The histograms and ntuple are saved in the output file in a format
/// accoring to a selected technology in Analysis.hh.
/// The histograms and ntuple are saved in the Root output file by default.
///
/// In EndOfRunAction(), the accumulated statistic and computed
/// dispersion is printed.
examples/extended/physicslists/shared/src/RunAction.cc
+3 -5
View File
@@ -28,12 +28,12 @@
/// \brief Implementation of the RunAction class
#include "RunAction.hh"
#include "Analysis.hh"
#include "G4Run.hh"
#include "G4RunManager.hh"
#include "G4UnitsTable.hh"
#include "G4SystemOfUnits.hh"
#include "G4AnalysisManager.hh"
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
@@ -42,12 +42,11 @@ RunAction::RunAction(const G4String& fileName)
fFileName(fileName)
{
// Create analysis manager
// The choice of analysis technology is done via selectin of a namespace
// in Analysis.hh
auto analysisManager = G4AnalysisManager::Instance();
G4cout << "Using " << analysisManager->GetType() << G4endl;
analysisManager->SetDefaultFileType("root");
analysisManager->SetVerboseLevel(1);
analysisManager->SetNtupleMerging(true);
G4cout << "Using " << analysisManager->GetType() << G4endl;
// Note: merging ntuples is available only with Root output
// Set default fileName
@@ -69,7 +68,6 @@ RunAction::RunAction(const G4String& fileName)
RunAction::~RunAction()
{
delete G4AnalysisManager::Instance();
}
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
examples/extended/physicslists/shared/src/ScreenSD.cc
+1 -1
View File
@@ -29,12 +29,12 @@
//
#include "ScreenSD.hh"
#include "Analysis.hh"
#include "G4VTouchable.hh"
#include "G4Step.hh"
#include "G4ios.hh"
#include "G4SystemOfUnits.hh"
#include "G4AnalysisManager.hh"
#include "G4VProcess.hh"