Cleaned up issue with 2 issues with switch statement on the absorptio…

…n weighting type: 1) added Analog option so switch encompasses all enum types, and 2) removal of the empty case clause.
VirtualPhotonics · May 2, 2024 · 042d944 · 042d944
1 parent 906b80b
commit 042d944
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 16 deletions.
diff --git a/src/Vts/MonteCarlo/Detectors/dMCdROfRhodMuaDetector.cs b/src/Vts/MonteCarlo/Detectors/dMCdROfRhodMuaDetector.cs
@@ -155,16 +155,15 @@ public void Initialize(ITissue tissue, Random rng)
         /// <param name="awt">absorption weighting type</param>
         protected void SetAbsorbAction(AbsorptionWeightingType awt)
         {
-            // AbsorptionWeightingType.Analog cannot have derivatives so not a case
-            switch (awt)
+            // AbsorptionWeightingType.Analog cannot have derivatives so exception
+            _absorbAction = awt switch
             {
                 // note: pMC is not applied to analog processing, only DAW and CAW
-                case AbsorptionWeightingType.Continuous:
-                case AbsorptionWeightingType.Discrete:
-                default:
-                    _absorbAction = AbsorbContinuousOrDiscrete;
-                    break;
-            }
+                AbsorptionWeightingType.Continuous => AbsorbContinuousOrDiscrete,
+                AbsorptionWeightingType.Discrete => AbsorbContinuousOrDiscrete,
+                AbsorptionWeightingType.Analog => throw new ArgumentException(@"Analog is not allowed with this detector", nameof(awt)),
+                _ => throw new ArgumentOutOfRangeException(typeof(AbsorptionWeightingType).ToString())
+            };
         }
 
         /// <summary>

diff --git a/src/Vts/MonteCarlo/Detectors/dMCdROfRhodMusDetector.cs b/src/Vts/MonteCarlo/Detectors/dMCdROfRhodMusDetector.cs
@@ -154,16 +154,15 @@ public void Initialize(ITissue tissue, Random rng)
         /// <param name="awt">absorption weighting type</param>
         protected void SetAbsorbAction(AbsorptionWeightingType awt)
         {
-            // AbsorptionWeightingType.Analog cannot have derivatives so not a case
-            switch (awt)
+            // AbsorptionWeightingType.Analog cannot have derivatives so exception
+            _absorbAction = awt switch
             {
                 // note: pMC is not applied to analog processing, only DAW and CAW
-                case AbsorptionWeightingType.Continuous:
-                case AbsorptionWeightingType.Discrete:
-                default:
-                    _absorbAction = AbsorbContinuousOrDiscrete;
-                    break;
-            }
+                AbsorptionWeightingType.Continuous => AbsorbContinuousOrDiscrete,
+                AbsorptionWeightingType.Discrete => AbsorbContinuousOrDiscrete,
+                AbsorptionWeightingType.Analog => throw new ArgumentException(@"Analog is not allowed with this detector", nameof(awt)),
+                _ => throw new ArgumentOutOfRangeException(typeof(AbsorptionWeightingType).ToString())
+            };
         }
 
         /// <summary>