Finally correcting the second (known and long overdue) bug in slat mapping

diff --git a/MUON/Calib/MappingData/Run0_999999999_v0_s0.root b/MUON/Calib/MappingData/Run0_999999999_v0_s0.root
index c31942676bab6626951bf941db9237f1a0641d04..b6a49ac045683c1e7ac28d65d64211a31bdfd5cc 100644 (file)
Binary files a/MUON/Calib/MappingData/Run0_999999999_v0_s0.root and b/MUON/Calib/MappingData/Run0_999999999_v0_s0.root differ

diff --git a/MUON/mapping/data/station345/R1B.pcb b/MUON/mapping/data/station345/R1B.pcb
index 80ee3c4902c4bfaa0477720acb13c2534b4a038f..33107a81c0b179776065ae13037e6d97750daa88 100644 (file)
--- a/MUON/mapping/data/station345/R1B.pcb
+++ b/MUON/mapping/data/station345/R1B.pcb
@@ -4,11 +4,11 @@
 
 SIZES 2.5 0.5 40 40
 
-MOTIF R41  9  0
-MOTIF L16 12  0
-MOTIF R42 13  0
-MOTIF L17 14  0
+MOTIF R43  9  0
+MOTIF O20 12  0
+MOTIF O20 14  0
 
-MOTIF O19 14 48
-MOTIF O19 12 48
-MOTIF R40  9 44
+MOTIF L24 14  32
+MOTIF R44 13  32
+MOTIF L25 12  32
+MOTIF R45 9   44

diff --git a/MUON/mapping/data/station345/makePadPos.C b/MUON/mapping/data/station345/makePadPos.C
index c66a4d7a58a5b8e22365494b3bca76733bed9362..f8fb7a6bd65d0e4f9b82335a61c27243f5222f31 100644 (file)
--- a/MUON/mapping/data/station345/makePadPos.C
+++ b/MUON/mapping/data/station345/makePadPos.C
@@ -24,7 +24,7 @@ std::vector<std::pair<int,int> > make_pattern(const std::string& what)
       cols.push_back(std::make_pair<int,int>(0,8));
     }
   else if ( what == "O9" || what == "O10" || what == "O11" || what == "O12" 
-           || what == "O17" || what == "O18" || what == "O19" )
+           || what == "O17" || what == "O18" || what == "O19" || what == "O20" )
     {
       add(cols,0,32);
       add(cols,0,32);
@@ -486,10 +486,37 @@ std::vector<std::pair<int,int> > make_pattern(const std::string& what)
   else if ( what == "D1" ) // dummy big motif of 16x80 to test
     {
       for ( int i = 0; i < 16; ++i )
-       {
-         add(cols,0,80);
-       }
+      {
+        add(cols,0,80);
+      }
     }
+  else if ( what == "R43" ) 
+  {
+    add(cols,0,7);
+    add(cols,0,21);
+    add(cols,0,36);
+  }
+  else if ( what == "L24")
+  {
+    add(cols,32,16);
+    add(cols,0,48);
+  }
+  else if ( what == "R44" )
+  {
+    add(cols,16,32);
+    add(cols,0,32);
+  }
+  else if ( what == "L25" )
+  {
+    add(cols,0,48);
+    add(cols,0,16);
+  }
+  else if ( what == "R45" ) 
+  {
+    add(cols,29,7);
+    add(cols,15,21);
+    add(cols,0,36);
+  }
   return cols;
 }
 

