diff --git a/libeos/options.py b/libeos/options.py index 943fec8..3ab191b 100644 --- a/libeos/options.py +++ b/libeos/options.py @@ -23,7 +23,7 @@ class Defaults: # autoscale lambdaRange = [2., 15.] thetaRange = [-12., 12.] - thetaRangeR = [-0.7, 0.7] + thetaRangeR = [-0.75, 0.75] yRange = [11, 41] qzRange = [0.005, 0.30] chopperSpeed = 500 diff --git a/libeos/reduction.py b/libeos/reduction.py index 4b8a3c2..de63807 100644 --- a/libeos/reduction.py +++ b/libeos/reduction.py @@ -382,6 +382,11 @@ class AmorReduction: if self.reduction_config.thetaRange[1]<12: mask_lz = np.logical_and(mask_lz, np.where(alphaF_lz >= self.reduction_config.thetaRange[0], True, False)) mask_lz = np.logical_and(mask_lz, np.where(alphaF_lz <= self.reduction_config.thetaRange[1], True, False)) + else: + self.reduction_config.thetaRange = [fromHDF.nu - fromHDF.mu - fromHDF.div/2, + fromHDF.nu - fromHDF.mu + fromHDF.div/2] + mask_lz = np.logical_and(mask_lz, np.where(alphaF_lz >= self.reduction_config.thetaRange[0], True, False)) + mask_lz = np.logical_and(mask_lz, np.where(alphaF_lz <= self.reduction_config.thetaRange[1], True, False)) if self.reduction_config.thetaRangeR[1]<12: t0 = fromHDF.nu - fromHDF.mu mask_lz = np.logical_and(mask_lz, np.where(alphaF_lz-t0 >= self.reduction_config.thetaRangeR[0], True, False))