diff --git a/RecFCCeeCalorimeter/src/components/AugmentClustersFCCee.cpp b/RecFCCeeCalorimeter/src/components/AugmentClustersFCCee.cpp
index b64fc86..9ada232 100644
--- a/RecFCCeeCalorimeter/src/components/AugmentClustersFCCee.cpp
+++ b/RecFCCeeCalorimeter/src/components/AugmentClustersFCCee.cpp
@@ -408,7 +408,7 @@ StatusCode AugmentClustersFCCee::execute([[maybe_unused]] const EventContext &ev
           vec_theta_cell_layer[layer+startPositionToFill].push_back(theta_id);
           vec_module_cell_layer[layer+startPositionToFill].push_back(module_id);
           // sum them for width in theta/module calculation
-	  if (m_do_widthTheta_logE_weights) {
+          if (m_do_widthTheta_logE_weights) {
             theta2_E_layer[layer+startPositionToFill] += theta_id * theta_id * weightLog;
             theta_E_layer[layer+startPositionToFill] += theta_id * weightLog;
           } else {
@@ -635,31 +635,37 @@ StatusCode AugmentClustersFCCee::execute([[maybe_unused]] const EventContext &ev
         if (m_do_photon_shapeVar && systemID == systemID_EMB) {
           if (m_do_widthTheta_logE_weights) {
             double w_theta2 = theta2_E_layer[layer+startPositionToFill] / sumWeightLayer[layer+startPositionToFill] - std::pow(theta_E_layer[layer+startPositionToFill] / sumWeightLayer[layer+startPositionToFill], 2);
-            // Very small but negative values caused by computational precision are allowed,
-            // otherwise crash.
-            if (w_theta2 < -1e-9) {
-              error() << "w_theta2 in theta width calculation is negative: " << w_theta2 << endmsg;
-              return StatusCode::FAILURE;
+            // Negative values can happen when noise is on and not filtered
+            // Negative values very close to zero can happen due to numerical precision
+            if (w_theta2 < 0.) {
+              warning() << "w_theta2 in theta width calculation is negative: " << w_theta2 << " , will set theta width to zero (this might happen when noise simulation is on)" <<  endmsg;
+              width_theta[layer+startPositionToFill] = 0.;
+            }
+            else {
+              width_theta[layer+startPositionToFill] = std::sqrt(w_theta2);
             }
-            width_theta[layer+startPositionToFill] = (sumWeightLayer[layer+startPositionToFill] > 0.) ? std::sqrt(std::fabs(w_theta2)) : 0. ;
           } else {
             double w_theta2 = theta2_E_layer[layer+startPositionToFill] / sumEnLayer[layer+startPositionToFill] - std::pow(theta_E_layer[layer+startPositionToFill] / sumEnLayer[layer+startPositionToFill], 2);
-            // Very small but negative values caused by computational precision are allowed,
-            // otherwise crash.
-            if (w_theta2 < -1e-9) {
-              error() << "w_theta2 in theta width calculation is negative: " << w_theta2 << endmsg;
-              return StatusCode::FAILURE;
+            // Negative values can happen when noise is on and not filtered
+            // Negative values very close to zero can happen due to numerical precision
+            if (w_theta2 < 0.) {
+              warning() << "w_theta2 in theta width calculation is negative: " << w_theta2 << " , will set theta width to zero (this might happen when noise simulation is on)" <<  endmsg;
+              width_theta[layer+startPositionToFill] = 0.;
+            }
+            else {
+              width_theta[layer+startPositionToFill] = std::sqrt(w_theta2);
             }
-            width_theta[layer+startPositionToFill] = (sumEnLayer[layer+startPositionToFill] > 0.) ? std::sqrt(std::fabs(w_theta2)) : 0. ;
-	        }
+          }
           double w_module2 = module2_E_layer[layer+startPositionToFill] / sumEnLayer[layer+startPositionToFill] - std::pow(module_E_layer[layer+startPositionToFill] / sumEnLayer[layer+startPositionToFill], 2);
-          // Very small but negative values caused by computational precision are allowed,
-          // otherwise crash.
+          // Negative values can happen when noise is on and not filtered
+          // Negative values very close to zero can happen due to numerical precision
           if (w_module2 < -1e-9) {
-            error() << "w_module2 in module width calculation is negative: " << w_module2 << endmsg;
-            return StatusCode::FAILURE;
+            warning() << "w_module2 in module width calculation is negative: " << w_theta2 << " , will set module width to zero (this might happen when noise simulation is on)" <<  endmsg;
+            width_module[layer+startPositionToFill] = 0. ;
+          }
+          else {
+            width_module[layer+startPositionToFill] = std::sqrt(w_module2);
           }
-          width_module[layer+startPositionToFill] = (sumEnLayer[layer+startPositionToFill] > 0.) ? std::sqrt(std::fabs(w_module2)) : 0. ;
 
           double Ratio_E = (E_cell_Max[layer+startPositionToFill] - E_cell_secMax[layer+startPositionToFill]) /
                            (E_cell_Max[layer+startPositionToFill] + E_cell_secMax[layer+startPositionToFill]);
@@ -752,12 +758,17 @@ StatusCode AugmentClustersFCCee::execute([[maybe_unused]] const EventContext &ev
               E_p4     = 0;
               theta_p4 = 0;
             }
-            // sum_E_nBin is also used in E fraction side calculation so put that outside the if block
+            // calculate energy fraction outside core of 3 inner theta strips
             double sum_E_3Bin = E_m1 + E_cell_Max[layer+startPositionToFill] + E_p1;
             double sum_E_5Bin = sum_E_3Bin + E_m2 + E_p2;
             double sum_E_7Bin = sum_E_5Bin + E_m3 + E_p3;
             double sum_E_9Bin = sum_E_7Bin + E_m4 + E_p4;
+            E_fr_side_pm2[layer+startPositionToFill] = (sum_E_3Bin > 0.) ? (sum_E_5Bin / sum_E_3Bin - 1.) : 0. ;
+            E_fr_side_pm3[layer+startPositionToFill] = (sum_E_3Bin > 0.) ? (sum_E_7Bin / sum_E_3Bin - 1.) : 0. ;
+            E_fr_side_pm4[layer+startPositionToFill] = (sum_E_3Bin > 0.) ? (sum_E_9Bin / sum_E_3Bin - 1.) : 0. ;
 
+            // calculate width along theta in core
+            double _w_theta_3Bin2(0.), _w_theta_5Bin2(0.), _w_theta_7Bin2(0.), _w_theta_9Bin2(0.);
             if (m_do_widthTheta_logE_weights) {
               double weightLog_E_max = std::max(0., m_thetaRecalcLayerWeights[k][layer] + log(E_cell_Max[layer+startPositionToFill] / sumEnLayer[layer+startPositionToFill]));
               double weightLog_m1 = std::max(0., m_thetaRecalcLayerWeights[k][layer] + log(E_m1 / sumEnLayer[layer+startPositionToFill]));
@@ -783,34 +794,10 @@ StatusCode AugmentClustersFCCee::execute([[maybe_unused]] const EventContext &ev
               double theta2_E_9Bin = theta2_E_7Bin + theta_m4 * theta_m4 * weightLog_m4 + theta_p4 * theta_p4 * weightLog_p4;
               double theta_E_9Bin = theta_E_7Bin + theta_m4 * weightLog_m4 + theta_p4 * weightLog_p4;
 
-              double _w_theta_3Bin2 = theta2_E_3Bin / sum_weightLog_3Bin - std::pow(theta_E_3Bin / sum_weightLog_3Bin, 2);
-              double _w_theta_5Bin2 = theta2_E_5Bin / sum_weightLog_5Bin - std::pow(theta_E_5Bin / sum_weightLog_5Bin, 2);
-              double _w_theta_7Bin2 = theta2_E_7Bin / sum_weightLog_7Bin - std::pow(theta_E_7Bin / sum_weightLog_7Bin, 2);
-              double _w_theta_9Bin2 = theta2_E_9Bin / sum_weightLog_9Bin - std::pow(theta_E_9Bin / sum_weightLog_9Bin, 2);
-
-              // Very small but negative values caused by computational precision are allowed,
-              // otherwise crash.
-              if (_w_theta_3Bin2 < -1e-9) {
-                error() << "_w_theta_3Bin2 in theta width calculation is negative: " << _w_theta_3Bin2 << endmsg;
-                return StatusCode::FAILURE;
-              }
-              if (_w_theta_5Bin2 < -1e-9) {
-                error() << "_w_theta_5Bin2 in theta width calculation is negative: " << _w_theta_5Bin2 << endmsg;
-                return StatusCode::FAILURE;
-              }
-              if (_w_theta_7Bin2 < -1e-9) {
-                error() << "_w_theta_7Bin2 in theta width calculation is negative: " << _w_theta_7Bin2 << endmsg;
-                return StatusCode::FAILURE;
-              }
-              if (_w_theta_9Bin2 < -1e-9) {
-                error() << "_w_theta_9Bin2 in theta width calculation is negative: " << _w_theta_9Bin2 << endmsg;
-                return StatusCode::FAILURE;
-              }
-
-              width_theta_3Bin[layer+startPositionToFill] = (sum_weightLog_3Bin > 0.) ? std::sqrt(std::fabs(_w_theta_3Bin2)) : 0. ;
-              width_theta_5Bin[layer+startPositionToFill] = (sum_weightLog_5Bin > 0.) ? std::sqrt(std::fabs(_w_theta_5Bin2)) : 0. ;
-              width_theta_7Bin[layer+startPositionToFill] = (sum_weightLog_7Bin > 0.) ? std::sqrt(std::fabs(_w_theta_7Bin2)) : 0. ;
-              width_theta_9Bin[layer+startPositionToFill] = (sum_weightLog_9Bin > 0.) ? std::sqrt(std::fabs(_w_theta_9Bin2)) : 0. ;
+              _w_theta_3Bin2 = theta2_E_3Bin / sum_weightLog_3Bin - std::pow(theta_E_3Bin / sum_weightLog_3Bin, 2);
+              _w_theta_5Bin2 = theta2_E_5Bin / sum_weightLog_5Bin - std::pow(theta_E_5Bin / sum_weightLog_5Bin, 2);
+              _w_theta_7Bin2 = theta2_E_7Bin / sum_weightLog_7Bin - std::pow(theta_E_7Bin / sum_weightLog_7Bin, 2);
+              _w_theta_9Bin2 = theta2_E_9Bin / sum_weightLog_9Bin - std::pow(theta_E_9Bin / sum_weightLog_9Bin, 2);
             } else {
               double theta2_E_3Bin = theta_m1 * theta_m1 * E_m1 + E_cell_Max_theta[layer+startPositionToFill] * E_cell_Max_theta[layer+startPositionToFill] * E_cell_Max[layer+startPositionToFill] + theta_p1 * theta_p1 * E_p1;
               double theta_E_3Bin = theta_m1 * E_m1 + E_cell_Max_theta[layer+startPositionToFill] * E_cell_Max[layer+startPositionToFill] + theta_p1 * E_p1;
@@ -821,38 +808,40 @@ StatusCode AugmentClustersFCCee::execute([[maybe_unused]] const EventContext &ev
               double theta2_E_9Bin = theta2_E_7Bin + theta_m4 * theta_m4 * E_m4 + theta_p4 * theta_p4 * E_p4;
               double theta_E_9Bin = theta_E_7Bin + theta_m4 * E_m4 + theta_p4 * E_p4;
 
-              double _w_theta_3Bin2 = theta2_E_3Bin / sum_E_3Bin - std::pow(theta_E_3Bin / sum_E_3Bin, 2);
-              double _w_theta_5Bin2 = theta2_E_5Bin / sum_E_5Bin - std::pow(theta_E_5Bin / sum_E_5Bin, 2);
-              double _w_theta_7Bin2 = theta2_E_7Bin / sum_E_7Bin - std::pow(theta_E_7Bin / sum_E_7Bin, 2);
-              double _w_theta_9Bin2 = theta2_E_9Bin / sum_E_9Bin - std::pow(theta_E_9Bin / sum_E_9Bin, 2);
-
-              // Very small but negative values caused by computational precision are allowed,
-              // otherwise crash.
-              if (_w_theta_3Bin2 < -1e-9) {
-                error() << "_w_theta_3Bin2 in theta width calculation is negative: " << _w_theta_3Bin2 << endmsg;
-                return StatusCode::FAILURE;
-              }
-              if (_w_theta_5Bin2 < -1e-9) {
-                error() << "_w_theta_5Bin2 in theta width calculation is negative: " << _w_theta_5Bin2 << endmsg;
-                return StatusCode::FAILURE;
-              }
-              if (_w_theta_7Bin2 < -1e-9) {
-                error() << "_w_theta_7Bin2 in theta width calculation is negative: " << _w_theta_7Bin2 << endmsg;
-                return StatusCode::FAILURE;
-              }
-              if (_w_theta_9Bin2 < -1e-9) {
-                error() << "_w_theta_9Bin2 in theta width calculation is negative: " << _w_theta_9Bin2 << endmsg;
-                return StatusCode::FAILURE;
-              }
-
-              width_theta_3Bin[layer+startPositionToFill] = (sum_E_3Bin > 0.) ? std::sqrt(std::fabs(_w_theta_3Bin2)) : 0. ;
-              width_theta_5Bin[layer+startPositionToFill] = (sum_E_5Bin > 0.) ? std::sqrt(std::fabs(_w_theta_5Bin2)) : 0. ;
-              width_theta_7Bin[layer+startPositionToFill] = (sum_E_7Bin > 0.) ? std::sqrt(std::fabs(_w_theta_7Bin2)) : 0. ;
-              width_theta_9Bin[layer+startPositionToFill] = (sum_E_9Bin > 0.) ? std::sqrt(std::fabs(_w_theta_9Bin2)) : 0. ;
+              _w_theta_3Bin2 = theta2_E_3Bin / sum_E_3Bin - std::pow(theta_E_3Bin / sum_E_3Bin, 2);
+              _w_theta_5Bin2 = theta2_E_5Bin / sum_E_5Bin - std::pow(theta_E_5Bin / sum_E_5Bin, 2);
+              _w_theta_7Bin2 = theta2_E_7Bin / sum_E_7Bin - std::pow(theta_E_7Bin / sum_E_7Bin, 2);
+              _w_theta_9Bin2 = theta2_E_9Bin / sum_E_9Bin - std::pow(theta_E_9Bin / sum_E_9Bin, 2);
+            }
+            // Negative values of the RMS can be caused by computational precision or cells with E<0 (in case of noise)
+            if (_w_theta_3Bin2 < 0) {
+              warning() << "_w_theta_3Bin2 in theta width calculation is negative: " << _w_theta_3Bin2 << " , will set theta width to zero (this might happen when noise simulation is on)" <<  endmsg;
+              width_theta_3Bin[layer+startPositionToFill] = 0.;
+            }
+            else {
+              width_theta_3Bin[layer+startPositionToFill] = std::sqrt(_w_theta_3Bin2);
+            }
+            if (_w_theta_5Bin2 < 0) {
+              warning() << "_w_theta_5Bin2 in theta width calculation is negative: " << _w_theta_5Bin2 << " , will set theta width to zero (this might happen when noise simulation is on)" <<  endmsg;
+              width_theta_5Bin[layer+startPositionToFill] = 0.;
+            }
+            else {
+              width_theta_5Bin[layer+startPositionToFill] = std::sqrt(_w_theta_5Bin2);
+            }
+            if (_w_theta_7Bin2 < 0) {
+              warning() << "_w_theta_7Bin2 in theta width calculation is negative: " << _w_theta_7Bin2 << " , will set theta width to zero (this might happen when noise simulation is on)" <<  endmsg;
+              width_theta_7Bin[layer+startPositionToFill] = 0.;
+            }
+            else {
+              width_theta_7Bin[layer+startPositionToFill] = std::sqrt(_w_theta_7Bin2);
+            }
+            if (_w_theta_9Bin2 < 0) {
+              warning() << "_w_theta_9Bin2 in theta width calculation is negative: " << _w_theta_9Bin2 << << " , will set theta width to zero (this might happen when noise simulation is on)" <<  endmsg;
+              width_theta_9Bin[layer+startPositionToFill] = 0.;
+            }
+            else {
+              width_theta_9Bin[layer+startPositionToFill] = std::sqrt(_w_theta_9Bin2);
             }
-            E_fr_side_pm2[layer+startPositionToFill] = (sum_E_3Bin > 0.) ? (sum_E_5Bin / sum_E_3Bin - 1.) : 0. ;
-            E_fr_side_pm3[layer+startPositionToFill] = (sum_E_3Bin > 0.) ? (sum_E_7Bin / sum_E_3Bin - 1.) : 0. ;
-            E_fr_side_pm4[layer+startPositionToFill] = (sum_E_3Bin > 0.) ? (sum_E_9Bin / sum_E_3Bin - 1.) : 0. ;
           } else {
             width_theta_3Bin[layer+startPositionToFill] = 0.;
             width_theta_5Bin[layer+startPositionToFill] = 0.;