1 added + 3 modified, total 4 files
java/trunk/hps-java/src/main/java/org/lcsim/hps/conditions
--- java/trunk/hps-java/src/main/java/org/lcsim/hps/conditions/CalibrationDriver.java 2013-11-27 21:45:34 UTC (rev 49)
+++ java/trunk/hps-java/src/main/java/org/lcsim/hps/conditions/CalibrationDriver.java 2013-11-27 23:19:00 UTC (rev 50)
@@ -23,6 +23,7 @@
// are loaded
private static int runNumber = -1;
private boolean fixRunNumber = false;
+ private String gainFilename = "default.gain";
public CalibrationDriver() {
add(new EcalConditions());
@@ -34,6 +35,10 @@
fixRunNumber = true;
}
+ public void setGainFilename(String gainFileName) {
+ this.gainFilename = gainFileName;
+ }
+
public static int runNumber() {
return runNumber;
}
@@ -51,7 +56,8 @@
super.detectorChanged(detector);
if (!EcalConditions.calibrationLoaded()) {
- EcalConditions.loadCalibration();
+ EcalConditions.setGainFilename(gainFilename);
+ EcalConditions.loadCalibration();
}
if (fixRunNumber && (!HPSSVTCalibrationConstants.pedestalLoaded() || !HPSSVTCalibrationConstants.tpLoaded())) {
System.out.println("Loading calibration for set run: " + runNumber);
java/trunk/hps-java/src/main/java/org/lcsim/hps/recon/ecal
--- java/trunk/hps-java/src/main/java/org/lcsim/hps/recon/ecal/EcalConditions.java 2013-11-27 21:45:34 UTC (rev 49)
+++ java/trunk/hps-java/src/main/java/org/lcsim/hps/recon/ecal/EcalConditions.java 2013-11-27 23:19:00 UTC (rev 50)
@@ -38,6 +38,7 @@
private static Subdetector subdetector;
private static boolean debug = false;
private static boolean calibrationLoaded = false;
+ private static String gainFilename = "default.gain";
public EcalConditions() {
}
@@ -71,6 +72,10 @@
loadPedestals();
calibrationLoaded = true;
}
+
+ public static void setGainFilename(String name) {
+ gainFilename = name;
+ }
public void setSubdetectorName(String subdetectorName) {
this.subdetectorName = subdetectorName;
@@ -196,9 +201,9 @@
BufferedReader bufferedReader;
ConditionsManager conditions = ConditionsManager.defaultInstance();
try {
- bufferedReader = new BufferedReader(conditions.getRawConditions("calibECal/default.gain").getReader());
+ bufferedReader = new BufferedReader(conditions.getRawConditions("calibECal/"+EcalConditions.gainFilename).getReader());
} catch (IOException e) {
- throw new RuntimeException("couldn't get gain file", e);
+ throw new RuntimeException("couldn't get gain file("+gainFilename+") ", e);
}
String line;
java/trunk/hps-java/src/main/resources/org/lcsim/hps/calib/testrun/calibECal
--- java/trunk/hps-java/src/main/resources/org/lcsim/hps/calib/testrun/calibECal/default_goodregion_shift_v5.gain (rev 0)
+++ java/trunk/hps-java/src/main/resources/org/lcsim/hps/calib/testrun/calibECal/default_goodregion_shift_v5.gain 2013-11-27 23:19:00 UTC (rev 50)
@@ -0,0 +1,442 @@
+-23 1 0.133127
+-23 2 0.115780
+-23 3 0.134208
+-23 4 0.155521
+-23 5 0.133770
+-22 1 0.157064
+-22 2 0.130944
+-22 3 0.140505
+-22 4 0.166728
+-22 5 0.133770
+-21 1 0.179666
+-21 2 0.196879
+-21 3 0.212828
+-21 4 0.212381
+-21 5 0.212381
+-20 1 0.204436
+-20 2 0.214580
+-20 3 0.208637
+-20 4 0.212381
+-20 5 0.212381
+-19 1 0.207319
+-19 2 0.193910
+-19 3 0.199045
+-19 4 0.214641
+-19 5 0.214641
+-18 1 0.204768
+-18 2 0.219602
+-18 3 0.213419
+-18 4 0.214641
+-18 5 0.214641
+-17 1 0.238475
+-17 2 0.251577
+-17 3 0.265810
+-17 4 0.261040
+-17 5 0.261040
+-16 1 0.236384
+-16 2 0.269346
+-16 3 0.230097
+-16 4 0.261040
+-16 5 0.261040
+-15 1 0.188842
+-15 2 0.220022
+-15 3 0.240980
+-15 4 0.222194
+-15 5 0.222194
+-14 1 0.213146
+-14 2 0.210830
+-14 3 0.213309
+-14 4 0.222194
+-14 5 0.222194
+-13 1 0.228191
+-13 2 0.190975
+-13 3 0.240622
+-13 4 0.222540
+-13 5 0.222540
+-12 1 0.192332
+-12 2 0.193673
+-12 3 0.224156
+-12 4 0.222540
+-12 5 0.222540
+-11 1 0.224342
+-11 2 0.216855
+-11 3 0.195149
+-11 4 0.252977
+-11 5 0.252977
+-10 2 0.182041
+-10 3 0.238880
+-10 4 0.252977
+-10 5 0.252977
+-9 2 0.270465
+-9 3 0.297437
+-9 4 0.305047
+-9 5 0.305047
+-8 2 0.255389
+-8 3 0.198861
+-8 4 0.305047
+-8 5 0.305047
+-7 2 0.348669
+-7 3 0.296798
+-7 4 0.296798
+-7 5 0.305047
+-6 2 0.296456
+-6 3 0.503613
+-6 4 0.296798
+-6 5 0.296389
+-5 2 0.500000
+-5 3 0.503613
+-5 4 0.296798
+-5 5 0.296389
+-4 2 0.500000
+-4 3 0.503613
+-4 4 0.296798
+-4 5 0.296389
+-3 2 0.503613
+-3 3 0.503613
+-3 4 0.296798
+-3 5 0.296389
+-2 2 0.296798
+-2 3 0.296798
+-2 4 0.296798
+-2 5 0.296389
+-1 1 0.296389
+-1 2 0.296389
+-1 3 0.296389
+-1 4 0.296389
+-1 5 0.296389
+1 1 0.150000
+1 2 0.292012
+1 3 0.150000
+1 4 0.150000
+1 5 0.150000
+2 1 0.136044
+2 2 0.107838
+2 3 0.077260
+2 4 0.107838
+2 5 0.107838
+3 1 0.318886
+3 2 0.064784
+3 3 0.094609
+3 4 0.107838
+3 5 0.107838
+4 1 0.289658
+4 2 0.410445
+4 3 0.328829
+4 4 0.340231
+4 5 0.274674
+5 1 0.272831
+5 2 0.231017
+5 3 0.237852
+5 4 0.472427
+5 5 0.274674
+6 1 0.307631
+6 2 0.229439
+6 3 0.275321
+6 4 0.100613
+6 5 0.150107
+7 1 0.240222
+7 2 0.163326
+7 3 0.399877
+7 4 0.000000
+7 5 0.150107
+8 1 0.149128
+8 2 1.007260
+8 3 1.052710
+8 4 0.219588
+8 5 0.135420
+9 1 0.155107
+9 2 0.049332
+9 3 0.196372
+9 4 0.188440
+9 5 0.135420
+10 1 0.182736
+10 2 0.179082
+10 3 0.219258
+10 4 0.013616
+10 5 0.047782
+11 1 0.190954
+11 2 0.195681
+11 3 0.396361
+11 4 0.015435
+11 5 0.047782
+12 1 0.176055
+12 2 0.184233
+12 3 0.282726
+12 4 0.140443
+12 5 0.173552
+13 1 0.217604
+13 2 0.253835
+13 3 0.209707
+13 4 0.150371
+13 5 0.173552
+14 1 0.422871
+14 2 0.371957
+14 3 0.478450
+14 4 0.374444
+14 5 0.374444
+15 1 0.374444
+15 2 0.601306
+15 3 0.374444
+15 4 0.374444
+15 5 0.374444
+16 1 0.120172
+16 2 0.186084
+16 3 0.209058
+16 4 0.227557
+16 5 0.194642
+17 1 0.162567
+17 2 0.212833
+17 3 0.190360
+17 4 0.181191
+17 5 0.194642
+18 1 0.161144
+18 2 0.177929
+18 3 0.202195
+18 4 0.183655
+18 5 0.182929
+19 1 0.157113
+19 2 0.159768
+19 3 0.198223
+19 4 0.182758
+19 5 0.182929
+20 1 0.215924
+20 2 0.205328
+20 3 0.224560
+20 4 0.247407
+20 5 0.208651
+21 1 0.228268
+21 2 0.208651
+21 3 0.230682
+21 4 0.199250
+21 5 0.208651
+22 1 0.105200
+22 2 0.081046
+22 3 0.114581
+22 4 0.089009
+22 5 0.103435
+23 1 0.090977
+23 2 0.095854
+23 3 0.108358
+23 4 0.081401
+23 5 0.103435
+-23 -1 0.371500
+-23 -2 0.371500
+-23 -3 0.371500
+-23 -4 0.371500
+-23 -5 0.371500
+-22 -1 0.277608
+-22 -2 0.371500
+-22 -3 0.371500
+-22 -4 0.371500
+-22 -5 0.371500
+-21 -1 0.238962
+-21 -2 0.213457
+-21 -3 0.189900
+-21 -4 0.253691
+-21 -5 0.253691
+-20 -1 0.286850
+-20 -2 0.253691
+-20 -3 0.253691
+-20 -4 0.253691
+-20 -5 0.253691
+-19 -1 0.293288
+-19 -2 0.219453
+-19 -3 0.294973
+-19 -4 0.294973
+-19 -5 0.294973
+-18 -1 0.325383
+-18 -2 0.291775
+-18 -3 0.221447
+-18 -4 0.294973
+-18 -5 0.294973
+-17 -1 0.231910
+-17 -2 0.229097
+-17 -3 0.239466
+-17 -4 0.254280
+-17 -5 0.254280
+-16 -1 0.259626
+-16 -2 0.224484
+-16 -3 0.244679
+-16 -4 0.254280
+-16 -5 0.254280
+-15 -1 0.343298
+-15 -2 0.267686
+-15 -3 0.301283
+-15 -4 0.351962
+-15 -5 0.351962
+-14 -1 0.327551
+-14 -2 0.369376
+-14 -3 0.295718
+-14 -4 0.351962
+-14 -5 0.351962
+-13 -1 0.282527
+-13 -2 0.242217
+-13 -3 0.252755
+-13 -4 0.275657
+-13 -5 0.275657
+-12 -1 0.254222
+-12 -2 0.243366
+-12 -3 0.231663
+-12 -4 0.275657
+-12 -5 0.275657
+-11 -1 0.231021
+-11 -2 0.220742
+-11 -3 0.248353
+-11 -4 0.236100
+-11 -5 0.236100
+-10 -2 0.195309
+-10 -3 0.245860
+-10 -4 0.236100
+-10 -5 0.236100
+-9 -2 0.177194
+-9 -3 0.074520
+-9 -4 0.198624
+-9 -5 0.198624
+-8 -2 0.091487
+-8 -3 0.198624
+-8 -4 0.198624
+-8 -5 0.198624
+-7 -2 0.189489
+-7 -3 0.347573
+-7 -4 0.347573
+-7 -5 0.198624
+-6 -2 0.341213
+-6 -3 0.579484
+-6 -4 0.347573
+-6 -5 0.503696
+-5 -2 0.489084
+-5 -3 0.579484
+-5 -4 0.347573
+-5 -5 0.503696
+-4 -2 0.374082
+-4 -3 0.579484
+-4 -4 0.347573
+-4 -5 0.503696
+-3 -2 0.579484
+-3 -3 0.579484
+-3 -4 0.347573
+-3 -5 0.503696
+-2 -2 0.347573
+-2 -3 0.347573
+-2 -4 0.347573
+-2 -5 0.503696
+-1 -1 0.503696
+-1 -2 0.503696
+-1 -3 0.503696
+-1 -4 0.503696
+-1 -5 0.503696
+1 -1 0.415687
+1 -2 0.380094
+1 -3 0.380094
+1 -4 0.380094
+1 -5 0.380094
+2 -1 0.248947
+2 -2 0.131393
+2 -3 0.176029
+2 -4 0.176029
+2 -5 0.176029
+3 -1 0.176029
+3 -2 0.176029
+3 -3 0.176029
+3 -4 0.176029
+3 -5 0.176029
+4 -1 0.115522
+4 -2 0.091284
+4 -3 0.141196
+4 -4 0.141196
+4 -5 0.141196
+5 -1 0.173591
+5 -2 0.141196
+5 -3 0.158859
+5 -4 0.141196
+5 -5 0.141196
+6 -1 0.150000
+6 -2 0.150000
+6 -3 0.150000
+6 -4 0.150000
+6 -5 0.150000
+7 -1 0.150000
+7 -2 0.150000
+7 -3 0.150000
+7 -4 0.150000
+7 -5 0.150000
+8 -1 0.318585
+8 -2 0.318585
+8 -3 0.546386
+8 -4 0.318585
+8 -5 0.318585
+9 -1 0.264988
+9 -2 0.362635
+9 -3 0.268807
+9 -4 0.318585
+9 -5 0.318585
+10 -1 0.091724
+10 -2 0.069005
+10 -3 0.069005
+10 -4 0.069005
+10 -5 0.069005
+11 -1 0.090529
+11 -2 0.029101
+11 -3 0.143969
+11 -4 0.069005
+11 -5 0.069005
+12 -1 0.285501
+12 -2 0.190797
+12 -3 0.201697
+12 -4 0.242563
+12 -5 0.242563
+13 -1 0.267369
+13 -2 0.180459
+13 -3 0.188169
+13 -4 0.242563
+13 -5 0.242563
+14 -1 0.528823
+14 -2 0.428856
+14 -3 0.428856
+14 -4 0.428856
+14 -5 0.428856
+15 -1 0.428856
+15 -2 0.428856
+15 -3 0.428856
+15 -4 0.428856
+15 -5 0.428856
+16 -1 0.202071
+16 -2 0.157954
+16 -3 0.204363
+16 -4 0.186077
+16 -5 0.186077
+17 -1 0.168442
+17 -2 0.189531
+17 -3 0.176195
+17 -4 0.186077
+17 -5 0.186077
+18 -1 0.150000
+18 -2 0.150000
+18 -3 0.150000
+18 -4 0.150000
+18 -5 0.150000
+19 -1 0.150000
+19 -2 0.150000
+19 -3 0.150000
+19 -4 0.150000
+19 -5 0.150000
+20 -1 0.128094
+20 -2 0.137154
+20 -3 0.109164
+20 -4 0.107923
+20 -5 0.107923
+21 -1 0.092048
+21 -2 0.096009
+21 -3 0.107923
+21 -4 0.107923
+21 -5 0.107923
+22 -1 0.150000
+22 -2 0.150000
+22 -3 0.150000
+22 -4 0.150000
+22 -5 0.150000
+23 -1 0.150000
+23 -2 0.150000
+23 -3 0.150000
+23 -4 0.150000
+23 -5 0.150000
java/trunk/hps-java/src/main/resources/org/lcsim/hps/steering/users/phansson
--- java/trunk/hps-java/src/main/resources/org/lcsim/hps/steering/users/phansson/TwoTrackAnalysis.lcsim 2013-11-27 21:45:34 UTC (rev 49)
+++ java/trunk/hps-java/src/main/resources/org/lcsim/hps/steering/users/phansson/TwoTrackAnalysis.lcsim 2013-11-27 23:19:00 UTC (rev 50)
@@ -74,6 +74,7 @@
<driver name="CalibrationDriver" type="org.lcsim.hps.conditions.CalibrationDriver">
<!-- <runNumber>${runNumber}</runNumber> -->
+ <!-- <gainFilename>default_goodregion_shift_v1.gain</gainFilename> -->
</driver>
<driver name="EventMarkerDriver"
type="org.lcsim.job.EventMarkerDriver">
SVNspam 0.1