Import Geant4 1.1.0 source tree
This commit is contained in:
@@ -206,8 +206,8 @@ G4VPhysicalVolume* ExN06DetectorConstruction::Construct()
|
||||
OpWaterSurface->SetFinish(polished);
|
||||
OpWaterSurface->SetModel(glisur);
|
||||
|
||||
if( WaterSurface->GetVolume1() == waterTank_phys ) G4cout << " Equal " << endl;
|
||||
if( WaterSurface->GetVolume2() == expHall_phys ) G4cout << " Equal " << endl;
|
||||
if( WaterSurface->GetVolume1() == waterTank_phys ) G4cout << " Equal " << G4endl;
|
||||
if( WaterSurface->GetVolume2() == expHall_phys ) G4cout << " Equal " << G4endl;
|
||||
|
||||
G4OpticalSurface * OpAirSurface =
|
||||
new G4OpticalSurface("AirSurface");
|
||||
@@ -221,16 +221,16 @@ G4VPhysicalVolume* ExN06DetectorConstruction::Construct()
|
||||
OpAirSurface->SetFinish(ground);
|
||||
OpAirSurface->SetModel(unified);
|
||||
|
||||
if( AirSurface->GetLogicalVolume() == bubbleAir_log ) G4cout << " Equal " << endl;
|
||||
if( AirSurface->GetLogicalVolume() == bubbleAir_log ) G4cout << " Equal " << G4endl;
|
||||
|
||||
G4LogicalBorderSurface * Tmp1Surface = WaterSurface->
|
||||
GetSurface(waterTank_phys,expHall_phys);
|
||||
|
||||
// if (Tmp1Surface == *WaterSurface) G4cout << " Equal " << endl;
|
||||
// if (Tmp1Surface == *WaterSurface) G4cout << " Equal " << G4endl;
|
||||
|
||||
G4LogicalSkinSurface * Tmp2Surface = AirSurface->GetSurface(bubbleAir_log);
|
||||
|
||||
// if (Tmp2Surface == *AirSurface ) G4cout << " Equal " << endl;
|
||||
// if (Tmp2Surface == *AirSurface ) G4cout << " Equal " << G4endl;
|
||||
|
||||
G4OpticalSurface * TmpOpSurface = Tmp2Surface->GetOpticalSurface();
|
||||
TmpOpSurface->DumpInfo();
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
//
|
||||
|
||||
#include "G4ios.hh"
|
||||
#include <iomanip.h>
|
||||
#include "g4std/iomanip"
|
||||
|
||||
#include "globals.hh"
|
||||
#include "ExN06PhysicsList.hh"
|
||||
@@ -211,7 +211,7 @@ void ExN06PhysicsList::ConstructOp()
|
||||
pmanager->AddContinuousProcess(theCerenkovProcess);
|
||||
}
|
||||
if (particleName == "opticalphoton") {
|
||||
G4cout << " AddDiscreteProcess to OpticalPhoton " << endl;
|
||||
G4cout << " AddDiscreteProcess to OpticalPhoton " << G4endl;
|
||||
pmanager->AddDiscreteProcess(theAbsorptionProcess);
|
||||
pmanager->AddDiscreteProcess(theRayleighScatteringProcess);
|
||||
pmanager->AddDiscreteProcess(theBoundaryProcess);
|
||||
|
||||
@@ -6,6 +6,9 @@
|
||||
// and all its terms.
|
||||
//
|
||||
|
||||
// Make this appear first!
|
||||
#include "G4Timer.hh"
|
||||
|
||||
#include "ExN06RunAction.hh"
|
||||
|
||||
#include "G4ios.hh"
|
||||
@@ -28,7 +31,7 @@ void ExN06RunAction::BeginOfRunAction(const G4Run* aRun)
|
||||
UI->ApplyCommand("/event/verbose 1");
|
||||
//UI->ApplyCommand("/tracking/verbose 1");
|
||||
|
||||
G4cout << "### Run " << aRun->GetRunID() << " start." << endl;
|
||||
G4cout << "### Run " << aRun->GetRunID() << " start." << G4endl;
|
||||
timer->Start();
|
||||
}
|
||||
|
||||
@@ -36,5 +39,5 @@ void ExN06RunAction::EndOfRunAction(const G4Run* aRun)
|
||||
{
|
||||
timer->Stop();
|
||||
G4cout << "number of event = " << aRun->GetNumberOfEvent()
|
||||
<< " " << *timer << endl;
|
||||
<< " " << *timer << G4endl;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user