diff --git a/.viewana.prm b/.viewana.prm index ae01df3b82fd21c7264bc2c689a3280b8c9effc6..77f8d80648b4a012a806b90bc6390fe62fed1d7a 100644 --- a/.viewana.prm +++ b/.viewana.prm @@ -8,6 +8,7 @@ +@2D @@ -25,15 +26,6 @@ - - - - - - - - -@2D diff --git a/ana/anamaker.pl b/ana/anamaker.pl index 8e6fc63789d9012f9e3251b7be96c52d81e214a0..2bc96ece97b129281f282a6f14824ce4cffd10ca 100755 --- a/ana/anamaker.pl +++ b/ana/anamaker.pl @@ -173,6 +173,47 @@ print OUT "exit\n"; +} + +elsif ($category eq 'tel') { + + $telmax=5; + +print OUT +"analys +4 +5 +6 +7 +hst1 +"; +foreach $id (1..$telmax) { + + $name = "Esum tel $id"; + print OUT "0, 7,$id,$id,2, 1000,0,40, '$name'\n"; +} + + +print OUT +"hst2 +"; + + +foreach $id (1..$telmax) { + + $name = "tel $id Esum vs dE1"; + print OUT "0, 7,$id,$id,11, 7,$id,$id,2, 200,0,10, 200,0,40, '$name'\n"; + $name = "tel $id dE2 vs dE1"; + print OUT "0, 7,$id,$id,11, 7,$id,$id,12, 200,0,10, 200,0,15, '$name'\n"; + $name = "tel $id E1 vs dE2"; + print OUT "0, 7,$id,$id,12, 7,$id,$id,13, 200,0,15, 200,0,20, '$name'\n"; + $name = "tel $id E2 vs E1"; + print OUT "0, 7,$id,$id,13, 7,$id,$id,14, 200,0,20, 200,0,20, '$name'\n"; + +} + + + } diff --git a/ana/auto.ana b/ana/auto.ana index 57c9bd026dff672638b433be1856c46e42759cf3..b015fda22a014dfb4c7085a207831f35c2dd41e3 100644 --- a/ana/auto.ana +++ b/ana/auto.ana @@ -1,138 +1,33 @@ -c ::made with the script anamaker.pl -c=dssd +c ::made with the script anamaker.pl -c=tel analys 4 +5 +6 +7 hst1 -0, 4,1,1,2, 1000,0,4000, 'Tel1 dE1X E1raw' -0, 4,2,2,2, 1000,0,4000, 'Tel1 dE1X E2raw' -0, 4,3,3,2, 1000,0,4000, 'Tel1 dE1X E3raw' -0, 4,4,4,2, 1000,0,4000, 'Tel1 dE1X E4raw' -0, 4,5,5,2, 1000,0,4000, 'Tel1 dE1X E5raw' -0, 4,6,6,2, 1000,0,4000, 'Tel1 dE1X E6raw' -0, 4,7,7,2, 1000,0,4000, 'Tel1 dE1X E7raw' -0, 4,8,8,2, 1000,0,4000, 'Tel1 dE1X E8raw' -0, 4,9,9,2, 1000,0,4000, 'Tel1 dE1X E9raw' -0, 4,10,10,2, 1000,0,4000, 'Tel1 dE1X E10raw' -0, 4,11,11,2, 1000,0,4000, 'Tel1 dE1X E11raw' -0, 4,12,12,2, 1000,0,4000, 'Tel1 dE1X E12raw' -0, 4,13,13,2, 1000,0,4000, 'Tel1 dE1X E13raw' -0, 4,14,14,2, 1000,0,4000, 'Tel1 dE1X E14raw' -0, 4,15,15,2, 1000,0,4000, 'Tel1 dE1X E15raw' -0, 4,16,16,2, 1000,0,4000, 'Tel1 dE1X E16raw' -0, 4,17,17,2, 1000,0,4000, 'Tel1 dE2Y E1raw' -0, 4,18,18,2, 1000,0,4000, 'Tel1 dE2Y E2raw' -0, 4,19,19,2, 1000,0,4000, 'Tel1 dE2Y E3raw' -0, 4,20,20,2, 1000,0,4000, 'Tel1 dE2Y E4raw' -0, 4,21,21,2, 1000,0,4000, 'Tel1 dE2Y E5raw' -0, 4,22,22,2, 1000,0,4000, 'Tel1 dE2Y E6raw' -0, 4,23,23,2, 1000,0,4000, 'Tel1 dE2Y E7raw' -0, 4,24,24,2, 1000,0,4000, 'Tel1 dE2Y E8raw' -0, 4,25,25,2, 1000,0,4000, 'Tel1 dE2Y E9raw' -0, 4,26,26,2, 1000,0,4000, 'Tel1 dE2Y E10raw' -0, 4,27,27,2, 1000,0,4000, 'Tel1 dE2Y E11raw' -0, 4,28,28,2, 1000,0,4000, 'Tel1 dE2Y E12raw' -0, 4,29,29,2, 1000,0,4000, 'Tel1 dE2Y E13raw' -0, 4,30,30,2, 1000,0,4000, 'Tel1 dE2Y E14raw' -0, 4,31,31,2, 1000,0,4000, 'Tel1 dE2Y E15raw' -0, 4,32,32,2, 1000,0,4000, 'Tel1 dE2Y E16raw' -0, 4,33,33,2, 1000,0,4000, 'Tel2 dE2Y E1raw' -0, 4,34,34,2, 1000,0,4000, 'Tel2 dE2Y E2raw' -0, 4,35,35,2, 1000,0,4000, 'Tel2 dE2Y E3raw' -0, 4,36,36,2, 1000,0,4000, 'Tel2 dE2Y E4raw' -0, 4,37,37,2, 1000,0,4000, 'Tel2 dE2Y E5raw' -0, 4,38,38,2, 1000,0,4000, 'Tel2 dE2Y E6raw' -0, 4,39,39,2, 1000,0,4000, 'Tel2 dE2Y E7raw' -0, 4,40,40,2, 1000,0,4000, 'Tel2 dE2Y E8raw' -0, 4,41,41,2, 1000,0,4000, 'Tel2 dE2Y E9raw' -0, 4,42,42,2, 1000,0,4000, 'Tel2 dE2Y E10raw' -0, 4,43,43,2, 1000,0,4000, 'Tel2 dE2Y E11raw' -0, 4,44,44,2, 1000,0,4000, 'Tel2 dE2Y E12raw' -0, 4,45,45,2, 1000,0,4000, 'Tel2 dE2Y E13raw' -0, 4,46,46,2, 1000,0,4000, 'Tel2 dE2Y E14raw' -0, 4,47,47,2, 1000,0,4000, 'Tel2 dE2Y E15raw' -0, 4,48,48,2, 1000,0,4000, 'Tel2 dE2Y E16raw' -0, 4,49,49,2, 1000,0,4000, 'Tel3 dE2Y E1raw' -0, 4,50,50,2, 1000,0,4000, 'Tel3 dE2Y E2raw' -0, 4,51,51,2, 1000,0,4000, 'Tel3 dE2Y E3raw' -0, 4,52,52,2, 1000,0,4000, 'Tel3 dE2Y E4raw' -0, 4,53,53,2, 1000,0,4000, 'Tel3 dE2Y E5raw' -0, 4,54,54,2, 1000,0,4000, 'Tel3 dE2Y E6raw' -0, 4,55,55,2, 1000,0,4000, 'Tel3 dE2Y E7raw' -0, 4,56,56,2, 1000,0,4000, 'Tel3 dE2Y E8raw' -0, 4,57,57,2, 1000,0,4000, 'Tel3 dE2Y E9raw' -0, 4,58,58,2, 1000,0,4000, 'Tel3 dE2Y E10raw' -0, 4,59,59,2, 1000,0,4000, 'Tel3 dE2Y E11raw' -0, 4,60,60,2, 1000,0,4000, 'Tel3 dE2Y E12raw' -0, 4,61,61,2, 1000,0,4000, 'Tel3 dE2Y E13raw' -0, 4,62,62,2, 1000,0,4000, 'Tel3 dE2Y E14raw' -0, 4,63,63,2, 1000,0,4000, 'Tel3 dE2Y E15raw' -0, 4,64,64,2, 1000,0,4000, 'Tel3 dE2Y E16raw' -0, 4,1,1,3, 1000,0,4000, 'Tel1 dE1X T1raw' -0, 4,2,2,3, 1000,0,4000, 'Tel1 dE1X T2raw' -0, 4,3,3,3, 1000,0,4000, 'Tel1 dE1X T3raw' -0, 4,4,4,3, 1000,0,4000, 'Tel1 dE1X T4raw' -0, 4,5,5,3, 1000,0,4000, 'Tel1 dE1X T5raw' -0, 4,6,6,3, 1000,0,4000, 'Tel1 dE1X T6raw' -0, 4,7,7,3, 1000,0,4000, 'Tel1 dE1X T7raw' -0, 4,8,8,3, 1000,0,4000, 'Tel1 dE1X T8raw' -0, 4,9,9,3, 1000,0,4000, 'Tel1 dE1X T9raw' -0, 4,10,10,3, 1000,0,4000, 'Tel1 dE1X T10raw' -0, 4,11,11,3, 1000,0,4000, 'Tel1 dE1X T11raw' -0, 4,12,12,3, 1000,0,4000, 'Tel1 dE1X T12raw' -0, 4,13,13,3, 1000,0,4000, 'Tel1 dE1X T13raw' -0, 4,14,14,3, 1000,0,4000, 'Tel1 dE1X T14raw' -0, 4,15,15,3, 1000,0,4000, 'Tel1 dE1X T15raw' -0, 4,16,16,3, 1000,0,4000, 'Tel1 dE1X T16raw' -0, 4,17,17,3, 1000,0,4000, 'Tel1 dE2Y T1raw' -0, 4,18,18,3, 1000,0,4000, 'Tel1 dE2Y T2raw' -0, 4,19,19,3, 1000,0,4000, 'Tel1 dE2Y T3raw' -0, 4,20,20,3, 1000,0,4000, 'Tel1 dE2Y T4raw' -0, 4,21,21,3, 1000,0,4000, 'Tel1 dE2Y T5raw' -0, 4,22,22,3, 1000,0,4000, 'Tel1 dE2Y T6raw' -0, 4,23,23,3, 1000,0,4000, 'Tel1 dE2Y T7raw' -0, 4,24,24,3, 1000,0,4000, 'Tel1 dE2Y T8raw' -0, 4,25,25,3, 1000,0,4000, 'Tel1 dE2Y T9raw' -0, 4,26,26,3, 1000,0,4000, 'Tel1 dE2Y T10raw' -0, 4,27,27,3, 1000,0,4000, 'Tel1 dE2Y T11raw' -0, 4,28,28,3, 1000,0,4000, 'Tel1 dE2Y T12raw' -0, 4,29,29,3, 1000,0,4000, 'Tel1 dE2Y T13raw' -0, 4,30,30,3, 1000,0,4000, 'Tel1 dE2Y T14raw' -0, 4,31,31,3, 1000,0,4000, 'Tel1 dE2Y T15raw' -0, 4,32,32,3, 1000,0,4000, 'Tel1 dE2Y T16raw' -0, 4,33,33,3, 1000,0,4000, 'Tel2 dE2Y T1raw' -0, 4,34,34,3, 1000,0,4000, 'Tel2 dE2Y T2raw' -0, 4,35,35,3, 1000,0,4000, 'Tel2 dE2Y T3raw' -0, 4,36,36,3, 1000,0,4000, 'Tel2 dE2Y T4raw' -0, 4,37,37,3, 1000,0,4000, 'Tel2 dE2Y T5raw' -0, 4,38,38,3, 1000,0,4000, 'Tel2 dE2Y T6raw' -0, 4,39,39,3, 1000,0,4000, 'Tel2 dE2Y T7raw' -0, 4,40,40,3, 1000,0,4000, 'Tel2 dE2Y T8raw' -0, 4,41,41,3, 1000,0,4000, 'Tel2 dE2Y T9raw' -0, 4,42,42,3, 1000,0,4000, 'Tel2 dE2Y T10raw' -0, 4,43,43,3, 1000,0,4000, 'Tel2 dE2Y T11raw' -0, 4,44,44,3, 1000,0,4000, 'Tel2 dE2Y T12raw' -0, 4,45,45,3, 1000,0,4000, 'Tel2 dE2Y T13raw' -0, 4,46,46,3, 1000,0,4000, 'Tel2 dE2Y T14raw' -0, 4,47,47,3, 1000,0,4000, 'Tel2 dE2Y T15raw' -0, 4,48,48,3, 1000,0,4000, 'Tel2 dE2Y T16raw' -0, 4,49,49,3, 1000,0,4000, 'Tel3 dE2Y T1raw' -0, 4,50,50,3, 1000,0,4000, 'Tel3 dE2Y T2raw' -0, 4,51,51,3, 1000,0,4000, 'Tel3 dE2Y T3raw' -0, 4,52,52,3, 1000,0,4000, 'Tel3 dE2Y T4raw' -0, 4,53,53,3, 1000,0,4000, 'Tel3 dE2Y T5raw' -0, 4,54,54,3, 1000,0,4000, 'Tel3 dE2Y T6raw' -0, 4,55,55,3, 1000,0,4000, 'Tel3 dE2Y T7raw' -0, 4,56,56,3, 1000,0,4000, 'Tel3 dE2Y T8raw' -0, 4,57,57,3, 1000,0,4000, 'Tel3 dE2Y T9raw' -0, 4,58,58,3, 1000,0,4000, 'Tel3 dE2Y T10raw' -0, 4,59,59,3, 1000,0,4000, 'Tel3 dE2Y T11raw' -0, 4,60,60,3, 1000,0,4000, 'Tel3 dE2Y T12raw' -0, 4,61,61,3, 1000,0,4000, 'Tel3 dE2Y T13raw' -0, 4,62,62,3, 1000,0,4000, 'Tel3 dE2Y T14raw' -0, 4,63,63,3, 1000,0,4000, 'Tel3 dE2Y T15raw' -0, 4,64,64,3, 1000,0,4000, 'Tel3 dE2Y T16raw' +0, 7,1,1,2, 1000,0,40, 'Esum tel 1' +0, 7,2,2,2, 1000,0,40, 'Esum tel 2' +0, 7,3,3,2, 1000,0,40, 'Esum tel 3' +0, 7,4,4,2, 1000,0,40, 'Esum tel 4' +0, 7,5,5,2, 1000,0,40, 'Esum tel 5' 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' -exit +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' +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' +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' diff --git a/ana/tel.ana b/ana/tel.ana new file mode 100644 index 0000000000000000000000000000000000000000..b015fda22a014dfb4c7085a207831f35c2dd41e3 --- /dev/null +++ b/ana/tel.ana @@ -0,0 +1,33 @@ +c ::made with the script anamaker.pl -c=tel +analys +4 +5 +6 +7 +hst1 +0, 7,1,1,2, 1000,0,40, 'Esum tel 1' +0, 7,2,2,2, 1000,0,40, 'Esum tel 2' +0, 7,3,3,2, 1000,0,40, 'Esum tel 3' +0, 7,4,4,2, 1000,0,40, 'Esum tel 4' +0, 7,5,5,2, 1000,0,40, 'Esum tel 5' +hst2 +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' +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' +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' diff --git a/anapaw_last.kumac b/anapaw_last.kumac new file mode 100644 index 0000000000000000000000000000000000000000..1112b68beaaecff0e20e1406fd144ce0f362e16b --- /dev/null +++ b/anapaw_last.kumac @@ -0,0 +1,4 @@ +*** Begin of history file: Tue Jan 18 17:35:05 2022 +a/l +exit +*** End of history file: Tue Jan 18 17:36:10 2022 diff --git a/anapaw_last.kumacold b/anapaw_last.kumacold new file mode 100644 index 0000000000000000000000000000000000000000..ee6965e123472e9854db6112176ff3a1c876e820 --- /dev/null +++ b/anapaw_last.kumacold @@ -0,0 +1,4 @@ +*** Begin of history file: Tue Jan 18 17:30:19 2022 +a/l +exit +*** End of history file: Tue Jan 18 17:33:37 2022 diff --git a/last.kumacold b/last.kumacold new file mode 100644 index 0000000000000000000000000000000000000000..db9ca963926136e0c24f3c51a54d6150267e5376 --- /dev/null +++ b/last.kumacold @@ -0,0 +1,27 @@ +*** Begin of history file: Tue Jan 18 13:42:38 2022 +a/l +a/l +clear +erase +ana/loop ridf/data0077.ridf +ls +hli +ht 101 +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 +ht 109 +opt logy +opt logy +*** End of history file: Tue Jan 18 14:31:03 2022 diff --git a/src/anapaw b/src/anapaw index b085b94fea6c411fe8f8f1fa6e0ea03c0308666e..56e3810b76e1591ec2cb2c1e8c3ca242c5b018c7 100755 Binary files a/src/anapaw and b/src/anapaw differ diff --git a/src/enc_dssd.f b/src/enc_dssd.f index af53fd1a97f02ad702c2813d213a032054d87842..e871f615330e1c2403c458df07fc3d2ef53ac973 100644 --- a/src/enc_dssd.f +++ b/src/enc_dssd.f @@ -15,6 +15,7 @@ c 2021.11 Made by HY from encgeneric include 'analyslogic.fh' include 'ssd.inc' + include 'tel.inc' if (initencflag(analyzer)) then write(*,*) ' ANAPAW-M : enc_ssd analys =',analyzer @@ -52,6 +53,73 @@ c write(*,*) id, ' : ',j,' , ',rawdata(j,id) c enddo enddo + call getmaxstrip(val,nx,ny, 1,16, 101) ! Tel1-1 + call getmaxstrip(val,nx,ny,17,32, 102) ! Tel1-2 + call getmaxstrip(val,nx,ny,33,48, 103) ! Tel2-2 + call getmaxstrip(val,nx,ny,49,64, 104) ! Tel3-2 + + naok=104 + + etel(1,1) = val(5,101) ! means tel 1 1rd layer is Emax for the first dssd + etel(1,2) = val(5,102) + etel(2,2) = val(5,103) + etel(3,2) = val(5,104) + + return end + + + subroutine getmaxstrip(val,nx,ny,I1,I2, IDOUT) + implicit none +c include 'psd.inc' +c include 'rf.inc' +c Do not EDIT!! +c Logical AnalyserFlag(50),INITENCFLAG(50) +c Logical USERFLAG(10),EVTERR +c Common/ANALYSLOGIC/ AnalyserFlag,INITENCFLAG,USERFLAG,EVTERR +c Do not EDIT!! +c + integer nx,ny + integer I1 ! ID start for ADC + integer I2 ! ID end for ADC + integer IDOUT ! ID for output (101--105) + real val(nx,ny) +c + real Amax, Emax, Tmax, dummy + real Arawmax, Trawmax + integer i, IDmax + parameter (dummy=-10000.) +c + Amax = dummy + Emax = dummy + Tmax = dummy + IDmax = 0 +c + do i=I1,I2 + if (val(4,i).gt.Amax) then + Amax = val(4,i) + Emax = val(4,i) !* gain_common(IDOUT-150) + IDmax = i + Tmax = val(5,i) + Arawmax = val(2,i) + Trawmax = val(3,i) + endif + enddo +c + val(1,IDOUT) = IDOUT + val(2,IDOUT) = IDmax + val(3,IDOUT) = Amax + val(4,IDOUT) = Tmax + val(5,IDOUT) = Emax +c val(6,IDOUT) = 1000. + val(6,IDOUT) = Trawmax + val(7,IDOUT) = Arawmax +c if (AnalyserFlag(1)) then +c if (trf1.gt.0.) val(6,IDOUT) = Tmax - trf1 +c if (trf2.gt.0.) val(7,IDOUT) = Tmax - trf2 +c endif +c + return + end diff --git a/src/enc_dssd.o b/src/enc_dssd.o index 4151b32d2fc7840c933c4e151bc4001aac4dd702..ad54a5f2cc49cb573beacf1ddc0bc0260dcec673 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 536cc885fba745f5d069d3208780ffcaceb453d8..c331122bf57c03060edde9bb3fa303c875bc26ae 100644 --- a/src/enc_mssd.f +++ b/src/enc_mssd.f @@ -26,6 +26,7 @@ c The last number "1000" is to detect overflow include 'analyslogic.fh' include 'ssd.inc' + include 'tel.inc' if (initencflag(analyzer)) then write(*,*) ' ANAPAW-M : enc_ssd analys =',analyzer @@ -131,8 +132,16 @@ c do j=1,ndata c val(10+j,naok) = rawdata(j,id) c write(*,*) id, ' : ',j,' , ',rawdata(j,id) c enddo + enddo +c define telescope + etel(2,1) = val(12,1) + etel(3,1) = val(12,2) + etel(4,1) = val(12,3) + etel(4,2) = val(12,4) + etel(5,1) = val(12,5) + etel(5,2) = val(12,6) c val(*,101....196) diff --git a/src/enc_mssd.o b/src/enc_mssd.o index 91849a4a15f1ed54e432cd77076d0c08ce18be27..7d6f78fcaf5eeea7c0af13b1fc61c5e12c880e56 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 b1674acd73e0325e6216cc851bdcad4377759dbe..00fc4f8ddde063789849d5edb4ab5901a8423181 100644 --- a/src/enc_ssd.f +++ b/src/enc_ssd.f @@ -15,6 +15,7 @@ c 2021.11 Made by HY from encgeneric include 'analyslogic.fh' include 'ssd.inc' + include 'tel.inc' if (initencflag(analyzer)) then write(*,*) ' ANAPAW-M : enc_ssd analys =',analyzer @@ -37,10 +38,10 @@ c write(*,*) 'id =',hitdet(i),' nhit =',nhitdata(id) val(1,naok) = id val(2,naok) = rawdata(1,id) ! Araw val(3,naok) = rawdata(2,id) ! Traw - val(4,naok) = (rawdata(1,id)-Offset_a_dssd(ID)) - & * Gain_a_dssd(ID) ! Acal - val(5,naok) = (rawdata(2,id)-Offset_t_dssd(ID)) - & * Gain_t_dssd(ID) !Tcal + val(4,naok) = (rawdata(1,id)-Offset_a_ssd(ID)) + & * Gain_a_ssd(ID) ! Acal + 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) @@ -48,6 +49,19 @@ c write(*,*) id, ' : ',j,' , ',rawdata(j,id) c enddo enddo +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) + etel(2,4) = val(4,4) + etel(3,3) = val(4,5) + etel(3,4) = val(4,6) + etel(4,3) = val(4,7) + etel(4,4) = val(4,8) + etel(5,3) = val(4,9) + etel(5,4) = val(4,10) +c not yet for timings + return end diff --git a/src/enc_ssd.o b/src/enc_ssd.o index e1833483e212637cc863725d537c652b13135b4d..04964161f67047cb38ee7a3c1ac95569d4b3cec7 100644 Binary files a/src/enc_ssd.o and b/src/enc_ssd.o differ diff --git a/src/enc_tel.f b/src/enc_tel.f new file mode 100644 index 0000000000000000000000000000000000000000..36916058e821e55cbf2d7c2cf6fc33380441f79f --- /dev/null +++ b/src/enc_tel.f @@ -0,0 +1,46 @@ +c 2021.11 Made by HY from encgeneric + + subroutine enctel(val,nx,ny,naok) + + implicit none + integer nx, ny,naok + real val(nx,ny) + integer i,j,id,layer + real esum + + include 'analyslogic.fh' + include 'tel.inc' + +c if (initencflag(analyzer)) then +c write(*,*) ' ANAPAW-M : enc_tel analys =',analyzer +c initencflag(analyzer) = .false. +c endif + +c write(*,*) ' ANAPAW-M : analyzer =',analyzer, ' nhitdet =',nhitdet + + naok = 0 + +c 1...id, 2...esum +c 11....1x energy for each layer +c 21....2x timing for each layer + + do id=1,n_tel + naok = naok + 1 + val(1,naok) = id + esum = 0 + + do layer=1,n_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) + enddo + + val(2,naok) = esum ! total energy + + enddo + + + return + end + diff --git a/src/enc_tel.o b/src/enc_tel.o new file mode 100644 index 0000000000000000000000000000000000000000..079176aa8ab2ad1bce8f422ae128ceb45f512f6c Binary files /dev/null and b/src/enc_tel.o differ diff --git a/src/makefile b/src/makefile index 26bf2d50f1c57cc10eb50c35fe1a900f7e99f272..70e5235a8945c62fd501697a09d495e7a3f31044 100644 --- a/src/makefile +++ b/src/makefile @@ -36,6 +36,7 @@ LDFLAGS = ADD = enc_coin.o \ enc_ssd.o \ enc_rf.o enc_dssd.o enc_mssd.o enc_ppac.o\ + enc_tel.o\ dssd_prm.o ssd_prm.o mssd_prm.o ppac_prm.o # encic.o loadicprm.o \ diff --git a/src/tel.inc b/src/tel.inc new file mode 100644 index 0000000000000000000000000000000000000000..a6387181f4b058a7a2d5cd253c5472835e401a5c --- /dev/null +++ b/src/tel.inc @@ -0,0 +1,12 @@ +c +c------ TEL.INC ------ common area for Telescope layer analysis +c + Integer n_tel, n_layer + parameter (n_tel = 5) ! number of telescopes + parameter (n_layer = 4) ! Number of layers in a telescope (assumed <10) + + real etel(n_tel,n_layer) + real ttel(n_tel,n_layer) +c + common/COM_TEL/ + & etel, ttel diff --git a/src/usersrc.F b/src/usersrc.F index d398296d78eb0788e1d5c8cc20998ed7f68f8233..302c79fa0882edd41dfff9fdf900b8e3baeac331 100644 --- a/src/usersrc.F +++ b/src/usersrc.F @@ -28,6 +28,8 @@ c EXTERNAL Encdssd EXTERNAL Encmssd EXTERNAL Encssd + EXTERNAL Enctel + c EXTERNAL Encmatrix c EXTERNAL Encimage c EXTERNAL Encpid @@ -61,7 +63,7 @@ c CALL Callanalyzer(6,6,Enctotale) CALL Callanalyzer(4,4,Encdssd) CALL Callanalyzer(5,5,Encmssd) CALL Callanalyzer(6,6,Encssd) - + CALL Enctel(val(1,1,7),nx,ny,naok(7)) c IF (Analyzerflag(10)) CALL Encmatrix(val(1,1,10),nx,ny,naok(10)) c IF (Analyzerflag(11)) CALL Encpid(val(1,1,11),nx,ny,naok(11)) diff --git a/src/usersrc.o b/src/usersrc.o index 741da27276a5aadc62ead05c7af70870c2bef464..dabdf1a2633557cf00a6e21be4d5cdc5d3aa1360 100644 Binary files a/src/usersrc.o and b/src/usersrc.o differ