replace Ecal with ECal and Hcal with HCal
replace WeightTime with TimeWeight
fix formatting
remove svn tags and fix formatting