Import Geant4 10.7.0.beta source tree

source/visualization/modeling/CMakeLists.txt

@@ -1,19 +1,6 @@
 #------------------------------------------------------------------------------
-# CMakeLists.txt
 # Module : G4modeling
 # Package: Geant4.src.G4visualization.G4modeling
-#
-# CMakeLists.txt for single level library that may be build global or granular
-#
-# Generated on : 24/9/2010
-#
-#
 #------------------------------------------------------------------------------
 
-include(Geant4MacroLibraryTargets)
-if(GEANT4_BUILD_GRANULAR_LIBS)
-    GEANT4_GRANULAR_LIBRARY_TARGET(COMPONENT sources.cmake)
-else()
-    GEANT4_GLOBAL_LIBRARY_TARGET(COMPONENTS sources.cmake)
-endif()
-
+geant4_global_library_target(COMPONENTS sources.cmake)

source/visualization/modeling/History

@@ -19,6 +19,19 @@ committal in the CVS repository !
 History file for visualization/modeling
 ---------------------------------------
 
+07 April 2020. John Allison  (modeling-V10-06-02)
+* G4BoundingExtentScene.cc:
+  * Minor tidy: Use G4VisExtent::GetNullExtent (rather than
+    default constructor).
+
+04 March 2020. John Allison  (modeling-V10-06-01)
+- G4AttributeFilterT.hh:
+  o Suppress warnings while filter not fully established.
+
+12 December 2019 B. Morgan (modeling-V10-06-00)
+- Cleanup CMake build, removing obsolete granular library option and
+  explicit include_directories.
+
 19 November 2019 Gabriele Cosmo (modeling-V10-05-11)
 - Fixed more cases of implicit type conversions.
 

source/visualization/modeling/include/G4AttributeFilterT.hh

@@ -77,7 +77,6 @@ private:
 
   // Caching
   mutable G4bool fFirst;
-  mutable G4bool fWarnedMissingAttribute;
   mutable G4VAttValueFilter* filter;
 
 };
@@ -87,7 +86,6 @@ G4AttributeFilterT<T>::G4AttributeFilterT(const G4String& name)
   :G4SmartFilter<T>(name)
   ,fAttName("")
   ,fFirst(true)
-  ,fWarnedMissingAttribute(false)
   ,filter(0)
 {}
 
