diff --git a/.viewana.prm b/.viewana.prm
index f50dd082d701d3e7bf675235abed0b613b3a307b..bc926ff0b188c9f81bf604df3cdffbf5782724ac 100644
--- a/.viewana.prm
+++ b/.viewana.prm
@@ -1,65 +1,11 @@
 @gate
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
 @and
- 
- 
- 
- 
- 
- 
- 
 @or
- 
- 
 @xy
 @1D
  
  
  
-@2D
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
  
  
  
@@ -81,6 +27,7 @@
  
  
  
+@2D
  
  
  
diff --git a/a b/a
index ae36238aca79f42983ca629a357903d223fcfb7c..cd66a6e190c63cfa45111906f8838691fc6fd6f4 120000
--- a/a
+++ b/a
@@ -1 +1 @@
-ridf/physics0168.ridf
\ No newline at end of file
+ridf/physics0180.ridf
\ No newline at end of file
diff --git a/ana/.#mi.ana b/ana/.#mi.ana
deleted file mode 120000
index eb0253597590f4c130142b7954b25fb3df0c26aa..0000000000000000000000000000000000000000
--- a/ana/.#mi.ana
+++ /dev/null
@@ -1 +0,0 @@
-crib@cribana.30450:1640587433
\ No newline at end of file
diff --git a/ana/mpos.ana b/ana/mpos.ana
index dec83963f218ba1ae35d89aeafdecca8e764d543..18bffb7e072dd1e11c54318ebc7161e29950088a 100644
--- a/ana/mpos.ana
+++ b/ana/mpos.ana
@@ -3,51 +3,51 @@ analys
 5
 
 hst1
-0, 5,1,1,4, 350,350,700, 'MUX 1-1 P1 zoom'
-0, 5,1,1,5, 350,400,750, 'MUX 1-1 P2 zoom'
+0, 5,1,1,4, 550,250,800, 'MUX 1-1 P1 zoom'
+0, 5,1,1,5, 550,300,850, 'MUX 1-1 P2 zoom'
 0, 5,1,1,14, 18,-0.5,17.5, 'MUX 1-1 P1n'
 0, 5,1,1,15, 18,-0.5,17.5, 'MUX 1-1 P2n'
 hst2
-0, 5,1,1,4, 5,1,1,14, 350,350,700, 18,-0.5,17.5, 'MUX 1-1 P1n vs P1 zoom'
-0, 5,1,1,5, 5,1,1,15, 350,400,750, 18,-0.5,17.5, 'MUX 1-1 p2n vs P2 zoom'
+0, 5,1,1,4, 5,1,1,14, 550,250,800, 18,-0.5,17.5, 'MUX 1-1 P1n vs P1 zoom'
+0, 5,1,1,5, 5,1,1,15, 550,300,850, 18,-0.5,17.5, 'MUX 1-1 p2n vs P2 zoom'
 hst1
-0, 5,2,2,4, 350,680,1030, 'MUX 1-2 P1 zoom'
-0, 5,2,2,5, 350,700,1050, 'MUX 1-2 P2 zoom'
+0, 5,2,2,4, 550,600,1150, 'MUX 1-2 P1 zoom'
+0, 5,2,2,5, 550,600,1150, 'MUX 1-2 P2 zoom'
 0, 5,2,2,14, 18,-0.5,17.5, 'MUX 1-2 P1n'
 0, 5,2,2,15, 18,-0.5,17.5, 'MUX 1-2 P2n'
 hst2
 0, 5,2,2,4, 5,2,2,14, 350,680,1030, 18,-0.5,17.5, 'MUX 1-2 P1n vs P1 zoom'
 0, 5,2,2,5, 5,2,2,15, 350,700,1050, 18,-0.5,17.5, 'MUX 1-2 P2n vs P2 zoom'
 hst1
-0, 5,3,3,4, 350,900,1250, 'MUX 2-1 P1 zoom'
-0, 5,3,3,5, 300,950,1250, 'MUX 2-1 P2 zoom'
+0, 5,3,3,4, 550,650,1200, 'MUX 2-1 P1 zoom'
+0, 5,3,3,5, 550,650,1200, 'MUX 2-1 P2 zoom'
 0, 5,3,3,14, 18,-0.5,17.5, 'MUX 2-1 P1n'
 0, 5,3,3,15, 18,-0.5,17.5, 'MUX 2-1 P2n'
 hst2
-0, 5,3,3,4, 5,3,3,14, 350,900,1250, 18,-0.5,17.5, 'MUX 2-1 P1n vs P1 zoom'
-0, 5,3,3,5, 5,3,3,15, 300,950,1250, 18,-0.5,17.5, 'MUX 2-1 P2n vs P2 zoom'
+0, 5,3,3,4, 5,3,3,14, 550,700,1450, 18,-0.5,17.5, 'MUX 2-1 P1n vs P1 zoom'
+0, 5,3,3,5, 5,3,3,15, 550,700,1450, 18,-0.5,17.5, 'MUX 2-1 P2n vs P2 zoom'
 hst1
