whoops, some crud left from moving stuff around

Author: SaOgaz

ccdproc/combiner.py

@@ -381,14 +381,14 @@ def combiner_method(self, combine_func=ma.median, scale_to=None):
         deviation does not account for rejected pixels.
         """
         if scale_to is not None:
-            self.scalings = scale_to
+            scalings = scale_to
         elif self.scaling is not None:
-            self.scalings = self.scaling
+            scalings = self.scaling
         else:
-            self.scalings = 1.0
+            scalings = 1.0
 
         # set the data
-        data = combine_func(self.scalings * self.data_arr, axis=0)
+        data = combine_func(scalings * self.data_arr, axis=0)
 
         # set the mask
         masked_values = self.data_arr.mask.sum(axis=0)
@@ -478,14 +478,14 @@ def combiner_method(self, combine_func=ma.average, scale_to=None):
             CCDData object based on the combined input of CCDData objects.
         """
         if scale_to is not None:
-            self.scalings = scale_to
+            scalings = scale_to
         elif self.scaling is not None:
-            self.scalings = self.scaling
+            scalings = self.scaling
         else:
-            self.scalings = 1.0
+            scalings = 1.0
 
         # set up the data
-        data, wei = combine_func(self.scalings * self.data_arr,
+        data, wei = combine_func(scalings * self.data_arr,
                                axis=0, weights=self.weights,
                                returned=True)
 
@@ -571,14 +571,14 @@ def combiner_method(self, combine_func=ma.sum, scale_to=None):
             CCDData object based on the combined input of CCDData objects.
         """
         if scale_to is not None:
-            self.scalings = scale_to
+            scalings = scale_to
         elif self.scaling is not None:
-            self.scalings = self.scaling
+            scalings = self.scaling
         else:
-            self.scalings = 1.0
+            scalings = 1.0
 
         # set up the data
-        data = combine_func(self.scalings * self.data_arr, axis=0)
+        data = combine_func(scalings * self.data_arr, axis=0)
 
         # set up the mask
         masked_values = self.data_arr.mask.sum(axis=0)