diff --git a/MUON/mapping/data/station345/motifL24.dat b/MUON/mapping/data/station345/motifL24.dat
new file mode 100644 (file)
index 0000000..7245e5b
--- /dev/null
+++ b/MUON/mapping/data/station345/motifL24.dat
@@ -0,0 +1,70 @@
+# Motif L24
+#
+#connecteur_berg kapton padname not_used
+#for slats there's no kapton connector, so it's always 1 (zero make the reader
+#abort, so it's not a valid value here).
+#
+33     1       1       -
+32     1       2       -
+31     1       3       -
+30     1       4       -
+29     1       5       -
+28     1       6       -
+27     1       7       -
+26     1       8       -
+25     1       9       -
+24     1       10      -
+23     1       11      -
+22     1       12      -
+21     1       13      -
+20     1       14      -
+19     1       15      -
+18     1       16      -
+17     1       17      -
+16     1       18      -
+15     1       19      -
+14     1       20      -
+13     1       21      -
+12     1       22      -
+11     1       23      -
+10     1       24      -
+9      1       25      -
+8      1       26      -
+7      1       27      -
+6      1       28      -
+5      1       29      -
+4      1       30      -
+3      1       31      -
+2      1       32      -
+52     1       33      -
+53     1       34      -
+54     1       35      -
+55     1       36      -
+56     1       37      -
+57     1       38      -
+58     1       39      -
+59     1       40      -
+60     1       41      -
+61     1       42      -
+62     1       43      -
+63     1       44      -
+64     1       45      -
+65     1       46      -
+66     1       47      -
+67     1       48      -
+68     1       49      -
+69     1       50      -
+70     1       51      -
+71     1       52      -
+72     1       53      -
+73     1       54      -
+74     1       55      -
+75     1       56      -
+76     1       57      -
+77     1       58      -
+78     1       59      -
+79     1       60      -
+80     1       61      -
+81     1       62      -
+82     1       63      -
+83     1       64      -

diff --git a/MUON/mapping/data/station345/motifL25.dat b/MUON/mapping/data/station345/motifL25.dat
new file mode 100644 (file)
index 0000000..53cce48
--- /dev/null
+++ b/MUON/mapping/data/station345/motifL25.dat
@@ -0,0 +1,70 @@
+# Motif L25
+#
+#connecteur_berg kapton padname not_used
+#for slats there's no kapton connector, so it's always 1 (zero make the reader
+#abort, so it's not a valid value here).
+#
+33     1       1       -
+32     1       2       -
+31     1       3       -
+30     1       4       -
+29     1       5       -
+28     1       6       -
+27     1       7       -
+26     1       8       -
+25     1       9       -
+24     1       10      -
+23     1       11      -
+22     1       12      -
+21     1       13      -
+20     1       14      -
+19     1       15      -
+18     1       16      -
+17     1       17      -
+16     1       18      -
+15     1       19      -
+14     1       20      -
+13     1       21      -
+12     1       22      -
+11     1       23      -
+10     1       24      -
+9      1       25      -
+8      1       26      -
+7      1       27      -
+6      1       28      -
+5      1       29      -
+4      1       30      -
+3      1       31      -
+2      1       32      -
+52     1       33      -
+53     1       34      -
+54     1       35      -
+55     1       36      -
+56     1       37      -
+57     1       38      -
+58     1       39      -
+59     1       40      -
+60     1       41      -
+61     1       42      -
+62     1       43      -
+63     1       44      -
+64     1       45      -
+65     1       46      -
+66     1       47      -
+67     1       48      -
+68     1       49      -
+69     1       50      -
+70     1       51      -
+71     1       52      -
+72     1       53      -
+73     1       54      -
+74     1       55      -
+75     1       56      -
+76     1       57      -
+77     1       58      -
+78     1       59      -
+79     1       60      -
+80     1       61      -
+81     1       62      -
+82     1       63      -
+83     1       64      -