-0, 5,4,4,4, 350,1200,1550, 'MUX 2-2 P1 zoom'
-0, 5,4,4,5, 350,1250,1600, 'MUX 2-2 P2 zoom'
+0, 5,4,4,4, 550,1250,1800, 'MUX 2-2 P1 zoom'
+0, 5,4,4,5, 550,1250,1800, 'MUX 2-2 P2 zoom'
 0, 5,4,4,14, 18,-0.5,17.5, 'MUX 2-2 P1n'
 0, 5,4,4,15, 18,-0.5,17.5, 'MUX 2-2 P2n'
 hst2
-0, 5,4,4,4, 5,4,4,14, 350,1200,1550, 18,-0.5,17.5, 'MUX 2-2 P1n vs P1 zoom'
-0, 5,4,4,5, 5,4,4,15, 350,1250,1600, 18,-0.5,17.5, 'MUX 2-2 P2n vs P2 zoom'
+0, 5,4,4,4, 5,4,4,14, 550,1250,1800, 18,-0.5,17.5, 'MUX 2-2 P1n vs P1 zoom'
+0, 5,4,4,5, 5,4,4,15, 550,1250,1800, 18,-0.5,17.5, 'MUX 2-2 P2n vs P2 zoom'
 hst1
-0, 5,5,5,4, 300,1550,1850, 'MUX 3-1 P1 zoom'
-0, 5,5,5,5, 350,1550,1900, 'MUX 3-1 P2 zoom'
+0, 5,5,5,4, 600,1300,1900, 'MUX 3-1 P1 zoom'
+0, 5,5,5,5, 600,1300,1900, 'MUX 3-1 P2 zoom'
 0, 5,5,5,14, 18,-0.5,17.5, 'MUX 3-1 P1n'
 0, 5,5,5,15, 18,-0.5,17.5, 'MUX 3-1 P2n'
 hst2
-0, 5,5,5,4, 5,5,5,14, 300,1550,1850, 18,-0.5,17.5, 'MUX 3-1 P1n vs P1 zoom'
-0, 5,5,5,5, 5,5,5,15, 350,1550,1900, 18,-0.5,17.5, 'MUX 3-1 P2n vs P2 zoom'
+0, 5,5,5,4, 5,5,5,14, 500,1350,1850, 18,-0.5,17.5, 'MUX 3-1 P1n vs P1 zoom'
+0, 5,5,5,5, 5,5,5,15, 500,1350,1850, 18,-0.5,17.5, 'MUX 3-1 P2n vs P2 zoom'
 hst1
-0, 5,6,6,4, 350,1800,2150, 'MUX 3-2 P1 zoom'
-0, 5,6,6,5, 350,1700,2050, 'MUX 3-2 P2 zoom'
+0, 5,6,6,4, 600,1600,2200, 'MUX 3-2 P1 zoom'
+0, 5,6,6,5, 600,1600,2200, 'MUX 3-2 P2 zoom'
 0, 5,6,6,14, 18,-0.5,17.5, 'MUX 3-2 P1n'
 0, 5,6,6,15, 18,-0.5,17.5, 'MUX 3-2 P2n'
 hst2
-0, 5,6,6,4, 5,6,6,14, 350,1800,2150, 18,-0.5,17.5, 'MUX 3-2 P1n vs P1 zoom'
-0, 5,6,6,5, 5,6,6,15, 350,1700,2050, 18,-0.5,17.5, 'MUX 3-2 P2n vs P2 zoom'
+0, 5,6,6,4, 5,6,6,14, 600,1400,2000, 18,-0.5,17.5, 'MUX 3-2 P1n vs P1 zoom'
+0, 5,6,6,5, 5,6,6,15, 600,1400,2000, 18,-0.5,17.5, 'MUX 3-2 P2n vs P2 zoom'
 exit
diff --git a/ana/pi_f3.ana b/ana/pi_f3.ana
index 0ffd3c00bbb50deab5967d85c69466a2083301f5..1b992f228bc25000cf257f2d098c054a4a1669ed 100644
--- a/ana/pi_f3.ana
+++ b/ana/pi_f3.ana
@@ -64,7 +64,7 @@ gate
 
 c
 hst1
-0, 3,1,3,3, 4,-0.5,3.5, 'Coin Reg.'
+0, 3,1,3,3, 3,0.5,3.5, 'Coin Reg.'
 0, 1,1,1,2, 200,1,100, 'RF1'
 0, 1,1,1,3, 200,1,100, 'RF2'
 
diff --git a/ana/run.ana b/ana/run.ana
index 69e77246f03918f2c61d4f4a3ca2ce22166b2eb4..8a2b2ab04cf98b3f458865f354ab47c993b1957f 100644
--- a/ana/run.ana
+++ b/ana/run.ana
@@ -85,9 +85,11 @@ hst2
 131, 2,10,10,2,  2,10,10,3, 100,-50.,50., 100,-50.,50., 'target X*Y (mm) 26Si gated'
 
 0, 2,1,1,24,  1,1,1,2, 100,-50.,50., 200,0.,100., 'F3PPACa X * RF1'
