Skip to content

Commit e84fd3e

Browse files
baltzellbaltzell
authored
Merge branch 'development' into detector-changed-hook
2 parents 61f18d7 + fa29360 commit e84fd3e

File tree

62 files changed

+1297
-634
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

62 files changed

+1297
-634
lines changed

‎common-tools/clara-io/pom.xml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@
44

55
<groupId>org.jlab.clas</groupId>
66
<artifactId>clara-io</artifactId>
7-
<version>13.5.1-SNAPSHOT</version>
7+
<version>13.5.2-SNAPSHOT</version>
88
<packaging>jar</packaging>
99

1010
<parent>
1111
<groupId>org.jlab.clas</groupId>
1212
<artifactId>common-tools</artifactId>
13-
<version>13.5.1-SNAPSHOT</version>
13+
<version>13.5.2-SNAPSHOT</version>
1414
</parent>
1515

1616
<dependencies>
@@ -44,25 +44,25 @@
4444
<dependency>
4545
<groupId>org.jlab.clas</groupId>
4646
<artifactId>clas-io</artifactId>
47-
<version>13.5.1-SNAPSHOT</version>
47+
<version>13.5.2-SNAPSHOT</version>
4848
</dependency>
4949

5050
<dependency>
5151
<groupId>org.jlab.clas</groupId>
5252
<artifactId>clas-detector</artifactId>
53-
<version>13.5.1-SNAPSHOT</version>
53+
<version>13.5.2-SNAPSHOT</version>
5454
</dependency>
5555

5656
<dependency>
5757
<groupId>org.jlab.clas</groupId>
5858
<artifactId>clas-analysis</artifactId>
59-
<version>13.5.1-SNAPSHOT</version>
59+
<version>13.5.2-SNAPSHOT</version>
6060
</dependency>
6161

6262
<dependency>
6363
<groupId>org.jlab.clas</groupId>
6464
<artifactId>clas-utils</artifactId>
65-
<version>13.5.1-SNAPSHOT</version>
65+
<version>13.5.2-SNAPSHOT</version>
6666
</dependency>
6767

6868
<dependency>

‎common-tools/clas-analysis/pom.xml‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@
44

55
<groupId>org.jlab.clas</groupId>
66
<artifactId>clas-analysis</artifactId>
7-
<version>13.5.1-SNAPSHOT</version>
7+
<version>13.5.2-SNAPSHOT</version>
88
<packaging>jar</packaging>
99

1010
<parent>
1111
<groupId>org.jlab.clas</groupId>
1212
<artifactId>common-tools</artifactId>
13-
<version>13.5.1-SNAPSHOT</version>
13+
<version>13.5.2-SNAPSHOT</version>
1414
</parent>
1515

1616
<dependencies>
@@ -38,49 +38,49 @@
3838
<dependency>
3939
<groupId>org.jlab.clas</groupId>
4040
<artifactId>clas-utils</artifactId>
41-
<version>13.5.1-SNAPSHOT</version>
41+
<version>13.5.2-SNAPSHOT</version>
4242
</dependency>
4343

4444
<dependency>
4545
<groupId>org.jlab.clas</groupId>
4646
<artifactId>clas-physics</artifactId>
47-
<version>13.5.1-SNAPSHOT</version>
47+
<version>13.5.2-SNAPSHOT</version>
4848
</dependency>
4949

5050
<dependency>
5151
<groupId>org.jlab.clas</groupId>
5252
<artifactId>clas-io</artifactId>
53-
<version>13.5.1-SNAPSHOT</version>
53+
<version>13.5.2-SNAPSHOT</version>
5454
</dependency>
5555

5656
<dependency>
5757
<groupId>org.jlab.clas</groupId>
5858
<artifactId>clas-geometry</artifactId>
59-
<version>13.5.1-SNAPSHOT</version>
59+
<version>13.5.2-SNAPSHOT</version>
6060
</dependency>
6161

