Merge pull request #1 from rathjd/master

Fixed merging issues, headers, lowered fit stat requirements
cms-data · Jul 7, 2021 · 9727b33 · 9727b33
2 parents a51d5fd + 6279b61
commit 9727b33
Show file tree

Hide file tree

Showing 60 changed files with 473 additions and 521 deletions.
diff --git a/...C/SlopeCorrection/FacingChambers/CSCconsistency_2to1_SlopeShift_ME11_even_GE11_layer1.mem b/...C/SlopeCorrection/FacingChambers/CSCconsistency_2to1_SlopeShift_ME11_even_GE11_layer1.mem
@@ -3,14 +3,14 @@
 1
 1
 2
-2
+3
 3
 3
 4
 5
 5
 6
-6
+7
 7
 8
 9
diff --git a/...C/SlopeCorrection/FacingChambers/CSCconsistency_2to1_SlopeShift_ME11_even_GE11_layer1.txt b/...C/SlopeCorrection/FacingChambers/CSCconsistency_2to1_SlopeShift_ME11_even_GE11_layer1.txt
@@ -6,14 +6,14 @@
 2 1
 3 1
 4 2
-5 2
+5 3
 6 3
 7 3
 8 4
 9 5
 10 5
 11 6
-12 6
+12 7
 13 7
 14 8
 15 9
diff --git a/...C/SlopeCorrection/FacingChambers/CSCconsistency_2to1_SlopeShift_ME11_even_GE11_layer2.mem b/...C/SlopeCorrection/FacingChambers/CSCconsistency_2to1_SlopeShift_ME11_even_GE11_layer2.mem
@@ -8,9 +8,9 @@
 4
 4
 5
+5
+6
 6
 6
 7
-8
-9
-a
+7
diff --git a/...C/SlopeCorrection/FacingChambers/CSCconsistency_2to1_SlopeShift_ME11_even_GE11_layer2.txt b/...C/SlopeCorrection/FacingChambers/CSCconsistency_2to1_SlopeShift_ME11_even_GE11_layer2.txt
@@ -11,9 +11,9 @@
 7 4
 8 4
 9 5
-10 6
+10 5
 11 6
-12 7
-13 8
-14 9
-15 10
+12 6
+13 6
+14 7
+15 7
diff --git a/...SC/SlopeCorrection/FacingChambers/CSCconsistency_2to1_SlopeShift_ME11_odd_GE11_layer1.mem b/...SC/SlopeCorrection/FacingChambers/CSCconsistency_2to1_SlopeShift_ME11_odd_GE11_layer1.mem
@@ -1,16 +1,16 @@
 0
+0
+1
 1
 2
+2
 3
 3
 4
 4
-4
-4
-4
-4
-4
-4
-4
-4
-4
+5
+6
+6
+7
+8
+9
diff --git a/...SC/SlopeCorrection/FacingChambers/CSCconsistency_2to1_SlopeShift_ME11_odd_GE11_layer1.txt b/...SC/SlopeCorrection/FacingChambers/CSCconsistency_2to1_SlopeShift_ME11_odd_GE11_layer1.txt
@@ -2,18 +2,18 @@
 #Structure is input slope (uint16_t) -> output slope (uint16_t)
 #<header> v1.0 4 32 </header>
 0 0
-1 1
-2 2
-3 3
-4 3
-5 4
-6 4
-7 4
+1 0
+2 1
+3 1
+4 2
+5 2
+6 3
+7 3
 8 4
 9 4
-10 4
-11 4
-12 4
-13 4
-14 4
-15 4
+10 5
+11 6
+12 6
+13 7
+14 8
+15 9
diff --git a/...SC/SlopeCorrection/FacingChambers/CSCconsistency_2to1_SlopeShift_ME11_odd_GE11_layer2.mem b/...SC/SlopeCorrection/FacingChambers/CSCconsistency_2to1_SlopeShift_ME11_odd_GE11_layer2.mem
@@ -1,16 +1,16 @@
 0
+0
+1
 1
 2
 2
 3
 3
 3
-3
-3
-3
-3
-3
-3
-3
-3
-3
+4
+4
+4
+4
+4
+5
+5
diff --git a/...SC/SlopeCorrection/FacingChambers/CSCconsistency_2to1_SlopeShift_ME11_odd_GE11_layer2.txt b/...SC/SlopeCorrection/FacingChambers/CSCconsistency_2to1_SlopeShift_ME11_odd_GE11_layer2.txt
@@ -2,18 +2,18 @@
 #Structure is input slope (uint16_t) -> output slope (uint16_t)
 #<header> v1.0 4 32 </header>
 0 0
