current beam status, mt

diff --git a/dmon/scripts/ChanDb_discdirc.pm b/dmon/scripts/ChanDb_discdirc.pm
index bdb85ab2b1fab745a4c68c952ac8e8cecc637f84..e8d95b217054c38612d2b61fe2cb1d775c94aed1 100644 (file)
--- a/dmon/scripts/ChanDb_discdirc.pm
+++ b/dmon/scripts/ChanDb_discdirc.pm
@@ -1,692 +1,1164 @@
 package ChanDb_discdirc;
 
 our $chanDb = {
-
-
-          '1' => {
-                   '0.00' => {
+          '3' => {
+                   '17.7' => {
+                               'chan' => 35,
+                               'fpga' => 8231
+                             },
+                   '2.1' => {
+                              'fpga' => 8233,
+                              'chan' => 37
+                            },
+                   '9.3' => {
+                              'chan' => 28,
+                              'fpga' => 8232
+                            },
+                   '12.9' => {
                                'fpga' => 8231,
-                               'chan' => 16
+                               'chan' => 43
                              },
-                   '8.40' => {
-                               'fpga' => 8230,
-                               'chan' => 48
+                   '8.7' => {
+                              'fpga' => 8232,
+                              'chan' => 32
+                            },
+                   '6.6' => {
+                              'chan' => 23,
+                              'fpga' => 8234
+                            },
+                   '3.9' => {
+                              'fpga' => 8234,
+                              'chan' => 16
+                            },
+                   '5.1' => {
+                              'chan' => 22,
+                              'fpga' => 8234
+                            },
+                   '18.3' => {
+                               'fpga' => 8229,
+                               'chan' => 16
                              },
-                   '9.60' => {
-                               'fpga' => 8230,
-                               'chan' => 46
+                   '6.3' => {
+                              'chan' => 24,
+                              'fpga' => 8234
+                            },
+                   '6.0' => {
+                              'fpga' => 8234,
+                              'chan' => 17
+                            },
+                   '13.2' => {
+                               'fpga' => 8231,
+                               'chan' => 44
                              },
-                   '12.90' => {
-                                'chan' => 39,
-                                'fpga' => 8230
-                              },
-                   '3.60' => {
-                               'chan' => 8,
+                   '0.3' => {
+                              'chan' => 10,
+                              'fpga' => 8234
+                            },
+                   '5.4' => {
+                              'chan' => 21,
+                              'fpga' => 8234
+                            },
+                   '10.5' => {
+                               'chan' => 47,
                                'fpga' => 8231
                              },
-                   '16.20' => {
-                                'fpga' => 8230,
-                                'chan' => 15
-                              },
-                   '9.00' => {
-                               'chan' => 3,
-                               'fpga' => 8230
+                   '6.9' => {
+                              'fpga' => 8234,
+                              'chan' => 20
+                            },
+                   '1.8' => {
+                              'fpga' => 8234,
+                              'chan' => 11
+                            },
+                   '17.4' => {
+                               'fpga' => 8229,
+                               'chan' => 13
                              },
-                   '15.90' => {
-                                'chan' => 16,
-                                'fpga' => 8230
-                              },
-                   '15.30' => {
-                                'chan' => 35,
-                                'fpga' => 8230
-                              },
-                   '8.70' => {
-                               'chan' => 4,
-                               'fpga' => 8230
+                   '15.9' => {
+                               'fpga' => 8229,
+                               'chan' => 12
                              },
-                   '1.80' => {
-                               'fpga' => 8230,
-                               'chan' => 23
+                   '14.4' => {
+                               'chan' => 42,
+                               'fpga' => 8231
                              },
-                   '6.60' => {
-                               'chan' => 31,
-                               'fpga' => 8230
+                   '11.7' => {
+                               'chan' => 45,
+                               'fpga' => 8231
                              },
-                   '1.50' => {
-                               'chan' => 24,
-                               'fpga' => 8230
+                   '12.6' => {
+                               'fpga' => 8229,
+                               'chan' => 5
+                             },
+                   '3.0' => {
+                              'chan' => 13,
+                              'fpga' => 8234
+                            },
+                   '9.0' => {
+                              'fpga' => 8232,
+                              'chan' => 31
+                            },
+                   '7.5' => {
+                              'fpga' => 8232,
+                              'chan' => 30
+                            },
+                   '3.6' => {
+                              'chan' => 36,
+                              'fpga' => 8233
+                            },
+                   '8.4' => {
+                              'fpga' => 8232,
+                              'chan' => 25
+                            },
+                   '14.1' => {
+                               'chan' => 41,
+                               'fpga' => 8231
+                             },
+                   '4.2' => {
+                              'chan' => 15,
+                              'fpga' => 8234
+                            },
+                   '4.5' => {
+                              'chan' => 33,
+                              'fpga' => 8233
+                            },
+                   '14.7' => {
+                               'fpga' => 8229,
+                               'chan' => 10
                              },
-                   '0.90' => {
+                   '15.6' => {
                                'fpga' => 8231,
-                               'chan' => 11
+                               'chan' => 40
+                             },
+                   '15.0' => {
+                               'fpga' => 8229,
+                               'chan' => 9
                              },
-                   '12.60' => {
-                                'chan' => 9,
-                                'fpga' => 8230
-                              },
-                   '11.70' => {
-                                'chan' => 41,
-                                'fpga' => 8230
-                              },
-                   '17.70' => {
-                                'chan' => 38,
-                                'fpga' => 8229
-                              },
-                   '1.20' => {
+                   '11.1' => {
+                               'chan' => 4,
+                               'fpga' => 8229
+                             },
+                   '16.2' => {
+                               'chan' => 11,
+                               'fpga' => 8229
+                             },
+                   '10.2' => {
+                               'chan' => 1,
+                               'fpga' => 8229
+                             },
+                   '1.5' => {
+                              'chan' => 12,
+                              'fpga' => 8234
+                            },
+                   '18.9' => {
                                'fpga' => 8231,
-                               'chan' => 12
+                               'chan' => 33
                              },
-                   '3.30' => {
-                               'chan' => 7,
+                   '15.3' => {
+                               'chan' => 39,
                                'fpga' => 8231
                              },
-                   '6.90' => {
-                               'chan' => 1,
+                   '18.0' => {
+                               'fpga' => 8231,
+                               'chan' => 36
+                             },
+                   '18.6' => {
+                               'chan' => 15,
+                               'fpga' => 8229
+                             },
+                   '11.4' => {
+                               'fpga' => 8229,
+                               'chan' => 3
+                             },
+                   '9.6' => {
+                              'chan' => 27,
+                              'fpga' => 8232
+                            },
+                   '9.9' => {
+                              'fpga' => 8229,
+                              'chan' => 2
+                            },
+                   '2.7' => {
+                              'fpga' => 8234,
+                              'chan' => 14
+                            },
+                   '7.8' => {
+                              'chan' => 29,
+                              'fpga' => 8232
+                            },
+                   '10.8' => {
+                               'chan' => 48,
                                'fpga' => 8231
                              },
-                   '15.00' => {
-                                'chan' => 13,
-                                'fpga' => 8230
-                              },
-                   '12.00' => {
-                                'fpga' => 8230,
-                                'chan' => 42
-                              },
-                   '2.10' => {
+                   '19.2' => {
+                               'fpga' => 8231,
+                               'chan' => 34
+                             },
+                   '12.0' => {
+                               'fpga' => 8231,
+                               'chan' => 46
+                             },
+                   '16.8' => {
                                'fpga' => 8231,
+                               'chan' => 38
+                             },
+                   '16.5' => {
+                               'fpga' => 8231,
+                               'chan' => 37
+                             },
+                   '13.8' => {
+                               'chan' => 7,
+                               'fpga' => 8229
+                             },
+                   '4.8' => {
+                              'fpga' => 8233,
+                              'chan' => 34
+                            },
+                   '3.3' => {
+                              'fpga' => 8233,
+                              'chan' => 35
+                            },
+                   '8.1' => {
+                              'fpga' => 8232,
+                              'chan' => 26
+                            },
+                   '5.7' => {
+                              'chan' => 18,
+                              'fpga' => 8234
+                            },
+                   '17.1' => {
+                               'fpga' => 8229,
+                               'chan' => 14
+                             },
+                   '0.9' => {
+                              'fpga' => 8233,
+                              'chan' => 39
+                            },
+                   '1.2' => {
+                              'fpga' => 8233,
+                              'chan' => 40
+                            },
+                   '0.6' => {
+                              'chan' => 9,
+                              'fpga' => 8234
+                            },
+                   '2.4' => {
+                              'fpga' => 8233,
+                              'chan' => 38
+                            },
+                   '7.2' => {
+                              'chan' => 19,
+                              'fpga' => 8234
+                            },
+                   '12.3' => {
+                               'chan' => 6,
+                               'fpga' => 8229
+                             },
+                   '13.5' => {
+                               'chan' => 8,
+                               'fpga' => 8229
+                             }
+                 },
+          '2' => {
+                   '2.4' => {
+                              'fpga' => 8233,
+                              'chan' => 10
+                            },
+                   '7.2' => {
+                              'chan' => 2,
+                              'fpga' => 8233
+                            },
+                   '12.3' => {
+                               'fpga' => 8232,
+                               'chan' => 10
+                             },
+                   '13.5' => {
+                               'chan' => 12,
+                               'fpga' => 8232
+                             },
+                   '1.2' => {
+                              'fpga' => 8233,
+                              'chan' => 12
+                            },
+                   '0.6' => {
+                              'chan' => 21,
+                              'fpga' => 8233
+                            },
+                   '13.8' => {
+                               'fpga' => 8232,
+                               'chan' => 11
+                             },
+                   '16.5' => {
+                               'fpga' => 8229,
+                               'chan' => 33
+                             },
+                   '4.8' => {
+                              'fpga' => 8233,
+                              'chan' => 6
+                            },
+                   '3.3' => {
+                              'fpga' => 8233,
+                              'chan' => 7
+                            },
+                   '8.1' => {
+                              'chan' => 47,
+                              'fpga' => 8229
+                            },
+                   '5.7' => {
+                              'chan' => 3,
+                              'fpga' => 8233
+                            },
+                   '0.9' => {
+                              'chan' => 11,
+                              'fpga' => 8233
+                            },
+                   '17.1' => {
+                               'fpga' => 8232,
+                               'chan' => 18
+                             },
+                   '10.8' => {
+                               'chan' => 44,
+                               'fpga' => 8229
+                             },
+                   '19.2' => {
+                               'fpga' => 8232,
+                               'chan' => 23
+                             },
+                   '16.8' => {
+                               'chan' => 34,
+                               'fpga' => 8229
+                             },
+                   '12.0' => {
+                               'chan' => 42,
+                               'fpga' => 8229
+                             },
+                   '2.7' => {
+                              'chan' => 26,
+                              'fpga' => 8233
+                            },
+                   '7.8' => {
+                              'chan' => 1,
+                              'fpga' => 8232
+                            },
+                   '9.9' => {
+                              'chan' => 6,
+                              'fpga' => 8232
+                            },
+                   '18.6' => {
+                               'fpga' => 8232,
+                               'chan' => 19
+                             },
+                   '11.4' => {
+                               'chan' => 7,
+                               'fpga' => 8232
+                             },
+                   '9.6' => {
+                              'fpga' => 8229,
+                              'chan' => 46
+                            },
+                   '15.3' => {
+                               'chan' => 35,
+                               'fpga' => 8229
+                             },
+                   '18.0' => {
+                               'chan' => 21,
+                               'fpga' => 8232
+                             },
+                   '1.5' => {
+                              'chan' => 24,
+                              'fpga' => 8233
+                            },
+                   '18.9' => {
+                               'fpga' => 8232,
+                               'chan' => 24
+                             },
+                   '10.2' => {
+                               'chan' => 5,
+                               'fpga' => 8232
+                             },
+                   '16.2' => {
+                               'fpga' => 8232,
+                               'chan' => 15
+                             },
+                   '11.1' => {
+                               'fpga' => 8232,
+                               'chan' => 8
+                             },
+                   '15.0' => {
+                               'fpga' => 8232,
+                               'chan' => 13
+                             },
+                   '4.5' => {
+                              'fpga' => 8233,
+                              'chan' => 5
+                            },
+                   '14.7' => {
+                               'fpga' => 8232,
+                               'chan' => 14
+                             },
+                   '15.6' => {
+                               'fpga' => 8229,
+                               'chan' => 36
+                             },
+                   '4.2' => {
+                              'chan' => 27,
+                              'fpga' => 8233
+                            },
+                   '3.6' => {
+                              'chan' => 8,
+                              'fpga' => 8233
+                            },
+                   '14.1' => {
+                               'fpga' => 8229,
+                               'chan' => 37
+                             },
+                   '8.4' => {
+                              'fpga' => 8229,
+                              'chan' => 48
+                            },
+                   '9.0' => {
+                              'fpga' => 8232,
+                              'chan' => 3
+                            },
+                   '7.5' => {
+                              'fpga' => 8232,
+                              'chan' => 2
+                            },
+                   '3.0' => {
+                              'chan' => 25,
+                              'fpga' => 8233
+                            },
+                   '15.9' => {
+                               'fpga' => 8232,
+                               'chan' => 16
+                             },
+                   '14.4' => {
+                               'chan' => 38,
+                               'fpga' => 8229
+                             },
+                   '12.6' => {
+                               'fpga' => 8232,
                                'chan' => 9
                              },
-                   '17.40' => {
-                                'fpga' => 8229,
-                                'chan' => 33
-                              },
-                   '0.30' => {
-                               'fpga' => 8230,
-                               'chan' => 22
+                   '11.7' => {
+                               'fpga' => 8229,
+                               'chan' => 41
                              },
-                   '3.00' => {
-                               'fpga' => 8230,
-                               'chan' => 25
+                   '1.8' => {
+                              'fpga' => 8233,
+                              'chan' => 23
+                            },
+                   '6.9' => {
+                              'fpga' => 8233,
+                              'chan' => 1
+                            },
+                   '17.4' => {
+                               'fpga' => 8232,
+                               'chan' => 17
                              },
-                   '14.10' => {
-                                'fpga' => 8230,
-                                'chan' => 37
-                              },
-                   '15.60' => {
-                                'chan' => 36,
-                                'fpga' => 8230
-                              },
-                   '7.50' => {
-                               'chan' => 2,
-                               'fpga' => 8230
+                   '13.2' => {
+                               'chan' => 40,
+                               'fpga' => 8229
+                             },
+                   '0.3' => {
+                              'chan' => 22,
+                              'fpga' => 8233
+                            },
+                   '5.4' => {
+                              'chan' => 29,
+                              'fpga' => 8233
+                            },
+                   '10.5' => {
+                               'fpga' => 8229,
+                               'chan' => 43
                              },
-                   '10.20' => {
-                                'fpga' => 8230,
-                                'chan' => 5
-                              },
-                   '10.50' => {
-                                'fpga' => 8230,
-                                'chan' => 43
-                              },
-                   '4.20' => {
+                   '6.0' => {
+                              'fpga' => 8233,
+                              'chan' => 4
+                            },
+                   '18.3' => {
+                               'fpga' => 8232,
+                               'chan' => 20
+                             },
+                   '5.1' => {
+                              'fpga' => 8233,
+                              'chan' => 30
+                            },
+                   '6.3' => {
+                              'fpga' => 8233,
+                              'chan' => 32
+                            },
+                   '3.9' => {
+                              'fpga' => 8233,
+                              'chan' => 28
+                            },
+                   '12.9' => {
+                               'fpga' => 8229,
+                               'chan' => 39
+                             },
+                   '6.6' => {
+                              'chan' => 31,
+                              'fpga' => 8233
+                            },
+                   '8.7' => {
+                              'fpga' => 8232,
+                              'chan' => 4
+                            },
+                   '2.1' => {
+                              'fpga' => 8233,
+                              'chan' => 9
+                            },
+                   '9.3' => {
+                              'chan' => 45,
+                              'fpga' => 8229
+                            },
+                   '17.7' => {
+                               'chan' => 22,
+                               'fpga' => 8232
+                             }
+                 },
+          '0' => {
+                   '1.5' => {
+                              'chan' => 30,
+                              'fpga' => 8230
+                            },
+                   '25.0' => {
                                'chan' => 27,
+                               'fpga' => 8228
+                             },
+                   '8.5' => {
+                              'fpga' => 8231,
+                              'chan' => 32
+                            },
+                   '28.0' => {
+                               'fpga' => 8228,
+                               'chan' => 21
+                             },
+                   '35.5' => {
+                               'fpga' => 8229,
+                               'chan' => 23
+                             },
+                   '39.5' => {
+                               'chan' => 31,
+                               'fpga' => 8229
+                             },
+                   '24.0' => {
+                               'chan' => 29,
+                               'fpga' => 8228
+                             },
+                   '39.0' => {
+                               'fpga' => 8229,
+                               'chan' => 30
+                             },
+                   '15.0' => {
+                               'chan' => 10,
                                'fpga' => 8230
                              },
-                   '2.70' => {
-                               'chan' => 26,
+                   '3.5' => {
+                              'chan' => 26,
+                              'fpga' => 8230
+                            },
+                   '20.5' => {
+                               'fpga' => 8228,
+                               'chan' => 4
+                             },
+                   '22.5' => {
+                               'chan' => 32,
+                               'fpga' => 8228
+                             },
+                   '4.5' => {
+                              'chan' => 24,
+                              'fpga' => 8230
+                            },
+                   '2.5' => {
+                              'chan' => 28,
+                              'fpga' => 8230
+                            },
+                   '38.0' => {
+                               'fpga' => 8229,
+                               'chan' => 28
+                             },
+                   '13.5' => {
+                               'chan' => 7,
                                'fpga' => 8230
                              },
-                   '8.10' => {
-                               'chan' => 47,
+                   '9.5' => {
+                              'fpga' => 8231,
+                              'chan' => 30
+                            },
+                   '12.5' => {
+                               'chan' => 5,
                                'fpga' => 8230
                              },
-                   '6.30' => {
-                               'chan' => 32,
+                   '36.5' => {
+                               'chan' => 25,
+                               'fpga' => 8229
+                             },
+                   '14.5' => {
+                               'chan' => 9,
                                'fpga' => 8230
                              },
-                   '9.30' => {
-                               'fpga' => 8230,
-                               'chan' => 45
+                   '24.5' => {
+                               'chan' => 28,
+                               'fpga' => 8228
                              },
-                   '18.60' => {
-                                'chan' => 35,
-                                'fpga' => 8229
-                              },
-                   '4.80' => {
-                               'fpga' => 8231,
-                               'chan' => 6
+                   '27.5' => {
+                               'fpga' => 8228,
+                               'chan' => 22
+                             },
+                   '25.5' => {
+                               'chan' => 26,
+                               'fpga' => 8228
                              },
-                   '5.10' => {
+                   '16.5' => {
                                'fpga' => 8230,
-                               'chan' => 30
+                               'chan' => 13
+                             },
+                   '30.0' => {
+                               'chan' => 17,
+                               'fpga' => 8228
+                             },
+                   '32.5' => {
+                               'fpga' => 8229,
+                               'chan' => 17
                              },
-                   '19.20' => {
-                                'fpga' => 8229,
-                                'chan' => 39
-                              },
-                   '13.80' => {
-                                'chan' => 11,
-                                'fpga' => 8230
-                              },
-                   '7.80' => {
+                   '12.0' => {
                                'fpga' => 8230,
-                               'chan' => 1
+                               'chan' => 4
                              },
-                   '9.90' => {
+                   '6.5' => {
+                              'chan' => 20,
+                              'fpga' => 8230
+                            },
+                   '14.0' => {
                                'fpga' => 8230,
-                               'chan' => 6
+                               'chan' => 8
+                             },
+                   '36.0' => {
+                               'fpga' => 8229,
+                               'chan' => 24
+                             },
+                   '26.0' => {
+                               'chan' => 25,
+                               'fpga' => 8228
                              },
-                   '18.90' => {
-                                'fpga' => 8229,
-                                'chan' => 40
-                              },
-                   '13.20' => {
-                                'fpga' => 8230,
-                                'chan' => 40
-                              },
-                   '18.30' => {
-                                'chan' => 36,
-                                'fpga' => 8229
-                              },
-                   '14.70' => {
-                                'fpga' => 8230,
-                                'chan' => 14
-                              },
-                   '16.50' => {
-                                'fpga' => 8230,
-                                'chan' => 33
-                              },
-                   '14.40' => {
-                                'fpga' => 8230,
-                                'chan' => 38
-                              },
-                   '10.80' => {
-                                'chan' => 44,
-                                'fpga' => 8230
-                              },
-                   '13.50' => {
-                                'chan' => 12,
-                                'fpga' => 8230
-                              },
-                   '17.10' => {
-                                'fpga' => 8229,
-                                'chan' => 34
-                              },
-                   '11.10' => {
-                                'chan' => 8,
-                                'fpga' => 8230
-                              },
-                   '16.80' => {
-                                'fpga' => 8230,
-                                'chan' => 34
-                              },
-                   '5.70' => {
+                   '27.0' => {
+                               'fpga' => 8228,
+                               'chan' => 23
+                             },
+                   '37.0' => {
+                               'chan' => 26,
+                               'fpga' => 8229
+                             },
+                   '28.5' => {
+                               'chan' => 20,
+                               'fpga' => 8228
+                             },
+                   '34.0' => {
+                               'fpga' => 8229,
+                               'chan' => 20
+                             },
+                   '20.0' => {
                                'fpga' => 8231,
-                               'chan' => 3
+                               'chan' => 25
                              },
-                   '2.40' => {
-                               'chan' => 10,
-                               'fpga' => 8231
+                   '29.5' => {
+                               'fpga' => 8228,
+                               'chan' => 18
                              },
-                   '12.30' => {
-                                'fpga' => 8230,
-                                'chan' => 10
-                              },
-                   '18.00' => {
-                                'chan' => 37,
-                                'fpga' => 8229
-                              },
-                   '3.90' => {
+                   '17.5' => {
+                               'chan' => 15,
+                               'fpga' => 8230
+                             },
+                   '18.5' => {
                                'chan' => 28,
+                               'fpga' => 8231
+                             },
+                   '31.5' => {
+                               'fpga' => 8228,
+                               'chan' => 6
+                             },
+                   '5.5' => {
+                              'fpga' => 8230,
+                              'chan' => 22
+                            },
+                   '21.0' => {
+                               'fpga' => 8228,
+                               'chan' => 3
+                             },
+                   '21.5' => {
+                               'fpga' => 8228,
+                               'chan' => 2
+                             },
+                   '18.0' => {
+                               'chan' => 16,
                                'fpga' => 8230
                              },
-                   '0.60' => {
-                               'fpga' => 8230,
-                               'chan' => 21
+                   '23.0' => {
+                               'chan' => 31,
+                               'fpga' => 8228
+                             },
+                   '35.0' => {
+                               'chan' => 22,
+                               'fpga' => 8229
                              },
-                   '7.20' => {
+                   '7.0' => {
+                              'fpga' => 8230,
+                              'chan' => 19
+                            },
+                   '33.5' => {
+                               'chan' => 19,
+                               'fpga' => 8229
+                             },
+                   '19.0' => {
                                'fpga' => 8231,
-                               'chan' => 2
+                               'chan' => 27
                              },
-                   '6.00' => {
-                               'chan' => 4,
-                               'fpga' => 8231
+                   '22.0' => {
+                               'fpga' => 8228,
+                               'chan' => 1
                              },
-                   '5.40' => {
+                   '0.5' => {
+                              'fpga' => 8230,
+                              'chan' => 32
+                            },
+                   '17.0' => {
                                'fpga' => 8230,
-                               'chan' => 29
+                               'chan' => 14
                              },
-                   '4.50' => {
-                               'fpga' => 8231,
-                               'chan' => 5
+                   '1.0' => {
+                              'fpga' => 8230,
+                              'chan' => 31
+                            },
+                   '8.0' => {
+                              'chan' => 17,
+                              'fpga' => 8230
+                            },
+                   '40.0' => {
+                               'fpga' => 8229,
+                               'chan' => 32
                              },
-                   '11.40' => {
-                                'chan' => 7,
-                                'fpga' => 8230
-                              }
-                 },
-          '0' => {
-                   '18.5' => {
-                               'chan' => 30,
+                   '31.0' => {
+                               'chan' => 7,
+                               'fpga' => 8228
+                             },
+                   '38.5' => {
+                               'chan' => 29,
                                'fpga' => 8229
                              },
+                   '32.0' => {
+                               'chan' => 5,
+                               'fpga' => 8228
+                             },
                    '37.5' => {
-                               'chan' => 16,
+                               'chan' => 27,
                                'fpga' => 8229
                              },
-                   '11' => {
-                             'chan' => 6,
-                             'fpga' => 8228
-                           },
-                   '10' => {
-                             'fpga' => 8228,
-                             'chan' => 8
-                           },
-                   '9' => {
-                            'chan' => 34,
-                            'fpga' => 8228
-                          },
+                   '11.0' => {
+                               'fpga' => 8230,
+                               'chan' => 2
+                             },
+                   '26.5' => {
+                               'fpga' => 8228,
+                               'chan' => 24
+                             },
+                   '16.0' => {
+                               'chan' => 12,
+                               'fpga' => 8230
+                             },
                    '7.5' => {
-                              'chan' => 37,
-                              'fpga' => 8228
+                              'fpga' => 8230,
+                              'chan' => 18
                             },
-                   '35.5' => {
-                               'fpga' => 8229,
-                               'chan' => 12
+                   '33.0' => {
+                               'chan' => 18,
+                               'fpga' => 8229
                              },
-                   '26.5' => {
+                   '10.0' => {
+                               'chan' => 29,
+                               'fpga' => 8231
+                             },
+                   '9.0' => {
+                              'fpga' => 8231,
+                              'chan' => 31
+                            },
+                   '3.0' => {
+                              'fpga' => 8230,
+                              'chan' => 27
+                            },
+                   '15.5' => {
+                               'fpga' => 8230,
+                               'chan' => 11
+                             },
+                   '4.0' => {
+                              'fpga' => 8230,
+                              'chan' => 25
+                            },
+                   '29.0' => {
                                'fpga' => 8228,
                                'chan' => 19
                              },
-                   '23.5' => {
-                               'fpga' => 8228,
-                               'chan' => 25
+                   '19.5' => {
+                               'fpga' => 8231,
+                               'chan' => 26
                              },
-                   '1.5' => {
-                              'chan' => 1,
-                              'fpga' => 8228
+                   '10.5' => {
+                               'chan' => 1,
+                               'fpga' => 8230
+                             },
+                   '6.0' => {
+                              'chan' => 21,
+                              'fpga' => 8230
                             },
-                   '36.5' => {
-                               'fpga' => 8229,
-                               'chan' => 14
+                   '30.5' => {
+                               'chan' => 8,
+                               'fpga' => 8228
+                             },
+                   '11.5' => {
+                               'chan' => 3,
+                               'fpga' => 8230
+                             },
+                   '5.0' => {
+                              'fpga' => 8230,
+                              'chan' => 23
+                            },
+                   '34.5' => {
+                               'chan' => 21,
+                               'fpga' => 8229
                              },
-                   '13' => {
-                             'chan' => 19,
-                             'fpga' => 8229
-                           },
-                   '29.5' => {
-                               'chan' => 13,
+                   '23.5' => {
+                               'chan' => 30,
                                'fpga' => 8228
                              },
-                   '1' => {
-                            'chan' => 2,
-                            'fpga' => 8228
-                          },
-                   '19.5' => {
-                               'chan' => 32,
-                               'fpga' => 8229
+                   '2.0' => {
+                              'fpga' => 8230,
+                              'chan' => 29
+                            },
+                   '13.0' => {
+                               'chan' => 6,
+                               'fpga' => 8230
+                             }
+                 },
+          '1' => {
+                   '26.0' => {
+                               'fpga' => 8232,
+                               'chan' => 37
                              },
-                   '29' => {
-                             'chan' => 14,
-                             'fpga' => 8228
-                           },
-                   '3' => {
-                            'fpga' => 8228,
-                            'chan' => 46
-                          },
-                   '0' => {
-                            'fpga' => 8228,
-                            'chan' => 4
-                          },
-                   '30.5' => {
-                               'fpga' => 8229,
-                               'chan' => 2
+                   '27.0' => {
+                               'chan' => 35,
+                               'fpga' => 8232
                              },
-                   '22.5' => {
-                               'chan' => 27,
+                   '28.5' => {
+                               'chan' => 16,
                                'fpga' => 8228
                              },
-                   '16.5' => {
-                               'chan' => 26,
-                               'fpga' => 8229
+                   '37.0' => {
+                               'chan' => 46,
+                               'fpga' => 8228
+                             },
+                   '36.0' => {
+                               'chan' => 44,
+                               'fpga' => 8228
                              },
-                   '17' => {
-                             'chan' => 27,
-                             'fpga' => 8229
-                           },
-                   '2' => {
-                            'chan' => 48,
-                            'fpga' => 8228
-                          },
+                   '5.5' => {
+                              'fpga' => 8231,
+                              'chan' => 10
+                            },
                    '21.5' => {
+                               'chan' => 46,
+                               'fpga' => 8232
+                             },
+                   '21.0' => {
+                               'chan' => 47,
+                               'fpga' => 8232
+                             },
+                   '23.0' => {
+                               'chan' => 43,
+                               'fpga' => 8232
+                             },
+                   '18.0' => {
+                               'fpga' => 8230,
+                               'chan' => 44
+                             },
+                   '34.0' => {
                                'fpga' => 8228,
-                               'chan' => 29
+                               'chan' => 40
                              },
-                   '37' => {
-                             'fpga' => 8229,
-                             'chan' => 15
-                           },
-                   '27.5' => {
-                               'chan' => 17,
-                               'fpga' => 8228
+                   '20.0' => {
+                               'fpga' => 8230,
+                               'chan' => 48
                              },
-                   '23' => {
-                             'chan' => 26,
-                             'fpga' => 8228
-                           },
-                   '4.5' => {
-                              'chan' => 43,
-                              'fpga' => 8228
-                            },
-                   '28' => {
-                             'chan' => 16,
-                             'fpga' => 8228
-                           },
-                   '27' => {
-                             'fpga' => 8228,
-                             'chan' => 18
-                           },
-                   '15' => {
-                             'fpga' => 8229,
-                             'chan' => 23
-                           },
-                   '7' => {
-                            'chan' => 38,
-                            'fpga' => 8228
-                          },
-                   '5' => {
-                            'chan' => 42,
-                            'fpga' => 8228
-                          },
-                   '13.5' => {
-                               'chan' => 20,
-                               'fpga' => 8229
+                   '29.5' => {
+                               'fpga' => 8228,
+                               'chan' => 14
                              },
-                   '20' => {
-                             'fpga' => 8228,
-                             'chan' => 32
-                           },
-                   '4' => {
-                            'fpga' => 8228,
-                            'chan' => 44
-                          },
-                   '10.5' => {
-                               'chan' => 7,
-                               'fpga' => 8228
+                   '17.5' => {
+                               'chan' => 43,
+                               'fpga' => 8230
                              },
-                   '31' => {
-                             'chan' => 3,
-                             'fpga' => 8229
-                           },
-                   '18' => {
-                             'chan' => 29,
-                             'fpga' => 8229
-                           },
-                   '31.5' => {
-                               'fpga' => 8229,
-                               'chan' => 4
+                   '18.5' => {
+                               'fpga' => 8230,
+                               'chan' => 45
                              },
-                   '39.5' => {
-                               'chan' => 9,
+                   '31.5' => {
+                               'chan' => 35,
                                'fpga' => 8228
                              },
                    '9.5' => {
-                              'chan' => 33,
-                              'fpga' => 8228
+                              'fpga' => 8231,
+                              'chan' => 2
                             },
-                   '34.5' => {
-                               'chan' => 10,
-                               'fpga' => 8229
+                   '13.5' => {
+                               'fpga' => 8230,
+                               'chan' => 35
+                             },
+                   '36.5' => {
+                               'fpga' => 8228,
+                               'chan' => 45
                              },
-                   '24' => {
-                             'fpga' => 8228,
-                             'chan' => 24
-                           },
-                   '8' => {
-                            'chan' => 36,
-                            'fpga' => 8228
-                          },
-                   '33' => {
-                             'chan' => 7,
-                             'fpga' => 8229
-                           },
                    '12.5' => {
-                               'chan' => 18,
-                               'fpga' => 8229
+                               'fpga' => 8230,
+                               'chan' => 33
                              },
-                   '25.5' => {
-                               'fpga' => 8228,
-                               'chan' => 21
+                   '14.5' => {
+                               'chan' => 37,
+                               'fpga' => 8230
                              },
-                   '20.5' => {
-                               'chan' => 31,
-                               'fpga' => 8228
+                   '24.5' => {
+                               'chan' => 40,
+                               'fpga' => 8232
+                             },
+                   '12.0' => {
+                               'chan' => 21,
+                               'fpga' => 8231
                              },
-                   '36' => {
-                             'fpga' => 8229,
-                             'chan' => 13
-                           },
-                   '2.5' => {
-                              'chan' => 47,
-                              'fpga' => 8228
-                            },
-                   '26' => {
-                             'chan' => 20,
-                             'fpga' => 8228
-                           },
                    '6.5' => {
-                              'chan' => 39,
-                              'fpga' => 8228
+                              'chan' => 8,
+                              'fpga' => 8231
                             },
-                   '38.5' => {
-                               'chan' => 11,
+                   '14.0' => {
+                               'fpga' => 8230,
+                               'chan' => 36
+                             },
+                   '27.5' => {
+                               'fpga' => 8232,
+                               'chan' => 34
+                             },
+                   '16.5' => {
+                               'fpga' => 8230,
+                               'chan' => 41
+                             },
+                   '25.5' => {
+                               'fpga' => 8232,
+                               'chan' => 38
+                             },
+                   '30.0' => {
+                               'chan' => 13,
                                'fpga' => 8228
                              },
                    '32.5' => {
-                               'chan' => 6,
-                               'fpga' => 8229
+                               'chan' => 37,
+                               'fpga' => 8228
                              },
-                   '21' => {
-                             'fpga' => 8228,
-                             'chan' => 30
-                           },
-                   '25' => {
-                             'chan' => 22,
-                             'fpga' => 8228
-                           },
-                   '19' => {
-                             'fpga' => 8229,
-                             'chan' => 31
-                           },
-                   '5.5' => {
-                              'chan' => 41,
-                              'fpga' => 8228
+                   '22.5' => {
+                               'fpga' => 8232,
+                               'chan' => 44
+                             },
+                   '4.5' => {
+                              'chan' => 12,
+                              'fpga' => 8231
                             },
-                   '14.5' => {
-                               'fpga' => 8229,
-                               'chan' => 22
+                   '15.0' => {
+                               'fpga' => 8230,
+                               'chan' => 38
                              },
                    '3.5' => {
-                              'chan' => 45,
-                              'fpga' => 8228
+                              'chan' => 14,
+                              'fpga' => 8231
                             },
-                   '17.5' => {
-                               'fpga' => 8229,
-                               'chan' => 28
+                   '20.5' => {
+                               'fpga' => 8232,
+                               'chan' => 48
                              },
-                   '16' => {
-                             'fpga' => 8229,
-                             'chan' => 25
-                           },
-                   '33.5' => {
-                               'fpga' => 8229,
-                               'chan' => 8
+                   '38.0' => {
+                               'chan' => 48,
+                               'fpga' => 8228
                              },
-                   '35' => {
-                             'fpga' => 8229,
-                             'chan' => 11
-                           },
-                   '0.5' => {
-                              'fpga' => 8228,
-                              'chan' => 3
+                   '2.5' => {
+                              'fpga' => 8231,
+                              'chan' => 16
                             },
-                   '30' => {
-                             'chan' => 1,
-                             'fpga' => 8229
-                           },
-                   '22' => {
-                             'chan' => 28,
-                             'fpga' => 8228
-                           },
-                   '38' => {
-                             'chan' => 12,
-                             'fpga' => 8228
-                           },
-                   '39' => {
-                             'chan' => 10,
-                             'fpga' => 8228
-                           },
-                   '34' => {
-                             'fpga' => 8229,
-                             'chan' => 9
-                           },
-                   '32' => {
-                             'chan' => 5,
-                             'fpga' => 8229
-                           },
                    '8.5' => {
-                              'chan' => 35,
-                              'fpga' => 8228
-                            },
-                   '12' => {
-                             'fpga' => 8229,
-                             'chan' => 17
-                           },
-                   '6' => {
-                            'fpga' => 8228,
-                            'chan' => 40
-                          },
-                   '14' => {
-                             'chan' => 21,
-                             'fpga' => 8229
-                           },
-                   '28.5' => {
-                               'fpga' => 8228,
-                               'chan' => 15
+                              'chan' => 4,
+                              'fpga' => 8231
+                            },
+                   '25.0' => {
+                               'chan' => 39,
+                               'fpga' => 8232
                              },
-                   '11.5' => {
-                               'chan' => 5,
+                   '28.0' => {
+                               'chan' => 33,
+                               'fpga' => 8232
+                             },
+                   '35.5' => {
+                               'chan' => 43,
                                'fpga' => 8228
                              },
-                   '24.5' => {
+                   '1.5' => {
+                              'chan' => 18,
+                              'fpga' => 8231
+                            },
+                   '39.0' => {
                                'fpga' => 8228,
-                               'chan' => 23
-                             },
-                   '15.5' => {
-                               'fpga' => 8229,
-                               'chan' => 24
-                             }
-                 },
-          '2' => {
-                   '4.50' => {
-                               'chan' => 21,
-                               'fpga' => 8232
+                               'chan' => 11
                              },
-                   '5.40' => {
-                               'chan' => 13,
-                               'fpga' => 8232
+                   '39.5' => {
+                               'fpga' => 8228,
+                               'chan' => 10
                              },
-                   '6.00' => {
+                   '24.0' => {
                                'fpga' => 8232,
-                               'chan' => 20
+                               'chan' => 41
                              },
-                   '6.90' => {
-                               'fpga' => 8232,
-                               'chan' => 17
+                   '6.0' => {
+                              'fpga' => 8231,
+                              'chan' => 9
+                            },
+                   '30.5' => {
+                               'fpga' => 8228,
+                               'chan' => 33
                              },
-                   '7.20' => {
-                               'fpga' => 8232,
-                               'chan' => 18
+                   '19.5' => {
+                               'chan' => 47,
+                               'fpga' => 8230
                              },
-                   '5.10' => {
-                               'chan' => 14,
-                               'fpga' => 8232
+                   '10.5' => {
+                               'fpga' => 8231,
+                               'chan' => 24
                              },
-                   '4.80' => {
+                   '23.5' => {
                                'fpga' => 8232,
-                               'chan' => 22
+                               'chan' => 42
                              },
-                   '3.30' => {
-                               'fpga' => 8232,
-                               'chan' => 23
+                   '2.0' => {
+                              'fpga' => 8231,
+                              'chan' => 17
+                            },
+                   '13.0' => {
+                               'chan' => 34,
+                               'fpga' => 8230
                              },
-                   '1.20' => {
-                               'chan' => 28,
+                   '11.5' => {
+                               'chan' => 22,
+                               'fpga' => 8231
+                             },
+                   '34.5' => {
+                               'fpga' => 8228,
+                               'chan' => 41
+                             },
+                   '5.0' => {
+                              'chan' => 11,
+                              'fpga' => 8231
+                            },
+                   '3.0' => {
+                              'chan' => 15,
+                              'fpga' => 8231
+                            },
+                   '26.5' => {
+                               'chan' => 36,
                                'fpga' => 8232
                              },
-                   '0.60' => {
-                               'fpga' => 8232,
-                               'chan' => 5
+                   '7.5' => {
+                              'fpga' => 8231,
+                              'chan' => 6
+                            },
+                   '16.0' => {
+                               'fpga' => 8230,
+                               'chan' => 40
                              },
-                   '3.90' => {
-                               'fpga' => 8232,
-                               'chan' => 12
+                   '33.0' => {
+                               'chan' => 38,
+                               'fpga' => 8228
                              },
-                   '6.30' => {
-                               'chan' => 16,
-                               'fpga' => 8232
+                   '9.0' => {
+                              'chan' => 3,
+                              'fpga' => 8231
+                            },
+                   '10.0' => {
+                               'chan' => 1,
+                               'fpga' => 8231
                              },
-                   '2.70' => {
-                               'fpga' => 8232,
-                               'chan' => 10
+                   '4.0' => {
+                              'fpga' => 8231,
+                              'chan' => 13
+                            },
+                   '29.0' => {
+                               'chan' => 15,
+                               'fpga' => 8228
                              },
-                   '2.40' => {
-                               'fpga' => 8232,
-                               'chan' => 26
+                   '15.5' => {
+                               'chan' => 39,
+                               'fpga' => 8230
                              },
-                   '5.70' => {
-                               'chan' => 19,
-                               'fpga' => 8232
+                   '17.0' => {
+                               'fpga' => 8230,
+                               'chan' => 42
                              },
-                   '4.20' => {
-                               'chan' => 11,
-                               'fpga' => 8232
+                   '1.0' => {
+                              'fpga' => 8231,
+                              'chan' => 19
+                            },
+                   '40.0' => {
+                               'chan' => 9,
+                               'fpga' => 8228
                              },
-                   '3.60' => {
-                               'chan' => 24,
-                               'fpga' => 8232
+                   '8.0' => {
+                              'chan' => 5,
+                              'fpga' => 8231
+                            },
+                   '0.5' => {
+                              'chan' => 20,
+                              'fpga' => 8231
+                            },
+                   '38.5' => {
+                               'fpga' => 8228,
+                               'chan' => 12
                              },
-                   '0.90' => {
-                               'chan' => 27,
-                               'fpga' => 8232
+                   '32.0' => {
+                               'fpga' => 8228,
+                               'chan' => 36
                              },
-                   '6.60' => {
-                               'chan' => 15,
-                               'fpga' => 8232
+                   '37.5' => {
+                               'fpga' => 8228,
+                               'chan' => 47
                              },
-                   '1.50' => {
-                               'chan' => 8,
-                               'fpga' => 8232
+                   '11.0' => {
+                               'chan' => 23,
+                               'fpga' => 8231
                              },
-                   '3.00' => {
-                               'fpga' => 8232,
-                               'chan' => 9
+                   '31.0' => {
+                               'fpga' => 8228,
+                               'chan' => 34
                              },
-                   '1.80' => {
-                               'fpga' => 8232,
-                               'chan' => 7
+                   '35.0' => {
+                               'fpga' => 8228,
+                               'chan' => 42
                              },
-                   '0.30' => {
-                               'chan' => 6,
+                   '7.0' => {
+                              'fpga' => 8231,
+                              'chan' => 7
+                            },
+                   '22.0' => {
+                               'chan' => 45,
                                'fpga' => 8232
                              },
-                   '2.10' => {
-                               'chan' => 25,
-                               'fpga' => 8232
+                   '33.5' => {
+                               'fpga' => 8228,
+                               'chan' => 39
                              },
-                   '0.00' => {
-                               'fpga' => 8232,
-                               'chan' => 32
+                   '19.0' => {
+                               'fpga' => 8230,
+                               'chan' => 46
                              }
                  }
         };

diff --git a/dmon/scripts/dmon_dircpower.pl b/dmon/scripts/dmon_dircpower.pl
new file mode 100755 (executable)
index 0000000..2eea873
--- /dev/null
+++ b/dmon/scripts/dmon_dircpower.pl
@@ -0,0 +1,109 @@
+#!/usr/bin/perl -w
+
+use warnings;
+use POSIX qw(strftime);
+use FileHandle;
+use lib "./code";
+use lib "../tools";
+use HADES::TrbNet;
+use List::Util qw(min max);
+use Time::HiRes qw(usleep);
+use Dmon;
+use HPlot;
+use Data::Dumper;
+use IO::Socket;
+
+
+my %config = Dmon::StartUp();
+my $script = $config{UserDirectory} . '/' . $config{PowerSupScript};
+
+HPlot::PlotInit({
+  name    => "PSCurrents",
+  file    => Dmon::DMONDIR."PSCurrents",
+  curves  => 20,
+  entries => 300,
+  type    => HPlot::TYPE_HISTORY,
+  output  => HPlot::OUT_PNG,
+  xlabel  => "Time [s]",
+  ylabel  => "Current [A]",
+  sizex   => 750,
+  sizey   => 270,
+  nokey   => 1,
+  buffer  => 1
+  });
+
+my $str = Dmon::MakeTitle(10,6,"PSCurrents",0);
+   $str .= qq@<img src="%ADDPNG PSCurrents.png%" type="image/png">@;
+   $str .= Dmon::MakeFooter();
+Dmon::WriteFile("PSCurrents",$str);
+
+while (1) {
+  # get data from epics
+  my $dataStr = `$script`;
+  my @lines = split "\n", $dataStr;
+  my %devices = ('hameg01', 0, 'hameg02', 0, 'hameg03', 0, 'tdklambda', 0);
+
+  my $maximum = 0;
+  my $total = 0;
+
+  my @values;
+
+  for my $line (@lines) {
+    if ($line =~ /(hameg\d\d|tdklambda) CH (\d).*(\d+\.\d+) A.*(\d+\.\d+) V.*(ON|OFF)/) {
+      my $dev = $1; my $chan = $2; my $curr = $3; my $volt = $4; my $state = $5;
+      
+      $curr = 0 if $state eq 'OFF';
+
+      my $i = 0; #internal mapping 0: h0.c1, 1: h0.c2, .., 4: h1.c1, 5: h1.c2, .., 11: h3.c4, 12: tdklambda
+      if ($dev eq 'tdklambda') {
+        $i = 12;
+      } else {
+        $dev =~ /(\d\d)/;
+        $i = 4 * ($1 - 1) + ($chan - 1);
+        
+        $maximum = $curr if $curr > $maximum;
+        $total += $curr;
+      }
+
+      $devices{$dev} = 1;
+      $values[$i] = $curr;
+    }
+  }
+
+  for(my $i=0; $i < 12; $i++) {
+    my $val = $values[$i];
+    $val = '0' unless $val;
+    HPlot::PlotAdd('PSCurrents',$val,$i);
+  }
+
+
+  my @devFound = ();
+  my @devMissing = ();
+  for my $dev (keys %devices) {
+    push @devFound,   $dev if     $devices{$dev};
+    push @devMissing, $dev unless $devices{$dev};
+  }
+
+  HPlot::PlotDraw('PSCurrents');
+
+  my $title    = "PS Currents";
+  my $value    = sprintf("%.2fA/%.2fA", $maximum, $total);
+  my $longtext = "Maximum / Total current: " . $value . "<br />";
+  $longtext .= 'TDK: ' . $values[12] . "A<br />";
+  $longtext .= 'Sups found: ' . join(', ', @devFound) . "<br />" if @devFound;
+  $longtext .= 'Sups missing: ' . join(', ', @devMissing) if @devMissing;
+
+  my $status   = Dmon::OK;
+  $status = Dmon::WARN if @devMissing;
+  $status = Dmon::FATAL unless @devFound;
+  
+
+  Dmon::WriteQALog($config{flog},"pscurrents",30,$status,$title,$value,$longtext,'2-PSCurrents');
+
+  sleep 1;
+}
+
+
+
+
+

diff --git a/dmon/scripts/dmon_heatmapdiscdirc.pl b/dmon/scripts/dmon_heatmapdiscdirc.pl
index 11df705b868caa7acc8b49990059bc5ece53c273..3e45557bdab02db9c32395713f32e00d80b81ed7 100755 (executable)
--- a/dmon/scripts/dmon_heatmapdiscdirc.pl
+++ b/dmon/scripts/dmon_heatmapdiscdirc.pl
@@ -41,7 +41,7 @@ my $padding_top     = 40;
 # my $pixel_size      = 10;
 # my $pmt_spacing_x   = 40;
 # my $pmt_spacing_y   = 35;
-my $strip_length    = 180;
+my $strip_length    = 135;
 
 my $px_per_mm       = 10;
 
@@ -85,7 +85,7 @@ while (1) {
     if ($instantaneous_normalization) {
       $max_count = 0;
       
-      for my $col (0..2) {
+      for my $col (0..3) {
         for my $ypos (sort keys %{$chanDb->{$col}}) {
           my $fpga = $chanDb->{$col}->{$ypos}->{fpga};
           my $channel = $chanDb->{$col}->{$ypos}->{chan};
@@ -112,7 +112,7 @@ while (1) {
     
     $offset_y = $padding_top;
     
-    for my $col (0..2) {
+    for my $col (0..3) {
       my $strip_width;
       if ($col == 0){
         $strip_width = 0.5;

diff --git a/perllibs/ChanDb.pm b/perllibs/ChanDb.pm
new file mode 120000 (symlink)
index 0000000..1bd3090
--- /dev/null
+++ b/perllibs/ChanDb.pm
@@ -0,0 +1 @@
+../users/gsi_dirc/ChanDb_zigzagmirrored.pm
\ No newline at end of file

diff --git a/thresholds/write_thresholds.pl b/thresholds/write_thresholds.pl
index c0ef4f22ca16b990bb98b6dbfa8e0440cf33055a..fccdd8971dac5015a66c2fc14ca8f1f3fe5a2e77 100755 (executable)
--- a/thresholds/write_thresholds.pl
+++ b/thresholds/write_thresholds.pl
@@ -8,6 +8,7 @@ use Getopt::Long;
 use HADES::TrbNet;
 use POSIX qw(strftime);
 
+# use Time::HiRes qw(usleep nanosleep);
 my $offset = 0;
 my $help;
 
@@ -74,7 +75,8 @@ foreach my $cl (@f) {
     next if($thresh > 0xffff);
 
     $thresh -= $offset;
-
+        #MMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMM
+        # usleep(100000);
     write_threshold("padiwa", $ep, $chain, $channel, $thresh);
     $count++;
 

diff --git a/users/gsi_dirc/dmon_config.pl b/users/gsi_dirc/dmon_config.pl
index d703a55ad641d0746a5ef3f415d246b2fa6775c3..873b223408439da56bceacc709419ec229e91939 100755 (executable)
--- a/users/gsi_dirc/dmon_config.pl
+++ b/users/gsi_dirc/dmon_config.pl
@@ -80,9 +80,9 @@ UserDirectory => '/home/hadaq/trbsoft/daqtools/users/gsi_dirc/',
 #BarrelDirc Heatmap settings
 HeatmapDirc => {
   # upper limit for high end of color scale
-##  max_count_uclamp => 1000000,
-  max_count_uclamp => 2000,
-#  max_count_uclamp => 20000,
+#  max_count_uclamp => 100000000,
+#  max_count_uclamp =>5000,
+  max_count_uclamp => 500,
   # lower limit for high end of color scale
   max_count_lclamp => 10,
   

diff --git a/users/gsi_dirc/prepare_padiwas_invert_leds.pl b/users/gsi_dirc/prepare_padiwas_invert_leds.pl
index bc4cc55d711954731cf12a4f4e77c5dd2f1694b5..db0fc1e2e5dbc4ffd49ef19647629823bce055c7 100755 (executable)
--- a/users/gsi_dirc/prepare_padiwas_invert_leds.pl
+++ b/users/gsi_dirc/prepare_padiwas_invert_leds.pl
@@ -52,8 +52,8 @@ print "\n";
 #execute_command("invert", "verbose");
 #exit
 
-# print "\tturn off all leds ";
-# execute_command("led 0x10");
+# print "\tturn off all leds depending on the firmware version";
+# execute_command("ledoff");
 # $pm->wait_all_children;
 # print "\n";
 

diff --git a/users/gsi_dirc/startup.sh b/users/gsi_dirc/startup.sh
index a4bbd4d88cf7d6996ef4e712926286d3f4c1a80a..0810b06160786c185a1ea5eaa3f9d1579f8aac9a 100755 (executable)
--- a/users/gsi_dirc/startup.sh
+++ b/users/gsi_dirc/startup.sh
@@ -113,8 +113,12 @@ trbcmd i 0xffff | wc -l
 # Reset trigger logic - only a workaround for a bug
 #trbcmd w 0xffff 0x20 0x33
 
+#20150522 Jan comment
+~/trbsoft/daqtools/padiwa.pl 0xfe4c 0 time > /dev/null;~/trbsoft/daqtools/padiwa.pl 0xfe4c 1 time > /dev/null; ~/trbsoft/daqtools/padiwa.pl 0xfe4c 2 time > /dev/null
+
 # Barrel DIRC
-prepare_padiwas_invert_leds.pl --endpoints=0x2000-0x2013 --chains=0..2 --invert=0xffff --stretch=0xffff
+# enable stretch prepare_padiwas_invert_leds.pl --endpoints=0x2000-0x2013 --chains=0..2 --invert=0xffff --stretch=0xffff
+prepare_padiwas_invert_leds.pl --endpoints=0x2000-0x2013 --chains=0..2 --invert=0xffff 
 #padiwa_led_off.pl
 
 # Beam
@@ -155,7 +159,10 @@ cd ~/trbsoft/daqtools/thresholds/
 ## Barrel DIRC
 #./write_thresholds.pl ~/trbsoft/daqtools/users/gsi_dirc/thresh/201505101447.thr -o 600 >> /dev/null # 1.5mV at plug
 #./write_thresholds.pl padiwa_threshold_results_20150511_2.log -o 400 > /dev/null # 1mV at plug
-./write_thresholds.pl padiwa_threshold_results_20150516_high_stretch_CS.log -o 400 > /dev/null # 1mV at plug
+# for stretch ./write_thresholds.pl padiwa_threshold_results_20150516_high_stretch_CS.log -o 400 > /dev/null # 1mV at plug
+#20150521
+./write_thresholds.pl padiwa_threshold_results_20150516_high_nostretch_CS.log -o 200 > /dev/null 
+#./write_thresholds.pl padiwa_threshold_results_20150521_high_nostretch_CS.log -o 200 > /dev/null 
 ./padiwa_led_off_MT.sh > /dev/null
 
 cd -