Many macros don't work for hybrid simulations

[janinefreeman]

Multiple macros need to be updated for hybrid simulations, or removed from those configs, because the variable names used in the macros do not match the hybrid naming structure (prepended with the technology name.

This is relevant in most of the macros on the list, and should require only minor updating but the config type does need to be checked.

Current workaround is to run the macro of interest in a case set up for a single generation technology, then port any relevant inputs to the hybrid case.