Handle also the root macros correctly.
cleaning
rename also the detectors in macro
reset last changes