-0, 2,2,2,24,  1,1,1,2, 100,-50.,50., 200,0.,100., 'F3PPACb X * RF1'
 12, 2,1,1,24,  1,1,1,2, 100,-50.,50., 200,0.,100., 'F3PPACa X * RF1 coin'
 11, 2,1,1,24,  1,1,1,2, 100,-50.,50., 200,0.,100., 'F3PPACa X * RF1 beamsingle'
+0, 2,2,2,24,  1,1,1,2, 100,-50.,50., 200,0.,100., 'F3PPACb X * RF1'
+12, 2,2,2,24,  1,1,1,2, 100,-50.,50., 200,0.,100., 'F3PPACb X * RF1 coin'
+11, 2,2,2,24,  1,1,1,2, 100,-50.,50., 200,0.,100., 'F3PPACb X * RF1 beamsingle'
 131, 2,1,1,24,  1,1,1,2, 100,-50.,50., 200,0.,100., 'F3PPACa X * RF1 26Si'
 136, 2,1,1,24,  1,1,1,2, 100,-50.,50., 200,0.,100., 'F3PPACa X * RF1 25Al?'
 0, 2,10,10,2, 1,1,1,2, 100,-50.,50., 200,0.,100., 'Tgt X * RF1'
@@ -128,8 +130,8 @@ c0, 5,6,6,18, 5,6,6,13, 16,0.5,16.5, 500,0,40, 'MUX 3-2 E2cal vs P2 strip'
 0, 7,1,1,12, 7,1,1,13, 200,0,15, 200,0,20, 'tel 1 E1 vs dE2'
 0, 7,1,1,13, 7,1,1,14, 200,0,20, 200,0,20, 'tel 1 E2 vs E1'
 21, 7,1,1,11, 7,1,1,2, 200,0,10, 200,0,40, 'tel 1 Esum vs dE1 26Si coin'
-21, 7,1,1,11, 7,1,1,2, 200,0,10, 200,0,100, 'tel 1 Esum vs dE1 26Si coin'
 21, 7,1,1,11, 7,1,1,12, 200,0,10, 200,0,15, 'tel 1 dE2 vs dE1 26Si coin'
+21, 7,1,1,11, 7,1,1,12, 200,0,30, 200,0,40, 'tel 1 dE2 vs dE1 26Si coin'
 0, 7,2,2,11, 7,2,2,2, 200,0,10, 200,0,40, 'tel 2 Esum vs dE1'
 0, 7,2,2,11, 7,2,2,12, 200,0,10, 200,0,15, 'tel 2 dE2 vs dE1'
 0, 7,2,2,12, 7,2,2,13, 200,0,15, 200,0,20, 'tel 2 E1 vs dE2'