diff --git a/MUON/mapping/data/station345/motifO20.dat b/MUON/mapping/data/station345/motifO20.dat
new file mode 100644 (file)
index 0000000..184de0e
--- /dev/null
+++ b/MUON/mapping/data/station345/motifO20.dat
@@ -0,0 +1,70 @@
+# Motif O20
+#
+#connecteur_berg kapton padname not_used
+#for slats there's no kapton connector, so it's always 1 (zero make the reader
+#abort, so it's not a valid value here).
+#
+52     1       1       -
+53     1       2       -
+54     1       3       -
+55     1       4       -
+56     1       5       -
+57     1       6       -
+58     1       7       -
+59     1       8       -
+60     1       9       -
+61     1       10      -
+62     1       11      -
+63     1       12      -
+64     1       13      -
+65     1       14      -
+66     1       15      -
+67     1       16      -
+68     1       17      -
+69     1       18      -
+70     1       19      -
+71     1       20      -
+72     1       21      -
+73     1       22      -
+74     1       23      -
+75     1       24      -
+76     1       25      -
+77     1       26      -
+78     1       27      -
+79     1       28      -
+80     1       29      -
+81     1       30      -
+82     1       31      -
+83     1       32      -
+33     1       33      -
+32     1       34      -
+31     1       35      -
+30     1       36      -
+29     1       37      -
+28     1       38      -
+27     1       39      -
+26     1       40      -
+25     1       41      -
+24     1       42      -
+23     1       43      -
+22     1       44      -
+21     1       45      -
+20     1       46      -
+19     1       47      -
+18     1       48      -
+17     1       49      -
+16     1       50      -
+15     1       51      -
+14     1       52      -
+13     1       53      -
+12     1       54      -
+11     1       55      -
+10     1       56      -
+9      1       57      -
+8      1       58      -
+7      1       59      -
+6      1       60      -
+5      1       61      -
+4      1       62      -
+3      1       63      -
+2      1       64      -

diff --git a/MUON/mapping/data/station345/motifR43.dat b/MUON/mapping/data/station345/motifR43.dat
new file mode 100644 (file)
index 0000000..49ebd17
--- /dev/null
+++ b/MUON/mapping/data/station345/motifR43.dat
@@ -0,0 +1,70 @@
+# Motif R43
+#
+#connecteur_berg kapton padname not_used
+#for slats there's no kapton connector, so it's always 1 (zero make the reader
+#abort, so it's not a valid value here).
+#
+77     1       1       -
+78     1       2       -
+79     1       3       -
+80     1       4       -
+81     1       5       -
+82     1       6       -
+83     1       7       -
+56     1       8       -
+57     1       9       -
+58     1       10      -
+59     1       11      -
+60     1       12      -
+61     1       13      -
+62     1       14      -
+63     1       15      -
+64     1       16      -
+65     1       17      -
+66     1       18      -
+67     1       19      -
+68     1       20      -
+69     1       21      -
+70     1       22      -
+71     1       23      -
+72     1       24      -
+73     1       25      -
+74     1       26      -
+75     1       27      -
+76     1       28      -
+33     1       29      -
+32     1       30      -
+31     1       31      -
+30     1       32      -
+29     1       33      -
+28     1       34      -
+27     1       35      -
+26     1       36      -
+25     1       37      -
+24     1       38      -
+23     1       39      -
+22     1       40      -
+21     1       41      -
+20     1       42      -
+19     1       43      -
+18     1       44      -
+17     1       45      -
+16     1       46      -
+15     1       47      -
+14     1       48      -
+13     1       49      -
+12     1       50      -
+11     1       51      -
+10     1       52      -
+9      1       53      -
+8      1       54      -
+7      1       55      -
+6      1       56      -
+5      1       57      -
+4      1       58      -
+3      1       59      -
+2      1       60      -
+52     1       61      -
+53     1       62      -
+54     1       63      -
+55     1       64      -

