- NPS was giving conflict between NP system of Unit and CLHEP one, this is was fixed by a nested ifdef on HEP_SYSTEM_OF_UNIT

* Fixing issue with S1:
 - in Detector Manager a tipo was desabling the condition compilation of S1

* Fixing issue in Isotropic:
 - conflict when the particle was light nuclei given by its name (eg proton instead of 1H)
 - Problem is fixed and user can use gamma, proton, deuton, triton and alpha spelling