diff --git a/ana/test.ana b/ana/test.ana
new file mode 100644
index 0000000000000000000000000000000000000000..d48ea6b6c58c3cd8a2e70ba52d94cc6b28a1102d
--- /dev/null
+++ b/ana/test.ana
@@ -0,0 +1,168 @@
+c still old one
+analys
+1
+2
+3
+4
+5
+6
+7
+c 11 single, 12 coin, 13 pileup
+gate
+11, 3,1,1,3, 0.5,1.5
+12, 3,2,2,3, 1.5,2.5
+13, 3,3,3,3, 2.5,3.5
+cxygate
+c@,anapaw.cut
+gate
+c beam TOF vs RF
+gate
+132, 2,100,100,2, 7,11.
+133, 1,1,1,2, 21.,32.
+c133, 1,1,1,2, 28.,37.
+134, 1,1,1,2, 72.,86.
+c134, 1,1,1,2, 80.,89.
+or 
+135, 133, 134
+c impurity #1
+gate
+138, 1,1,1,2, 58.,70.
+139, 1,1,1,3, 58.,70.
+or 
+140, 138, 139
+and 
+131, 132, 135 
+136, 140 
+
+
+gate 
+c lowgain unknown particle (only usable for some runs)
+201, 6,13,16,2, 1000,2500
+
+
+c gate for "good event"
+c coin, no pile up, 26Si
+and
+21, 12, -13, 131 
+
+
+c PPAC position gates
+301, 2,2,2,24, -10,10
+302, 2,2,2,25, -10,10
+and
+310, 301,302
+500, 310,106
+c 
+gate
+20, 2,10,10,6, 0,15
+
+
+c
+hst1
+0, 3,1,3,3, 3, 0.5,3.5, 'Coin reg'
+0, 1,1,1,2, 200,1,100, 'RF1'
+0, 1,1,1,3, 200,1,100, 'RF2'
+
+hst2
+
+0, 1,1,1,2, 1,1,1,3, 200,1,100, 200,1,100, 'RF2 vs 1'
+
+hst2
+0, 2,1,1,24,  2,1,1,25, 100,-50.,50., 100,-50.,50., 'F3a X*Y (mm)'
+12, 2,1,1,24,  2,1,1,25, 100,-50.,50., 100,-50.,50., 'F3a X*Y (mm) coin'
+11, 2,1,1,24,  2,1,1,25, 100,-50.,50., 100,-50.,50., 'F3a X*Y (mm) beamsingle'
+131, 2,1,1,24,  2,1,1,25, 100,-50.,50., 100,-50.,50., 'F3a X*Y (mm) 26Si gated'
+
+0, 2,2,2,24,  2,2,2,25, 100,-50.,50., 100,-50.,50., 'F3b X*Y (mm)'
+12, 2,2,2,24,  2,2,2,25, 100,-50.,50., 100,-50.,50., 'F3b X*Y (mm) coin'
+11, 2,2,2,24,  2,2,2,25, 100,-50.,50., 100,-50.,50., 'F3b X*Y (mm) beamsingle'
+131, 2,2,2,24,  2,2,2,25, 100,-50.,50., 100,-50.,50., 'F3b X*Y (mm) 26Si gated'
+
+0, 2,10,10,2,  2,10,10,3, 100,-50.,50., 100,-50.,50., 'target X*Y (mm)'
+12, 2,10,10,2,  2,10,10,3, 100,-50.,50., 100,-50.,50., 'target X*Y (mm) coin'
+11, 2,10,10,2,  2,10,10,3, 100,-50.,50., 100,-50.,50., 'target X*Y (mm) beamsingle'
+20, 2,10,10,2,  2,10,10,3, 100,-50.,50., 100,-50.,50., 'target X*Y (mm) window'
+131, 2,10,10,2,  2,10,10,3, 100,-50.,50., 100,-50.,50., 'target X*Y (mm) 26Si gated'
+
+0, 2,1,1,24,  1,1,1,2, 100,-50.,50., 200,0.,100., 'F3PPACa X * RF1'
+0, 2,2,2,24,  1,1,1,2, 100,-50.,50., 200,0.,100., 'F3PPACb X * RF1'
+12, 2,1,1,24,  1,1,1,2, 100,-50.,50., 200,0.,100., 'F3PPACa X * RF1 coin'
+11, 2,1,1,24,  1,1,1,2, 100,-50.,50., 200,0.,100., 'F3PPACa X * RF1 beamsingle'
+131, 2,1,1,24,  1,1,1,2, 100,-50.,50., 200,0.,100., 'F3PPACa X * RF1 26Si'
+136, 2,1,1,24,  1,1,1,2, 100,-50.,50., 200,0.,100., 'F3PPACa X * RF1 25Al?'
+
+0, 2,2,2,24,  1,1,1,2, 100,-50.,50., 200,0.,100., 'F3PPACb X * RF1'
+12, 2,2,2,24,  1,1,1,2, 100,-50.,50., 200,0.,100., 'F3PPACb X * RF1 coin'
+11, 2,2,2,24,  1,1,1,2, 100,-50.,50., 200,0.,100., 'F3PPACb X * RF1 beamsingle'
+131, 2,2,2,24,  1,1,1,2, 100,-50.,50., 200,0.,100., 'F3PPACb X * RF1 26Si'
+136, 2,2,2,24,  1,1,1,2, 100,-50.,50., 200,0.,100., 'F3PPACb X * RF1 25Al?'
+
+0, 2,10,10,2, 1,1,1,2, 100,-50.,50., 200,0.,100., 'Tgt X * RF1'
+131, 2,10,10,2, 1,1,1,2, 100,-50.,50., 200,0.,100., 'Tgt X * RF1 26Si'
+0, 1,1,1,2, 2,100,100,2, 200,0.,100., 100,-5.,40.,  'TOF * RF1'
+
+
+hst2
+0, 4,1,64,1, 4,1,64,2, 64,0.5,64.5, 200,0,4000, 'DSSD Eraw vs ch'
+0, 4,1,64,1, 4,1,64,4, 64,0.5,64.5, 200,0,20, 'DSSD Ecal vs ch'
+0, 4,1,64,1, 4,1,64,3, 64,0.5,64.5, 200,0,10000, 'DSSD Traw vs ch'
+0, 4,1,64,1, 4,1,64,5, 64,0.5,64.5, 200,0,800, 'DSSD Tcal vs ch'
+
+0, 7,1,1,2, 4,102,102,5, 200,0,40, 200,0,1000, 'Tel1-2 Tcal vs Esum1'
+0, 7,2,2,2, 4,103,103,5, 200,0,40, 200,0,1000, 'Tel2-2 Tcal vs Esum2'
+0, 7,3,3,2, 4,104,104,5, 200,0,40, 200,0,1000, 'Tel3-2 Tcal vs Esum3'
+
+21, 7,1,1,2, 4,102,102,5, 200,0,40, 200,0,1000, 'Tel1-2 Tcal vs Esum1 26Si coin'
+21, 7,2,2,2, 4,103,103,5, 200,0,40, 200,0,1000, 'Tel2-2 Tcal vs Esum2 26Si coin'
+21, 7,3,3,2, 4,104,104,5, 200,0,40, 200,0,1000, 'Tel3-2 Tcal vs Esum3 26Si coin'
+
+
+0, 5,1,1,17, 5,1,1,12, 16,0.5,16.5, 500,0,40, 'MUX 1-1 E1cal vs P1 strip'
+c0, 5,1,1,18, 5,1,1,13, 16,0.5,16.5, 500,0,40, 'MUX 1-1 E2cal vs P2 strip'
+0, 5,2,2,17, 5,2,2,12, 16,0.5,16.5, 500,0,40, 'MUX 1-2 E1cal vs P1 strip'
+c0, 5,2,2,18, 5,2,2,13, 16,0.5,16.5, 500,0,40, 'MUX 1-2 E2cal vs P2 strip'
+0, 5,3,3,17, 5,3,3,12, 16,0.5,16.5, 500,0,40, 'MUX 2-1 E1cal vs P1 strip'
+c0, 5,3,3,18, 5,3,3,13, 16,0.5,16.5, 500,0,40, 'MUX 2-1 E2cal vs P2 strip'
+0, 5,4,4,17, 5,4,4,12, 16,0.5,16.5, 500,0,40, 'MUX 2-2 E1cal vs P1 strip'
+c0, 5,4,4,18, 5,4,4,13, 16,0.5,16.5, 500,0,40, 'MUX 2-2 E2cal vs P2 strip'
+0, 5,5,5,17, 5,5,5,12, 16,0.5,16.5, 500,0,40, 'MUX 3-1 E1cal vs P1 strip'
+c0, 5,5,5,18, 5,5,5,13, 16,0.5,16.5, 500,0,40, 'MUX 3-1 E2cal vs P2 strip'
+0, 5,6,6,17, 5,6,6,12, 16,0.5,16.5, 500,0,40, 'MUX 3-2 E1cal vs P1 strip'
+c0, 5,6,6,18, 5,6,6,13, 16,0.5,16.5, 500,0,40, 'MUX 3-2 E2cal vs P2 strip'
+
+0, 7,1,1,11, 7,1,1,2, 200,0,10, 200,0,40, 'tel 1 Esum vs dE1'
+0, 7,1,1,11, 7,1,1,12, 200,0,10, 200,0,15, 'tel 1 dE2 vs dE1'
+0, 7,1,1,12, 7,1,1,13, 200,0,15, 200,0,20, 'tel 1 E1 vs dE2'
+0, 7,1,1,13, 7,1,1,14, 200,0,20, 200,0,20, 'tel 1 E2 vs E1'
+21, 7,1,1,11, 7,1,1,2, 200,0,10, 200,0,40, 'tel 1 Esum vs dE1 26Si coin'
+21, 7,1,1,11, 7,1,1,12, 200,0,10, 200,0,15, 'tel 1 dE2 vs dE1 26Si coin'
+21, 7,1,1,11, 7,1,1,12, 200,0,30, 200,0,40, 'tel 1 dE2 vs dE1 26Si coin'
+0, 7,2,2,11, 7,2,2,2, 200,0,10, 200,0,40, 'tel 2 Esum vs dE1'
+0, 7,2,2,11, 7,2,2,12, 200,0,10, 200,0,15, 'tel 2 dE2 vs dE1'
+0, 7,2,2,12, 7,2,2,13, 200,0,15, 200,0,20, 'tel 2 E1 vs dE2'
+0, 7,2,2,13, 7,2,2,14, 200,0,20, 200,0,20, 'tel 2 E2 vs E1'
+21, 7,2,2,11, 7,2,2,2, 200,0,10, 200,0,40, 'tel 2 Esum vs dE1 26Si coin'
+21, 7,2,2,11, 7,2,2,12, 200,0,10, 200,0,15, 'tel 2 dE2 vs dE1 26Si coin'
+0, 7,3,3,11, 7,3,3,2, 200,0,10, 200,0,40, 'tel 3 Esum vs dE1'
+0, 7,3,3,11, 7,3,3,12, 200,0,10, 200,0,15, 'tel 3 dE2 vs dE1'
+0, 7,3,3,12, 7,3,3,13, 200,0,15, 200,0,20, 'tel 3 E1 vs dE2'
+0, 7,3,3,13, 7,3,3,14, 200,0,20, 200,0,20, 'tel 3 E2 vs E1'
+0, 7,4,4,11, 7,4,4,2, 200,0,10, 200,0,40, 'tel 4 Esum vs dE1'
+0, 7,4,4,11, 7,4,4,12, 200,0,10, 200,0,15, 'tel 4 dE2 vs dE1'
+0, 7,4,4,12, 7,4,4,13, 200,0,15, 200,0,20, 'tel 4 E1 vs dE2'
+0, 7,4,4,13, 7,4,4,14, 200,0,20, 200,0,20, 'tel 4 E2 vs E1'
+0, 7,5,5,11, 7,5,5,2, 200,0,10, 200,0,40, 'tel 5 Esum vs dE1'
+0, 7,5,5,11, 7,5,5,12, 200,0,10, 200,0,15, 'tel 5 dE2 vs dE1'
+0, 7,5,5,12, 7,5,5,13, 200,0,15, 200,0,20, 'tel 5 E1 vs dE2'
+0, 7,5,5,13, 7,5,5,14, 200,0,20, 200,0,20, 'tel 5 E2 vs E1'
+
+0, 6,1,17,1, 6,1,17,2, 17,0.5,17.5, 200,0,4000, 'SSD Eraw vs ch'
+0, 6,1,17,1, 6,1,17,4, 17,0.5,17.5, 200,0,20, 'SSD Ecal vs ch'
+0, 6,1,17,1, 6,1,17,3, 17,0.5,17.5, 200,0,10000, 'SSD Traw vs ch'
+
+
+
+
+exit
+
+
diff --git a/ana/#mi.ana# b/ana/tmp_mi.ana
similarity index 97%
rename from ana/#mi.ana#
rename to ana/tmp_mi.ana
index b0f46f296e5c1256d5698173acaf442fffa811cc..a78c6c8961d57f3998fbd25ba6c07d4acd1c4c8c 100644
--- a/ana/#mi.ana#
+++ b/ana/tmp_mi.ana
@@ -18,13 +18,13 @@ gate
 c beam TOF vs RF
 gate
 132, 2,100,100,2, 7,11.
