Sim-recon-1.2.0 Release Notes

From GlueXWiki
Revision as of 15:00, 3 June 2015 by Marki (Talk | contribs)

(diff) ← Older revision | Latest revision (diff) | Newer revision → (diff)
Jump to: navigation, search

This version is based on revision 18552 of ^trunk/sim-recon.

This release is being used for simulation of Spring 2015 data and for Data Challenge 3. It contains a fix to the xstream library to expose methods formerly masked by STL-native methods.

At JLab, it was built using version_1.5.xml.

Package Version
jana 0.7.2
sim-recon 1.2.0
hdds 3.2
cernlib 2005
xerces-c 3.1.1
clhep 2.0.4.5
root 5.34.26
ccdb 1.05
evio 4.3.1

Changes since the last release:


r18214 | davidl | 2015-04-29 15:32:56 -0400 (Wed, 29 Apr 2015) | 1 line Changed paths:

  M /trunk/sim-recon/src/libraries/DAQ/DEPICSvalue.h

Fix problem with crashes when DEPICSvalue objects are being turned into strings. In this case, for janaroot plugin.


r18224 | staylor | 2015-04-30 10:19:02 -0400 (Thu, 30 Apr 2015) | 1 line Changed paths:

  M /trunk/sim-recon/src/libraries/PID/DParticleID.cc

Set dSCphi0 and dSCdphi


r18229 | mstaib | 2015-04-30 14:29:09 -0400 (Thu, 30 Apr 2015) | 1 line Changed paths:

  M /trunk/sim-recon/src/libraries/PID/DParticleID.cc

Allow setting OUT_OF_TIME_CUT from command line.


r18230 | davidl | 2015-04-30 14:58:05 -0400 (Thu, 30 Apr 2015) | 1 line Changed paths:

  M /trunk/sim-recon/src/libraries/TTAB/DTTabUtilities_factory.cc

Temporary fix to mechanism holding DF1TDCConfig objects used to convert to ns.


r18236 | pmatt | 2015-04-30 17:46:35 -0400 (Thu, 30 Apr 2015) | 3 lines Changed paths:

  M /trunk/sim-recon/src/libraries/ANALYSIS/DHistogramActions_Independent.cc
  M /trunk/sim-recon/src/libraries/ANALYSIS/DHistogramActions_Independent.h
  M /trunk/sim-recon/src/libraries/PID/DParticleID.cc
  M /trunk/sim-recon/src/libraries/PID/DParticleID.h

Add histograms for SC efficiencies in the barrel and nose regions.



r18239 | jrsteven | 2015-05-01 10:09:28 -0400 (Fri, 01 May 2015) | 1 line Changed paths:

  M /trunk/sim-recon/src/programs/Analysis/plugins/p2pi_hists/DCustomAction_p2pi_hists.cc
  M /trunk/sim-recon/src/programs/Analysis/plugins/p2pi_hists/DCustomAction_p2pi_taggerCoincidence.cc
  M /trunk/sim-recon/src/programs/Analysis/plugins/p2pi_hists/DReaction_factory_p2pi_hists.cc
  M /trunk/sim-recon/src/programs/Analysis/plugins/p3pi_hists/DCustomAction_p3pi_hists.cc
  M /trunk/sim-recon/src/programs/Analysis/plugins/p3pi_hists/DCustomAction_p3pi_taggerCoincidence.cc
  M /trunk/sim-recon/src/programs/Analysis/plugins/p3pi_hists/DReaction_factory_p3pi_hists.cc

updates to p2pi and p3pi plugins for spring 2015 data


r18244 | mstaib | 2015-05-01 15:23:15 -0400 (Fri, 01 May 2015) | 1 line Changed paths:

  M /trunk/sim-recon/src/programs/Utilities/plugins/HLDetectorTiming/JEventProcessor_HLDetectorTiming.cc
  M /trunk/sim-recon/src/programs/Utilities/plugins/HLDetectorTiming/JEventProcessor_HLDetectorTiming.h

Few changes for updated two-step procedure


r18249 | jrsteven | 2015-05-01 16:15:33 -0400 (Fri, 01 May 2015) | 1 line Changed paths:

  M /trunk/sim-recon/src/programs/Analysis/plugins/p2pi_hists/HistMacro_p2pi_preco1.C

update p2pi macro for spring data


r18267 | sdobbs | 2015-05-04 00:41:04 -0400 (Mon, 04 May 2015) | 1 line Changed paths:

  M /trunk/sim-recon/src/libraries/include/particleType.h

Changed 'J/psi' -> 'Jpsi' since it was confusing ROOT


r18270 | sdobbs | 2015-05-04 17:36:06 -0400 (Mon, 04 May 2015) | 2 lines Changed paths:

  M /trunk/sim-recon/src/programs/Utilities/SConscript
  A /trunk/sim-recon/src/programs/Utilities/hddm_select_events/SConscript

Add hddm_select_events to SBMS as optional build.


r18277 | pooser | 2015-05-05 19:54:11 -0400 (Tue, 05 May 2015) | 1 line Changed paths:

  M /trunk/sim-recon/src/libraries/START_COUNTER/DSCHit_factory.cc

Implemented new method to correct for the timewalk utilizing the pulse peak object instead of the pulse integral object. The CCDB has been updated accordingly.


r18278 | pmatt | 2015-05-05 20:19:57 -0400 (Tue, 05 May 2015) | 3 lines Changed paths:

  A /trunk/sim-recon/src/libraries/PID/DEventRFBunch_factory_Calibrations.cc
  A /trunk/sim-recon/src/libraries/PID/DEventRFBunch_factory_Calibrations.h
  M /trunk/sim-recon/src/libraries/PID/PID_init.cc

Factory for picking an RF time to use to help with calibrating the timing alignment/offset constants.



r18279 | pmatt | 2015-05-05 21:17:30 -0400 (Tue, 05 May 2015) | 4 lines Changed paths:

  M /trunk/sim-recon/src/libraries/ANALYSIS/DHistogramActions_Independent.cc
  M /trunk/sim-recon/src/libraries/PID/DEventRFBunch_factory_Calibrations.cc
  M /trunk/sim-recon/src/libraries/PID/DEventRFBunch_factory_Calibrations.h