@@ -101,17 +99,12 @@ template <typename T>
 G4bool
 G4AttributeFilterT<T>::Evaluate(const T& object) const
 {
-  // Return false if attribute name has not been set. Just print one warning.
-  if (fAttName.isNull()) {
-
-    if (!fWarnedMissingAttribute) {
-      G4Exception("G4AttributeFilterT::Evaluate", "modeling0101", JustWarning, "Null attribute name");
-      fWarnedMissingAttribute = true;
-    }
-    
-    return false;
-  }
+  // Return true (i.e., do not filter out) if attribute name has not yet been set.
+  if (fAttName.isNull()) return true;
   
+  // ...or required attribute value has not yet been set
+  if (fConfigVect.size() == 0) return true;
+
   if (fFirst) {
 
     fFirst = false;
@@ -124,11 +117,11 @@ G4AttributeFilterT<T>::Evaluate(const T& object) const
       static G4bool warnedUnableToExtract = false;
       if (!warnedUnableToExtract) {
 	G4ExceptionDescription ed;
-	ed <<"Unable to extract attribute definition named "<<fAttName;
+	ed <<"Unable to extract attribute definition named "<<fAttName<<' ';
 	G4Exception
 	  ("G4AttributeFilterT::Evaluate", "modeling0102", JustWarning, ed, "Invalid attribute definition");
-	G4cout << "Available attributes:\n"
-	       << object.GetAttDefs();
+	G4cerr << "Available attributes:\n"
+	       << *object.GetAttDefs();
 	warnedUnableToExtract = true;
       }
       return false;
@@ -155,11 +148,11 @@ G4AttributeFilterT<T>::Evaluate(const T& object) const
     static G4bool warnedUnableToExtract = false;
     if (!warnedUnableToExtract) {
       G4ExceptionDescription ed;
-      ed <<"Unable to extract attribute value named "<<fAttName;
+      ed <<"Unable to extract attribute value named "<<fAttName<<' ';
       G4Exception
 	("G4AttributeFilterT::Evaluate", "modeling0103", JustWarning, ed, "InvalidAttributeValue");
-      G4cout << "Available attributes:\n"
-	     << object.GetAttDefs();
+      G4cerr << "Available attributes:\n"
+	     << *object.GetAttDefs();
       warnedUnableToExtract = true;
     }
     return false;

source/visualization/modeling/include/G4ModelCommandsT.hh

@@ -841,7 +841,6 @@ protected:
 
   virtual void Apply(const G4String& param) {
     G4VModelCommand<M>::Model()->AddValue(param);
-
   }
 };
 

source/visualization/modeling/sources.cmake

@@ -1,192 +1,148 @@
 #------------------------------------------------------------------------------
-# sources.cmake
 # Module : G4modeling
 # Package: Geant4.src.G4visualization.G4modeling
-#
-# Sources description for a library.
-# Lists the sources and headers of the code explicitely.
-# Lists include paths needed.
-# Lists the internal granular and global dependencies of the library.
-# Source specific properties should be added at the end.
-#
-# Generated on : 24/9/2010
-#
-#
 #------------------------------------------------------------------------------
 
-# List external includes needed.
-include_directories(${CLHEP_INCLUDE_DIRS})
-include_directories(${USOLIDS_INCLUDE_DIRS})
-
-# List internal includes needed.
-include_directories(${CMAKE_SOURCE_DIR}/source/digits_hits/detector/include)
-include_directories(${CMAKE_SOURCE_DIR}/source/digits_hits/digits/include)
-include_directories(${CMAKE_SOURCE_DIR}/source/digits_hits/hits/include)
-include_directories(${CMAKE_SOURCE_DIR}/source/digits_hits/utils/include)
-include_directories(${CMAKE_SOURCE_DIR}/source/event/include)
-include_directories(${CMAKE_SOURCE_DIR}/source/run/include)
-include_directories(${CMAKE_SOURCE_DIR}/source/geometry/management/include)
-include_directories(${CMAKE_SOURCE_DIR}/source/geometry/navigation/include)
-include_directories(${CMAKE_SOURCE_DIR}/source/geometry/magneticfield/include)
-include_directories(${CMAKE_SOURCE_DIR}/source/geometry/solids/Boolean/include)
-include_directories(${CMAKE_SOURCE_DIR}/source/geometry/solids/CSG/include)
-include_directories(${CMAKE_SOURCE_DIR}/source/geometry/solids/specific/include)
-include_directories(${CMAKE_SOURCE_DIR}/source/geometry/volumes/include)
-include_directories(${CMAKE_SOURCE_DIR}/source/global/HEPGeometry/include)
-include_directories(${CMAKE_SOURCE_DIR}/source/global/HEPRandom/include)
-include_directories(${CMAKE_SOURCE_DIR}/source/global/HEPNumerics/include)
-include_directories(${CMAKE_SOURCE_DIR}/source/global/management/include)
-include_directories(${CMAKE_SOURCE_DIR}/source/graphics_reps/include)
-include_directories(${CMAKE_SOURCE_DIR}/source/intercoms/include)
-include_directories(${CMAKE_SOURCE_DIR}/source/materials/include)
-include_directories(${CMAKE_SOURCE_DIR}/source/particles/management/include)
-include_directories(${CMAKE_SOURCE_DIR}/source/processes/management/include)
-include_directories(${CMAKE_SOURCE_DIR}/source/track/include)
-include_directories(${CMAKE_SOURCE_DIR}/source/tracking/include)
-
 #
 # Define the Geant4 Module.
 #
-include(Geant4MacroDefineModule)
-GEANT4_DEFINE_MODULE(NAME G4modeling
-    HEADERS
-        G4ArrowModel.hh
-        G4AttFilterUtils.hh
-        G4AttValueFilterT.hh
-        G4AttributeFilterT.hh
-        G4AxesModel.hh
-        G4BoundingExtentScene.hh
-        G4BoundingSphereScene.hh
-        G4CallbackModel.hh
-        G4DigiFilterFactories.hh
-        G4DigiModel.hh
-        G4ElectricFieldModel.hh
-        G4GPSModel.hh
-        G4HitFilterFactories.hh
-        G4HitsModel.hh
-        G4LogicalVolumeModel.hh
-        G4MagneticFieldModel.hh
-        G4ModelApplyCommandsT.hh
-        G4ModelColourMap.hh
-        G4ModelCommandUtils.hh
-        G4ModelCommandsT.hh
-        G4ModelCompoundCommandsT.hh
-        G4ModelingParameters.hh
-        G4ModelingParameters.icc
-        G4NullModel.hh
-        G4PSHitsModel.hh
-        G4PhysicalVolumeMassScene.hh
-        G4PhysicalVolumeModel.hh
-        G4PhysicalVolumeSearchScene.hh
-        G4PhysicalVolumesSearchScene.hh
-        G4PseudoScene.hh
-        G4ScaleModel.hh
-        G4TextModel.hh
-        G4TouchablePropertiesScene.hh
-        G4TouchableUtils.hh
-        G4TrajectoriesModel.hh
-        G4TrajectoryChargeFilter.hh
-        G4TrajectoryDrawByAttribute.hh
-        G4TrajectoryDrawByCharge.hh
-        G4TrajectoryDrawByOriginVolume.hh
-        G4TrajectoryDrawByParticleID.hh
-        G4TrajectoryDrawByEncounteredVolume.hh
-        G4TrajectoryDrawerUtils.hh
-        G4TrajectoryFilterFactories.hh
-        G4TrajectoryGenericDrawer.hh
-        G4TrajectoryModelFactories.hh
-        G4TrajectoryOriginVolumeFilter.hh
-        G4TrajectoryParticleFilter.hh
-        G4TrajectoryEncounteredVolumeFilter.hh
-        G4VAttValueFilter.hh
-        G4VFieldModel.hh
-        G4VModel.hh
-        G4VModel.icc
-        G4VModelCommand.hh
-        G4VModelFactory.hh
-        G4VTrajectoryModel.hh
-        G4VisTrajContext.hh
-        G4VisTrajContext.icc
-    SOURCES
-        G4ArrowModel.cc
-        G4AttFilterUtils.cc
-        G4AxesModel.cc
-        G4BoundingExtentScene.cc
-        G4BoundingSphereScene.cc
-        G4DigiFilterFactories.cc
-        G4DigiModel.cc
-        G4ElectricFieldModel.cc
-        G4GPSModel.cc
-        G4HitFilterFactories.cc
-        G4HitsModel.cc
-        G4LogicalVolumeModel.cc
-        G4MagneticFieldModel.cc
-        G4ModelingParameters.cc
-        G4NullModel.cc
-        G4PSHitsModel.cc
-        G4PhysicalVolumeMassScene.cc
-        G4PhysicalVolumeModel.cc
-        G4PhysicalVolumeSearchScene.cc
-        G4PhysicalVolumesSearchScene.cc
-        G4ScaleModel.cc
-        G4TextModel.cc
-        G4TouchablePropertiesScene.cc
-        G4TouchableUtils.cc
-        G4TrajectoriesModel.cc
-        G4TrajectoryChargeFilter.cc
-        G4TrajectoryDrawByAttribute.cc
-        G4TrajectoryDrawByCharge.cc
-        G4TrajectoryDrawByOriginVolume.cc
-        G4TrajectoryDrawByParticleID.cc
-        G4TrajectoryDrawByEncounteredVolume.cc
-        G4TrajectoryDrawerUtils.cc
-        G4TrajectoryFilterFactories.cc
-        G4TrajectoryGenericDrawer.cc
-        G4TrajectoryModelFactories.cc
-        G4TrajectoryOriginVolumeFilter.cc
-        G4TrajectoryParticleFilter.cc
-        G4TrajectoryEncounteredVolumeFilter.cc
-        G4VFieldModel.cc
-        G4VModel.cc
-        G4VTrajectoryModel.cc
-        G4VisTrajContext.cc
-    GRANULAR_DEPENDENCIES
-        G4csg
-        G4detector
-        G4detutils
-        G4digits
-        G4run
-        G4event
-        G4geomBoolean
-        G4geometrymng
-        G4globman
-        G4graphics_reps
-        G4hepnumerics
-        G4hits
-        G4intercoms
-        G4materials
-        G4navigation
-        G4partman
-        G4procman
-        G4specsolids
-        G4track
-        G4tracking
-        G4volumes
-    GLOBAL_DEPENDENCIES
-        G4digits_hits
-        G4run
-        G4event
-        G4geometry
-        G4global
-        G4graphics_reps
-        G4intercoms
-        G4materials
-        G4particles
-        G4processes
-        G4track
-        G4tracking
-    LINK_LIBRARIES
+geant4_define_module(NAME G4modeling
+  HEADERS
+    G4ArrowModel.hh
+    G4AttFilterUtils.hh
+    G4AttValueFilterT.hh
+    G4AttributeFilterT.hh
+    G4AxesModel.hh
+    G4BoundingExtentScene.hh
+    G4BoundingSphereScene.hh
+    G4CallbackModel.hh
+    G4DigiFilterFactories.hh
+    G4DigiModel.hh
+    G4ElectricFieldModel.hh
+    G4GPSModel.hh
+    G4HitFilterFactories.hh
+    G4HitsModel.hh
+    G4LogicalVolumeModel.hh
+    G4MagneticFieldModel.hh
+    G4ModelApplyCommandsT.hh
+    G4ModelColourMap.hh
+    G4ModelCommandUtils.hh
+    G4ModelCommandsT.hh
+    G4ModelCompoundCommandsT.hh
+    G4ModelingParameters.hh
+    G4ModelingParameters.icc
+    G4NullModel.hh
+    G4PSHitsModel.hh
+    G4PhysicalVolumeMassScene.hh
+    G4PhysicalVolumeModel.hh
+    G4PhysicalVolumeSearchScene.hh
+    G4PhysicalVolumesSearchScene.hh
+    G4PseudoScene.hh
+    G4ScaleModel.hh
+    G4TextModel.hh
+    G4TouchablePropertiesScene.hh
+    G4TouchableUtils.hh
+    G4TrajectoriesModel.hh
+    G4TrajectoryChargeFilter.hh
+    G4TrajectoryDrawByAttribute.hh
+    G4TrajectoryDrawByCharge.hh
+    G4TrajectoryDrawByOriginVolume.hh
+    G4TrajectoryDrawByParticleID.hh
+    G4TrajectoryDrawByEncounteredVolume.hh
+    G4TrajectoryDrawerUtils.hh
+    G4TrajectoryFilterFactories.hh
+    G4TrajectoryGenericDrawer.hh
+    G4TrajectoryModelFactories.hh
+    G4TrajectoryOriginVolumeFilter.hh
+    G4TrajectoryParticleFilter.hh
+    G4TrajectoryEncounteredVolumeFilter.hh
+    G4VAttValueFilter.hh
+    G4VFieldModel.hh
+    G4VModel.hh
+    G4VModel.icc
+    G4VModelCommand.hh
+    G4VModelFactory.hh
+    G4VTrajectoryModel.hh
+    G4VisTrajContext.hh
+    G4VisTrajContext.icc
+  SOURCES
+    G4ArrowModel.cc
+    G4AttFilterUtils.cc
+    G4AxesModel.cc
+    G4BoundingExtentScene.cc
+    G4BoundingSphereScene.cc
+    G4DigiFilterFactories.cc
+    G4DigiModel.cc
+    G4ElectricFieldModel.cc
+    G4GPSModel.cc
+    G4HitFilterFactories.cc
+    G4HitsModel.cc
+    G4LogicalVolumeModel.cc
+    G4MagneticFieldModel.cc
+    G4ModelingParameters.cc
+    G4NullModel.cc
+    G4PSHitsModel.cc
+    G4PhysicalVolumeMassScene.cc
+    G4PhysicalVolumeModel.cc
+    G4PhysicalVolumeSearchScene.cc
+    G4PhysicalVolumesSearchScene.cc
+    G4ScaleModel.cc
+    G4TextModel.cc
+    G4TouchablePropertiesScene.cc
+    G4TouchableUtils.cc
+    G4TrajectoriesModel.cc
+    G4TrajectoryChargeFilter.cc
+    G4TrajectoryDrawByAttribute.cc
+    G4TrajectoryDrawByCharge.cc
+    G4TrajectoryDrawByOriginVolume.cc
+    G4TrajectoryDrawByParticleID.cc
+    G4TrajectoryDrawByEncounteredVolume.cc
+    G4TrajectoryDrawerUtils.cc
+    G4TrajectoryFilterFactories.cc
+    G4TrajectoryGenericDrawer.cc
+    G4TrajectoryModelFactories.cc
+    G4TrajectoryOriginVolumeFilter.cc
+    G4TrajectoryParticleFilter.cc
+    G4TrajectoryEncounteredVolumeFilter.cc
+    G4VFieldModel.cc
+    G4VModel.cc
+    G4VTrajectoryModel.cc
+    G4VisTrajContext.cc
+  GRANULAR_DEPENDENCIES
+    G4csg
+    G4detector
+    G4detutils
+    G4digits
+    G4run
+    G4event
+    G4geomBoolean
+    G4geometrymng
+    G4globman
+    G4graphics_reps
+    G4hepnumerics
+    G4hits
+    G4intercoms
+    G4materials
+    G4navigation
+    G4partman
+    G4procman
+    G4specsolids
+    G4track
+    G4tracking
+    G4volumes
+  GLOBAL_DEPENDENCIES
+    G4digits_hits
+    G4run
+    G4event
+    G4geometry
+    G4global
+    G4graphics_reps
+    G4intercoms
+    G4materials
+    G4particles
+    G4processes
+    G4track
+    G4tracking
 )
 
 # List any source specific properties here
-

source/visualization/modeling/src/G4BoundingExtentScene.cc

@@ -56,14 +56,14 @@ void G4BoundingExtentScene::ProcessVolume(const G4VSolid& solid)
 
 void G4BoundingExtentScene::ResetBoundingExtent ()
 {
-  fExtent = G4VisExtent();
+  fExtent = G4VisExtent::GetNullExtent();
   fpCurrentObjectTransformation = 0;
 }
 
 void G4BoundingExtentScene::AccrueBoundingExtent (const G4VisExtent& newExtent)
 {
 
-  if (fExtent == G4VisExtent()) {  // First time.
+  if (fExtent == G4VisExtent::GetNullExtent()) {  // First time.
 
     fExtent = newExtent;