Some refactoring of diamond_validation for qg_strat
Some refactoring of diamond_validation for qg_strat

iakovos-panourgias/fluidity,rjferrier/fluidity,jrper/fluidity,jrper/fluidity,rjferrier/fluidity,iakovos-panourgias/fluidity,jrper/fluidity,iakovos-panourgias/fluidity,iakovos-panourgias/fluidity,rjferrier/fluidity,jjo31/ATHAM-Fluidity,jjo31/ATHAM-Fluidity,jjo31/ATHAM-Fluidity,jjo31/ATHAM-Fluidity,jrper/fluidity,rjferrier/fluidity,jrper/fluidity,rjferrier/fluidity,iakovos-panourgias/fluidity,jjo31/ATHAM-Fluidity