diff --git a/.viewana.prm b/.viewana.prm index f50dd082d701d3e7bf675235abed0b613b3a307b..b622d34bd252deee3839bb379f9eb3848d13139e 100644 --- a/.viewana.prm +++ b/.viewana.prm @@ -1,95 +1,6 @@ @gate - - - - - - - - - - @and - - - - - - - @or - - @xy @1D - - - @2D - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/a b/a new file mode 120000 index 0000000000000000000000000000000000000000..ae36238aca79f42983ca629a357903d223fcfb7c --- /dev/null +++ b/a @@ -0,0 +1 @@ +ridf/physics0168.ridf \ No newline at end of file diff --git a/ana/#mi.ana# b/ana/#mi.ana# index 1486171f771ce56c19c820cadafe0b1d3faf6361..b0f46f296e5c1256d5698173acaf442fffa811cc 100644 --- a/ana/#mi.ana# +++ b/ana/#mi.ana# @@ -35,10 +35,10 @@ and gate c lowgain unknown particle -201, 6,13,16,2, 1000,2500 +201, 6,13,16,2, 100qexi0,2500 c PPAC position gates -301, 2,2,2,24, -10,10 +301, 2,2,2,24, -ht 10,10 302, 2,2,2,25, -10,10 and 310, 301,302 diff --git a/ana/mpos-r.ana b/ana/mpos-r.ana index 3a1d1c41d77fb9f56cdda6019a3c3218627ed908..008965fffde4e05bc2f49e255205781d09aeafa6 100644 --- a/ana/mpos-r.ana +++ b/ana/mpos-r.ana @@ -3,7 +3,9 @@ analys 5 hst1 -0, 5,1,1,4, 350,350,700, 'MUX 1-1 P1 zoom' +0, 5,1,1,4, 1000,0,4000, 'MUX 1-1 P1raw' +0, 5,1,1,5, 1000,0,4000, 'MUX 1-1 P2raw' +0, 5,1,1,4, 300,350,650, 'MUX 1-1 P1 zoom' 0, 5,1,1,5, 350,400,750, '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' @@ -11,6 +13,8 @@ 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' hst1 +0, 5,2,2,4, 1000,0,4000, 'MUX 1-2 P1raw' +0, 5,2,2,5, 1000,0,4000, 'MUX 1-2 P2raw' 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,14, 18,-0.5,17.5, 'MUX 1-2 P1n' @@ -19,6 +23,8 @@ 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, 1000,0,4000, 'MUX 2-1 P1raw' +0, 5,3,3,5, 1000,0,4000, 'MUX 2-1 P2raw' 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,14, 18,-0.5,17.5, 'MUX 2-1 P1n' @@ -27,6 +33,8 @@ 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' hst1 +0, 5,4,4,4, 1000,0,4000, 'MUX 2-2 P1raw' +0, 5,4,4,5, 1000,0,4000, 'MUX 2-2 P2raw' 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,14, 18,-0.5,17.5, 'MUX 2-2 P1n' @@ -35,6 +43,8 @@ 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' hst1 +0, 5,5,5,4, 1000,0,4000, 'MUX 3-1 P1raw' +0, 5,5,5,5, 1000,0,4000, 'MUX 3-1 P2raw' 0, 5,5,5,4, 300,1550,1950, 'MUX 3-1 P1 zoom' 0, 5,5,5,5, 350,1550,1900, 'MUX 3-1 P2 zoom' 0, 5,5,5,14, 18,-0.5,17.5, 'MUX 3-1 P1n' @@ -43,6 +53,8 @@ hst2 0, 5,5,5,4, 5,5,5,14, 300,1550,1950, 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' hst1 +0, 5,6,6,4, 1000,0,4000, 'MUX 3-2 P1raw' +0, 5,6,6,5, 1000,0,4000, 'MUX 3-2 P2raw' 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,14, 18,-0.5,17.5, 'MUX 3-2 P1n' diff --git a/anapaw_last.kumacold b/anapaw_last.kumacold index bd9c3600336899477431074c3ddb6686d633cc3f..0ee6c818296ad60075c0aa3b2abfab8aa7cede8a 100644 --- a/anapaw_last.kumacold +++ b/anapaw_last.kumacold @@ -1,4 +1,4 @@ -*** Begin of history file: Sun Jan 23 19:44:42 2022 -a/l ridf/physics168.ridf +*** Begin of history file: Sun Jan 23 22:29:57 2022 +hbt cont exit -*** End of history file: Sun Jan 23 19:49:16 2022 +*** End of history file: Sun Jan 23 22:30:11 2022 diff --git a/last.kumacold b/last.kumacold index 0af0f66c74b8feb3bd14ec932b18f681acf7c7c2..426ea227639b947d775b643111f911268499a2f3 100644 --- a/last.kumacold +++ b/last.kumacold @@ -1,52 +1,52 @@ -*** Begin of history file: Sun Jan 23 00:19:54 2022 -a/l -a/l ridf/secondary0150.ridf +*** Begin of history file: Sun Jan 23 22:03:29 2022 +a/l ridf/physics0175.ridf i -ht +ht 101 lgy -ht +ht 101 +ht 102 hn -hn -hn -hn -hn -hn -hn -hn -hn -hn -hn -hn -lny -htp colz -lgz -htp colz -hn -hn -hn -hn -hn -hn -hn -hn -hn -hn -htp colz +hb +hb +zoo i -hstore hbk/secondary0150_lowgain.hbk -era -a/l ridf/secondary0151.ridf +ht 111 +ht 109 +zone 2 2 +ht 101 +ht 109 +ht 117 +ht 125 +ht 141 +ht 142 +ht 141 +ht 133 +ht 117 +ht 125 +ht 118 +ht 126 +zone 1 1 +ht 117 +ht 118 +ht 117 +zo +zone 2 2 +ht 133 +ht 141 +zone 1 1 i -ht 105 -lgy -ht -hn -hn -zon 2 2 -i -ht 105 -hn -hn -hn -xf -*** End of history file: Sun Jan 23 00:24:58 2022 +ht 141 +zoo +ht 141 +zoo +hn +ht 133 +zoo +ht 133 +zoo +ht 125 +zoo +ht 125 +zoo +ht 117 +*** End of history file: Sun Jan 23 22:30:11 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 0ffd43d4f59ef1ad689cddd6aa4272d5cecebdfa..4c039673fd292a519d62168183602fec1c40793c 100755 Binary files a/src/anapaw and b/src/anapaw differ diff --git a/src/dssd.prm b/src/dssd.prm index 0e7b1d7908a3cd73de5c2e84dd5508ff7acc6219..0061cb3da932f99545e3f25b521ca5cf3380ebcf 100644 --- a/src/dssd.prm +++ b/src/dssd.prm @@ -21,7 +21,7 @@ c vme_ped(64) offset 31.41, 62.77, 58.12, 42.32, 53.73, 3.36, 38.27, 46.83, 46.61, 42.01, 83.94, 49.41, 53.42, 66.87, 18.22, 78.95, c vme_gain () -0.00, 0.002606, 0.002205, 0.002246, 0.002196, 0.00216, 0.002201, 0.002205, +0.00226, 0.002606, 0.002205, 0.002246, 0.002196, 0.00216, 0.002201, 0.002205, 0.002405, 0.002421, 0.002387, 0.002307, 0.002483, 0.002495, 0.00263, 0.002581, 0.0083, 0.00752, 0.00748, 0.00781, 0.00801, 0.00797, 0.00767, 0.0079, 0.00777, 0.00812, 0.00765, 0.00811, 0.00753, 0.00786, 0.00761, 0.0081, diff --git a/src/enc_dssd.f b/src/enc_dssd.f index 81e1298b410a7512ccf8510ab0a096596bc6ea94..d0b224ff8432c10e825da4e09e180c189c8a6997 100644 --- a/src/enc_dssd.f +++ b/src/enc_dssd.f @@ -32,8 +32,10 @@ c write(*,*) ' ANAPAW-M : analyzer =',analyzer, ' nhitdet =',nhitdet naok = 0 do i=1,nhitdet - id = hitdet(i) -c write(*,*) 'id =',hitdet(i),' nhit =',nhitdata(id) +c id = hitdet(i) + id = i +c write(*,*) 'id =',hitdet(i),' nhitdata(id) =',nhitdata(id), +c & nhitdet c c use id instead of sequential naok c naok = naok + 1 @@ -64,7 +66,7 @@ c Write(*,*) rawdata(2,id) c if ((id.le.32).and.(id.ge.17)) then c if ((id.le.32)) then -c Write(*,*) id, val(4,naok) +c Write(*,*) id, val(2,naok), val(4,naok) c endif c do j=1,ndata @@ -131,10 +133,12 @@ c Arawmax = val(2,i) Trawmax = val(3,i) -c write(*,*) 'Amax->',val(4,i) +c write(*,*) 'Emax->',val(4,i) endif enddo + +c write(*,*) 'Final Emax is', Emax c val(1,IDOUT) = IDOUT val(2,IDOUT) = IDmax diff --git a/src/enc_dssd.o b/src/enc_dssd.o index 54a3748299a59aa4f78d18436ae27ba7b9980d33..e765bc4824bb39e820c4947f4e374fcb52d51b1b 100644 Binary files a/src/enc_dssd.o and b/src/enc_dssd.o differ diff --git a/src/enc_mssd.f b/src/enc_mssd.f index a91bc38692a5a009709f5dcf95c535199a5b8f68..006a0a571fd79b708119c3ccdb5239e74ba64f93 100644 --- a/src/enc_mssd.f +++ b/src/enc_mssd.f @@ -110,6 +110,8 @@ c & pos_highpeak_mssd(id) else val(12,naok) = 0 endif +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)) diff --git a/src/enc_mssd.o b/src/enc_mssd.o index 0462be37e9fd35a5547516cf50f623a23a723acd..5baa84cd7355b909b0519bb6d15fd1307b386797 100644 Binary files a/src/enc_mssd.o and b/src/enc_mssd.o differ diff --git a/src/enc_ssd.f b/src/enc_ssd.f index d3b140ee550b7cf03e7c466378a9f8f6ea13b09a..f9a0b05a3e6d3d39989552137adcde6271e1c167 100644 --- a/src/enc_ssd.f +++ b/src/enc_ssd.f @@ -33,7 +33,7 @@ c write(*,*) ' ANAPAW-M : analyzer =',analyzer, ' nhitdet =',nhitdet do i=1,nhitdet id = hitdet(i) -c write(*,*) 'id =',hitdet(i),' nhit =',nhitdata(id) +c write(*,*) 'id =',hitdet(i),' nhitdet =',nhitdet naok = id c naok = naok + 1 val(1,naok) = id @@ -44,14 +44,16 @@ c naok = naok + 1 val(5,naok) = (rawdata(2,id)-Offset_t_ssd(ID)) & * Gain_t_ssd(ID) !Tcal -c do j=1,ndata -c val(10+j,naok) = rawdata(j,id) -c write(*,*) id, ' : ',j,' , ',rawdata(j,id) -c enddo +c write(*,*) 'naok, val(4,naok)=',naok,val(4,naok) + enddo naok = nhitdet +c write(*,*) 'val(4,1),val(4,2)=',val(4,1),val(4,2) + c telescope; assuming naok = id + + etel(1,3) = val(4,1) ! means tel 1 3rd layer is Acal for id=1 ssd etel(1,4) = val(4,2) etel(2,3) = val(4,3) diff --git a/src/enc_ssd.o b/src/enc_ssd.o index 4ea72aa160446ab94308bdb99e5c8218b39eca8f..9d1742da7103834b7f874dc543ed5d9c8b1ea6c6 100644 Binary files a/src/enc_ssd.o and b/src/enc_ssd.o differ diff --git a/src/mssd.prm b/src/mssd.prm index 7e4cde86957f1be36a319fa6238cc2842b4bea8b..fb6c94616a63755363c986fe6bfad0274d55a716 100644 --- a/src/mssd.prm +++ b/src/mssd.prm @@ -83,7 +83,9 @@ c393, 434.0, 713, 735.0, 908, 978.5, 1234, 1282.0, 1579, 1593.0, 1847, 1760.0 c data0066 mux 2-1,2-2,3-1,3-2 c393, 434.0, 713, 735.0, 933.7, 967.9, 1233.1, 1282.0, 1581.8, 1604.4, 1847.8, 1760.0 c data0084 and 85 mux2,3 -393.0, 434.0, 713.0, 735.0, 951.6, 978.5, 1245.1, 1282.0, 1580.1, 1602.0, 1846.1, 1760.0 +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, 1825.0, 1825.0 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 @@ -99,4 +101,6 @@ c661, 694.0, 999, 1006.0, 1157, 1230.0, 1505, 1545.0, 1855, 1851.0, 2122, 2001.0 c data0066 mux 2-1,2-2,3-1,3-2 c661, 694.0, 999, 1006.0, 1188.7, 1223.3, 1520.2, 1545.0, 1856.5, 1851.0, 2122, 2001.0 c data0084 and 85 mux2,3 -661.0, 694.0, 999.0, 1006.0, 1210.9, 1223.3, 1520.2, 1545.0, 1854.6, 1857.7, 2120.9, 2001.0 +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