Import Geant4 7.0.0 source tree
This commit is contained in:
@@ -1,4 +1,4 @@
|
||||
$Id: History,v 1.1 2004/06/01 07:02:16 gcosmo Exp $
|
||||
$Id: History,v 1.3 2004/12/03 16:26:07 gcosmo Exp $
|
||||
-------------------------------------------------------------------
|
||||
|
||||
=========================================================
|
||||
@@ -15,6 +15,15 @@ track of all tags.
|
||||
* Reverse chronological order (last date on top), please *
|
||||
----------------------------------------------------------
|
||||
|
||||
December 3rd, 2004 Gabriele Cosmo (LXe-V06-02-01)
|
||||
---------------------------------
|
||||
- Implemented migration to <cmath>.
|
||||
|
||||
August 25th, 2004 Trevor MacPhail (LXe-V06-02-00)
|
||||
---------------------------------
|
||||
- fixed compilation error in LXeSteppingVerbose.cc
|
||||
- fixed compilation warnings in LXePMTSD.cc, LXeScintHit.cc, LXeScintSD.cc
|
||||
|
||||
May 31st, 2004 Trevor MacPhail (LXe-V06-01-00)
|
||||
------------------------------
|
||||
- First release of LXe setup for optical processes.
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
**********************************************
|
||||
Geant4 version $Name: geant4-06-02 $
|
||||
Geant4 version $Name: geant4-07-00-cand-01 $
|
||||
(12-December-2003)
|
||||
Copyright : Geant4 Collaboration
|
||||
**********************************************
|
||||
|
||||
@@ -70,7 +70,7 @@ G4bool LXePMTSD::ProcessHits(G4Step* aStep,G4TouchableHistory* ROhist){
|
||||
//absorbed by the photocathode
|
||||
//_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_
|
||||
G4bool LXePMTSD::ProcessHits_constStep(const G4Step* aStep,
|
||||
G4TouchableHistory* ROhist){
|
||||
G4TouchableHistory* ){
|
||||
|
||||
//need to know if this is an optical photon
|
||||
if(aStep->GetTrack()->GetDefinition()
|
||||
@@ -121,7 +121,7 @@ G4bool LXePMTSD::ProcessHits_constStep(const G4Step* aStep,
|
||||
}
|
||||
|
||||
//_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_
|
||||
void LXePMTSD::EndOfEvent(G4HCofThisEvent* HCE){
|
||||
void LXePMTSD::EndOfEvent(G4HCofThisEvent* ){
|
||||
}
|
||||
|
||||
//_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_
|
||||
|
||||
@@ -62,7 +62,7 @@ const LXeScintHit& LXeScintHit::operator=(const LXeScintHit &right){
|
||||
}
|
||||
|
||||
//_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_
|
||||
G4int LXeScintHit::operator==(const LXeScintHit &right) const{
|
||||
G4int LXeScintHit::operator==(const LXeScintHit&) const{
|
||||
return false;
|
||||
//returns false because there currently isnt need to check for equality yet
|
||||
}
|
||||
|
||||
@@ -56,7 +56,7 @@ void LXeScintSD::Initialize(G4HCofThisEvent* HCE){
|
||||
}
|
||||
|
||||
//_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_
|
||||
G4bool LXeScintSD::ProcessHits(G4Step* aStep,G4TouchableHistory* ROhist){
|
||||
G4bool LXeScintSD::ProcessHits(G4Step* aStep,G4TouchableHistory* ){
|
||||
G4double edep = aStep->GetTotalEnergyDeposit();
|
||||
if(edep==0.) return false; //No edep so dont count as hit
|
||||
|
||||
@@ -82,7 +82,7 @@ G4bool LXeScintSD::ProcessHits(G4Step* aStep,G4TouchableHistory* ROhist){
|
||||
}
|
||||
|
||||
//_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_
|
||||
void LXeScintSD::EndOfEvent(G4HCofThisEvent* HCE){
|
||||
void LXeScintSD::EndOfEvent(G4HCofThisEvent* ){
|
||||
}
|
||||
|
||||
//_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_
|
||||
|
||||
@@ -25,7 +25,7 @@
|
||||
#include "G4SteppingManager.hh"
|
||||
#include "G4UnitsTable.hh"
|
||||
|
||||
#include<strstream>
|
||||
|
||||
|
||||
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
|
||||
|
||||
@@ -41,69 +41,47 @@ LXeSteppingVerbose::~LXeSteppingVerbose()
|
||||
|
||||
void LXeSteppingVerbose::StepInfo()
|
||||
{
|
||||
CopyState();
|
||||
CopyState();
|
||||
|
||||
G4int prec = G4cout.precision(3);
|
||||
|
||||
if( verboseLevel >= 1 ){
|
||||
G4int lengthLen=+G4UnitDefinition::GetUnitsTable()[G4BestUnit(0,"Length").GetIndexOfCategory()]->GetSymbMxLen();
|
||||
G4int energyLen=+G4UnitDefinition::GetUnitsTable()[G4BestUnit(0,"Energy").GetIndexOfCategory()]->GetSymbMxLen();
|
||||
|
||||
if( verboseLevel >= 4 ) VerboseTrack();
|
||||
if( verboseLevel >= 3 ){
|
||||
G4cout << G4endl;
|
||||
G4cout << std::setw( 5) << "Step#"
|
||||
<< std::setw( 6) << "X" << std::setw(lengthLen+1)<<" "
|
||||
<< std::setw( 6) << "Y" << std::setw(lengthLen+1)<<" "
|
||||
<< std::setw( 6) << "Z" << std::setw(lengthLen+1)<<" "
|
||||
<< std::setw( 7) << "KineE" << std::setw(energyLen+1)<<" "
|
||||
<< std::setw( 7) << "dEStep"<< std::setw(energyLen+1)<<" "
|
||||
<< std::setw(10) << "StepLeng"<< std::setw(lengthLen+1)<<" "
|
||||
<< std::setw(10) << "TrakLeng"<< std::setw(lengthLen+1)<<" "
|
||||
<< std::setw(10) << "Volume"
|
||||
<< std::setw(10) << "Process" << G4endl;
|
||||
G4cout << std::setw( 5) << "#Step#" << " "
|
||||
<< std::setw( 6) << "X" << " "
|
||||
<< std::setw( 6) << "Y" << " "
|
||||
<< std::setw( 6) << "Z" << " "
|
||||
<< std::setw( 9) << "KineE" << " "
|
||||
<< std::setw( 9) << "dEStep" << " "
|
||||
<< std::setw(10) << "StepLeng"
|
||||
<< std::setw(10) << "TrakLeng"
|
||||
<< std::setw(10) << "Volume" << " "
|
||||
<< std::setw(10) << "Process" << G4endl;
|
||||
}
|
||||
|
||||
//This is a less clean way of outputing the data than normal but it
|
||||
//produces nicer colums since G4BestUnit doesnt cooperate too well with
|
||||
//field widths.
|
||||
G4cout << std::setw(5) << fTrack->GetCurrentStepNumber();
|
||||
strstream out;
|
||||
out.precision(3);
|
||||
out.rdbuf()->seekpos(0);
|
||||
out<<G4BestUnit(fTrack->GetPosition().x(),"Length")<<'\0';
|
||||
G4cout<<std::setw(7+lengthLen)<<out.str();
|
||||
out.rdbuf()->seekpos(0);
|
||||
out<<G4BestUnit(fTrack->GetPosition().y(),"Length")<<'\0';
|
||||
G4cout<<std::setw(7+lengthLen)<<out.str();
|
||||
out.rdbuf()->seekpos(0);
|
||||
out<<G4BestUnit(fTrack->GetPosition().z(),"Length")<<'\0';
|
||||
G4cout<<std::setw(7+lengthLen)<<out.str();
|
||||
out.rdbuf()->seekpos(0);
|
||||
out<<G4BestUnit(fTrack->GetKineticEnergy(),"Energy")<<'\0';
|
||||
G4cout<<std::setw(7+energyLen)<<out.str();
|
||||
out.rdbuf()->seekpos(0);
|
||||
out<<G4BestUnit(fStep->GetTotalEnergyDeposit(),"Energy")<<'\0';
|
||||
G4cout<<std::setw(7+energyLen)<<out.str();
|
||||
out.rdbuf()->seekpos(0);
|
||||
out<<G4BestUnit(fStep->GetStepLength(),"Length")<<'\0';
|
||||
G4cout<<std::setw(10+lengthLen)<<out.str();
|
||||
out.rdbuf()->seekpos(0);
|
||||
out<<G4BestUnit(fTrack->GetTrackLength(),"Length")<<'\0';
|
||||
G4cout<<std::setw(10+lengthLen)<<out.str();
|
||||
|
||||
G4cout << std::setw(5) << fTrack->GetCurrentStepNumber() << " "
|
||||
<< std::setw(6) << G4BestUnit(fTrack->GetPosition().x(),"Length")
|
||||
<< std::setw(6) << G4BestUnit(fTrack->GetPosition().y(),"Length")
|
||||
<< std::setw(6) << G4BestUnit(fTrack->GetPosition().z(),"Length")
|
||||
<< std::setw(6) << G4BestUnit(fTrack->GetKineticEnergy(),"Energy")
|
||||
<< std::setw(6) << G4BestUnit(fStep->GetTotalEnergyDeposit(),"Energy")
|
||||
<< std::setw(6) << G4BestUnit(fStep->GetStepLength(),"Length")
|
||||
<< std::setw(6) << G4BestUnit(fTrack->GetTrackLength(),"Length")
|
||||
<< " ";
|
||||
|
||||
// if( fStepStatus != fWorldBoundary){
|
||||
if( fTrack->GetNextVolume() != 0 ) {
|
||||
G4cout << " "<<fTrack->GetVolume()->GetName();
|
||||
} else {
|
||||
G4cout << " OutOfWorld";
|
||||
G4cout << std::setw(10) << fTrack->GetVolume()->GetName();
|
||||
} else {
|
||||
G4cout << std::setw(10) << "OutOfWorld";
|
||||
}
|
||||
|
||||
if(fStep->GetPostStepPoint()->GetProcessDefinedStep() != 0){
|
||||
G4cout << " "
|
||||
<< std::setw(10)
|
||||
<< fStep->GetPostStepPoint()->GetProcessDefinedStep()
|
||||
->GetProcessName();
|
||||
if(fStep->GetPostStepPoint()->GetProcessDefinedStep() != NULL){
|
||||
G4cout << " "
|
||||
<< std::setw(10) << fStep->GetPostStepPoint()->GetProcessDefinedStep()
|
||||
->GetProcessName();
|
||||
} else {
|
||||
G4cout << " UserLimit";
|
||||
}
|
||||
@@ -159,56 +137,35 @@ void LXeSteppingVerbose::TrackingStarted()
|
||||
|
||||
CopyState();
|
||||
G4int prec = G4cout.precision(3);
|
||||
if( verboseLevel > 0 ){
|
||||
G4int lengthLen=+G4UnitDefinition::GetUnitsTable()[G4BestUnit(0,"Length").GetIndexOfCategory()]->GetSymbMxLen();
|
||||
G4int energyLen=+G4UnitDefinition::GetUnitsTable()[G4BestUnit(0,"Energy").GetIndexOfCategory()]->GetSymbMxLen();
|
||||
if( verboseLevel > 0 ){
|
||||
|
||||
G4cout << std::setw( 5) << "Step#"
|
||||
<< std::setw( 6) << "X" << std::setw(lengthLen+1)<<" "
|
||||
<< std::setw( 6) << "Y" << std::setw(lengthLen+1)<<" "
|
||||
<< std::setw( 6) << "Z" << std::setw(lengthLen+1)<<" "
|
||||
<< std::setw( 7) << "KineE" << std::setw(energyLen+1)<<" "
|
||||
<< std::setw( 7) << "dEStep"<< std::setw(energyLen+1)<<" "
|
||||
<< std::setw(10) << "StepLeng"<< std::setw(lengthLen+1)<<" "
|
||||
<< std::setw(10) << "TrakLeng"<< std::setw(lengthLen+1)<<" "
|
||||
<< std::setw(10) << "Volume"
|
||||
G4cout << std::setw( 5) << "Step#" << " "
|
||||
<< std::setw( 6) << "X" << " "
|
||||
<< std::setw( 6) << "Y" << " "
|
||||
<< std::setw( 6) << "Z" << " "
|
||||
<< std::setw( 9) << "KineE" << " "
|
||||
<< std::setw( 9) << "dEStep" << " "
|
||||
<< std::setw(10) << "StepLeng"
|
||||
<< std::setw(10) << "TrakLeng"
|
||||
<< std::setw(10) << "Volume" << " "
|
||||
<< std::setw(10) << "Process" << G4endl;
|
||||
|
||||
//This is a less clean way of outputing the data than normal but it
|
||||
//produces nicer colums since G4BestUnit doesnt cooperate too well with
|
||||
//field widths.
|
||||
G4cout << std::setw( 5) << fTrack->GetCurrentStepNumber();
|
||||
strstream out;
|
||||
out.precision(3);
|
||||
out.rdbuf()->seekpos(0);
|
||||
out<<G4BestUnit(fTrack->GetPosition().x(),"Length")<<'\0';
|
||||
G4cout<<std::setw(7+lengthLen)<<out.str();
|
||||
out.rdbuf()->seekpos(0);
|
||||
out<<G4BestUnit(fTrack->GetPosition().y(),"Length")<<'\0';
|
||||
G4cout<<std::setw(7+lengthLen)<<out.str();
|
||||
out.rdbuf()->seekpos(0);
|
||||
out<<G4BestUnit(fTrack->GetPosition().z(),"Length")<<'\0';
|
||||
G4cout<<std::setw(7+lengthLen)<<out.str();
|
||||
out.rdbuf()->seekpos(0);
|
||||
out<<G4BestUnit(fTrack->GetKineticEnergy(),"Energy")<<'\0';
|
||||
G4cout<<std::setw(7+energyLen)<<out.str();
|
||||
out.rdbuf()->seekpos(0);
|
||||
out<<G4BestUnit(fStep->GetTotalEnergyDeposit(),"Energy")<<'\0';
|
||||
G4cout<<std::setw(7+energyLen)<<out.str();
|
||||
out.rdbuf()->seekpos(0);
|
||||
out<<G4BestUnit(fStep->GetStepLength(),"Length")<<'\0';
|
||||
G4cout<<std::setw(10+lengthLen)<<out.str();
|
||||
out.rdbuf()->seekpos(0);
|
||||
out<<G4BestUnit(fTrack->GetTrackLength(),"Length")<<'\0';
|
||||
G4cout<<std::setw(10+lengthLen)<<out.str();
|
||||
|
||||
G4cout << std::setw(5) << fTrack->GetCurrentStepNumber() << " "
|
||||
<< std::setw(6) << G4BestUnit(fTrack->GetPosition().x(),"Length")
|
||||
<< std::setw(6) << G4BestUnit(fTrack->GetPosition().y(),"Length")
|
||||
<< std::setw(6) << G4BestUnit(fTrack->GetPosition().z(),"Length")
|
||||
<< std::setw(6) << G4BestUnit(fTrack->GetKineticEnergy(),"Energy")
|
||||
<< std::setw(6) << G4BestUnit(fStep->GetTotalEnergyDeposit(),"Energy")
|
||||
<< std::setw(6) << G4BestUnit(fStep->GetStepLength(),"Length")
|
||||
<< std::setw(6) << G4BestUnit(fTrack->GetTrackLength(),"Length")
|
||||
<< " ";
|
||||
|
||||
if(fTrack->GetNextVolume()){
|
||||
G4cout << " "<< fTrack->GetVolume()->GetName();
|
||||
G4cout << std::setw(10) << fTrack->GetVolume()->GetName();
|
||||
} else {
|
||||
G4cout << std::setw(11+lengthLen)<< "OutOfWorld";
|
||||
G4cout << std::setw(10) << "OutOfWorld";
|
||||
}
|
||||
G4cout << " initStep" << G4endl;
|
||||
G4cout << " initStep" << G4endl;
|
||||
}
|
||||
G4cout.precision(prec);
|
||||
}
|
||||
|
||||
@@ -73,13 +73,13 @@ void LXeTrajectory::DrawTrajectory(G4int i_mode) const{
|
||||
// If i_mode>=0, draws a trajectory as a polyline and, if i_mode!=0,
|
||||
// adds markers - yellow circles for step points and magenta squares
|
||||
// for auxiliary points, if any - whose screen size in pixels is
|
||||
// given by abs(i_mode)/1000. E.g: i_mode = 5000 gives easily
|
||||
// given by std::abs(i_mode)/1000. E.g: i_mode = 5000 gives easily
|
||||
// visible markers.
|
||||
|
||||
G4VVisManager* pVVisManager = G4VVisManager::GetConcreteInstance();
|
||||
if (!pVVisManager) return;
|
||||
|
||||
const G4double markerSize = abs(i_mode)/1000;
|
||||
const G4double markerSize = std::abs(i_mode)/1000;
|
||||
G4bool lineRequired (i_mode >= 0);
|
||||
G4bool markersRequired (markerSize > 0.);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user