Skip to content

Commit 15d291b

Browse files
Holly SzumilaHolly Szumila
Holly Szumila
authored and
Holly Szumila
committed
up to date with master
2 parents 969f93d + 7aa7c7a commit 15d291b

40 files changed

Lines changed: 1897 additions & 4670 deletions

File tree

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,3 +3,4 @@
33
.settings
44
target
55
*.diff
6+
*.log

‎analysis/pom.xml‎

Lines changed: 32 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,34 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
3-
<modelVersion>4.0.0</modelVersion>
4-
<artifactId>hps-analysis</artifactId>
5-
<name>analysis</name>
6-
<description>common analysis code</description>
7-
<parent>
8-
<groupId>org.hps</groupId>
9-
<artifactId>hps-parent</artifactId>
10-
<relativePath>../parent/pom.xml</relativePath>
11-
<version>3.11-SNAPSHOT</version>
12-
</parent>
13-
<dependencies>
14-
<dependency>
15-
<groupId>org.hps</groupId>
16-
<artifactId>hps-recon</artifactId>
17-
</dependency>
18-
</dependencies>
19-
<build>
20-
<plugins>
21-
<plugin>
22-
<groupId>org.apache.maven.plugins</groupId>
23-
<artifactId>maven-surefire-plugin</artifactId>
24-
<configuration>
25-
<excludes>
26-
<exclude>**/VertexAnalysisTest.java</exclude>
27-
</excludes>
28-
</configuration>
29-
</plugin>
30-
</plugins>
31-
</build>
2+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
3+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
4+
<modelVersion>4.0.0</modelVersion>
5+
<artifactId>hps-analysis</artifactId>
6+
<name>analysis</name>
7+
<description>common analysis code</description>
8+
<parent>
9+
<groupId>org.hps</groupId>
10+
<artifactId>hps-java</artifactId>
11+
<relativePath>../pom.xml</relativePath>
12+
<version>3.11-SNAPSHOT</version>
13+
</parent>
14+
<dependencies>
15+
<dependency>
16+
<groupId>org.hps</groupId>
17+
<artifactId>hps-recon</artifactId>
18+
</dependency>
19+
</dependencies>
20+
<build>
21+
<plugins>
22+
<plugin>
23+
<groupId>org.apache.maven.plugins</groupId>
24+
<artifactId>maven-surefire-plugin</artifactId>
25+
<configuration>
26+
<excludes>
27+
<exclude>**/VertexAnalysisTest.java</exclude>
28+
<exclude>org/hps/analysis/MC/MCTrackerHitResidualAnalysisDriverTest.java</exclude>
29+
</excludes>
30+
</configuration>
31+
</plugin>
32+
</plugins>
33+
</build>
3234
</project>

‎conditions/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
<description>extensions to the org.lcsim conditions framework</description>
77
<parent>
88
<groupId>org.hps</groupId>
9-
<artifactId>hps-parent</artifactId>
10-
<relativePath>../parent/pom.xml</relativePath>
9+
<artifactId>hps-java</artifactId>
10+
<relativePath>../pom.xml</relativePath>
1111
<version>3.11-SNAPSHOT</version>
1212
</parent>
1313
<build>

‎crawler/pom.xml‎

Lines changed: 22 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,23 @@
1-
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
2-
<modelVersion>4.0.0</modelVersion>
3-
<artifactId>hps-crawler</artifactId>
4-
<name>crawler</name>
5-
<description>file crawler</description>
6-
<parent>
7-
<groupId>org.hps</groupId>
8-
<artifactId>hps-parent</artifactId>
9-
<relativePath>../parent/pom.xml</relativePath>
10-
<version>3.11-SNAPSHOT</version>
11-
</parent>
12-
<dependencies>
13-
<dependency>
14-
<groupId>org.hps</groupId>
15-
<artifactId>hps-record-util</artifactId>
16-
</dependency>
17-
<dependency>
18-
<groupId>org.hps</groupId>
19-
<artifactId>hps-datacat</artifactId>
20-
</dependency>
21-
</dependencies>
1+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
2+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
3+
<modelVersion>4.0.0</modelVersion>
4+
<artifactId>hps-crawler</artifactId>
5+
<name>crawler</name>
6+
<description>file crawler</description>
7+
<parent>
8+
<groupId>org.hps</groupId>
9+
<artifactId>hps-java</artifactId>
10+
<relativePath>../pom.xml</relativePath>
11+
<version>3.11-SNAPSHOT</version>
12+
</parent>
13+
<dependencies>
14+
<dependency>
15+
<groupId>org.hps</groupId>
16+
<artifactId>hps-record-util</artifactId>
17+
</dependency>
18+
<dependency>
19+
<groupId>org.hps</groupId>
20+
<artifactId>hps-datacat</artifactId>
21+
</dependency>
22+
</dependencies>
2223
</project>

‎datacat/pom.xml‎