RF Calibrations: Use "WireBased" tag for DDetectorMatches. Histogram Actions: Fix ST matching histogram labels, fill "nohit" histogram.



r18280 | pmatt | 2015-05-05 21:26:05 -0400 (Tue, 05 May 2015) | 3 lines Changed paths:

  M /trunk/sim-recon/src/libraries/PID/DEventRFBunch_factory_Calibrations.cc

Add comments.



r18281 | pmatt | 2015-05-05 21:41:35 -0400 (Tue, 05 May 2015) | 3 lines Changed paths:

  M /trunk/sim-recon/src/libraries/TTAB/DTTabUtilities.cc
  M /trunk/sim-recon/src/libraries/TTAB/DTTabUtilities.h
  M /trunk/sim-recon/src/libraries/TTAB/DTTabUtilities_factory.cc
  M /trunk/sim-recon/src/libraries/TTAB/DTTabUtilities_factory.h

Use DF1TDCConfig objects that are associated with the DF1TDCHits.



r18282 | pmatt | 2015-05-05 22:07:28 -0400 (Tue, 05 May 2015) | 3 lines Changed paths:

  M /trunk/sim-recon/src/libraries/ANALYSIS/DHistogramActions_Independent.cc
  M /trunk/sim-recon/src/libraries/ANALYSIS/DHistogramActions_Independent.h
  M /trunk/sim-recon/src/libraries/PID/DEventRFBunch_factory_Calibrations.cc
  M /trunk/sim-recon/src/libraries/TRACKING/DTrackWireBased.h
  M /trunk/sim-recon/src/libraries/TRACKING/DTrackWireBased_factory.cc
  M /trunk/sim-recon/src/libraries/TRACKING/DTrackWireBased_factory_THROWN.cc

Add FOM member variable to DTrackWireBased, set it in factories, use it in other places. Histogram wire-based tracking FOM.



r18283 | pooser | 2015-05-06 08:14:59 -0400 (Wed, 06 May 2015) | 1 line Changed paths:

  M /trunk/sim-recon/src/libraries/START_COUNTER/DSCHit_factory.cc

Reverted back to previous configuration to work on debugging.


r18284 | pmatt | 2015-05-06 10:49:27 -0400 (Wed, 06 May 2015) | 3 lines Changed paths:

  M /trunk/sim-recon/src/programs/Analysis/plugins/monitoring_hists/HistMacro_Matching_SC.C

Update macro with 1D efficiencies.



r18285 | pmatt | 2015-05-06 11:18:54 -0400 (Wed, 06 May 2015) | 3 lines Changed paths:

  M /trunk/sim-recon/src/programs/Analysis/plugins/monitoring_hists/HistMacro_Matching_BCAL.C
  M /trunk/sim-recon/src/programs/Analysis/plugins/monitoring_hists/HistMacro_Matching_SC.C

Added 1D eff graph for BCAL.



r18294 | nsparks | 2015-05-06 15:59:38 -0400 (Wed, 06 May 2015) | 1 line Changed paths:

  M /trunk/sim-recon/src/libraries/PAIR_SPECTROMETER/DPSCPair_factory.cc
  M /trunk/sim-recon/src/libraries/PAIR_SPECTROMETER/DPSCPair_factory.h
  M /trunk/sim-recon/src/libraries/PAIR_SPECTROMETER/DPSPair_factory.cc
  M /trunk/sim-recon/src/libraries/PAIR_SPECTROMETER/DPSPair_factory.h

save all left-right hit pairs instead of just the closest one in time; sort vector of pairs according to time difference


r18303 | pmatt | 2015-05-06 17:18:36 -0400 (Wed, 06 May 2015) | 3 lines Changed paths:

  M /trunk/sim-recon/src/libraries/RF/DRFTime_factory.cc
  M /trunk/sim-recon/src/libraries/RF/DRFTime_factory.h
  M /trunk/sim-recon/src/libraries/TTAB/DTTabUtilities.cc
  M /trunk/sim-recon/src/libraries/TTAB/DTTabUtilities_factory.cc

Fix tdc -> time conversion when DF1TDCConfig objects are in the datastream (had low/high-res backwards).



r18307 | pmatt | 2015-05-06 19:37:27 -0400 (Wed, 06 May 2015) | 3 lines Changed paths:

  M /trunk/sim-recon/src/libraries/RF/DRFTime_factory.cc

Ignore RF times hooked up to FADC250's.



r18308 | pmatt | 2015-05-06 20:14:27 -0400 (Wed, 06 May 2015) | 6 lines Changed paths:

  M /trunk/sim-recon/src/libraries/TTAB/DTTabUtilities.cc
  M /trunk/sim-recon/src/libraries/TTAB/DTTabUtilities_factory.cc

Fix TDC -> time conversion for CAEN TDCs. Yes, again. It turns out that the correction-code for the 6-fold-ambiguity still assumed a 25ps resolution when appying the TDC shift. This change fixes the DTTabUtilities conversion function, which the RF TOF signal is using, but the DTOFHit factory is not yet using. Will switch the DTOFHit factory to use this function AFTER the launch starts tomorrow, since fixing this will require yet another calibration of the TOF timing offsets. The RF delta-t between the TOF and other systems now looks OK IF a tdc phase shift of 1 is used (unlike the 0 which is in the CCDB right now). This should be fixed prior to launch tomorrow.



r18319 | mstaib | 2015-05-07 12:01:13 -0400 (Thu, 07 May 2015) | 1 line Changed paths:

  M /trunk/sim-recon/src/libraries/TRACKING/DTrackCandidate_factory_StraightLine.cc
  M /trunk/sim-recon/src/libraries/TRACKING/DTrackCandidate_factory_StraightLine.h

Add command line options for changing hit pruning parameters


r18343 | pmatt | 2015-05-07 18:06:35 -0400 (Thu, 07 May 2015) | 4 lines Changed paths:

  A /trunk/sim-recon/src/libraries/PID/DChargedTrack_factory_PreSelectTimeCalib.cc
  A /trunk/sim-recon/src/libraries/PID/DChargedTrack_factory_PreSelectTimeCalib.h
  M /trunk/sim-recon/src/libraries/PID/PID_init.cc

