LISTSERV 16.5 - LCD-CVS Archives

slic/src

G4MatScanMessenger.cc removed after 1.3

diff -N G4MatScanMessenger.cc
--- G4MatScanMessenger.cc	8 May 2006 20:08:30 -0000	1.3
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,243 +0,0 @@

-//
-// ********************************************************************
-// * DISCLAIMER                                                       *
-// *                                                                  *
-// * The following disclaimer summarizes all the specific disclaimers *
-// * of contributors to this software. The specific disclaimers,which *
-// * govern, are listed with their locations in:                      *
-// *   http://cern.ch/geant4/license                                  *
-// *                                                                  *
-// * 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.                                                             *
-// *                                                                  *
-// * This  code  implementation is the  intellectual property  of the *
-// * GEANT4 collaboration.                                            *
-// * By copying,  distributing  or modifying the Program (or any work *
-// * based  on  the Program)  you indicate  your  acceptance of  this *
-// * statement, and all its terms.                                    *
-// ********************************************************************
-//
-//
-// $Id: G4MatScanMessenger.cc,v 1.3 2006/05/08 20:08:30 jeremy Exp $
-// GEANT4 tag $Name:  $
-//
-//
-//
-
-
-#include "G4MatScanMessenger.hh"
-
-#include "G4UIdirectory.hh"
-#include "G4UIcommand.hh"
-#include "G4UIparameter.hh"
-#include "G4UIcmdWithoutParameter.hh"
-#include "G4UIcmdWithABool.hh"
-#include "G4UIcmdWith3VectorAndUnit.hh"
-#include "G4UIcmdWithAString.hh"
-#include "G4MaterialScanner.hh"
-#include "G4ThreeVector.hh"
-#include "G4Tokenizer.hh"
-
-G4MatScanMessenger::G4MatScanMessenger(G4MaterialScanner* p1)
-{
-  theScanner = p1;
-  G4UIparameter* par;
-  msDirectory = new G4UIdirectory("/control/matScan/");
-  msDirectory->SetGuidance("Material scanner commands.");
-
-  scanCmd = new G4UIcmdWithoutParameter("/control/matScan/scan",this);
-  scanCmd->SetGuidance("Start material scanning.");
-  scanCmd->SetGuidance("Scanning range should be defined with");
-  scanCmd->SetGuidance("/control/matScan/theta and /control/matSca/phi commands.");
-  scanCmd->AvailableForStates(G4State_Idle);
-
-  thetaCmd = new G4UIcommand("/control/matScan/theta",this);
-  thetaCmd->SetGuidance("Define theta range.");
-  thetaCmd->SetGuidance("Usage : /control/matScan/theta [nbin] [thetaMin] [thetaSpan] [unit]");
-  thetaCmd->SetGuidance("Notation of angles :");
-  thetaCmd->SetGuidance(" theta --- +Z axis : +90 deg. / X-Y plane : 0 deg. / -Z axis : -90 deg.");
-  par = new G4UIparameter("nbin",'i',false);
-  par->SetParameterRange("nbin>0");
-  thetaCmd->SetParameter(par);
-  par = new G4UIparameter("thetaMin",'d',false);
-  thetaCmd->SetParameter(par);
-  par = new G4UIparameter("thetaSpan",'d',true);
-  par->SetParameterRange("thetaSpan>=0.");
-  par->SetDefaultValue(0.);
-  thetaCmd->SetParameter(par);
-  par = new G4UIparameter("unit",'c',true);
-  par->SetDefaultValue("deg");
-  par->SetParameterCandidates(thetaCmd->UnitsList(thetaCmd->CategoryOf("deg")));
-  thetaCmd->SetParameter(par);
-
-  phiCmd = new G4UIcommand("/control/matScan/phi",this);
-  phiCmd->SetGuidance("Define phi range.");
-  phiCmd->SetGuidance("Usage : /control/matScan/phi [nbin] [phiMin] [phiSpan] [unit]");
-  phiCmd->SetGuidance("Notation of angles :");
-  phiCmd->SetGuidance(" phi   --- +X axis : 0 deg. / +Y axis : 90 deg. / -X axis : 180 deg. / -Y axis : 270 deg.");
-  par = new G4UIparameter("nbin",'i',false);
-  par->SetParameterRange("nbin>0");
-  phiCmd->SetParameter(par);
-  par = new G4UIparameter("phiMin",'d',false);
-  phiCmd->SetParameter(par);
-  par = new G4UIparameter("phiSpan",'d',true);
-  par->SetParameterRange("phiSpan>=0.");
-  par->SetDefaultValue(0.);
-  phiCmd->SetParameter(par);
-  par = new G4UIparameter("unit",'c',true);
-  par->SetDefaultValue("deg");
-  par->SetParameterCandidates(phiCmd->UnitsList(phiCmd->CategoryOf("deg")));
-  phiCmd->SetParameter(par);
-
-  singleCmd = new G4UIcommand("/control/matScan/singleMeasure",this);
-  singleCmd->SetGuidance("Measure thickness for one particular direction.");
-  singleCmd->SetGuidance("Notation of angles :");
-  singleCmd->SetGuidance(" theta --- +Z axis : +90 deg. / X-Y plane : 0 deg. / -Z axis : -90 deg.");
-  singleCmd->SetGuidance(" phi   --- +X axis : 0 deg. / +Y axis : 90 deg. / -X axis : 180 deg. / -Y axis : 270 deg.");
-  singleCmd->AvailableForStates(G4State_Idle);
-  par = new G4UIparameter("theta",'d',false);
-  singleCmd->SetParameter(par);
-  par = new G4UIparameter("phi",'d',false);
-  singleCmd->SetParameter(par);
-  par = new G4UIparameter("unit",'c',true);
-  par->SetDefaultValue("deg");
-  par->SetParameterCandidates(singleCmd->UnitsList(singleCmd->CategoryOf("deg")));
-  singleCmd->SetParameter(par);
-
-  eyePosCmd = new G4UIcmdWith3VectorAndUnit("/control/matScan/eyePosition",this);
-  eyePosCmd->SetGuidance("Define the eye position.");
-  eyePosCmd->SetParameterName("X","Y","Z",true);
-  eyePosCmd->SetDefaultValue(G4ThreeVector(0.,0.,0.));
-  eyePosCmd->SetDefaultUnit("m");
-
-  regSenseCmd = new G4UIcmdWithABool("/control/matScan/regionSensitive",this);
-  regSenseCmd->SetGuidance("Set region sensitivity.");
-  regSenseCmd->SetGuidance("This command is automatically set to TRUE");
-  regSenseCmd->SetGuidance(" if /control/matScan/region command is issued.");
-  regSenseCmd->SetParameterName("senseFlag",true);
-  regSenseCmd->SetDefaultValue(false);
-
-  regionCmd = new G4UIcmdWithAString("/control/matScan/region",this);
-  regionCmd->SetGuidance("Define region name to be scanned.");
-  regionCmd->SetGuidance("/control/matScan/regionSensitive command is automatically");
-  regionCmd->SetGuidance("set to TRUE with this command.");
-  regionCmd->SetParameterName("region",true);
-  regionCmd->SetDefaultValue("DefaultRegionForTheWorld");
-}
-
-G4MatScanMessenger::~G4MatScanMessenger()
-{
-  delete scanCmd;
-  delete thetaCmd;
-  delete phiCmd;
-  delete singleCmd;
-  delete eyePosCmd;
-  delete regSenseCmd;
-  delete regionCmd;
-  delete msDirectory;
-}
-
-G4String G4MatScanMessenger::GetCurrentValue(G4UIcommand * command)
-{
-  G4String currentValue;
-  if(command==thetaCmd)
-  {
-   currentValue = thetaCmd->ConvertToString(theScanner->GetNTheta());
-   currentValue += " ";
-   currentValue += thetaCmd->ConvertToString((theScanner->GetThetaMin())/deg);
-   currentValue += " ";
-   currentValue += thetaCmd->ConvertToString((theScanner->GetThetaSpan())/deg);
-  }
-  else if(command==phiCmd)
-  {
-   currentValue = phiCmd->ConvertToString(theScanner->GetNPhi());
-   currentValue += " ";
-   currentValue += phiCmd->ConvertToString((theScanner->GetPhiMin())/deg);
-   currentValue += " ";
-   currentValue += phiCmd->ConvertToString((theScanner->GetPhiSpan())/deg);
-  }
-  else if(command==eyePosCmd)
-  { currentValue = eyePosCmd->ConvertToString(theScanner->GetEyePosition(),"m"); }
-  else if(command==regSenseCmd)
-  { currentValue = regSenseCmd->ConvertToString(theScanner->GetRegionSensitive()); }
-  else if(command==regionCmd)
-  { currentValue = theScanner->GetRegionName(); }
-  return currentValue;
-}
-
-void G4MatScanMessenger::SetNewValue(G4UIcommand * command,G4String newValue)
-{
-  if(command==scanCmd)
-  { theScanner->Scan(); }
-  else if(command==thetaCmd)
-  {
-    G4Tokenizer next( newValue );
-    G4int nbin = StoI(next());
-    G4double thetaMin = StoD(next());
-    G4double thetaSpan = StoD(next());
-    G4String unit = next();
-    thetaMin *= thetaCmd->ValueOf(unit);
-    thetaSpan *= thetaCmd->ValueOf(unit);
-    theScanner->SetNTheta(nbin);
-    theScanner->SetThetaMin(thetaMin);
-    theScanner->SetThetaSpan(thetaSpan);
-  }
-  else if(command==phiCmd)
-  {
-    G4Tokenizer next( newValue );
-    G4int nbin = StoI(next());
-    G4double phiMin = StoD(next());
-    G4double phiSpan = StoD(next());
-    G4String unit = next();
-    phiMin *= phiCmd->ValueOf(unit);
-    phiSpan *= phiCmd->ValueOf(unit);
-    theScanner->SetNPhi(nbin);
-    theScanner->SetPhiMin(phiMin);
-    theScanner->SetPhiSpan(phiSpan);
-  }
-  else if(command==eyePosCmd)
-  { theScanner->SetEyePosition(eyePosCmd->GetNew3VectorValue(newValue)); }
-  else if(command==regSenseCmd)
-  { theScanner->SetRegionSensitive(regSenseCmd->GetNewBoolValue(newValue)); }
-  else if(command==regionCmd)
-  { if(theScanner->SetRegionName(newValue)) theScanner->SetRegionSensitive(true); }
-  else if(command==singleCmd)
-  {
-    G4int ntheta = theScanner->GetNTheta();
-    G4double thetaMin = theScanner->GetThetaMin();
-    G4double thetaSpan = theScanner->GetThetaSpan();
-    G4int nphi = theScanner->GetNPhi();
-    G4double phiMin = theScanner->GetPhiMin();
-    G4double phiSpan = theScanner->GetPhiSpan();
-
-    G4Tokenizer next( newValue );
-    G4double theta = StoD(next());
-    G4double phi = StoD(next());
-    G4String unit = next();
-    theta *= singleCmd->ValueOf(unit);
-    phi *= singleCmd->ValueOf(unit);
-    theScanner->SetNTheta(1);
-    theScanner->SetThetaMin(theta);
-    theScanner->SetThetaSpan(0.);
-    theScanner->SetNPhi(1);
-    theScanner->SetPhiMin(phi);
-    theScanner->SetPhiSpan(0.);
-    theScanner->Scan();
-
-    theScanner->SetNTheta(ntheta);
-    theScanner->SetThetaMin(thetaMin);
-    theScanner->SetThetaSpan(thetaSpan);
-    theScanner->SetNPhi(nphi);
-    theScanner->SetPhiMin(phiMin);
-    theScanner->SetPhiSpan(phiSpan);
-  }
-
-}
-
-
- 
-
-

