Import Geant4 5.1.0 source tree
This commit is contained in:
@@ -104,6 +104,7 @@ A01AnalysisManager::~A01AnalysisManager()
|
||||
delete tree;
|
||||
delete tFactory;
|
||||
delete hFactory;
|
||||
G4cout << "Warning: Geant4 will NOT exit unless you close the JAS-AIDA window." << G4endl;
|
||||
delete analysisFactory;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -20,7 +20,7 @@
|
||||
// * statement, and all its terms. *
|
||||
// ********************************************************************
|
||||
//
|
||||
// $Id: A01DetectorConstruction.cc,v 1.4 2002/12/13 11:34:33 gunter Exp $
|
||||
// $Id: A01DetectorConstruction.cc,v 1.5 2002/12/20 21:40:30 duns Exp $
|
||||
// --------------------------------------------------------------
|
||||
//
|
||||
|
||||
@@ -63,8 +63,7 @@
|
||||
|
||||
A01DetectorConstruction::A01DetectorConstruction()
|
||||
: air(0), argonGas(0), scintillator(0), CsI(0), lead(0),
|
||||
hodoscope1(0), hodoscope2(0), chamber1(0), chamber2(0),
|
||||
EMcalorimeter(0), HadCalorimeter(0), worldVisAtt(0), magneticVisAtt(0),
|
||||
worldVisAtt(0), magneticVisAtt(0),
|
||||
armVisAtt(0), hodoscopeVisAtt(0), chamberVisAtt(0),
|
||||
wirePlaneVisAtt(0), EMcalorimeterVisAtt(0), cellVisAtt(0),
|
||||
HadCalorimeterVisAtt(0), HadCalorimeterCellVisAtt(0),
|
||||
@@ -84,13 +83,6 @@ A01DetectorConstruction::~A01DetectorConstruction()
|
||||
|
||||
DestroyMaterials();
|
||||
|
||||
delete hodoscope1;
|
||||
delete hodoscope2;
|
||||
delete chamber1;
|
||||
delete chamber2;
|
||||
delete EMcalorimeter;
|
||||
delete HadCalorimeter;
|
||||
|
||||
delete worldVisAtt;
|
||||
delete magneticVisAtt;
|
||||
delete armVisAtt;
|
||||
@@ -105,6 +97,16 @@ A01DetectorConstruction::~A01DetectorConstruction()
|
||||
|
||||
G4VPhysicalVolume* A01DetectorConstruction::Construct()
|
||||
{
|
||||
// All managed (deleted) by SDManager
|
||||
G4VSensitiveDetector* hodoscope1;
|
||||
G4VSensitiveDetector* hodoscope2;
|
||||
G4VSensitiveDetector* chamber1;
|
||||
G4VSensitiveDetector* chamber2;
|
||||
G4VSensitiveDetector* EMcalorimeter;
|
||||
//@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
|
||||
G4VSensitiveDetector* HadCalorimeter;
|
||||
//@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
|
||||
|
||||
ConstructMaterials();
|
||||
|
||||
// Magnetic field ----------------------------------------------------------
|
||||
|
||||
@@ -20,7 +20,7 @@
|
||||
// * statement, and all its terms. *
|
||||
// ********************************************************************
|
||||
//
|
||||
// $Id: A01EventAction.cc,v 1.3 2002/12/13 11:34:34 gunter Exp $
|
||||
// $Id: A01EventAction.cc,v 1.4 2002/12/20 21:40:30 duns Exp $
|
||||
// --------------------------------------------------------------
|
||||
//
|
||||
|
||||
@@ -87,11 +87,12 @@ A01EventAction::A01EventAction()
|
||||
plotter = analysisManager->createPlotter();
|
||||
if (plotter)
|
||||
{
|
||||
plotter->createRegions(2,2);
|
||||
plotter->createRegions(3,2);
|
||||
plotter->region(0)->plot(*dc1Hits);
|
||||
plotter->region(1)->plot(*dc2Hits);
|
||||
plotter->region(2)->plot(*dc1XY);
|
||||
plotter->region(3)->plot(*evstof);
|
||||
plotter->region(3)->plot(*dc2XY);
|
||||
plotter->region(4)->plot(*evstof);
|
||||
plotter->show();
|
||||
}
|
||||
}
|
||||
@@ -166,7 +167,6 @@ void A01EventAction::EndOfEventAction(const G4Event* evt)
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
// Fill the tuple
|
||||
|
||||
if (tuple)
|
||||
|
||||
Reference in New Issue
Block a user