Fixed flagged potential merge conflict from @davidChevrier.  It wasn't bad code, but just didn't use the new paradigm used in the newXRFDetector branch.