6262
<dependency>
6363
<groupId>org.jlab.clas</groupId>
6464
<artifactId>clas-jcsg</artifactId>
65-
<version>13.5.1-SNAPSHOT</version>
65+
<version>13.5.2-SNAPSHOT</version>
6666
</dependency>
6767

6868
<dependency>
6969
<groupId>org.jlab.clas</groupId>
7070
<artifactId>clas-detector</artifactId>
71-
<version>13.5.1-SNAPSHOT</version>
71+
<version>13.5.2-SNAPSHOT</version>
7272
</dependency>
7373

7474
<dependency>
7575
<groupId>org.jlab.clas</groupId>
7676
<artifactId>clas-reco</artifactId>
77-
<version>13.5.1-SNAPSHOT</version>
77+
<version>13.5.2-SNAPSHOT</version>
7878
</dependency>
7979

8080
<dependency>
8181
<groupId>org.jlab.clas</groupId>
8282
<artifactId>swim-tools</artifactId>
83-
<version>13.5.1-SNAPSHOT</version>
83+
<version>13.5.2-SNAPSHOT</version>
8484
</dependency>
8585

8686
</dependencies>

‎common-tools/clas-decay-tools/pom.xml‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@
44

55
<groupId>org.jlab.clas</groupId>
66
<artifactId>clas-decay-tools</artifactId>
7-
<version>13.5.1-SNAPSHOT</version>
7+
<version>13.5.2-SNAPSHOT</version>
88
<packaging>jar</packaging>
99

1010
<parent>
1111
<groupId>org.jlab.clas</groupId>
1212
<artifactId>common-tools</artifactId>
13-
<version>13.5.1-SNAPSHOT</version>
13+
<version>13.5.2-SNAPSHOT</version>
1414
</parent>
1515

1616
<dependencies>
@@ -21,54 +21,54 @@
2121
<dependency>
2222
<groupId>org.jlab.clas</groupId>
2323
<artifactId>swim-tools</artifactId>
24-
<version>13.5.1-SNAPSHOT</version>
24+
<version>13.5.2-SNAPSHOT</version>
2525
<type>jar</type>
2626
</dependency>
2727
<dependency>
2828
<groupId>cnuphys</groupId>
2929
<artifactId>swimmer</artifactId>
30-
<version>13.5.1-SNAPSHOT</version>
30+
<version>13.5.2-SNAPSHOT</version>
3131
</dependency>
3232
<dependency>
3333
<groupId>cnuphys</groupId>
3434
<artifactId>magfield</artifactId>
35-
<version>13.5.1-SNAPSHOT</version>
35+
<version>13.5.2-SNAPSHOT</version>
3636
</dependency>
3737
<dependency>
3838
<groupId>org.jlab.clas12.detector</groupId>
3939
<artifactId>clas12detector-vtx</artifactId>
40-
<version>13.5.1-SNAPSHOT</version>
40+
<version>13.5.2-SNAPSHOT</version>
4141
<type>jar</type>
4242
</dependency>
4343
<dependency>
4444
<groupId>org.jlab.clas</groupId>
4545
<artifactId>clas-reco</artifactId>
46-
<version>13.5.1-SNAPSHOT</version>
46+
<version>13.5.2-SNAPSHOT</version>
4747
</dependency>
4848
<dependency>
4949
<groupId>org.jlab.clas</groupId>
5050
<artifactId>clas-utils</artifactId>
51-
<version>13.5.1-SNAPSHOT</version>
51+
<version>13.5.2-SNAPSHOT</version>
5252
</dependency>
5353
<dependency>
5454
<groupId>org.jlab.clas</groupId>
5555
<artifactId>clas-detector</artifactId>
56-
<version>13.5.1-SNAPSHOT</version>
56+
<version>13.5.2-SNAPSHOT</version>
5757
</dependency>
5858
<dependency>
5959
<groupId>org.jlab.clas</groupId>
6060
<artifactId>clas-io</artifactId>
61-
<version>13.5.1-SNAPSHOT</version>
61+
<version>13.5.2-SNAPSHOT</version>
6262
</dependency>
6363
<dependency>
6464
<groupId>org.jlab.clas</groupId>
6565
<artifactId>clas-physics</artifactId>
66-
<version>13.5.1-SNAPSHOT</version>
66+
<version>13.5.2-SNAPSHOT</version>
6767
</dependency>
6868
<dependency>
6969
<groupId>org.jlab.clas</groupId>
7070
<artifactId>clas-geometry</artifactId>
71-
<version>13.5.1-SNAPSHOT</version>
71+
<version>13.5.2-SNAPSHOT</version>
7272
</dependency>
7373
</dependencies>
7474
</project>

