Merge lp:~maus-mlcr/maus/maus-patch into lp:maus

[Durga Rajaram]

Patch release with geometry download/mangling scripts modified for supporting extra virtual planes in gdml

=== modified file 'README'
--- README	2018-01-13 16:41:50 +0000
+++ README	2018-01-22 09:26:24 +0000
@@ -1,4 +1,4 @@
-MAUS release version 3.1.0
+MAUS release version 3.1.1
 
 1.  Introduction
 

=== modified file 'RELEASENOTES'
--- RELEASENOTES	2018-01-13 16:41:50 +0000
+++ RELEASENOTES	2018-01-22 09:26:24 +0000
@@ -5,6 +5,9 @@
 
 Release Notes
 =============
+MAUS-v3.1.1
+  This is a patch for 3.1.0
+    - Geometry: added support for extra virtual planes
 MAUS-v3.1.0
   The following changes were made:
     - EMR: reconstruction improvements and bug fixes

=== modified file 'src/common_cpp/Utils/VersionNumber.hh'
--- src/common_cpp/Utils/VersionNumber.hh	2018-01-13 16:41:50 +0000
+++ src/common_cpp/Utils/VersionNumber.hh	2018-01-22 09:26:24 +0000
@@ -24,7 +24,7 @@
 #ifndef MAUS_VERSION_NUMBER
 #define MAUS_VERSION_NUMBER_X 3
 #define MAUS_VERSION_NUMBER_Y 1
-#define MAUS_VERSION_NUMBER_Z 0
+#define MAUS_VERSION_NUMBER_Z 1
 #define MAUS_VERSION_NUMBER() \
         (MAUS_VERSION_NUMBER_X*1000+\
         MAUS_VERSION_NUMBER_Y*100+\

=== modified file 'src/common_py/geometry/GDMLtoMAUSModule.py'
--- src/common_py/geometry/GDMLtoMAUSModule.py	2017-12-14 18:46:57 +0000
+++ src/common_py/geometry/GDMLtoMAUSModule.py	2018-01-22 09:26:24 +0000
@@ -41,7 +41,7 @@
             'iris1_closed.gdml', 'iris2_open.gdml', 'iris3_open.gdml',\
             'iris3_closed.gdml', 'iris4_open.gdml',\
             'iris2_closed.gdml', 'iris1_open.gdml',\
-            'iris4_closed.gdml']
+            'iris4_closed.gdml', 'ssu_virtuals.gdml', 'ssd_virtuals.gdml']
 
 class GDMLtomaus(): #pylint: disable = R0902, R0903
     """

=== modified file 'src/common_py/geometry/xsltScripts/ParentFileCreation.xsl'
--- src/common_py/geometry/xsltScripts/ParentFileCreation.xsl	2018-01-11 12:06:56 +0000
+++ src/common_py/geometry/xsltScripts/ParentFileCreation.xsl	2018-01-22 09:26:24 +0000
@@ -313,6 +313,35 @@
                          PropertyBool RepeatModule2 True
                          PropertyInt NumberOfRepeats 48
                         }
+
+     	                Module Virtual
+                        {
+                         Volume None
+                         Position 0.0 0.0 13205.0 mm
+                         PropertyString SensitiveDetector Virtual
+                        }
+                            
+     	                Module Virtual
+                        {
+                         Volume None
+                         Position 0.0 0.0 13305.0 mm
+                         PropertyString SensitiveDetector Virtual
+                        }
+
+     	                Module Virtual
+                        {
+                         Volume None
+                         Position 0.0 0.0 16445.0 mm
+                         PropertyString SensitiveDetector Virtual
+                        }
+                            
+     	                Module Virtual
+                        {
+                         Volume None
+                         Position 0.0 0.0 20447.0 mm
+                         PropertyString SensitiveDetector Virtual
+                        }
+                            
                             
                             // Detectors
                  <xsl:for-each select="MICE_Information/Detector_Information/*/*/physvol">