Add factory for preselecting charged tracks. It uses the wire-based track results with no cuts on detector match or FOM (it assumes it's uncalibrated). This factory is (hopefully) useful for calibrating the time-offsets between detectors.



r18344 | pmatt | 2015-05-07 18:07:31 -0400 (Thu, 07 May 2015) | 3 lines Changed paths:

  M /trunk/sim-recon/src/libraries/PID/DChargedTrack_factory_PreSelectTimeCalib.h

Remove unused variables from class definition.



r18346 | pmatt | 2015-05-07 18:52:52 -0400 (Thu, 07 May 2015) | 3 lines Changed paths:

  M /trunk/sim-recon/src/libraries/RF/DRFTime_factory.cc

Use only the first time from the PSC until other systems are aligned.



r18353 | mstaib | 2015-05-08 13:44:15 -0400 (Fri, 08 May 2015) | 1 line Changed paths:

  A /trunk/sim-recon/src/programs/Utilities/plugins/HLDetectorTiming/DFactoryGenerator_p2pi.h
  A /trunk/sim-recon/src/programs/Utilities/plugins/HLDetectorTiming/DReaction_factory_p2pi.cc
  A /trunk/sim-recon/src/programs/Utilities/plugins/HLDetectorTiming/DReaction_factory_p2pi.h
  M /trunk/sim-recon/src/programs/Utilities/plugins/HLDetectorTiming/JEventProcessor_HLDetectorTiming.cc
  M /trunk/sim-recon/src/programs/Utilities/plugins/HLDetectorTiming/JEventProcessor_HLDetectorTiming.h

Plot some signals Vs. the RF when the signal is available. Remove the fitting from the event processor, this is done in seperate scripts now and it's too much of a pain to update in two places. Choosing the correct beam bunch in the tagger is challenging in the spring 2015 data, so a few more options are added to look at. In particular, you can now ask for the hits corresponding to reconstructed events downstream that pass some cuts. Still in testing.


r18358 | pmatt | 2015-05-08 18:34:49 -0400 (Fri, 08 May 2015) | 4 lines Changed paths:

  M /trunk/sim-recon/src/libraries/TOF/DTOFHit_factory.cc
  M /trunk/sim-recon/src/libraries/TOF/DTOFHit_factory.h
  M /trunk/sim-recon/src/libraries/TTAB/DTTabUtilities.cc
  M /trunk/sim-recon/src/libraries/TTAB/DTTabUtilities_factory.cc
  M /trunk/sim-recon/src/libraries/TTAB/DTTabUtilities_factory.h

Rip out the TDC -> time conversion from the DTOFHit_factory, and use the conversion function in DTTabUtilities instead. This is to centralize code, but also because the code for handling the 6-fold ambiguity in DTOFHit_factory was bad (assumed 25 ps resolution).



r18362 | mstaib | 2015-05-10 12:44:39 -0400 (Sun, 10 May 2015) | 1 line Changed paths:

  M /trunk/sim-recon/src/programs/Utilities/plugins/HLDetectorTiming/JEventProcessor_HLDetectorTiming.cc

Change some binning


r18364 | marki | 2015-05-11 10:28:47 -0400 (Mon, 11 May 2015) | 1 line Changed paths:

  M /trunk/sim-recon/src/programs/Utilities/plugins/HLDetectorTiming/JEventProcessor_HLDetectorTiming.h

remove extraneous comma


r18367 | davidl | 2015-05-11 14:38:38 -0400 (Mon, 11 May 2015) | 1 line Changed paths:

  M /trunk/sim-recon/src/libraries/HDDM/event.xml

Add the incident particle id to the bcalTruthHit. Add the forwardMWPC hit structure.


r18369 | davidl | 2015-05-11 15:01:59 -0400 (Mon, 11 May 2015) | 1 line Changed paths:

  M /trunk/sim-recon/src/programs/Simulation/mcsmear/mcsmear.cc
  M /trunk/sim-recon/src/programs/Simulation/mcsmear/smear.cc

Add smearing of FMWPC.


r18373 | davidl | 2015-05-12 09:14:27 -0400 (Tue, 12 May 2015) | 1 line Changed paths:

  M /trunk/sim-recon/src/external/xstream/include/xstream/bz.h
  M /trunk/sim-recon/src/external/xstream/include/xstream/digest.h
  M /trunk/sim-recon/src/external/xstream/include/xstream/z.h
  M /trunk/sim-recon/src/external/xstream/src/bz.cpp
  M /trunk/sim-recon/src/external/xstream/src/digest.cpp
  M /trunk/sim-recon/src/external/xstream/src/z.cpp

Minor changes to avoid compiler warnings mainly related to xsputn.


r18382 | dalton | 2015-05-13 14:23:50 -0400 (Wed, 13 May 2015) | 4 lines Changed paths:

  M /trunk/sim-recon/src/programs/Analysis/plugins/SConscript


Compile DAQTree and DAQTreeBCAL plugins by default.



r18383 | davidl | 2015-05-14 09:21:57 -0400 (Thu, 14 May 2015) | 15 lines Changed paths:

  M /trunk/sim-recon/src/external/xstream/include/xstream/bz.h
  M /trunk/sim-recon/src/external/xstream/src/bz.cpp

Reverting change made a few days ago that tried to avoid compiler warnings. That change broke mcsmear with errors referencing bz compression. The changes in commit 18383 involved 6 files (really 3 plus their headers) that were mainly changing the signature of xsputn to accept const char* instead of char*. This commit only backs out one of the 3 since that is what is needed to get mcsmear working. I suspect that the problem was that changing the input types to xsputn made some call to it go instead to a system routine of the same name. This problem may therefore be present in the other two places changed in revision 18383 as well, just they are not used commonly so the problem has yet to present.



r18385 | pooser | 2015-05-14 09:53:59 -0400 (Thu, 14 May 2015) | 1 line Changed paths:

  M /trunk/sim-recon/src/libraries/START_COUNTER/DSCHit.h
  M /trunk/sim-recon/src/libraries/START_COUNTER/DSCHit_factory.cc

Modify ST hit factory to grab the pulse peak objects for time walk corrections. The CCDB has been modified accordingly


r18412 | davidl | 2015-05-14 16:19:36 -0400 (Thu, 14 May 2015) | 1 line Changed paths:

  M /trunk/sim-recon/src/libraries/DAQ/JEventSource_EVIO.cc
  M /trunk/sim-recon/src/libraries/DAQ/JEventSource_EVIO.h

Add EVIO:F125PULSE_NUMBER_FILTER and EVIO:F250PULSE_NUMBER_FILTER config. parameters to give user ability to filter out higher pulse numbers.


r18415 | pmatt | 2015-05-14 21:39:23 -0400 (Thu, 14 May 2015) | 5 lines Changed paths:

  M /trunk/sim-recon/src/libraries/RF/DRFTime_factory.cc
  M /trunk/sim-recon/src/libraries/RF/DRFTime_factory.h
  M /trunk/sim-recon/src/libraries/TTAB/DTTabUtilities.cc
  M /trunk/sim-recon/src/programs/Utilities/plugins/trackeff_missing/DReaction_factory_trackeff_missing.cc

DReaction: Remove cut on RF time. TTab: Delete unused variable. RF factory: Overhaul: Only use time source with best resolution. Remove all references to ADC sources. Change constants format to coincide with new CCDB format (since no ADC sources). Will make CCDB change ASAP. Users will need new sqlite's after this.



r18418 | pmatt | 2015-05-14 22:03:51 -0400 (Thu, 14 May 2015) | 3 lines Changed paths:

  D /trunk/sim-recon/src/libraries/PID/DChargedTrack_factory_PreSelectTimeCalib.cc
  D /trunk/sim-recon/src/libraries/PID/DChargedTrack_factory_PreSelectTimeCalib.h

This factory isn't used by anything. Was supposed to use wirebased tracks, but I never quite got it working, and it turns out it's unnecessary anyway.



r18419 | staylor | 2015-05-15 10:22:00 -0400 (Fri, 15 May 2015) | 1 line Changed paths:

  M /trunk/sim-recon/src/libraries/START_COUNTER/DSCHit_factory.cc

Skip hit if there is no pulse pedestal or pulse integral object.


r18421 | pmatt | 2015-05-15 11:17:30 -0400 (Fri, 15 May 2015) | 3 lines Changed paths:

  M /trunk/sim-recon/src/libraries/PID/PID_init.cc
  M /trunk/sim-recon/src/libraries/RF/DRFTime_factory.cc

Delete unused charged track preselect factory from factory list in PID_init().



r18427 | davidl | 2015-05-15 15:35:01 -0400 (Fri, 15 May 2015) | 10 lines Changed paths:

  M /trunk/sim-recon/src/external/xstream/include/xstream/bz.h
  M /trunk/sim-recon/src/external/xstream/include/xstream/digest.h
  M /trunk/sim-recon/src/external/xstream/include/xstream/z.h
  M /trunk/sim-recon/src/external/xstream/src/digest.cpp
  M /trunk/sim-recon/src/external/xstream/src/z.cpp

Backing change made in revision 18372 for "z" and "digest" compression methods. These will likely give the same problem that arose with the "bz" method and required it to be reverted.

Implemented alternative method of supressing warnings due to hides overloaded virtual function. This just declares that the class is "using" the method with the same name (but different argument types) from the base class. We don't actually use it, but it lets the compiler know that we know that it is there and our declaration using different argument types is not a mistake


r18432 | staylor | 2015-05-18 09:01:29 -0400 (Mon, 18 May 2015) | 1 line Changed paths:

  M /trunk/sim-recon/src/libraries/TRACKING/DReferenceTrajectory.cc
  M /trunk/sim-recon/src/libraries/TRACKING/DReferenceTrajectory.h

Use Brent's algorithm to find best doca between two tracks.


r18435 | pmatt | 2015-05-18 10:45:29 -0400 (Mon, 18 May 2015) | 4 lines Changed paths:

  M /trunk/sim-recon/src/libraries/ANALYSIS/DAnalysisResults_factory.cc
  M /trunk/sim-recon/src/libraries/ANALYSIS/DAnalysisResults_factory_PreKinFit.cc
  M /trunk/sim-recon/src/libraries/ANALYSIS/DParticleCombo_factory_PreKinFit.cc
  M /trunk/sim-recon/src/programs/Utilities/plugins/trackeff_missing/DReaction_factory_trackeff_missing.cc

After creating histograms, change back to ROOT file base directory. Remove kinfit confidence level cuts.



r18439 | nsparks | 2015-05-18 15:59:21 -0400 (Mon, 18 May 2015) | 1 line Changed paths:

  A /trunk/sim-recon/src/programs/Utilities/plugins/ps_skim
  A /trunk/sim-recon/src/programs/Utilities/plugins/ps_skim/JEventProcessor_ps_skim.cc
  A /trunk/sim-recon/src/programs/Utilities/plugins/ps_skim/JEventProcessor_ps_skim.h
  A /trunk/sim-recon/src/programs/Utilities/plugins/ps_skim/SConscript

plugin for skimming pair spectrometer events; skims events with PSC or PS left-right coincidence, default max tdiff is 10ns


r18441 | nsparks | 2015-05-18 16:05:19 -0400 (Mon, 18 May 2015) | 1 line Changed paths:

  M /trunk/sim-recon/src/programs/Utilities/plugins/SConscript

added ps_skim


r18443 | davidl | 2015-05-18 16:57:59 -0400 (Mon, 18 May 2015) | 1 line Changed paths:

  M /trunk/sim-recon/src/programs/Analysis/hdview2/MyProcessor.cc

Use tag 'TRUTH' when getting DFCALHit objects to display for FCALTruth checkbox.


r18446 | davidl | 2015-05-19 14:26:07 -0400 (Tue, 19 May 2015) | 4 lines Changed paths:

  M /trunk/sim-recon/src/programs/Analysis/hdview2/MyProcessor.cc

- Fixed issue with CDC drift times for axial wires not being drawn - Fixed issue with reconstructed charged track projections to FCAL

 not being drawn.

r18447 | davidl | 2015-05-19 15:00:40 -0400 (Tue, 19 May 2015) | 7 lines Changed paths:

  M /trunk/sim-recon/src/programs/Analysis/hdview2/MyProcessor.cc
  M /trunk/sim-recon/src/programs/Analysis/hdview2/hdv_mainframe.cc

- Fix problem with markers not being drawn for axial CDC

 wires due to their stereo angle not being exactly zero

- Widen time range for both CDC and FDC so that more wires

 are draw cyan and less yellow. There still seems to be
 plenty of yellow and something more needs to be done with
 this.

r18453 | staylor | 2015-05-19 19:01:34 -0400 (Tue, 19 May 2015) | 1 line Changed paths:

  M /trunk/sim-recon/src/libraries/HDGEOMETRY/DMagneticFieldMapFineMesh.cc
  M /trunk/sim-recon/src/libraries/HDGEOMETRY/DMagneticFieldMapFineMesh.h

Instead of creating and reading from a generic finemesh.evio file for the finer-grid magnetic field map used in the reconstruction, grab specific magnetic field name from the ccdb and create/read unique files for each magnetic field map. At some point these evio files should probably be converted to resources...


r18465 | sdobbs | 2015-05-20 18:28:28 -0400 (Wed, 20 May 2015) | 7 lines Changed paths:

  A /trunk/sim-recon/src/libraries/HDGEOMETRY/DMagneticFieldMapPS.h
  A /trunk/sim-recon/src/libraries/HDGEOMETRY/DMagneticFieldMapPS2DMap.cc
  A /trunk/sim-recon/src/libraries/HDGEOMETRY/DMagneticFieldMapPS2DMap.h
  A /trunk/sim-recon/src/libraries/HDGEOMETRY/DMagneticFieldMapPSConst.cc
  A /trunk/sim-recon/src/libraries/HDGEOMETRY/DMagneticFieldMapPSConst.h

Added classes to manage field maps for the pair spectrometer magnet. Current two types of maps are supported: 1) A constant field 2) A 2D map with regular grid spacing, which is read in using the resource mechanism

