Import Geant4 11.3.0 source tree

source/graphics_reps/History

@@ -6,6 +6,22 @@ It must **not** be used as a substitute for writing good git commit messages!
 
 -------------------------------------------------------------------------------
 
+## 2024-09-13 John Allison (greps-V11-02-06)
+- G4AttDef.hh: Deprecate output operator<< that uses pointer.
+- G4VMarker.cc: Minor improvements to messages in output operator<<.
+- G4Visible.cc: Minor improvements to messages in output operator<<.
+
+## 2024-09-02 Evgueni Tcherniaev (greps-V11-02-05)
+- BooleanProcessor.src: fixed defect reported by Coverity.
+
+## 2024-07-10 Evgueni Tcherniaev (greps-V11-02-04)
+- BooleanProcessor.src, HepPolyhedronProcessor.src:
+  - Fixed defects reported by Coverity.
+
+## 2024-05-31 Ben Morgan (greps-V11-02-03)
+- Provide all base class interfaces in Seq and MT mode, with an empty implementation
+  modelling the Sequential case.
+
 ## 2024-05-30 John Allison (greps-V11-02-02)
 - G4VVisManager:
   - Add EventReadyForVis, used by G4SubEvtRunManager.

source/graphics_reps/include/G4AttDef.hh

@@ -113,6 +113,7 @@
 // include this prototype will not cause a compilation error - it will merely
 // cause your code to use a default function that outputs the pointer as an
 // address.
+[[deprecated("Use pass-by-reference version instead.")]]
 std::ostream& operator<<
 (std::ostream& os, const std::map<G4String,G4AttDef>* definitions);
 

source/graphics_reps/include/G4VVisManager.hh

@@ -222,13 +222,9 @@ public: // With description
   virtual G4bool FilterDigi(const G4VDigi&) = 0;
   // Digi filter
 
-#ifdef G4MULTITHREADED
-
-  virtual void SetUpForAThread() = 0;
+  virtual void SetUpForAThread() {}
   // This method is invoked by G4WorkerRunManager
 
-#endif
-
   virtual void EventReadyForVis(const G4Event*) {}
   // This is invoked by G4SubEvtRunManager
 

source/graphics_reps/src/BooleanProcessor.src

@@ -1,3 +1,4 @@
+// -*- C++ -*-
 /***********************************************************************
  *                                                                     *
  * Name: BooleanProcessor                            Date:    10.12.99 *
@@ -727,9 +728,13 @@ int BooleanProcessor::testFaceVsPlane(ExtEdge & edge)
         iedge = edges[iedge].inext;
       }
       if (ii[i] == (int)nodes.size()) {
-        d3 = d2-d1; d1 = d1/d3; d2 = d2/d3;
-        nodes.emplace_back(d2*nodes[i1].v-d1*nodes[i2].v, iedge);
-      }  
+        d3 = d2-d1;
+        if (d3 != 0.)
+        {
+          d1 = d1/d3; d2 = d2/d3;
+          nodes.emplace_back(d2*nodes[i1].v-d1*nodes[i2].v, iedge);
+        }
+      }
     }
     edge.inext = 0;
     if (s1 == MINUS_PLUS || s1 == ZERO_PLUS) {
@@ -1916,7 +1921,7 @@ HepPolyhedron BooleanProcessor::createPolyhedron()
   //   A L L O C A T E   M E M O R Y
 
   ExtPolyhedron polyhedron;
-  if (nface == 0) return HepPolyhedron(polyhedron);
+  if (nface == 0) return HepPolyhedron(std::move(polyhedron));
   polyhedron.AllocateMemory(nnode, nface);
 
   //   S E T   N O D E S
@@ -1954,7 +1959,7 @@ HepPolyhedron BooleanProcessor::createPolyhedron()
     polyhedron.pF[faces[i].inew] =
       G4Facet(v[0],f[0], v[1],f[1], v[2],f[2], v[3],f[3]); 
   }
-  return HepPolyhedron(polyhedron);
+  return HepPolyhedron(std::move(polyhedron));
 }
 
 G4ThreadLocal int BooleanProcessor::ishift = 0; //G.Barrand

source/graphics_reps/src/G4VMarker.cc

@@ -57,8 +57,8 @@ G4bool G4VMarker::operator != (const G4VMarker& mk) const {
 std::ostream& operator << (std::ostream& os, const G4VMarker& marker) {
   os << "G4VMarker: position: " << marker.fPosition
      << ", world size: " << marker.fWorldSize
-     << ", screen size: " << marker.fScreenSize << '\n'
-     << "           fill style: ";
+     << ", screen size: " << marker.fScreenSize
+     << ", fill style: ";
   switch (marker.fFillStyle) {
   case G4VMarker::noFill:
     os << "no fill";
@@ -72,7 +72,7 @@ std::ostream& operator << (std::ostream& os, const G4VMarker& marker) {
   default:
     os << "unrecognised"; break;
   }
-  os << "\n           " << (const G4Visible&) marker;
+  os << "\n    " << (const G4Visible&) marker;
   return os;
 }
 

source/graphics_reps/src/G4Visible.cc

@@ -112,8 +112,7 @@ G4bool G4Visible::operator != (const G4Visible& right) const {
 
 std::ostream& operator << (std::ostream& os, const G4Visible& v) {
   os << "G4Visible: ";
-  if (!v.fInfo.empty()) os << "User information: " << v.fInfo;
-  os << '\n';
-  if (v.fpVisAttributes != nullptr) return os << *(v.fpVisAttributes);
+  if (!v.fInfo.empty()) os << "User information: " << v.fInfo << ": ";
+  if (v.fpVisAttributes != nullptr) return os << '\n' << *(v.fpVisAttributes);
   return os << "No Visualization Attributes";
 }

source/graphics_reps/src/HepPolyhedronProcessor.src

@@ -1,3 +1,4 @@
+// -*- C++ -*-
 //
 // ********************************************************************
 // * License and Disclaimer                                           *
@@ -198,7 +199,7 @@ bool HepPolyhedronProcessor::execute1(HepPolyhedron& a_poly,
       }
     }
     if(done) {
-      a_poly = result;
+      a_poly = std::move(result);
       return true;      
     }
   }