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

Import Geant4 10.4.0 source tree

Browse Source
This commit is contained in:
Gabriele Cosmo
2017-12-08 12:52:30 +01:00
parent 98e455a940
commit fc6af9e721
2166 changed files with 276760 additions and 100873 deletions
Download Patch File Download Diff File Expand all files Collapse all files
examples/extended/exoticphysics/channeling/History
+5
View File
@@ -15,6 +15,11 @@ track of all tags.
* Reverse chronological order (last date on top), please *
----------------------------------------------------------
August 22, 2017 E. Bagli (channelingExample-V10-03-03)
- Modified sdht_ID to fSDHT_ID
- Removed G4VIS_USE, G4UI_USE
- Removed double blank lines
May 05,2017 E. Bagli (channelingExample-V10-03-00)
- Added the support to the G4Crystal package implemented in V10-03
- Added the support to G4Channeling process implemented in V10-03-01
examples/extended/exoticphysics/channeling/analysis/analyse_ch_eff.C
+1 -1
View File
@@ -29,7 +29,7 @@ Int_t AnalyseChannelingEfficiency(TTree *fTree,Float_t fChannelingMinimum = 35.,
TH1F *hChannelingEfficiency = new TH1F("hChannelingEfficiency","G4Channeling;Horizontal Incoming Angle [#murad];Efficiency [%]",21,-10.5,10.5);
fTree->Draw("-(angXout-angXin):-angXin>>hChannelingPlot");
fTree->Draw("(angXout-angXin):angXin>>hChannelingPlot");
Double_t vNormalizationToAmorphous = 0.965; // Normalization for channeling efficiency, see PRSTAB 11, 063501 (2008)
examples/extended/exoticphysics/channeling/channeling.cc
+37 -32
View File
@@ -46,13 +46,8 @@
#include "DetectorConstruction.hh"
#ifdef G4VIS_USE
#include "G4VisExecutive.hh"
#endif
#ifdef G4UI_USE
#include "G4UIExecutive.hh"
#endif
#include "FTFP_BERT.hh"
@@ -64,6 +59,13 @@
int main(int argc,char** argv)
{
// Detect interactive mode (if no arguments) and define UI session
//
G4UIExecutive* ui = 0;
if ( argc == 1 ) {
ui = new G4UIExecutive(argc, argv);
}
// Construct the default run manager
#ifdef G4MULTITHREADED
G4MTRunManager* runManager = new G4MTRunManager;
@@ -97,38 +99,41 @@ int main(int argc,char** argv)
#endif
runManager->SetUserInitialization(new DetectorConstruction());
// Initialize visualization
//
G4VisManager* visManager = new G4VisExecutive;
// G4VisExecutive can take a verbosity argument - see /vis/verbose guidance.
// G4VisManager* visManager = new G4VisExecutive("Quiet");
visManager->Initialize();
// Get the pointer to the User Interface manager
G4UImanager* UI = G4UImanager::GetUIpointer();
if(argc!=1) {
// Batch mode
G4String command = "/control/execute ";
G4String fileName = argv[1];
UI->ApplyCommand(command+fileName);
G4UImanager* UImanager = G4UImanager::GetUIpointer();
// Process macro or start UI session
//
if ( ! ui ) {
// batch mode
G4String command = "/control/execute ";
G4String fileName = argv[1];
UImanager->ApplyCommand(command+fileName);
}
else {
// Define visualization and UI terminal for interactive mode
#ifdef G4VIS_USE
G4VisManager* visManager = new G4VisExecutive;
visManager->Initialize();
#endif
#ifdef G4UI_USE
G4UIExecutive * ui = new G4UIExecutive(argc,argv);
ui->SessionStart();
delete ui;
#endif
#ifdef G4VIS_USE
delete visManager;
#endif
else {
// interactive mode
UImanager->ApplyCommand("/control/execute init_vis.mac");
ui->SessionStart();
delete ui;
}
// Job termination
// Free the store: user actions, physics_list and detector_description are
// owned and deleted by the run manager, so they should not be deleted
// in the main() program !
delete visManager;
delete runManager;
return 0;
}
examples/extended/exoticphysics/channeling/channeling.out
+61 -5
View File
@@ -4,7 +4,7 @@
############################################
*************************************************************
Geant4 version Name: geant4-10-03-ref-06 (30-June-2017)
Geant4 version Name: geant4-10-04-ref-00 (08-December-2017)
Copyright : Geant4 Collaboration
Reference : NIM A 506 (2003), 250-303
WWW : http://cern.ch/geant4
@@ -14,6 +14,53 @@
G4VModularPhysicsList::ReplacePhysics: G4EmStandardwith type : 2 is replaces with G4EmStandard_opt4_channeling
Using Root
Visualization Manager instantiating with verbosity "warnings (3)"...
Visualization Manager initialising...
Registering graphics systems...
You have successfully registered the following graphics systems.
Current available graphics systems are:
ASCIITree (ATree)
DAWNFILE (DAWNFILE)
G4HepRep (HepRepXML)
G4HepRepFile (HepRepFile)
RayTracer (RayTracer)
VRML1FILE (VRML1FILE)
VRML2FILE (VRML2FILE)
gMocrenFile (gMocrenFile)
OpenGLImmediateQt (OGLIQt, OGLI)
OpenGLStoredQt (OGLSQt, OGL, OGLS)
OpenGLImmediateXm (OGLIXm, OGLIQt_FALLBACK)
OpenGLStoredXm (OGLSXm, OGLSQt_FALLBACK)
OpenGLImmediateX (OGLIX, OGLIQt_FALLBACK, OGLIXm_FALLBACK)
OpenGLStoredX (OGLSX, OGLSQt_FALLBACK, OGLSXm_FALLBACK)
RayTracerX (RayTracerX)
Registering model factories...
You have successfully registered the following model factories.
Registered model factories:
generic
drawByAttribute
drawByCharge
drawByOriginVolume
drawByParticleID
drawByEncounteredVolume
Registered filter factories:
attributeFilter
chargeFilter
originVolumeFilter
particleFilter
encounteredVolumeFilter
You have successfully registered the following user vis actions.
Run Duration User Vis Actions: none
End of Event User Vis Actions: none
End of Run User Vis Actions: none
Some /vis commands (optionally) take a string to specify colour.
"/vis/list" to see available colours.
G4ChannelingECHARM::ReadFromECHARM() - 1e-06 2048 1.91979e-07 1 2.21679e-07 -6.66994e-06 1.53567e-05
G4ChannelingECHARM::ReadFromECHARM() - 1e-09 2048 1.91979e-07 1 2.21679e-07 -615.379 615.379
G4ChannelingECHARM::ReadFromECHARM() - 1e-09 2048 1.91979e-07 1 2.21679e-07 0 0
@@ -577,6 +624,7 @@ CoulombScat: for pi-, integral: 1 SubType= 1 BuildTable= 1
Process: hadElastic
Model: hElasticLHEP: 0 eV ---> 100 TeV
Cr_sctns: Glauber-Gribov: 0 eV ---> 2.88022e+295 J
Cr_sctns: GheishaElastic: 0 eV ---> 100 TeV
Process: kaon+Inelastic
@@ -591,6 +639,7 @@ CoulombScat: for pi-, integral: 1 SubType= 1 BuildTable= 1
Process: hadElastic
Model: hElasticLHEP: 0 eV ---> 100 TeV
Cr_sctns: Glauber-Gribov: 0 eV ---> 2.88022e+295 J
Cr_sctns: GheishaElastic: 0 eV ---> 100 TeV
Process: kaon-Inelastic
@@ -699,16 +748,21 @@ CoulombScat: for pi-, integral: 1 SubType= 1 BuildTable= 1
====== Pre-compound/De-excitation Physics Parameters ========
=======================================================================
Type of pre-compound inverse x-section 3
Pre-compound model active 1
Pre-compound low energy (MeV) 0.1
Type of de-excitation inverse x-section 3
Type of de-excitation factory Evaporation
Number of de-excitation channels 8
Min excitation energy (keV) 0.01
Min energy per nucleon for multifragmentation (MeV) 1e+05
Level density (1/MeV) 0.1
Time limit for long lived isomeres (ns) 1e+12
Use new data files 1
Use complete data files 0
Correlated gamma emission flag 0
Internal e- conversion flag 1
Store e- internal conversion data 0
Electron internal conversion ID 2
Correlated gamma emission flag 0
Max 2J for sampling of angular correlations 10
=======================================================================
Number of de-excitation channels 8
### Run 0 starts.
... open Root analysis file : ExExCh.root - done
--> Event 0 starts.
@@ -1713,3 +1767,5 @@ Number of de-excitation channels 8
--> Event 999 starts.
... write Root file : ExExCh.root - done
... close Root file : ExExCh.root - done
Graphics systems deleted.
Visualization Manager deleting...
examples/extended/exoticphysics/channeling/include/Analysis.hh
-1
View File
@@ -31,5 +31,4 @@
//#include "g4xml.hh"
//#include "g4csv.hh"
#endif
examples/extended/exoticphysics/channeling/include/DetectorConstruction.hh
-2
View File
@@ -81,5 +81,3 @@ private:
G4ThreeVector fBR;
G4ThreeVector fAngles;
};
examples/extended/exoticphysics/channeling/include/DetectorConstructionMessenger.hh
+1 -7
View File
@@ -3,11 +3,6 @@
// * License and Disclaimer *
// * *
// * The Geant4 software is copyright of the Copyright Holders of *
//
// ********************************************************************
// * 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 *
@@ -27,6 +22,7 @@
// * use in resulting scientific publications, and indicate your *
// * acceptance of all terms of the Geant4 Software license. *
// ********************************************************************
//
// --------------------------------------------------------------
//
@@ -70,5 +66,3 @@ class DetectorConstructionMessenger: public G4UImessenger
};
#endif
examples/extended/exoticphysics/channeling/include/EventAction.hh
+1 -1
View File
@@ -44,7 +44,7 @@ class EventAction : public G4UserEventAction
virtual void EndOfEventAction(const G4Event*);
private:
G4int sdht_ID;
G4int fSDHT_ID;
};
#endif
examples/extended/exoticphysics/channeling/include/G4ChannelingPhysics.hh
-8
View File
@@ -49,11 +49,3 @@ public:
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
#endif
examples/extended/exoticphysics/channeling/include/G4EmStandardPhysics_option4_channeling.hh
-6
View File
@@ -68,9 +68,3 @@ private:
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
#endif
examples/extended/exoticphysics/channeling/include/PrimaryGeneratorAction.hh
-2
View File
@@ -52,5 +52,3 @@ private:
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
#endif
examples/extended/exoticphysics/channeling/include/RunAction.hh
-1
View File
@@ -45,4 +45,3 @@ public:
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
#endif
examples/extended/exoticphysics/channeling/include/SensitiveDetector.hh
-1
View File
@@ -50,4 +50,3 @@ class SensitiveDetector : public G4VSensitiveDetector
};
#endif
examples/extended/exoticphysics/channeling/include/SensitiveDetectorHit.hh
-2
View File
@@ -107,5 +107,3 @@ inline void SensitiveDetectorHit::operator delete(void* aHit)
}
#endif
examples/extended/exoticphysics/channeling/include/StackingAction.hh
-1
View File
@@ -54,4 +54,3 @@ private:
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
#endif
examples/extended/exoticphysics/channeling/include/UserActionInitialization.hh
-10
View File
@@ -42,13 +42,3 @@ public:
};
#endif
examples/extended/exoticphysics/channeling/src/DetectorConstruction.cc
-3
View File
@@ -105,7 +105,6 @@ G4VPhysicalVolume* DetectorConstruction::Construct(){
false,
0);
//** Detectors instantiation **//
G4ThreeVector fDetectorSizes(G4ThreeVector(38.0 * CLHEP::mm,
38.0 * CLHEP::mm,
@@ -182,7 +181,6 @@ G4VPhysicalVolume* DetectorConstruction::Construct(){
crystalLogic->SetVerbose(1);
//** Crystal Definition End **//
G4RotationMatrix* rot = new G4RotationMatrix;
if(fAngles.x()!=0.){
rot->rotateX(fAngles.x());
@@ -246,4 +244,3 @@ void DetectorConstruction::ConstructSDandField(){;}
#endif
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
examples/extended/exoticphysics/channeling/src/DetectorConstructionMessenger.cc
-2
View File
@@ -50,7 +50,6 @@ DetectorConstructionMessenger(
fXtalMaterialCmd->SetParameterName("xMat",true);
fXtalMaterialCmd->SetDefaultValue("G4_Si");
fXtalSizeCmd = new G4UIcmdWith3VectorAndUnit("/xtal/setSize",this);
fXtalSizeCmd->SetGuidance("Set crystal size.");
fXtalSizeCmd->SetParameterName("xtalSizeX",
@@ -69,7 +68,6 @@ DetectorConstructionMessenger(
fXtalBRCmd->SetDefaultValue(G4ThreeVector(0.,0.,0.));
fXtalBRCmd->SetDefaultUnit("m");
fXtalAngleCmd = new G4UIcmdWith3VectorAndUnit("/xtal/setAngle",this);
fXtalAngleCmd->SetGuidance("Set crystal angles.");
fXtalAngleCmd->SetParameterName("xtalAngleX",
examples/extended/exoticphysics/channeling/src/EventAction.cc
+5 -6
View File
@@ -45,7 +45,7 @@
#include "Analysis.hh"
EventAction::EventAction():
sdht_ID(-1){}
fSDHT_ID(-1){}
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
@@ -60,16 +60,15 @@ void EventAction::BeginOfEventAction(const G4Event*){;}
void EventAction::EndOfEventAction(const G4Event* evt){
G4SDManager* SDman = G4SDManager::GetSDMpointer();
G4ThreeVector ssd[3];
ssd[0]= G4ThreeVector(0.,0.,0.);
ssd[1]= G4ThreeVector(0.,0.,0.);
ssd[2]= G4ThreeVector(0.,0.,0.);
if(sdht_ID == -1) {
if(fSDHT_ID == -1) {
G4String sdName;
if(SDman->FindSensitiveDetector(sdName="telescope",0)){
sdht_ID = SDman->GetCollectionID(sdName="telescope/collection");
fSDHT_ID = SDman->GetCollectionID(sdName="telescope/collection");
}
}
@@ -77,8 +76,8 @@ void EventAction::EndOfEventAction(const G4Event* evt){
G4HCofThisEvent *hce = evt->GetHCofThisEvent();
if(hce){
if(sdht_ID != -1){
G4VHitsCollection* aHCSD = hce->GetHC(sdht_ID);
if(fSDHT_ID != -1){
G4VHitsCollection* aHCSD = hce->GetHC(fSDHT_ID);
sdht = (SensitiveDetectorHitsCollection*)(aHCSD);
}
}
examples/extended/exoticphysics/channeling/src/G4ChannelingPhysics.cc
-1
View File
@@ -92,4 +92,3 @@ void G4ChannelingPhysics::ConstructProcess()
}
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
examples/extended/exoticphysics/channeling/src/G4EmStandardPhysics_option4_channeling.cc
-1
View File
@@ -199,7 +199,6 @@ void G4EmStandardPhysics_option4_channeling::ConstructProcess()
G4CoulombScattering* piss = new G4CoulombScattering();
G4CoulombScattering* kss = new G4CoulombScattering();
G4CoulombScattering* pss = new G4CoulombScattering();
// energy limits for e+- scattering models
//G4double highEnergyLimit = 100*MeV;
examples/extended/exoticphysics/channeling/src/PrimaryGeneratorAction.cc
-4
View File
@@ -40,9 +40,6 @@ PrimaryGeneratorAction::~PrimaryGeneratorAction(){
delete fGPS;
}
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
void PrimaryGeneratorAction::GeneratePrimaries(G4Event* anEvent){
@@ -50,4 +47,3 @@ void PrimaryGeneratorAction::GeneratePrimaries(G4Event* anEvent){
}
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
examples/extended/exoticphysics/dmparticle/dmparticle.out
+543 -546
View File
File diff suppressed because it is too large Load Diff
examples/extended/exoticphysics/monopole/CMakeLists.txt
+1 -1
View File
@@ -40,7 +40,7 @@ target_link_libraries(monopole ${Geant4_LIBRARIES} )
# relies on these scripts being in the current working directory.
#
set(monopole_SCRIPTS
monopole.in monopole.out vis.mac
monopole.in vis.mac
)
foreach(_script ${monopole_SCRIPTS})
examples/extended/exoticphysics/monopole/History
+11 -1
View File
@@ -1,4 +1,4 @@
$Id: History 104872 2017-06-23 14:19:16Z gcosmo $
$Id: History 107534 2017-11-21 13:13:36Z gcosmo $
-------------------------------------------------------------------
=========================================================
@@ -15,6 +15,16 @@ track of all tags.
* Reverse chronological order (last date on top), please *
----------------------------------------------------------
21 November 17: V.Ivantchenko (monopole-V10-03-04)
- Simplified histograms defition and filling
20 November 17: V.Ivantchenko (monopole-V10-03-03)
- Fixed lost functionality of histograms and monopole parameter
definitions
26 October 17: D. Sorokin (monopole-V10-03-01)
- G4MonopoleTransportation.cc - build fix
23 June 17: S. Elles (monopole-V10-03-00)
- add MT interface
- switch ActionInitialization, Run and RunAction classes
examples/extended/exoticphysics/monopole/include/HistoManager.hh
-104
View File
@@ -1,104 +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. *
// ********************************************************************
//
// $Id: HistoManager.hh 104174 2017-05-15 12:12:45Z selles $
// GEANT4 tag $Name: geant4-09-02-ref-01 $
//
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
#ifndef HistoManager_h
#define HistoManager_h 1
#include "g4root.hh"
#include "globals.hh"
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
const G4int MaxHisto = 10;
class DetectorConstruction;
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
class HistoManager
{
public:
HistoManager(DetectorConstruction* det, G4double binLength);
~HistoManager();
void Book();
void Add1D(G4int histoId, const G4String& name, G4int nb,
G4double x1, G4double x2,
const G4String& u1="none", const G4String& u2="none");
void SetHisto1D(G4int,G4int,G4double,G4double,const G4String& unit1="none");
void FillHisto(G4int id, G4double e, G4double weight = 1.0);
void Scale (G4int, G4double);
void SetBinLength(G4double binLength);
void Update(G4double binLength);
G4bool HistoExist (G4int id) const { return fExist[id]; }
G4double GetHistoUnit(G4int id) const { return fUnit1[id]; }
G4double GetBinWidth (G4int id) const { return fWidth[id]; }
private:
DetectorConstruction* fDetector;
G4bool fVerbose;
G4double fBinLength;
G4int fNbHisto;
std::vector<G4int> fHistoId;
G4bool fNtupleActive;
G4String fTupleName;
G4String fTupleTitle;
std::vector<G4bool> fExist;
std::vector<G4String> fLabel;
std::vector<G4String> fTitle;
std::vector<G4int> fNbins;
std::vector<G4double> fVmin ;
std::vector<G4double> fVmax ;
std::vector<G4double> fWidth;
std::vector<G4double> fUnit1;
std::vector<G4double> fUnit2;
std::vector<G4String> fIds;
std::vector<G4bool> fActive;
std::vector<G4int> fTupleI;
std::vector<G4int> fTupleF;
std::vector<G4int> fTupleD;
std::vector<G4String> fNtupleI;
std::vector<G4String> fNtupleF;
std::vector<G4String> fNtupleD;
};
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
#endif
examples/extended/exoticphysics/monopole/include/Run.hh
+13 -22
View File
@@ -34,49 +34,40 @@
#ifndef Run_h
#define Run_h 1
#include "DetectorConstruction.hh"
#include "G4Run.hh"
#include "globals.hh"
#include "g4root.hh"
#include "globals.hh"
//class DetectorConstruction;
class PrimaryGeneratorAction;
class HistoManager;
class G4ParticleDefinition;
class G4Track;
class G4MonopoleFieldSetup;
class DetectorConstruction;
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
class Run : public G4Run
{
public:
Run(DetectorConstruction*, PrimaryGeneratorAction*, HistoManager*);
public:
Run(DetectorConstruction*, PrimaryGeneratorAction*);
~Run();
public:
virtual void Merge(const G4Run*);
void EndOfRun(double binLength);
virtual void Merge(const G4Run*);
void EndOfRun(double binLength);
void FillHisto(G4int id, G4double x, G4double weight = 1.0);
void FillHisto(G4int id, G4double x, G4double weight = 1.0);
inline void SetVerbose(G4int verbose) { fVerboseLevel = verbose; }
inline G4int GetVerbose() const { return fVerboseLevel; }
G4double GetOffsetX() const { return fOffsetX; }
inline void SetVerbose(G4int verbose) { fVerboseLevel = verbose; }
inline G4int GetVerbose() const { return fVerboseLevel; }
inline G4double GetOffsetX() const { return fOffsetX; }
void AddProjRange (G4double x) { fProjRange += x; fProjRange2 += x*x; };
inline void AddProjRange (G4double x) { fProjRange += x;
fProjRange2 += x*x; };
private:
DetectorConstruction* fDetector;
PrimaryGeneratorAction* fPrimary;
HistoManager* fHistoManager;
G4AnalysisManager* fAnalysisManager;
std::vector<G4int> fHistoId;
G4int fNevt;
G4int fNevt;
G4double fOffsetX;
G4double fProjRange;
examples/extended/exoticphysics/monopole/include/RunAction.hh
+3 -3
View File
@@ -26,7 +26,7 @@
/// \file exoticphysics/monopole/include/RunAction.hh
/// \brief Definition of the RunAction class
//
// $Id: RunAction.hh 104872 2017-06-23 14:19:16Z gcosmo $
// $Id: RunAction.hh 107534 2017-11-21 13:13:36Z gcosmo $
//
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
@@ -40,7 +40,6 @@
class Run;
class DetectorConstruction;
class PrimaryGeneratorAction;
class HistoManager;
class RunActionMessenger;
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
@@ -63,10 +62,11 @@ public:
private:
void Book();
DetectorConstruction* fDetector;
PrimaryGeneratorAction* fKinematic;
Run* fRun;
HistoManager* fHistoManager;
RunActionMessenger* fMessenger;
G4double fBinLength;
examples/extended/exoticphysics/monopole/monopole.cc
+25 -21
View File
@@ -26,7 +26,7 @@
/// \file exoticphysics/monopole/monopole.cc
/// \brief Main program of the exoticphysics/monopole example
//
// $Id: monopole.cc 104872 2017-06-23 14:19:16Z gcosmo $
// $Id: monopole.cc 107526 2017-11-21 07:17:43Z gcosmo $
//
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
@@ -61,26 +61,18 @@
int main(int argc,char** argv) {
//choose the Random engine
//CLHEP::HepRandom::setTheEngine(new CLHEP::RanecuEngine);
//CLHEP::HepRandom::setTheEngine(new CLHEP::Ranlux64Engine);
CLHEP::HepRandom::setTheEngine(new CLHEP::RanluxEngine);
CLHEP::HepRandom::setTheEngine(new CLHEP::MixMaxRng);
// Construct the default run manager
#ifdef G4MULTITHREADED
G4MTRunManager* runManager = new G4MTRunManager;
G4int nThreads = std::min(G4Threading::G4GetNumberOfCores(),2);
if (argc==3) nThreads = G4UIcommand::ConvertToInt(argv[2]);
runManager->SetNumberOfThreads(nThreads);
runManager->SetNumberOfThreads(2);
G4cout << "===== Monopole is started with "
<< runManager->GetNumberOfThreads() << " threads =====" << G4endl;
#else
G4RunManager* runManager = new G4RunManager();
#endif
// set mandatory initialization classes
DetectorConstruction* det = new DetectorConstruction();
runManager->SetUserInitialization(det);
//create physicsList
// Physics List is defined via environment variable PHYSLIST
G4PhysListFactory factory;
@@ -91,24 +83,36 @@ int main(int argc,char** argv) {
phys->RegisterPhysics(theMonopole);
runManager->SetUserInitialization(phys);
// visualization manager
#ifdef G4VIS_USE
G4VisManager* visManager = nullptr;
#endif
//get the pointer to the User Interface manager
G4UImanager* UImanager = G4UImanager::GetUIpointer();
// Setup monopole
G4String s = "";
if(argc > 2) { s = argv[2]; }
UImanager->ApplyCommand("/control/verbose 1");
UImanager->ApplyCommand("/monopole/setup "+s);
// set detector construction
DetectorConstruction* det = new DetectorConstruction();
runManager->SetUserInitialization(det);
// set user action classes
runManager->SetUserInitialization(new ActionInitialization(det));
// get the pointer to the User Interface manager
G4UImanager* UImanager = G4UImanager::GetUIpointer();
#ifdef G4VIS_USE
G4VisManager* visManager = new G4VisExecutive("Quiet");
visManager->Initialize();
#endif
if (argc==1) // Define UI terminal for interactive mode
{
#ifdef G4VIS_USE
visManager = new G4VisExecutive();
visManager->Initialize();
#endif
#ifdef G4UI_USE
G4UIExecutive* ui = new G4UIExecutive(argc, argv);
#ifdef G4VIS_USE
UImanager->ApplyCommand("/control/execute vis.mac");
#endif
ui->SessionStart();
delete ui;
#endif
examples/extended/exoticphysics/monopole/monopole.in
+3 -2
View File
@@ -4,6 +4,7 @@
#
#
/control/verbose 1
/control/cout/ignoreThreadsExcept 0
/run/verbose 0
/testex/run/verbose 1
/tracking/verbose 0
@@ -17,12 +18,12 @@
#
/process/em/verbose 1
/run/initialize
/process/em/verbose 1
/particle/select monopole
/particle/process/dump
#
#/process/eLoss/verbose 1
/run/printProgress 10
#
#
/gun/particle monopole
/gun/energy 100 GeV
examples/extended/exoticphysics/monopole/monopole.out
+137 -2813
View File
File diff suppressed because it is too large Load Diff
examples/extended/exoticphysics/monopole/src/G4MonopolePhysics.cc
+5 -6
View File
@@ -26,7 +26,7 @@
/// \file exoticphysics/monopole/src/G4MonopolePhysics.cc
/// \brief Implementation of the G4MonopolePhysics class
//
// $Id: G4MonopolePhysics.cc 104872 2017-06-23 14:19:16Z gcosmo $
// $Id: G4MonopolePhysics.cc 107526 2017-11-21 07:17:43Z gcosmo $
//
//---------------------------------------------------------------------------
//
@@ -36,7 +36,8 @@
//
// Modified:
//
// 12.07.10 S.Burdin (changed the magnetic and electric charge variables from integer to double)
// 12.07.10 S.Burdin (changed the magnetic and electric charge variables
// from integer to double)
//----------------------------------------------------------------------------
//
//
@@ -68,8 +69,7 @@
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
G4MonopolePhysics::G4MonopolePhysics(const G4String& nam)
: G4VPhysicsConstructor(nam),
fMessenger(0), fMpl(0)
: G4VPhysicsConstructor(nam), fMpl(nullptr)
{
fMagCharge = 1.0;
// fMagCharge = -1.0;
@@ -77,6 +77,7 @@ G4MonopolePhysics::G4MonopolePhysics(const G4String& nam)
fElCharge = 0.0;
fMonopoleMass = 100.*GeV;
SetPhysicsType(bUnknown);
fMessenger = new G4MonopolePhysicsMessenger(this);
}
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
@@ -100,8 +101,6 @@ void G4MonopolePhysics::ConstructProcess()
if(verboseLevel > 0) {
G4cout << "G4MonopolePhysics::ConstructProcess" << G4endl;
}
fMessenger = new G4MonopolePhysicsMessenger(this);
G4PhysicsListHelper* ph = G4PhysicsListHelper::GetPhysicsListHelper();
G4ProcessManager* pmanager = fMpl->GetProcessManager();
examples/extended/exoticphysics/monopole/src/G4MonopolePhysicsMessenger.cc
+4 -9
View File
@@ -26,9 +26,10 @@
/// \file exoticphysics/monopole/src/G4MonopolePhysicsMessenger.cc
/// \brief Implementation of the G4MonopolePhysicsMessenger class
//
// $Id: G4MonopolePhysicsMessenger.cc 68036 2013-03-13 14:13:45Z gcosmo $
// $Id: G4MonopolePhysicsMessenger.cc 107526 2017-11-21 07:17:43Z gcosmo $
//
// 12.07.10 S.Burdin (changed the magnetic and electric charge variables from integer to double)
// 12.07.10 S.Burdin (changed the magnetic and electric charge variables
// from integer to double)
//
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
@@ -46,13 +47,7 @@
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
G4MonopolePhysicsMessenger::G4MonopolePhysicsMessenger(G4MonopolePhysics* p)
: G4UImessenger(),
fPhys(p),
fPhysicsDir(0),
fPhysicsCmd(0),
fMCmd(0),
fZCmd(0),
fMassCmd(0)
: G4UImessenger(), fPhys(p)
{
fPhysicsDir = new G4UIdirectory("/monopole/");
fPhysicsDir->SetGuidance("histograms control");
examples/extended/exoticphysics/monopole/src/G4MonopoleTransportation.cc
+2 -3
View File
@@ -26,7 +26,7 @@
/// \file exoticphysics/monopole/src/G4MonopoleTransportation.cc
/// \brief Implementation of the G4MonopoleTransportation class
//
// $Id: G4MonopoleTransportation.cc 104872 2017-06-23 14:19:16Z gcosmo $
// $Id: G4MonopoleTransportation.cc 106979 2017-10-31 09:01:20Z gcosmo $
//
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
@@ -294,8 +294,7 @@ AlongStepGetPhysicalInteractionLength( const G4Track& track,
particleMagneticCharge ); // in Mev/c
G4EquationOfMotion* equationOfMotion =
(fFieldPropagator->GetChordFinder()->GetIntegrationDriver()->GetStepper())
->GetEquationOfMotion();
fFieldPropagator->GetChordFinder()->GetIntegrationDriver()->GetEquationOfMotion();
equationOfMotion
->SetChargeMomentumMass( chargeState, // Was particleMagneticCharge - in Mev/c
examples/extended/exoticphysics/monopole/src/HistoManager.cc
-295
View File
@@ -1,295 +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. *
// ********************************************************************
//
// $Id: HistoManager.cc 104174 2017-05-15 12:12:45Z selles $
// GEANT4 tag $Name: geant4-09-04-cand-00 $
//
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
#include "HistoManager.hh"
#include "DetectorConstruction.hh"
#include "G4UnitsTable.hh"
#include "G4SystemOfUnits.hh"
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
HistoManager::HistoManager(DetectorConstruction* det, G4double binLength)
: fDetector(det), fBinLength(binLength)
{
fVerbose = true;
fHistoId.resize(MaxHisto);
fExist.resize(MaxHisto);
fActive.resize(MaxHisto);
fLabel.resize(MaxHisto);
fTitle.resize(MaxHisto);
fNbins.resize(MaxHisto);
fVmin.resize(MaxHisto);
fVmax.resize(MaxHisto);
fUnit1.resize(MaxHisto);
fUnit2.resize(MaxHisto);
fWidth.resize(MaxHisto);
fIds.resize(MaxHisto);
// histograms
fNbHisto = 0;
for (G4int k=0; k<MaxHisto; k++) {
fHistoId[k] = 0;
fExist[k] = false;
fActive[k] = false;
fUnit1[k] = 1.0;
fUnit2[k] = 1.0;
fWidth[k] = 1.0;
}
fNtupleActive = false;
fTupleName = "tuple";
fTupleTitle = "test";
fTupleI.assign(MaxHisto,-1);
fTupleF.assign(MaxHisto,-1);
fTupleD.assign(MaxHisto,-1);
Book();
}
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
HistoManager::~HistoManager()
{
delete G4AnalysisManager::Instance();
}
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
void HistoManager::Book()
{
G4AnalysisManager* analysisManager = G4AnalysisManager::Instance();
// Create or get analysis manager
analysisManager->SetVerboseLevel(1);
analysisManager->SetActivation(false); // enable inactivation of histograms
// Define the histogramms
if(analysisManager->GetNofH1s()==0)
{
G4double length = fDetector->GetAbsorSizeX();
G4int nbBins = G4lrint(length / fBinLength);
// Create histograms
fNbHisto = 0;
Add1D(0,"dummy", nbBins, 0, length, "mm");
Add1D(1,"Edep (MeV/mm) along absorber (mm)", nbBins, 0, length, "mm");
Add1D(2,"DEDX (MeV/mm) of proton", 100, -3., 7.);
Add1D(3,"DEDX (MeV/mm) of monopole", 100, -3., 7.);
Add1D(4,"Range(mm) of proton", 100, -3., 7., "mm");
Add1D(5,"Range(mm) of monopole", 100, -3., 7., "mm");
// Creating an 1-dimensional histograms in the root directory of the tree
for(G4int i=0; i<fNbHisto; i++)
{
fHistoId[i] = analysisManager->CreateH1(fIds[i], fTitle[i],
fNbins[i], fVmin[i], fVmax[i]);
analysisManager->SetH1Activation(fHistoId[i],fActive[i]);
}
// Creating a tuple factory, whose tuples will be handled by the tree
if(fNtupleActive) {
analysisManager->CreateNtuple(fTupleName,fTupleTitle);
G4int i;
G4int n = fNtupleI.size();
for(i=0; i<n; ++i) {
if(fTupleI[i] == -1)
{ fTupleI[i] = analysisManager->CreateNtupleIColumn(fNtupleI[i]); }
}
n = fNtupleF.size();
for(i=0; i<n; ++i) {
if(fTupleF[i] == -1)
{ fTupleF[i] = analysisManager->CreateNtupleFColumn(fNtupleF[i]); }
}
n = fNtupleD.size();
for(i=0; i<n; ++i) {
if(fTupleD[i] == -1)
{ fTupleD[i] = analysisManager->CreateNtupleDColumn(fNtupleD[i]); }
}
}
}
// Added to catch the SetActivation parameters set througj UI interface
for (G4int k=0; k<MaxHisto; k++)
fExist[k] = analysisManager->GetH1Activation(fHistoId[k]);
// Check if a filename is set
if(analysisManager->GetFileName()=="") return;
// Activate the analysisManage ronly if a filename is set
analysisManager->SetActivation(true); // enable inactivation of histograms
}
void HistoManager::SetBinLength(G4double binLength)
{
fBinLength = binLength;
G4double length = fDetector->GetAbsorSizeX();
G4int nbBins = G4lrint(length / fBinLength);
SetHisto1D(1, nbBins, 0., length, "mm");
}
void HistoManager::Update(G4double binLength)
{
G4AnalysisManager* analysisManager = G4AnalysisManager::Instance();
G4double histo1_binLength = analysisManager->GetH1Width(fHistoId[1]);
if(fabs(histo1_binLength-binLength)>0.01)
{
G4double length = fDetector->GetAbsorSizeX();
G4int nbBins = G4lrint(length / binLength);
analysisManager->SetH1(fHistoId[1], nbBins,
G4AnalysisManager::Instance()->GetH1Xmin(fHistoId[1]),
G4AnalysisManager::Instance()->GetH1Xmax(fHistoId[1]));
}
}
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
void HistoManager::Add1D(G4int histoId, const G4String& name, G4int nb,
G4double x1, G4double x2,
const G4String& u1, const G4String& u2)
{
std::stringstream sg;
sg<<histoId;
const G4String id = sg.str();
if(fVerbose) {
G4cout << "New histogram will be booked: #" << id << " <" << name
<< " " << nb << " " << x1 << " " << x2 << " " << u1<<" "<<u2
<< G4endl;
}
fNbHisto++;
double vUnit1= (u1=="none")? 1. : (G4UnitDefinition::GetValueOf(u1));
fUnit1[histoId]=vUnit1;
double vUnit2= (u2=="none")? 1. : (G4UnitDefinition::GetValueOf(u2));
fUnit2[histoId]=vUnit2;
x1 /= vUnit1;
x2 /= vUnit1;
fNbins[histoId]=nb;
fVmin[histoId]=x1;
fVmax[histoId]=x2;
fWidth[histoId] = (x2-x1)/nb;
fTitle[histoId]=name;
fIds[histoId]=id;
G4int exist = (name.substr(0,5)=="dummy"||name.substr(0,5)=="Dummy")?false:true;
fExist[histoId]=exist;
fActive[histoId]=exist;
}
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
void HistoManager::SetHisto1D(G4int ih,
G4int nbins, G4double valmin, G4double valmax,
const G4String& unit)
{
if (ih > MaxHisto) {
G4cout << "---> warning from HistoManager::SetHisto() : histo " << ih
<< "does not exist" << G4endl;
return;
}
// const G4String id[] = { "0", "1", "2", "3", "4", "5", "6" };
// const G4String title[] =
// { "dummy", //0
// "continuous energy loss along primary track", //1
// "energy from secondaries", //2
// "total energy lost by primary track", //3
// "energy spectrum of e-+", //4
// "energy spectrum of gamma", //5
// "step size" //6
// };
// G4String titl = fTitle[ih];
G4double vmin = valmin, vmax = valmax;
if (unit != "none") {
fUnit1[ih] = G4UnitDefinition::GetValueOf(unit);
}
vmin = valmin/fUnit1[ih];
vmax = valmax/fUnit1[ih];
fExist[ih] = true;
fNbins[ih] = nbins;
fVmin[ih] = vmin;
fVmax[ih] = vmax;
fWidth[ih] = (valmax-valmin)/nbins;
if(fTitle[ih].substr(0,5)=="dummy") fExist[ih]=false;
if(fTitle[ih].substr(0,5)=="Dummy") fExist[ih]=false;
fActive[ih]=fExist[ih];
G4cout << "----> SetHisto " << ih << ": " << fTitle[ih] << "; "
<< nbins << " bins from "
<< vmin << " " << unit << " to " << vmax << " " << fUnit1[ih] << " - "
<<fExist[ih]<<G4endl;
}
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
void HistoManager::FillHisto(G4int ih, G4double e, G4double weight)
{
if (ih > MaxHisto) {
G4cout << "---> warning from HistoManager::FillHisto() : histo " << ih
<< "does not exist; e= " << e << " w= " << weight << G4endl;
return;
}
if(!fExist[ih]) return;
G4AnalysisManager::Instance()->FillH1( fHistoId[ih], e/fUnit1[ih], weight);
}
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
void HistoManager::Scale(G4int ih, G4double fac)
{
if (ih > MaxHisto) {
G4cout << "---> warning from HistoManager::Scale() : histo " << ih
<< "does not exist. (fac = " << fac << ")" << G4endl;
return;
}
if(!fExist[ih]) return;
G4AnalysisManager::Instance()->GetH1(fHistoId[ih])->scale(fac);
}
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
examples/extended/exoticphysics/monopole/src/Run.cc
+17 -50
View File
@@ -33,21 +33,16 @@
#include "Run.hh"
#include "PrimaryGeneratorAction.hh"
#include "HistoManager.hh"
#include "G4Track.hh"
#include "G4VPhysicalVolume.hh"
#include "DetectorConstruction.hh"
#include "G4EmCalculator.hh"
#include "G4SystemOfUnits.hh"
#include "G4UnitsTable.hh"
#include <iomanip>
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
Run::Run(DetectorConstruction* det, PrimaryGeneratorAction* prim,
HistoManager* histoMgr)
:fDetector(det), fPrimary(prim), fHistoManager(histoMgr)
Run::Run(DetectorConstruction* det, PrimaryGeneratorAction* prim)
:fDetector(det), fPrimary(prim)
{
fAnalysisManager = G4AnalysisManager::Instance();
@@ -57,18 +52,13 @@ Run::Run(DetectorConstruction* det, PrimaryGeneratorAction* prim,
fVerboseLevel = 1;
fNevt = 0;
fProjRange = fProjRange2 = 0.;
fHistoManager->Book();
}
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
Run::~Run()
{
{}
}
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
void Run::Merge(const G4Run* run)
@@ -110,7 +100,7 @@ void Run::EndOfRun(double binLength)
<< G4BestUnit(fDetector->GetAbsorSizeX(),"Length") << " of "
<< matName << " (density: "
<< G4BestUnit(density,"Volumic Mass") << ")" << G4endl;
G4cout<<"Proj "<<fProjRange<<" "<<fProjRange2<<G4endl;
//G4cout<<"Proj "<<fProjRange<<" "<<fProjRange2<<G4endl;
};
//compute projected range and straggling
@@ -122,14 +112,14 @@ void Run::EndOfRun(double binLength)
if(GetVerbose() > 0){
G4cout.precision(5);
G4cout << "\n projected Range= " << G4BestUnit(fProjRange, "Length")
G4cout << " Projected Range= " << G4BestUnit(fProjRange, "Length")
<< " rms= " << G4BestUnit(rms, "Length")
<< G4endl;
<< "\n" << G4endl;
};
G4double ekin[100], dedxproton[100], dedxmp[100];
G4EmCalculator calc;
calc.SetVerbose(2);
//calc.SetVerbose(2);
G4int i;
for(i = 0; i < 100; ++i) {
ekin[i] = std::pow(10., 0.1*G4double(i)) * keV;
@@ -141,9 +131,9 @@ void Run::EndOfRun(double binLength)
if(GetVerbose() > 0){
G4cout << "### Stopping Powers" << G4endl;
for(i=0; i<100; i++) {
G4cout << " E(MeV)= " << ekin[i] << " dedxp= " << dedxproton[i]
<< " dedxmp= " << dedxmp[i]
for(i=0; i<100; ++i) {
G4cout << " E(MeV)= " << ekin[i] << " dedxp(MeV/mm)= " << dedxproton[i]
<< " dedxmp(MeV/mm)= " << dedxmp[i]
<< G4endl;
}
}
@@ -151,7 +141,7 @@ void Run::EndOfRun(double binLength)
// normalize histogram
G4double fac = (mm/MeV) / (nEvents * binLength);
fHistoManager->Scale(1,fac);
fAnalysisManager->ScaleH1(1,fac);
if(GetVerbose() > 0){
G4cout << "Range table for " << matName << G4endl;
@@ -159,35 +149,13 @@ void Run::EndOfRun(double binLength)
for(i=0; i<100; ++i) {
G4double e = std::log10(ekin[i] / MeV) + 0.05;
fHistoManager->FillHisto(2, e, dedxproton[i]);
fHistoManager->FillHisto(3, e, dedxmp[i]);
fHistoManager->FillHisto(4, e,
fAnalysisManager->FillH1(2, e, dedxproton[i]);
fAnalysisManager->FillH1(3, e, dedxmp[i]);
fAnalysisManager->FillH1(4, e,
std::log10(calc.GetRange(ekin[i],"proton",matName)/mm));
fHistoManager->FillHisto(5, e,
fAnalysisManager->FillH1(5, e,
std::log10(calc.GetRange(ekin[i],"monopole",matName)/mm));
}
if(fAnalysisManager) {
if(fAnalysisManager->IsActive()) {
// Write histogram file
if(!fAnalysisManager->Write()) {
G4Exception ("Histo::Save()", "hist01", FatalException,
"Cannot write ROOT file.");
}
G4cout << "### Histo::Save: Histograms are saved" << G4endl;
if(fAnalysisManager->CloseFile() && fVerboseLevel) {
G4cout << " File is closed" << G4endl;
}
}
delete fAnalysisManager;
fAnalysisManager = 0;
}
}
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
@@ -195,8 +163,7 @@ void Run::EndOfRun(double binLength)
void Run::FillHisto(G4int histoId, G4double v1, G4double v2)
{
if(fAnalysisManager)
fHistoManager->FillHisto(histoId, v1, v2);
fAnalysisManager->FillH1(histoId, v1, v2);
}
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
examples/extended/exoticphysics/monopole/src/RunAction.cc
+32 -29
View File
@@ -26,7 +26,7 @@
/// \file exoticphysics/monopole/src/RunAction.cc
/// \brief Implementation of the RunAction class
//
// $Id: RunAction.cc 104872 2017-06-23 14:19:16Z gcosmo $
// $Id: RunAction.cc 107534 2017-11-21 13:13:36Z gcosmo $
//
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
@@ -35,7 +35,6 @@
#include "RunActionMessenger.hh"
#include "DetectorConstruction.hh"
#include "PrimaryGeneratorAction.hh"
#include "HistoManager.hh"
#include "Run.hh"
#include "G4UnitsTable.hh"
@@ -51,11 +50,11 @@ RunAction::RunAction(DetectorConstruction* det, PrimaryGeneratorAction* kin)
:fDetector(det),fKinematic(kin)
{
fMessenger = new RunActionMessenger(this);
fBinLength = 5 * CLHEP::mm;
// Book predefined histograms
fHistoManager = new HistoManager(det, fBinLength);
G4AnalysisManager* analysisManager = G4AnalysisManager::Instance();
analysisManager->SetFileName("monopole");
analysisManager->SetVerboseLevel(1);
analysisManager->SetActivation(true);
}
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
@@ -66,14 +65,13 @@ RunAction::~RunAction()
if(isMaster) delete fKinematic;
#endif
delete fMessenger;
delete fHistoManager;
}
}
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
G4Run* RunAction::GenerateRun()
{
fRun = new Run(fDetector,fKinematic,fHistoManager);
fRun = new Run(fDetector,fKinematic);
return fRun;
}
@@ -82,23 +80,14 @@ G4Run* RunAction::GenerateRun()
void RunAction::BeginOfRunAction(const G4Run* aRun)
{
G4cout << "### Run " << aRun->GetRunID() << " start." << G4endl;
// save Rndm status
//
CLHEP::HepRandom::showEngineStatus();
//histograms
//
G4AnalysisManager* analysisManager = G4AnalysisManager::Instance();
if ( analysisManager->IsActive() ) {
analysisManager->OpenFile();
}
Book();
}
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
void RunAction::EndOfRunAction(const G4Run* /*aRun*/)
void RunAction::EndOfRunAction(const G4Run*)
{
// print Run summary
//
@@ -110,22 +99,36 @@ void RunAction::EndOfRunAction(const G4Run* /*aRun*/)
analysisManager->Write();
analysisManager->CloseFile();
}
// show Rndm status
if (isMaster) G4Random::showEngineStatus();
}
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
void RunAction::SetBinSize(G4double size)
{
fBinLength = size;
fBinLength = size;
if(fBinLength > fDetector->GetMaxStepSize()) {
fBinLength = fDetector->GetMaxStepSize();
}
// fHistoManager->SetBinLength(fBinLength);
fHistoManager->Update(fBinLength);
}
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
void RunAction::Book()
{
G4AnalysisManager* analysisManager = G4AnalysisManager::Instance();
analysisManager->SetFirstHistoId(1);
G4double length = fDetector->GetAbsorSizeX();
G4int nbBins = G4lrint(length / fBinLength);
// Create histograms
analysisManager->CreateH1("h1","Edep (MeV/mm) along absorber (mm)",
nbBins, 0, length);
analysisManager->CreateH1("h2","DEDX (MeV/mm) of proton", 100, -3., 7.);
analysisManager->CreateH1("h3","DEDX (MeV/mm) of monopole", 100, -3., 7.);
analysisManager->CreateH1("h4","Range(mm) of proton", 100, -3., 7., "mm");
analysisManager->CreateH1("h5","Range(mm) of monopole", 100, -3., 7., "mm");
analysisManager->OpenFile();
}
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
examples/extended/exoticphysics/phonon/History
+17 -1
View File
@@ -1,4 +1,4 @@
$Id: History 102480 2017-02-01 10:47:25Z gcosmo $
$Id: History 107810 2017-12-04 15:58:40Z gcosmo $
-------------------------------------------------------------------
=========================================================
@@ -15,6 +15,22 @@ track of all tags.
* Reverse chronological order (last date on top), please *
----------------------------------------------------------
4 December 2017 G.Folger (phononExample-V10-03-08)
- fix typo in caustic.out-clang-MT, it had extra \n at end.
24 November 2017 G.Folger (phononExample-V10-03-07)
- update references for caustic and timing
changed caused by new CLHEP 2.4.0.0 random number generator
24 October 2017 G.Folger (phononExample-V10-03-06)
- create caustic and timings with \n at least line, drop first
empty line; it is difficult to create file without final \nl
- update references for this change.
24 October 2017 G.Folger (phononExample-V10-03-05)
- update references for caustic and timing
caused by change in G4RandomDirection, tag global-V10-03-11
25 January 2017 G.Folger (phononExample-V10-03-04)
- correct new timing.out-MT: remove last newline from file
examples/extended/exoticphysics/phonon/caustic.out
+5 -7
View File
@@ -1,7 +1,5 @@
-5.89577,1.71691,12.7
0.768651,5.64379,12.7
22.6541,30.6334,-3.74316
-23.7086,10.2911,12.7
0.734288,-6.91453,-12.7
-1.12731,16.2918,-12.7
-12.1592,-16.493,-12.7
-17.8358,-18.8973,-12.7
33.5431,18.0686,1.49911
-22.8043,-5.27506,12.7
3.91373,19.7249,-12.7
examples/extended/exoticphysics/phonon/caustic.out-MT
+6 -6
View File
@@ -1,6 +1,6 @@
-6.63941,-16.9549,-12.7
3.35453,4.76497,12.7
16.7678,-8.41667,12.7
-6.45515,-21.9922,-12.7
-6.13518,-28.1214,-12.7
10.0632,-8.86304,12.7
-18.12,6.8066,12.7
12.4047,-3.15044,12.7
25.8628,27.9772,8.91
5.31685,5.00029,-12.7
9.88462,-8.41006,12.7
examples/extended/exoticphysics/phonon/caustic.out-clang-MT
+5 -4
View File
@@ -1,4 +1,5 @@
-0.99087,2.90339,-12.7
-0.830314,-6.05251,-12.7
-8.31785,-11.1924,12.7
-36.9773,-9.18101,-2.30047
3.74678,-11.7797,12.7
12.3251,10.3106,-12.7
2.66145,-0.647826,-12.7
-0.878124,-5.97534,12.7
examples/extended/exoticphysics/phonon/phonon.out
+2 -4
View File
@@ -4,7 +4,7 @@
############################################
*************************************************************
Geant4 version Name: geant4-10-03-ref-06 (30-June-2017)
Geant4 version Name: geant4-10-04-ref-00 (08-December-2017)
Copyright : Geant4 Collaboration
Reference : NIM A 506 (2003), 250-303
WWW : http://cern.ch/geant4
@@ -56,8 +56,6 @@ End of Event User Vis Actions: none
End of Run User Vis Actions: none
Some /vis commands (optionally) take a string to specify colour.
Available colours:
black, blue, brown, cyan, gray, green, grey, magenta, red, white, yellow
"/vis/list" to see available colours.
Graphics systems deleted.
Visualization Manager deleting...
examples/extended/exoticphysics/phonon/src/XAluminumElectrodeSensitivity.cc
+5 -4
View File
@@ -26,7 +26,7 @@
/// \file exoticphysics/phonon/src/XAluminumElectrodeSensitivity.cc
/// \brief Implementation of the XAluminumElectrodeSensitivity class
//
// $Id: XAluminumElectrodeSensitivity.cc 92176 2015-08-20 13:07:22Z gcosmo $
// $Id: XAluminumElectrodeSensitivity.cc 106987 2017-10-31 10:09:40Z gcosmo $
//
#include "XAluminumElectrodeSensitivity.hh"
@@ -160,10 +160,11 @@ WriteHitInfo(const XAluminumElectrodeHit* aHit) {
G4AutoLock lockIt(&theMutex); // Only one event can write at a time
*fWriter << "\n" << aHit->fWorldPos.getX()/mm
*fWriter << aHit->fWorldPos.getX()/mm
<< "," << aHit->fWorldPos.getY()/mm
<< "," << aHit->fWorldPos.getZ()/mm;
<< "," << aHit->fWorldPos.getZ()/mm
<< "\n";
*fWriter2 << "\n" << aHit->fTime/ns << " " << aHit->fEdep/eV;
*fWriter2 << aHit->fTime/ns << " " << aHit->fEdep/eV << "\n";
}
examples/extended/exoticphysics/phonon/timing.out
+5 -7
View File
@@ -1,7 +1,5 @@
66989.6 0.000951929
70752.9 0.00168444
13609.6 0.00112376
16760.9 0.0013148
32476.7 0.000932744
33325 0.00149233
7767.34 0.00114592
29512 0.00178309
25342.7 0.00149878
48378.2 0.00150418
21104.6 0.00156803
examples/extended/exoticphysics/phonon/timing.out-MT
+6 -6
View File
@@ -1,6 +1,6 @@
10536.6 0.000854609
17670.4 0.00120314
59705.9 0.00269489
67480.4 0.00100411
72328.2 0.00174325
11672.1 0.00147344
21667.6 0.00118218
26231.2 0.00158908
30904.1 0.000828324
32060.5 0.00118923
40886.5 0.00123774
examples/extended/exoticphysics/phonon/timing.out-clang-MT
+5 -4
View File
@@ -1,4 +1,5 @@
89273.7 0.00262158
18192 0.00206239
53783.1 0.00281603
25482.8 0.0009196
37013.1 0.000656883
23009.8 0.00140291
178693 0.00221071
54113.9 0.00230991
examples/extended/exoticphysics/ucn/ExUCN.out
+2 -4
View File
@@ -4,7 +4,7 @@
############################################
*************************************************************
Geant4 version Name: geant4-10-03-ref-06 (30-June-2017)
Geant4 version Name: geant4-10-04-ref-00 (08-December-2017)
Copyright : Geant4 Collaboration
Reference : NIM A 506 (2003), 250-303
WWW : http://cern.ch/geant4
@@ -81,9 +81,7 @@ End of Event User Vis Actions: none
End of Run User Vis Actions: none
Some /vis commands (optionally) take a string to specify colour.
Available colours:
black, blue, brown, cyan, gray, green, grey, magenta, red, white, yellow
"/vis/list" to see available colours.
/event/verbose 1
#/tracking/verbose 1
/ucnboundary/verbose 1
examples/extended/exoticphysics/ucn/History
+3
View File
@@ -15,6 +15,9 @@ track of all tags.
* Reverse chronological order (last date on top), please *
----------------------------------------------------------
September 12, 2017 Soon Yung Jun (ExUCN-V10-03-01)
- ExUCNDetectorConstruction: commented out a wrong use of AddConstProperty
February 14th, 2016 Gunter Folger (ExUCN-V10-03-00)
- ExUCN.in: reduce verbosity.
examples/extended/exoticphysics/ucn/src/ExUCNDetectorConstruction.cc
+3 -1
View File
@@ -98,7 +98,9 @@ void ExUCNDetectorConstruction::DefineMaterials()
G4UCNMaterialPropertiesTable* MPT = new G4UCNMaterialPropertiesTable();
MPT->AddConstProperty("REFLECTIVITY",1.);
// MPT->AddConstProperty("REFLECTIVITY",1.);
// Commented out above line as REFLECTIVITY=1 by default in
// G4OpBoundaryProcess. Also use AddProperty to set REFLECTIVITY if needed
MPT->AddConstProperty("DIFFUSION",0.1);
MPT->AddConstProperty("FERMIPOT",252.0); // Gollub, Table 2.1 in neV
MPT->AddConstProperty("SPINFLIP",0.);