The classes are organized similarly to the solenoid map classes.


r18467 | sdobbs | 2015-05-20 19:07:41 -0400 (Wed, 20 May 2015) | 2 lines Changed paths:

  M /trunk/sim-recon/src/programs/Simulation/HDGeant/calibDB.cc
  M /trunk/sim-recon/src/programs/Simulation/HDGeant/calibDB.h
  M /trunk/sim-recon/src/programs/Simulation/HDGeant/uginit.F

Added configuration parameters and procedure for loading pair spectrometer magnet field map.


r18468 | sdobbs | 2015-05-20 19:10:10 -0400 (Wed, 20 May 2015) | 3 lines Changed paths:

  M /trunk/sim-recon/src/programs/Simulation/HDGeant/SConscript
  D /trunk/sim-recon/src/programs/Simulation/HDGeant/bcal2nt.cpp
  D /trunk/sim-recon/src/programs/Simulation/HDGeant/bcal2nt_c.c
  D /trunk/sim-recon/src/programs/Simulation/HDGeant/cdccount.cpp
  D /trunk/sim-recon/src/programs/Simulation/HDGeant/cdccount_c.c
  D /trunk/sim-recon/src/programs/Simulation/HDGeant/cdcdump.cpp
  D /trunk/sim-recon/src/programs/Simulation/HDGeant/cdcdump_c.c
  D /trunk/sim-recon/src/programs/Simulation/HDGeant/hddmcp.cpp
  D /trunk/sim-recon/src/programs/Simulation/HDGeant/hddmcp_c.c
  A /trunk/sim-recon/src/programs/Simulation/HDGeant/utilities
  A /trunk/sim-recon/src/programs/Simulation/HDGeant/utilities/SConscript
  A /trunk/sim-recon/src/programs/Simulation/HDGeant/utilities/bcal2nt.cpp
  A /trunk/sim-recon/src/programs/Simulation/HDGeant/utilities/bcal2nt_c.c
  A /trunk/sim-recon/src/programs/Simulation/HDGeant/utilities/cdccount.cpp
  A /trunk/sim-recon/src/programs/Simulation/HDGeant/utilities/cdccount_c.c
  A /trunk/sim-recon/src/programs/Simulation/HDGeant/utilities/cdcdump.cpp
  A /trunk/sim-recon/src/programs/Simulation/HDGeant/utilities/cdcdump_c.c
  A /trunk/sim-recon/src/programs/Simulation/HDGeant/utilities/hddmcp.cpp
  A /trunk/sim-recon/src/programs/Simulation/HDGeant/utilities/hddmcp_c.c

