Scintillation parameters added to macro, and update to ntuple branches