-133, 1,1,1,2, 21.,32.
-134, 1,1,1,2, 72.,86.
+133, 1,1,1,2, 21.,28.　
+134, 1,1,1,2, 72.,80.  
 or 
 135, 133, 134
 c impurity #1
 gate
-138, 1,1,1,2, 57.,70.
+138, 1,1,1,2, 57.,70. 
 139, 1,1,1,3, 57.,70.
 or 
 140, 138, 139
@@ -35,10 +35,10 @@ and
 
 gate 
 c lowgain unknown particle 
-201, 6,13,16,2, 100qexi0,2500
+201, 6,13,16,2, 1000,2500
 
 c PPAC position gates
-301, 2,2,2,24, -ht 10,10
+301, 2,2,2,24, -10,10
 302, 2,2,2,25, -10,10
 and
 310, 301,302
@@ -101,7 +101,7 @@ c
 135, 5,5,5,6, 5,5,5,12, 160,0.,10000., 500,0,40, 'MUX 3-1 E1cal vs Traw Si26'
 135, 5,5,5,6, 5,5,5,13, 160,0.,10000., 500,0,40, 'MUX 3-1 E2cal vs Traw Si26'
 135, 5,6,6,6, 5,6,6,12, 160,0.,10000., 500,0,40, 'MUX 3-2 E1cal vs Traw Si26'
