Now doing cross section weighting again since new output files without this at event level are available. Some cosmetics to identation.