diff --git a/.viewana.prm b/.viewana.prm index ab20526ca11a821abc743f401d5f60cb9a8e4ff1..14bb2959b7448943b8695d0967370848c4d83b0b 100644 --- a/.viewana.prm +++ b/.viewana.prm @@ -8,6 +8,7 @@ +@2D @@ -23,18 +24,6 @@ - - - - - - - - - - -@2D - diff --git a/ana/pi_f3.ana b/ana/pi_f3.ana index 4b56efd9b159e1a119fcd05ca8169c32c827d2ba..2c01f57377a7f0614986786ce7c38f446ef1013a 100644 --- a/ana/pi_f3.ana +++ b/ana/pi_f3.ana @@ -23,15 +23,16 @@ gate c beam TOF vs RF gate 132, 2,100,100,2, 5.5,11. -c133, 1,1,1,2, 20.,35. -c133, 1,1,1,2, 3.6,18.6 -c133, 1,1,1,2, 31.,45. -133, 1,1,1,2, 12.,25. -c134, 1,1,1,3, 10.,25. -c134, 1,1,1,3, 38.,50. -134, 1,1,1,3, 20.,33. +133, 1,1,1,2, 33.,41. +134, 1,1,1,2, 86.,93. or 135, 133, 134 +c impurity #1 +gate +138, 1,1,1,2, 18.,25. +139, 1,1,1,2, 70.,77. +or +140, 138, 139 and 131, 132, 135 250, 102, 104 @@ -92,10 +93,10 @@ hst2 c0, 1,1,1,2, 2,1,1,24, 200,1.,100., 100,-50.,50., 'RF vs F3PPACa X (mm)' c0, 1,1,1,2, 2,1,1,25, 200,1.,100., 100,-50.,50., 'RF vs F3PPACa Y (mm)' c0, 1,1,1,2, 2,2,2,24, 200,1.,100., 100,-50.,50., 'RF vs F3PPACb X (mm)' -131, 2,1,1,24, 2,1,1,25, 100,-50.,50., 100,-50.,50., 'F3a X*Y (mm) 26Si gated' +135, 2,1,1,24, 2,1,1,25, 100,-50.,50., 100,-50.,50., 'F3a X*Y (mm) 26Si gated' c201, 2,1,1,24, 2,1,1,25, 100,-50.,50., 100,-50.,50., 'F3a X*Y (mm) PSD energy gate' 0, 2,2,2,24, 2,2,2,25, 100,-50.,50., 100,-50.,50., 'F3b X*Y (mm)' -131, 2,2,2,24, 2,2,2,25, 100,-50.,50., 100,-50.,50., 'F3b X*Y (mm) 26Si gated' +135, 2,2,2,24, 2,2,2,25, 100,-50.,50., 100,-50.,50., 'F3b X*Y (mm) 26Si gated' c201, 2,2,2,24, 2,2,2,25, 100,-50.,50., 100,-50.,50., 'F3b X*Y (mm) PSD energy gate' c310, 2,2,2,24, 2,2,2,25, 100,-50.,50., 100,-50.,50., 'F3b X*Y (mm) center' @@ -104,7 +105,7 @@ c-135, 2,2,2,24, 2,2,2,25, 100,-50.,50., 100,-50.,50., 'F3b X*Y (mm) not beam' 0, 2,10,10,2, 2,10,10,3, 100,-50.,50., 100,-50.,50., 'target X*Y (mm)' 20, 2,10,10,2, 2,10,10,3, 100,-50.,50., 100,-50.,50., 'target X*Y (mm) window' c104, 2,10,10,2, 2,10,10,3, 100,-50.,50., 100,-50.,50., 'target X*Y (mm)' -131, 2,10,10,2, 2,10,10,3, 100,-50.,50., 100,-50.,50., 'target X*Y (mm) 26Si gated' +135, 2,10,10,2, 2,10,10,3, 100,-50.,50., 100,-50.,50., 'target X*Y (mm) 26Si gated' c0, 2,1,1,24, 6,1,1,2, 100,-50.,50., 400,0.,4000., 'F3a X * Esum raw' c0, 2,2,2,24, 6,1,1,2, 100,-50.,50., 400,0.,4000., 'F3b X * Esum raw' c0, 2,1,1,24, 6,1,1,2, 100,-50.,50., 444,2.,150., 'F3a X * Esum cal' @@ -118,8 +119,8 @@ c0, 1,1,1,2, 8,24,24,5, 196,2.,100., 400,1.,100., 'RF1 * F3SSD Ecal' 0, 2,1,1,24, 1,1,1,3, 100,-50.,50., 200,0.,100., 'F3PPACa X * RF2' 0, 2,2,2,24, 1,1,1,2, 100,-50.,50., 200,0.,100., 'F3PPACb X * RF1' 0, 2,2,2,24, 1,1,1,3, 100,-50.,50., 200,0.,100., 'F3PPACb X * RF2' -12, 2,1,1,24, 1,1,1,2, 100,-50.,50., 200,0.,100., 'F3PPACa X * RF1 beam' -12, 2,2,2,24, 1,1,1,2, 100,-50.,50., 200,0.,100., 'F3PPACb X * RF1 beam' +135, 2,1,1,24, 1,1,1,2, 100,-50.,50., 200,0.,100., 'F3PPACa X * RF1 26Si' +135, 2,2,2,24, 1,1,1,2, 100,-50.,50., 200,0.,100., 'F3PPACb X * RF1 26Si' 0, 2,10,10,2, 1,1,1,2, 100,-50.,50., 200,0.,100., 'Tgt X * RF1' 0, 2,10,10,3, 1,1,1,2, 100,-50.,50., 200,0.,100., 'Tgt Y * RF1' 0, 2,10,10,2, 1,1,1,3, 100,-50.,50., 200,0.,100., 'Tgt X * RF2' @@ -140,14 +141,22 @@ c401, 1,1,1,2, 1,4,4,23, 200,0.,100., 500,0.5,4000.5, 'RF1*F3SSD Eraw 3H gate' c401, 1,1,1,2, 2,100,100,2, 200,0.,100., 100,-5.,40., 'TOF * RF1 3H gate' -exit - 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,8000, '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, 6,13,13,2, 1,1,1,2, 200,0,4000, 200,0,100, 'RF1 vs Lowgain 1 Eraw ' +0, 6,14,14,2, 1,1,1,2, 200,0,4000, 200,0,100, 'RF1 vs Lowgain 2 Eraw ' +0, 6,15,15,2, 1,1,1,2, 200,0,4000, 200,0,100, 'RF1 vs Lowgain 3 Eraw ' +0, 6,16,16,2, 1,1,1,2, 200,0,4000, 200,0,100, 'RF1 vs Lowgain 4 Eraw ' + +0, 6,15,15,2, 2,1,1,24, 200,0,4000, 100,-50.,50., 'F3PPACa X vs Lowgain 3 Eraw ' +135, 6,15,15,2, 2,1,1,24, 200,0,4000, 100,-50.,50., 'F3PPACa X vs Lowgain 3 Eraw 26Si' +140, 6,15,15,2, 2,1,1,24, 200,0,4000, 100,-50.,50., 'F3PPACa X vs Lowgain 3 Eraw impurity' + + exit diff --git a/ana/ssd.ana b/ana/ssd.ana index 0d8c1a06cc484a4b9aa153f872d21b2638649b91..7b9e6b8a90816dcafc4cc074f49b1edf5c38c39c 100644 --- a/ana/ssd.ana +++ b/ana/ssd.ana @@ -1,5 +1,6 @@ c ::made with the script anamaker.pl -c=ssd analys +1 4 5 6 @@ -40,6 +41,11 @@ hst2 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' +0, 6,13,13,2, 1,1,1,2, 200,0,4000, 200,0,100, 'RF1 vs Lowgain 1 Eraw ' +0, 6,14,14,2, 1,1,1,2, 200,0,4000, 200,0,100, 'RF1 vs Lowgain 2 Eraw ' +0, 6,15,15,2, 1,1,1,2, 200,0,4000, 200,0,100, 'RF1 vs Lowgain 3 Eraw ' +0, 6,16,16,2, 1,1,1,2, 200,0,4000, 200,0,100, 'RF1 vs Lowgain 4 Eraw ' + 0, 6,13,13,2, 7,1,1,12, 200,0,4000, 200,0,20, 'tel 1 dE2 vs Lowgain 1 Eraw ' 0, 6,14,14,2, 7,1,1,12, 200,0,4000, 200,0,20, 'tel 1 dE2 vs Lowgain 2 Eraw ' 0, 6,15,15,2, 7,1,1,12, 200,0,4000, 200,0,20, 'tel 1 dE2 vs Lowgain 3 Eraw ' diff --git a/ana/tel.ana b/ana/tel.ana index b015fda22a014dfb4c7085a207831f35c2dd41e3..8285d297525eeb510c02b3f618d9aa8c55a0fadd 100644 --- a/ana/tel.ana +++ b/ana/tel.ana @@ -31,3 +31,6 @@ hst2 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,15,15,2, 7,1,1,12, 200,0,4000, 200,0,15, 'tel 1 dE2 vs lowgain3 raw' diff --git a/anapaw_last.kumacold b/anapaw_last.kumacold index 3070f24edb7a2852c12d426bc8d8e93d54e2b58a..07b7b709148807dfbc3ef6e9f8af7a3c152af3ea 100644 --- a/anapaw_last.kumacold +++ b/anapaw_last.kumacold @@ -1,7 +1,4 @@ -*** Begin of history file: Fri Jan 21 18:26:54 2022 +*** Begin of history file: Sat Jan 22 17:07:18 2022 a/l ridf/data0085.ridf -i -ht 125 -ht 127 -q -*** End of history file: Fri Jan 21 18:32:45 2022 +exit +*** End of history file: Sat Jan 22 17:07:54 2022 diff --git a/last.kumac b/last.kumac deleted file mode 100644 index 064d5db183fc3c2549c520789cbf9b94eb0e1b01..0000000000000000000000000000000000000000 --- a/last.kumac +++ /dev/null @@ -1,27 +0,0 @@ -*** Begin of history file: Fri Jan 21 10:26:51 2022 -a/l -cle f -a/l -a/l -a/l -a/l -a/l -a/l -a/l ridf/primary0100.ridf -i -zone 2 2 -lgz -ht 107 -lny -ht 107 -ht 107 -ht 107 -ht 107 cont -ht 109 -ht 109 -ht 109 -ht 109 -ht 109 -ht 109 -ht 109 -*** End of history file: Fri Jan 21 23:47:13 2022 diff --git a/last.kumacold b/last.kumacold index db9ca963926136e0c24f3c51a54d6150267e5376..064d5db183fc3c2549c520789cbf9b94eb0e1b01 100644 --- a/last.kumacold +++ b/last.kumacold @@ -1,27 +1,27 @@ -*** Begin of history file: Tue Jan 18 13:42:38 2022 +*** Begin of history file: Fri Jan 21 10:26:51 2022 a/l +cle f a/l -clear -erase -ana/loop ridf/data0077.ridf -ls -hli -ht 101 +a/l +a/l +a/l +a/l +a/l +a/l ridf/primary0100.ridf +i zone 2 2 -ht zone -zone -zone 2 3 -ht 124 -opt liny -ht 124 -ht 109(500,1500) -h/p 109(500,1500) -h/p 109(500:1500) -h/p 109(500.,1500.) -hi/pl 109(500.,1500.) -zone 2 3 -hth 109 +lgz +ht 107 +lny +ht 107 +ht 107 +ht 107 +ht 107 cont +ht 109 +ht 109 +ht 109 +ht 109 +ht 109 +ht 109 ht 109 -opt logy -opt logy -*** End of history file: Tue Jan 18 14:31:03 2022 +*** End of history file: Fri Jan 21 23:47:13 2022 diff --git a/src/anapaw b/src/anapaw index ff0a62c44e9dff3a07c993ceb074d6ad020602ca..fc9e3b6212564bdef69ac99a75ac20c7baedef78 100755 Binary files a/src/anapaw and b/src/anapaw differ diff --git a/src/enc_dssd.f b/src/enc_dssd.f index 88093c4c1b192b71d44135de2cee3537634fbef9..81e1298b410a7512ccf8510ab0a096596bc6ea94 100644 --- a/src/enc_dssd.f +++ b/src/enc_dssd.f @@ -34,7 +34,11 @@ c write(*,*) ' ANAPAW-M : analyzer =',analyzer, ' nhitdet =',nhitdet do i=1,nhitdet id = hitdet(i) c write(*,*) 'id =',hitdet(i),' nhit =',nhitdata(id) - naok = naok + 1 +c +c use id instead of sequential naok +c naok = naok + 1 + naok=id +c val(1,naok) = id val(2,naok) = rawdata(1,id) ! Araw val(3,naok) = rawdata(2,id) ! Traw @@ -57,7 +61,11 @@ c write(*,*) 'id =',hitdet(i),' nhit =',nhitdata(id) c Write(*,*) 'nstrip,val(6,naok)=', nstrip,val(6,naok) c Write(*,*) rawdata(2,id) -c Write(*,*) val(5,naok) + +c if ((id.le.32).and.(id.ge.17)) then +c if ((id.le.32)) then +c Write(*,*) id, val(4,naok) +c endif c do j=1,ndata c val(10+j,naok) = rawdata(j,id) @@ -77,6 +85,8 @@ c enddo etel(2,2) = val(5,103) etel(3,2) = val(5,104) +c write(*,*) 'etel(1,1)',etel(1,1) +c write(*,*) 'etel(1,2)',etel(1,2) return end @@ -120,6 +130,9 @@ c Tmax = val(5,i) Arawmax = val(2,i) Trawmax = val(3,i) + +c write(*,*) 'Amax->',val(4,i) + endif enddo c diff --git a/src/enc_dssd.o b/src/enc_dssd.o index 921ca0e0dc5eef6b8024c307ca9d7060b7d68a7f..54a3748299a59aa4f78d18436ae27ba7b9980d33 100644 Binary files a/src/enc_dssd.o and b/src/enc_dssd.o differ diff --git a/src/enc_tel.f b/src/enc_tel.f index d3c908fcb534071880e09e72c7854066bdfeaf0d..4269f3caf4f19028e39f205a17e9cfc58b915fbf 100644 --- a/src/enc_tel.f +++ b/src/enc_tel.f @@ -30,12 +30,18 @@ c 21....2x timing for each layer esum = 0 do layer=1,n_layer +c write(*,*) "id,layer=",id,layer +c write(*,*) "etel(id,layer)=",etel(id,layer) val(layer+10,naok) = etel(id,layer) ! energy (MeV) val(layer+20,naok) = etel(id,layer) ! timing (ns) c if (etel(id,layer).gt.0.050) ! such code may be needed to supress pedestal - esum = esum + etel(id,layer) + if (etel(id,layer).gt.0.001) then + esum = esum + etel(id,layer) + endif + enddo +c write(*,*) "esum=",esum val(2,naok) = esum ! total energy enddo diff --git a/src/enc_tel.o b/src/enc_tel.o index 079176aa8ab2ad1bce8f422ae128ceb45f512f6c..df3fb85ed9ff33d7ebf598b06c104567dff5dbbf 100644 Binary files a/src/enc_tel.o and b/src/enc_tel.o differ