removing double underscore from header file protectors.
Merge branch 'master' into ftof_volumes
added run, variation and timestamp to command line args of clas12geom.