Update scalars to be Performance/ Map in all cases

map scalars have format that is fairly different per the scalar.  Update
all scalar to have a similar format. In all cases the transform a
variable from a performance value to a map value. ie.  Nc = NcMap *
C_Nc, Wc = WcMap * C_Wc, etc.