diff --git a/MUON/mapping/data/station345/motifR44.dat b/MUON/mapping/data/station345/motifR44.dat
new file mode 100644 (file)
index 0000000..ab00f71
--- /dev/null
+++ b/MUON/mapping/data/station345/motifR44.dat
@@ -0,0 +1,70 @@
+# Motif R44
+#
+#connecteur_berg kapton padname not_used
+#for slats there's no kapton connector, so it's always 1 (zero make the reader
+#abort, so it's not a valid value here).
+#
+33     1       1       -
+32     1       2       -
+31     1       3       -
+30     1       4       -
+29     1       5       -
+28     1       6       -
+27     1       7       -
+26     1       8       -
+25     1       9       -
+24     1       10      -
+23     1       11      -
+22     1       12      -
+21     1       13      -
+20     1       14      -
+19     1       15      -
+18     1       16      -
+17     1       17      -
+16     1       18      -
+15     1       19      -
+14     1       20      -
+13     1       21      -
+12     1       22      -
+11     1       23      -
+10     1       24      -
+9      1       25      -
+8      1       26      -
+7      1       27      -
+6      1       28      -
+5      1       29      -
+4      1       30      -
+3      1       31      -
+2      1       32      -
+52     1       33      -
+53     1       34      -
+54     1       35      -
+55     1       36      -
+56     1       37      -
+57     1       38      -
+58     1       39      -
+59     1       40      -
+60     1       41      -
+61     1       42      -
+62     1       43      -
+63     1       44      -
+64     1       45      -
+65     1       46      -
+66     1       47      -
+67     1       48      -
+68     1       49      -
+69     1       50      -
+70     1       51      -
+71     1       52      -
+72     1       53      -
+73     1       54      -
+74     1       55      -
+75     1       56      -
+76     1       57      -
+77     1       58      -
+78     1       59      -
+79     1       60      -
+80     1       61      -
+81     1       62      -
+82     1       63      -
+83     1       64      -

diff --git a/MUON/mapping/data/station345/motifR45.dat b/MUON/mapping/data/station345/motifR45.dat
new file mode 100644 (file)
index 0000000..c749f7b
--- /dev/null
+++ b/MUON/mapping/data/station345/motifR45.dat
@@ -0,0 +1,70 @@
+# Motif R45
+#
+#connecteur_berg kapton padname not_used
+#for slats there's no kapton connector, so it's always 1 (zero make the reader
+#abort, so it's not a valid value here).
+#
+33     1       1       -
+32     1       2       -
+31     1       3       -
+30     1       4       -
+29     1       5       -
+28     1       6       -
+27     1       7       -
+26     1       8       -
+25     1       9       -
+24     1       10      -
+23     1       11      -
+22     1       12      -
+21     1       13      -
+20     1       14      -
+19     1       15      -
+18     1       16      -
+17     1       17      -
+16     1       18      -
+15     1       19      -
+14     1       20      -
+13     1       21      -
+12     1       22      -
+11     1       23      -
+10     1       24      -
+9      1       25      -
+8      1       26      -
+7      1       27      -
+6      1       28      -
+5      1       29      -
+4      1       30      -
+3      1       31      -
+2      1       32      -
+52     1       33      -
+53     1       34      -
+54     1       35      -
+55     1       36      -
+56     1       37      -
+57     1       38      -
+58     1       39      -
+59     1       40      -
+60     1       41      -
+61     1       42      -
+62     1       43      -
+63     1       44      -
+64     1       45      -
+65     1       46      -
+66     1       47      -
+67     1       48      -
+68     1       49      -
+69     1       50      -
+70     1       51      -
+71     1       52      -
+72     1       53      -
+73     1       54      -
+74     1       55      -
+75     1       56      -
+76     1       57      -
+77     1       58      -
+78     1       59      -
+79     1       60      -
+80     1       61      -
+81     1       62      -
+82     1       63      -
+83     1       64      -

diff --git a/MUON/mapping/data/station345/padPosL24.dat b/MUON/mapping/data/station345/padPosL24.dat
new file mode 100644 (file)
index 0000000..a3a0990
--- /dev/null
+++ b/MUON/mapping/data/station345/padPosL24.dat
@@ -0,0 +1,64 @@
+1      0       32
+2      0       33
+3      0       34
+4      0       35
+5      0       36
+6      0       37
+7      0       38
+8      0       39
+9      0       40
+10     0       41
+11     0       42
+12     0       43
+13     0       44
+14     0       45
+15     0       46
+16     0       47
+17     1       0
+18     1       1
+19     1       2
+20     1       3
+21     1       4
+22     1       5
+23     1       6
+24     1       7
+25     1       8
+26     1       9
+27     1       10
+28     1       11
+29     1       12
+30     1       13
+31     1       14
+32     1       15
+33     1       16
+34     1       17
+35     1       18
+36     1       19
+37     1       20
+38     1       21
+39     1       22
+40     1       23
+41     1       24
+42     1       25
+43     1       26
+44     1       27
+45     1       28
+46     1       29
+47     1       30
+48     1       31
+49     1       32
+50     1       33
+51     1       34
+52     1       35
+53     1       36
+54     1       37
+55     1       38
+56     1       39
+57     1       40
+58     1       41
+59     1       42
+60     1       43
+61     1       44
+62     1       45
+63     1       46
+64     1       47