Moved helper programs to their own subdirectory. This should help avoid linker errors using SBMS.


r18474 | sdobbs | 2015-05-21 12:45:21 -0400 (Thu, 21 May 2015) | 1 line Changed paths:

  M /trunk/sim-recon/src/programs/Simulation/bggen/code/parp_ini.F

Reduce lower limit of allowed photon energies to 2 GeV.


r18483 | kmoriya | 2015-05-21 14:15:40 -0400 (Thu, 21 May 2015) | 1 line Changed paths:

  M /trunk/sim-recon/src/SBMS/sbms.py
  M /trunk/sim-recon/src/libraries/SConscript

modifications necessary to compile TPOL_online


r18486 | kmoriya | 2015-05-21 14:52:42 -0400 (Thu, 21 May 2015) | 1 line Changed paths:

  M /trunk/sim-recon/src/libraries/TPOL/DTPOLHit_factory.cc
  M /trunk/sim-recon/src/libraries/TPOL/DTPOLHit_factory.h
  M /trunk/sim-recon/src/libraries/TPOL/DTPOLRingDigiHit.h

libraries necessary to compile TPOL_online, but still not much more than skeleton


r18488 | kmoriya | 2015-05-21 15:07:55 -0400 (Thu, 21 May 2015) | 1 line Changed paths:

  M /trunk/sim-recon/src/libraries/TPOL/DTPOLSectorDigiHit.h

added const NSECTORS


r18496 | mstaib | 2015-05-21 19:45:44 -0400 (Thu, 21 May 2015) | 1 line Changed paths:

  M /trunk/sim-recon/src/libraries/TRACKING/DTrackCandidate_factory_CDCCOSMIC.cc
  M /trunk/sim-recon/src/libraries/TRACKING/DTrackCandidate_factory_CDCCOSMIC.h

