Import Geant4 11.0.0 source tree
This commit is contained in:
committed by
Ben Morgan
parent
6399a014b6
commit
80e2389dd8
@@ -35,9 +35,8 @@
|
||||
#include "CCalG4Hit.hh"
|
||||
#include "CCaloOrganization.hh"
|
||||
#include "CCalSDList.hh"
|
||||
#include "CCalAnalysis.hh"
|
||||
|
||||
|
||||
#include "G4AnalysisManager.hh"
|
||||
#include "G4ios.hh"
|
||||
#include "G4SystemOfUnits.hh"
|
||||
#include "G4Event.hh"
|
||||
@@ -51,8 +50,6 @@
|
||||
#include <vector>
|
||||
#include <map>
|
||||
|
||||
#include "CCalAnalysis.hh"
|
||||
|
||||
//#define debug
|
||||
//#define ddebug
|
||||
|
||||
|
||||
@@ -245,7 +245,7 @@ CCalRotationMatrixFactory::CCalRotationMatrixFactory():theMatrices(){
|
||||
|
||||
is >> name;
|
||||
while(name!="*ENDDO") {
|
||||
if (name.index("#.")==0) { //It is a comment.Skip line.
|
||||
if (name.find("#.")==0) { //It is a comment.Skip line.
|
||||
is.getline(rubish,256,'\n');
|
||||
} else {
|
||||
#ifdef debug
|
||||
|
||||
@@ -34,7 +34,7 @@
|
||||
|
||||
#include "G4ios.hh"
|
||||
|
||||
#include "CCalAnalysis.hh"
|
||||
#include "G4AnalysisManager.hh"
|
||||
#include "G4Threading.hh"
|
||||
|
||||
|
||||
@@ -47,7 +47,6 @@ CCalRunAction::CCalRunAction()
|
||||
|
||||
CCalRunAction::~CCalRunAction()
|
||||
{
|
||||
delete G4AnalysisManager::Instance();
|
||||
}
|
||||
|
||||
|
||||
@@ -56,6 +55,7 @@ void CCalRunAction::BeginOfRunAction(const G4Run* aRun)
|
||||
G4cout << "### Run " << aRun->GetRunID() << " start." << G4endl;
|
||||
|
||||
G4AnalysisManager* analysis = G4AnalysisManager::Instance();
|
||||
analysis->SetDefaultFileType("root");
|
||||
|
||||
//cleanup
|
||||
G4int timeHist = analysis->GetH1Id("h300");
|
||||
|
||||
@@ -31,16 +31,14 @@
|
||||
|
||||
#include "CCalSteppingAction.hh"
|
||||
#include "CCalRunAction.hh"
|
||||
#include "CCalAnalysis.hh"
|
||||
|
||||
#include "G4AnalysisManager.hh"
|
||||
#include "G4SystemOfUnits.hh"
|
||||
#include "G4SDManager.hh"
|
||||
#include "G4StepPoint.hh"
|
||||
#include "G4ThreeVector.hh"
|
||||
#include "G4RunManager.hh"
|
||||
|
||||
#include "CCalAnalysis.hh"
|
||||
|
||||
CCalSteppingAction::CCalSteppingAction()
|
||||
{
|
||||
timeHistoMaxBin = 200;
|
||||
|
||||
@@ -63,7 +63,7 @@ std::ifstream& readName(std::ifstream& is, G4String& name){
|
||||
name += " ";
|
||||
name += other;
|
||||
};
|
||||
name = name.strip(G4String::both, '\"');
|
||||
G4StrUtil::strip(name, '\"');
|
||||
}
|
||||
return is;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user