-135, 5,6,6,6,ht  5,6,6,13, 160,0.,10000., 500,0,40, 'MUX 3-2 E2cal vs Traw Si26'
+135, 5,6,6,6, 5,6,6,13, 160,0.,10000., 500,0,40, 'MUX 3-2 E2cal vs Traw Si26'
 c check SSD (6)
 135, 6,1,17,1, 6,1,17,2, 17,0.5,17.5, 200,0,4000, 'SSD Eraw vs ch Si26'
 135, 6,1,17,1, 6,1,17,4, 17,0.5,17.5, 200,0,20, 'SSD Ecal vs ch Si26'
diff --git a/anapaw_last.kumacold b/anapaw_last.kumacold
index 5cd484424be879c11ed303e071526a05e2205193..16fd18f528f0618443d51f7c0b7339cc4bf5e151 100644
--- a/anapaw_last.kumacold
+++ b/anapaw_last.kumacold
@@ -1,5 +1,4 @@
-*** Begin of history file: Sun Jan 23 22:55:37 2022
-a/l
+*** Begin of history file: Mon Jan 24 19:02:43 2022
 a/l a
 exit
-*** End   of history file: Sun Jan 23 23:04:05 2022
+*** End   of history file: Mon Jan 24 19:04:51 2022
diff --git a/last.kumac b/last.kumac
deleted file mode 100644
index 8375fde67f2dbe9c7f36cc7799457b5509c5c086..0000000000000000000000000000000000000000
--- a/last.kumac
+++ /dev/null
@@ -1,77 +0,0 @@
-*** Begin of history file: Sun Jan 23 19:14:21 2022
-exe kumac/runs
-i
-ht 101
-hn
-hn
-hn cont
-lgz
-lgz
-hn cont
-hn cont
-hn cont
-hn cont
-hn cont
-hn cont
-hn cont
-hn cont
-hn cont
-hn cont
-hn cont
-hn cont
-hn cont
-hn cont
-hn cont
-hn cont
-hn cont
-hn cont
-hn cont
-hn cont
-hn cont
-hn cont
-hn cont
-hn cont
-hn cont
-hn cont
-hn cont
-hn cont
-hn cont
-hn cont
-hn cont
-hn cont
-hn cont
-hn cont
-hn cont
-hn cont
-hn cont
-hn cont
-hn cont
-hn cont
-hn cont
-hn cont
-hn cont
-hn cont
-hn cont
-hn cont
-hn cont
-hn cont
-hn cont
-hn cont
-hn cont
-hn cont
-hn cont
-hn cont
-hn cont
-hn cont
-hn cont
-hn cont
-hn cont
-hn cont
-hn cont
-hn cont
-hn cont
-hn cont
-hn cont
-hn cont
-hn cont
-*** End   of history file: Sun Jan 23 23:05:02 2022
diff --git a/last.kumacold b/last.kumacold
index 356714e26c4c4d7790b59e0f21f8a1beca46fcd8..9df762ef3eafcd4c8e1857ed8e012c0ffdb67849 100644
--- a/last.kumacold
+++ b/last.kumacold
@@ -1,52 +1,27 @@
-*** Begin of history file: Sun Jan 23 19:14:21 2022
-exe kumac/runs
+*** Begin of history file: Mon Jan 24 18:21:00 2022
+a/l ridf/physics0183.ridf
+ht
+ht
+book ana/mpos.ana
+start
+a/l ridf/physics0183.ridf
+ht
+hn
+hn
+hn
+hn
+hn
+hn
+hn
+hn
+hn
+hn
+hn
+hn
+start
 i
 ht 101
 hn