Overhaul of CDCCOSMIC track candidates. Previously was doing a wire-based fit to all hits in the CDC, now uses the track finder and ROOT minimizer to do a time-based fit. The nonlinear fit may fail with a bad initial guess. The code now tries to recover by using pairs of BCAL hits to seed a second pass at the fit. Multithreading may be an issue since the implimentation of the minimizer may cause problems, but good enough to go for now.


r18504 | mstaib | 2015-05-22 11:16:18 -0400 (Fri, 22 May 2015) | 1 line Changed paths:

  A /trunk/sim-recon/src/programs/Utilities/plugins/HLDetectorTiming/HistMacro_CalorimeterTiming.C
  A /trunk/sim-recon/src/programs/Utilities/plugins/HLDetectorTiming/HistMacro_PIDSystemTiming.C
  A /trunk/sim-recon/src/programs/Utilities/plugins/HLDetectorTiming/HistMacro_TaggerRFAlignment.C
  A /trunk/sim-recon/src/programs/Utilities/plugins/HLDetectorTiming/HistMacro_TaggerSCAlignment.C
  A /trunk/sim-recon/src/programs/Utilities/plugins/HLDetectorTiming/HistMacro_TaggerTiming.C
  A /trunk/sim-recon/src/programs/Utilities/plugins/HLDetectorTiming/HistMacro_TrackMatchedTiming.C

Macros for displaying online/offline status of detector timing.


r18505 | mstaib | 2015-05-22 11:21:27 -0400 (Fri, 22 May 2015) | 1 line Changed paths:

  M /trunk/sim-recon/src/programs/Utilities/plugins/HLDetectorTiming/SConscript

Add directives for RootSpy macros


r18506 | mstaib | 2015-05-22 11:26:43 -0400 (Fri, 22 May 2015) | 1 line Changed paths:

  D /trunk/sim-recon/src/programs/Utilities/plugins/HLDetectorTiming/test

remove outdated script


r18507 | mstaib | 2015-05-22 11:35:11 -0400 (Fri, 22 May 2015) | 1 line Changed paths:

  A /trunk/sim-recon/src/programs/Utilities/plugins/HLDetectorTiming/FitScripts
  A /trunk/sim-recon/src/programs/Utilities/plugins/HLDetectorTiming/FitScripts/ExtractTDCADCTiming.C
  A /trunk/sim-recon/src/programs/Utilities/plugins/HLDetectorTiming/FitScripts/ExtractTrackBasedTiming.C

ROOT scripts used for extracting timing offsets from histograms


r18508 | mstaib | 2015-05-22 11:37:08 -0400 (Fri, 22 May 2015) | 1 line Changed paths:

  M /trunk/sim-recon/src/programs/Utilities/plugins/HLDetectorTiming/JEventProcessor_HLDetectorTiming.cc
  D /trunk/sim-recon/src/programs/Utilities/plugins/HLDetectorTiming/README

README will never be up to date...removing


r18513 | jonesrt | 2015-05-25 10:51:43 -0400 (Mon, 25 May 2015) | 12 lines Changed paths:

  M /trunk/sim-recon/src/programs/Simulation/bggen/code/bg_ctrl.inc
  M /trunk/sim-recon/src/programs/Simulation/bggen/code/bg_ini.F
  M /trunk/sim-recon/src/programs/Simulation/bggen/code/cobrems.F
  M /trunk/sim-recon/src/programs/Simulation/bggen/code/cobrems.inc
  M /trunk/sim-recon/src/programs/Simulation/bggen/code/cohbeam_ini.F
  • cohbeam_ini.F, bg_ini.F, bg_ctrl.inc [rtj]
  - adjust to updated version of cobrems.F with new inputs
    for the electron beam emittance and the radiator thickness.
  - add new input file commands:
    1) EEMIT nnn : sets electron beam emittance to nnn (m.rad)
    2) RADTHICK nnn : sets diamond radiator thickness (m)
  • cobrems.F, cobrems.inc
  - updated to the latest revision with new input arguments
    to allow the user to set the electron beam emittance and
    radiator thickness.

r18514 | jonesrt | 2015-05-25 11:12:09 -0400 (Mon, 25 May 2015) | 8 lines Changed paths:

  M /trunk/sim-recon/src/programs/Simulation/HDGeant/cobrems.F
  M /trunk/sim-recon/src/programs/Simulation/HDGeant/cobrems.inc
  M /trunk/sim-recon/src/programs/Simulation/HDGeant/control.in
  M /trunk/sim-recon/src/programs/Simulation/HDGeant/uginit.F
  • cobrems.F, cobrems.inc [rtj]
  - bring up to date with the latest version, adds new input arguments
    to let the user specify electron beam emittance and radiator thickness.
  • uginit.F, control.in [rtj]
  - extend the BEAM card to allow two new fields to specify beam emittance
    and radiator thickness. If these field are left blank then default
    values are used, for backward compatibility with old control files.

r18515 | jonesrt | 2015-05-25 11:13:55 -0400 (Mon, 25 May 2015) | 4 lines Changed paths:

  M /trunk/sim-recon/src/programs/Simulation/bggen/code/cobrems.F
  • cobrems.F [rtj]
  - get rid of tabs because the fortran compiler is confused by them unless
    they appear at the beginning of a line.

r18516 | jonesrt | 2015-05-25 11:16:27 -0400 (Mon, 25 May 2015) | 4 lines Changed paths:

  M /trunk/sim-recon/src/programs/Simulation/HDGeant/control.in
  M /trunk/sim-recon/src/programs/Simulation/HDGeant/gustep.F
  • control.in [rtj]
  - fix a comment to make it clear what the Emin parameter means
    in the BGRATE card

r18517 | jonesrt | 2015-05-25 11:20:12 -0400 (Mon, 25 May 2015) | 5 lines Changed paths:

  M /trunk/sim-recon/src/programs/Simulation/HDGeant/gustep.F
  • gustep.F [rtj]
  - rolling back the update accidentally applied to gustep.F during my recent
    checkin of changes to control.in -- I doubt anyone wants this flag
    BACKGROUND_PROFILING to be turned on in their builds!

