diff --git a/reconstruction/cvt/nbactions.xml b/reconstruction/cvt/nbactions.xml index c7ab542be..6d95fa82a 100644 --- a/reconstruction/cvt/nbactions.xml +++ b/reconstruction/cvt/nbactions.xml @@ -10,10 +10,13 @@ org.codehaus.mojo:exec-maven-plugin:1.2.1:exec - -DCLAS12DIR=/Users/ziegler/Desktop/Work/Release/branches/optim2/clas12-offline-software/coatjava -classpath %classpath org.jlab.rec.cvt.services.CVTReconstruction + ${exec.vmArgs} -classpath %classpath ${exec.mainClass} ${exec.appArgs} java Symm_torus_r2501_phi16_z251_24Apr2018.dat Symm_solenoid_r601_phi1_z1201_13June2018.dat + -DCLAS12DIR=/Users/veronique/Work/git/Sandbox/AI/coatjava/coatjava + + org.jlab.rec.cvt.analysis.CVTAIAnal @@ -26,9 +29,12 @@ org.codehaus.mojo:exec-maven-plugin:1.2.1:exec - -Xdebug -Xrunjdwp:transport=dt_socket,server=n,address=${jpda.address} -DCLAS12DIR=/Users/ziegler/Desktop/Work/Release/branches/optim2/clas12-offline-software/coatjava -classpath %classpath org.jlab.rec.cvt.services.CVTReconstruction + ${exec.vmArgs} -classpath %classpath ${exec.mainClass} ${exec.appArgs} java true + -DCLAS12DIR=/Users/veronique/Work/git/Sandbox/AI/coatjava/coatjava -agentlib:jdwp=transport=dt_socket,server=n,address=${jpda.address} + + org.jlab.rec.cvt.analysis.CVTAIAnal @@ -41,8 +47,11 @@ org.codehaus.mojo:exec-maven-plugin:1.2.1:exec - -DCLAS12DIR=/Users/ziegler/Desktop/Work/Release/branches/optim2/clas12-offline-software/coatjava -classpath %classpath org.jlab.rec.cvt.services.CVTReconstruction + ${exec.vmArgs} -classpath %classpath ${exec.mainClass} ${exec.appArgs} java + -DCLAS12DIR=/Users/veronique/Work/git/Sandbox/AI/coatjava/coatjava + + org.jlab.rec.cvt.analysis.CVTAIAnal diff --git a/reconstruction/cvt/src/main/java/org/jlab/rec/cvt/analysis/CVTAIAnal.java b/reconstruction/cvt/src/main/java/org/jlab/rec/cvt/analysis/CVTAIAnal.java index 2b2f6699d..829e06ae8 100644 --- a/reconstruction/cvt/src/main/java/org/jlab/rec/cvt/analysis/CVTAIAnal.java +++ b/reconstruction/cvt/src/main/java/org/jlab/rec/cvt/analysis/CVTAIAnal.java @@ -16,6 +16,7 @@ import org.jlab.io.hipo.HipoDataEvent; import org.jlab.io.task.DataSourceProcessorPane; import org.jlab.io.task.IDataEventListener; +import org.jlab.rec.cvt.bmt.BMTType; public class CVTAIAnal implements IDataEventListener { @@ -101,21 +102,21 @@ public CVTAIAnal() { bmtvspFT.setLineColor(46); bmtvspFF.setLineColor(45); - bstvspTT.setTitleX("Generated p (GeV)"); + bstvspTT.setTitleX(" p (GeV)"); bstvspTT.setTitleY("Efficiency"); - bstvspTF.setTitleX("Generated p (GeV)"); + bstvspTF.setTitleX(" p (GeV)"); bstvspTF.setTitleY("Efficiency"); - bstvspFT.setTitleX("Generated p (GeV)"); + bstvspFT.setTitleX(" p (GeV)"); bstvspFT.setTitleY("Efficiency"); - bstvspFF.setTitleX("Generated p (GeV)"); + bstvspFF.setTitleX(" p (GeV)"); bstvspFF.setTitleY("Efficiency"); - bmtvspTT.setTitleX("Generated p (GeV)"); + bmtvspTT.setTitleX(" p (GeV)"); bmtvspTT.setTitleY("Efficiency"); - bmtvspTF.setTitleX("Generated p (GeV)"); + bmtvspTF.setTitleX(" p (GeV)"); bmtvspTF.setTitleY("Efficiency"); - bmtvspFT.setTitleX("Generated p (GeV)"); + bmtvspFT.setTitleX(" p (GeV)"); bmtvspFT.setTitleY("Efficiency"); - bmtvspFF.setTitleX("Generated p (GeV)"); + bmtvspFF.setTitleX(" p (GeV)"); bmtvspFF.setTitleY("Efficiency"); bstvsthTT.setLineColor(39); @@ -181,9 +182,10 @@ public void dataEventAction(DataEvent event) { for(int i =0; i hpl) { for(HitPos hp : hpl) { if(hp.gettTrack()==null) continue; - + int d = -1; + if(hp.getDetType()==BMTType.UNDEFINED) { + d = 0; + } else { + d = 1; + } int pbin = this.getBin(hp.gettTrack().p, nbins, mid, width); - if(hp.isTruePositive) pAnal.truePositives[0][pbin]++; - if(hp.isFalsePositive) pAnal.falsePositives[0][pbin]++; - if(hp.isTrueNegative) pAnal.trueNegatives[0][pbin]++; - if(hp.isFalseNegative) pAnal.falseNegatives[0][pbin]++; + if(hp.isTruePositive) pAnal.truePositives[d][pbin]++; + if(hp.isFalsePositive) pAnal.falsePositives[d][pbin]++; + if(hp.isTrueNegative) pAnal.trueNegatives[d][pbin]++; + if(hp.isFalseNegative) pAnal.falseNegatives[d][pbin]++; int thbin = this.getBin(hp.gettTrack().theta, nbins2, mid2, width2); - if(hp.isTruePositive) thAnal.truePositives[0][thbin]++; - if(hp.isFalsePositive) thAnal.falsePositives[0][thbin]++; - if(hp.isTrueNegative) thAnal.trueNegatives[0][thbin]++; - if(hp.isFalseNegative) thAnal.falseNegatives[0][thbin]++; + if(hp.isTruePositive) thAnal.truePositives[d][thbin]++; + if(hp.isFalsePositive) thAnal.falsePositives[d][thbin]++; + if(hp.isTrueNegative) thAnal.trueNegatives[d][thbin]++; + if(hp.isFalseNegative) thAnal.falseNegatives[d][thbin]++; } }