Commit in hps-java/src/main on MAIN | |||
java/org/lcsim/hps/users/phansson/trigRate.java | +15 | -14 | 1.2 -> 1.3 |
/TrigRateDriver.java | +1 | -1 | 1.2 -> 1.3 |
/ecalPlots.java | +17 | -8 | 1.2 -> 1.3 |
resources/org/lcsim/hps/steering/MultScatAna.lcsim | +132 | added 1.1 | |
+165 | -23 |
Simple private analysis updates.
diff -u -r1.2 -r1.3 --- trigRate.java 12 Jul 2012 21:32:39 -0000 1.2 +++ trigRate.java 17 Jul 2012 20:13:12 -0000 1.3 @@ -173,7 +173,7 @@
try { ITree tree = analysisFactory.createTreeFactory().create("plots/20120618_trig_rate_gainfix_noFirstRow/trigratedriver_hps_001351_withtracking.evio.0.aida"); //printObjectsInTree(tree);
- ana.getGainCalibration(tree,side);
+ //ana.getGainCalibration(tree,side);
} catch (IOException e) {
@@ -199,21 +199,22 @@
//String path = "plots/20120615_trig_rate_gainfix/"; //String path = "plots/20120618_trig_rate_gainfix_noFirstRow/"; String path = "plots/20120618_trig_rate_gainfix/";
- //path = "";
+ path = "";
List<String> trees = new ArrayList<String>();
- trees.add(path + "trigratedriver_hps_001351.evio.0.aida"); - trees.add(path + "trigratedriver_hps_001354.evio.0.aida"); - trees.add(path + "trigratedriver_hps_001359.evio.0.aida"); - trees.add(path + "trigratedriver_hps_001362.evio.0.aida"); - trees.add(path + "trigratedriver_hps_001353.evio.0.aida"); - trees.add(path + "trigratedriver_hps_001354.evio.1.aida"); - trees.add(path + "trigratedriver_hps_001360.evio.0.aida"); - trees.add(path + "trigratedriver_hps_001362.evio.1.aida"); - trees.add(path + "trigratedriver_hps_001353.evio.1.aida"); - trees.add(path + "trigratedriver_hps_001358.evio.0.aida"); - trees.add(path + "trigratedriver_hps_001360.evio.1.aida"); - trees.add(path + "trigratedriver_hps_001362.evio.2.aida");
+ trees.add(path + "trigratefile_001351.aida");//driver_hps_001351.evio.0.aida"); + //trees.add(path + "trigratedriver_hps_001354.evio.0.aida"); + //trees.add(path + "trigratedriver_hps_001359.evio.0.aida"); + //trees.add(path + "trigratedriver_hps_001362.evio.0.aida"); + //trees.add(path + "trigratedriver_hps_001353.evio.0.aida"); + //trees.add(path + "trigratedriver_hps_001354.evio.1.aida"); + //trees.add(path + "trigratedriver_hps_001360.evio.0.aida"); + //trees.add(path + "trigratedriver_hps_001362.evio.1.aida"); + //trees.add(path + "trigratedriver_hps_001353.evio.1.aida"); + trees.add(path + "trigratefile_001358.aida"); + //trees.add(path + "trigratedriver_hps_001358.evio.0.aida"); + //trees.add(path + "trigratedriver_hps_001360.evio.1.aida"); + //trees.add(path + "trigratedriver_hps_001362.evio.2.aida");
/*
diff -u -r1.2 -r1.3 --- TrigRateDriver.java 12 Jul 2012 21:32:39 -0000 1.2 +++ TrigRateDriver.java 17 Jul 2012 20:13:12 -0000 1.3 @@ -263,7 +263,7 @@
boolean clusterGoodRegion = false;
- if(crystalPair[0]<0) clusterGoodRegion = true;
+ //if(crystalPair[0]<0 && crystalPair[1]>0) clusterGoodRegion = true;
if(crystalPair[0]<0) clusterGoodRegion = true; // if(crystalPair[0]<0 && crystalPair[1]>1) clusterGoodRegion = true; // if(crystalPair[0]<0 && crystalPair[1]<-1) clusterGoodRegion = true;
diff -u -r1.2 -r1.3 --- ecalPlots.java 12 Jul 2012 21:32:39 -0000 1.2 +++ ecalPlots.java 17 Jul 2012 20:13:12 -0000 1.3 @@ -60,6 +60,12 @@
Options opts = createCommandLineOptions();
+ if (args.length == 0) { + System.out.println("ecalPlots [options]"); + HelpFormatter help = new HelpFormatter(); + help.printHelp(" ", opts); + System.exit(1); + }
CommandLineParser parser = new PosixParser(); CommandLine cmd=null; try {
@@ -67,6 +73,9 @@
} catch (ParseException ex) { Logger.getLogger(ecalPlots.class.getName()).log(Level.SEVERE, null, ex); }
+ + +
int type=0; String strType = cmd.getOptionValue("t"); if(strType==null) {
@@ -216,7 +225,7 @@
try { String path = "";//plots/20120710_ecal_dataMC/../../";
- String file_mc = "trigratefile_egs5_160rl.aida";
+ String file_mc = "trigratefile_egs5_500mb_90na_01.aida";//trigratefile_egs5_160rl.aida";
String file_data = "trigratefile_run1351.aida"; String file_bkg = "trigratefile_run1358.aida";
@@ -230,8 +239,8 @@
- SimpleHPSConditions cond = new SimpleHPSConditions("runConditions.txt"); -
+ SimpleHPSConditions cond = new SimpleHPSConditions("/Users/phansson/work/HPS/software/reco/hps-java/src/main/java/org/lcsim/hps/users/phansson/runConditions.txt"); +
int idx = file_data.indexOf("run"); int run_data = Integer.parseInt(file_data.substring(idx+3,idx+7)); idx = file_bkg.indexOf("run");
@@ -260,14 +269,14 @@
for(int ix=-23;ix<=23;++ix) { for(int iy=-5;iy<=5;++iy) {
- //if(ix<=0) continue;
+ if(ix<=0) continue;
if(iy<=0) continue; histNames.add("Cluster energy x="+ix+" y="+iy); } }
- System.out.println("Histogram names: "+histNames.toString());
+ //System.out.println("Histogram names: "+histNames.toString());
int iadded=0; IHistogram1D h_obs=null;
@@ -275,7 +284,7 @@
IHistogram1D h_mc=null;
- boolean dataToMCNorm = true;
+ boolean dataToMCNorm = false;
for(String hname : histNames) { IHistogram1D h_obs_tmp = (IHistogram1D)tree_data.find(hname); IHistogram1D h_bkg_tmp = (IHistogram1D)tree_bkg.find(hname);
@@ -305,8 +314,8 @@
} else { h_mc.scale(k_Q); }
- System.out.println("mc " + h_mc.entries() + "(" + h_mc.allEntries() + ")" + " obs " + h_obs.entries()+ "(" + h_obs.allEntries() + ")" + " bkg " + h_bkg.entries()+ "(" + h_bkg.allEntries() + ")" + " obs " + h_data.entries()+ "(" + h_data.allEntries() + ")"); - System.out.println("mc " + h_mc.sumBinHeights() + " obs " + h_obs.sumBinHeights() + " bkg " + h_bkg.sumBinHeights() + " obs " + h_data.sumBinHeights());
+ //System.out.println("mc " + h_mc.entries() + "(" + h_mc.allEntries() + ")" + " obs " + h_obs.entries()+ "(" + h_obs.allEntries() + ")" + " bkg " + h_bkg.entries()+ "(" + h_bkg.allEntries() + ")" + " obs " + h_data.entries()+ "(" + h_data.allEntries() + ")"); + //System.out.println("mc " + h_mc.sumBinHeights() + " obs " + h_obs.sumBinHeights() + " bkg " + h_bkg.sumBinHeights() + " obs " + h_data.sumBinHeights());
System.out.printf("Run %d: obs %.1f bkg %.1f\t=>\tdata %.1f MC %.1f\t->\tdata/MC=%.2f\n",run_data,h_obs.sumBinHeights(),h_bkg.sumBinHeights(),h_data.sumBinHeights(),h_mc.sumBinHeights(),h_data.sumBinHeights()/h_mc.sumBinHeights()); ecalhtplots.plotBasic1D(h_data,h_mc,name+"_"+h_obs.title(), "","","data","MC",savePlots);
diff -N MultScatAna.lcsim --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ MultScatAna.lcsim 17 Jul 2012 20:13:12 -0000 1.1 @@ -0,0 +1,132 @@
+<lcsim xmlns:xs="http://www.w3.org/2001/XMLSchema-instance" + xs:noNamespaceSchemaLocation="http://www.lcsim.org/schemas/lcsim/1.0/lcsim.xsd"> + <control> + <numberOfEvents>-1</numberOfEvents> + <printInputFiles>true</printInputFiles> + <printDriversDetailed>true</printDriversDetailed> + </control> + <execute> + <driver name="EventMarkerDriver"/> + <driver name="HPSCalibrationDriver"/> + <driver name="SVTSetupDriver"/> + <driver name="EcalRawConverter"/> + <driver name="EcalClusterer"/> + + <driver name="RawTrackerHitMaker"/> + <driver name="RawTrackerHitFitterDriver"/> + <driver name="TrackerHitDriver"/> + <driver name="TrackerReconDriver"/> +<!-- + <driver name="SVTOccupancyPlots"/> + <driver name="TrackingReconstructionPlots"/> + <driver name="GainCalibrationDriver"/> + <driver name="MultScatAnaDriver"/> + +--> + + <driver name="TrigRateDriver"/> + + +<!-- + <driver name="HPSSVTDAQMaps"/> + <driver name="EcalMonitoringPlots"/> + <driver name="FastTrackResidualDriver"/> +--> + <driver name="CleanupDriver"/> +<!-- + <driver name="LCIOWriter"/> +--> + </execute> + <drivers> + + + <driver name="MultScatAnaDriver" + type="org.lcsim.hps.users.phansson.MultScatAnalysis"> + <debug>false</debug> +<!-- <outputPlotFileName>/Users/phansson/work/HPS/software/reco/run/multscatana_1351_508851.aida</outputPlotFileName> --> +<!-- <outputPlotFileName>/Users/phansson/work/HPS/software/reco/run/multscatana_1353_0_682913.aida</outputPlotFileName> --> +<!-- <outputPlotFileName>/Users/phansson/work/HPS/software/reco/run/multscatana_1353_1_328525.aida</outputPlotFileName> --> +<!-- <outputPlotFileName>/Users/phansson/work/HPS/software/reco/run/multscatana_1354_0_692635.aida</outputPlotFileName> --> + <outputPlotFileName>/Users/phansson/work/HPS/software/reco/run/multscatana.aida</outputPlotFileName> + </driver> + + <driver name="TrigRateDriver" + type="org.lcsim.hps.users.phansson.TrigRateDriver"> + <debug>false</debug> + <hideFrame>false</hideFrame> + <outputPlotFileName>/Users/phansson/work/HPS/software/reco/run/trigratefile.aida</outputPlotFileName> + </driver> + + <driver name="GainCalibrationDriver" + type="org.lcsim.hps.recon.ecal.GainCalibrationDriver"> + <debug>false</debug> + <hideFrame>false</hideFrame> + <outputPlotFileName></outputPlotFileName> + </driver> + + + + + <driver name="HPSCalibrationDriver" type="org.lcsim.hps.monitoring.HPSCalibrationDriver"/> + <driver name="EcalRawConverter" + type="org.lcsim.hps.recon.ecal.HPSEcalRawConverterDriver"> + <ecalCollectionName>EcalCalHits</ecalCollectionName> + </driver> + <driver name="EcalClusterer" + type="org.lcsim.hps.recon.ecal.HPSEcalClusterer"> + <ecalName>Ecal</ecalName> + <ecalCollectionName>EcalCalHits</ecalCollectionName> + </driver> + <driver name="RawTrackerHitFitterDriver" + type="org.lcsim.hps.recon.tracking.HPSRawTrackerHitFitterDriver"> +<!-- <fitAlgorithm>Dumb</fitAlgorithm> --> + <fitAlgorithm>Analytic</fitAlgorithm> + </driver> + <driver name="FastTrackResidualDriver" + type="org.lcsim.hps.users.phansson.FastTrackResidualDriver"> + <conversionZ>-300.0</conversionZ> + <ecalBeamgapCorr>17.0</ecalBeamgapCorr> + <debug>false</debug> + <ecalClusterSel>1</ecalClusterSel> + <outputPlotFileName></outputPlotFileName> + </driver> + + <driver name="TrackerHitDriver" + type="org.lcsim.hps.users.mgraham.DataTrackerHitDriver"/> + <driver name="EcalDaqPlots" type="org.lcsim.hps.monitoring.ecal.EcalDaqPlots"> + </driver> + <driver name="CleanupDriver" + type="org.lcsim.recon.tracking.digitization.sisim.config.ReadoutCleanupDriver"> + <collectionNames>TrackerHits SVTRawTrackerHits SVTFittedRawTrackerHits</collectionNames> + </driver> + <driver name="EcalMonitoringPlots" type="org.lcsim.hps.monitoring.ecal.EcalMonitoringPlots"/> + <driver name="EcalEventMonitor" type="org.lcsim.hps.monitoring.ecal.EcalEventMonitor"> + <eventRefreshRate>1</eventRefreshRate> + </driver> + <driver name="SVTOccupancyPlots" type="org.lcsim.hps.monitoring.svt.SensorOccupancyPlotsDriver"> + <rawTrackerHitCollectionName>SVTRawTrackerHits</rawTrackerHitCollectionName> + <eventRefreshRate>1</eventRefreshRate> + </driver> + <driver name="SVTSetupDriver" + type="org.lcsim.hps.recon.tracking.HPSSVTSensorSetup"> + </driver> + <driver name="EventMarkerDriver" type="org.lcsim.job.EventMarkerDriver"> + <eventInterval>1000</eventInterval> + </driver> + <driver name="RawTrackerHitMaker" type="org.lcsim.hps.recon.tracking.SVTDataToRawTrackerHitDriver"/> + <driver name="TrackerReconDriver" + type="org.lcsim.hps.recon.tracking.TrackerReconDriver"> + <debug>false</debug> + <strategyResource>/org/lcsim/hps/recon/tracking/strategies/HPS-Test-4pt1.xml</strategyResource> + <stripMaxSeparation>20.0</stripMaxSeparation> + <stripTolerance>1.0</stripTolerance> + </driver> + <driver name="TrackingReconstructionPlots" type="org.lcsim.hps.monitoring.svt.TrackingReconstructionPlots"> + <outputPlots>trackingPlots.aida</outputPlots> + </driver> + <driver name="LCIOWriter" + type="org.lcsim.util.loop.LCIODriver"> + <outputFilePath>/Users/phansson/work/HPS/software/reco/run/hps_recon.slcio</outputFilePath> + </driver> + </drivers> +</lcsim>
Use REPLY-ALL to reply to list
To unsubscribe from the LCD-CVS list, click the following link:
https://listserv.slac.stanford.edu/cgi-bin/wa?SUBED1=LCD-CVS&A=1