Get rid of calcToAdd class member, pass it directly to NanoAODModule.prepareTree (simpler to keep track of)