-// -// ******************************************************************** -// * DISCLAIMER * -// * * -// * The following disclaimer summarizes all the specific disclaimers * -// * of contributors to this software. The specific disclaimers,which * -// * govern, are listed with their locations in: * -// * http://cern.ch/geant4/license * -// * * -// * 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. * -// * * -// * This code implementation is the intellectual property of the * -// * GEANT4 collaboration. * -// * By copying, distributing or modifying the Program (or any work * -// * based on the Program) you indicate your acceptance of this * -// * statement, and all its terms. * -// ******************************************************************** -// -// -// $Id: G4MaterialScanner.cc,v 1.3 2006/05/08 20:08:30 jeremy Exp $ -// GEANT4 tag $Name: $ -// -// -// - - -#include "G4MaterialScanner.hh" -#include "G4EventManager.hh" -#include "G4MatScanMessenger.hh" -#include "G4RayShooter.hh" -#include "G4MSSteppingAction.hh" -#include "G4GeometryManager.hh" -#include "G4StateManager.hh" -#include "G4Event.hh" -#include "G4TransportationManager.hh" -#include "G4ProductionCutsTable.hh" -#include "G4Region.hh" -#include "G4RegionStore.hh" -#include "G4ProcessManager.hh" -#include "G4ProcessVector.hh" -#include "G4Geantino.hh" -#include "G4SDManager.hh" - - -G4MaterialScanner::G4MaterialScanner() -{ - theRayShooter = new G4RayShooter(); - theMessenger = new G4MatScanMessenger(this); - theEventManager = G4EventManager::GetEventManager(); - - theUserEventAction = 0; - theUserStackingAction = 0; - theUserTrackingAction = 0; - theUserSteppingAction = 0; - - theMatScannerEventAction = 0; - theMatScannerStackingAction = 0; - theMatScannerTrackingAction = 0; - theMatScannerSteppingAction = new G4MSSteppingAction(); - - eyePosition = G4ThreeVector(0.,0.,0.); - nTheta = 91; - thetaMin = 0.*deg; - thetaSpan = 90.*deg; - nPhi = 37; - phiMin = 0.*deg; - phiSpan = 360.*deg; - - regionSensitive = false; - regionName = "notDefined"; - theRegion = 0; -} - -G4MaterialScanner::~G4MaterialScanner() -{ - delete theRayShooter; - delete theMatScannerSteppingAction; - delete theMessenger; -} - -void G4MaterialScanner::Scan() -{ - G4StateManager* theStateMan = G4StateManager::GetStateManager(); - G4ApplicationState currentState = theStateMan->GetCurrentState(); - if(currentState!=G4State_Idle) - { - G4cerr << "Illegal application state - Scan() ignored." << G4endl; - return; - } - - StoreUserActions(); - DoScan(); - RestoreUserActions(); -} - -void G4MaterialScanner::StoreUserActions() -{ - theUserEventAction = theEventManager->GetUserEventAction(); - theUserStackingAction = theEventManager->GetUserStackingAction(); - theUserTrackingAction = theEventManager->GetUserTrackingAction(); - theUserSteppingAction = theEventManager->GetUserSteppingAction(); - - theEventManager->SetUserAction(theMatScannerEventAction); - theEventManager->SetUserAction(theMatScannerStackingAction); - theEventManager->SetUserAction(theMatScannerTrackingAction); - theEventManager->SetUserAction(theMatScannerSteppingAction); - - G4SDManager* theSDMan = G4SDManager::GetSDMpointerIfExist(); - if(theSDMan) - { theSDMan->Activate("/",false); } - - G4GeometryManager* theGeomMan = G4GeometryManager::GetInstance(); - theGeomMan->OpenGeometry(); - theGeomMan->CloseGeometry(true); -} - -void G4MaterialScanner::RestoreUserActions() -{ - theEventManager->SetUserAction(theUserEventAction); - theEventManager->SetUserAction(theUserStackingAction); - theEventManager->SetUserAction(theUserTrackingAction); - theEventManager->SetUserAction(theUserSteppingAction); - - G4SDManager* theSDMan = G4SDManager::GetSDMpointerIfExist(); - if(theSDMan) - { theSDMan->Activate("/",true); } -} - -void G4MaterialScanner::DoScan() -{ -// Confirm process(es) of Geantino is initialized - G4VPhysicalVolume* wv = G4TransportationManager::GetTransportationManager() - ->GetNavigatorForTracking()->GetWorldVolume(); - - G4RegionStore::GetInstance()->UpdateMaterialList(wv); - G4ProductionCutsTable::GetProductionCutsTable()->UpdateCoupleTable(wv); - G4ProcessVector* pVector - = G4Geantino::GeantinoDefinition()->GetProcessManager()->GetProcessList(); - for (G4int j=0; j < pVector->size(); ++j) { - (*pVector)[j]->BuildPhysicsTable(*(G4Geantino::GeantinoDefinition())); - } - -// Close geometry and set the application state - G4GeometryManager* geomManager = G4GeometryManager::GetInstance(); - geomManager->OpenGeometry(); - geomManager->CloseGeometry(1,0); - - G4ThreeVector center(0,0,0); - G4Navigator* navigator = - G4TransportationManager::GetTransportationManager()->GetNavigatorForTracking(); - navigator->LocateGlobalPointAndSetup(center,0,false); - - G4StateManager* theStateMan = G4StateManager::GetStateManager(); - theStateMan->SetNewState(G4State_GeomClosed); - -// Event loop - G4int iEvent = 0; - for(G4int iTheta=0;iTheta<nTheta;iTheta++) - { - G4double theta = thetaMin; - if(iTheta>0) theta += G4double(iTheta)*thetaSpan/G4double(nTheta-1); - G4double aveLength = 0.; - G4double aveX0 = 0.; - G4double aveLambda = 0.; - G4cout << G4endl; - G4cout << " Theta(deg) Phi(deg) Length(mm) x0 lambda0" << G4endl; - G4cout << G4endl; - for(G4int iPhi=0;iPhi<nPhi;iPhi++) - { - G4Event* anEvent = new G4Event(iEvent++); - G4double phi = phiMin; - if(iPhi>0) phi += G4double(iPhi)*phiSpan/G4double(nPhi-1); - eyeDirection = G4ThreeVector(std::cos(theta)*std::cos(phi), - std::cos(theta)*std::sin(phi), - std::sin(theta)); - theRayShooter->Shoot(anEvent,eyePosition,eyeDirection); - theMatScannerSteppingAction->Initialize(regionSensitive,theRegion); - theEventManager->ProcessOneEvent(anEvent); - G4double length = theMatScannerSteppingAction->GetTotalStepLength(); - G4double x0 = theMatScannerSteppingAction->GetX0(); - G4double lambda = theMatScannerSteppingAction->GetLambda0(); - - G4cout << " " - << std::setw(11) << theta/deg << " " - << std::setw(11) << phi/deg << " " - << std::setw(11) << length/mm << " " - << std::setw(11) << x0 << " " - << std::setw(11) << lambda << G4endl; - aveLength += length/mm; - aveX0 += x0; - aveLambda += lambda; - } - if(nPhi>1) - { - G4cout << G4endl; - G4cout << " ave. for theta = " << std::setw(11) << theta/deg << " : " - << std::setw(11) << aveLength/nPhi << " " - << std::setw(11) << aveX0/nPhi << " " - << std::setw(11) << aveLambda/nPhi << G4endl; - } - } - - theStateMan->SetNewState(G4State_Idle); - return; -} - -G4bool G4MaterialScanner::SetRegionName(const G4String& val) -{ - G4Region* aRegion = G4RegionStore::GetInstance()->GetRegion(val); - if(aRegion) - { - theRegion = aRegion; - regionName = val; - return true; - } - else - { - G4cerr << "Region <" << val << "> not found. Command ignored." << G4endl; - G4cerr << "Defined regions are : " << G4endl; - for(size_t i=0;i<G4RegionStore::GetInstance()->size();i++) - { G4cerr << " " << (*(G4RegionStore::GetInstance()))[i]->GetName(); } - G4cerr << G4endl; - return false; - } -}

Commit in `slic` on MAIN
`include/SteppingAction.hh`	+1	-3	1.10 -> 1.11
`/G4MSSteppingAction.hh`		-67	1.3 removed
`/G4MatScanMessenger.hh`		-70	1.3 removed
`/G4MaterialScanner.hh`		-124	1.3 removed
`src/RunManager.cc`	+1	-4	1.13 -> 1.14
`/SteppingAction.cc`	+2	-7	1.11 -> 1.12
`/G4MSSteppingAction.cc`		-69	1.3 removed
`/G4MatScanMessenger.cc`		-243	1.3 removed
`/G4MaterialScanner.cc`		-229	1.3 removed
	+4	-816