+ht 109
 hn
-hn cont
-lgz
-lgz
-hn cont
-hn cont
-hn cont
-hn cont
-hn cont
-hn cont
-hn cont
-hn cont
-hn cont
-hn cont
-hn cont
-hn cont
-hn cont
-hn cont
-hn cont
-hn cont
-hn cont
-hn cont
-hn cont
-hn cont
-hn cont
-hn cont
-hn cont
-hn cont
-hn cont
-hn cont
-hn cont
-hn cont
-hn cont
-hn cont
-hn cont
-hn cont
-hn cont
-hn cont
-hn cont
-hn cont
-hn cont
-hn cont
-hn cont
-hn cont
-hn cont
-hn cont
-*** End   of history file: Sun Jan 23 23:04:09 2022
+*** End   of history file: Mon Jan 24 18:21:56 2022
diff --git a/paw.metafile b/paw.metafile
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/src/anapaw b/src/anapaw
index c50083dcfd7154c24fb000646edcbdca974e42a0..b984232e1855794baca468fd86be39fcba720b15 100755
Binary files a/src/anapaw and b/src/anapaw differ
diff --git a/src/enc_mssd.f b/src/enc_mssd.f
index 006a0a571fd79b708119c3ccdb5239e74ba64f93..0e68d600a18fd1263f5bd928f809bc92e5112556 100644
--- a/src/enc_mssd.f
+++ b/src/enc_mssd.f
@@ -11,7 +11,7 @@ c  2021.11 Made by HY from encgeneric
       integer nhitdet
       integer analyzer
       real val(nx,ny)
-      integer i,j,id,pos1,pos2,strip1,strip2
+      integer i,j,id,sid,pos1,pos2,strip1,strip2
 
       real tmp, coffset, civ, chigh
       real pos_cal1(18)
@@ -48,12 +48,18 @@ c      write(*,*) ' ANAPAW-M : analyzer =',analyzer, ' nhitdet =',nhitdet
 c         write(*,*) 'id =',hitdet(i),' nhit =',nhitdata(id)
          naok = id
 c         naok = naok + 1
+c Jan 24 MUX2-1 and MUX-3-1 merged
+         sid = id
+         if (id.eq.3) then  
+            sid= 5
+         endif   
+
          val(1,naok) = id
-         val(2,naok) = rawdata(1,id) ! Araw1
-         val(3,naok) = rawdata(2,id) ! Araw2
-         val(4,naok) = rawdata(3,id) ! P1
-         val(5,naok) = rawdata(4,id) ! P2
-         val(6,naok) = rawdata(5,id) ! Traw
+         val(2,naok) = rawdata(1,sid) ! Araw1
+         val(3,naok) = rawdata(2,sid) ! Araw2
+         val(4,naok) = rawdata(3,sid) ! P1
+         val(5,naok) = rawdata(4,sid) ! P2
+         val(6,naok) = rawdata(5,sid) ! Traw
 
 
 c     Need a position spectrum-> ch number
@@ -62,7 +68,7 @@ c     Need a position spectrum-> ch number
          civ = pos_interval_mssd(2*id-1) 
          chigh = pos_highpeak_mssd(2*id-1)
 
-         tmp = (rawdata(3,id) - coffset + 0.5*civ) /
+         tmp = (rawdata(3,sid) - coffset + 0.5*civ) /
      &           (chigh - coffset + civ)
 
          pos1 = 0
@@ -86,7 +92,7 @@ c     &       pos_highpeak_mssd(id)
          civ = pos_interval_mssd(2*id) 
          chigh = pos_highpeak_mssd(2*id)
 
-         tmp = (rawdata(4,id) - coffset + 0.5*civ) /
+         tmp = (rawdata(4,sid) - coffset + 0.5*civ) /
      &           (chigh - coffset + civ)
 
 
@@ -105,7 +111,7 @@ c     &       pos_highpeak_mssd(id)
 
 
          if ((pos1.ge.1).and.(pos1.le.16)) then 
-         val(12,naok) = (rawdata(1,id)-Offset_a_mssd((ID-1)*16+pos1)) 
+         val(12,naok) = (rawdata(1,sid)-Offset_a_mssd((ID-1)*16+pos1)) 
      &        * Gain_a_mssd((ID-1)*16+pos1) ! Acal
          else 
             val(12,naok) = 0
