added NZ calcs for two detectors
fixed conflict