diff --git a/compact/RadiatorCell_FinaOptimisation.xml b/compact/RadiatorCell_FinaOptimisation.xml
new file mode 100644
index 0000000..2a68225
--- /dev/null
+++ b/compact/RadiatorCell_FinaOptimisation.xml
@@ -0,0 +1,210 @@
+<lccdd >
+<define>
+<constant name="Radiator_c0_r1_Curvature"             value="0.369008 * m"      />
+<constant name="Radiator_c0_r1_XPosition"             value="0.00199739 * m"      />
+<constant name="Radiator_c0_r1_ZPosition"             value="0.000484417 * m"      />
+<constant name="Radiator_c0_r1_DetPosition"             value="0.00204862 * m"      />
+<constant name="Radiator_c0_r1_DetTilt"             value="-0.0204611 * rad"      />
+<constant name="Radiator_c1_r2_Curvature"             value="0.368913 * m"      />
+<constant name="Radiator_c1_r2_XPosition"             value="-0.025092 * m"      />
+<constant name="Radiator_c1_r2_ZPosition"             value="0.00109283 * m"      />
+<constant name="Radiator_c1_r2_DetPosition"             value="-0.0127519 * m"      />
+<constant name="Radiator_c1_r2_DetTilt"             value="-0.0445222 * rad"      />
+<constant name="Radiator_c1_r1_Curvature"             value="0.367441 * m"      />
+<constant name="Radiator_c1_r1_XPosition"             value="-0.0441887 * m"      />
+<constant name="Radiator_c1_r1_ZPosition"             value="0.00248451 * m"      />
+<constant name="Radiator_c1_r1_DetPosition"             value="-0.0203282 * m"      />
+<constant name="Radiator_c1_r1_DetTilt"             value="-0.0931162 * rad"      />
+<constant name="Radiator_c2_r2_Curvature"             value="0.363157 * m"      />
+<constant name="Radiator_c2_r2_XPosition"             value="-0.063806 * m"      />
+<constant name="Radiator_c2_r2_ZPosition"             value="0.00637531 * m"      />
+<constant name="Radiator_c2_r2_DetPosition"             value="-0.028171 * m"      />
+<constant name="Radiator_c2_r2_DetTilt"             value="-0.124024 * rad"      />
+<constant name="Radiator_c2_r1_Curvature"             value="0.358554 * m"      />
+<constant name="Radiator_c2_r1_XPosition"             value="-0.0816915 * m"      />
+<constant name="Radiator_c2_r1_ZPosition"             value="0.0113855 * m"      />
+<constant name="Radiator_c2_r1_DetPosition"             value="-0.0351757 * m"      />
+<constant name="Radiator_c2_r1_DetTilt"             value="-0.132262 * rad"      />
+<constant name="Radiator_c3_r2_Curvature"             value="0.350086 * m"      />
+<constant name="Radiator_c3_r2_XPosition"             value="-0.0959577 * m"      />
+<constant name="Radiator_c3_r2_ZPosition"             value="0.0193522 * m"      />
+<constant name="Radiator_c3_r2_DetPosition"             value="-0.0397032 * m"      />
+<constant name="Radiator_c3_r2_DetTilt"             value="-0.150924 * rad"      />
+<constant name="Radiator_c3_r1_Curvature"             value="0.346543 * m"      />
+<constant name="Radiator_c3_r1_XPosition"             value="-0.114685 * m"      />
+<constant name="Radiator_c3_r1_ZPosition"             value="0.0234365 * m"      />
+<constant name="Radiator_c3_r1_DetPosition"             value="-0.0478341 * m"      />
+<constant name="Radiator_c3_r1_DetTilt"             value="-0.134323 * rad"      />
+<constant name="Radiator_c4_r2_Curvature"             value="0.336429 * m"      />
+<constant name="Radiator_c4_r2_XPosition"             value="-0.116496 * m"      />
+<constant name="Radiator_c4_r2_ZPosition"             value="0.033904 * m"      />
+<constant name="Radiator_c4_r2_DetPosition"             value="-0.0423608 * m"      />
+<constant name="Radiator_c4_r2_DetTilt"             value="-0.18349 * rad"      />
+<constant name="Radiator_c4_r1_Curvature"             value="0.33016 * m"      />
+<constant name="Radiator_c4_r1_XPosition"             value="-0.127363 * m"      />
+<constant name="Radiator_c4_r1_ZPosition"             value="0.04225 * m"      />
+<constant name="Radiator_c4_r1_DetPosition"             value="-0.0459939 * m"      />
+<constant name="Radiator_c4_r1_DetTilt"             value="-0.20144 * rad"      />
+<constant name="Radiator_c5_r2_Curvature"             value="0.320575 * m"      />
+<constant name="Radiator_c5_r2_XPosition"             value="-0.123091 * m"      />
+<constant name="Radiator_c5_r2_ZPosition"             value="0.05137 * m"      />
+<constant name="Radiator_c5_r2_DetPosition"             value="-0.0366375 * m"      />
+<constant name="Radiator_c5_r2_DetTilt"             value="-0.21376 * rad"      />
+<constant name="Radiator_c5_r1_Curvature"             value="0.325436 * m"      />
+<constant name="Radiator_c5_r1_XPosition"             value="-0.128286 * m"      />
+<constant name="Radiator_c5_r1_ZPosition"             value="0.0503257 * m"      />
+<constant name="Radiator_c5_r1_DetPosition"             value="-0.0324965 * m"      />
+<constant name="Radiator_c5_r1_DetTilt"             value="-0.154886 * rad"      />
+<constant name="Radiator_c6_r2_Curvature"             value="0.314895 * m"      />
+<constant name="Radiator_c6_r2_XPosition"             value="-0.129993 * m"      />
+<constant name="Radiator_c6_r2_ZPosition"             value="0.0624498 * m"      />
+<constant name="Radiator_c6_r2_DetPosition"             value="-0.0315672 * m"      />
+<constant name="Radiator_c6_r2_DetTilt"             value="-0.229024 * rad"      />
+<constant name="Radiator_c6_r1_Curvature"             value="0.326104 * m"      />
+<constant name="Radiator_c6_r1_XPosition"             value="-0.139797 * m"      />
+<constant name="Radiator_c6_r1_ZPosition"             value="0.055998 * m"      />
+<constant name="Radiator_c6_r1_DetPosition"             value="-0.0295479 * m"      />
+<constant name="Radiator_c6_r1_DetTilt"             value="-0.134243 * rad"      />
+<constant name="Radiator_c7_r2_Curvature"             value="0.319311 * m"      />
+<constant name="Radiator_c7_r2_XPosition"             value="-0.137129 * m"      />
+<constant name="Radiator_c7_r2_ZPosition"             value="0.0664953 * m"      />
+<constant name="Radiator_c7_r2_DetPosition"             value="-0.0266767 * m"      />
+<constant name="Radiator_c7_r2_DetTilt"             value="-0.14106 * rad"      />
+<constant name="Radiator_c7_r1_Curvature"             value="0.310634 * m"      />
+<constant name="Radiator_c7_r1_XPosition"             value="-0.134094 * m"      />
+<constant name="Radiator_c7_r1_ZPosition"             value="0.076318 * m"      />
+<constant name="Radiator_c7_r1_DetPosition"             value="-0.0198518 * m"      />
+<constant name="Radiator_c7_r1_DetTilt"             value="-0.259362 * rad"      />
+<constant name="Radiator_c8_r2_Curvature"             value="0.321726 * m"      />
+<constant name="Radiator_c8_r2_XPosition"             value="-0.141744 * m"      />
+<constant name="Radiator_c8_r2_ZPosition"             value="0.0698931 * m"      />
+<constant name="Radiator_c8_r2_DetPosition"             value="-0.0196984 * m"      />
+<constant name="Radiator_c8_r2_DetTilt"             value="-0.0928119 * rad"      />
+<constant name="Radiator_c8_r1_Curvature"             value="0.350381 * m"      />
+<constant name="Radiator_c8_r1_XPosition"             value="-0.215767 * m"      />
+<constant name="Radiator_c8_r1_ZPosition"             value="0.0785187 * m"      />
+<constant name="Radiator_c8_r1_DetPosition"             value="-0.0827883 * m"      />
+<constant name="Radiator_c8_r1_DetTilt"             value="-0.403075 * rad"      />
+<constant name="Radiator_c9_r2_Curvature"             value="0.254983 * m"      />
+<constant name="Radiator_c9_r2_XPosition"             value="-0.221951 * m"      />
+<constant name="Radiator_c9_r2_ZPosition"             value="0.135631 * m"      />
+<constant name="Radiator_c9_r2_DetPosition"             value="-0.120379 * m"      />
+<constant name="Radiator_c9_r2_DetTilt"             value="-1.38132 * rad"      />
+<constant name="EndCapRadiator_c1_r1_Curvature"             value="0.349637 * m"      />
+<constant name="EndCapRadiator_c1_r1_XPosition"             value="0.0540617 * m"      />
+<constant name="EndCapRadiator_c1_r1_ZPosition"             value="0.0185107 * m"      />
+<constant name="EndCapRadiator_c1_r1_DetPosition"             value="0.081954 * m"      />
+<constant name="EndCapRadiator_c1_r1_DetTilt"             value="-0.101852 * rad"      />
+<constant name="EndCapRadiator_c2_r2_Curvature"             value="0.35963 * m"      />
+<constant name="EndCapRadiator_c2_r2_XPosition"             value="-0.0693705 * m"      />
+<constant name="EndCapRadiator_c2_r2_ZPosition"             value="0.0100598 * m"      />
+<constant name="EndCapRadiator_c2_r2_DetPosition"             value="-0.0304485 * m"      />
+<constant name="EndCapRadiator_c2_r2_DetTilt"             value="-0.118494 * rad"      />
+<constant name="EndCapRadiator_c2_r1_Curvature"             value="0.358139 * m"      />
+<constant name="EndCapRadiator_c2_r1_XPosition"             value="-0.0846481 * m"      />
+<constant name="EndCapRadiator_c2_r1_ZPosition"             value="0.0115558 * m"      />
+<constant name="EndCapRadiator_c2_r1_DetPosition"             value="-0.0407355 * m"      />
+<constant name="EndCapRadiator_c2_r1_DetTilt"             value="-0.103914 * rad"      />
+<constant name="EndCapRadiator_c3_r2_Curvature"             value="0.349695 * m"      />
+<constant name="EndCapRadiator_c3_r2_XPosition"             value="-0.0999593 * m"      />
+<constant name="EndCapRadiator_c3_r2_ZPosition"             value="0.0198683 * m"      />
+<constant name="EndCapRadiator_c3_r2_DetPosition"             value="-0.0432295 * m"      />
+<constant name="EndCapRadiator_c3_r2_DetTilt"             value="-0.118265 * rad"      />
+<constant name="EndCapRadiator_c3_r1_Curvature"             value="0.344967 * m"      />
+<constant name="EndCapRadiator_c3_r1_XPosition"             value="-0.107123 * m"      />
+<constant name="EndCapRadiator_c3_r1_ZPosition"             value="0.0250228 * m"      />
+<constant name="EndCapRadiator_c3_r1_DetPosition"             value="-0.0447855 * m"      />
+<constant name="EndCapRadiator_c3_r1_DetTilt"             value="-0.137308 * rad"      />
+<constant name="EndCapRadiator_c3_r3_Curvature"             value="0.340541 * m"      />
+<constant name="EndCapRadiator_c3_r3_XPosition"             value="-0.113788 * m"      />
+<constant name="EndCapRadiator_c3_r3_ZPosition"             value="0.0289459 * m"      />
+<constant name="EndCapRadiator_c3_r3_DetPosition"             value="-0.0419997 * m"      />
+<constant name="EndCapRadiator_c3_r3_DetTilt"             value="-0.119164 * rad"      />
+<constant name="EndCapRadiator_c4_r2_Curvature"             value="0.339376 * m"      />
+<constant name="EndCapRadiator_c4_r2_XPosition"             value="-0.115136 * m"      />
+<constant name="EndCapRadiator_c4_r2_ZPosition"             value="0.0306836 * m"      />
+<constant name="EndCapRadiator_c4_r2_DetPosition"             value="-0.0422966 * m"      />
+<constant name="EndCapRadiator_c4_r2_DetTilt"             value="-0.118536 * rad"      />
+<constant name="EndCapRadiator_c4_r1_Curvature"             value="0.333608 * m"      />
+<constant name="EndCapRadiator_c4_r1_XPosition"             value="-0.124894 * m"      />
+<constant name="EndCapRadiator_c4_r1_ZPosition"             value="0.0364653 * m"      />
+<constant name="EndCapRadiator_c4_r1_DetPosition"             value="-0.0456515 * m"      />
+<constant name="EndCapRadiator_c4_r1_DetTilt"             value="-0.112783 * rad"      />
+<constant name="EndCapRadiator_c4_r3_Curvature"             value="0.327512 * m"      />
+<constant name="EndCapRadiator_c4_r3_XPosition"             value="-0.126093 * m"      />
+<constant name="EndCapRadiator_c4_r3_ZPosition"             value="0.0427482 * m"      />
+<constant name="EndCapRadiator_c4_r3_DetPosition"             value="-0.0433654 * m"      />
+<constant name="EndCapRadiator_c4_r3_DetTilt"             value="-0.143649 * rad"      />
+<constant name="EndCapRadiator_c5_r2_Curvature"             value="0.324686 * m"      />
+<constant name="EndCapRadiator_c5_r2_XPosition"             value="-0.12464 * m"      />
+<constant name="EndCapRadiator_c5_r2_ZPosition"             value="0.0469601 * m"      />
+<constant name="EndCapRadiator_c5_r2_DetPosition"             value="-0.0383363 * m"      />
+<constant name="EndCapRadiator_c5_r2_DetTilt"             value="-0.186657 * rad"      />
+<constant name="EndCapRadiator_c5_r4_Curvature"             value="0.317135 * m"      />
+<constant name="EndCapRadiator_c5_r4_XPosition"             value="-0.121418 * m"      />
+<constant name="EndCapRadiator_c5_r4_ZPosition"             value="0.0532098 * m"      />
+<constant name="EndCapRadiator_c5_r4_DetPosition"             value="-0.0288431 * m"      />
+<constant name="EndCapRadiator_c5_r4_DetTilt"             value="-0.129972 * rad"      />
+<constant name="EndCapRadiator_c5_r1_Curvature"             value="0.323165 * m"      />
+<constant name="EndCapRadiator_c5_r1_XPosition"             value="-0.134206 * m"      />
+<constant name="EndCapRadiator_c5_r1_ZPosition"             value="0.0530051 * m"      />
+<constant name="EndCapRadiator_c5_r1_DetPosition"             value="-0.0443281 * m"      />
+<constant name="EndCapRadiator_c5_r1_DetTilt"             value="-0.20109 * rad"      />
+<constant name="EndCapRadiator_c5_r3_Curvature"             value="0.313826 * m"      />
+<constant name="EndCapRadiator_c5_r3_XPosition"             value="-0.118079 * m"      />
+<constant name="EndCapRadiator_c5_r3_ZPosition"             value="0.0570635 * m"      />
+<constant name="EndCapRadiator_c5_r3_DetPosition"             value="-0.0254509 * m"      />
+<constant name="EndCapRadiator_c5_r3_DetTilt"             value="-0.186348 * rad"      />
+<constant name="EndCapRadiator_c6_r2_Curvature"             value="0.312448 * m"      />
+<constant name="EndCapRadiator_c6_r2_XPosition"             value="-0.125109 * m"      />
+<constant name="EndCapRadiator_c6_r2_ZPosition"             value="0.0621203 * m"      />
+<constant name="EndCapRadiator_c6_r2_DetPosition"             value="-0.029028 * m"      />
+<constant name="EndCapRadiator_c6_r2_DetTilt"             value="-0.251983 * rad"      />
+<constant name="EndCapRadiator_c6_r4_Curvature"             value="0.306595 * m"      />
+<constant name="EndCapRadiator_c6_r4_XPosition"             value="-0.116272 * m"      />
+<constant name="EndCapRadiator_c6_r4_ZPosition"             value="0.0648111 * m"      />
+<constant name="EndCapRadiator_c6_r4_DetPosition"             value="-0.0159027 * m"      />
+<constant name="EndCapRadiator_c6_r4_DetTilt"             value="-0.19651 * rad"      />
+<constant name="EndCapRadiator_c6_r1_Curvature"             value="0.324725 * m"      />
+<constant name="EndCapRadiator_c6_r1_XPosition"             value="-0.138884 * m"      />
+<constant name="EndCapRadiator_c6_r1_ZPosition"             value="0.0577007 * m"      />
+<constant name="EndCapRadiator_c6_r1_DetPosition"             value="-0.0348118 * m"      />
+<constant name="EndCapRadiator_c6_r1_DetTilt"             value="-0.159627 * rad"      />
+<constant name="EndCapRadiator_c6_r3_Curvature"             value="0.305166 * m"      />
+<constant name="EndCapRadiator_c6_r3_XPosition"             value="-0.11767 * m"      />
+<constant name="EndCapRadiator_c6_r3_ZPosition"             value="0.0684136 * m"      />
+<constant name="EndCapRadiator_c6_r3_DetPosition"             value="-0.0169257 * m"      />
+<constant name="EndCapRadiator_c6_r3_DetTilt"             value="-0.211619 * rad"      />
+<constant name="EndCapRadiator_c7_r2_Curvature"             value="0.315405 * m"      />
+<constant name="EndCapRadiator_c7_r2_XPosition"             value="-0.130506 * m"      />
+<constant name="EndCapRadiator_c7_r2_ZPosition"             value="0.0646394 * m"      />
+<constant name="EndCapRadiator_c7_r2_DetPosition"             value="-0.024065 * m"      />
+<constant name="EndCapRadiator_c7_r2_DetTilt"             value="-0.124305 * rad"      />
+<constant name="EndCapRadiator_c6_r5_Curvature"             value="0.293591 * m"      />
+<constant name="EndCapRadiator_c6_r5_XPosition"             value="-0.150647 * m"      />
+<constant name="EndCapRadiator_c6_r5_ZPosition"             value="0.0848231 * m"      />
+<constant name="EndCapRadiator_c6_r5_DetPosition"             value="-0.0489362 * m"      />
+<constant name="EndCapRadiator_c6_r5_DetTilt"             value="-0.34349 * rad"      />
+<constant name="EndCapRadiator_c7_r4_Curvature"             value="0.305523 * m"      />
+<constant name="EndCapRadiator_c7_r4_XPosition"             value="-0.171981 * m"      />
+<constant name="EndCapRadiator_c7_r4_ZPosition"             value="0.0783345 * m"      />
+<constant name="EndCapRadiator_c7_r4_DetPosition"             value="-0.060806 * m"      />
+<constant name="EndCapRadiator_c7_r4_DetTilt"             value="-0.286207 * rad"      />
+<constant name="EndCapRadiator_c7_r1_Curvature"             value="0.347918 * m"      />
+<constant name="EndCapRadiator_c7_r1_XPosition"             value="-0.210358 * m"      />
+<constant name="EndCapRadiator_c7_r1_ZPosition"             value="0.0679805 * m"      />
+<constant name="EndCapRadiator_c7_r1_DetPosition"             value="-0.0614699 * m"      />
+<constant name="EndCapRadiator_c7_r1_DetTilt"             value="-0.413081 * rad"      />
+<constant name="EndCapRadiator_c7_r3_Curvature"             value="0.274816 * m"      />
+<constant name="EndCapRadiator_c7_r3_XPosition"             value="-0.186277 * m"      />
+<constant name="EndCapRadiator_c7_r3_ZPosition"             value="0.10374 * m"      />
+<constant name="EndCapRadiator_c7_r3_DetPosition"             value="-0.0485 * m"      />
+<constant name="EndCapRadiator_c7_r3_DetTilt"             value="-0.652112 * rad"      />
+<constant name="EndCapRadiator_c8_r2_Curvature"             value="0.220668 * m"      />
+<constant name="EndCapRadiator_c8_r2_XPosition"             value="-0.200031 * m"      />
+<constant name="EndCapRadiator_c8_r2_ZPosition"             value="0.101179 * m"      />
+<constant name="EndCapRadiator_c8_r2_DetPosition"             value="-0.117352 * m"      />
+<constant name="EndCapRadiator_c8_r2_DetTilt"             value="-1.3989 * rad"      />
+<!-- <constant name="EndCapRadiator_c6_r5_DetZOffset"             value="4.2 * mm"      /> -->
+</define>
+</lccdd >