diff --git a/MUON/mapping/data/station345/padPosL25.dat b/MUON/mapping/data/station345/padPosL25.dat
new file mode 100644 (file)
index 0000000..a03a3ad
--- /dev/null
+++ b/MUON/mapping/data/station345/padPosL25.dat
@@ -0,0 +1,64 @@
+1      0       0
+2      0       1
+3      0       2
+4      0       3
+5      0       4
+6      0       5
+7      0       6
+8      0       7
+9      0       8
+10     0       9
+11     0       10
+12     0       11
+13     0       12
+14     0       13
+15     0       14
+16     0       15
+17     0       16
+18     0       17
+19     0       18
+20     0       19
+21     0       20
+22     0       21
+23     0       22
+24     0       23
+25     0       24
+26     0       25
+27     0       26
+28     0       27
+29     0       28
+30     0       29
+31     0       30
+32     0       31
+33     0       32
+34     0       33
+35     0       34
+36     0       35
+37     0       36
+38     0       37
+39     0       38
+40     0       39
+41     0       40
+42     0       41
+43     0       42
+44     0       43
+45     0       44
+46     0       45
+47     0       46
+48     0       47
+49     1       0
+50     1       1
+51     1       2
+52     1       3
+53     1       4
+54     1       5
+55     1       6
+56     1       7
+57     1       8
+58     1       9
+59     1       10
+60     1       11
+61     1       12
+62     1       13
+63     1       14
+64     1       15

diff --git a/MUON/mapping/data/station345/padPosO20.dat b/MUON/mapping/data/station345/padPosO20.dat
new file mode 100644 (file)
index 0000000..f6927f0
--- /dev/null
+++ b/MUON/mapping/data/station345/padPosO20.dat
@@ -0,0 +1,64 @@
+1      0       0
+2      0       1
+3      0       2
+4      0       3
+5      0       4
+6      0       5
+7      0       6
+8      0       7
+9      0       8
+10     0       9
+11     0       10
+12     0       11
+13     0       12
+14     0       13
+15     0       14
+16     0       15
+17     0       16
+18     0       17
+19     0       18
+20     0       19
+21     0       20
+22     0       21
+23     0       22
+24     0       23
+25     0       24
+26     0       25
+27     0       26
+28     0       27
+29     0       28
+30     0       29
+31     0       30
+32     0       31
+33     1       0
+34     1       1
+35     1       2
+36     1       3
+37     1       4
+38     1       5
+39     1       6
+40     1       7
+41     1       8
+42     1       9
+43     1       10
+44     1       11
+45     1       12
+46     1       13
+47     1       14
+48     1       15
+49     1       16
+50     1       17
+51     1       18
+52     1       19
+53     1       20
+54     1       21
+55     1       22
+56     1       23
+57     1       24
+58     1       25
+59     1       26
+60     1       27
+61     1       28
+62     1       29
+63     1       30
+64     1       31

