Import Geant4 11.4.0 source tree

source/digits_hits/utils/include/G4VScoringMesh.hh

@@ -178,6 +178,8 @@ class G4VScoringMesh
   inline void SetVerboseLevel(G4int vl) { verboseLevel = vl; }
   // get the primitive scorer map
   inline MeshScoreMap GetScoreMap() const { return fMap; }
+  // get the associated detector
+  inline const G4MultiFunctionalDetector* GetMFD() const { return fMFD; }
   // get whether this mesh setup has been ready
   inline G4bool ReadyForQuantity() const { return (sizeIsSet && nMeshIsSet); }
 

source/digits_hits/utils/src/G4ScoreQuantityMessenger.cc

@@ -173,6 +173,9 @@ void G4ScoreQuantityMessenger::QuantityCommands()
   param = new G4UIparameter("unit", 's', true);
   param->SetDefaultValue("percm2");
   qCellFluxCmd->SetParameter(param);
+  param = new G4UIparameter("scoreweighted", 'b', true);
+  param->SetDefaultValue("false");
+  qCellFluxCmd->SetParameter(param);
   //
   qPassCellFluxCmd = new G4UIcommand("/score/quantity/passageCellFlux", this);
   qPassCellFluxCmd->SetGuidance("Passage cell flux scorer");
@@ -633,6 +636,7 @@ void G4ScoreQuantityMessenger::SetNewValue(G4UIcommand* command,
         ps = new G4PSCellFlux(token[0]);
       }
       ps->SetUnit(token[1]);
+      ps->ScoreWeighted(StoB(token[2]));
       mesh->SetPrimitiveScorer(ps);
     }
   }