Geant4 Cross Reference

Cross-Referencing   Geant4
Geant4/examples/extended/electromagnetic/TestEm6/src/DetectorMessenger.cc

Version: [ ReleaseNotes ] [ 1.0 ] [ 1.1 ] [ 2.0 ] [ 3.0 ] [ 3.1 ] [ 3.2 ] [ 4.0 ] [ 4.0.p1 ] [ 4.0.p2 ] [ 4.1 ] [ 4.1.p1 ] [ 5.0 ] [ 5.0.p1 ] [ 5.1 ] [ 5.1.p1 ] [ 5.2 ] [ 5.2.p1 ] [ 5.2.p2 ] [ 6.0 ] [ 6.0.p1 ] [ 6.1 ] [ 6.2 ] [ 6.2.p1 ] [ 6.2.p2 ] [ 7.0 ] [ 7.0.p1 ] [ 7.1 ] [ 7.1.p1 ] [ 8.0 ] [ 8.0.p1 ] [ 8.1 ] [ 8.1.p1 ] [ 8.1.p2 ] [ 8.2 ] [ 8.2.p1 ] [ 8.3 ] [ 8.3.p1 ] [ 8.3.p2 ] [ 9.0 ] [ 9.0.p1 ] [ 9.0.p2 ] [ 9.1 ] [ 9.1.p1 ] [ 9.1.p2 ] [ 9.1.p3 ] [ 9.2 ] [ 9.2.p1 ] [ 9.2.p2 ] [ 9.2.p3 ] [ 9.2.p4 ] [ 9.3 ] [ 9.3.p1 ] [ 9.3.p2 ] [ 9.4 ] [ 9.4.p1 ] [ 9.4.p2 ] [ 9.4.p3 ] [ 9.4.p4 ] [ 9.5 ] [ 9.5.p1 ] [ 9.5.p2 ] [ 9.6 ] [ 9.6.p1 ] [ 9.6.p2 ] [ 9.6.p3 ] [ 9.6.p4 ] [ 10.0 ] [ 10.0.p1 ] [ 10.0.p2 ] [ 10.0.p3 ] [ 10.0.p4 ] [ 10.1 ] [ 10.1.p1 ] [ 10.1.p2 ] [ 10.1.p3 ] [ 10.2 ] [ 10.2.p1 ] [ 10.2.p2 ] [ 10.2.p3 ] [ 10.3 ] [ 10.3.p1 ] [ 10.3.p2 ] [ 10.3.p3 ] [ 10.4 ] [ 10.4.p1 ] [ 10.4.p2 ] [ 10.4.p3 ] [ 10.5 ] [ 10.5.p1 ] [ 10.6 ] [ 10.6.p1 ] [ 10.6.p2 ] [ 10.6.p3 ] [ 10.7 ] [ 10.7.p1 ] [ 10.7.p2 ] [ 10.7.p3 ] [ 10.7.p4 ] [ 11.0 ] [ 11.0.p1 ] [ 11.0.p2 ] [ 11.0.p3, ] [ 11.0.p4 ] [ 11.1 ] [ 11.1.1 ] [ 11.1.2 ] [ 11.1.3 ] [ 11.2 ] [ 11.2.1 ] [ 11.2.2 ] [ 11.3.0 ]

Diff markup