r18518 | jonesrt | 2015-05-25 12:14:43 -0400 (Mon, 25 May 2015) | 4 lines Changed paths:

  M /trunk/sim-recon/src/programs/Simulation/bggen/code/cobrems.F
  • cobrems.F [rtj]
  - Update the default electron beam energy width from 6MeV to
    60keV, I think the old value was a typo.

r18519 | jonesrt | 2015-05-25 12:17:22 -0400 (Mon, 25 May 2015) | 4 lines Changed paths:

  M /trunk/sim-recon/src/programs/Simulation/HDGeant/cobrems.F
  • cobrems.F [rtj]
  - Updated the (presently hard-coded) value for the electron beam energy
    spread RMS, was formerly set to 6 MeV but I think it should be 6 keV.

r18520 | jonesrt | 2015-05-25 12:18:46 -0400 (Mon, 25 May 2015) | 4 lines Changed paths:

  M /trunk/sim-recon/src/programs/Simulation/HDGeant/uginit.F
  • uginit.F [rtj]
  - extended the definition of the BEAM card to 7 instead of 5 parameters,
    otherwise it was not able to read the last 2 that I just added.

r18521 | jonesrt | 2015-05-25 14:22:49 -0400 (Mon, 25 May 2015) | 4 lines Changed paths:

  M /trunk/sim-recon/src/programs/Simulation/HDGeant/hitTag.c
  • hitTag.c [rtj]
  - broaden the time window for accepted tags to [-200,200] ns from [-20,20] ns
    to enable more complete tagging studies

r18522 | jonesrt | 2015-05-25 14:25:21 -0400 (Mon, 25 May 2015) | 7 lines Changed paths:

  M /trunk/sim-recon/src/programs/Simulation/HDGeant/cobrems.F
  • cobrems.F [rtj]
  - collimator acceptance should be turned off in hdgeant generator because
    it is implicit in the simulation (beam is generated upstream of collimator)
  - comment out redundant code
  - restore some safety logic that got wiped out from an earlier version
  - clean up printout

r18523 | jonesrt | 2015-05-25 14:28:04 -0400 (Mon, 25 May 2015) | 4 lines Changed paths:

  M /trunk/sim-recon/src/programs/Simulation/bggen/code/cobrems.F
  • cobrems.F [rtj]
  - comment out some redundant code
  - improve formatting of output

r18525 | pmatt | 2015-05-26 11:28:11 -0400 (Tue, 26 May 2015) | 3 lines Changed paths:

  M /trunk/sim-recon/src/libraries/ANALYSIS/DAnalysisAction.h
  M /trunk/sim-recon/src/libraries/ANALYSIS/DAnalysisResults_factory.cc
  M /trunk/sim-recon/src/libraries/ANALYSIS/DAnalysisResults_factory_PreKinFit.cc
  M /trunk/sim-recon/src/libraries/ANALYSIS/DParticleCombo_factory_PreKinFit.cc

If no output ROOT file detected, print error message and abort.



r18527 | staylor | 2015-05-26 13:54:43 -0400 (Tue, 26 May 2015) | 1 line Changed paths:

  M /trunk/sim-recon/src/libraries/TRACKING/DReferenceTrajectory.cc
  M /trunk/sim-recon/src/libraries/TRACKING/DReferenceTrajectory.h

Add additional argument to FindPlaneCrossing to allow for starting at any step along the reference trajectory, as opposed to step 0. Fix problem projecting track to a plane that is beyond the extent of the magnetic field map.


r18528 | sdobbs | 2015-05-26 14:05:43 -0400 (Tue, 26 May 2015) | 1 line Changed paths:

  M /trunk/sim-recon/src/programs/Simulation/genpi/genmu+mu-.cc
  M /trunk/sim-recon/src/programs/Simulation/genpi/genpi+pi-.cc
  M /trunk/sim-recon/src/programs/Simulation/genpi/genpi.cc
  M /trunk/sim-recon/src/programs/Simulation/genpi/genpi0.cc

Add setting run number as command line parameter.


r18531 | jonesrt | 2015-05-26 16:20:30 -0400 (Tue, 26 May 2015) | 24 lines Changed paths:

  M /trunk/sim-recon/src/programs/Utilities/hddm/hddm-cpp.cpp
  M /trunk/sim-recon/src/programs/Utilities/hddm/hddm-xml.cpp
  • hddm-cpp.cpp, hddm-xml.cpp [rtj]
  - Both of these patches are done to handle a bug in the xstream library
    in the way it computes the data integrity crc check. The original version
    of digest.cpp in that package had a double call to pbump(1) every time 
    another buffer of the data record was passed through the checker. The
    effect of this was to inject a garbage character into the stream at the
    end of every buffer (4096 bytes in the original version). This came to
    light as soon as I increased the buffer size from 4096. The bug was
    hidden before because each subsequent buffer wrote over the previous
    copy in memory, so that the same garbage character was injected each
    time the integrity check was computed, either on output (for recording
    at the end of the record in the file) or on input (for checking against
    the recorded value). The bug is fixed, but now all data files that were
    written prior to today with integrity checks on will have bad crc values
    in the file. The following tools all have integrity checks turned on by
    default: mcsmear, the danarest plugin, the danahddm plugin. For now a
    warning message is printed, but processing proceeds. At some point this
    needs to transition back to being a fatal error.
  - To get this patch to work with minimal effort on an existing build of
    sim-recon, "svn update" and then from the top-level src directory do:
          $ rm .Linux*/library/HDDM/hddm*
          $ scons install
    

r18532 | mstaib | 2015-05-26 16:42:25 -0400 (Tue, 26 May 2015) | 1 line Changed paths:

  M /trunk/sim-recon/src/programs/Utilities/plugins/HLDetectorTiming/HistogramTools.cc
  M /trunk/sim-recon/src/programs/Utilities/plugins/HLDetectorTiming/HistogramTools.h

Ensure we are in the base directory before making histograms


