Import Geant4 10.6.0 source tree

examples/extended/optical/OpNovice2/include/DetectorConstruction.hh

@@ -67,7 +67,7 @@ class DetectorConstruction : public G4VUserDetectorConstruction
       fSurface->SetType(type);
       G4RunManager::GetRunManager()->GeometryHasBeenModified();
     }
-    
+
     void SetSurfaceModel(const G4OpticalSurfaceModel model) {
       fSurface->SetModel(model);
       G4RunManager::GetRunManager()->GeometryHasBeenModified();
@@ -76,18 +76,20 @@ class DetectorConstruction : public G4VUserDetectorConstruction
       {return fSurface->GetModel();}
 
     void SetSurfaceSigmaAlpha(G4double v);
+    void SetSurfacePolish(G4double v);
 
     void AddTankMPV(const char* c, G4MaterialPropertyVector* mpv);
-    void AddTankMPCV(const char* c, G4double v);
+    void AddTankMPC(const char* c, G4double v);
     G4MaterialPropertiesTable* GetTankMaterialPropertiesTable() 
       {return fTankMPT;}
 
     void AddWorldMPV(const char* c, G4MaterialPropertyVector* mpv);
-    void AddWorldMPCV(const char* c, G4double v);
+    void AddWorldMPC(const char* c, G4double v);
     G4MaterialPropertiesTable* GetWorldMaterialPropertiesTable() 
       {return fWorldMPT;}
 
     void AddSurfaceMPV(const char* c, G4MaterialPropertyVector* mpv);
+    void AddSurfaceMPC(const char* c, G4double v);
     G4MaterialPropertiesTable* GetSurfaceMaterialPropertiesTable() 
       {return fSurfaceMPT;}
 

examples/extended/optical/OpNovice2/include/DetectorMessenger.hh

@@ -50,33 +50,35 @@ class G4UIcmdWithoutParameter;
 class DetectorMessenger: public G4UImessenger
 {
   public:
-  
+
     DetectorMessenger(DetectorConstruction* );
    ~DetectorMessenger();
-    
+
     virtual void SetNewValue(G4UIcommand*, G4String);
 
   private:
-  
+
     DetectorConstruction*      fDetector;
-      
+
     G4UIdirectory*             fOpticalDir;
-   
+
     // the surface
     G4UIcmdWithAString*        fSurfaceTypeCmd;
     G4UIcmdWithAString*        fSurfaceFinishCmd;
     G4UIcmdWithAString*        fSurfaceModelCmd;
     G4UIcmdWithADouble*        fSurfaceSigmaAlphaCmd;
+    G4UIcmdWithADouble*        fSurfacePolishCmd;
     G4UIcmdWithAString*        fSurfaceMatPropVectorCmd;
+    G4UIcmdWithAString*        fSurfaceMatPropConstCmd;
 
-    // the box 
+    // the box
     G4UIcmdWithAString*        fTankMatPropVectorCmd;
-    G4UIcmdWithAString*        fTankMatConstPropVectorCmd;
+    G4UIcmdWithAString*        fTankMatPropConstCmd;
     G4UIcmdWithAString*        fTankMaterialCmd;
 
     // the world
     G4UIcmdWithAString*        fWorldMatPropVectorCmd;
-    G4UIcmdWithAString*        fWorldMatConstPropVectorCmd;
+    G4UIcmdWithAString*        fWorldMatPropConstCmd;
     G4UIcmdWithAString*        fWorldMaterialCmd;
 
 };