Lines changed: 22 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,23 @@
1-
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
2-
<modelVersion>4.0.0</modelVersion>
3-
<artifactId>hps-datacat</artifactId>
4-
<name>datacat</name>
5-
<description>SRS data catalog utilities</description>
6-
<parent>
7-
<groupId>org.hps</groupId>
8-
<artifactId>hps-parent</artifactId>
9-
<relativePath>../parent/pom.xml</relativePath>
10-
<version>3.11-SNAPSHOT</version>
11-
</parent>
12-
<dependencies>
13-
<dependency>
14-
<groupId>srs</groupId>
15-
<artifactId>org-srs-datacat-client</artifactId>
16-
</dependency>
17-
<dependency>
18-
<groupId>org.hps</groupId>
19-
<artifactId>hps-logging</artifactId>
20-
</dependency>
21-
</dependencies>
1+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
2+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
3+
<modelVersion>4.0.0</modelVersion>
4+
<artifactId>hps-datacat</artifactId>
5+
<name>datacat</name>
6+
<description>SRS data catalog utilities</description>
7+
<parent>
8+
<groupId>org.hps</groupId>
9+
<artifactId>hps-java</artifactId>
10+
<relativePath>../pom.xml</relativePath>
11+
<version>3.11-SNAPSHOT</version>
12+
</parent>
13+
<dependencies>
14+
<dependency>
15+
<groupId>srs</groupId>
16+
<artifactId>org-srs-datacat-client</artifactId>
17+
</dependency>
18+
<dependency>
19+
<groupId>org.hps</groupId>
20+
<artifactId>hps-logging</artifactId>
21+
</dependency>
22+
</dependencies>
2223
</project>

detector-data/detectors/HPS-EngRun2015-Nominal-v1-4-1/compact_millepede-milleBinaryISN_hps_005772.evio.0-v1-L2_tu-10k.gbl-tmp-L4t_tu_L4b_tu_L5t_tu_L5b_tu_L2t_tu_L2b_tu.xml renamed to detector-data/detectors/HPS-EngRun2015-Nominal-v1-4-1/compact_millepede-round1-test1.xml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@
44
<info name="HPS-EngRun2015-Nominal-v1">
55
<comment>HPS detector for 2015 Engineering Run with tracker fully open
66
this detector uses the box dipole at -0.25T for 1 GeV running
7+
Millepede aligned: 1) float L2_tu, 2) float L2_tu, L4_tu, L5_tu
8+
test version #1, 10k events run 5772
79
</comment>
810
</info>
911

detector-data/detectors/HPS-EngRun2015-Nominal-v1-4-1/compact_millepede-milleBinaryISN_hps_005772.evio.0-v1-L2_tu-10k.gbl-tmp-L4t_tu_L4b_tu_L5t_tu_L5b_tu_L2t_tu_L2b_tu-TAKE2.xml renamed to detector-data/detectors/HPS-EngRun2015-Nominal-v1-4-1/compact_millepede-round1-test2.xml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,9 @@
44
<info name="HPS-EngRun2015-Nominal-v1">
55
<comment>HPS detector for 2015 Engineering Run with tracker fully open
66
this detector uses the box dipole at -0.25T for 1 GeV running
7+
Millepede aligned: 1) float L2_tu, 2) float L2_tu, L4_tu, L5_tu
8+
test version #2, 10k events run 5772
9+
differs from test#1 for L2_tu TB offsets
710
</comment>
811
</info>
912

detector-data/detectors/HPS-EngRun2015-Nominal-v1-4-1/compact_millepede-milleBinaryISN_hps_005772.evio.0-HPS-EngRun2015-Nominal-v1-1-20k.gbl-L2_L4_L5_tu.xml renamed to detector-data/detectors/HPS-EngRun2015-Nominal-v1-4-1/compact_millepede-round1.xml

File renamed without changes.

detector-data/detectors/HPS-EngRun2015-Nominal-v1-4-1/compact_millepede-milleBinaryISN_hps_005772.evio.0-HPS-EngRun2015-Nominal-v1-2-20k.gbl-L2-5_tu_rw.xml renamed to detector-data/detectors/HPS-EngRun2015-Nominal-v1-4-1/compact_millepede-round2.xml

File renamed without changes.

detector-data/detectors/HPS-EngRun2015-Nominal-v1-4-1/compact_millepede-milleBinaryISN_hps_005772.evio.0.gbl-L3_L4_L5_tu_rw_THEN_L2_tu_rw_THEN_L2_L3_L4_tu_rw_THEN_L2_L3_L5_tu_rw_THEN_L2_L3_L4_L5_excl_L3ST_tu_L4Sb_tu_THEN_L2_L4_L5_tu_rw.xml renamed to detector-data/detectors/HPS-EngRun2015-Nominal-v1-4-1/compact_millepede-round3.xml

File renamed without changes.

0 commit comments

Comments
 (0)