Merge branch 'master' of https://eicweb.phy.anl.gov/EIC/NPDet

.gitignore

CMakeLists.txt

src/ConceptDetectors/SiEIC/compact/sieic_magnet.xml

src/ConceptDetectors/SiEIC/compact/sieic_modified.xml

src/ConceptDetectors/SiEIC/compact/sieic_vis.png

src/ConceptDetectors/SiEIC/compact/sieic_vis_angled.png

...ceptDetectors/SiEIC/compact/sieic_vis_angledNoOverlay.png

src/ConceptDetectors/SiEIC/compact/simple_sieic.xml

src/ConceptDetectors/SoLID/compact/gps.mac

src/ConceptDetectors/SoLID/compact/run_example

...eptDetectors/SoLID/compact/solid_components/materials.xml

src/ConceptDetectors/SoLID/compact/solid_pvdis.xml

src/ConceptDetectors/SoLID/compact/solid_sidis.xml

src/ConceptDetectors/SoLID/src/EMCalorimeterSOLID_geo.cpp

src/ConceptDetectors/SoLID/src/StandInGeometrySOLID_geo.cpp

src/GenericDetectors/CMakeLists.txt

src/GenericDetectors/beamline/compact/IRChamber_example.xml

src/GenericDetectors/beamline/compact/eic/B0pF_example.xml

src/GenericDetectors/beamline/compact/eic/fields.xml

...enericDetectors/beamline/compact/eic_beamline_example.xml