diff --git a/Trigger/TrigT1/L1CaloFEX/L1CaloFEXSim/src/eTower.cxx b/Trigger/TrigT1/L1CaloFEX/L1CaloFEXSim/src/eTower.cxx
index 59e00379e613827304fb7e48c2783a31c593f331..04c1a64328e305205042e1f1f8f101c339d07177 100644
--- a/Trigger/TrigT1/L1CaloFEX/L1CaloFEXSim/src/eTower.cxx
+++ b/Trigger/TrigT1/L1CaloFEX/L1CaloFEXSim/src/eTower.cxx
@@ -181,7 +181,7 @@ namespace LVL1 {
       Should be derived from tower ID, should be corrected in the future.
       Need to also think what index range should be (thinking ahead to Run2) */
   int eTower::iEta() const {
-    const int index = (m_eta + 2.5)/0.1; // /0.1;  // Equivalent to divide by 0.1 which is the Tower size
+    const int index = (m_eta * m_posneg);
     return index;
   }
   
@@ -189,10 +189,7 @@ namespace LVL1 {
       Should be derived from tower ID, should be corrected in the future.
       Decision here is whether phi is signed or not */
   int eTower::iPhi() const {
-    int index = 32*m_phi/M_PI;
-    if (m_phi < 0) index = 32*(m_phi + 2*M_PI)/M_PI;
-    const int cindex = index;
-    return cindex;
+    return m_phi;
   }
   
   /** Return ET of specified supercell */
diff --git a/Trigger/TrigT1/L1CaloFEX/L1CaloFEXSim/src/jTower.cxx b/Trigger/TrigT1/L1CaloFEX/L1CaloFEXSim/src/jTower.cxx
index f10d8a27a5716d49c9e8f7639ffcb6062165c479..610f4dbc64934d17c8736e70b01c5f97c91219d6 100644
--- a/Trigger/TrigT1/L1CaloFEX/L1CaloFEXSim/src/jTower.cxx
+++ b/Trigger/TrigT1/L1CaloFEX/L1CaloFEXSim/src/jTower.cxx
@@ -197,7 +197,7 @@ namespace LVL1 {
       Should be derived from tower ID, should be corrected in the future.
       Need to also think what index range should be (thinking ahead to Run2) */
   int jTower::iEta() const {
-    const int index = (m_eta + 2.5)*10; // /0.1;  // Equivalent to divide by 0.1 which is the Tower size
+    const int index = (m_eta * m_posneg);
     return index;
   }
   
@@ -205,10 +205,7 @@ namespace LVL1 {
       Should be derived from tower ID, should be corrected in the future.
       Decision here is whether phi is signed or not */
   int jTower::iPhi() const {
-    int index = 32*m_phi/M_PI;
-    if (m_phi < 0) index = 32*(m_phi + 2*M_PI)/M_PI;
-    const int cindex = index;
-    return cindex;
+    return m_phi;
   }
   
   /** Return ET of specified supercell */