-1 1
-2 2
-3 2
-4 3
-5 3
+1 0
+2 1
+3 1
+4 2
+5 2
 6 3
 7 3
 8 3
-9 3
-10 3
-11 3
-12 3
-13 3
-14 3
-15 3
+9 4
+10 4
+11 4
+12 4
+13 4
+14 5
+15 5
diff --git a/...C/SlopeCorrection/FacingChambers/CSCconsistency_3to1_SlopeShift_ME11_even_GE11_layer2.mem b/...C/SlopeCorrection/FacingChambers/CSCconsistency_3to1_SlopeShift_ME11_even_GE11_layer2.mem
@@ -1,16 +1,16 @@
 0
 0
-1
-1
-1
-2
-2
-2
-3
-3
-4
-4
-4
-5
-5
-6
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
diff --git a/...C/SlopeCorrection/FacingChambers/CSCconsistency_3to1_SlopeShift_ME11_even_GE11_layer2.txt b/...C/SlopeCorrection/FacingChambers/CSCconsistency_3to1_SlopeShift_ME11_even_GE11_layer2.txt
@@ -3,17 +3,17 @@
 #<header> v1.0 4 32 </header>
 0 0
 1 0
-2 1
-3 1
-4 1
-5 2
-6 2
-7 2
-8 3
-9 3
-10 4
-11 4
-12 4
-13 5
-14 5
-15 6
+2 0
+3 0
+4 0
+5 0
+6 0
+7 0
+8 0
+9 0
+10 0
+11 0
+12 0
+13 0
+14 0
+15 0
diff --git a/...SC/SlopeCorrection/FacingChambers/CSCconsistency_3to1_SlopeShift_ME11_odd_GE11_layer1.mem b/...SC/SlopeCorrection/FacingChambers/CSCconsistency_3to1_SlopeShift_ME11_odd_GE11_layer1.mem
@@ -1,16 +1,16 @@
 0
 0
-1
-1
-1
-1
-2
-2
-2
-3
-3
-3
-4
-4
-4
-5
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
diff --git a/...SC/SlopeCorrection/FacingChambers/CSCconsistency_3to1_SlopeShift_ME11_odd_GE11_layer1.txt b/...SC/SlopeCorrection/FacingChambers/CSCconsistency_3to1_SlopeShift_ME11_odd_GE11_layer1.txt
@@ -3,17 +3,17 @@
 #<header> v1.0 4 32 </header>
 0 0
 1 0
-2 1
-3 1
-4 1
-5 1
-6 2
-7 2
-8 2
-9 3
-10 3
-11 3
-12 4
-13 4
-14 4
-15 5
+2 0
+3 0
+4 0
+5 0
+6 0
+7 0
+8 0
+9 0
+10 0
+11 0
+12 0
+13 0
+14 0
+15 0
diff --git a/...SC/SlopeCorrection/FacingChambers/CSCconsistency_3to1_SlopeShift_ME11_odd_GE11_layer2.mem b/...SC/SlopeCorrection/FacingChambers/CSCconsistency_3to1_SlopeShift_ME11_odd_GE11_layer2.mem
@@ -1,16 +1,16 @@
 0
 0
-1
-1
-1
-2
-2
-2
-3
-3
-3
-4
-4
-5
-5
-6
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
diff --git a/...SC/SlopeCorrection/FacingChambers/CSCconsistency_3to1_SlopeShift_ME11_odd_GE11_layer2.txt b/...SC/SlopeCorrection/FacingChambers/CSCconsistency_3to1_SlopeShift_ME11_odd_GE11_layer2.txt
@@ -3,17 +3,17 @@
 #<header> v1.0 4 32 </header>
 0 0
 1 0
-2 1
-3 1
-4 1
-5 2
-6 2
-7 2
-8 3
-9 3
-10 3
-11 4
-12 4
-13 5
-14 5
-15 6
+2 0
+3 0
+4 0
+5 0
+6 0
+7 0
+8 0
+9 0
+10 0
+11 0
+12 0
+13 0
+14 0
+15 0
diff --git a/GEMCSC/SlopeCorrection/FacingChambers/GEMCSCSlopeCorr_ME11_even_GE11_layer1.mem b/GEMCSC/SlopeCorrection/FacingChambers/GEMCSCSlopeCorr_ME11_even_GE11_layer1.mem
@@ -5,12 +5,12 @@ c
 16
 1b
 1e
-21
+22
 24
 26
-27
 28
 29
 2a
 2a
-2a
+2b
+2b
-Original file line number
+Diff line change
@@ Expand Up / @@ -6,14 +6,14 @@ @@
 1
 1
 2
-2
+3
 3
 3
 4
 5
 5
 6
-6
+7
 7
 8
 9