Skip to content
Snippets Groups Projects

Resolve "MRICH overlap in master branch"

Merged Wouter Deconinck requested to merge cherry-pick-3efb3867 into acadia
2 files
+ 21
18
Compare changes
  • Side-by-side
  • Inline
Files
2
+ 8
7
@@ -91,19 +91,20 @@
@@ -91,19 +91,20 @@
</photodet>
</photodet>
</module>
</module>
<comment>
<comment>
Modules are only listed here for one quadrant
Modules are only listed here for one quadrant. The modules point back to the
 
z0 position (should be their actual position, but breaks parametrization).
</comment>
</comment>
<positions scale="1.03">
<positions scale="1.03" z0="157.5*cm">
<position x="-41.3250000000" y="178.6750000000"/>
<position x="-41.3250000000" y="178.6750000000"/>
<position x=" 96.0250000001" y="178.6750000000"/>
<position x=" 96.0250000001" y="178.6750000000"/>
</positions>
</positions>
<positions scale="1.036">
<positions scale="1.036" z0="157.5*cm">
<position x="-41.3250000000" y="316.0250000001"/>
<position x="-41.3250000000" y="316.0250000001"/>
<position x=" 96.0250000001" y="316.0250000001"/>
<position x=" 96.0250000001" y="316.0250000001"/>
<position x="233.3750000002" y="178.6750000000"/>
<position x="233.3750000002" y="178.6750000000"/>
<position x="233.3750000002" y="316.0250000001"/>
<position x="233.3750000002" y="316.0250000001"/>
</positions>
</positions>
<positions scale="1.052">
<positions scale="1.052" z0="157.5*cm">
<position x="-41.3250000000" y="453.3750000002"/>
<position x="-41.3250000000" y="453.3750000002"/>
<position x=" 96.0250000001" y="453.3750000002"/>
<position x=" 96.0250000001" y="453.3750000002"/>
<position x="233.3750000002" y="453.3750000002"/>
<position x="233.3750000002" y="453.3750000002"/>
@@ -111,7 +112,7 @@
@@ -111,7 +112,7 @@
<position x="370.7250000003" y="316.0250000001"/>
<position x="370.7250000003" y="316.0250000001"/>
<position x="370.7250000003" y="178.6750000000"/>
<position x="370.7250000003" y="178.6750000000"/>
</positions>
</positions>
<positions scale="1.078">
<positions scale="1.078" z0="157.5*cm">
<position x="-41.3250000000" y="590.7250000003"/>
<position x="-41.3250000000" y="590.7250000003"/>
<position x=" 96.0250000001" y="590.7250000003"/>
<position x=" 96.0250000001" y="590.7250000003"/>
<position x="233.3750000002" y="590.7250000003"/>
<position x="233.3750000002" y="590.7250000003"/>
@@ -121,7 +122,7 @@
@@ -121,7 +122,7 @@
<position x="508.0750000004" y="316.0250000001"/>
<position x="508.0750000004" y="316.0250000001"/>
<position x="508.0750000004" y="453.3750000002"/>
<position x="508.0750000004" y="453.3750000002"/>
</positions>
</positions>
<positions scale="1.09">
<positions scale="1.09" z0="157.5*cm">
<position x="-41.3250000000" y="728.0750000004"/>
<position x="-41.3250000000" y="728.0750000004"/>
<position x=" 96.0250000001" y="728.0750000004"/>
<position x=" 96.0250000001" y="728.0750000004"/>
<!--position x="233.3750000002" y="728.0750000004"/-->
<!--position x="233.3750000002" y="728.0750000004"/-->
@@ -132,7 +133,7 @@
@@ -132,7 +133,7 @@
<position x="645.4250000005" y="316.0250000001"/>
<position x="645.4250000005" y="316.0250000001"/>
<position x="645.4250000005" y="178.6750000000"/>
<position x="645.4250000005" y="178.6750000000"/>
</positions>
</positions>
<positions scale="1.095">
<positions scale="1.095" z0="157.5*cm">
<!--position x="-41.3250000000" y="865.4250000005"/-->
<!--position x="-41.3250000000" y="865.4250000005"/-->
<!--position x=" 96.0250000001" y="865.4250000005"/-->
<!--position x=" 96.0250000001" y="865.4250000005"/-->
<!--position x="233.3750000002" y="865.4250000005"/-->
<!--position x="233.3750000002" y="865.4250000005"/-->
Loading