Surrounded the CMSSW environment specific code with #ifdefs so that that may be turned on and off in one place rather than hunting around in code.  Left off by default, as use outside the CMSSW env. has always been a design requirement of the ntuple analysis code...

Some conditional expressions were used in if statements that seemed to be sabotaged by operator precedence, so likely didn't do as intended.  Surrounded with parentheses.