Differences between /examples/extended/electromagnetic/TestEm6/src/DetectorMessenger.cc (Version 11.3.0) and /examples/extended/electromagnetic/TestEm6/src/DetectorMessenger.cc (Version 9.6)


  1 //                                                  1 //
  2 // *******************************************      2 // ********************************************************************
  3 // * License and Disclaimer                         3 // * License and Disclaimer                                           *
  4 // *                                                4 // *                                                                  *
  5 // * The  Geant4 software  is  copyright of th      5 // * The  Geant4 software  is  copyright of the Copyright Holders  of *
  6 // * the Geant4 Collaboration.  It is provided      6 // * the Geant4 Collaboration.  It is provided  under  the terms  and *
  7 // * conditions of the Geant4 Software License      7 // * conditions of the Geant4 Software License,  included in the file *
  8 // * LICENSE and available at  http://cern.ch/      8 // * LICENSE and available at  http://cern.ch/geant4/license .  These *
  9 // * include a list of copyright holders.           9 // * include a list of copyright holders.                             *
 10 // *                                               10 // *                                                                  *
 11 // * Neither the authors of this software syst     11 // * Neither the authors of this software system, nor their employing *
 12 // * institutes,nor the agencies providing fin     12 // * institutes,nor the agencies providing financial support for this *
 13 // * work  make  any representation or  warran     13 // * work  make  any representation or  warranty, express or implied, *
 14 // * regarding  this  software system or assum     14 // * regarding  this  software system or assume any liability for its *
 15 // * use.  Please see the license in the file      15 // * use.  Please see the license in the file  LICENSE  and URL above *
 16 // * for the full disclaimer and the limitatio     16 // * for the full disclaimer and the limitation of liability.         *
 17 // *                                               17 // *                                                                  *
 18 // * This  code  implementation is the result      18 // * This  code  implementation is the result of  the  scientific and *
 19 // * technical work of the GEANT4 collaboratio     19 // * technical work of the GEANT4 collaboration.                      *
 20 // * By using,  copying,  modifying or  distri     20 // * By using,  copying,  modifying or  distributing the software (or *
 21 // * any work based  on the software)  you  ag     21 // * any work based  on the software)  you  agree  to acknowledge its *
 22 // * use  in  resulting  scientific  publicati     22 // * use  in  resulting  scientific  publications,  and indicate your *
 23 // * acceptance of all terms of the Geant4 Sof     23 // * acceptance of all terms of the Geant4 Software license.          *
 24 // *******************************************     24 // ********************************************************************
 25 //                                                 25 //
 26 /// \file electromagnetic/TestEm6/src/Detector     26 /// \file electromagnetic/TestEm6/src/DetectorMessenger.cc
 27 /// \brief Implementation of the DetectorMesse     27 /// \brief Implementation of the DetectorMessenger class
 28 //                                                 28 //
                                                   >>  29 // $Id$
 29 //                                                 30 //
 30 //....oooOO0OOooo........oooOO0OOooo........oo     31 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 31 //....oooOO0OOooo........oooOO0OOooo........oo     32 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 32                                                    33 
 33 #include "DetectorMessenger.hh"                    34 #include "DetectorMessenger.hh"
 34                                                    35 
 35 #include "DetectorConstruction.hh"                 36 #include "DetectorConstruction.hh"
 36                                                <<  37 #include "G4UIdirectory.hh"
 37 #include "G4UIcmdWithADoubleAndUnit.hh"        << 
 38 #include "G4UIcmdWithAString.hh"                   38 #include "G4UIcmdWithAString.hh"
                                                   >>  39 #include "G4UIcmdWithADoubleAndUnit.hh"
 39 #include "G4UIcmdWithoutParameter.hh"              40 #include "G4UIcmdWithoutParameter.hh"
 40 #include "G4UIdirectory.hh"                    << 
 41                                                    41 
 42 //....oooOO0OOooo........oooOO0OOooo........oo     42 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 43                                                    43 
 44 DetectorMessenger::DetectorMessenger(DetectorC <<  44 DetectorMessenger::DetectorMessenger(DetectorConstruction * Det)
 45   : G4UImessenger(),                           <<  45 :fDetector(Det)
 46     fDetector(Det),                            <<  46 { 
 47     fTestemDir(0),                             << 
 48     fDetDir(0),                                << 
 49     fMaterCmd(0),                              << 
 50     fSizeCmd(0),                               << 
 51     fMagFieldCmd(0),                           << 
 52     fMaxStepCmd(0),                            << 
 53     fUpdateCmd(0)                              << 
 54 {                                              << 
 55   fTestemDir = new G4UIdirectory("/testem/");      47   fTestemDir = new G4UIdirectory("/testem/");
 56   fTestemDir->SetGuidance(" detector control."     48   fTestemDir->SetGuidance(" detector control.");
 57                                                <<  49   
 58   fDetDir = new G4UIdirectory("/testem/det/");     50   fDetDir = new G4UIdirectory("/testem/det/");
 59   fDetDir->SetGuidance("detector construction      51   fDetDir->SetGuidance("detector construction commands");
 60                                                <<  52        
 61   fMaterCmd = new G4UIcmdWithAString("/testem/ <<  53   fMaterCmd = new G4UIcmdWithAString("/testem/det/setMat",this);
 62   fMaterCmd->SetGuidance("Select material of t     54   fMaterCmd->SetGuidance("Select material of the box.");
 63   fMaterCmd->SetParameterName("choice", false) <<  55   fMaterCmd->SetParameterName("choice",false);
 64   fMaterCmd->AvailableForStates(G4State_PreIni <<  56   fMaterCmd->AvailableForStates(G4State_PreInit,G4State_Idle);
 65                                                <<  57   
 66   fSizeCmd = new G4UIcmdWithADoubleAndUnit("/t <<  58   fSizeCmd = new G4UIcmdWithADoubleAndUnit("/testem/det/setSize",this);
 67   fSizeCmd->SetGuidance("Set size of the box")     59   fSizeCmd->SetGuidance("Set size of the box");
 68   fSizeCmd->SetParameterName("Size", false);   <<  60   fSizeCmd->SetParameterName("Size",false);
 69   fSizeCmd->SetRange("Size>0.");                   61   fSizeCmd->SetRange("Size>0.");
 70   fSizeCmd->SetUnitCategory("Length");             62   fSizeCmd->SetUnitCategory("Length");
 71   fSizeCmd->AvailableForStates(G4State_PreInit <<  63   fSizeCmd->AvailableForStates(G4State_PreInit,G4State_Idle);
 72                                                <<  64       
 73   fMagFieldCmd = new G4UIcmdWithADoubleAndUnit <<  65   fMagFieldCmd = new G4UIcmdWithADoubleAndUnit("/testem/det/setField",this);  
 74   fMagFieldCmd->SetGuidance("Define magnetic f     66   fMagFieldCmd->SetGuidance("Define magnetic field.");
 75   fMagFieldCmd->SetGuidance("Magnetic field wi     67   fMagFieldCmd->SetGuidance("Magnetic field will be in Z direction.");
 76   fMagFieldCmd->SetParameterName("Bz", false); <<  68   fMagFieldCmd->SetParameterName("Bz",false);
 77   fMagFieldCmd->SetUnitCategory("Magnetic flux     69   fMagFieldCmd->SetUnitCategory("Magnetic flux density");
 78   fMagFieldCmd->AvailableForStates(G4State_Pre <<  70   fMagFieldCmd->AvailableForStates(G4State_PreInit,G4State_Idle);
 79                                                <<  71     
 80   fUpdateCmd = new G4UIcmdWithoutParameter("/t <<  72   fUpdateCmd = new G4UIcmdWithoutParameter("/testem/det/update",this);
 81   fUpdateCmd->SetGuidance("Update calorimeter      73   fUpdateCmd->SetGuidance("Update calorimeter geometry.");
 82   fUpdateCmd->SetGuidance("This command MUST b     74   fUpdateCmd->SetGuidance("This command MUST be applied before \"beamOn\" ");
 83   fUpdateCmd->SetGuidance("if you changed geom     75   fUpdateCmd->SetGuidance("if you changed geometrical value(s).");
 84   fUpdateCmd->AvailableForStates(G4State_Idle)     76   fUpdateCmd->AvailableForStates(G4State_Idle);
 85                                                <<  77       
 86   fMaxStepCmd = new G4UIcmdWithADoubleAndUnit( <<  78   fMaxStepCmd = new G4UIcmdWithADoubleAndUnit("/testem/tracking/stepMax",this);
 87   fMaxStepCmd->SetGuidance("Set max allowed st     79   fMaxStepCmd->SetGuidance("Set max allowed step size");
 88   fMaxStepCmd->SetParameterName("Size", false) <<  80   fMaxStepCmd->SetParameterName("Size",false);
 89   fMaxStepCmd->SetRange("Size>0.");                81   fMaxStepCmd->SetRange("Size>0.");
 90   fMaxStepCmd->SetUnitCategory("Length");          82   fMaxStepCmd->SetUnitCategory("Length");
 91   fMaxStepCmd->AvailableForStates(G4State_Idle <<  83   fMaxStepCmd->AvailableForStates(G4State_Idle);   
 92 }                                                  84 }
 93                                                    85 
 94 //....oooOO0OOooo........oooOO0OOooo........oo     86 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 95                                                    87 
 96 DetectorMessenger::~DetectorMessenger()            88 DetectorMessenger::~DetectorMessenger()
 97 {                                                  89 {
 98   delete fMaterCmd;                                90   delete fMaterCmd;
 99   delete fSizeCmd;                             <<  91   delete fSizeCmd; 
100   delete fMagFieldCmd;                             92   delete fMagFieldCmd;
101   delete fUpdateCmd;                               93   delete fUpdateCmd;
102   delete fMaxStepCmd;                              94   delete fMaxStepCmd;
103   delete fDetDir;                              <<  95   delete fDetDir;  
104   delete fTestemDir;                               96   delete fTestemDir;
105 }                                                  97 }
106                                                    98 
107 //....oooOO0OOooo........oooOO0OOooo........oo     99 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
108                                                   100 
109 void DetectorMessenger::SetNewValue(G4UIcomman << 101 void DetectorMessenger::SetNewValue(G4UIcommand* command,G4String newValue)
110 {                                              << 102 { 
111   if (command == fMaterCmd) {                  << 103   if( command == fMaterCmd )
112     fDetector->SetMaterial(newValue);          << 104    { fDetector->SetMaterial(newValue);}
113   }                                            << 105    
114                                                << 106   if( command == fSizeCmd )
115   if (command == fSizeCmd) {                   << 107    { fDetector->SetSize(fSizeCmd->GetNewDoubleValue(newValue));}
116     fDetector->SetSize(fSizeCmd->GetNewDoubleV << 108    
117   }                                            << 109   if( command == fMagFieldCmd )
118                                                << 110    { fDetector->SetMagField(fMagFieldCmd->GetNewDoubleValue(newValue));}
119   if (command == fMagFieldCmd) {               << 111      
120     fDetector->SetMagField(fMagFieldCmd->GetNe << 112   if( command == fUpdateCmd )
121   }                                            << 113    { fDetector->UpdateGeometry(); }
122                                                << 114    
123   if (command == fUpdateCmd) {                 << 115   if( command == fMaxStepCmd )
124     fDetector->UpdateGeometry();               << 116    { fDetector->SetMaxStepSize(fMaxStepCmd->GetNewDoubleValue(newValue));}   
125   }                                            << 
126                                                << 
127   if (command == fMaxStepCmd) {                << 
128     fDetector->SetMaxStepSize(fMaxStepCmd->Get << 
129   }                                            << 
130 }                                                 117 }
131                                                   118 
132 //....oooOO0OOooo........oooOO0OOooo........oo    119 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
133                                                   120