make g1 and g2 expressions more similar

Author: cailmdaley

src/sp_validation/cosmo_val.py

@@ -1021,10 +1021,9 @@ def calculate_2pcf(self, ver, npatch=None, save_fits=False, **treecorr_config):
                     g1 = (e1 - self.c1[ver]) / np.average(
                         self.results[ver].dat_shear[R11]
                     )
-                    g2 = (
-                        self.results[ver].dat_shear[self.cc[ver]["shear"]["e2_col"]]
-                        - self.c2[ver]
-                    ) / np.average(self.results[ver].dat_shear[R22])
+                    g2 = (e2 - self.c2[ver]) / np.average(
+                        self.results[ver].dat_shear[R22]
+                    )
 
                 # Use patch file if it exists
                 patch_file = os.path.abspath(