renamed: pixel_mask_pf -> pixel_mask
This commit is contained in:
@@ -12,7 +12,7 @@ class JFData:
|
||||
self.ju_stream_adapter = ju.StreamAdapter()
|
||||
self.pedestal_name_saved = None
|
||||
self.id_pixel_mask_corrected = None
|
||||
self.pixel_mask_pf = None
|
||||
self.pixel_mask = None
|
||||
|
||||
|
||||
def ensure_current_pixel_mask(self, pedestal_name):
|
||||
@@ -48,23 +48,23 @@ class JFData:
|
||||
pixel_mask_corrected = self.ju_stream_adapter.handler.get_pixel_mask(double_pixels=double_pixels)
|
||||
if pixel_mask_corrected is None:
|
||||
self.id_pixel_mask_corrected = None
|
||||
self.pixel_mask_pf = None
|
||||
self.pixel_mask = None
|
||||
return None
|
||||
|
||||
# starting from ju 3.3.1 pedestal file is cached in library, re-calculated only if parameters (and/or pedestal file) have changed
|
||||
new_id_pixel_mask_corrected = id(pixel_mask_corrected)
|
||||
old_id_pixel_mask_corrected = self.id_pixel_mask_corrected
|
||||
if new_id_pixel_mask_corrected == old_id_pixel_mask_corrected:
|
||||
return self.pixel_mask_pf
|
||||
return self.pixel_mask
|
||||
|
||||
pixel_mask_pf = np.ascontiguousarray(pixel_mask_corrected)
|
||||
calc_apply_additional_mask(results, pixel_mask_pf) # changes pixel_mask_pf in place
|
||||
calc_apply_additional_mask_from_file(results, pixel_mask_pf) # further changes pixel_mask_pf in place
|
||||
pixel_mask = np.ascontiguousarray(pixel_mask_corrected)
|
||||
calc_apply_additional_mask(results, pixel_mask) # changes pixel_mask in place
|
||||
calc_apply_additional_mask_from_file(results, pixel_mask) # further changes pixel_mask in place
|
||||
|
||||
self.id_pixel_mask_corrected = new_id_pixel_mask_corrected
|
||||
self.pixel_mask_pf = pixel_mask_pf
|
||||
self.pixel_mask = pixel_mask
|
||||
|
||||
return pixel_mask_pf
|
||||
return pixel_mask
|
||||
|
||||
|
||||
def get_saturated_pixels(self, image, double_pixels):
|
||||
|
||||
Reference in New Issue
Block a user