diff --git a/MUON/mapping/data/station345/padPosR43.dat b/MUON/mapping/data/station345/padPosR43.dat
new file mode 100644 (file)
index 0000000..f366452
--- /dev/null
+++ b/MUON/mapping/data/station345/padPosR43.dat
@@ -0,0 +1,64 @@
+1      0       0
+2      0       1
+3      0       2
+4      0       3
+5      0       4
+6      0       5
+7      0       6
+8      1       0
+9      1       1
+10     1       2
+11     1       3
+12     1       4
+13     1       5
+14     1       6
+15     1       7
+16     1       8
+17     1       9
+18     1       10
+19     1       11
+20     1       12
+21     1       13
+22     1       14
+23     1       15
+24     1       16
+25     1       17
+26     1       18
+27     1       19
+28     1       20
+29     2       0
+30     2       1
+31     2       2
+32     2       3
+33     2       4
+34     2       5
+35     2       6
+36     2       7
+37     2       8
+38     2       9
+39     2       10
+40     2       11
+41     2       12
+42     2       13
+43     2       14
+44     2       15
+45     2       16
+46     2       17
+47     2       18
+48     2       19
+49     2       20
+50     2       21
+51     2       22
+52     2       23
+53     2       24
+54     2       25
+55     2       26
+56     2       27
+57     2       28
+58     2       29
+59     2       30
+60     2       31
+61     2       32
+62     2       33
+63     2       34
+64     2       35

diff --git a/MUON/mapping/data/station345/padPosR44.dat b/MUON/mapping/data/station345/padPosR44.dat
new file mode 100644 (file)
index 0000000..b023a4d
--- /dev/null
+++ b/MUON/mapping/data/station345/padPosR44.dat
@@ -0,0 +1,64 @@
+1      0       16
+2      0       17
+3      0       18
+4      0       19
+5      0       20
+6      0       21
+7      0       22
+8      0       23
+9      0       24
+10     0       25
+11     0       26
+12     0       27
+13     0       28
+14     0       29
+15     0       30
+16     0       31
+17     0       32
+18     0       33
+19     0       34
+20     0       35
+21     0       36
+22     0       37
+23     0       38
+24     0       39
+25     0       40
+26     0       41
+27     0       42
+28     0       43
+29     0       44
+30     0       45
+31     0       46
+32     0       47
+33     1       0
+34     1       1
+35     1       2
+36     1       3
+37     1       4
+38     1       5
+39     1       6
+40     1       7
+41     1       8
+42     1       9
+43     1       10
+44     1       11
+45     1       12
+46     1       13
+47     1       14
+48     1       15
+49     1       16
+50     1       17
+51     1       18
+52     1       19
+53     1       20
+54     1       21
+55     1       22
+56     1       23
+57     1       24
+58     1       25
+59     1       26
+60     1       27
+61     1       28
+62     1       29
+63     1       30
+64     1       31

diff --git a/MUON/mapping/data/station345/padPosR45.dat b/MUON/mapping/data/station345/padPosR45.dat
new file mode 100644 (file)
index 0000000..982fd41
--- /dev/null
+++ b/MUON/mapping/data/station345/padPosR45.dat
@@ -0,0 +1,64 @@
+1      0       29
+2      0       30
+3      0       31
+4      0       32
+5      0       33
+6      0       34
+7      0       35
+8      1       15
+9      1       16
+10     1       17
+11     1       18
+12     1       19
+13     1       20
+14     1       21
+15     1       22
+16     1       23
+17     1       24
+18     1       25
+19     1       26
+20     1       27
+21     1       28
+22     1       29
+23     1       30
+24     1       31
+25     1       32
+26     1       33
+27     1       34
+28     1       35
+29     2       0
+30     2       1
+31     2       2
+32     2       3
+33     2       4
+34     2       5
+35     2       6
+36     2       7
+37     2       8
+38     2       9
+39     2       10
+40     2       11
+41     2       12
+42     2       13
+43     2       14
+44     2       15
+45     2       16
+46     2       17
+47     2       18
+48     2       19
+49     2       20
+50     2       21
+51     2       22
+52     2       23
+53     2       24
+54     2       25
+55     2       26
+56     2       27
+57     2       28
+58     2       29
+59     2       30
+60     2       31
+61     2       32
+62     2       33
+63     2       34
+64     2       35