‎common-tools/clas-detector/pom.xml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,20 +4,20 @@
44

55
<groupId>org.jlab.clas</groupId>
66
<artifactId>clas-detector</artifactId>
7-
<version>13.5.1-SNAPSHOT</version>
7+
<version>13.5.2-SNAPSHOT</version>
88
<packaging>jar</packaging>
99

1010
<parent>
1111
<groupId>org.jlab.clas</groupId>
1212
<artifactId>common-tools</artifactId>
13-
<version>13.5.1-SNAPSHOT</version>
13+
<version>13.5.2-SNAPSHOT</version>
1414
</parent>
1515

1616
<dependencies>
1717
<dependency>
1818
<groupId>org.jlab.clas</groupId>
1919
<artifactId>clas-utils</artifactId>
20-
<version>13.5.1-SNAPSHOT</version>
20+
<version>13.5.2-SNAPSHOT</version>
2121
</dependency>
2222

2323
<dependency>
@@ -43,19 +43,19 @@
4343
<dependency>
4444
<groupId>org.jlab.clas</groupId>
4545
<artifactId>clas-io</artifactId>
46-
<version>13.5.1-SNAPSHOT</version>
46+
<version>13.5.2-SNAPSHOT</version>
4747
</dependency>
4848

4949
<dependency>
5050
<groupId>org.jlab.clas</groupId>
5151
<artifactId>clas-geometry</artifactId>
52-
<version>13.5.1-SNAPSHOT</version>
52+
<version>13.5.2-SNAPSHOT</version>
5353
</dependency>
5454

5555
<dependency>
5656
<groupId>org.jlab.clas</groupId>
5757
<artifactId>clas-logging</artifactId>
58-
<version>13.5.1-SNAPSHOT</version>
58+
<version>13.5.2-SNAPSHOT</version>
5959
</dependency>
6060

6161
<dependency>

‎common-tools/clas-detector/src/main/java/org/jlab/detector/calib/utils/ConstantsManager.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ else if (requests > 1) {
130130
}
131131
}
132132

133-
LOGGER.log(Level.FINE, "[ConstantsManager] ---> loading table for run = " + run);
133+
LOGGER.log(Level.INFO, "[ConstantsManager] ---> loading table for run = " + run);
134134
DatabaseConstantsDescriptor desc = defaultDescriptor.getCopy(run);
135135
DatabaseConstantProvider provider = new DatabaseConstantProvider(run, this.databaseVariation, this.timeStamp);
136136

@@ -142,7 +142,8 @@ else if (requests > 1) {
142142
try {
143143
IndexedTable table = provider.readTable(tableName, desc.getTableIndices().get(i));
144144
desc.getMap().put(tk.get(i), table);
145-
LOGGER.log(Level.FINE, String.format("***** >>> adding : %14s / table = %s", tk.get(i), tableName));
145+
LOGGER.log(Level.INFO, "***** >>> add table = {0}", tableName);
146+
LOGGER.log(Level.FINEST, " key = {0}", tk.get(i));
146147
} catch (Exception e) {
147148
LOGGER.log(Level.SEVERE, e.getMessage());
148149
LOGGER.log(Level.SEVERE, "[ConstantsManager] ---> error reading table : " + tableName);

0 commit comments

Comments
 (0)