master
Fixed indentation
added phase-2 layers in FastSim, turn off FastSim calorimetry
modifier for phase2-specific fastSim changes