minor cleanup. use shape of underlaying data only if data is set, otherwise fall back on computing shape from dims
minor cleanup. use shape of underlaying data only if data is set, otherwise fall back on computing shape from dims

qutip/qutip,qutip/qutip,cgranade/qutip,zasdfgbnm/qutip,zasdfgbnm/qutip,anubhavvardhan/qutip,cgranade/qutip,anubhavvardhan/qutip