@@ -114,7 +120,7 @@ c         write (*,*) 'pos1=', pos1
 c         write (*,*) 'val(12,naok),id=', val(12,naok),id
 
          if ((pos2.ge.1).and.(pos2.le.16)) then 
-         val(13,naok) = (rawdata(2,id)-Offset_a_mssd((ID-1)*16+pos2)) 
+         val(13,naok) = (rawdata(2,sid)-Offset_a_mssd((ID-1)*16+pos2)) 
      &        * Gain_a_mssd((ID-1)*16+pos2) ! Acal
          else 
             val(13,naok) = 0
@@ -144,27 +150,27 @@ c digitized position
 
          do j=1,16
             if(strip1.eq.j) then
-                val(20+j,naok) = rawdata(1,id)
+                val(20+j,naok) = rawdata(1,sid)
             endif
             if(strip2.eq.j) then
-                val(40+j,naok) = rawdata(2,id)
+                val(40+j,naok) = rawdata(2,sid)
             endif
          end do
 
          do j=1,16
             if(strip1.eq.j) then
-                val(60+j,naok) = (rawdata(1,id)-Offset_a_mssd((ID-1)*16
+                val(60+j,naok) = (rawdata(1,sid)-Offset_a_mssd((ID-1)*16
      &          +pos1)) * Gain_a_mssd((ID-1)*16+pos1) ! Acal
             endif
             if(strip2.eq.j) then
-                val(80+j,naok) = (rawdata(2,id)-Offset_a_mssd((ID-1)*16
+                val(80+j,naok) = (rawdata(2,sid)-Offset_a_mssd((ID-1)*16
      &          +pos2)) * Gain_a_mssd((ID-1)*16+pos2) ! Acal
             endif
          end do
 c        write (*,*) 'pos1=',val(14,naok)
 
          if ((pos1.ge.1).and.(pos1.le.16)) then 
-         val(16,naok) = (rawdata(5,id)-Offset_t_mssd((ID-1)*16+pos1))  
+         val(16,naok) = (rawdata(5,sid)-Offset_t_mssd((ID-1)*16+pos1))  
      &        * Gain_t_mssd((ID-1)*16+pos1) !Tcal pos1 only?
          else 
             val(16,naok) = 0
diff --git a/src/enc_mssd.o b/src/enc_mssd.o
index 5baa84cd7355b909b0519bb6d15fd1307b386797..2976af620e1e1c57c42400c770712acf3322bccb 100644
Binary files a/src/enc_mssd.o and b/src/enc_mssd.o differ
diff --git a/src/mssd.prm b/src/mssd.prm
index be7077d6f0c704362c4f5ff4af640675e16f4bfa..73dbd5a0c9b7661c4d609cffe33d74ff056d51d0 100644
--- a/src/mssd.prm
+++ b/src/mssd.prm
@@ -85,7 +85,11 @@ c393, 434.0, 713, 735.0, 933.7, 967.9, 1233.1, 1282.0, 1581.8, 1604.4, 1847.8, 1
 c data0084 and 85 mux2,3
 c393.0, 434.0, 713.0, 735.0, 951.6, 978.5, 1245.1, 1282.0, 1580.1, 1602.0, 1846.1, 1760.0
 c physics0175 (P2 and MUX2-1 signal cannot be seen)
-369.0, 369.0, 710.0, 710.0, 951.6, 978.5, 1193.0, 1193.0, 1572.0, 1572.0, 1837.0, 1825.0
+c369.0, 369.0, 710.0, 710.0, 951.6, 978.5, 1193.0, 1193.0, 1572.0, 1572.0, 1837.0, 1825.0
+c physics180 MUX2-1 -> MUX 3-1
+369.0, 369.0, 710.0, 710.0, 887.8, 887.8, 1308.8, 1308.8, 1458.4, 1458.4, 1655.9, 1655.9
+c
+c
 c pos_interval (ADC ch between neighboring positions)
 c17.28, 17.0, 17.718, 17.0, 17.343, 17.0, 18.21, 17.0, 17.98, 17.0, 18.037, 17.0
 c data0084 and 85 mux2,3
@@ -103,4 +107,6 @@ c661, 694.0, 999, 1006.0, 1188.7, 1223.3, 1520.2, 1545.0, 1856.5, 1851.0, 2122,
 c data0084 and 85 mux2,3
 c661.0, 694.0, 999.0, 1006.0, 1210.9, 1223.3, 1520.2, 1545.0, 1854.6, 1857.7, 2120.9, 2001.0
 c physics0175 (P2 and MUX2-1 signal cannot be seen)
-623.5, 623.5, 996.0, 996.0, 951.6, 978.5, 1456.0, 1456.0, 1846.0, 1846.0, 2111.0, 2111.0
+c623.5, 623.5, 996.0, 996.0, 951.6, 978.5, 1456.0, 1456.0, 1846.0, 1846.0, 2111.0, 2111.0
+c physics180 MUX2-1 -> MUX 3-1
+623.5, 623.5, 996.0, 996.0, 1124.9, 1124.9, 1598.8, 1598.8, 1705.8, 1705.8, 1909, 1909.0