Fix variable reuse bug

Author: AnkitBarik

python/magic/potential.py

@@ -397,6 +397,9 @@ def avg(self, field='vphi', levels=defaultLevels, cm=defaultCm,
         :type normed: bool
         """
 
+        if field in ('temperature', 'entropy', 's', 'S', 'u2', 'b2', 'nrj'):
+            normed = False
+
         phiavg = np.zeros((self.n_theta_max, self.n_r_max), np.float32)
         t1 = time.time()
         if field in ('T', 'temp', 'S', 'entropy'):
@@ -465,9 +468,6 @@ def avg(self, field='vphi', levels=defaultLevels, cm=defaultCm,
         t2 = time.time()
         print('Transform time (avg): {:.2f}'.format(t2-t1))
 
-        if field in ('temperature', 'entropy', 's', 'S', 'u2', 'b2', 'nrj'):
-            normed = False
-
         fig, xx, yy, im = merContour(phiavg, self.radius, label, levels, cm,
                                      normed, vmax, vmin, cbar, tit)
 
@@ -507,6 +507,10 @@ def equat(self, field='vr', levels=defaultLevels, cm=defaultCm,
         :type normed: bool
         """
 
+        if field in ('temperature', 't', 'T', 'entropy', 's', 'S', 'u2',
+                     'b2', 'nrj'):
+            normed = False
+
         equator = np.zeros((self.n_phi_max, self.n_r_max), np.float32)
         t1 = time.time()
         if field in ('temperature', 't', 'T', 'entropy', 's', 'S'):
@@ -571,10 +575,6 @@ def equat(self, field='vr', levels=defaultLevels, cm=defaultCm,
 
         equator = symmetrize(equator, self.minc)
 
-        if field in ('temperature', 't', 'T', 'entropy', 's', 'S', 'u2',
-                     'b2', 'nrj'):
-            normed = False
-
         fig, xx, yy = equatContour(equator, self.radius, self.minc, label,
                                    levels, cm, normed, vmax, vmin, cbar, tit,
                                    normRad)
@@ -634,6 +634,10 @@ def surf(self, field='vr', proj='hammer', lon_0=0., r=0.85, vmax=None,
         :type normed: bool
         """
 
+        if field in ('temperature', 't', 'T', 'entropy', 's', 'S', 'u2',
+                     'b2', 'nrj'):
+            normed = False
+
         r /= (1-self.radratio)  # as we give a normalised radius
         ind = np.nonzero(np.where(abs(self.radius-r) ==
                          min(abs(self.radius-r)), 1, 0))
@@ -702,10 +706,6 @@ def surf(self, field='vr', proj='hammer', lon_0=0., r=0.85, vmax=None,
 
         rprof = symmetrize(rprof, self.minc)
 
-        if field in ('temperature', 't', 'T', 'entropy', 's', 'S', 'u2',
-                     'b2', 'nrj'):
-            normed = False
-
         radialContour(rprof, rad, label, proj, lon_0, vmax, vmin,
                       lat_0, levels, cm, normed, cbar, tit, lines)