r18535 | jonesrt | 2015-05-26 17:27:50 -0400 (Tue, 26 May 2015) | 36 lines Changed paths:

  M /trunk/sim-recon/src/external/xstream/include/xstream/base64.h
  M /trunk/sim-recon/src/external/xstream/include/xstream/bz.h
  M /trunk/sim-recon/src/external/xstream/include/xstream/common.h
  M /trunk/sim-recon/src/external/xstream/include/xstream/dater.h
  M /trunk/sim-recon/src/external/xstream/include/xstream/digest.h
  M /trunk/sim-recon/src/external/xstream/include/xstream/except/base64.h
  M /trunk/sim-recon/src/external/xstream/include/xstream/except/bz.h
  M /trunk/sim-recon/src/external/xstream/include/xstream/except/posix.h
  M /trunk/sim-recon/src/external/xstream/include/xstream/except/z.h
  M /trunk/sim-recon/src/external/xstream/include/xstream/except.h
  M /trunk/sim-recon/src/external/xstream/include/xstream/fd.h
  M /trunk/sim-recon/src/external/xstream/include/xstream/posix.h
  M /trunk/sim-recon/src/external/xstream/include/xstream/tee.h
  M /trunk/sim-recon/src/external/xstream/include/xstream/xdr.h
  M /trunk/sim-recon/src/external/xstream/include/xstream/z.h
  M /trunk/sim-recon/src/external/xstream/src/base64.cpp
  M /trunk/sim-recon/src/external/xstream/src/bz.cpp
  M /trunk/sim-recon/src/external/xstream/src/common.cpp
  M /trunk/sim-recon/src/external/xstream/src/dater.cpp
  M /trunk/sim-recon/src/external/xstream/src/debug.cpp
  M /trunk/sim-recon/src/external/xstream/src/debug.h
  M /trunk/sim-recon/src/external/xstream/src/digest.cpp
  M /trunk/sim-recon/src/external/xstream/src/fd.cpp
  M /trunk/sim-recon/src/external/xstream/src/md5.cpp
  M /trunk/sim-recon/src/external/xstream/src/posix.cpp
  M /trunk/sim-recon/src/external/xstream/src/tee.cpp
  M /trunk/sim-recon/src/external/xstream/src/xdr.cpp
  M /trunk/sim-recon/src/external/xstream/src/z.cpp
  M /trunk/sim-recon/src/external/xstream/src/z_digest.cpp
  • line-by-line overhaul of xstream library [rtj]
  - Every header file and every cpp file that implements some subclass of
    the std iostream library is touched in this overhaul.
  - It was prompted by David Lawrence noticing that one of the virtual methods
    xsputn of a std::streambuf subclass was missing the const modifier on its
    first argument, so that it was never actually called. This turned out to
    be repeated elsewhere, so that large portions of the library code were not
    actually being executed by user applications. Instead, the default code in
    the stl base streambuf class was being executed, which ***worked*** but...
    as it says in the stl docs, users WILL want to override these methods. For
    example, in the current code every time a record is sent to an output file,
    it gets copied one byte at a time to the output file object by individual
    calls to the sputc(char c) method. Needless to say, this is not what we
    want.
  - As soon as David Lawrence changed the signature on the virtual methods in
    the xstream streambuf classes to match the stl standard so that they were
    actually being executed, then the code started generating errors -- what
    does one expect for code that has never been tested?!?
  - Fortunately the documentation for the stl class interfaces are very clear
    which makes it easy to find and fix the bugs. I went through and fixed
    many logical errors and signature mismatches that existed in the code,
    including:
         *) non-const arguments that should be const;
         *) const arguments that should be non-const;
         *) pass-by-value args that were specified as const,
         *) std::stream and std::streambuf methods that incorrectly or
            incompletely performed their function, or failed to return the
            correct value;
         *) unnecessary copying of data between intermediate buffers;
         *) some actual bugs that resulted in exceptions being generated
            in response to valid i/o requests on valid data streams.
  - Least of all, the new code gets rid of the compiler warnings about
    methods in a derived class hiding others in the base class with a
    different signature, which usually indicates a programming error.
     

r18536 | mstaib | 2015-05-26 18:04:30 -0400 (Tue, 26 May 2015) | 1 line Changed paths:

  M /trunk/sim-recon/src/programs/Utilities/plugins/HLDetectorTiming/JEventProcessor_HLDetectorTiming.cc

Grab DRFTime object when available


r18541 | jrsteven | 2015-05-27 12:43:07 -0400 (Wed, 27 May 2015) | 1 line Changed paths:

  M /trunk/sim-recon/src/programs/Simulation/HDGeant/hitTag.c

Remove hardcoded mc context for calls to ccdb retrieving tagger energy bins. This is required to use different ccdb contexts, such as mc_6gev to get the right endpoint energy for spring 2015 simulations.


r18543 | sdobbs | 2015-05-27 12:59:26 -0400 (Wed, 27 May 2015) | 1 line Changed paths:

  M /trunk/sim-recon/src/programs/Simulation/HDGeant/settofg.F

Removed hardcoded mc context when getting the RF period from CCDB.


r18544 | beattite | 2015-05-27 14:31:25 -0400 (Wed, 27 May 2015) | 1 line Changed paths:

  M /trunk/sim-recon/src/libraries/BCAL/BCAL_init.cc

Added DBCALShower factory with tag CURVATURE


r18545 | beattite | 2015-05-27 14:34:34 -0400 (Wed, 27 May 2015) | 1 line Changed paths:

  A /trunk/sim-recon/src/libraries/BCAL/DBCALShower_factory_CURVATURE.cc
  A /trunk/sim-recon/src/libraries/BCAL/DBCALShower_factory_CURVATURE.h

Added DBCALShower factory with tag CURVATURE


r18546 | beattite | 2015-05-27 14:44:14 -0400 (Wed, 27 May 2015) | 1 line Changed paths:

  M /trunk/sim-recon/src/programs/Simulation/HDGeant/hitBCal.cc
  M /trunk/sim-recon/src/programs/Simulation/mcsmear/mcsmear.cc
  M /trunk/sim-recon/src/programs/Simulation/mcsmear/smear.cc
  M /trunk/sim-recon/src/programs/Simulation/mcsmear/smear_bcal.cc

MAJOR MCSMEAR REVISION: Removed time histograms from HDGeant. Mcsmear now uses single energies and times for BCAL hits


r18549 | staylor | 2015-05-27 15:50:34 -0400 (Wed, 27 May 2015) | 1 line Changed paths:

  M /trunk/sim-recon/src/programs/Simulation/HDGeant/hitCDC.c

Remove hard-coded variation BField1200A from calls to get cdc drift table parameters.