Henry Day-Hall · Thomas Strebler · Joshua Falco Beirer
--- a/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimEvent/src/TFCSEnergyAndHitGANV2.cxx
+++ b/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimEvent/src/TFCSEnergyAndHitGANV2.cxx
        }

        simulstate.add_E(layer, Einit * energyInVoxel);
        vox++;
-        if (energyInVoxel <= 0) {
-          vox++;
-          continue;
-        }
-
-        simulstate.add_E(layer, Einit * energyInVoxel);
-        vox++;
+        if (energyInVoxel != 0) {
+          simulstate.add_E(layer, Einit * energyInVoxel);
+        }
+        vox++;
--- a/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimEvent/src/TFCSEnergyAndHitGANV2.cxx
+++ b/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimEvent/src/TFCSEnergyAndHitGANV2.cxx
-      int binsInAlphaInRBin = GetAlphaBinsForRBin(x, ix, yBinNum);
+      const int binsInAlphaInRBin = GetAlphaBinsForRBin(x, ix, yBinNum);

      // Horrible work around for variable # of bins along alpha direction
-      int binsToMerge = yBinNum == 32 ? 32 / binsInAlphaInRBin : 1;
+      const int binsToMerge = yBinNum == 32 ? 32 / binsInAlphaInRBin : 1;
      for (int iy = 1; iy <= binsInAlphaInRBin; ++iy) {
-        double energyInVoxel = outputs.at("out_" + std::to_string(vox));
-        int lowEdgeIndex = (iy - 1) * binsToMerge + 1;
+        const double energyInVoxel = outputs.at(std::to_string(vox));
+        const int lowEdgeIndex = (iy - 1) * binsToMerge + 1;

        ATH_MSG_VERBOSE(" Vox " << vox << " energy " << energyInVoxel
                                << " binx " << ix << " biny " << iy);

        if (energyInVoxel <= 0) {
-        if (energyInVoxel <= 0) {
+        if (energyInVoxel == 0) {
--- a/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimEvent/src/TFCSPredictExtrapWeights.cxx
+++ b/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimEvent/src/TFCSPredictExtrapWeights.cxx
    inputVariables["pdgId"] = 1; // one hot enconding
  } else if (is_match_pdgid(11) || is_match_pdgid(-11)) {
    inputVariables["pdgId"] = 0; // one hot enconding
-  } 
+  };
-  };
+  }
--- a/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimEvent/src/TFCSPredictExtrapWeights.cxx
+++ b/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimEvent/src/TFCSPredictExtrapWeights.cxx
 // LWTNN
 #include "lwtnn/LightweightGraph.hh"
 #include "lwtnn/LightweightNeuralNetwork.hh"
 #include "lwtnn/parse_json.hh"