Author: [log in to unmask]
Date: Wed Jan 6 10:40:54 2016
New Revision: 4097
Log:
organize
Added:
java/trunk/users/src/main/java/org/hps/users/phansson/alignment/ResLimit.java
- copied, changed from r4081, java/trunk/users/src/main/java/org/hps/users/phansson/ResLimit.java
java/trunk/users/src/main/java/org/hps/users/phansson/daq/
java/trunk/users/src/main/java/org/hps/users/phansson/daq/SvtHeaderAnalysisDriver.java
- copied, changed from r4081, java/trunk/users/src/main/java/org/hps/users/phansson/SvtHeaderAnalysisDriver.java
java/trunk/users/src/main/java/org/hps/users/phansson/daq/SvtHeaderMetaDataReaderDriver.java
- copied, changed from r4081, java/trunk/users/src/main/java/org/hps/users/phansson/SvtHeaderMetaDataReaderDriver.java
java/trunk/users/src/main/java/org/hps/users/phansson/daq/SvtOldHeaderAnalysisDriver.java
- copied, changed from r4081, java/trunk/users/src/main/java/org/hps/users/phansson/SvtOldHeaderAnalysisDriver.java
java/trunk/users/src/main/java/org/hps/users/phansson/daq/SvtOldHeaderDataInfo.java
- copied, changed from r4081, java/trunk/users/src/main/java/org/hps/users/phansson/SvtOldHeaderDataInfo.java
java/trunk/users/src/main/java/org/hps/users/phansson/testrun/
java/trunk/users/src/main/java/org/hps/users/phansson/testrun/BeamCurrentData.java
- copied, changed from r4081, java/trunk/users/src/main/java/org/hps/users/phansson/BeamCurrentData.java
java/trunk/users/src/main/java/org/hps/users/phansson/testrun/Count.java
- copied, changed from r4081, java/trunk/users/src/main/java/org/hps/users/phansson/Count.java
java/trunk/users/src/main/java/org/hps/users/phansson/testrun/DAQDeadTimeData.java
- copied, changed from r4081, java/trunk/users/src/main/java/org/hps/users/phansson/DAQDeadTimeData.java
java/trunk/users/src/main/java/org/hps/users/phansson/testrun/EcalHitMapPlots.java
- copied, changed from r4081, java/trunk/users/src/main/java/org/hps/users/phansson/EcalHitMapPlots.java
java/trunk/users/src/main/java/org/hps/users/phansson/testrun/PolarCount.java
- copied, changed from r4081, java/trunk/users/src/main/java/org/hps/users/phansson/PolarCount.java
java/trunk/users/src/main/java/org/hps/users/phansson/testrun/SimpleHPSConditions.java
- copied, changed from r4081, java/trunk/users/src/main/java/org/hps/users/phansson/SimpleHPSConditions.java
java/trunk/users/src/main/java/org/hps/users/phansson/testrun/TrigRateAna.java
- copied, changed from r4081, java/trunk/users/src/main/java/org/hps/users/phansson/TrigRateAna.java
java/trunk/users/src/main/java/org/hps/users/phansson/testrun/TrigRateDriver.java
- copied, changed from r4081, java/trunk/users/src/main/java/org/hps/users/phansson/TrigRateDriver.java
java/trunk/users/src/main/java/org/hps/users/phansson/testrun/dataMCPlots.java
- copied, changed from r4081, java/trunk/users/src/main/java/org/hps/users/phansson/dataMCPlots.java
java/trunk/users/src/main/java/org/hps/users/phansson/testrun/ecalPlots.java
- copied, changed from r4081, java/trunk/users/src/main/java/org/hps/users/phansson/ecalPlots.java
java/trunk/users/src/main/java/org/hps/users/phansson/testrun/trigRate.java
- copied, changed from r4081, java/trunk/users/src/main/java/org/hps/users/phansson/trigRate.java
Removed:
java/trunk/users/src/main/java/org/hps/users/phansson/BeamCurrentData.java
java/trunk/users/src/main/java/org/hps/users/phansson/Count.java
java/trunk/users/src/main/java/org/hps/users/phansson/DAQDeadTimeData.java
java/trunk/users/src/main/java/org/hps/users/phansson/EcalHitMapPlots.java
java/trunk/users/src/main/java/org/hps/users/phansson/PolarCount.java
java/trunk/users/src/main/java/org/hps/users/phansson/ResLimit.java
java/trunk/users/src/main/java/org/hps/users/phansson/SimpleHPSConditions.java
java/trunk/users/src/main/java/org/hps/users/phansson/SvtHeaderAnalysisDriver.java
java/trunk/users/src/main/java/org/hps/users/phansson/SvtHeaderMetaDataReaderDriver.java
java/trunk/users/src/main/java/org/hps/users/phansson/SvtOldHeaderAnalysisDriver.java
java/trunk/users/src/main/java/org/hps/users/phansson/SvtOldHeaderDataInfo.java
java/trunk/users/src/main/java/org/hps/users/phansson/TrigRateAna.java
java/trunk/users/src/main/java/org/hps/users/phansson/TrigRateDriver.java
java/trunk/users/src/main/java/org/hps/users/phansson/dataMCPlots.java
java/trunk/users/src/main/java/org/hps/users/phansson/ecalPlots.java
java/trunk/users/src/main/java/org/hps/users/phansson/trigRate.java
Modified:
java/trunk/users/src/main/java/org/hps/users/mgraham/HelicalTrackHitResidualsDriver.java
java/trunk/users/src/main/java/org/hps/users/phansson/CmpGenToFittedTracksDriver.java
java/trunk/users/src/main/java/org/hps/users/phansson/TriggerTurnOnAnalysis.java
java/trunk/users/src/main/java/org/hps/users/phansson/TruthMomentumResolutionDriver.java
java/trunk/users/src/main/java/org/hps/users/phansson/alignment/MPAlignmentInputCalculator.java
java/trunk/users/src/main/java/org/hps/users/phansson/alignment/RunMPAlignment.java
java/trunk/users/src/main/java/org/hps/users/phansson/tools/ROOTFlatTupleDriver.java
Modified: java/trunk/users/src/main/java/org/hps/users/mgraham/HelicalTrackHitResidualsDriver.java
=============================================================================
--- java/trunk/users/src/main/java/org/hps/users/mgraham/HelicalTrackHitResidualsDriver.java (original)
+++ java/trunk/users/src/main/java/org/hps/users/mgraham/HelicalTrackHitResidualsDriver.java Wed Jan 6 10:40:54 2016
@@ -16,10 +16,11 @@
import java.util.logging.Logger;
+
//===> import org.hps.conditions.deprecated.SvtUtils;
import org.hps.recon.tracking.EventQuality;
import org.hps.recon.tracking.TrackUtils;
-import org.hps.users.phansson.TrigRateDriver;
+import org.hps.users.phansson.testrun.TrigRateDriver;
import org.lcsim.detector.tracker.silicon.HpsSiSensor;
import org.lcsim.event.EventHeader;
import org.lcsim.event.RawTrackerHit;
Modified: java/trunk/users/src/main/java/org/hps/users/phansson/CmpGenToFittedTracksDriver.java
=============================================================================
--- java/trunk/users/src/main/java/org/hps/users/phansson/CmpGenToFittedTracksDriver.java (original)
+++ java/trunk/users/src/main/java/org/hps/users/phansson/CmpGenToFittedTracksDriver.java Wed Jan 6 10:40:54 2016
@@ -12,6 +12,7 @@
import java.util.logging.Level;
import java.util.logging.Logger;
+import org.hps.users.phansson.testrun.TrigRateDriver;
import org.lcsim.event.EventHeader;
import org.lcsim.event.Track;
import org.lcsim.event.TrackerHit;
Modified: java/trunk/users/src/main/java/org/hps/users/phansson/TriggerTurnOnAnalysis.java
=============================================================================
--- java/trunk/users/src/main/java/org/hps/users/phansson/TriggerTurnOnAnalysis.java (original)
+++ java/trunk/users/src/main/java/org/hps/users/phansson/TriggerTurnOnAnalysis.java Wed Jan 6 10:40:54 2016
@@ -10,12 +10,15 @@
import hep.aida.IHistogramFactory;
import hep.aida.IPlotter;
import hep.physics.vec.Hep3Vector;
+
import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
import java.util.logging.Level;
import java.util.logging.Logger;
+
import org.hps.analysis.ecal.HPSMCParticlePlotsDriver;
+import org.hps.users.phansson.testrun.TrigRateDriver;
import org.lcsim.event.Cluster;
import org.lcsim.event.EventHeader;
import org.lcsim.event.GenericObject;
Modified: java/trunk/users/src/main/java/org/hps/users/phansson/TruthMomentumResolutionDriver.java
=============================================================================
--- java/trunk/users/src/main/java/org/hps/users/phansson/TruthMomentumResolutionDriver.java (original)
+++ java/trunk/users/src/main/java/org/hps/users/phansson/TruthMomentumResolutionDriver.java Wed Jan 6 10:40:54 2016
@@ -18,6 +18,7 @@
import java.util.logging.Logger;
import org.hps.analysis.ecal.HPSMCParticlePlotsDriver;
+import org.hps.users.phansson.testrun.TrigRateDriver;
import org.lcsim.constants.Constants;
import org.lcsim.event.EventHeader;
import org.lcsim.event.MCParticle;
Modified: java/trunk/users/src/main/java/org/hps/users/phansson/alignment/MPAlignmentInputCalculator.java
=============================================================================
--- java/trunk/users/src/main/java/org/hps/users/phansson/alignment/MPAlignmentInputCalculator.java (original)
+++ java/trunk/users/src/main/java/org/hps/users/phansson/alignment/MPAlignmentInputCalculator.java Wed Jan 6 10:40:54 2016
@@ -19,7 +19,6 @@
import org.hps.recon.tracking.TrackerHitUtils;
import org.hps.users.mgraham.alignment.RunAlignment;
-import org.hps.users.phansson.ResLimit;
import org.lcsim.event.Track;
import org.lcsim.fit.helicaltrack.HelicalTrackFit;
import org.lcsim.util.aida.AIDA;
Copied: java/trunk/users/src/main/java/org/hps/users/phansson/alignment/ResLimit.java (from r4081, java/trunk/users/src/main/java/org/hps/users/phansson/ResLimit.java)
=============================================================================
--- java/trunk/users/src/main/java/org/hps/users/phansson/ResLimit.java (original)
+++ java/trunk/users/src/main/java/org/hps/users/phansson/alignment/ResLimit.java Wed Jan 6 10:40:54 2016
@@ -2,7 +2,7 @@
* To change this template, choose Tools | Templates
* and open the template in the editor.
*/
-package org.hps.users.phansson;
+package org.hps.users.phansson.alignment;
import java.util.HashMap;
import java.util.Iterator;
Modified: java/trunk/users/src/main/java/org/hps/users/phansson/alignment/RunMPAlignment.java
=============================================================================
--- java/trunk/users/src/main/java/org/hps/users/phansson/alignment/RunMPAlignment.java (original)
+++ java/trunk/users/src/main/java/org/hps/users/phansson/alignment/RunMPAlignment.java Wed Jan 6 10:40:54 2016
@@ -10,8 +10,8 @@
import java.util.logging.Level;
import java.util.logging.Logger;
-import org.hps.users.phansson.TrigRateAna;
-import org.hps.users.phansson.TrigRateDriver;
+import org.hps.users.phansson.testrun.TrigRateAna;
+import org.hps.users.phansson.testrun.TrigRateDriver;
import org.lcsim.event.EventHeader;
import org.lcsim.event.Track;
import org.lcsim.event.TrackerHit;
Copied: java/trunk/users/src/main/java/org/hps/users/phansson/daq/SvtHeaderAnalysisDriver.java (from r4081, java/trunk/users/src/main/java/org/hps/users/phansson/SvtHeaderAnalysisDriver.java)
=============================================================================
--- java/trunk/users/src/main/java/org/hps/users/phansson/SvtHeaderAnalysisDriver.java (original)
+++ java/trunk/users/src/main/java/org/hps/users/phansson/daq/SvtHeaderAnalysisDriver.java Wed Jan 6 10:40:54 2016
@@ -1,7 +1,7 @@
/**
*
*/
-package org.hps.users.phansson;
+package org.hps.users.phansson.daq;
import java.io.FileWriter;
import java.io.IOException;
Copied: java/trunk/users/src/main/java/org/hps/users/phansson/daq/SvtHeaderMetaDataReaderDriver.java (from r4081, java/trunk/users/src/main/java/org/hps/users/phansson/SvtHeaderMetaDataReaderDriver.java)
=============================================================================
--- java/trunk/users/src/main/java/org/hps/users/phansson/SvtHeaderMetaDataReaderDriver.java (original)
+++ java/trunk/users/src/main/java/org/hps/users/phansson/daq/SvtHeaderMetaDataReaderDriver.java Wed Jan 6 10:40:54 2016
@@ -1,7 +1,7 @@
/**
*
*/
-package org.hps.users.phansson;
+package org.hps.users.phansson.daq;
import java.util.Map;
import java.util.logging.Level;
Copied: java/trunk/users/src/main/java/org/hps/users/phansson/daq/SvtOldHeaderAnalysisDriver.java (from r4081, java/trunk/users/src/main/java/org/hps/users/phansson/SvtOldHeaderAnalysisDriver.java)
=============================================================================
--- java/trunk/users/src/main/java/org/hps/users/phansson/SvtOldHeaderAnalysisDriver.java (original)
+++ java/trunk/users/src/main/java/org/hps/users/phansson/daq/SvtOldHeaderAnalysisDriver.java Wed Jan 6 10:40:54 2016
@@ -1,7 +1,7 @@
/**
*
*/
-package org.hps.users.phansson;
+package org.hps.users.phansson.daq;
import hep.aida.IHistogram2D;
import hep.aida.IPlotter;
Copied: java/trunk/users/src/main/java/org/hps/users/phansson/daq/SvtOldHeaderDataInfo.java (from r4081, java/trunk/users/src/main/java/org/hps/users/phansson/SvtOldHeaderDataInfo.java)
=============================================================================
--- java/trunk/users/src/main/java/org/hps/users/phansson/SvtOldHeaderDataInfo.java (original)
+++ java/trunk/users/src/main/java/org/hps/users/phansson/daq/SvtOldHeaderDataInfo.java Wed Jan 6 10:40:54 2016
@@ -1,7 +1,7 @@
/**
*
*/
-package org.hps.users.phansson;
+package org.hps.users.phansson.daq;
import org.lcsim.event.GenericObject;
Copied: java/trunk/users/src/main/java/org/hps/users/phansson/testrun/BeamCurrentData.java (from r4081, java/trunk/users/src/main/java/org/hps/users/phansson/BeamCurrentData.java)
=============================================================================
--- java/trunk/users/src/main/java/org/hps/users/phansson/BeamCurrentData.java (original)
+++ java/trunk/users/src/main/java/org/hps/users/phansson/testrun/BeamCurrentData.java Wed Jan 6 10:40:54 2016
@@ -2,7 +2,7 @@
* To change this template, choose Tools | Templates
* and open the template in the editor.
*/
-package org.hps.users.phansson;
+package org.hps.users.phansson.testrun;
/**
*
Copied: java/trunk/users/src/main/java/org/hps/users/phansson/testrun/Count.java (from r4081, java/trunk/users/src/main/java/org/hps/users/phansson/Count.java)
=============================================================================
--- java/trunk/users/src/main/java/org/hps/users/phansson/Count.java (original)
+++ java/trunk/users/src/main/java/org/hps/users/phansson/testrun/Count.java Wed Jan 6 10:40:54 2016
@@ -2,7 +2,7 @@
* To change this template, choose Tools | Templates
* and open the template in the editor.
*/
-package org.hps.users.phansson;
+package org.hps.users.phansson.testrun;
/**
*
@@ -15,7 +15,7 @@
private double n;
private double en;
- Count(String n, String r, double N, double err) {
+ public Count(String n, String r, double N, double err) {
this.name = n;
this.run = r;
this.n = N;
Copied: java/trunk/users/src/main/java/org/hps/users/phansson/testrun/DAQDeadTimeData.java (from r4081, java/trunk/users/src/main/java/org/hps/users/phansson/DAQDeadTimeData.java)
=============================================================================
--- java/trunk/users/src/main/java/org/hps/users/phansson/DAQDeadTimeData.java (original)
+++ java/trunk/users/src/main/java/org/hps/users/phansson/testrun/DAQDeadTimeData.java Wed Jan 6 10:40:54 2016
@@ -2,7 +2,7 @@
* To change this template, choose Tools | Templates
* and open the template in the editor.
*/
-package org.hps.users.phansson;
+package org.hps.users.phansson.testrun;
/**
*
Copied: java/trunk/users/src/main/java/org/hps/users/phansson/testrun/EcalHitMapPlots.java (from r4081, java/trunk/users/src/main/java/org/hps/users/phansson/EcalHitMapPlots.java)
=============================================================================
--- java/trunk/users/src/main/java/org/hps/users/phansson/EcalHitMapPlots.java (original)
+++ java/trunk/users/src/main/java/org/hps/users/phansson/testrun/EcalHitMapPlots.java Wed Jan 6 10:40:54 2016
@@ -2,7 +2,7 @@
* To change this template, choose Tools | Templates
* and open the template in the editor.
*/
-package org.hps.users.phansson;
+package org.hps.users.phansson.testrun;
import hep.aida.IAnalysisFactory;
import hep.aida.IHistogram1D;
Copied: java/trunk/users/src/main/java/org/hps/users/phansson/testrun/PolarCount.java (from r4081, java/trunk/users/src/main/java/org/hps/users/phansson/PolarCount.java)
=============================================================================
--- java/trunk/users/src/main/java/org/hps/users/phansson/PolarCount.java (original)
+++ java/trunk/users/src/main/java/org/hps/users/phansson/testrun/PolarCount.java Wed Jan 6 10:40:54 2016
@@ -2,7 +2,8 @@
* To change this template, choose Tools | Templates
* and open the template in the editor.
*/
-package org.hps.users.phansson;
+package org.hps.users.phansson.testrun;
+
Copied: java/trunk/users/src/main/java/org/hps/users/phansson/testrun/SimpleHPSConditions.java (from r4081, java/trunk/users/src/main/java/org/hps/users/phansson/SimpleHPSConditions.java)
=============================================================================
--- java/trunk/users/src/main/java/org/hps/users/phansson/SimpleHPSConditions.java (original)
+++ java/trunk/users/src/main/java/org/hps/users/phansson/testrun/SimpleHPSConditions.java Wed Jan 6 10:40:54 2016
@@ -2,7 +2,7 @@
* To change this template, choose Tools | Templates
* and open the template in the editor.
*/
-package org.hps.users.phansson;
+package org.hps.users.phansson.testrun;
import java.io.BufferedReader;
import java.io.FileNotFoundException;
Copied: java/trunk/users/src/main/java/org/hps/users/phansson/testrun/TrigRateAna.java (from r4081, java/trunk/users/src/main/java/org/hps/users/phansson/TrigRateAna.java)
=============================================================================
--- java/trunk/users/src/main/java/org/hps/users/phansson/TrigRateAna.java (original)
+++ java/trunk/users/src/main/java/org/hps/users/phansson/testrun/TrigRateAna.java Wed Jan 6 10:40:54 2016
@@ -2,7 +2,7 @@
* To change this template, choose Tools | Templates
* and open the template in the editor.
*/
-package org.hps.users.phansson;
+package org.hps.users.phansson.testrun;
import hep.aida.IAnalysisFactory;
import hep.aida.IDataPointSet;
Copied: java/trunk/users/src/main/java/org/hps/users/phansson/testrun/TrigRateDriver.java (from r4081, java/trunk/users/src/main/java/org/hps/users/phansson/TrigRateDriver.java)
=============================================================================
--- java/trunk/users/src/main/java/org/hps/users/phansson/TrigRateDriver.java (original)
+++ java/trunk/users/src/main/java/org/hps/users/phansson/testrun/TrigRateDriver.java Wed Jan 6 10:40:54 2016
@@ -1,4 +1,4 @@
-package org.hps.users.phansson;
+package org.hps.users.phansson.testrun;
import hep.aida.IAnalysisFactory;
import hep.aida.IHistogram;
@@ -16,6 +16,7 @@
import java.util.logging.Logger;
import org.hps.recon.tracking.BeamlineConstants;
+import org.hps.users.phansson.EcalTrackMatch;
import org.lcsim.event.Cluster;
import org.lcsim.event.EventHeader;
import org.lcsim.event.Track;
Copied: java/trunk/users/src/main/java/org/hps/users/phansson/testrun/dataMCPlots.java (from r4081, java/trunk/users/src/main/java/org/hps/users/phansson/dataMCPlots.java)
=============================================================================
--- java/trunk/users/src/main/java/org/hps/users/phansson/dataMCPlots.java (original)
+++ java/trunk/users/src/main/java/org/hps/users/phansson/testrun/dataMCPlots.java Wed Jan 6 10:40:54 2016
@@ -2,7 +2,7 @@
* To change this template, choose Tools | Templates
* and open the template in the editor.
*/
-package org.hps.users.phansson;
+package org.hps.users.phansson.testrun;
import hep.aida.IAnalysisFactory;
import hep.aida.IDataPointSet;
Copied: java/trunk/users/src/main/java/org/hps/users/phansson/testrun/ecalPlots.java (from r4081, java/trunk/users/src/main/java/org/hps/users/phansson/ecalPlots.java)
=============================================================================
--- java/trunk/users/src/main/java/org/hps/users/phansson/ecalPlots.java (original)
+++ java/trunk/users/src/main/java/org/hps/users/phansson/testrun/ecalPlots.java Wed Jan 6 10:40:54 2016
@@ -2,7 +2,7 @@
* To change this template, choose Tools | Templates
* and open the template in the editor.
*/
-package org.hps.users.phansson;
+package org.hps.users.phansson.testrun;
import hep.aida.IAnalysisFactory;
import hep.aida.IHistogram1D;
Copied: java/trunk/users/src/main/java/org/hps/users/phansson/testrun/trigRate.java (from r4081, java/trunk/users/src/main/java/org/hps/users/phansson/trigRate.java)
=============================================================================
--- java/trunk/users/src/main/java/org/hps/users/phansson/trigRate.java (original)
+++ java/trunk/users/src/main/java/org/hps/users/phansson/testrun/trigRate.java Wed Jan 6 10:40:54 2016
@@ -2,7 +2,7 @@
* To change this template, choose Tools | Templates
* and open the template in the editor.
*/
-package org.hps.users.phansson;
+package org.hps.users.phansson.testrun;
import hep.aida.IAnalysisFactory;
import hep.aida.ITree;
Modified: java/trunk/users/src/main/java/org/hps/users/phansson/tools/ROOTFlatTupleDriver.java
=============================================================================
--- java/trunk/users/src/main/java/org/hps/users/phansson/tools/ROOTFlatTupleDriver.java (original)
+++ java/trunk/users/src/main/java/org/hps/users/phansson/tools/ROOTFlatTupleDriver.java Wed Jan 6 10:40:54 2016
@@ -32,7 +32,7 @@
import org.hps.recon.vertexing.TwoTrackVertexer;
import org.hps.record.triggerbank.AbstractIntData;
import org.hps.record.triggerbank.TestRunTriggerData;
-import org.hps.users.phansson.TrigRateDriver;
+import org.hps.users.phansson.testrun.TrigRateDriver;
import org.lcsim.detector.IDetectorElement;
import org.lcsim.detector.identifier.IExpandedIdentifier;
import org.lcsim.detector.identifier.IIdentifierHelper;
