From c84e1c6647f4283ce823ebe39d8c49ef71a42648 Mon Sep 17 00:00:00 2001 From: sophieMu2e Date: Thu, 20 Jul 2023 10:21:41 -0500 Subject: [PATCH 001/213] stashing --- Analyses/fcl/prolog.fcl | 27 ++ Analyses/fcl/runCRYDigi.fcl | 22 ++ Analyses/fcl/runCRYGen.fcl | 21 ++ Analyses/src/CRYGenPlots_module.cc | 119 +++++---- Analyses/src/PhotonAna_module.cc | 108 ++++++++ Analyses/src/PhotonGenPlots_module.cc | 252 ++++++++++++++++++ Analyses/src/SConscript | 1 + TrackerConditions/inc/DriftInfo.hh | 3 +- TrkPatRec/fcl/prolog.fcl | 8 +- .../src/PhotonConversionFinder_module.cc | 99 +++++++ 10 files changed, 606 insertions(+), 54 deletions(-) create mode 100644 Analyses/fcl/runCRYDigi.fcl create mode 100644 Analyses/fcl/runCRYGen.fcl create mode 100644 Analyses/src/PhotonAna_module.cc create mode 100644 Analyses/src/PhotonGenPlots_module.cc create mode 100644 TrkPatRec/src/PhotonConversionFinder_module.cc diff --git a/Analyses/fcl/prolog.fcl b/Analyses/fcl/prolog.fcl index 50d0e65c8c..16d509243a 100644 --- a/Analyses/fcl/prolog.fcl +++ b/Analyses/fcl/prolog.fcl @@ -22,11 +22,22 @@ TrackSummaryMaker: { trackInput : "TrkPatRec:DeM" } +CRYGenPlots : { + module_type : CRYGenPlots + CRYModuleLabel : "compressDetStepMCs" + CRYInstanceName : "Primary" +} + CaloClusterCompareNew : { module_type : CaloClusterCompare CaloClusterCollection : CaloClusterOnline } +PhotonAna : { + module_type : PhotonAna + KalSeedCollection : "TTKSFDeM:Digitize" +} + CaloClusterCompareOld : { module_type : CaloClusterCompare CaloClusterCollection : CaloClusterFast @@ -82,6 +93,22 @@ ClusterCompareNew : Analysis : [CaloClusterCompareNew] } +PhotonAnalysis : +{ + analyzers : { + PhotonAna : @local::PhotonAna + } + Analysis : [PhotonAna] +} + +CRYAnalysis : +{ + analyzers : { + CRYGenPlots : @local::CRYGenPlots + } + Analysis : [CRYGenPlots] +} + ClusterCompareOld : { analyzers : { diff --git a/Analyses/fcl/runCRYDigi.fcl b/Analyses/fcl/runCRYDigi.fcl new file mode 100644 index 0000000000..a3b01ad02b --- /dev/null +++ b/Analyses/fcl/runCRYDigi.fcl @@ -0,0 +1,22 @@ +# author : Sophie Middleton +# purpose : example for cry analysis +#include "Offline/fcl/minimalMessageService.fcl" +#include "Offline/fcl/standardProducers.fcl" +#include "Offline/fcl/standardServices.fcl" +#include "Offline/Analyses/fcl/prolog.fcl" + +services : @local::Services.Reco + +process_name : CRYGenPlots + +source : { module_type : RootInput } + +physics : +{ + analyzers : { @table::CRYAnalysis.analyzers} +} +physics.EndPath : [ @sequence::CRYAnalysis.Analysis] + +physics.analyzers.CRYAnalysis.CRYModuleLabel : "compressDigiMCs" +services.TFileService.fileName: "nts.owner.CRYAnalysisDigi.version.sequencer.root" +services.GeometryService.inputFile: "Offline/Mu2eG4/geom/geom_common_extracted.txt" diff --git a/Analyses/fcl/runCRYGen.fcl b/Analyses/fcl/runCRYGen.fcl new file mode 100644 index 0000000000..0e2f9742bd --- /dev/null +++ b/Analyses/fcl/runCRYGen.fcl @@ -0,0 +1,21 @@ +# author : Sophie Middleton +# purpose : example for cry analysis +#include "Offline/fcl/minimalMessageService.fcl" +#include "Offline/fcl/standardProducers.fcl" +#include "Offline/fcl/standardServices.fcl" +#include "Offline/Analyses/fcl/prolog.fcl" + +services : @local::Services.Reco + +process_name : CRYGenPlots + +source : { module_type : RootInput } + +physics : +{ + analyzers : { @table::CRYAnalysis.analyzers} +} +physics.EndPath : [ @sequence::CRYAnalysis.Analysis] + +services.TFileService.fileName: "nts.owner.CRYAnalysis.version.sequencer.root" +services.GeometryService.inputFile: "Offline/Mu2eG4/geom/geom_common_extracted.txt" diff --git a/Analyses/src/CRYGenPlots_module.cc b/Analyses/src/CRYGenPlots_module.cc index 1028f6fe5d..6d177ce613 100644 --- a/Analyses/src/CRYGenPlots_module.cc +++ b/Analyses/src/CRYGenPlots_module.cc @@ -1,11 +1,3 @@ -//////////////////////////////////////////////////////////////////////// -// Class: CRYGenPlots -// Plugin Type: analyzer (art v2_10_04) -// File: CRYGenPlots_module.cc -// -// Generated at Wed Jun 27 18:05:40 2018 by Hoai Nam Tran using cetskelgen -// from cetlib version v3_02_01. -//////////////////////////////////////////////////////////////////////// #include "art/Framework/Core/EDAnalyzer.h" #include "art/Framework/Principal/Event.h" @@ -24,6 +16,7 @@ #include "Offline/GlobalConstantsService/inc/PhysicsParams.hh" #include "Offline/GlobalConstantsService/inc/ParticleDataList.hh" #include "Offline/MCDataProducts/inc/GenParticle.hh" +#include "Offline/Mu2eUtilities/inc/TwoLinePCA.hh" #include "Offline/Mu2eUtilities/inc/compressPdgId.hh" #include "Offline/DataProducts/inc/PDGCode.hh" @@ -61,46 +54,47 @@ class mu2e::CRYGenPlots : public art::EDAnalyzer { std::string processName_; std::string CRYModuleLabel_; std::string CRYInstanceName_; - double _keMax; + float _keMax = std::numeric_limits::max(); // histograms - TH2F *_hXZ; - TH1F *_hY; - TH1F *_hKE; - TH1F *_hTheta; - TH1F *_hPhi; - TH1F *_hPmag; - TH1F *_hPyOverPmag; - TH1F *_hTime; - TH2F *_hPtypeKE; - TH1F *_hNSecondaries; - - TTree *_cosmicTree; - - float _x; - float _y; - float _z; - float _px; - float _py; - float _pz; - float _theta; - float _phi; - float _KE; - float _p; - float _t; - int _pdgId; + TH2F *_hXZ = nullptr; + TH1F *_hY = nullptr; + TH1F *_hKE = nullptr; + TH1F *_hTheta = nullptr; + TH1F *_hPhi = nullptr; + TH1F *_hPmag = nullptr; + TH1F *_hPyOverPmag = nullptr; + TH1F *_hTime = nullptr; + TH2F *_hPtypeKE = nullptr; + TH1F *_hNSecondaries = nullptr; + + TTree *_cosmicTree = nullptr; + TTree *_eventTree = nullptr; + + float _x = std::numeric_limits::lowest(); + float _y = std::numeric_limits::lowest(); + float _z = std::numeric_limits::lowest(); + float _px = std::numeric_limits::lowest(); + float _py = std::numeric_limits::lowest(); + float _pz = std::numeric_limits::lowest(); + float _theta = std::numeric_limits::lowest(); + float _phi = std::numeric_limits::lowest(); + float _KE = std::numeric_limits::lowest(); + float _p = std::numeric_limits::lowest(); + float _t = std::numeric_limits::lowest(); + std::vector _dca; + PDGCode::type _pdgId; void bookHists(art::ServiceHandle &); GlobalConstantsHandle pdt; }; - - mu2e::CRYGenPlots::CRYGenPlots(fhicl::ParameterSet const & p) -: EDAnalyzer(p) - , processName_(p.get("processName", "")) - , CRYModuleLabel_(p.get("CRYModuleLabel", "cryGen")) - , CRYInstanceName_(p.get("CRYInstanceName", "")) - , _keMax(p.get("keMax", 10E3)) +mu2e::CRYGenPlots::CRYGenPlots(fhicl::ParameterSet const &p) + : EDAnalyzer(p), + processName_(p.get("processName", "")), + CRYModuleLabel_(p.get("CRYModuleLabel", "FromCRYBinary")), + CRYInstanceName_(p.get("CRYInstanceName", "")), + _keMax(p.get("keMax", 10E3)) { art::ServiceHandle tfs; @@ -120,6 +114,9 @@ class mu2e::CRYGenPlots : public art::EDAnalyzer { _cosmicTree->Branch("p", &_p, "p/F"); _cosmicTree->Branch("t", &_t, "t/F"); _cosmicTree->Branch("pdgId", &_pdgId, "pdgId/I"); + + _eventTree = tfs->make("eventTree", "TTree with cosmic ray info per shower"); + _eventTree->Branch("dca", &_dca); } @@ -132,13 +129,41 @@ void mu2e::CRYGenPlots::analyze(art::Event const & e) success = e.getByLabel(CRYModuleLabel_, CRYInstanceName_, processName_, gpHandle); else - success = e.getByLabel(CRYModuleLabel_, CRYInstanceName_, gpHandle); + success = e.getByLabel(CRYModuleLabel_, gpHandle); if (!success) return; const auto & particles = *gpHandle; + + // Store the point of closest approach between target box and roof for + // events with more than one particle + _dca.clear(); + for (GenParticleCollection::const_iterator i = particles.begin(); i != particles.end(); ++i) + { + for (GenParticleCollection::const_iterator j = i+1; j != particles.end(); ++j) + { + GenParticle const &particle1 = *i; + GenParticle const &particle2 = *j; + + TwoLinePCA twoLine(particle1.position(), -particle1.momentum().vect(), particle2.position(), -particle2.momentum().vect()); + const CLHEP::Hep3Vector point1 = twoLine.point1(); + const CLHEP::Hep3Vector point2 = twoLine.point2(); + + + if (point1.y() > 5000 && + point1.y() < 15365.4 && + point2.y() > 5000 && + point2.y() < 15365.4) + { + _dca.push_back(twoLine.dca()); + } + } + } + _eventTree->Fill(); + _hNSecondaries->Fill(particles.size()); + for(const auto & p : particles) { _hXZ->Fill(p.position().x(), p.position().z()); @@ -169,7 +194,6 @@ void mu2e::CRYGenPlots::analyze(art::Event const & e) _theta = yMom3.theta(); _phi = yMom3.phi(); - _KE = mom4.e() - mass; _p = mom3.mag(); @@ -178,17 +202,8 @@ void mu2e::CRYGenPlots::analyze(art::Event const & e) _pdgId = p.pdgId(); _cosmicTree->Fill(); - _hKE->Fill(mom4.e() - mass); - _hTheta->Fill(yMom3.theta()); - _hPhi->Fill(yMom3.phi()); - - _hPmag->Fill(mom3.mag()); - _hTime->Fill(p.time()); - _hPyOverPmag->Fill(mom4.py() / mom3.mag()); - int pbin = compressPdgIdCosmic(p.pdgId()); _hPtypeKE->Fill(mom4.e(), pbin); - } } diff --git a/Analyses/src/PhotonAna_module.cc b/Analyses/src/PhotonAna_module.cc new file mode 100644 index 0000000000..45fcb3608a --- /dev/null +++ b/Analyses/src/PhotonAna_module.cc @@ -0,0 +1,108 @@ +// +// TODO: This file will analyze the outgoing photons energy, momentum and position by looking at the indicent electron/positron +// Original author S. Middleton and H. Jafree +// + +#include "fhiclcpp/ParameterSet.h" +#include "art/Framework/Core/EDAnalyzer.h" +#include "art/Framework/Principal/Event.h" +#include "art/Framework/Principal/Handle.h" +#include "art_root_io/TFileService.h" + +#include "Offline/ProditionsService/inc/ProditionsHandle.hh" + +#include "Offline/GeometryService/inc/GeomHandle.hh" +#include "Offline/GeometryService/inc/DetectorSystem.hh" +#include "Offline/TrackerGeom/inc/Tracker.hh" +#include "Offline/RecoDataProducts/inc/KalSeed.hh" + +#include "CLHEP/Units/PhysicalConstants.h" +#include "CLHEP/Matrix/Vector.h" +#include "CLHEP/Matrix/SymMatrix.h" + +#include +#include +#include +#include +#include +#include +#include +#include +#include + +//ROOT +#include "TStyle.h" +#include "Rtypes.h" +#include "TH1F.h" +#include "TCanvas.h" +#include "TH2F.h" +#include "TLegend.h" +#include "TTree.h" +#include "TLatex.h" +#include "TGraph.h" +#include "TProfile.h" +using namespace std; +namespace mu2e{ + + class PhotonAna : public art::EDAnalyzer { + public: + struct Config { + using Name=fhicl::Name; + using Comment=fhicl::Comment; + fhicl::Atom diag{Name("diag"), Comment("Create diag histograms"),0}; + fhicl::Atom KalToken{Name("KalSeedCollection"),Comment("tag for kal seed collection")}; + }; + typedef art::EDAnalyzer::Table Parameters; + explicit PhotonAna(const Parameters& conf); + virtual ~PhotonAna(){}; + virtual void beginJob() override; + virtual void analyze(const art::Event& e); + + private: + + Config _conf; + int _diag; + art::InputTag _KalToken; + const KalSeedCollection* _KalCol; + + TTree* _photon_analyzer; + Float_t _pathlength; + + }; + + PhotonAna::PhotonAna(const Parameters& conf) : + art::EDAnalyzer(conf), + _diag(conf().diag()), + _KalToken(conf().KalToken()) + {} + + + void PhotonAna::beginJob() { //TODO - can add TTree and THistograms here if required + if(_diag > 0){ + art::ServiceHandle tfs; + _photon_analyzer=tfs->make("photon_analyzer"," Diagnostics for Photon Conversion Track Fitting"); + _photon_analyzer->Branch("PathLength", &_pathlength, "PathLength/F"); + } + } + + using LHPT = KinKal::PiecewiseTrajectory; + void PhotonAna::analyze(const art::Event& event) { + auto kalH = event.getValidHandle(_KalToken); + _KalCol = kalH.product(); + for(unsigned int k = 0; k < _KalCol->size(); k++){ + KalSeed kseed = (*_KalCol)[k]; + if(kseed.loopHelixFit()){ + std::unique_ptr trajectory = kseed.loopHelixFitTrajectory(); + double t1 = trajectory->range().begin(); + double x1 = trajectory->position3(t1).x(); + double y1 = trajectory->position3(t1).y(); + double z1 = trajectory->position3(t1).z(); + _pathlength = sqrt((x1)*(x1)+(y1)*(y1)+(z1)*(z1)); + _photon_analyzer->Fill(); + } + } + } + +}//end mu2e namespace +using mu2e::PhotonAna; +DEFINE_ART_MODULE(PhotonAna); diff --git a/Analyses/src/PhotonGenPlots_module.cc b/Analyses/src/PhotonGenPlots_module.cc new file mode 100644 index 0000000000..940b897b7f --- /dev/null +++ b/Analyses/src/PhotonGenPlots_module.cc @@ -0,0 +1,252 @@ + +#include "art/Framework/Core/EDAnalyzer.h" +#include "art/Framework/Principal/Event.h" +#include "art/Framework/Principal/Handle.h" +#include "art/Framework/Principal/Run.h" +#include "art/Framework/Principal/SubRun.h" +#include "art_root_io/TFileService.h" +#include "art/Framework/Services/Registry/ServiceHandle.h" +#include "art/Framework/Services/Registry/ServiceDefinitionMacros.h" + +#include "canvas/Utilities/InputTag.h" +#include "fhiclcpp/ParameterSet.h" +#include "messagefacility/MessageLogger/MessageLogger.h" + +#include "Offline/GlobalConstantsService/inc/GlobalConstantsHandle.hh" +#include "Offline/GlobalConstantsService/inc/PhysicsParams.hh" +#include "Offline/GlobalConstantsService/inc/ParticleDataList.hh" +#include "Offline/MCDataProducts/inc/GenParticle.hh" +#include "Offline/Mu2eUtilities/inc/TwoLinePCA.hh" +#include "Offline/Mu2eUtilities/inc/compressPdgId.hh" +#include "Offline/DataProducts/inc/PDGCode.hh" + +#include "TH1F.h" +#include "TH2F.h" +#include "TTree.h" +namespace mu2e { + class PhotonGenPlots; +} + +using CLHEP::Hep3Vector; +using CLHEP::HepLorentzVector; + + +class mu2e::PhotonGenPlots : public art::EDAnalyzer { + public: + explicit PhotonGenPlots(fhicl::ParameterSet const & p); + // The compiler-generated destructor is fine for non-base + // classes without bare pointers or other resource use. + + // Plugins should not be copied or assigned. + PhotonGenPlots(PhotonGenPlots const &) = delete; + PhotonGenPlots(PhotonGenPlots &&) = delete; + PhotonGenPlots & operator = (PhotonGenPlots const &) = delete; + PhotonGenPlots & operator = (PhotonGenPlots &&) = delete; + + // Required functions. + void analyze(art::Event const & e) override; + + // Selected optional functions. + void beginJob() override; + void endJob() override; + + private: + std::string processName_; + std::string CRYModuleLabel_; + std::string CRYInstanceName_; + float _keMax = std::numeric_limits::max(); + + // histograms + TH2F *_hXZ = nullptr; + TH1F *_hY = nullptr; + TH1F *_hKE = nullptr; + TH1F *_hTheta = nullptr; + TH1F *_hPhi = nullptr; + TH1F *_hPmag = nullptr; + TH1F *_hPyOverPmag = nullptr; + TH1F *_hTime = nullptr; + TH2F *_hPtypeKE = nullptr; + TH1F *_hNSecondaries = nullptr; + + TTree *_cosmicTree = nullptr; + TTree *_eventTree = nullptr; + + float _x = std::numeric_limits::lowest(); + float _y = std::numeric_limits::lowest(); + float _z = std::numeric_limits::lowest(); + float _px = std::numeric_limits::lowest(); + float _py = std::numeric_limits::lowest(); + float _pz = std::numeric_limits::lowest(); + float _theta = std::numeric_limits::lowest(); + float _phi = std::numeric_limits::lowest(); + float _KE = std::numeric_limits::lowest(); + float _p = std::numeric_limits::lowest(); + float _t = std::numeric_limits::lowest(); + std::vector _dca; + PDGCode::type _pdgId; + + void bookHists(art::ServiceHandle &); + GlobalConstantsHandle pdt; +}; + +mu2e::PhotonGenPlots::PhotonGenPlots(fhicl::ParameterSet const &p) + : EDAnalyzer(p), + processName_(p.get("processName", "")), + CRYModuleLabel_(p.get("CRYModuleLabel", "FromCRYBinary")), + CRYInstanceName_(p.get("CRYInstanceName", "")), + _keMax(p.get("keMax", 10E3)) +{ + art::ServiceHandle tfs; + + bookHists(tfs); + + _cosmicTree = tfs->make("cosmicTree", "TTree with cosmic ray info"); + + _cosmicTree->Branch("x", &_x, "x/F"); + _cosmicTree->Branch("y", &_y, "y/F"); + _cosmicTree->Branch("z", &_z, "z/F"); + _cosmicTree->Branch("px", &_px, "px/F"); + _cosmicTree->Branch("py", &_py, "py/F"); + _cosmicTree->Branch("pz", &_pz, "pz/F"); + _cosmicTree->Branch("theta", &_theta, "theta/F"); + _cosmicTree->Branch("phi", &_phi, "phi/F"); + _cosmicTree->Branch("KE", &_KE, "KE/F"); + _cosmicTree->Branch("p", &_p, "p/F"); + _cosmicTree->Branch("t", &_t, "t/F"); + _cosmicTree->Branch("pdgId", &_pdgId, "pdgId/I"); + + _eventTree = tfs->make("eventTree", "TTree with cosmic ray info per shower"); + _eventTree->Branch("dca", &_dca); +} + + +void mu2e::PhotonGenPlots::analyze(art::Event const & e) +{ + art::Handle gpHandle; + bool success; + + if (processName_.length() > 0) + success = e.getByLabel(CRYModuleLabel_, CRYInstanceName_, processName_, + gpHandle); + else + success = e.getByLabel(CRYModuleLabel_, gpHandle); + + if (!success) + return; + + const auto & particles = *gpHandle; + + // Store the point of closest approach between target box and roof for + // events with more than one particle + _dca.clear(); + for (GenParticleCollection::const_iterator i = particles.begin(); i != particles.end(); ++i) + { + for (GenParticleCollection::const_iterator j = i+1; j != particles.end(); ++j) + { + GenParticle const &particle1 = *i; + GenParticle const &particle2 = *j; + + TwoLinePCA twoLine(particle1.position(), -particle1.momentum().vect(), particle2.position(), -particle2.momentum().vect()); + const CLHEP::Hep3Vector point1 = twoLine.point1(); + const CLHEP::Hep3Vector point2 = twoLine.point2(); + + + if (point1.y() > 5000 && + point1.y() < 15365.4 && + point2.y() > 5000 && + point2.y() < 15365.4) + { + _dca.push_back(twoLine.dca()); + } + } + } + _eventTree->Fill(); + + _hNSecondaries->Fill(particles.size()); + + for(const auto & p : particles) + { + _hXZ->Fill(p.position().x(), p.position().z()); + _hY->Fill(p.position().y()); + + const ParticleData& p_data = pdt->particle(p.pdgId()); + double mass = p_data.mass(); // in MeV + + HepLorentzVector mom4 = p.momentum(); + Hep3Vector mom3(mom4.px(), mom4.py(), mom4.pz()); + Hep3Vector yMom3(mom4.pz(), mom4.px(), -mom4.py()); // for theta, phi + + _hKE->Fill(mom4.e() - mass); + _hTheta->Fill(yMom3.theta()); + _hPhi->Fill(yMom3.phi()); + + _hPmag->Fill(mom3.mag()); + _hTime->Fill(p.time()); + _hPyOverPmag->Fill(mom4.py() / mom3.mag()); + + _x = p.position().x(); + _y = p.position().y(); + _z = p.position().z(); + + _px = mom4.px(); + _py = mom4.py(); + _pz = mom4.pz(); + + _theta = yMom3.theta(); + _phi = yMom3.phi(); + _KE = mom4.e() - mass; + _p = mom3.mag(); + + _t = p.time(); + + _pdgId = p.pdgId(); + _cosmicTree->Fill(); + + int pbin = compressPdgIdCosmic(p.pdgId()); + _hPtypeKE->Fill(mom4.e(), pbin); + } + +} + +void mu2e::PhotonGenPlots::beginJob() +{ + // Implementation of optional member function here. +} + +void mu2e::PhotonGenPlots::endJob() +{ + // Implementation of optional member function here. +} + +void mu2e::PhotonGenPlots::bookHists(art::ServiceHandle &tfs) +{ + + _hXZ = tfs->make("XZ", "XZ", 500, -2.0e5, 2.0e5, 500, -2.0e5, 2.0e5 ); + _hY = tfs->make("Y", "Y", 500, -15.0e3, 21.0e3 ); + + _hKE = tfs->make("E", "E", 2000, 0, _keMax); + _hTheta = tfs->make("Theta", "Theta", + 200, -M_PI - 0.5, M_PI + 0.5); + _hPhi = tfs->make("Phi", "Phi", + 200, -M_PI - 0.5, M_PI + 0.5); + + _hPmag = tfs->make("Pmag", "Momentum modulus", 500, 0., 2E6); + _hPyOverPmag = tfs->make("PyOverPmag", "Py/Pmag", 200, -20., 20.); + _hTime = tfs->make("Time", "Timing of secondary particles", + 1000, -1.E-3, 1E0); + + _hNSecondaries = tfs->make("nSecondaries", "Number of secondaries", + 1000, 0, 1000); + + _hPtypeKE = tfs->make("PtypeKE", "Particle type vs energy", + 2000, 0., 2E6, 8, 0, 8); + _hPtypeKE->GetYaxis()->SetBinLabel(1, "mu"); + _hPtypeKE->GetYaxis()->SetBinLabel(2, "gamma"); + _hPtypeKE->GetYaxis()->SetBinLabel(3, "electron"); + _hPtypeKE->GetYaxis()->SetBinLabel(4, "neutron"); + _hPtypeKE->GetYaxis()->SetBinLabel(5, "proton"); + _hPtypeKE->GetYaxis()->SetBinLabel(6, "pion"); + _hPtypeKE->GetYaxis()->SetBinLabel(7, "kaon"); + _hPtypeKE->GetYaxis()->SetBinLabel(8, "others"); +} +DEFINE_ART_MODULE(mu2e::PhotonGenPlots) diff --git a/Analyses/src/SConscript b/Analyses/src/SConscript index e77df8776a..97523ae595 100644 --- a/Analyses/src/SConscript +++ b/Analyses/src/SConscript @@ -64,6 +64,7 @@ helper.make_plugins( [ mainlib, 'cetlib', 'cetlib_except', 'KinKal_General', + 'KinKal_Trajectory', 'CLHEP', rootlibs, extrarootlibs, diff --git a/TrackerConditions/inc/DriftInfo.hh b/TrackerConditions/inc/DriftInfo.hh index 0b604b9ba0..664aa77b11 100644 --- a/TrackerConditions/inc/DriftInfo.hh +++ b/TrackerConditions/inc/DriftInfo.hh @@ -7,7 +7,8 @@ namespace mu2e { struct DriftInfo { double LorentzAngle_ =0; // angle for EXB effects double rDrift_ =0; // calibrated drift distance - double cDrift_ =0; // single cluster drift distance + double cDrift_ =0 + ; // single cluster drift distance double signedDriftError_ =0; // estimated error on signed drift distance (includes LR ambiguity error effects) double unsignedDriftError_ =0; // estimated error on unsigned drift distance double driftVelocity_; // instantaneous drift velocity diff --git a/TrkPatRec/fcl/prolog.fcl b/TrkPatRec/fcl/prolog.fcl index 2d204153ea..0620def13b 100644 --- a/TrkPatRec/fcl/prolog.fcl +++ b/TrkPatRec/fcl/prolog.fcl @@ -22,7 +22,13 @@ TimeCalculator : { PatRecBackground : ["Background","Noisy","Dead"] TrkFitBackground : ["Dead"] - +PhotonConversionFinder : { # TODO - add parameters + module_type : PhotonConversionFinder + diag : 0 + ComboHitCollection : "makeSH" + TimeClusterCollection : "TimeClusterFinder" + } + TimeClusterFinder : { module_type : TimeClusterFinder diff --git a/TrkPatRec/src/PhotonConversionFinder_module.cc b/TrkPatRec/src/PhotonConversionFinder_module.cc new file mode 100644 index 0000000000..cd460943fd --- /dev/null +++ b/TrkPatRec/src/PhotonConversionFinder_module.cc @@ -0,0 +1,99 @@ +// +// TODO: explain purpose +// Original author S. Middleton and H. Jafree +// + +#include "fhiclcpp/ParameterSet.h" +#include "art/Framework/Principal/Event.h" +#include "fhiclcpp/ParameterSet.h" +#include "art/Framework/Principal/Handle.h" +#include "art/Framework/Core/EDProducer.h" +#include "art_root_io/TFileService.h" +#include "art/Utilities/make_tool.h" +#include "canvas/Persistency/Common/Ptr.h" + +#include "Offline/ProditionsService/inc/ProditionsHandle.hh" + +#include "Offline/GeometryService/inc/GeomHandle.hh" +#include "Offline/GeometryService/inc/DetectorSystem.hh" +#include "Offline/TrackerGeom/inc/Tracker.hh" + +#include "Offline/RecoDataProducts/inc/ComboHit.hh" +#include "Offline/RecoDataProducts/inc/TimeCluster.hh" +#include "Offline/RecoDataProducts/inc/HelixSeed.hh" + +#include "CLHEP/Units/PhysicalConstants.h" +#include "CLHEP/Matrix/Vector.h" +#include "CLHEP/Matrix/SymMatrix.h" + +#include +#include +#include +#include +#include +#include +#include +#include +#include + +namespace mu2e{ + + class PhotonConversionFinder : public art::EDProducer { + public: + struct Config{ + using Name=fhicl::Name; + using Comment=fhicl::Comment; + fhicl::Atom diag{Name("diag"), Comment("Create diag histograms"),0}; + fhicl::Atom chToken{Name("ComboHitCollection"),Comment("tag for straw hit collection")}; + fhicl::Atom tcToken{Name("TimeClusterCollection"),Comment("tag for time cluster collection")}; + }; + typedef art::EDProducer::Table Parameters; + explicit PhotonConversionFinder(const Parameters& conf); + virtual ~PhotonConversionFinder(){}; + virtual void beginRun(art::Run& ) override; + virtual void beginJob() override; + virtual void produce(art::Event& event ) override; + + private: + + Config _conf; + + //config parameters: + int _diag; + art::InputTag _chToken; + art::InputTag _tcToken; + + }; + + + PhotonConversionFinder::PhotonConversionFinder(const Parameters& conf) : + art::EDProducer(conf), + _diag (conf().diag()), + _chToken (conf().chToken()), + _tcToken (conf().tcToken()) + { + consumes(_chToken); + consumes(_tcToken); + produces(); + } + + void PhotonConversionFinder::beginRun(art::Run& ) {//TODO + } + + void PhotonConversionFinder::beginJob() { //TODO - can add TTree and THistograms here if required + } + + void PhotonConversionFinder::produce(art::Event& event ) { + /*auto const& chH = event.getValidHandle(_chToken); + const ComboHitCollection& chcol(*chH); + auto const& tcH = event.getValidHandle(_tcToken); + const TimeClusterCollection& tccol(*tcH);*/ + std::unique_ptr seed_col(new HelixSeedCollection()); + //TODO - this is where your algorithm will be... + event.put(std::move(seed_col)); //TODO - one per event + } + + +}//end mu2e namespace +using mu2e::PhotonConversionFinder; +DEFINE_ART_MODULE(PhotonConversionFinder); From b6c50adbc3930898e9e4e90ed8dd984ba364018b Mon Sep 17 00:00:00 2001 From: sophieMu2e Date: Mon, 18 Sep 2023 09:16:29 -0500 Subject: [PATCH 002/213] removes --- Analyses/fcl/prolog.fcl | 25 ++-- Analyses/src/PhotonAna_module.cc | 108 ------------------ DAQ/inc/CaloDAQUtilities.hh | 4 +- DAQ/src/ArtBinaryPacketsFromDigis_module.cc | 30 +++-- Filters/fcl/prolog.fcl | 1 + .../src/PhotonConversionFinder_module.cc | 99 ---------------- 6 files changed, 32 insertions(+), 235 deletions(-) delete mode 100644 Analyses/src/PhotonAna_module.cc delete mode 100644 TrkPatRec/src/PhotonConversionFinder_module.cc diff --git a/Analyses/fcl/prolog.fcl b/Analyses/fcl/prolog.fcl index 16d509243a..0e0a125404 100644 --- a/Analyses/fcl/prolog.fcl +++ b/Analyses/fcl/prolog.fcl @@ -17,17 +17,16 @@ PrintStrawHits : { makeSHinstance : "CosmicFilter" } +KalSeedCount : { + module_type : ExampleFilter + debugLevel : 0 +} + TrackSummaryMaker: { module_type: TrackSummaryMaker trackInput : "TrkPatRec:DeM" } -CRYGenPlots : { - module_type : CRYGenPlots - CRYModuleLabel : "compressDetStepMCs" - CRYInstanceName : "Primary" -} - CaloClusterCompareNew : { module_type : CaloClusterCompare CaloClusterCollection : CaloClusterOnline @@ -35,7 +34,7 @@ CaloClusterCompareNew : { PhotonAna : { module_type : PhotonAna - KalSeedCollection : "TTKSFDeM:Digitize" + MCTrajectoryCollection : compressDigiMCs } CaloClusterCompareOld : { @@ -98,15 +97,11 @@ PhotonAnalysis : analyzers : { PhotonAna : @local::PhotonAna } - Analysis : [PhotonAna] -} - -CRYAnalysis : -{ - analyzers : { - CRYGenPlots : @local::CRYGenPlots + filters : { + KalSeedCount : @local::KalSeedCount } - Analysis : [CRYGenPlots] + Analysis : [PhotonAna] + Filter : [KalSeedCount] } ClusterCompareOld : diff --git a/Analyses/src/PhotonAna_module.cc b/Analyses/src/PhotonAna_module.cc deleted file mode 100644 index 45fcb3608a..0000000000 --- a/Analyses/src/PhotonAna_module.cc +++ /dev/null @@ -1,108 +0,0 @@ -// -// TODO: This file will analyze the outgoing photons energy, momentum and position by looking at the indicent electron/positron -// Original author S. Middleton and H. Jafree -// - -#include "fhiclcpp/ParameterSet.h" -#include "art/Framework/Core/EDAnalyzer.h" -#include "art/Framework/Principal/Event.h" -#include "art/Framework/Principal/Handle.h" -#include "art_root_io/TFileService.h" - -#include "Offline/ProditionsService/inc/ProditionsHandle.hh" - -#include "Offline/GeometryService/inc/GeomHandle.hh" -#include "Offline/GeometryService/inc/DetectorSystem.hh" -#include "Offline/TrackerGeom/inc/Tracker.hh" -#include "Offline/RecoDataProducts/inc/KalSeed.hh" - -#include "CLHEP/Units/PhysicalConstants.h" -#include "CLHEP/Matrix/Vector.h" -#include "CLHEP/Matrix/SymMatrix.h" - -#include -#include -#include -#include -#include -#include -#include -#include -#include - -//ROOT -#include "TStyle.h" -#include "Rtypes.h" -#include "TH1F.h" -#include "TCanvas.h" -#include "TH2F.h" -#include "TLegend.h" -#include "TTree.h" -#include "TLatex.h" -#include "TGraph.h" -#include "TProfile.h" -using namespace std; -namespace mu2e{ - - class PhotonAna : public art::EDAnalyzer { - public: - struct Config { - using Name=fhicl::Name; - using Comment=fhicl::Comment; - fhicl::Atom diag{Name("diag"), Comment("Create diag histograms"),0}; - fhicl::Atom KalToken{Name("KalSeedCollection"),Comment("tag for kal seed collection")}; - }; - typedef art::EDAnalyzer::Table Parameters; - explicit PhotonAna(const Parameters& conf); - virtual ~PhotonAna(){}; - virtual void beginJob() override; - virtual void analyze(const art::Event& e); - - private: - - Config _conf; - int _diag; - art::InputTag _KalToken; - const KalSeedCollection* _KalCol; - - TTree* _photon_analyzer; - Float_t _pathlength; - - }; - - PhotonAna::PhotonAna(const Parameters& conf) : - art::EDAnalyzer(conf), - _diag(conf().diag()), - _KalToken(conf().KalToken()) - {} - - - void PhotonAna::beginJob() { //TODO - can add TTree and THistograms here if required - if(_diag > 0){ - art::ServiceHandle tfs; - _photon_analyzer=tfs->make("photon_analyzer"," Diagnostics for Photon Conversion Track Fitting"); - _photon_analyzer->Branch("PathLength", &_pathlength, "PathLength/F"); - } - } - - using LHPT = KinKal::PiecewiseTrajectory; - void PhotonAna::analyze(const art::Event& event) { - auto kalH = event.getValidHandle(_KalToken); - _KalCol = kalH.product(); - for(unsigned int k = 0; k < _KalCol->size(); k++){ - KalSeed kseed = (*_KalCol)[k]; - if(kseed.loopHelixFit()){ - std::unique_ptr trajectory = kseed.loopHelixFitTrajectory(); - double t1 = trajectory->range().begin(); - double x1 = trajectory->position3(t1).x(); - double y1 = trajectory->position3(t1).y(); - double z1 = trajectory->position3(t1).z(); - _pathlength = sqrt((x1)*(x1)+(y1)*(y1)+(z1)*(z1)); - _photon_analyzer->Fill(); - } - } - } - -}//end mu2e namespace -using mu2e::PhotonAna; -DEFINE_ART_MODULE(PhotonAna); diff --git a/DAQ/inc/CaloDAQUtilities.hh b/DAQ/inc/CaloDAQUtilities.hh index 8b9f6c9baa..3281138044 100644 --- a/DAQ/inc/CaloDAQUtilities.hh +++ b/DAQ/inc/CaloDAQUtilities.hh @@ -18,8 +18,8 @@ namespace mu2e { public: CaloDAQUtilities(std::string ModuleName); - uint16_t getCrystalID(CalorimeterFragment::CalorimeterHitReadoutPacket const& Hit){ return Hit.DIRACB & 0x0FFF;} - uint16_t getSiPMID (CalorimeterFragment::CalorimeterHitReadoutPacket const& Hit){ + uint16_t getCrystalID(CalorimeterFragment::CalorimeterHitReadoutPacket const& Hit){ return Hit.DIRACB & 0x0FFF;} + uint16_t getSiPMID (CalorimeterFragment::CalorimeterHitReadoutPacket const& Hit){ uint16_t crystalID = getCrystalID(Hit); uint16_t sipmID = Hit.DIRACB >> 12; return (crystalID * 2 + sipmID); diff --git a/DAQ/src/ArtBinaryPacketsFromDigis_module.cc b/DAQ/src/ArtBinaryPacketsFromDigis_module.cc index 5ea6d9f76b..9efa45061f 100644 --- a/DAQ/src/ArtBinaryPacketsFromDigis_module.cc +++ b/DAQ/src/ArtBinaryPacketsFromDigis_module.cc @@ -58,9 +58,11 @@ using DataBlockHeader = DataHeaderPacket; using TrackerDataPacket = mu2e::TrackerFragment::TrackerDataPacket; using TrackerADCPacket = mu2e::TrackerFragment::TrackerADCPacket; using adc_t = uint16_t; + using CalorimeterDataPacket = mu2e::CalorimeterFragment::CalorimeterDataPacket; using CalorimeterBoardID = mu2e::CalorimeterFragment::CalorimeterBoardID; using CalorimeterHitReadoutPacket = mu2e::CalorimeterFragment::CalorimeterHitReadoutPacket; + using CRVROCStatusPacket = mu2e::CRVFragment::CRVROCStatusPacket; using CRVHitWaveformSample = mu2e::CRVFragment::CRVHitWaveformSample; using CRVHitInfo = mu2e::CRVFragment::CRVHitInfo; @@ -69,7 +71,7 @@ using CRVHit = mu2e::CRVFragment::CRVHit; // data struct for the calorimeter struct CaloDataPacket { CalorimeterDataPacket dataPacket; - CalorimeterBoardID boardID; + CalorimeterBoardID boardID; //TODO - remove std::vector hitPacketVec; std::vector> waveformVec; std::vector hitIndex; @@ -364,7 +366,7 @@ void ArtBinaryPacketsFromDigis::printTrackerData(std::vector 1) { printCalorimeterData(caloData); } + //add to data block list tmpCaloDataBlockList.push_back( std::pair(headerData, caloData)); } @@ -743,7 +748,7 @@ void ArtBinaryPacketsFromDigis::processCalorimeterData(art::Event& evt, uint64_t } } } - + // fill header if (is_first) { // No hits, so just fill a header packet and no data packets DataBlockHeader headerData; @@ -766,7 +771,7 @@ void ArtBinaryPacketsFromDigis::processCalorimeterData(art::Event& evt, uint64_t //-------------------------------------------------------------------------------- void ArtBinaryPacketsFromDigis::fillHeaderByteAndPacketCounts(calo_data_block_t& caloData) { caloData.first.s.TransferByteCount = 16 /*header packet*/ + sizeof(uint16_t) /* num hits */ + - sizeof(CalorimeterBoardID) + + sizeof(CalorimeterBoardID) + //TODO - is it needed? (sizeof(uint16_t) + sizeof(CalorimeterHitReadoutPacket)) * caloData.second.hitPacketVec.size(); @@ -786,20 +791,23 @@ void ArtBinaryPacketsFromDigis::fillHeaderByteAndPacketCounts(calo_data_block_t& } //-------------------------------------------------------------------------------- -// crate a caloPacket from the digi +// crate a caloPacket from the digi TODO //-------------------------------------------------------------------------------- +// here is where we fill the fagrment information void ArtBinaryPacketsFromDigis::fillCalorimeterDataPacket(CaloDAQMap const& calodaqconds, const CaloDigi& CD, CaloDataPacket& CaloData) { CaloData.dataPacket.NumberOfHits = 1; - CalorimeterBoardID ccBoardID; - + CalorimeterBoardID ccBoardID; //TODO - replace with Hit? + + // Offline ID: CaloSiPMId offId(CD.SiPMID()); // uint16_t roId = CD.SiPMID(); uint16_t crystalId = offId.crystal().id(); if( _diagLevel==1) printf( "...FromDigis: cryId %d roId %d \n",crystalId,offId.id()); + // Online ID: CaloRawSiPMId rawId = calodaqconds.rawId(offId); uint16_t globalROCID = rawId.dirac(); uint16_t DiracChannel = rawId.ROCchannel(); @@ -897,7 +905,7 @@ void ArtBinaryPacketsFromDigis::fillCalorimeterDataStream(DTCLib::DTC_Event& cur // check that the trkDataBlock is not empty if (caloData.second.hitPacketVec.size() != 0) { sz += sizeof(CalorimeterDataPacket) + caloData.second.hitPacketVec.size() * sizeof(uint16_t) + - sizeof(CalorimeterBoardID); + sizeof(CalorimeterBoardID); //TODO - is it needed? for (size_t i = 0; i < caloData.second.hitPacketVec.size(); ++i) { auto nSamples = caloData.second.hitPacketVec[i].NumberOfSamples; sz += sizeof(uint16_t) * nSamples + sizeof(CalorimeterHitReadoutPacket); @@ -940,8 +948,8 @@ void ArtBinaryPacketsFromDigis::fillCalorimeterDataStream(DTCLib::DTC_Event& cur pos += sizeof(uint16_t) * caloData.second.hitIndex.size(); memcpy(thisBlock.allocBytes->data() + pos, &(caloData.second.boardID), - sizeof(CalorimeterBoardID)); - pos += sizeof(CalorimeterBoardID); + sizeof(CalorimeterBoardID)); //TODO - is it needed? + pos += sizeof(CalorimeterBoardID); //TODO - is it needed? for (size_t i = 0; i < caloData.second.hitPacketVec.size(); ++i) { @@ -969,7 +977,7 @@ void ArtBinaryPacketsFromDigis::fillCalorimeterHeaderDataPacket(CaloDAQMap const // Word 0 adc_t nBytes = sizeof(DataBlockHeader) + sizeof(CalorimeterDataPacket) + - sizeof(CalorimeterBoardID); // this needs to be increased every time a new hit is addeded! + sizeof(CalorimeterBoardID); // this needs to be increased every time a new hit is addeded! //TODO - is it needed? HeaderData.s.TransferByteCount = nBytes; // Word 1 HeaderData.s.PacketType = 5; // PacketType::Dataheader; diff --git a/Filters/fcl/prolog.fcl b/Filters/fcl/prolog.fcl index 3d516d4a8e..b6554f4774 100644 --- a/Filters/fcl/prolog.fcl +++ b/Filters/fcl/prolog.fcl @@ -21,6 +21,7 @@ FilterStepPointMomentum : { cutMomentumMin : 10. # MeV/c } + # throw when hits are outside their sensitive volumes VetoIncorrectHits: { module_type : VetoIncorrectHits diff --git a/TrkPatRec/src/PhotonConversionFinder_module.cc b/TrkPatRec/src/PhotonConversionFinder_module.cc deleted file mode 100644 index cd460943fd..0000000000 --- a/TrkPatRec/src/PhotonConversionFinder_module.cc +++ /dev/null @@ -1,99 +0,0 @@ -// -// TODO: explain purpose -// Original author S. Middleton and H. Jafree -// - -#include "fhiclcpp/ParameterSet.h" -#include "art/Framework/Principal/Event.h" -#include "fhiclcpp/ParameterSet.h" -#include "art/Framework/Principal/Handle.h" -#include "art/Framework/Core/EDProducer.h" -#include "art_root_io/TFileService.h" -#include "art/Utilities/make_tool.h" -#include "canvas/Persistency/Common/Ptr.h" - -#include "Offline/ProditionsService/inc/ProditionsHandle.hh" - -#include "Offline/GeometryService/inc/GeomHandle.hh" -#include "Offline/GeometryService/inc/DetectorSystem.hh" -#include "Offline/TrackerGeom/inc/Tracker.hh" - -#include "Offline/RecoDataProducts/inc/ComboHit.hh" -#include "Offline/RecoDataProducts/inc/TimeCluster.hh" -#include "Offline/RecoDataProducts/inc/HelixSeed.hh" - -#include "CLHEP/Units/PhysicalConstants.h" -#include "CLHEP/Matrix/Vector.h" -#include "CLHEP/Matrix/SymMatrix.h" - -#include -#include -#include -#include -#include -#include -#include -#include -#include - -namespace mu2e{ - - class PhotonConversionFinder : public art::EDProducer { - public: - struct Config{ - using Name=fhicl::Name; - using Comment=fhicl::Comment; - fhicl::Atom diag{Name("diag"), Comment("Create diag histograms"),0}; - fhicl::Atom chToken{Name("ComboHitCollection"),Comment("tag for straw hit collection")}; - fhicl::Atom tcToken{Name("TimeClusterCollection"),Comment("tag for time cluster collection")}; - }; - typedef art::EDProducer::Table Parameters; - explicit PhotonConversionFinder(const Parameters& conf); - virtual ~PhotonConversionFinder(){}; - virtual void beginRun(art::Run& ) override; - virtual void beginJob() override; - virtual void produce(art::Event& event ) override; - - private: - - Config _conf; - - //config parameters: - int _diag; - art::InputTag _chToken; - art::InputTag _tcToken; - - }; - - - PhotonConversionFinder::PhotonConversionFinder(const Parameters& conf) : - art::EDProducer(conf), - _diag (conf().diag()), - _chToken (conf().chToken()), - _tcToken (conf().tcToken()) - { - consumes(_chToken); - consumes(_tcToken); - produces(); - } - - void PhotonConversionFinder::beginRun(art::Run& ) {//TODO - } - - void PhotonConversionFinder::beginJob() { //TODO - can add TTree and THistograms here if required - } - - void PhotonConversionFinder::produce(art::Event& event ) { - /*auto const& chH = event.getValidHandle(_chToken); - const ComboHitCollection& chcol(*chH); - auto const& tcH = event.getValidHandle(_tcToken); - const TimeClusterCollection& tccol(*tcH);*/ - std::unique_ptr seed_col(new HelixSeedCollection()); - //TODO - this is where your algorithm will be... - event.put(std::move(seed_col)); //TODO - one per event - } - - -}//end mu2e namespace -using mu2e::PhotonConversionFinder; -DEFINE_ART_MODULE(PhotonConversionFinder); From 97ad4a52260c5ff75fb1139700b1e5c0c9c90e1b Mon Sep 17 00:00:00 2001 From: sophieMu2e Date: Tue, 3 Oct 2023 07:55:23 -0500 Subject: [PATCH 003/213] changes --- Analyses/src/PhotonAna_module.cc | 389 +++++++++++++++++++++++++++++++ 1 file changed, 389 insertions(+) create mode 100644 Analyses/src/PhotonAna_module.cc diff --git a/Analyses/src/PhotonAna_module.cc b/Analyses/src/PhotonAna_module.cc new file mode 100644 index 0000000000..7706583121 --- /dev/null +++ b/Analyses/src/PhotonAna_module.cc @@ -0,0 +1,389 @@ +// +// TODO: This file will analyze the outgoing photons energy, momentum and position by looking at the indicent electron/positron +// Original author S. Middleton +// + +#include "fhiclcpp/ParameterSet.h" +#include "art/Framework/Core/EDAnalyzer.h" +#include "art/Framework/Principal/Event.h" +#include "art/Framework/Principal/Handle.h" +#include "art_root_io/TFileService.h" +#include "canvas/Utilities/InputTag.h" + +#include "Offline/ProditionsService/inc/ProditionsHandle.hh" + +#include "Offline/GeometryService/inc/GeomHandle.hh" +#include "Offline/GeometryService/inc/DetectorSystem.hh" +#include "Offline/TrackerGeom/inc/Tracker.hh" +#include "Offline/RecoDataProducts/inc/KalSeed.hh" +#include "Offline/MCDataProducts/inc/SimParticle.hh" +#include "Offline/MCDataProducts/inc/StrawGasStep.hh" +#include "Offline/MCDataProducts/inc/MCTrajectoryPoint.hh" +#include "Offline/MCDataProducts/inc/MCTrajectoryCollection.hh" + +#include "CLHEP/Units/PhysicalConstants.h" +#include "CLHEP/Matrix/Vector.h" +#include "CLHEP/Matrix/SymMatrix.h" + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +//ROOT +#include "TStyle.h" +#include "Rtypes.h" +#include "TH1F.h" +#include "TCanvas.h" +#include "TH2F.h" +#include "TH3F.h" +#include "TLegend.h" +#include "TTree.h" +#include "TLatex.h" +#include "TGraph.h" +#include "TProfile.h" +using namespace std; +namespace mu2e{ + + class PhotonAna : public art::EDAnalyzer { + public: + struct Config { + using Name=fhicl::Name; + using Comment=fhicl::Comment; + fhicl::Atom diag{Name("diag"), Comment("Create diag histograms"),0}; + fhicl::Atom StrawToken{Name("StrawGasStepCollection"),Comment("tag for straw gas step collection")}; + fhicl::Atom MCToken{Name("MCTrajectoryCollection"),Comment("tag for MC trajectory collection")}; + fhicl::Atom SimToken{Name("SimParticleCollection"),Comment("tag for Sim collection")}; + }; + typedef art::EDAnalyzer::Table Parameters; + explicit PhotonAna(const Parameters& conf); + virtual void beginJob() override; + virtual void analyze(const art::Event& e); + + private: + Config _conf; + int _diagLevel; + art::InputTag _StrawToken; + art::InputTag _MCToken; + art::InputTag _SimToken; + const StrawGasStepCollection* _StrawCol; + const MCTrajectoryCollection* _TrajCol; + const SimParticleCollection* _SimCol; + + //Declaring variables: Daughter particles + Float_t _pdgid; + //TTree *_photon_analyzer; + TTree *_simpart_analyzer; + //StrawId strawid; + Int_t nparts; + + Float_t ElecPairMom; + Float_t PosPairMom; + Float_t TotalPairMom; + + Float_t ElecStartMomx; + Float_t ElecStartMomy; + Float_t ElecStartMomz; + + Float_t ElecStartPosx; + Float_t ElecStartPosy; + Float_t ElecStartPosz; + + Float_t ElecTheta; + Float_t ElecPhi; + Float_t ElecTransMom; + Float_t ElecPhotDirMom; + + Float_t PosStartMomx; + Float_t PosStartMomy; + Float_t PosStartMomz; + + Float_t PosTheta; + Float_t PosPhi; + Float_t PosTransMom; + Float_t PosPhotDirMom; + + Float_t PosStartPosx; + Float_t PosStartPosy; + Float_t PosStartPosz; + + Float_t PhotStartMomx; + Float_t PhotStartMomy; + Float_t PhotStartMomz; + Float_t PhotTotMom; + + Float_t PhotTheta; + Float_t PhotPhi; + + Int_t nParts; + + unsigned int nConv = 0; + unsigned int nConvParticles = 0; + unsigned int nBoth = 0; + unsigned int nSameMother = 0; + unsigned int nSameMotherPhoton = 0; + }; + + PhotonAna::PhotonAna(const Parameters& conf) : + art::EDAnalyzer(conf), + _diagLevel(conf().diag()), + _StrawToken(conf().StrawToken()), + _MCToken(conf().MCToken()), + _SimToken(conf().SimToken()) + {} + + void PhotonAna::beginJob() { //TODO - can add TTree and THistograms here if required + art::ServiceHandle tfs; + //1D Historgrams + + _simpart_analyzer = tfs->make("simpart_analyzer"," Diagnostics for Photon Conversion Track Fitting"); + _simpart_analyzer->Branch("ElecPairMom",&ElecPairMom,"elecPairMom/F"); + _simpart_analyzer->Branch("PosPairMom",&PosPairMom,"posPairMom/F"); + _simpart_analyzer->Branch("TotalPairMom",&TotalPairMom,"totalPairMom/F"); + _simpart_analyzer->Branch("Particles", &nParts, "nParts/I"); + + _simpart_analyzer->Branch("ElecStartMomx",&ElecStartMomx,"ElecStartMomx/F"); + _simpart_analyzer->Branch("ElecStartMomy",&ElecStartMomy,"ElecStartMomy/F"); + _simpart_analyzer->Branch("ElecStartMomz",&ElecStartMomz,"ElecStartMomz/F"); + + _simpart_analyzer->Branch("ElecStartPosx",&ElecStartPosx,"ElecStartPosx/F"); + _simpart_analyzer->Branch("ElecStartPosy",&ElecStartPosy,"ElecStartPosy/F"); + _simpart_analyzer->Branch("ElecStartPosz",&ElecStartPosz,"ElecStartPosz/F"); + + _simpart_analyzer->Branch("PosStartMomx",&PosStartMomx,"PosStartMomx/F"); + _simpart_analyzer->Branch("PosStartMomy",&PosStartMomy,"PosStartMomy/F"); + _simpart_analyzer->Branch("PosStartMomz",&PosStartMomz,"PosStartMomz/F"); + + _simpart_analyzer->Branch("PosStartPosx",&PosStartPosx,"PosStartPosx/F"); + _simpart_analyzer->Branch("PosStartPosy",&PosStartPosy,"PosStartPosy/F"); + _simpart_analyzer->Branch("PosStartPosz",&PosStartPosz,"PosStartPosz/F"); + + _simpart_analyzer->Branch("PhotStartMomx",&PhotStartMomx,"PhotStartMomx/F"); + _simpart_analyzer->Branch("PhotStartMomy",&PhotStartMomy,"PhotStartMomy/F"); + _simpart_analyzer->Branch("PhotStartMomz",&PhotStartMomz,"PhotStartMomz/F"); + _simpart_analyzer->Branch("PhotTotMom",&PhotTotMom,"PhotTotMom/F"); + + _simpart_analyzer->Branch("ElecTheta",&ElecTheta,"ElecTheta/F"); + _simpart_analyzer->Branch("ElecPhi",&ElecPhi,"ElecPhi/F"); + _simpart_analyzer->Branch("ElecTransMom",&ElecTransMom,"ElecTransMom/F"); + _simpart_analyzer->Branch("ElecPhotDirMom",&ElecPhotDirMom,"ElecPhotDirMom/F"); + + _simpart_analyzer->Branch("PosTheta",&PosTheta,"PosTheta/F"); + _simpart_analyzer->Branch("PosPhi",&PosPhi,"PosPhi/F"); + _simpart_analyzer->Branch("PosTransMom",&PosTransMom,"PosTransMom/F"); + _simpart_analyzer->Branch("PosPhotDirMom",&PosPhotDirMom,"PosPhotDirMom/F"); + + _simpart_analyzer->Branch("PhotTheta",&PhotTheta,"PhotTheta/F"); + _simpart_analyzer->Branch("PhotPhi",&PhotPhi,"PhotPhi/F"); + } + void PhotonAna::analyze(const art::Event& event) { + + int eventid_ = event.id().event(); + int runid_ = event.run(); + int subrunid_ = event.subRun(); + if(_diagLevel > 1){ + std::cout<<"+=======================================================+"<(_SimToken); + _SimCol = sH.product(); + + //std::cout<<"SimCol Size : "<<_SimCol->size()< ElecMotherPos; //TODO update plots to use these positions + std::vector PosMotherPos; + + bool hasBoth = false; + //loop over Simparticles: + for ( SimParticleCollection::const_iterator i=_SimCol->begin(); i!=_SimCol->end(); ++i ){ + SimParticle const& sim = i->second; + + //check the particle is e-/e+ and created by conversion + if(abs(sim.pdgId()) == 11 and sim.creationCode()==13){//(sim.creationCode()==173 or sim.creationCode()==174) + + double TotalMomentum = sim.startMomentum().rho(); + + // fill counters + if(isConv ==false) nConv ++; // avoids double counting for each of the pair + isConv = true; + nConvParticles ++; + + //print information on daughter: + if(_diagLevel > 1){ + std::cout<<"Daughter PDG ID : "< const& parent = sim.parent(); + + PhotStartMomx = parent->startMomentum().x(); + PhotStartMomy = parent->startMomentum().y(); + PhotStartMomz = parent->startMomentum().z(); + PhotTotMom = parent->startMomentum().rho(); + PhotTheta = parent->startMomentum().theta(); + PhotPhi = parent->startMomentum().phi() ; + + // information on grandmother + /*art::Ptr grandparent = parent->parent(); + if(_diagLevel > 1) std::cout<<"ancestor id "<parent()->pdgId()<isPrimary() and abs(grandparent->pdgId()!=13)){ + int id = grandparent->parent()->pdgId(); + std::vector ancestors; + ancestors.push_back(id); + while(abs(id) !=13){ + id = grandparent->parent()->pdgId(); + grandparent = grandparent->parent(); + if(_diagLevel > 1) std::cout<<"ancestor id "< 1){ + std::cout<<"Mother PDG ID : "<pdgId()<endPosition().x()<<" , "<endPosition().y()<<" , "<endPosition().z()<pdgId() == 22 and parent->creationCode()==175) hasMotherPhoton = true; //TODO keep this at ==13? + + // check electron and positrons and save parent positions for later checks + if(sim.pdgId() == 11) { + hasElectron = true; + ElectronMom = TotalMomentum; //TODO - add these to the TTree + ElecMotherPos.push_back(parent->endPosition().x()); + ElecMotherPos.push_back(parent->endPosition().y()); + ElecMotherPos.push_back(parent->endPosition().z()); + + ElecStartMomx = sim.startMomentum().x(); + ElecStartMomy = sim.startMomentum().y(); + ElecStartMomz = sim.startMomentum().z(); + + ElecStartPosx = sim.startPosition().x(); + ElecStartPosy = sim.startPosition().y(); + ElecStartPosz = sim.startPosition().z(); + + ElecTheta = sim.startMomentum().theta(); + ElecPhi = sim.startMomentum().phi(); + ElecTransMom = TotalMomentum*(sin(ElecTheta)); + + ElecPhotDirMom = sim.startMomentum().dot(parent->startMomentum());//(ElecMom[0]*ElecMotherMom[0]+ElecMom[1]*ElecMotherMom[1]+ElecMom[2]*ElecMotherMom[2])/ElecMotherAbsMom; + + } + if(sim.pdgId() == -11){ + hasPositron = true; + PositronMom = TotalMomentum; + PosMotherPos.push_back(parent->endPosition().x()); + PosMotherPos.push_back(parent->endPosition().y()); + PosMotherPos.push_back(parent->endPosition().z()); + + PosStartMomx = sim.startMomentum().x(); + PosStartMomy = sim.startMomentum().y(); + PosStartMomz = sim.startMomentum().z(); + + PosStartPosx = sim.startPosition().x(); + PosStartPosy = sim.startPosition().y(); + PosStartPosz = sim.startPosition().z(); + + PosTheta = sim.startMomentum().theta(); + PosPhi = sim.startMomentum().phi(); + PosTransMom = TotalMomentum*(sin(PosTheta)); + + PosPhotDirMom = sim.startMomentum().dot(parent->startMomentum()); + + } + + } + } + + // fill counters + if(hasElectron and hasPositron) hasBoth = true; + if(isConv and hasBoth) nBoth ++; + if(ElecMotherPos.size() !=0 and PosMotherPos.size() != 0 and ElecMotherPos[0] == PosMotherPos[0] and ElecMotherPos[1] == PosMotherPos[1] and ElecMotherPos[2] == PosMotherPos[2]) nSameMother++; + if(ElecMotherPos.size() !=0 and PosMotherPos.size() != 0 and ElecMotherPos[0] == PosMotherPos[0] and ElecMotherPos[1] == PosMotherPos[1] and ElecMotherPos[2] == PosMotherPos[2] and hasMotherPhoton) nSameMotherPhoton++; + + // only print if its an interesting event but iterate without printing others + if(_diagLevel > 0 and isConv and hasBoth and ElecMotherPos.size() !=0 and PosMotherPos.size() != 0 and ElecMotherPos[0] == PosMotherPos[0] and ElecMotherPos[1] == PosMotherPos[1] and ElecMotherPos[2] == PosMotherPos[2] and hasMotherPhoton and nConvParticles==2){ //nConv == 2 + if(_diagLevel == 1){ std::cout<<"+=======================================================+"<Fill(); + } + + + + //------------ MC Trajectory --------------------// + /*auto chH = event.getValidHandle(_MCToken); + _TrajCol = chH.product(); + std::map,mu2e::MCTrajectory>::const_iterator trajectoryIter; + for(unsigned int k = 0; k < _TrajCol->size(); k++){ + for(trajectoryIter=_TrajCol->begin(); trajectoryIter!=_TrajCol->end(); trajectoryIter++){ + _pdgid = trajectoryIter->first->pdgId(); + art::Ptr const& _parent = trajectoryIter->first->parent(); + ProcessCode _creationCode = trajectoryIter->first->creationCode(); + + //initialsation of variables + theta = atan((trajectoryIter->first->startMomentum().y())/trajectoryIter->first->startMomentum().x()); + nparts = _TrajCol->size(); + startmomentum = trajectoryIter->first->startMomentum().rho(); + transmomentum = startmomentum*(sin(theta)); + //Fill for e+e- pairs origination from same parent particle + if (_TrajCol->size()==2 && _creationCode==13 && (_pdgid==11 || _pdgid==-11) && _parent->pdgId()==22 && (transmomentum>5 || transmomentum <-5) ) { + cout << "********************************" << k << "/ " << _TrajCol->size() << "*************************" << endl; + + startmomentum_D = trajectoryIter->first->startMomentum().rho(); + transmomentum_D = startmomentum_D*(sin(theta)); + endmomentum_D = trajectoryIter->first->endMomentum().rho(); + startposx_D = (trajectoryIter->first->startPosition().x())+3903; + startposy_D = trajectoryIter->first->startPosition().y(); + startposz_D = trajectoryIter->first->startPosition().z(); + startposr_D = sqrt(((startposx_D)*(startposx_D))+startposy_D*startposy_D); + endposx_D = (trajectoryIter->first->endPosition().x())+3903; + endposy_D = trajectoryIter->first->endPosition().y(); + endposz_D = trajectoryIter->first->endPosition().z(); + endposr_D = sqrt(((endposx_D)*(endposx_D))+endposy_D*endposy_D); + time_D = trajectoryIter->first->startGlobalTime(); + + + std::cout << "Code: "<< _creationCode << " ID: " << _pdgid << " Parent: " << _parent->pdgId() <pdgId() <<" Start Pos X: "<< startposx_P <<" end Pos X: "<< endposx_P <first->id() << endl; + std::cout << "ID parent particle: " << trajectoryIter->first->parent()->id() << endl; + + //_photon_analyzer->Fill(); + }; + } + }*/ + + } +}//end mu2e namespace +using mu2e::PhotonAna; +DEFINE_ART_MODULE(PhotonAna) From cfb524fa73b13b5bd48c423f64d2fa4efa998c09 Mon Sep 17 00:00:00 2001 From: sophieMu2e Date: Tue, 3 Oct 2023 07:56:11 -0500 Subject: [PATCH 004/213] changes --- Analyses/fcl/prolog.fcl | 14 +++------- DAQ/src/ArtBinaryPacketsFromDigis_module.cc | 30 ++++++++------------- Filters/fcl/prolog.fcl | 3 +-- 3 files changed, 16 insertions(+), 31 deletions(-) diff --git a/Analyses/fcl/prolog.fcl b/Analyses/fcl/prolog.fcl index 0e0a125404..234df4a895 100644 --- a/Analyses/fcl/prolog.fcl +++ b/Analyses/fcl/prolog.fcl @@ -17,11 +17,6 @@ PrintStrawHits : { makeSHinstance : "CosmicFilter" } -KalSeedCount : { - module_type : ExampleFilter - debugLevel : 0 -} - TrackSummaryMaker: { module_type: TrackSummaryMaker trackInput : "TrkPatRec:DeM" @@ -34,7 +29,10 @@ CaloClusterCompareNew : { PhotonAna : { module_type : PhotonAna - MCTrajectoryCollection : compressDigiMCs + diag : 1 + StrawGasStepCollection : compressDigiMCs +MCTrajectoryCollection : compressDigiMCs +SimParticleCollection : compressDetStepMCs#compressDigiMCs } CaloClusterCompareOld : { @@ -97,11 +95,7 @@ PhotonAnalysis : analyzers : { PhotonAna : @local::PhotonAna } - filters : { - KalSeedCount : @local::KalSeedCount - } Analysis : [PhotonAna] - Filter : [KalSeedCount] } ClusterCompareOld : diff --git a/DAQ/src/ArtBinaryPacketsFromDigis_module.cc b/DAQ/src/ArtBinaryPacketsFromDigis_module.cc index 9efa45061f..5ea6d9f76b 100644 --- a/DAQ/src/ArtBinaryPacketsFromDigis_module.cc +++ b/DAQ/src/ArtBinaryPacketsFromDigis_module.cc @@ -58,11 +58,9 @@ using DataBlockHeader = DataHeaderPacket; using TrackerDataPacket = mu2e::TrackerFragment::TrackerDataPacket; using TrackerADCPacket = mu2e::TrackerFragment::TrackerADCPacket; using adc_t = uint16_t; - using CalorimeterDataPacket = mu2e::CalorimeterFragment::CalorimeterDataPacket; using CalorimeterBoardID = mu2e::CalorimeterFragment::CalorimeterBoardID; using CalorimeterHitReadoutPacket = mu2e::CalorimeterFragment::CalorimeterHitReadoutPacket; - using CRVROCStatusPacket = mu2e::CRVFragment::CRVROCStatusPacket; using CRVHitWaveformSample = mu2e::CRVFragment::CRVHitWaveformSample; using CRVHitInfo = mu2e::CRVFragment::CRVHitInfo; @@ -71,7 +69,7 @@ using CRVHit = mu2e::CRVFragment::CRVHit; // data struct for the calorimeter struct CaloDataPacket { CalorimeterDataPacket dataPacket; - CalorimeterBoardID boardID; //TODO - remove + CalorimeterBoardID boardID; std::vector hitPacketVec; std::vector> waveformVec; std::vector hitIndex; @@ -366,7 +364,7 @@ void ArtBinaryPacketsFromDigis::printTrackerData(std::vector 1) { printCalorimeterData(caloData); } - //add to data block list tmpCaloDataBlockList.push_back( std::pair(headerData, caloData)); } @@ -748,7 +743,7 @@ void ArtBinaryPacketsFromDigis::processCalorimeterData(art::Event& evt, uint64_t } } } - // fill header + if (is_first) { // No hits, so just fill a header packet and no data packets DataBlockHeader headerData; @@ -771,7 +766,7 @@ void ArtBinaryPacketsFromDigis::processCalorimeterData(art::Event& evt, uint64_t //-------------------------------------------------------------------------------- void ArtBinaryPacketsFromDigis::fillHeaderByteAndPacketCounts(calo_data_block_t& caloData) { caloData.first.s.TransferByteCount = 16 /*header packet*/ + sizeof(uint16_t) /* num hits */ + - sizeof(CalorimeterBoardID) + //TODO - is it needed? + sizeof(CalorimeterBoardID) + (sizeof(uint16_t) + sizeof(CalorimeterHitReadoutPacket)) * caloData.second.hitPacketVec.size(); @@ -791,23 +786,20 @@ void ArtBinaryPacketsFromDigis::fillHeaderByteAndPacketCounts(calo_data_block_t& } //-------------------------------------------------------------------------------- -// crate a caloPacket from the digi TODO +// crate a caloPacket from the digi //-------------------------------------------------------------------------------- -// here is where we fill the fagrment information void ArtBinaryPacketsFromDigis::fillCalorimeterDataPacket(CaloDAQMap const& calodaqconds, const CaloDigi& CD, CaloDataPacket& CaloData) { CaloData.dataPacket.NumberOfHits = 1; - CalorimeterBoardID ccBoardID; //TODO - replace with Hit? - - // Offline ID: + CalorimeterBoardID ccBoardID; + CaloSiPMId offId(CD.SiPMID()); // uint16_t roId = CD.SiPMID(); uint16_t crystalId = offId.crystal().id(); if( _diagLevel==1) printf( "...FromDigis: cryId %d roId %d \n",crystalId,offId.id()); - // Online ID: CaloRawSiPMId rawId = calodaqconds.rawId(offId); uint16_t globalROCID = rawId.dirac(); uint16_t DiracChannel = rawId.ROCchannel(); @@ -905,7 +897,7 @@ void ArtBinaryPacketsFromDigis::fillCalorimeterDataStream(DTCLib::DTC_Event& cur // check that the trkDataBlock is not empty if (caloData.second.hitPacketVec.size() != 0) { sz += sizeof(CalorimeterDataPacket) + caloData.second.hitPacketVec.size() * sizeof(uint16_t) + - sizeof(CalorimeterBoardID); //TODO - is it needed? + sizeof(CalorimeterBoardID); for (size_t i = 0; i < caloData.second.hitPacketVec.size(); ++i) { auto nSamples = caloData.second.hitPacketVec[i].NumberOfSamples; sz += sizeof(uint16_t) * nSamples + sizeof(CalorimeterHitReadoutPacket); @@ -948,8 +940,8 @@ void ArtBinaryPacketsFromDigis::fillCalorimeterDataStream(DTCLib::DTC_Event& cur pos += sizeof(uint16_t) * caloData.second.hitIndex.size(); memcpy(thisBlock.allocBytes->data() + pos, &(caloData.second.boardID), - sizeof(CalorimeterBoardID)); //TODO - is it needed? - pos += sizeof(CalorimeterBoardID); //TODO - is it needed? + sizeof(CalorimeterBoardID)); + pos += sizeof(CalorimeterBoardID); for (size_t i = 0; i < caloData.second.hitPacketVec.size(); ++i) { @@ -977,7 +969,7 @@ void ArtBinaryPacketsFromDigis::fillCalorimeterHeaderDataPacket(CaloDAQMap const // Word 0 adc_t nBytes = sizeof(DataBlockHeader) + sizeof(CalorimeterDataPacket) + - sizeof(CalorimeterBoardID); // this needs to be increased every time a new hit is addeded! //TODO - is it needed? + sizeof(CalorimeterBoardID); // this needs to be increased every time a new hit is addeded! HeaderData.s.TransferByteCount = nBytes; // Word 1 HeaderData.s.PacketType = 5; // PacketType::Dataheader; diff --git a/Filters/fcl/prolog.fcl b/Filters/fcl/prolog.fcl index b6554f4774..2ed61607b9 100644 --- a/Filters/fcl/prolog.fcl +++ b/Filters/fcl/prolog.fcl @@ -1,4 +1,4 @@ -# -*- mode: tcl -*- +## -*- mode: tcl -*- #------------------------------------------------------------------------------ # this file is included by fcl/standardProducers.fcl inside the PROLOG section #------------------------------------------------------------------------------ @@ -21,7 +21,6 @@ FilterStepPointMomentum : { cutMomentumMin : 10. # MeV/c } - # throw when hits are outside their sensitive volumes VetoIncorrectHits: { module_type : VetoIncorrectHits From a960a8dca2a1b5958a0887ca7ecbabfebb22fb54 Mon Sep 17 00:00:00 2001 From: Andrew Edmonds Date: Mon, 16 Oct 2023 19:19:38 -0500 Subject: [PATCH 005/213] Update TrackQuality to use tensorflow-trained model --- RecoDataProducts/inc/MVAResult.hh | 17 ++ TrkDiag/data/trkqual.dat | 16 ++ TrkDiag/inc/trkqual.hxx | 254 +++++++++++++++++++++++++++++ TrkDiag/src/SConscript | 6 + TrkDiag/src/TrackQuality_module.cc | 187 ++++++++------------- 5 files changed, 358 insertions(+), 122 deletions(-) create mode 100644 RecoDataProducts/inc/MVAResult.hh create mode 100644 TrkDiag/data/trkqual.dat create mode 100644 TrkDiag/inc/trkqual.hxx diff --git a/RecoDataProducts/inc/MVAResult.hh b/RecoDataProducts/inc/MVAResult.hh new file mode 100644 index 0000000000..875033dac0 --- /dev/null +++ b/RecoDataProducts/inc/MVAResult.hh @@ -0,0 +1,17 @@ +// +// A datsa product that stores the result of any MVA/ML/AI algorithm +// +#ifndef RecoDataProducts_MVAResult_hh +#define RecoDataProducts_MVAResult_hh +#include +#include + +namespace mu2e { + struct MVAResult { + MVAResult() : _value(-1.0) {} + MVAResult(Float_t value ) : _value(value) {} + Float_t _value; + }; + typedef std::vector MVAResultCollection; +} +#endif diff --git a/TrkDiag/data/trkqual.dat b/TrkDiag/data/trkqual.dat new file mode 100644 index 0000000000..63c55ccf22 --- /dev/null +++ b/TrkDiag/data/trkqual.dat @@ -0,0 +1,16 @@ +tensor_dense3kernel0 6 +-2.32326317 -1.28914106 1.87569582 1.37539637 1.28820384 1.45947862 +tensor_dense2bias0 6 +-0.105199143 -0.398535997 0.221802577 0.1211548 0.384487808 0.48019737 +tensor_densebias0 7 +0.722284496 -0.529624403 0.764210701 -0.233725727 -0.359556615 -0.630548954 0.609221578 +tensor_densekernel0 49 +-0.0117151449 0.215292424 -0.0234739017 0.00105536217 0.0821127743 0.238448724 -0.0326735191 0.541053891 0.406676948 -0.104409121 0.978412688 0.349829167 -0.326305687 -0.323543102 -0.15426065 -0.651483655 -0.195591822 0.0372229479 -0.00857323688 -0.931888402 0.13227582 2.21336913 -1.43697155 1.93482685 -2.56313205 -0.80483675 -2.05880404 1.58560824 -1.35457683 0.665873885 -1.38273966 1.44111753 -1.70221281 0.0761312395 -0.932778478 2.55081105 -2.20607281 3.3390398 -3.3709774 -2.09288025 -2.10334516 3.26435852 0.229383811 -0.723667562 0.340755761 -0.141343623 -0.401876181 -0.393494844 0.892214894 +tensor_dense1kernel0 49 +-0.991838694 1.20358372 1.53597522 1.15777254 -1.31489921 0.923312485 1.20099473 0.514366329 -0.530589104 -1.4272356 -1.44105768 0.500654638 -1.41453576 -1.31682372 -1.58864951 1.19073904 1.42839694 1.51448393 -1.20055389 1.01591957 1.32457709 1.03849721 -1.67175376 -1.26662505 -0.584386528 0.726290166 -0.878184378 -1.2526176 0.758100629 -0.306252301 -0.425617039 -0.73307091 0.227494672 0.204406887 0.155830532 1.18002975 -0.321701288 -0.485498995 -0.282102168 1.4067955 -1.21952736 -1.35681903 -1.6188513 0.706927598 1.63495719 1.00884712 -1.42083085 1.59898329 1.00649226 +tensor_dense3bias0 1 +-0.385066271 +tensor_dense1bias0 7 +0.0608773492 -0.537909746 -0.39536196 -0.235204011 0.511781096 -0.235568658 -0.0105576282 +tensor_dense2kernel0 42 +-1.4008733 -0.8848176 1.53826797 1.04104829 1.28910315 1.83825207 0.875014842 0.956438482 0.0641859621 -0.27782461 -0.225287825 -0.605817318 1.22979307 1.47419178 -0.758476496 -1.23763752 -1.21146119 -1.14878368 0.283652544 0.662472785 -1.10383689 -0.707927108 -1.44055927 -0.412708431 -1.45053887 -1.56932211 1.14952338 1.60565019 1.55148971 1.25131953 1.00861549 0.524758339 -1.32967794 -0.568487704 -1.58955598 -1.44846332 0.710721493 0.876535773 -1.38773823 -1.33408678 -0.570860624 -1.59157705 diff --git a/TrkDiag/inc/trkqual.hxx b/TrkDiag/inc/trkqual.hxx new file mode 100644 index 0000000000..90509f0b50 --- /dev/null +++ b/TrkDiag/inc/trkqual.hxx @@ -0,0 +1,254 @@ +//Code generated automatically by TMVA for Inference of Model file [trkqual.h5] at [Wed Sep 6 23:28:56 2023] + +#ifndef TMVA_SOFIE_TRKQUAL +#define TMVA_SOFIE_TRKQUAL + +#include +#include +#include +#include "TMVA/SOFIE_common.hxx" +#include + +namespace TMVA_SOFIE_trkqual{ +namespace BLAS{ + extern "C" void sgemv_(const char * trans, const int * m, const int * n, const float * alpha, const float * A, + const int * lda, const float * X, const int * incx, const float * beta, const float * Y, const int * incy); + extern "C" void sgemm_(const char * transa, const char * transb, const int * m, const int * n, const int * k, + const float * alpha, const float * A, const int * lda, const float * B, const int * ldb, + const float * beta, float * C, const int * ldc); +}//BLAS +struct Session { +std::vector fTensor_dense3kernel0 = std::vector(6); +float * tensor_dense3kernel0 = fTensor_dense3kernel0.data(); +std::vector fTensor_dense2bias0 = std::vector(6); +float * tensor_dense2bias0 = fTensor_dense2bias0.data(); +std::vector fTensor_densebias0 = std::vector(7); +float * tensor_densebias0 = fTensor_densebias0.data(); +std::vector fTensor_densekernel0 = std::vector(49); +float * tensor_densekernel0 = fTensor_densekernel0.data(); +std::vector fTensor_dense1kernel0 = std::vector(49); +float * tensor_dense1kernel0 = fTensor_dense1kernel0.data(); +std::vector fTensor_dense3bias0 = std::vector(1); +float * tensor_dense3bias0 = fTensor_dense3bias0.data(); +std::vector fTensor_dense1bias0 = std::vector(7); +float * tensor_dense1bias0 = fTensor_dense1bias0.data(); +std::vector fTensor_dense2kernel0 = std::vector(42); +float * tensor_dense2kernel0 = fTensor_dense2kernel0.data(); +std::vector fTensor_dense1Dense = std::vector(7); +float * tensor_dense1Dense = fTensor_dense1Dense.data(); +std::vector fTensor_denseSigmoid0 = std::vector(7); +float * tensor_denseSigmoid0 = fTensor_denseSigmoid0.data(); +std::vector fTensor_dense1Sigmoid0 = std::vector(7); +float * tensor_dense1Sigmoid0 = fTensor_dense1Sigmoid0.data(); +std::vector fTensor_dense3Dense = std::vector(1); +float * tensor_dense3Dense = fTensor_dense3Dense.data(); +std::vector fTensor_dense1bias0bcast = std::vector(7); +float * tensor_dense1bias0bcast = fTensor_dense1bias0bcast.data(); +std::vector fTensor_densebias0bcast = std::vector(7); +float * tensor_densebias0bcast = fTensor_densebias0bcast.data(); +std::vector fTensor_denseDense = std::vector(7); +float * tensor_denseDense = fTensor_denseDense.data(); +std::vector fTensor_dense2bias0bcast = std::vector(6); +float * tensor_dense2bias0bcast = fTensor_dense2bias0bcast.data(); +std::vector fTensor_dense2Dense = std::vector(6); +float * tensor_dense2Dense = fTensor_dense2Dense.data(); +std::vector fTensor_dense3Sigmoid0 = std::vector(1); +float * tensor_dense3Sigmoid0 = fTensor_dense3Sigmoid0.data(); +std::vector fTensor_dense2Sigmoid0 = std::vector(6); +float * tensor_dense2Sigmoid0 = fTensor_dense2Sigmoid0.data(); +std::vector fTensor_dense3bias0bcast = std::vector(1); +float * tensor_dense3bias0bcast = fTensor_dense3bias0bcast.data(); + + +Session(std::string filename ="") { + if (filename.empty()) filename = "trkqual.dat"; + std::ifstream f; + f.open(filename); + if (!f.is_open()){ + throw std::runtime_error("tmva-sofie failed to open file for input weights"); + } + std::string tensor_name; + int length; + f >> tensor_name >> length; + if (tensor_name != "tensor_dense3kernel0" ) { + std::string err_msg = "TMVA-SOFIE failed to read the correct tensor name; expected name is tensor_dense3kernel0 , read " + tensor_name; + throw std::runtime_error(err_msg); + } + if (length != 6) { + std::string err_msg = "TMVA-SOFIE failed to read the correct tensor size; expected size is 6 , read " + std::to_string(length) ; + throw std::runtime_error(err_msg); + } + for (int i =0; i < length; ++i) + f >> tensor_dense3kernel0[i]; + f >> tensor_name >> length; + if (tensor_name != "tensor_dense2bias0" ) { + std::string err_msg = "TMVA-SOFIE failed to read the correct tensor name; expected name is tensor_dense2bias0 , read " + tensor_name; + throw std::runtime_error(err_msg); + } + if (length != 6) { + std::string err_msg = "TMVA-SOFIE failed to read the correct tensor size; expected size is 6 , read " + std::to_string(length) ; + throw std::runtime_error(err_msg); + } + for (int i =0; i < length; ++i) + f >> tensor_dense2bias0[i]; + f >> tensor_name >> length; + if (tensor_name != "tensor_densebias0" ) { + std::string err_msg = "TMVA-SOFIE failed to read the correct tensor name; expected name is tensor_densebias0 , read " + tensor_name; + throw std::runtime_error(err_msg); + } + if (length != 7) { + std::string err_msg = "TMVA-SOFIE failed to read the correct tensor size; expected size is 7 , read " + std::to_string(length) ; + throw std::runtime_error(err_msg); + } + for (int i =0; i < length; ++i) + f >> tensor_densebias0[i]; + f >> tensor_name >> length; + if (tensor_name != "tensor_densekernel0" ) { + std::string err_msg = "TMVA-SOFIE failed to read the correct tensor name; expected name is tensor_densekernel0 , read " + tensor_name; + throw std::runtime_error(err_msg); + } + if (length != 49) { + std::string err_msg = "TMVA-SOFIE failed to read the correct tensor size; expected size is 49 , read " + std::to_string(length) ; + throw std::runtime_error(err_msg); + } + for (int i =0; i < length; ++i) + f >> tensor_densekernel0[i]; + f >> tensor_name >> length; + if (tensor_name != "tensor_dense1kernel0" ) { + std::string err_msg = "TMVA-SOFIE failed to read the correct tensor name; expected name is tensor_dense1kernel0 , read " + tensor_name; + throw std::runtime_error(err_msg); + } + if (length != 49) { + std::string err_msg = "TMVA-SOFIE failed to read the correct tensor size; expected size is 49 , read " + std::to_string(length) ; + throw std::runtime_error(err_msg); + } + for (int i =0; i < length; ++i) + f >> tensor_dense1kernel0[i]; + f >> tensor_name >> length; + if (tensor_name != "tensor_dense3bias0" ) { + std::string err_msg = "TMVA-SOFIE failed to read the correct tensor name; expected name is tensor_dense3bias0 , read " + tensor_name; + throw std::runtime_error(err_msg); + } + if (length != 1) { + std::string err_msg = "TMVA-SOFIE failed to read the correct tensor size; expected size is 1 , read " + std::to_string(length) ; + throw std::runtime_error(err_msg); + } + for (int i =0; i < length; ++i) + f >> tensor_dense3bias0[i]; + f >> tensor_name >> length; + if (tensor_name != "tensor_dense1bias0" ) { + std::string err_msg = "TMVA-SOFIE failed to read the correct tensor name; expected name is tensor_dense1bias0 , read " + tensor_name; + throw std::runtime_error(err_msg); + } + if (length != 7) { + std::string err_msg = "TMVA-SOFIE failed to read the correct tensor size; expected size is 7 , read " + std::to_string(length) ; + throw std::runtime_error(err_msg); + } + for (int i =0; i < length; ++i) + f >> tensor_dense1bias0[i]; + f >> tensor_name >> length; + if (tensor_name != "tensor_dense2kernel0" ) { + std::string err_msg = "TMVA-SOFIE failed to read the correct tensor name; expected name is tensor_dense2kernel0 , read " + tensor_name; + throw std::runtime_error(err_msg); + } + if (length != 42) { + std::string err_msg = "TMVA-SOFIE failed to read the correct tensor size; expected size is 42 , read " + std::to_string(length) ; + throw std::runtime_error(err_msg); + } + for (int i =0; i < length; ++i) + f >> tensor_dense2kernel0[i]; + f.close(); + { + float * data = TMVA::Experimental::SOFIE::UTILITY::UnidirectionalBroadcast(tensor_densebias0,{ 7 }, { 1 , 7 }); + std::copy(data, data + 7, tensor_densebias0bcast); + delete [] data; + } + { + float * data = TMVA::Experimental::SOFIE::UTILITY::UnidirectionalBroadcast(tensor_dense1bias0,{ 7 }, { 1 , 7 }); + std::copy(data, data + 7, tensor_dense1bias0bcast); + delete [] data; + } + { + float * data = TMVA::Experimental::SOFIE::UTILITY::UnidirectionalBroadcast(tensor_dense2bias0,{ 6 }, { 1 , 6 }); + std::copy(data, data + 6, tensor_dense2bias0bcast); + delete [] data; + } + { + float * data = TMVA::Experimental::SOFIE::UTILITY::UnidirectionalBroadcast(tensor_dense3bias0,{ 1 }, { 1 , 1 }); + std::copy(data, data + 1, tensor_dense3bias0bcast); + delete [] data; + } +} + +std::vector infer(float* tensor_denseinput){ + +//--------- Gemm + char op_0_transA = 'n'; + char op_0_transB = 'n'; + int op_0_m = 1; + int op_0_n = 7; + int op_0_k = 7; + float op_0_alpha = 1; + float op_0_beta = 1; + int op_0_lda = 7; + int op_0_ldb = 7; + std::copy(tensor_densebias0bcast, tensor_densebias0bcast + 7, tensor_denseDense); + BLAS::sgemm_(&op_0_transB, &op_0_transA, &op_0_n, &op_0_m, &op_0_k, &op_0_alpha, tensor_densekernel0, &op_0_ldb, tensor_denseinput, &op_0_lda, &op_0_beta, tensor_denseDense, &op_0_n); + for (int id = 0; id < 7 ; id++){ + tensor_denseSigmoid0[id] = 1 / (1 + std::exp( - tensor_denseDense[id])); + } + +//--------- Gemm + char op_2_transA = 'n'; + char op_2_transB = 'n'; + int op_2_m = 1; + int op_2_n = 7; + int op_2_k = 7; + float op_2_alpha = 1; + float op_2_beta = 1; + int op_2_lda = 7; + int op_2_ldb = 7; + std::copy(tensor_dense1bias0bcast, tensor_dense1bias0bcast + 7, tensor_dense1Dense); + BLAS::sgemm_(&op_2_transB, &op_2_transA, &op_2_n, &op_2_m, &op_2_k, &op_2_alpha, tensor_dense1kernel0, &op_2_ldb, tensor_denseSigmoid0, &op_2_lda, &op_2_beta, tensor_dense1Dense, &op_2_n); + for (int id = 0; id < 7 ; id++){ + tensor_dense1Sigmoid0[id] = 1 / (1 + std::exp( - tensor_dense1Dense[id])); + } + +//--------- Gemm + char op_4_transA = 'n'; + char op_4_transB = 'n'; + int op_4_m = 1; + int op_4_n = 6; + int op_4_k = 7; + float op_4_alpha = 1; + float op_4_beta = 1; + int op_4_lda = 7; + int op_4_ldb = 6; + std::copy(tensor_dense2bias0bcast, tensor_dense2bias0bcast + 6, tensor_dense2Dense); + BLAS::sgemm_(&op_4_transB, &op_4_transA, &op_4_n, &op_4_m, &op_4_k, &op_4_alpha, tensor_dense2kernel0, &op_4_ldb, tensor_dense1Sigmoid0, &op_4_lda, &op_4_beta, tensor_dense2Dense, &op_4_n); + for (int id = 0; id < 6 ; id++){ + tensor_dense2Sigmoid0[id] = 1 / (1 + std::exp( - tensor_dense2Dense[id])); + } + +//--------- Gemm + char op_6_transA = 'n'; + char op_6_transB = 'n'; + int op_6_m = 1; + int op_6_n = 1; + int op_6_k = 6; + float op_6_alpha = 1; + float op_6_beta = 1; + int op_6_lda = 6; + int op_6_ldb = 1; + std::copy(tensor_dense3bias0bcast, tensor_dense3bias0bcast + 1, tensor_dense3Dense); + BLAS::sgemm_(&op_6_transB, &op_6_transA, &op_6_n, &op_6_m, &op_6_k, &op_6_alpha, tensor_dense3kernel0, &op_6_ldb, tensor_dense2Sigmoid0, &op_6_lda, &op_6_beta, tensor_dense3Dense, &op_6_n); + for (int id = 0; id < 1 ; id++){ + tensor_dense3Sigmoid0[id] = 1 / (1 + std::exp( - tensor_dense3Dense[id])); + } + std::vector ret (tensor_dense3Sigmoid0, tensor_dense3Sigmoid0 + 1); + return ret; +} +}; +} //TMVA_SOFIE_trkqual + +#endif // TMVA_SOFIE_TRKQUAL diff --git a/TrkDiag/src/SConscript b/TrkDiag/src/SConscript index b2e89e4471..643c38f21c 100644 --- a/TrkDiag/src/SConscript +++ b/TrkDiag/src/SConscript @@ -14,6 +14,7 @@ rootlibs = env['ROOTLIBS'] babarlibs = env['BABARLIBS'] mainlib = helper.make_mainlib ( [ + 'openblas', 'mu2e_TrkReco', 'mu2e_ParticleID', 'mu2e_BTrkData', @@ -53,11 +54,14 @@ mainlib = helper.make_mainlib ( [ 'xerces-c', 'boost_filesystem', 'hep_concurrency', + 'TMVA', + 'ROOTTMVASofie' ] ) # Fixme: split into link lists for each module. helper.make_plugins( [ mainlib, + 'openblas', 'mu2e_TrkReco', 'mu2e_ParticleID', 'mu2e_BTrkData', @@ -106,6 +110,8 @@ helper.make_plugins( [ 'xerces-c', 'boost_filesystem', 'hep_concurrency', + 'TMVA', + 'ROOTTMVASofie', 'pthread' ] ) diff --git a/TrkDiag/src/TrackQuality_module.cc b/TrkDiag/src/TrackQuality_module.cc index fea85c8b63..0be44cd6cd 100644 --- a/TrkDiag/src/TrackQuality_module.cc +++ b/TrkDiag/src/TrackQuality_module.cc @@ -1,5 +1,6 @@ // // Create a TrkQual object +// using TMVA::SOFIE // // Original author A. Edmonds // @@ -14,13 +15,12 @@ // utilities #include "Offline/ProditionsService/inc/ProditionsHandle.hh" #include "Offline/Mu2eUtilities/inc/MVATools.hh" -#include "Offline/AnalysisConditions/inc/TrkQualCatalog.hh" #include "Offline/GlobalConstantsService/inc/GlobalConstantsHandle.hh" #include "Offline/GlobalConstantsService/inc/ParticleDataList.hh" // data #include "Offline/RecoDataProducts/inc/KalSeed.hh" -#include "Offline/RecoDataProducts/inc/TrkQual.hh" -#include "Offline/RecoDataProducts/inc/RecoQual.hh" +#include "Offline/RecoDataProducts/inc/MVAResult.hh" +#include "Offline/TrkDiag/inc/trkqual.hxx" // C++ #include #include @@ -32,10 +32,13 @@ using namespace std; using CLHEP::Hep3Vector; using CLHEP::HepVector; +namespace TMVA_SOFIE_trkqual { + class Session; +} namespace mu2e { - class TrackQuality : public art::EDProducer + class TrackQualityV2 : public art::EDProducer { public: struct Config { @@ -43,167 +46,107 @@ namespace mu2e using Comment=fhicl::Comment; fhicl::Atom kalSeedTag{Name("KalSeedCollection"), Comment("Input tag for KalSeedCollection")}; - fhicl::Atom trainName{Name("TrainingName"), Comment("Name of the training (e.g. TrkQual)")}; fhicl::Atom printMVA{Name("PrintMVA"), Comment("Print the MVA used"), false}; }; using Parameters = art::EDProducer::Table; - TrackQuality(const Parameters& conf); + TrackQualityV2(const Parameters& conf); private: void produce(art::Event& event) override; void initializeMVA(std::string xmlfilename); art::InputTag _kalSeedTag; - std::string _trainName; bool _printMVA; - mu2e::ProditionsHandle _trkQualCatalogH; + std::shared_ptr mva_; }; - TrackQuality::TrackQuality(const Parameters& conf) : + TrackQualityV2::TrackQualityV2(const Parameters& conf) : art::EDProducer{conf}, _kalSeedTag(conf().kalSeedTag()), - _trainName(conf().trainName()), _printMVA(conf().printMVA()) { - produces(); - produces(); + produces(); + mva_ = std::make_shared("Offline/TrkDiag/data/trkqual.dat"); } - void TrackQuality::produce(art::Event& event ) { - auto const& ptable = GlobalConstantsHandle(); + void TrackQualityV2::produce(art::Event& event ) { // create output - unique_ptr tqcol(new TrkQualCollection()); - unique_ptr rqcol(new RecoQualCollection()); + unique_ptr mvacol(new MVAResultCollection()); // get the KalSeeds art::Handle kalSeedHandle; event.getByLabel(_kalSeedTag, kalSeedHandle); const auto& kalSeeds = *kalSeedHandle; - TrkQualCatalog const& trkQualCatalog = _trkQualCatalogH.get(event.id()); - TrkQualEntry const& trkQualEntry = trkQualCatalog.find(_trainName); - - if(_printMVA) { - trkQualEntry._mvaTool.showMVA(); - } - // Go through the tracks and calculate their track qualities - for (const auto& i_kalSeed : kalSeeds) { - TrkQual trkqual; - - static TrkFitFlag goodfit(TrkFitFlag::kalmanOK); - if (i_kalSeed.status().hasAllProperties(goodfit)) { - - // fill the hit count variables - int nhits = 0; int nactive = 0; int ndouble = 0; int ndactive = 0; int nnullambig = 0; - static StrawHitFlag active(StrawHitFlag::active); - for (auto ihit = i_kalSeed.hits().begin(); ihit != i_kalSeed.hits().end(); ++ihit) { - ++nhits; - if (ihit->flag().hasAllProperties(active)) { - ++nactive; - if (ihit->ambig()==0) { - ++nnullambig; - } - } - auto jhit = ihit; jhit++; - if(jhit != i_kalSeed.hits().end() && ihit->strawId().uniquePanel() == - jhit->strawId().uniquePanel()){ - ++ndouble; - if(ihit->flag().hasAllProperties(active)) { ++ndactive; } - } - } - - int ndof = nactive -5; - if (i_kalSeed.hasCaloCluster()) { - ++ndof; - } - - int nmat = 0; int nmatactive = 0; int radlen = 0.0; - for (std::vector::const_iterator i_straw = i_kalSeed.straws().begin(); i_straw != i_kalSeed.straws().end(); ++i_straw) { - ++nmat; - if (i_straw->active()) { - ++nmatactive; - radlen += i_straw->radLen(); + for (const auto& kalSeed : kalSeeds) { + std::array features; // the features we trained on + + // fill the hit count variables + int nhits = 0; int nactive = 0; int ndouble = 0; int ndactive = 0; int nnullambig = 0; + static StrawHitFlag active(StrawHitFlag::active); + for (auto ihit = kalSeed.hits().begin(); ihit != kalSeed.hits().end(); ++ihit) { + ++nhits; + if (ihit->flag().hasAllProperties(active)) { + ++nactive; + if (ihit->ambig()==0) { + ++nnullambig; } } - - - trkqual[TrkQual::nactive] = nactive; - trkqual[TrkQual::factive] = (double) nactive / nhits; - trkqual[TrkQual::fdouble] = (double) ndactive / nactive; - trkqual[TrkQual::fnullambig] = (double) nnullambig / nactive; - trkqual[TrkQual::fstraws] = (double)nmatactive / nactive; - - // fill fit consistency and t0 variables - if (i_kalSeed.fitConsistency() > FLT_MIN) { - trkqual[TrkQual::log10fitcon] = log10(i_kalSeed.fitConsistency()); - } - else { - trkqual[TrkQual::log10fitcon] = -50.0; - } - trkqual[TrkQual::t0err] = i_kalSeed.t0().t0Err(); - - // find the best KalSegment and fill variables relating to it - KalSegment kseg; - std::vector const& ksegs = i_kalSeed.segments(); - auto bestkseg = ksegs.begin(); - double zpos = -1631.11; - for(auto ikseg = ksegs.begin(); ikseg != ksegs.end(); ++ikseg){ - HelixVal const& hel = ikseg->helix(); - // check for a segment whose range includes zpos. There should be a better way of doing this, FIXME - double sind = hel.tanDip()/sqrt(1.0+hel.tanDip()*hel.tanDip()); - if(hel.z0()+sind*ikseg->fmin() < zpos && hel.z0()+sind*ikseg->fmax() > zpos){ - bestkseg = ikseg; - break; - } + auto jhit = ihit; jhit++; + if(jhit != kalSeed.hits().end() && ihit->strawId().uniquePanel() == + jhit->strawId().uniquePanel()){ + ++ndouble; + if(ihit->flag().hasAllProperties(active)) { ++ndactive; } } - kseg = *bestkseg; - if (bestkseg != ksegs.end()) { - double charge = ptable->particle(i_kalSeed.particle()).charge(); - trkqual[TrkQual::momerr] = bestkseg->momerr(); - trkqual[TrkQual::d0] = -1*charge*bestkseg->helix().d0(); - trkqual[TrkQual::rmax] = -1*charge*(bestkseg->helix().d0() + 2.0/bestkseg->helix().omega()); + } - trkqual.setMVAStatus(MVAStatus::calculated); - trkqual.setMVAValue(trkQualEntry._mvaTool.evalMVA(trkqual.values(), trkQualEntry._mvaMask)); + int ndof = nactive -5; + if (kalSeed.hasCaloCluster()) { + ++ndof; + } - } - else { - trkqual.setMVAStatus(MVAStatus::filled); + int nmat = 0; int nmatactive = 0; int radlen = 0.0; + for (std::vector::const_iterator i_straw = kalSeed.straws().begin(); i_straw != kalSeed.straws().end(); ++i_straw) { + ++nmat; + if (i_straw->active()) { + ++nmatactive; + radlen += i_straw->radLen(); } } - tqcol->push_back(trkqual); - - // Get the efficiency cut that this track passes - Float_t passCalib = 0.0; // everything will pass a 100% efficient cut - if (trkQualEntry._calibrated) { - // std::cout << _trainName << " = " << trkqual.MVAValue() << std::endl; - for (const auto& i_pair : trkQualEntry._effCalib) { - // std::cout << i_pair.first << ", " << i_pair.second << ": "; - if (trkqual.MVAValue() >= i_pair.second) { - // std::cout << "PASSES" << std::endl; - passCalib = i_pair.first; - } - else { - // std::cout << "FAILS" << std::endl; - break; - } + + features[0] = nactive; + features[1] = (double) nactive / nhits; + features[3] = (double) nnullambig / nactive; + features[4] = kalSeed.fitConsistency(); + features[6] = (double)nmatactive / nactive; + + // Now get the features that are for the entrance of the trackre + for(size_t ikinter = 0; ikinter < kalSeed.intersections().size(); ++ikinter){ + auto const& kinter = kalSeed.intersections()[ikinter]; + if (kinter.surfaceId() == SurfaceIdDetail::TT_Front) { // we only want the tracker entrance (sid=0) + features[2] = sqrt(kinter.loopHelix().paramVar(KinKal::LoopHelix::t0_)); + features[5] = kinter.momerr(); + break; } } - rqcol->push_back(RecoQual(trkqual.status(),trkqual.MVAValue(), passCalib)); + + auto mvaout = mva_->infer(features.data()); + + mvacol->push_back(MVAResult(mvaout[0])); } - if ( (tqcol->size() != rqcol->size()) || (tqcol->size() != kalSeeds.size()) ) { - throw cet::exception("TrackQuality") << "KalSeed, TrkQual and RecoQual sizes are inconsistent (" << kalSeeds.size() << ", " << tqcol->size() << ", " << rqcol->size() << " respectively)"; + if ( (mvacol->size() != kalSeeds.size()) ) { + throw cet::exception("TrackQualityV2") << "KalSeed and MVAResult sizes are inconsistent (" << kalSeeds.size() << ", " << mvacol->size(); } + // put the output products into the event - event.put(move(tqcol)); - event.put(move(rqcol)); + event.put(move(mvacol)); } }// mu2e -DEFINE_ART_MODULE(mu2e::TrackQuality) +DEFINE_ART_MODULE(mu2e::TrackQualityV2) From de52f39c2e7370e8ccbb8b103c2406165b943d2d Mon Sep 17 00:00:00 2001 From: Eric Flumerfelt Date: Thu, 19 Oct 2023 14:47:26 -0500 Subject: [PATCH 006/213] Initial commit of CMake files for building the Offline --- Analyses/CMakeLists.txt | 173 ++++++++++ AnalysisConditions/CMakeLists.txt | 2 + AnalysisConfig/CMakeLists.txt | 1 + BFieldGeom/CMakeLists.txt | 15 + BFieldTest/CMakeLists.txt | 6 + BTrkData/CMakeLists.txt | 12 + BeamlineGeom/CMakeLists.txt | 10 + CMakeLists.txt | 127 ++++++++ CMakePresets.json | 112 +++++++ CRVConditions/CMakeLists.txt | 13 + CRVConfig/CMakeLists.txt | 1 + CRVFilters/CMakeLists.txt | 5 + CRVReco/CMakeLists.txt | 16 + CRVResponse/CMakeLists.txt | 38 +++ CalPatRec/CMakeLists.txt | 44 +++ CaloCluster/CMakeLists.txt | 21 ++ CaloConditions/CMakeLists.txt | 14 + CaloConfig/CMakeLists.txt | 1 + CaloDiag/CMakeLists.txt | 12 + CaloFilters/CMakeLists.txt | 17 + CaloMC/CMakeLists.txt | 27 ++ CaloReco/CMakeLists.txt | 19 ++ CalorimeterGeom/CMakeLists.txt | 15 + CommonMC/CMakeLists.txt | 23 ++ Compression/CMakeLists.txt | 17 + ConditionsBase/CMakeLists.txt | 1 + ConditionsService/CMakeLists.txt | 13 + ConfigTools/CMakeLists.txt | 13 + CosmicRayShieldGeom/CMakeLists.txt | 19 ++ CosmicReco/CMakeLists.txt | 37 +++ DAQ/CMakeLists.txt | 29 ++ DAQConditions/CMakeLists.txt | 12 + DAQConfig/CMakeLists.txt | 1 + DataProducts/CMakeLists.txt | 22 ++ DbService/CMakeLists.txt | 22 ++ DbTables/CMakeLists.txt | 16 + DetectorSolenoidGeom/CMakeLists.txt | 10 + EventDisplay/CMakeLists.txt | 15 + EventGenerator/CMakeLists.txt | 101 ++++++ EventMixing/CMakeLists.txt | 19 ++ ExternalShieldingGeom/CMakeLists.txt | 12 + ExtinctionMonitorFNAL/CMakeLists.txt | 1 + Filters/CMakeLists.txt | 79 +++++ GeneralUtilities/CMakeLists.txt | 38 +++ GeomPrimitives/CMakeLists.txt | 13 + GeometryService/CMakeLists.txt | 49 +++ GlobalConstantsService/CMakeLists.txt | 16 + HelloWorld/CMakeLists.txt | 8 + KinKalGeom/CMakeLists.txt | 15 + MBSGeom/CMakeLists.txt | 3 + MCDataProducts/CMakeLists.txt | 29 ++ MECOStyleProtonAbsorberGeom/CMakeLists.txt | 10 + Mu2e/CMakeLists.txt | 9 + Mu2eBTrk/CMakeLists.txt | 12 + Mu2eG4/CMakeLists.txt | 140 ++++++++ Mu2eG4Helper/CMakeLists.txt | 12 + Mu2eHallGeom/CMakeLists.txt | 10 + Mu2eInterfaces/CMakeLists.txt | 11 + Mu2eKinKal/CMakeLists.txt | 34 ++ Mu2eUtilities/CMakeLists.txt | 61 ++++ PTMGeom/CMakeLists.txt | 13 + ParticleID/CMakeLists.txt | 18 ++ Print/CMakeLists.txt | 61 ++++ ProditionsService/CMakeLists.txt | 13 + ProductionSolenoidGeom/CMakeLists.txt | 12 + ProductionTargetGeom/CMakeLists.txt | 10 + ProtonBeamDumpGeom/CMakeLists.txt | 10 + RecoDataProducts/CMakeLists.txt | 41 +++ STMConditions/CMakeLists.txt | 11 + STMConfig/CMakeLists.txt | 1 + STMGeom/CMakeLists.txt | 1 + STMReco/CMakeLists.txt | 15 + SeedService/CMakeLists.txt | 12 + ServicesGeom/CMakeLists.txt | 11 + SimulationConditions/CMakeLists.txt | 13 + SimulationConfig/CMakeLists.txt | 1 + Sources/CMakeLists.txt | 19 ++ StoppingTargetGeom/CMakeLists.txt | 10 + TEveEventDisplay/CMakeLists.txt | 30 ++ TestTools/CMakeLists.txt | 10 + TrackCaloMatching/CMakeLists.txt | 15 + TrackerConditions/CMakeLists.txt | 28 ++ TrackerConfig/CMakeLists.txt | 1 + TrackerGeom/CMakeLists.txt | 16 + TrackerMC/CMakeLists.txt | 20 ++ Trigger/CMakeLists.txt | 13 + TrkDiag/CMakeLists.txt | 39 +++ TrkExt/CMakeLists.txt | 20 ++ TrkFilters/CMakeLists.txt | 9 + TrkHitReco/CMakeLists.txt | 29 ++ TrkPatRec/CMakeLists.txt | 24 ++ TrkReco/CMakeLists.txt | 28 ++ UtilityModules/CMakeLists.txt | 8 + Validation/CMakeLists.txt | 49 +++ make_cmake.sh | 58 ++++ ups/product_deps | 353 +++++++++++++++++++++ ups/setup_deps | 260 +++++++++++++++ ups/setup_for_development | 260 +++++++++++++++ 98 files changed, 3175 insertions(+) create mode 100644 Analyses/CMakeLists.txt create mode 100644 AnalysisConditions/CMakeLists.txt create mode 100644 AnalysisConfig/CMakeLists.txt create mode 100644 BFieldGeom/CMakeLists.txt create mode 100644 BFieldTest/CMakeLists.txt create mode 100644 BTrkData/CMakeLists.txt create mode 100644 BeamlineGeom/CMakeLists.txt create mode 100644 CMakeLists.txt create mode 100644 CMakePresets.json create mode 100644 CRVConditions/CMakeLists.txt create mode 100644 CRVConfig/CMakeLists.txt create mode 100644 CRVFilters/CMakeLists.txt create mode 100644 CRVReco/CMakeLists.txt create mode 100644 CRVResponse/CMakeLists.txt create mode 100644 CalPatRec/CMakeLists.txt create mode 100644 CaloCluster/CMakeLists.txt create mode 100644 CaloConditions/CMakeLists.txt create mode 100644 CaloConfig/CMakeLists.txt create mode 100644 CaloDiag/CMakeLists.txt create mode 100644 CaloFilters/CMakeLists.txt create mode 100644 CaloMC/CMakeLists.txt create mode 100644 CaloReco/CMakeLists.txt create mode 100644 CalorimeterGeom/CMakeLists.txt create mode 100644 CommonMC/CMakeLists.txt create mode 100644 Compression/CMakeLists.txt create mode 100644 ConditionsBase/CMakeLists.txt create mode 100644 ConditionsService/CMakeLists.txt create mode 100644 ConfigTools/CMakeLists.txt create mode 100644 CosmicRayShieldGeom/CMakeLists.txt create mode 100644 CosmicReco/CMakeLists.txt create mode 100644 DAQ/CMakeLists.txt create mode 100644 DAQConditions/CMakeLists.txt create mode 100644 DAQConfig/CMakeLists.txt create mode 100644 DataProducts/CMakeLists.txt create mode 100644 DbService/CMakeLists.txt create mode 100644 DbTables/CMakeLists.txt create mode 100644 DetectorSolenoidGeom/CMakeLists.txt create mode 100644 EventDisplay/CMakeLists.txt create mode 100644 EventGenerator/CMakeLists.txt create mode 100644 EventMixing/CMakeLists.txt create mode 100644 ExternalShieldingGeom/CMakeLists.txt create mode 100644 ExtinctionMonitorFNAL/CMakeLists.txt create mode 100644 Filters/CMakeLists.txt create mode 100644 GeneralUtilities/CMakeLists.txt create mode 100644 GeomPrimitives/CMakeLists.txt create mode 100644 GeometryService/CMakeLists.txt create mode 100644 GlobalConstantsService/CMakeLists.txt create mode 100644 HelloWorld/CMakeLists.txt create mode 100644 KinKalGeom/CMakeLists.txt create mode 100644 MBSGeom/CMakeLists.txt create mode 100644 MCDataProducts/CMakeLists.txt create mode 100644 MECOStyleProtonAbsorberGeom/CMakeLists.txt create mode 100644 Mu2e/CMakeLists.txt create mode 100644 Mu2eBTrk/CMakeLists.txt create mode 100644 Mu2eG4/CMakeLists.txt create mode 100644 Mu2eG4Helper/CMakeLists.txt create mode 100644 Mu2eHallGeom/CMakeLists.txt create mode 100644 Mu2eInterfaces/CMakeLists.txt create mode 100644 Mu2eKinKal/CMakeLists.txt create mode 100644 Mu2eUtilities/CMakeLists.txt create mode 100644 PTMGeom/CMakeLists.txt create mode 100644 ParticleID/CMakeLists.txt create mode 100644 Print/CMakeLists.txt create mode 100644 ProditionsService/CMakeLists.txt create mode 100644 ProductionSolenoidGeom/CMakeLists.txt create mode 100644 ProductionTargetGeom/CMakeLists.txt create mode 100644 ProtonBeamDumpGeom/CMakeLists.txt create mode 100644 RecoDataProducts/CMakeLists.txt create mode 100644 STMConditions/CMakeLists.txt create mode 100644 STMConfig/CMakeLists.txt create mode 100644 STMGeom/CMakeLists.txt create mode 100644 STMReco/CMakeLists.txt create mode 100644 SeedService/CMakeLists.txt create mode 100644 ServicesGeom/CMakeLists.txt create mode 100644 SimulationConditions/CMakeLists.txt create mode 100644 SimulationConfig/CMakeLists.txt create mode 100644 Sources/CMakeLists.txt create mode 100644 StoppingTargetGeom/CMakeLists.txt create mode 100644 TEveEventDisplay/CMakeLists.txt create mode 100644 TestTools/CMakeLists.txt create mode 100644 TrackCaloMatching/CMakeLists.txt create mode 100644 TrackerConditions/CMakeLists.txt create mode 100644 TrackerConfig/CMakeLists.txt create mode 100644 TrackerGeom/CMakeLists.txt create mode 100644 TrackerMC/CMakeLists.txt create mode 100644 Trigger/CMakeLists.txt create mode 100644 TrkDiag/CMakeLists.txt create mode 100644 TrkExt/CMakeLists.txt create mode 100644 TrkFilters/CMakeLists.txt create mode 100644 TrkHitReco/CMakeLists.txt create mode 100644 TrkPatRec/CMakeLists.txt create mode 100644 TrkReco/CMakeLists.txt create mode 100644 UtilityModules/CMakeLists.txt create mode 100644 Validation/CMakeLists.txt create mode 100755 make_cmake.sh create mode 100644 ups/product_deps create mode 100644 ups/setup_deps create mode 100644 ups/setup_for_development diff --git a/Analyses/CMakeLists.txt b/Analyses/CMakeLists.txt new file mode 100644 index 0000000000..0b01176fa2 --- /dev/null +++ b/Analyses/CMakeLists.txt @@ -0,0 +1,173 @@ +cet_build_plugin(BFieldPlotter art::module REG_SOURCE src/BFieldPlotter_module.cc) + +cet_build_plugin(CaloCalibAna art::module REG_SOURCE src/CaloCalibAna_module.cc) + +cet_build_plugin(CaloCalib art::module REG_SOURCE src/CaloCalib_module.cc) + +cet_build_plugin(CaloClusterCompare art::module REG_SOURCE src/CaloClusterCompare_module.cc) + +cet_build_plugin(CaloDigiAna art::module REG_SOURCE src/CaloDigiAna_module.cc LIBRARIES REG ROOT::Hist) + +cet_build_plugin(CaloHitFinderInspect art::module REG_SOURCE src/CaloHitFinderInspect_module.cc) + +cet_build_plugin(CaloTrackMatchExample art::module REG_SOURCE src/CaloTrackMatchExample_module.cc) + +cet_build_plugin(CollectionSizeAnalyzer art::module REG_SOURCE src/CollectionSizeAnalyzer_module.cc) + +cet_build_plugin(CompressionCheck0 art::module REG_SOURCE src/CompressionCheck0_module.cc) + +cet_build_plugin(CORSIKAGenPlots art::module REG_SOURCE src/CORSIKAGenPlots_module.cc) + +cet_build_plugin(CosmicAnalysis art::module REG_SOURCE src/CosmicAnalysis_module.cc) + +cet_build_plugin(CosmicFilter art::module REG_SOURCE src/CosmicFilter_module.cc LIBRARIES REG ROOT::Hist) + +cet_build_plugin(CountPionDecays art::module REG_SOURCE src/CountPionDecays_module.cc) + +cet_build_plugin(CRYGenPlots art::module REG_SOURCE src/CRYGenPlots_module.cc) + +cet_build_plugin(DiskCal00 art::module REG_SOURCE src/DiskCal00_module.cc) + +cet_build_plugin(EMFCSimpleDumper art::module REG_SOURCE src/EMFCSimpleDumper_module.cc) + +cet_build_plugin(EventIDSequencePrinter art::module REG_SOURCE src/EventIDSequencePrinter_module.cc) + +cet_build_plugin(EventLister art::module REG_SOURCE src/EventLister_module.cc) + +cet_build_plugin(ExtremeHitTimes art::module REG_SOURCE src/ExtremeHitTimes_module.cc) + +cet_build_plugin(FilterEmptyEvents art::module REG_SOURCE src/FilterEmptyEvents_module.cc) + +cet_build_plugin(FilterVDHits art::module REG_SOURCE src/FilterVDHits_module.cc) + +cet_build_plugin(G4ReactionAnalyzer art::module REG_SOURCE src/G4ReactionAnalyzer_module.cc LIBRARIES REG ROOT::Hist) + +cet_build_plugin(GenParticlesAnalyzer art::module REG_SOURCE src/GenParticlesAnalyzer_module.cc) + +cet_build_plugin(GeomVis art::module REG_SOURCE src/GeomVis_module.cc) + +cet_build_plugin(Histforpabs art::module REG_SOURCE src/Histforpabs_module.cc LIBRARIES REG art_root_io::TFileService_service) + +cet_build_plugin(InteractiveRoot art::module REG_SOURCE src/InteractiveRoot_module.cc) + +cet_build_plugin(KineticFracAnalysis art::module REG_SOURCE src/KineticFracAnalysis_module.cc) + +cet_build_plugin(materailsPropStudy art::module REG_SOURCE src/materailsPropStudy_module.cc) + +cet_build_plugin(MTVerification art::module REG_SOURCE src/MTVerification_module.cc) + +cet_build_plugin(Mu2eG4StudyCalo01ReadBack art::module REG_SOURCE src/Mu2eG4StudyCalo01ReadBack_module.cc) + +cet_build_plugin(Mu2eG4StudyReadBack art::module REG_SOURCE src/Mu2eG4StudyReadBack_module.cc) + +cet_build_plugin(ParticleIDScan art::module REG_SOURCE src/ParticleIDScan_module.cc LIBRARIES REG art_root_io::tfile_support) + +cet_build_plugin(PbarAnalysis2 art::module REG_SOURCE src/PbarAnalysis2_module.cc) + +cet_build_plugin(pbars1hist art::module REG_SOURCE src/pbars1hist_module.cc) + +cet_build_plugin(PionMomentumAnalyzer art::module REG_SOURCE src/PionMomentumAnalyzer_module.cc) + +cet_build_plugin(PointerCheck art::module REG_SOURCE src/PointerCheck_module.cc) + +cet_build_plugin(PrimaryProtonEnergyDumper art::module REG_SOURCE src/PrimaryProtonEnergyDumper_module.cc) + +cet_build_plugin(PrintGenParticles art::module REG_SOURCE src/PrintGenParticles_module.cc) + +cet_build_plugin(PrintSTMGeom art::module REG_SOURCE src/PrintSTMGeom_module.cc) + +cet_build_plugin(PrintStrawHits art::module REG_SOURCE src/PrintStrawHits_module.cc) + +cet_build_plugin(PrintTrackerGeom art::module REG_SOURCE src/PrintTrackerGeom_module.cc) + +cet_build_plugin(ProtonBunchIntensityAnalyzer art::module REG_SOURCE src/ProtonBunchIntensityAnalyzer_module.cc) + +cet_build_plugin(PtrTest0 art::module REG_SOURCE src/PtrTest0_module.cc) + +cet_build_plugin(PtrTest art::module REG_SOURCE src/PtrTest_module.cc) + +cet_build_plugin(ReadAntiProtonSteps art::module REG_SOURCE src/ReadAntiProtonSteps_module.cc) + +cet_build_plugin(ReadBack0 art::module REG_SOURCE src/ReadBack0_module.cc) + +cet_build_plugin(ReadBack art::module REG_SOURCE src/ReadBack_module.cc) + +cet_build_plugin(ReadCaloDigi art::module REG_SOURCE src/ReadCaloDigi_module.cc) + +cet_build_plugin(ReadMCTrajectories art::module REG_SOURCE src/ReadMCTrajectories_module.cc) + +cet_build_plugin(ReadPSVacuum art::module REG_SOURCE src/ReadPSVacuum_module.cc) + +cet_build_plugin(ReadPTM art::module REG_SOURCE src/ReadPTM_module.cc) + +cet_build_plugin(ReadPtr art::module REG_SOURCE src/ReadPtr_module.cc) + +cet_build_plugin(ReadStrawDigiReco art::module REG_SOURCE src/ReadStrawDigiReco_module.cc) + +cet_build_plugin(ReadStrawHitReco art::module REG_SOURCE src/ReadStrawHitReco_module.cc) + +cet_build_plugin(ReadTrackCaloMatching art::module REG_SOURCE src/ReadTrackCaloMatching_module.cc) + +cet_build_plugin(ReadTrackCaloMatchingMVA art::module REG_SOURCE src/ReadTrackCaloMatchingMVA_module.cc) + +cet_build_plugin(ReadTrackerSteps art::module REG_SOURCE src/ReadTrackerSteps_module.cc) + +cet_build_plugin(ReadTrkExtrapol art::module REG_SOURCE src/ReadTrkExtrapol_module.cc) + +cet_build_plugin(ReadTrkExtrapolMVA art::module REG_SOURCE src/ReadTrkExtrapolMVA_module.cc) + +cet_build_plugin(ReadVirtualDetector art::module REG_SOURCE src/ReadVirtualDetector_module.cc) + +cet_build_plugin(SelectiveStepPtPrinter art::module REG_SOURCE src/SelectiveStepPtPrinter_module.cc) + +cet_build_plugin(SelectPiMinusAtTS5 art::module REG_SOURCE src/SelectPiMinusAtTS5_module.cc) + +cet_build_plugin(SensitiveTargetEnergyDumper art::module REG_SOURCE src/SensitiveTargetEnergyDumper_module.cc) + +cet_build_plugin(SimParticleAnalyzer art::module REG_SOURCE src/SimParticleAnalyzer_module.cc) + +cet_build_plugin(SimParticleCheck00 art::module REG_SOURCE src/SimParticleCheck00_module.cc) + +cet_build_plugin(SimParticleDumperCompact art::module REG_SOURCE src/SimParticleDumperCompact_module.cc) + +cet_build_plugin(SimParticlesPrinter art::module REG_SOURCE src/SimParticlesPrinter_module.cc) + +cet_build_plugin(StatusG4Analyzer art::module REG_SOURCE src/StatusG4Analyzer_module.cc) + +cet_build_plugin(StepPointMC1stHitDumper art::module REG_SOURCE src/StepPointMC1stHitDumper_module.cc) + +cet_build_plugin(StepPointMCDumperCalo art::module REG_SOURCE src/StepPointMCDumperCalo_module.cc) + +cet_build_plugin(StepPointMCDumperCompact art::module REG_SOURCE src/StepPointMCDumperCompact_module.cc) + +cet_build_plugin(StepPointMCDumper art::module REG_SOURCE src/StepPointMCDumper_module.cc) + +cet_build_plugin(StepPointsPrinter art::module REG_SOURCE src/StepPointsPrinter_module.cc) + +cet_build_plugin(StoppedParticlesDumper art::module REG_SOURCE src/StoppedParticlesDumper_module.cc) + +cet_build_plugin(StoppedParticlesPrinter art::module REG_SOURCE src/StoppedParticlesPrinter_module.cc) + +cet_build_plugin(TrackSummaryDataAnalyzer art::module REG_SOURCE src/TrackSummaryDataAnalyzer_module.cc) + +cet_build_plugin(TrackSummaryMaker art::module REG_SOURCE src/TrackSummaryMaker_module.cc) + +cet_build_plugin(TrackSummaryMCAnalyzer art::module REG_SOURCE src/TrackSummaryMCAnalyzer_module.cc) + +cet_build_plugin(TrackSummaryTruthMaker art::module REG_SOURCE src/TrackSummaryTruthMaker_module.cc) + +cet_build_plugin(TrackSummaryTruthRFSelector art::module REG_SOURCE src/TrackSummaryTruthRFSelector_module.cc) + +cet_build_plugin(TSTrackAna art::module REG_SOURCE src/TSTrackAna_module.cc) + +cet_build_plugin(TVirtDebug art::module REG_SOURCE src/TVirtDebug_module.cc) + +cet_build_plugin(ViewAllProvenances art::module REG_SOURCE src/ViewAllProvenances_module.cc) + +cet_build_plugin(ViewProvenance art::module REG_SOURCE src/ViewProvenance_module.cc) + +cet_build_plugin(VMMonitor art::module REG_SOURCE src/VMMonitor_module.cc) + + +install_source(SUBDIRS src) +install_fhicl(SUBDIRS fcl SUBDIRNAME Analyses) diff --git a/AnalysisConditions/CMakeLists.txt b/AnalysisConditions/CMakeLists.txt new file mode 100644 index 0000000000..01300267a3 --- /dev/null +++ b/AnalysisConditions/CMakeLists.txt @@ -0,0 +1,2 @@ +install_headers(SUBDIRS inc) +install_fhicl(SUBDIRS fcl SUBDIRNAME AnalysisConditions) diff --git a/AnalysisConfig/CMakeLists.txt b/AnalysisConfig/CMakeLists.txt new file mode 100644 index 0000000000..04a44744b2 --- /dev/null +++ b/AnalysisConfig/CMakeLists.txt @@ -0,0 +1 @@ +install_headers(SUBDIRS inc) diff --git a/BFieldGeom/CMakeLists.txt b/BFieldGeom/CMakeLists.txt new file mode 100644 index 0000000000..a30f692f35 --- /dev/null +++ b/BFieldGeom/CMakeLists.txt @@ -0,0 +1,15 @@ +cet_make_library( + SOURCE +src/BFCacheManager.cc +src/BFGridMap.cc +src/BFieldManager.cc +src/BFInterpolationStyle.cc +src/BFMapType.cc +src/BFParamMap.cc +LIBRARIES PUBLIC +cetlib::cetlib +) + + +install_source(SUBDIRS src) +install_headers(SUBDIRS inc) diff --git a/BFieldTest/CMakeLists.txt b/BFieldTest/CMakeLists.txt new file mode 100644 index 0000000000..e6438f8419 --- /dev/null +++ b/BFieldTest/CMakeLists.txt @@ -0,0 +1,6 @@ +cet_build_plugin(BFieldSymmetry art::module REG_SOURCE src/BFieldSymmetry_module.cc) + +cet_build_plugin(BFieldTest art::module REG_SOURCE src/BFieldTest_module.cc) + + +install_source(SUBDIRS src) diff --git a/BTrkData/CMakeLists.txt b/BTrkData/CMakeLists.txt new file mode 100644 index 0000000000..baed02deba --- /dev/null +++ b/BTrkData/CMakeLists.txt @@ -0,0 +1,12 @@ +cet_make_library( + SOURCE +src/Doublet.cc +src/TrkCaloHit.cc +src/TrkStrawHit.cc +LIBRARIES PUBLIC +cetlib::cetlib +) + + +install_source(SUBDIRS src) +install_headers(SUBDIRS inc) diff --git a/BeamlineGeom/CMakeLists.txt b/BeamlineGeom/CMakeLists.txt new file mode 100644 index 0000000000..affe5f5a63 --- /dev/null +++ b/BeamlineGeom/CMakeLists.txt @@ -0,0 +1,10 @@ +cet_make_library( + SOURCE +src/TSdA.cc +LIBRARIES PUBLIC +cetlib::cetlib +) + + +install_source(SUBDIRS src) +install_headers(SUBDIRS inc) diff --git a/CMakeLists.txt b/CMakeLists.txt new file mode 100644 index 0000000000..3288471683 --- /dev/null +++ b/CMakeLists.txt @@ -0,0 +1,127 @@ + +cmake_minimum_required (VERSION 3.19 FATAL_ERROR) + +find_package(cetmodules) + +project(offline VERSION 11.00.00) + +include(CetCMakeEnv) +cet_cmake_env() + +cet_set_compiler_flags(DIAGS VIGILANT + WERROR + NO_UNDEFINED + EXTRA_FLAGS -pedantic + ) + + include_directories(..) + + find_package(art_root_io REQUIRED) + +include(ArtDictionary) +include(BuildPlugins) + +add_subdirectory(Analyses) +add_subdirectory(AnalysisConditions) +add_subdirectory(AnalysisConfig) +#add_subdirectory(AnalysisUtilities) +add_subdirectory(BeamlineGeom) +add_subdirectory(BFieldGeom) +add_subdirectory(BFieldTest) +#add_subdirectory(bin) +#add_subdirectory(boost_fix) +add_subdirectory(BTrkData) +add_subdirectory(CaloCluster) +add_subdirectory(CaloConditions) +add_subdirectory(CaloConfig) +add_subdirectory(CaloDiag) +add_subdirectory(CaloFilters) +add_subdirectory(CaloMC) +add_subdirectory(CaloReco) +add_subdirectory(CalorimeterGeom) +add_subdirectory(CalPatRec) +add_subdirectory(CommonMC) +add_subdirectory(Compression) +add_subdirectory(ConditionsBase) +add_subdirectory(ConditionsService) +add_subdirectory(ConfigTools) +add_subdirectory(CosmicRayShieldGeom) +add_subdirectory(CosmicReco) +add_subdirectory(CRVConditions) +add_subdirectory(CRVConfig) +add_subdirectory(CRVFilters) +add_subdirectory(CRVReco) +add_subdirectory(CRVResponse) +add_subdirectory(DAQ) +add_subdirectory(DAQConditions) +add_subdirectory(DAQConfig) +add_subdirectory(DataProducts) +add_subdirectory(DbService) +add_subdirectory(DbTables) +add_subdirectory(DetectorSolenoidGeom) +add_subdirectory(EventDisplay) +add_subdirectory(EventGenerator) +add_subdirectory(EventMixing) +add_subdirectory(ExternalShieldingGeom) +add_subdirectory(ExtinctionMonitorFNAL) +#add_subdirectory(fcl) +add_subdirectory(Filters) +add_subdirectory(GeneralUtilities) +add_subdirectory(GeometryService) +add_subdirectory(GeomPrimitives) +add_subdirectory(GlobalConstantsService) +add_subdirectory(HelloWorld) +#add_subdirectory(KalmanTests) +add_subdirectory(KinKalGeom) +add_subdirectory(MBSGeom) +add_subdirectory(MCDataProducts) +add_subdirectory(MECOStyleProtonAbsorberGeom) +add_subdirectory(Mu2e) +add_subdirectory(Mu2eBTrk) +add_subdirectory(Mu2eG4) +add_subdirectory(Mu2eG4Helper) +add_subdirectory(Mu2eHallGeom) +add_subdirectory(Mu2eInterfaces) +add_subdirectory(Mu2eKinKal) +#add_subdirectory(Mu2eReco) +add_subdirectory(Mu2eUtilities) +add_subdirectory(ParticleID) +add_subdirectory(Print) +add_subdirectory(ProditionsService) +add_subdirectory(ProductionSolenoidGeom) +add_subdirectory(ProductionTargetGeom) +add_subdirectory(ProtonBeamDumpGeom) +add_subdirectory(PTMGeom) +add_subdirectory(RecoDataProducts) +#add_subdirectory(scripts) +add_subdirectory(SeedService) +add_subdirectory(ServicesGeom) +add_subdirectory(SimulationConditions) +add_subdirectory(SimulationConfig) +add_subdirectory(Sources) +add_subdirectory(STMConditions) +add_subdirectory(STMConfig) +add_subdirectory(STMGeom) +add_subdirectory(STMReco) +add_subdirectory(StoppingTargetGeom) +add_subdirectory(TestTools) +add_subdirectory(TEveEventDisplay) +add_subdirectory(TrackCaloMatching) +add_subdirectory(TrackerConditions) +add_subdirectory(TrackerConfig) +add_subdirectory(TrackerGeom) +add_subdirectory(TrackerMC) +add_subdirectory(Trigger) +add_subdirectory(TrkDiag) +add_subdirectory(TrkExt) +add_subdirectory(TrkFilters) +add_subdirectory(TrkHitReco) +add_subdirectory(TrkPatRec) +add_subdirectory(TrkReco) +#add_subdirectory(ups_install) +add_subdirectory(UtilityModules) +add_subdirectory(Validation) + +install_fhicl(SUBDIRS fcl) + +cet_cmake_config() \ No newline at end of file diff --git a/CMakePresets.json b/CMakePresets.json new file mode 100644 index 0000000000..5ca47be1f9 --- /dev/null +++ b/CMakePresets.json @@ -0,0 +1,112 @@ +{ + "configurePresets" : [ + { + "cacheVariables" : { + "CMAKE_BUILD_TYPE" : { + "type" : "STRING", + "value" : "Debug" + }, + "CMAKE_CXX_EXTENSIONS" : { + "type" : "BOOL", + "value" : "OFF" + }, + "CMAKE_CXX_STANDARD_REQUIRED" : { + "type" : "BOOL", + "value" : "ON" + } + }, + "description" : "Configuration settings translated from ups/product_deps", + "displayName" : "Configuration from product_deps", + "hidden" : true, + "name" : "from_product_deps" + }, + { + "cacheVariables" : { + "CMAKE_CXX_COMPILER" : { + "type" : "STRING", + "value" : "$env{CETPKG_CXX_COMPILER}" + }, + "CMAKE_CXX_STANDARD" : { + "type" : "STRING", + "value" : "$env{CETPKG_CXX_STANDARD}" + }, + "CMAKE_C_COMPILER" : { + "type" : "STRING", + "value" : "$env{CETPKG_C_COMPILER}" + }, + "CMAKE_Fortran_COMPILER" : { + "type" : "STRING", + "value" : "$env{CETPKG_Fortran_COMPILER}" + }, + "UPS_CXX_COMPILER_ID" : { + "type" : "STRING", + "value" : "$env{CETPKG_CXX_COMPILER_ID}" + }, + "UPS_CXX_COMPILER_VERSION" : { + "type" : "STRING", + "value" : "$env{CETPKG_CXX_COMPILER_VERSION}" + }, + "UPS_C_COMPILER_ID" : { + "type" : "STRING", + "value" : "$env{CETPKG_C_COMPILER_ID}" + }, + "UPS_C_COMPILER_VERSION" : { + "type" : "STRING", + "value" : "$env{CETPKG_C_COMPILER_VERSION}" + }, + "UPS_Fortran_COMPILER_ID" : { + "type" : "STRING", + "value" : "$env{CETPKG_Fortran_COMPILER_ID}" + }, + "UPS_Fortran_COMPILER_VERSION" : { + "type" : "STRING", + "value" : "$env{CETPKG_Fortran_COMPILER_VERSION}" + }, + "WANT_UPS" : { + "type" : "BOOL", + "value" : true + }, + "offline_EXEC_PREFIX_INIT" : { + "type" : "STRING", + "value" : "$env{CETPKG_FQ_DIR}" + }, + "offline_UPS_BUILD_ONLY_DEPENDENCIES_INIT" : { + "type" : "STRING", + "value" : "cetmodules" + }, + "offline_UPS_PRODUCT_FLAVOR_INIT" : { + "type" : "STRING", + "value" : "$env{CETPKG_FLAVOR}" + }, + "offline_UPS_PRODUCT_NAME_INIT" : { + "type" : "STRING", + "value" : "offline" + }, + "offline_UPS_QUALIFIER_STRING_INIT" : { + "type" : "STRING", + "value" : "$env{CETPKG_QUALSPEC}" + } + }, + "description" : "Extra configuration for UPS package generation", + "displayName" : "UPS extra configuration", + "hidden" : true, + "name" : "extra_for_UPS" + }, + { + "description" : "Default configuration including settings from ups/product_deps", + "displayName" : "Default configuration", + "inherits" : "from_product_deps", + "name" : "default" + }, + { + "description" : "Default configuration for UPS package generation", + "displayName" : "Default configuration for UPS", + "inherits" : [ + "default", + "extra_for_UPS" + ], + "name" : "for_UPS" + } + ], + "version" : 3 +} diff --git a/CRVConditions/CMakeLists.txt b/CRVConditions/CMakeLists.txt new file mode 100644 index 0000000000..96ec34beb9 --- /dev/null +++ b/CRVConditions/CMakeLists.txt @@ -0,0 +1,13 @@ +cet_make_library( + SOURCE +src/CRVCalibMaker.cc +src/CRVOrdinalMaker.cc +src/CRVStatusMaker.cc +LIBRARIES PUBLIC +cetlib::cetlib +) + + +install_source(SUBDIRS src) +install_headers(SUBDIRS inc) +install_fhicl(SUBDIRS fcl SUBDIRNAME CRVConditions) diff --git a/CRVConfig/CMakeLists.txt b/CRVConfig/CMakeLists.txt new file mode 100644 index 0000000000..04a44744b2 --- /dev/null +++ b/CRVConfig/CMakeLists.txt @@ -0,0 +1 @@ +install_headers(SUBDIRS inc) diff --git a/CRVFilters/CMakeLists.txt b/CRVFilters/CMakeLists.txt new file mode 100644 index 0000000000..3fc8787d6c --- /dev/null +++ b/CRVFilters/CMakeLists.txt @@ -0,0 +1,5 @@ +cet_build_plugin(CrvCoincidenceClusterFilter art::module REG_SOURCE src/CrvCoincidenceClusterFilter_module.cc) + + +install_source(SUBDIRS src) +install_fhicl(SUBDIRS fcl SUBDIRNAME CRVFilters) diff --git a/CRVReco/CMakeLists.txt b/CRVReco/CMakeLists.txt new file mode 100644 index 0000000000..56c1c2f03f --- /dev/null +++ b/CRVReco/CMakeLists.txt @@ -0,0 +1,16 @@ +cet_make_library( + SOURCE +src/CrvHelper.cc +src/MakeCrvRecoPulses.cc +LIBRARIES PUBLIC +cetlib::cetlib +) + +cet_build_plugin(CrvCoincidenceFinder art::module REG_SOURCE src/CrvCoincidenceFinder_module.cc) + +cet_build_plugin(CrvRecoPulsesFinder art::module REG_SOURCE src/CrvRecoPulsesFinder_module.cc) + + +install_source(SUBDIRS src) +install_headers(SUBDIRS inc) +install_fhicl(SUBDIRS fcl SUBDIRNAME CRVReco) diff --git a/CRVResponse/CMakeLists.txt b/CRVResponse/CMakeLists.txt new file mode 100644 index 0000000000..4ce55fe623 --- /dev/null +++ b/CRVResponse/CMakeLists.txt @@ -0,0 +1,38 @@ +cet_make_library( + SOURCE +src/CrvMCHelper.cc +src/DrawLookupTableHistograms.cc +src/MakeCrvDigis.cc +src/MakeCrvPhotons.cc +src/MakeCrvSiPMCharges.cc +src/MakeCrvWaveforms.cc +LIBRARIES PUBLIC +cetlib::cetlib +) + +cet_build_plugin(CrvCalibration art::module REG_SOURCE src/CrvCalibration_module.cc) + +cet_build_plugin(CrvCoincidenceClusterMatchMC art::module REG_SOURCE src/CrvCoincidenceClusterMatchMC_module.cc) + +cet_build_plugin(CrvDigitizer art::module REG_SOURCE src/CrvDigitizer_module.cc) + +cet_build_plugin(CrvPedestalFinder art::module REG_SOURCE src/CrvPedestalFinder_module.cc) + +cet_build_plugin(CrvPhotonGenerator art::module REG_SOURCE src/CrvPhotonGenerator_module.cc) + +cet_build_plugin(CrvPlot art::module REG_SOURCE src/CrvPlot_module.cc) + +cet_build_plugin(CrvSiPMChargeGenerator art::module REG_SOURCE src/CrvSiPMChargeGenerator_module.cc) + +cet_build_plugin(CrvStepsFromStepPointMCs art::module REG_SOURCE src/CrvStepsFromStepPointMCs_module.cc) + +cet_build_plugin(CRVTest art::module REG_SOURCE src/CRVTest_module.cc) + +cet_build_plugin(CrvWaveformsGenerator art::module REG_SOURCE src/CrvWaveformsGenerator_module.cc) + +cet_build_plugin(MakeCrvCoincidenceClusterMCAssns art::module REG_SOURCE src/MakeCrvCoincidenceClusterMCAssns_module.cc) + + +install_source(SUBDIRS src) +install_headers(SUBDIRS inc) +install_fhicl(SUBDIRS fcl SUBDIRNAME CRVResponse) diff --git a/CalPatRec/CMakeLists.txt b/CalPatRec/CMakeLists.txt new file mode 100644 index 0000000000..6227d21058 --- /dev/null +++ b/CalPatRec/CMakeLists.txt @@ -0,0 +1,44 @@ +cet_make_library( + SOURCE +src/CalHelixFinderAlg.cc +src/CalHelixFinderData.cc +src/CalHelixFinderDiag_tool.cc +src/CalTimePeakFinderDiag_tool.cc +src/DeltaCandidate.cc +src/DeltaFinderAlg.cc +src/DeltaFinderAlg_findProtons.cc +src/DeltaFinderDiag_tool.cc +src/DeltaFinder_types.cc +src/DeltaSeed.cc +src/HlPrint_ComboHit.cc +src/MergePatRecDiag_tool.cc +src/ObjectDumpUtils.cc +src/PhiClusterFinderDiag_tool.cc +src/ProtonCandidate.cc +src/TZClusterFinderDiag_tool.cc +LIBRARIES PUBLIC +cetlib::cetlib +) + +cet_build_plugin(CalHelixFinder art::module REG_SOURCE src/CalHelixFinder_module.cc) + +cet_build_plugin(CalTimePeakFinder art::module REG_SOURCE src/CalTimePeakFinder_module.cc) + +cet_build_plugin(ComboHitFilter art::module REG_SOURCE src/ComboHitFilter_module.cc) + +cet_build_plugin(DeltaFinderAna art::module REG_SOURCE src/DeltaFinderAna_module.cc) + +cet_build_plugin(DeltaFinder art::module REG_SOURCE src/DeltaFinder_module.cc) + +cet_build_plugin(MergeHelixFinder art::module REG_SOURCE src/MergeHelixFinder_module.cc) + +cet_build_plugin(PhiClusterFinder art::module REG_SOURCE src/PhiClusterFinder_module.cc) + +cet_build_plugin(PrefetchData art::module REG_SOURCE src/PrefetchData_module.cc) + +cet_build_plugin(TZClusterFinder art::module REG_SOURCE src/TZClusterFinder_module.cc) + + +install_source(SUBDIRS src) +install_headers(SUBDIRS inc) +install_fhicl(SUBDIRS fcl SUBDIRNAME CalPatRec) diff --git a/CaloCluster/CMakeLists.txt b/CaloCluster/CMakeLists.txt new file mode 100644 index 0000000000..b22e4f9328 --- /dev/null +++ b/CaloCluster/CMakeLists.txt @@ -0,0 +1,21 @@ +cet_make_library( + SOURCE +src/ClusterAssociator.cc +src/ClusterFinder.cc +src/ClusterUtils.cc +LIBRARIES PUBLIC +cetlib::cetlib +) + +cet_build_plugin(CaloClusterFast art::module REG_SOURCE src/CaloClusterFast_module.cc) + +cet_build_plugin(CaloClusterMaker art::module REG_SOURCE src/CaloClusterMaker_module.cc) + +cet_build_plugin(CaloProtoClusterMaker art::module REG_SOURCE src/CaloProtoClusterMaker_module.cc) + +cet_build_plugin(CaloTrigger art::module REG_SOURCE src/CaloTrigger_module.cc) + + +install_source(SUBDIRS src) +install_headers(SUBDIRS inc) +install_fhicl(SUBDIRS fcl SUBDIRNAME CaloCluster) diff --git a/CaloConditions/CMakeLists.txt b/CaloConditions/CMakeLists.txt new file mode 100644 index 0000000000..ee86071e73 --- /dev/null +++ b/CaloConditions/CMakeLists.txt @@ -0,0 +1,14 @@ +cet_make_library( + SOURCE +src/CalCalib.cc +src/CalCalibMaker.cc +src/CaloDAQMap.cc +src/CaloDAQMapMaker.cc +LIBRARIES PUBLIC +cetlib::cetlib +) + + +install_source(SUBDIRS src) +install_headers(SUBDIRS inc) +install_fhicl(SUBDIRS fcl SUBDIRNAME CaloConditions) diff --git a/CaloConfig/CMakeLists.txt b/CaloConfig/CMakeLists.txt new file mode 100644 index 0000000000..04a44744b2 --- /dev/null +++ b/CaloConfig/CMakeLists.txt @@ -0,0 +1 @@ +install_headers(SUBDIRS inc) diff --git a/CaloDiag/CMakeLists.txt b/CaloDiag/CMakeLists.txt new file mode 100644 index 0000000000..5ed16636cc --- /dev/null +++ b/CaloDiag/CMakeLists.txt @@ -0,0 +1,12 @@ +cet_build_plugin(CaloClusterCheck art::module REG_SOURCE src/CaloClusterCheck_module.cc) + +cet_build_plugin(CaloExample art::module REG_SOURCE src/CaloExample_module.cc) + +cet_build_plugin(CaloMCInspector art::module REG_SOURCE src/CaloMCInspector_module.cc) + +cet_build_plugin(CaloNeutron art::module REG_SOURCE src/CaloNeutron_module.cc) + +cet_build_plugin(CaloNNDiag art::module REG_SOURCE src/CaloNNDiag_module.cc) + + +install_source(SUBDIRS src) diff --git a/CaloFilters/CMakeLists.txt b/CaloFilters/CMakeLists.txt new file mode 100644 index 0000000000..437263ffad --- /dev/null +++ b/CaloFilters/CMakeLists.txt @@ -0,0 +1,17 @@ +cet_build_plugin(CaloClusterCounterFilter art::module REG_SOURCE src/CaloClusterCounterFilter_module.cc) + +cet_build_plugin(CaloCosmicCalib art::module REG_SOURCE src/CaloCosmicCalib_module.cc) + +cet_build_plugin(CaloLikelihood art::module REG_SOURCE src/CaloLikelihood_module.cc) + +cet_build_plugin(EcalTriggerPreselect art::module REG_SOURCE src/EcalTriggerPreselect_module.cc) + +cet_build_plugin(FilterEcalMixedTrigger art::module REG_SOURCE src/FilterEcalMixedTrigger_module.cc) + +cet_build_plugin(FilterEcalMVATrigger art::module REG_SOURCE src/FilterEcalMVATrigger_module.cc) + +cet_build_plugin(FilterEcalNNTrigger art::module REG_SOURCE src/FilterEcalNNTrigger_module.cc) + + +install_source(SUBDIRS src) +install_fhicl(SUBDIRS fcl SUBDIRNAME CaloFilters) diff --git a/CaloMC/CMakeLists.txt b/CaloMC/CMakeLists.txt new file mode 100644 index 0000000000..41c45e9261 --- /dev/null +++ b/CaloMC/CMakeLists.txt @@ -0,0 +1,27 @@ +cet_make_library( + SOURCE +src/CaloNoiseARFitter.cc +src/CaloNoiseSimGenerator.cc +src/CaloPhotonPropagation.cc +src/CaloWFExtractor.cc +src/ShowerStepUtil.cc +LIBRARIES PUBLIC +cetlib::cetlib +) + +cet_build_plugin(CaloClusterTruthMatch art::module REG_SOURCE src/CaloClusterTruthMatch_module.cc) + +cet_build_plugin(CaloDigiMaker art::module REG_SOURCE src/CaloDigiMaker_module.cc) + +cet_build_plugin(CaloHitTruthMatch art::module REG_SOURCE src/CaloHitTruthMatch_module.cc) + +cet_build_plugin(CaloShowerROMaker art::module REG_SOURCE src/CaloShowerROMaker_module.cc) + +cet_build_plugin(CaloShowerStepMaker art::module REG_SOURCE src/CaloShowerStepMaker_module.cc) + +cet_build_plugin(CaloShowerUpdater art::module REG_SOURCE src/CaloShowerUpdater_module.cc) + + +install_source(SUBDIRS src) +install_headers(SUBDIRS inc) +install_fhicl(SUBDIRS fcl SUBDIRNAME CaloMC) diff --git a/CaloReco/CMakeLists.txt b/CaloReco/CMakeLists.txt new file mode 100644 index 0000000000..629b6cb3be --- /dev/null +++ b/CaloReco/CMakeLists.txt @@ -0,0 +1,19 @@ +cet_make_library( + SOURCE +src/CaloRawWFProcessor.cc +src/CaloTemplateWFProcessor.cc +src/CaloTemplateWFUtil.cc +LIBRARIES PUBLIC +cetlib::cetlib +) + +cet_build_plugin(CaloHitMakerFast art::module REG_SOURCE src/CaloHitMakerFast_module.cc) + +cet_build_plugin(CaloHitMaker art::module REG_SOURCE src/CaloHitMaker_module.cc) + +cet_build_plugin(CaloRecoDigiMaker art::module REG_SOURCE src/CaloRecoDigiMaker_module.cc) + + +install_source(SUBDIRS src) +install_headers(SUBDIRS inc) +install_fhicl(SUBDIRS fcl SUBDIRNAME CaloReco) diff --git a/CalorimeterGeom/CMakeLists.txt b/CalorimeterGeom/CMakeLists.txt new file mode 100644 index 0000000000..7a0ff53125 --- /dev/null +++ b/CalorimeterGeom/CMakeLists.txt @@ -0,0 +1,15 @@ +cet_make_library( + SOURCE +src/CaloGeomUtil.cc +src/CrystalCondReader.cc +src/DiskCalorimeter.cc +src/Disk.cc +src/SquareMapper.cc +src/SquareShiftMapper.cc +LIBRARIES PUBLIC +cetlib::cetlib +) + + +install_source(SUBDIRS src) +install_headers(SUBDIRS inc) diff --git a/CommonMC/CMakeLists.txt b/CommonMC/CMakeLists.txt new file mode 100644 index 0000000000..749340b6b4 --- /dev/null +++ b/CommonMC/CMakeLists.txt @@ -0,0 +1,23 @@ +cet_build_plugin(CosmicTimeOffset art::module REG_SOURCE src/CosmicTimeOffset_module.cc) + +cet_build_plugin(EventWindowMarkerProducer art::module REG_SOURCE src/EventWindowMarkerProducer_module.cc) + +cet_build_plugin(FindMCPrimary art::module REG_SOURCE src/FindMCPrimary_module.cc) + +cet_build_plugin(GenEventCountReader art::module REG_SOURCE src/GenEventCountReader_module.cc) + +cet_build_plugin(InFlightStepDumper art::module REG_SOURCE src/InFlightStepDumper_module.cc) + +cet_build_plugin(NullMCPrimary art::module REG_SOURCE src/NullMCPrimary_module.cc) + +cet_build_plugin(ProtonTimeOffset art::module REG_SOURCE src/ProtonTimeOffset_module.cc) + +cet_build_plugin(SelectRecoMC art::module REG_SOURCE src/SelectRecoMC_module.cc) + +cet_build_plugin(SimParticleDaughterSelector art::module REG_SOURCE src/SimParticleDaughterSelector_module.cc) + +cet_build_plugin(StoppedParticlesFinder art::module REG_SOURCE src/StoppedParticlesFinder_module.cc) + + +install_source(SUBDIRS src) +install_fhicl(SUBDIRS fcl SUBDIRNAME CommonMC) diff --git a/Compression/CMakeLists.txt b/Compression/CMakeLists.txt new file mode 100644 index 0000000000..b93a46c1a1 --- /dev/null +++ b/Compression/CMakeLists.txt @@ -0,0 +1,17 @@ +cet_make_library( + SOURCE +src/CompressionLevel.cc +LIBRARIES PUBLIC +cetlib::cetlib +) + +cet_build_plugin(CompressDetStepMCs art::module REG_SOURCE src/CompressDetStepMCs_module.cc) + +cet_build_plugin(CompressDigiMCsCheck art::module REG_SOURCE src/CompressDigiMCsCheck_module.cc) + +cet_build_plugin(CompressDigiMCs art::module REG_SOURCE src/CompressDigiMCs_module.cc) + + +install_source(SUBDIRS src) +install_headers(SUBDIRS inc) +install_fhicl(SUBDIRS fcl SUBDIRNAME Compression) diff --git a/ConditionsBase/CMakeLists.txt b/ConditionsBase/CMakeLists.txt new file mode 100644 index 0000000000..04a44744b2 --- /dev/null +++ b/ConditionsBase/CMakeLists.txt @@ -0,0 +1 @@ +install_headers(SUBDIRS inc) diff --git a/ConditionsService/CMakeLists.txt b/ConditionsService/CMakeLists.txt new file mode 100644 index 0000000000..31d49f2d93 --- /dev/null +++ b/ConditionsService/CMakeLists.txt @@ -0,0 +1,13 @@ +cet_make_library( + SOURCE +src/AcceleratorParams.cc +src/CalorimeterCalibrations.cc +src/ConditionsService_service.cc +src/ExtMonFNALConditions.cc +LIBRARIES PUBLIC +cetlib::cetlib +) + + +install_source(SUBDIRS src) +install_headers(SUBDIRS inc) diff --git a/ConfigTools/CMakeLists.txt b/ConfigTools/CMakeLists.txt new file mode 100644 index 0000000000..39d0775a99 --- /dev/null +++ b/ConfigTools/CMakeLists.txt @@ -0,0 +1,13 @@ +cet_make_library( + SOURCE +src/checkForStale.cc +src/requireUniqueKey.cc +src/SimpleConfig.cc +src/SimpleConfigRecord.cc +LIBRARIES PUBLIC +cetlib::cetlib +) + + +install_source(SUBDIRS src) +install_headers(SUBDIRS inc) diff --git a/CosmicRayShieldGeom/CMakeLists.txt b/CosmicRayShieldGeom/CMakeLists.txt new file mode 100644 index 0000000000..a5e4d55b3b --- /dev/null +++ b/CosmicRayShieldGeom/CMakeLists.txt @@ -0,0 +1,19 @@ +cet_make_library( + SOURCE +src/CosmicRayShield.cc +src/CRSAbsorberLayer.cc +src/CRSAluminumSheet.cc +src/CRSFEB.cc +src/CRSScintillatorBar.cc +src/CRSScintillatorBarDetail.cc +src/CRSScintillatorLayer.cc +src/CRSScintillatorModule.cc +src/CRSScintillatorShield.cc +src/CRSSupportStructure.cc +LIBRARIES PUBLIC +cetlib::cetlib +) + + +install_source(SUBDIRS src) +install_headers(SUBDIRS inc) diff --git a/CosmicReco/CMakeLists.txt b/CosmicReco/CMakeLists.txt new file mode 100644 index 0000000000..d76de86287 --- /dev/null +++ b/CosmicReco/CMakeLists.txt @@ -0,0 +1,37 @@ +cet_make_library( + SOURCE +src/CosmicTrackFit.cc +src/CosmicTrackMCInfo.cc +src/DriftFitUtils.cc +src/MinuitDriftFitter.cc +src/PDFFit.cc +LIBRARIES PUBLIC +cetlib::cetlib +) + +cet_build_plugin(CosmicAnalyzer art::module REG_SOURCE src/CosmicAnalyzer_module.cc) + +cet_build_plugin(CosmicFitDisplay art::module REG_SOURCE src/CosmicFitDisplay_module.cc) + +cet_build_plugin(CosmicMCRecoDiff art::module REG_SOURCE src/CosmicMCRecoDiff_module.cc) + +cet_build_plugin(CosmicMuonInfo art::module REG_SOURCE src/CosmicMuonInfo_module.cc) + +cet_build_plugin(CosmicSeedFilter art::module REG_SOURCE src/CosmicSeedFilter_module.cc) + +cet_build_plugin(CosmicShowerFilter art::module REG_SOURCE src/CosmicShowerFilter_module.cc) + +cet_build_plugin(CosmicTrackDetails art::module REG_SOURCE src/CosmicTrackDetails_module.cc) + +cet_build_plugin(CosmicTrackDiag art::module REG_SOURCE src/CosmicTrackDiag_module.cc) + +cet_build_plugin(CosmicTrackFinder art::module REG_SOURCE src/CosmicTrackFinder_module.cc) + +cet_build_plugin(LineFinder art::module REG_SOURCE src/LineFinder_module.cc) + +cet_build_plugin(SimpleTimeCluster art::module REG_SOURCE src/SimpleTimeCluster_module.cc) + + +install_source(SUBDIRS src) +install_headers(SUBDIRS inc) +install_fhicl(SUBDIRS fcl SUBDIRNAME CosmicReco) diff --git a/DAQ/CMakeLists.txt b/DAQ/CMakeLists.txt new file mode 100644 index 0000000000..f45e3febb3 --- /dev/null +++ b/DAQ/CMakeLists.txt @@ -0,0 +1,29 @@ +cet_make_library( + SOURCE +src/CaloDAQUtilities.cc +LIBRARIES PUBLIC +cetlib::cetlib +) + +cet_build_plugin(ArtBinaryPacketsFromDigis art::module REG_SOURCE src/ArtBinaryPacketsFromDigis_module.cc) + +cet_build_plugin(ArtFragmentsFromDTCEvents art::module REG_SOURCE src/ArtFragmentsFromDTCEvents_module.cc) + +cet_build_plugin(CaloHitsFromFragments art::module REG_SOURCE src/CaloHitsFromFragments_module.cc) + +cet_build_plugin(CaloRecoFromFragments art::module REG_SOURCE src/CaloRecoFromFragments_module.cc) + +cet_build_plugin(CrvDigisFromFragments art::module REG_SOURCE src/CrvDigisFromFragments_module.cc) + +cet_build_plugin(FragmentAna art::module REG_SOURCE src/FragmentAna_module.cc) + +cet_build_plugin(PrefetchDAQData art::module REG_SOURCE src/PrefetchDAQData_module.cc) + +cet_build_plugin(StrawHitRecoFromFragments art::module REG_SOURCE src/StrawHitRecoFromFragments_module.cc) + +cet_build_plugin(StrawRecoFromFragments art::module REG_SOURCE src/StrawRecoFromFragments_module.cc) + + +install_source(SUBDIRS src) +install_headers(SUBDIRS inc) +install_fhicl(SUBDIRS fcl SUBDIRNAME DAQ) diff --git a/DAQConditions/CMakeLists.txt b/DAQConditions/CMakeLists.txt new file mode 100644 index 0000000000..5db5af411e --- /dev/null +++ b/DAQConditions/CMakeLists.txt @@ -0,0 +1,12 @@ +cet_make_library( + SOURCE +src/EventTiming.cc +src/EventTimingMaker.cc +LIBRARIES PUBLIC +cetlib::cetlib +) + + +install_source(SUBDIRS src) +install_headers(SUBDIRS inc) +install_fhicl(SUBDIRS fcl SUBDIRNAME DAQConditions) diff --git a/DAQConfig/CMakeLists.txt b/DAQConfig/CMakeLists.txt new file mode 100644 index 0000000000..04a44744b2 --- /dev/null +++ b/DAQConfig/CMakeLists.txt @@ -0,0 +1 @@ +install_headers(SUBDIRS inc) diff --git a/DataProducts/CMakeLists.txt b/DataProducts/CMakeLists.txt new file mode 100644 index 0000000000..dd8a71c54e --- /dev/null +++ b/DataProducts/CMakeLists.txt @@ -0,0 +1,22 @@ +cet_make_library( + SOURCE +src/CaloRawSiPMId.cc +src/CaloSiPMId.cc +src/CompressedPDGCode.cc +src/CrystalId.cc +src/ExtMonFNALChipId.cc +src/ExtMonFNALPixelId.cc +src/GenVector.cc +src/PDGCode.cc +src/STMChannel.cc +src/StrawId.cc +src/StrawIdMask.cc +src/StrawStatus.cc +src/VirtualDetectorId.cc +LIBRARIES PUBLIC +cetlib::cetlib +) + + +install_source(SUBDIRS src) +install_headers(SUBDIRS inc) diff --git a/DbService/CMakeLists.txt b/DbService/CMakeLists.txt new file mode 100644 index 0000000000..3a636fa84c --- /dev/null +++ b/DbService/CMakeLists.txt @@ -0,0 +1,22 @@ +cet_make_library( + SOURCE +src/DbEngine.cc +src/DbIdList.cc +src/DbReader.cc +src/DbService_service.cc +src/DbSql.cc +src/DbTool.cc +src/dbTool_main.cc +src/DbValTool.cc +src/EpicsTool.cc +src/epicsTool_main.cc +LIBRARIES PUBLIC +cetlib::cetlib +) + +cet_build_plugin(DbServiceTest art::module REG_SOURCE src/DbServiceTest_module.cc) + + +install_source(SUBDIRS src) +install_headers(SUBDIRS inc) +install_fhicl(SUBDIRS fcl SUBDIRNAME DbService) diff --git a/DbTables/CMakeLists.txt b/DbTables/CMakeLists.txt new file mode 100644 index 0000000000..c34581589e --- /dev/null +++ b/DbTables/CMakeLists.txt @@ -0,0 +1,16 @@ +cet_make_library( + SOURCE +src/DbCache.cc +src/DbIoV.cc +src/DbSet.cc +src/DbTable.cc +src/DbTableFactory.cc +src/DbUtil.cc +src/DbValCache.cc +LIBRARIES PUBLIC +cetlib::cetlib +) + + +install_source(SUBDIRS src) +install_headers(SUBDIRS inc) diff --git a/DetectorSolenoidGeom/CMakeLists.txt b/DetectorSolenoidGeom/CMakeLists.txt new file mode 100644 index 0000000000..84714ce49a --- /dev/null +++ b/DetectorSolenoidGeom/CMakeLists.txt @@ -0,0 +1,10 @@ +cet_make_library( + SOURCE +src/DetectorSolenoid.cc +LIBRARIES PUBLIC +cetlib::cetlib +) + + +install_source(SUBDIRS src) +install_headers(SUBDIRS inc) diff --git a/EventDisplay/CMakeLists.txt b/EventDisplay/CMakeLists.txt new file mode 100644 index 0000000000..939888de21 --- /dev/null +++ b/EventDisplay/CMakeLists.txt @@ -0,0 +1,15 @@ +cet_make_library( + SOURCE +src/ContentSelector.cc +src/DataInterface.cc +src/EventDisplayFrame.cc +src/TrackColorSelector.cc +LIBRARIES PUBLIC +cetlib::cetlib +) + +cet_build_plugin(EventDisplay art::module REG_SOURCE src/EventDisplay_module.cc) + + +install_source(SUBDIRS src) +install_fhicl(SUBDIRS fcl SUBDIRNAME EventDisplay) diff --git a/EventGenerator/CMakeLists.txt b/EventGenerator/CMakeLists.txt new file mode 100644 index 0000000000..681c1897ea --- /dev/null +++ b/EventGenerator/CMakeLists.txt @@ -0,0 +1,101 @@ +cet_make_library( + SOURCE +src/CosmicCRY.cc +src/CosmicDYB.cc +src/CosmicFromTH2.cc +src/DIOGenerator_tool.cc +src/DYBGenerator.cc +src/ExtMonFNALGunImpl.cc +src/FromG4BLFile.cc +src/MuCap1809keVGammaGenerator_tool.cc +src/MuCapDeuteronGenerator_tool.cc +src/MuCapNeutronGenerator_tool.cc +src/MuCapPhotonGenerator_tool.cc +src/MuCapProtonGenerator_tool.cc +src/MuplusMichelGenerator_tool.cc +src/ParticleGun.cc +src/ParticleGunImpl.cc +src/PiCaptureEffects.cc +src/PrimaryProtonGunImpl.cc +LIBRARIES PUBLIC +cetlib::cetlib +) + +cet_build_plugin(AntiProtonGun art::module REG_SOURCE src/AntiProtonGun_module.cc) + +cet_build_plugin(CaloCalibGun art::module REG_SOURCE src/CaloCalibGun_module.cc) + +cet_build_plugin(CaloTBGun art::module REG_SOURCE src/CaloTBGun_module.cc) + +cet_build_plugin(CeEndpoint art::module REG_SOURCE src/CeEndpoint_module.cc) + +cet_build_plugin(CORSIKAEventGenerator art::module REG_SOURCE src/CORSIKAEventGenerator_module.cc) + +cet_build_plugin(CRYEventGenerator art::module REG_SOURCE src/CRYEventGenerator_module.cc) + +cet_build_plugin(CryResampler art::module REG_SOURCE src/CryResampler_module.cc) + +cet_build_plugin(DecayInOrbitWeight art::module REG_SOURCE src/DecayInOrbitWeight_module.cc) + +cet_build_plugin(EplusFromStoppedPion art::module REG_SOURCE src/EplusFromStoppedPion_module.cc) + +cet_build_plugin(EventGenerator art::module REG_SOURCE src/EventGenerator_module.cc) + +cet_build_plugin(ExtMonFNALBoxGenerator art::module REG_SOURCE src/ExtMonFNALBoxGenerator_module.cc) + +cet_build_plugin(ExtMonFNALGun art::module REG_SOURCE src/ExtMonFNALGun_module.cc) + +cet_build_plugin(ExtMonFNALRoomGenerator art::module REG_SOURCE src/ExtMonFNALRoomGenerator_module.cc) + +cet_build_plugin(FlatMuonDaughterGenerator art::module REG_SOURCE src/FlatMuonDaughterGenerator_module.cc) + +cet_build_plugin(FromAsciiMomentumAndPosition art::module REG_SOURCE src/FromAsciiMomentumAndPosition_module.cc) + +cet_build_plugin(FromSimParticleCompact art::module REG_SOURCE src/FromSimParticleCompact_module.cc) + +cet_build_plugin(FromStepPointMCs art::module REG_SOURCE src/FromStepPointMCs_module.cc) + +cet_build_plugin(FromStepPointMCsRotateTarget art::module REG_SOURCE src/FromStepPointMCsRotateTarget_module.cc) + +cet_build_plugin(G4BeamlineGenerator art::module REG_SOURCE src/G4BeamlineGenerator_module.cc) + +cet_build_plugin(GeneratorPlots art::module REG_SOURCE src/GeneratorPlots_module.cc) + +cet_build_plugin(GenEventCounter art::module REG_SOURCE src/GenEventCounter_module.cc) + +cet_build_plugin(InFlightParticleSampler art::module REG_SOURCE src/InFlightParticleSampler_module.cc) + +cet_build_plugin(LeadingLog art::module REG_SOURCE src/LeadingLog_module.cc) + +cet_build_plugin(MuStopProductsGun art::module REG_SOURCE src/MuStopProductsGun_module.cc) + +cet_build_plugin(PBIWeight art::module REG_SOURCE src/PBIWeight_module.cc) + +cet_build_plugin(Pileup art::module REG_SOURCE src/Pileup_module.cc) + +cet_build_plugin(PrimaryAntiProtonGun art::module REG_SOURCE src/PrimaryAntiProtonGun_module.cc) + +cet_build_plugin(PrimaryProtonGun art::module REG_SOURCE src/PrimaryProtonGun_module.cc) + +cet_build_plugin(RanTest art::module REG_SOURCE src/RanTest_module.cc) + +cet_build_plugin(RMCGun art::module REG_SOURCE src/RMCGun_module.cc) + +cet_build_plugin(RPCGun art::module REG_SOURCE src/RPCGun_module.cc) + +cet_build_plugin(SingleProcessGenerator art::module REG_SOURCE src/SingleProcessGenerator_module.cc) + +cet_build_plugin(StoppedMuonRMCGun art::module REG_SOURCE src/StoppedMuonRMCGun_module.cc) + +cet_build_plugin(StoppedMuonXRayGammaRayGun art::module REG_SOURCE src/StoppedMuonXRayGammaRayGun_module.cc) + +cet_build_plugin(StoppedMuplusDecayGun art::module REG_SOURCE src/StoppedMuplusDecayGun_module.cc) + +cet_build_plugin(StoppedParticleG4Gun art::module REG_SOURCE src/StoppedParticleG4Gun_module.cc) + +cet_build_plugin(StoppedParticleReactionGun art::module REG_SOURCE src/StoppedParticleReactionGun_module.cc) + + +install_source(SUBDIRS src) +install_headers(SUBDIRS inc) +install_fhicl(SUBDIRS fcl SUBDIRNAME EventGenerator) diff --git a/EventMixing/CMakeLists.txt b/EventMixing/CMakeLists.txt new file mode 100644 index 0000000000..0f3573d5f4 --- /dev/null +++ b/EventMixing/CMakeLists.txt @@ -0,0 +1,19 @@ +cet_make_library( + SOURCE +src/Mu2eProductMixer.cc +LIBRARIES PUBLIC +cetlib::cetlib +) + +cet_build_plugin(MixBackgroundFrames art::module REG_SOURCE src/MixBackgroundFrames_module.cc) + +cet_build_plugin(ProtonBunchIntensityFlat art::module REG_SOURCE src/ProtonBunchIntensityFlat_module.cc) + +cet_build_plugin(ProtonBunchIntensityLogNormal art::module REG_SOURCE src/ProtonBunchIntensityLogNormal_module.cc) + +cet_build_plugin(ResamplingMixer art::module REG_SOURCE src/ResamplingMixer_module.cc) + + +install_source(SUBDIRS src) +install_headers(SUBDIRS inc) +install_fhicl(SUBDIRS fcl SUBDIRNAME EventMixing) diff --git a/ExternalShieldingGeom/CMakeLists.txt b/ExternalShieldingGeom/CMakeLists.txt new file mode 100644 index 0000000000..e46d4d92a8 --- /dev/null +++ b/ExternalShieldingGeom/CMakeLists.txt @@ -0,0 +1,12 @@ +cet_make_library( + SOURCE +src/ExtShieldDownstream.cc +src/ExtShieldUpstream.cc +src/Saddle.cc +LIBRARIES PUBLIC +cetlib::cetlib +) + + +install_source(SUBDIRS src) +install_headers(SUBDIRS inc) diff --git a/ExtinctionMonitorFNAL/CMakeLists.txt b/ExtinctionMonitorFNAL/CMakeLists.txt new file mode 100644 index 0000000000..9a2ebc60e4 --- /dev/null +++ b/ExtinctionMonitorFNAL/CMakeLists.txt @@ -0,0 +1 @@ +install_fhicl(SUBDIRS fcl SUBDIRNAME ExtinctionMonitorFNAL) diff --git a/Filters/CMakeLists.txt b/Filters/CMakeLists.txt new file mode 100644 index 0000000000..a277133424 --- /dev/null +++ b/Filters/CMakeLists.txt @@ -0,0 +1,79 @@ +cet_build_plugin(BunchIntensityFilter art::module REG_SOURCE src/BunchIntensityFilter_module.cc) + +cet_build_plugin(CaloShowerSimFilter art::module REG_SOURCE src/CaloShowerSimFilter_module.cc) + +cet_build_plugin(ChooseTrackFilter art::module REG_SOURCE src/ChooseTrackFilter_module.cc) + +cet_build_plugin(CompressPhysicalVolumes art::module REG_SOURCE src/CompressPhysicalVolumes_module.cc) + +cet_build_plugin(CompressStepPointMCs art::module REG_SOURCE src/CompressStepPointMCs_module.cc) + +cet_build_plugin(CosmicMixingFilter art::module REG_SOURCE src/CosmicMixingFilter_module.cc) + +cet_build_plugin(DetectorStepFilter art::module REG_SOURCE src/DetectorStepFilter_module.cc) + +cet_build_plugin(EMFBoxHitsFilter art::module REG_SOURCE src/EMFBoxHitsFilter_module.cc) + +cet_build_plugin(EMFPixelHitsFilter art::module REG_SOURCE src/EMFPixelHitsFilter_module.cc) + +cet_build_plugin(EMFPixelSimFilter art::module REG_SOURCE src/EMFPixelSimFilter_module.cc) + +cet_build_plugin(FilterCosmicsStage1 art::module REG_SOURCE src/FilterCosmicsStage1_module.cc) + +cet_build_plugin(FilterG4Out art::module REG_SOURCE src/FilterG4Out_module.cc) + +cet_build_plugin(FilterStatusG4 art::module REG_SOURCE src/FilterStatusG4_module.cc) + +cet_build_plugin(FilterStepPointAngleVsTarget art::module REG_SOURCE src/FilterStepPointAngleVsTarget_module.cc) + +cet_build_plugin(FilterStepPointKinEnPDG art::module REG_SOURCE src/FilterStepPointKinEnPDG_module.cc) + +cet_build_plugin(FilterStepPointMomentum art::module REG_SOURCE src/FilterStepPointMomentum_module.cc) + +cet_build_plugin(FilterStepPointPDG art::module REG_SOURCE src/FilterStepPointPDG_module.cc) + +cet_build_plugin(FilterStepPointPositionMomentum art::module REG_SOURCE src/FilterStepPointPositionMomentum_module.cc) + +cet_build_plugin(FilterStepPointPzVsTarget art::module REG_SOURCE src/FilterStepPointPzVsTarget_module.cc) + +cet_build_plugin(FilterStepPointReflection art::module REG_SOURCE src/FilterStepPointReflection_module.cc) + +cet_build_plugin(GenParticleMomFilter art::module REG_SOURCE src/GenParticleMomFilter_module.cc) + +cet_build_plugin(KilledEventFilter art::module REG_SOURCE src/KilledEventFilter_module.cc) + +cet_build_plugin(ParticleCodeFilter art::module REG_SOURCE src/ParticleCodeFilter_module.cc) + +cet_build_plugin(RandomPrescaleFilter art::module REG_SOURCE src/RandomPrescaleFilter_module.cc) + +cet_build_plugin(RecoMomFilter art::module REG_SOURCE src/RecoMomFilter_module.cc) + +cet_build_plugin(SelectEvents art::module REG_SOURCE src/SelectEvents_module.cc) + +cet_build_plugin(SelectStepPointsByTime art::module REG_SOURCE src/SelectStepPointsByTime_module.cc) + +cet_build_plugin(StepPointFilter art::module REG_SOURCE src/StepPointFilter_module.cc) + +cet_build_plugin(StepPointMCCollectionUpdater art::module REG_SOURCE src/StepPointMCCollectionUpdater_module.cc) + +cet_build_plugin(StepPointsInDigis art::module REG_SOURCE src/StepPointsInDigis_module.cc) + +cet_build_plugin(StrawDigiMCFilter art::module REG_SOURCE src/StrawDigiMCFilter_module.cc) + +cet_build_plugin(TrackerStepPointFilter art::module REG_SOURCE src/TrackerStepPointFilter_module.cc) + +cet_build_plugin(TrackSummaryTruthUpdater art::module REG_SOURCE src/TrackSummaryTruthUpdater_module.cc) + +cet_build_plugin(TriggerResultsFilter art::module REG_SOURCE src/TriggerResultsFilter_module.cc) + +cet_build_plugin(TrkPatRecFilter art::module REG_SOURCE src/TrkPatRecFilter_module.cc) + +cet_build_plugin(TrkQualFilter art::module REG_SOURCE src/TrkQualFilter_module.cc) + +cet_build_plugin(VetoIncorrectHits art::module REG_SOURCE src/VetoIncorrectHits_module.cc) + +cet_build_plugin(WeightSamplingFilter art::module REG_SOURCE src/WeightSamplingFilter_module.cc) + + +install_source(SUBDIRS src) +install_fhicl(SUBDIRS fcl SUBDIRNAME Filters) diff --git a/GeneralUtilities/CMakeLists.txt b/GeneralUtilities/CMakeLists.txt new file mode 100644 index 0000000000..e0d5116402 --- /dev/null +++ b/GeneralUtilities/CMakeLists.txt @@ -0,0 +1,38 @@ +cet_make_library( + SOURCE +src/Angles.cc +src/Binning.cc +src/CombineTwoDPoints.cc +src/CsvReader.cc +src/DigitalFiltering.cc +src/HepTransform.cc +src/LinePointPCA.cc +src/LineSegmentPCA.cc +src/MinMax.cc +src/NUBinning.cc +src/OrientationResolver.cc +src/ParameterSetFromFile.cc +src/ParameterSetHelpers.cc +src/PathnameWithNextVersion.cc +src/RMS.cc +src/RootNameTitleHelper.cc +src/SplineInterpolation.cc +src/splitLine.cc +src/splitString.cc +src/sqrtOrThrow.cc +src/TimeUtility.cc +src/toHex.cc +src/to_string.cc +src/trimInPlace.cc +src/TwoBodyKinematics.cc +src/TwoDPoint.cc +src/TwoDPointTest_main.cc +src/TwoDWeight.cc +src/VMInfo.cc +LIBRARIES PUBLIC +cetlib::cetlib +) + + +install_source(SUBDIRS src) +install_headers(SUBDIRS inc) diff --git a/GeomPrimitives/CMakeLists.txt b/GeomPrimitives/CMakeLists.txt new file mode 100644 index 0000000000..869e0dfd66 --- /dev/null +++ b/GeomPrimitives/CMakeLists.txt @@ -0,0 +1,13 @@ +cet_make_library( + SOURCE +src/PlacedTubs.cc +src/Polycone.cc +src/Polyhedra.cc +src/Tube.cc +LIBRARIES PUBLIC +cetlib::cetlib +) + + +install_source(SUBDIRS src) +install_headers(SUBDIRS inc) diff --git a/GeometryService/CMakeLists.txt b/GeometryService/CMakeLists.txt new file mode 100644 index 0000000000..6ab6800da5 --- /dev/null +++ b/GeometryService/CMakeLists.txt @@ -0,0 +1,49 @@ +cet_make_library( + SOURCE +src/BeamlineMaker.cc +src/BFieldConfigMaker.cc +src/BFieldManagerMaker.cc +src/CosmicRayShieldMaker.cc +src/DetectorSolenoidMaker.cc +src/DetectorSolenoidShieldingMaker.cc +src/DetectorSystemMaker.cc +src/DiskCalorimeterMaker.cc +src/ElectronicRackMaker.cc +src/ExtMonFNALBuildingMaker.cc +src/ExtMonFNALMagnetMaker.cc +src/ExtMonFNAL_Maker.cc +src/ExtMonFNALMuonIDMaker.cc +src/ExtShieldDownstreamMaker.cc +src/ExtShieldUpstreamMaker.cc +src/G4GeometryOptions.cc +src/GeometryService_service.cc +src/MBSMaker.cc +src/MECOStyleProtonAbsorberMaker.cc +src/Mu2eCoordTransform.cc +src/Mu2eEnvelope.cc +src/Mu2eHallMaker.cc +src/NotchManager.cc +src/PipeMaker.cc +src/ProductionSolenoidMaker.cc +src/ProductionTargetMaker.cc +src/ProtonBeamDumpMaker.cc +src/PSEnclosureMaker.cc +src/PSShieldMaker.cc +src/PSVacuumMaker.cc +src/PTMMaker.cc +src/SaddleMaker.cc +src/STMMaker.cc +src/StoppingTargetMaker.cc +src/TrackerMaker.cc +src/TSdAMaker.cc +src/VirtualDetector.cc +src/VirtualDetectorMaker.cc +src/WorldG4.cc +src/WorldG4Maker.cc +LIBRARIES PUBLIC +cetlib::cetlib +) + + +install_source(SUBDIRS src) +install_headers(SUBDIRS inc) diff --git a/GlobalConstantsService/CMakeLists.txt b/GlobalConstantsService/CMakeLists.txt new file mode 100644 index 0000000000..18e9da035d --- /dev/null +++ b/GlobalConstantsService/CMakeLists.txt @@ -0,0 +1,16 @@ +cet_make_library( + SOURCE +src/GlobalConstantsService.cc +src/GlobalConstantsService_service.cc +src/MassCache.cc +src/ParticleData.cc +src/ParticleDataList.cc +src/PhysicsParams.cc +src/unknownPDGIdName.cc +LIBRARIES PUBLIC +cetlib::cetlib +) + + +install_source(SUBDIRS src) +install_headers(SUBDIRS inc) diff --git a/HelloWorld/CMakeLists.txt b/HelloWorld/CMakeLists.txt new file mode 100644 index 0000000000..2bf89a3f13 --- /dev/null +++ b/HelloWorld/CMakeLists.txt @@ -0,0 +1,8 @@ +cet_build_plugin(HelloProducer art::module REG_SOURCE src/HelloProducer_module.cc) + +cet_build_plugin(HelloWorld2 art::module REG_SOURCE src/HelloWorld2_module.cc) + +cet_build_plugin(HelloWorld art::module REG_SOURCE src/HelloWorld_module.cc) + + +install_source(SUBDIRS src) diff --git a/KinKalGeom/CMakeLists.txt b/KinKalGeom/CMakeLists.txt new file mode 100644 index 0000000000..c91b491049 --- /dev/null +++ b/KinKalGeom/CMakeLists.txt @@ -0,0 +1,15 @@ +cet_make_library( + SOURCE +src/DetectorSolenoid.cc +src/StoppingTarget.cc +src/SurfaceId.cc +src/SurfaceMap.cc +src/TestCRV.cc +src/Tracker.cc +LIBRARIES PUBLIC +cetlib::cetlib +) + + +install_source(SUBDIRS src) +install_headers(SUBDIRS inc) diff --git a/MBSGeom/CMakeLists.txt b/MBSGeom/CMakeLists.txt new file mode 100644 index 0000000000..3e2803f8df --- /dev/null +++ b/MBSGeom/CMakeLists.txt @@ -0,0 +1,3 @@ + +install_source(SUBDIRS src) +install_headers(SUBDIRS inc) diff --git a/MCDataProducts/CMakeLists.txt b/MCDataProducts/CMakeLists.txt new file mode 100644 index 0000000000..5cbc02ee3a --- /dev/null +++ b/MCDataProducts/CMakeLists.txt @@ -0,0 +1,29 @@ +cet_make_library( + SOURCE +src/CaloClusterMC.cc +src/CaloHitMC.cc +src/CosmicLivetime.cc +src/CrvDigiMC.cc +src/ExtMonFNALSimHit.cc +src/G4BeamlineInfo.cc +src/GenId.cc +src/MARSInfo.cc +src/MCRelationship.cc +src/PhysicalVolumeInfo.cc +src/PhysicalVolumeInfoMultiCollection.cc +src/ProcessCode.cc +src/SimParticle.cc +src/StageParticle.cc +src/StatusG4.cc +src/StepFilterMode.cc +src/StepInstanceName.cc +src/StepPointMC.cc +src/StrawDigiMC.cc +src/TrackSummaryTruthAssns.cc +LIBRARIES PUBLIC +cetlib::cetlib +) + + +install_source(SUBDIRS src) +install_headers(SUBDIRS inc) diff --git a/MECOStyleProtonAbsorberGeom/CMakeLists.txt b/MECOStyleProtonAbsorberGeom/CMakeLists.txt new file mode 100644 index 0000000000..f5ca915c97 --- /dev/null +++ b/MECOStyleProtonAbsorberGeom/CMakeLists.txt @@ -0,0 +1,10 @@ +cet_make_library( + SOURCE +src/MECOStyleProtonAbsorber.cc +LIBRARIES PUBLIC +cetlib::cetlib +) + + +install_source(SUBDIRS src) +install_headers(SUBDIRS inc) diff --git a/Mu2e/CMakeLists.txt b/Mu2e/CMakeLists.txt new file mode 100644 index 0000000000..42194d7fb8 --- /dev/null +++ b/Mu2e/CMakeLists.txt @@ -0,0 +1,9 @@ +cet_make_library( + SOURCE +src/mu2e_main.cc +LIBRARIES PUBLIC +cetlib::cetlib +) + + +install_source(SUBDIRS src) diff --git a/Mu2eBTrk/CMakeLists.txt b/Mu2eBTrk/CMakeLists.txt new file mode 100644 index 0000000000..53b4940abc --- /dev/null +++ b/Mu2eBTrk/CMakeLists.txt @@ -0,0 +1,12 @@ +cet_make_library( + SOURCE +src/BaBarMu2eField.cc +src/DetStrawElem.cc +src/ParticleInfo.cc +LIBRARIES PUBLIC +cetlib::cetlib +) + + +install_source(SUBDIRS src) +install_headers(SUBDIRS inc) diff --git a/Mu2eG4/CMakeLists.txt b/Mu2eG4/CMakeLists.txt new file mode 100644 index 0000000000..d938ffaca9 --- /dev/null +++ b/Mu2eG4/CMakeLists.txt @@ -0,0 +1,140 @@ +cet_make_library( + SOURCE +src/addStepLimiter.cc +src/CaloCrateSD.cc +src/CaloCrystalSD.cc +src/CaloReadoutCardSD.cc +src/CaloReadoutSD.cc +src/checkConfigRelics.cc +src/checkForOverlaps.cc +src/checkParticleCodeForG4.cc +src/constructCRV.cc +src/constructDiskCalorimeter.cc +src/constructDS.cc +src/constructDummyStoppingTarget.cc +src/ConstructEnvBox_tool.cc +src/ConstructEnvCalo01_tool.cc +src/ConstructEnvMuCapture_tool.cc +src/ConstructEnvNBoxes_tool.cc +src/ConstructEnvTube_tool.cc +src/constructExternalShielding.cc +src/constructExtMonFNALBuilding.cc +src/constructExtMonFNAL.cc +src/constructHall.cc +src/constructHaymanRings.cc +src/ConstructMaterials.cc +src/constructMBS.cc +src/constructMSTM.cc +src/constructProtonAbsorber.cc +src/constructProtonBeamDump.cc +src/constructPS.cc +src/constructPSEnclosure.cc +src/constructPSShield.cc +src/constructPTM.cc +src/constructSaddles.cc +src/constructServicesGeom.cc +src/constructSTM.cc +src/constructStoppingTarget.cc +src/constructStudyEnv_v001.cc +src/constructStudyEnv_v002.cc +src/constructStudyEnv_v003.cc +src/constructStudyEnv_v004.cc +src/constructTargetPS.cc +src/ConstructTrackerDetail5.cc +src/constructTrackerv5.cc +src/constructTS.cc +src/constructTSdA.cc +src/constructVirtualDetectors.cc +src/constructVirtualDetectorSDs.cc +src/constructVisualizationRegions.cc +src/constructWorldVolume.cc +src/CRVSD.cc +src/customizeChargedPionDecay.cc +src/DuplicateLogicalVolumeChecker.cc +src/EventNumberList.cc +src/exportG4PDT.cc +src/ExtMonFNALPixelSD.cc +src/FieldMgr.cc +src/findMaterialOrThrow.cc +src/finishNesting.cc +src/generateFieldMap.cc +src/getPhysicalVolumeOrThrow.cc +src/HelicalProtonAbsorber.cc +src/InitEnvToolBase.cc +src/MaterialFinder.cc +src/MTMasterThread.cc +src/Mu2eG4ActionInitialization.cc +src/Mu2eG4Config.cc +src/Mu2eG4CustomizationPhysicsConstructor.cc +src/Mu2eG4Cuts.cc +src/Mu2eG4DecayMuonsWithSpinPhysicsConstructor.cc +src/Mu2eG4DSGradientMagneticField.cc +src/Mu2eG4EventAction.cc +src/Mu2eG4GlobalMagneticField.cc +src/Mu2eG4Inputs.cc +src/Mu2eG4IOConfigHelper.cc +src/Mu2eG4MasterRunAction.cc +src/Mu2eG4MinDEDXPhysicsConstructor.cc +src/Mu2eG4MinimalModularPhysicsList.cc +src/Mu2eG4MinimalPhysicsConstructor.cc +src/Mu2eG4MTRunManager.cc +src/Mu2eG4PerThreadStorage.cc +src/Mu2eG4PrimaryGeneratorAction.cc +src/Mu2eG4PrimaryType.cc +src/Mu2eG4ResourceLimits.cc +src/Mu2eG4RunAction.cc +src/Mu2eG4SensitiveDetector.cc +src/Mu2eG4StackingAction.cc +src/Mu2eG4StepLimiterPhysicsConstructor.cc +src/Mu2eG4SteppingAction.cc +src/Mu2eG4SteppingVerbose.cc +src/Mu2eG4TrackingAction.cc +src/Mu2eG4TrajectoryControl.cc +src/Mu2eG4UserHelpers.cc +src/Mu2eG4UserTrackInformation.cc +src/Mu2eG4VisCommands.cc +src/Mu2eG4WorkerRunManager.cc +src/Mu2eRecorderProcess.cc +src/Mu2eSpecialCutsProcess.cc +src/Mu2eStudyWorld.cc +src/Mu2eUniverse.cc +src/Mu2eWorld.cc +src/nestBox.cc +src/nestCons.cc +src/nestExtrudedSolid.cc +src/nestPolycone.cc +src/nestPolyhedra.cc +src/nestTorus.cc +src/nestTrp.cc +src/nestTubs.cc +src/PhysicalVolumeHelper.cc +src/physicsListDecider.cc +src/PhysicsProcessInfo.cc +src/preG4InitializeTasks.cc +src/ReflectionProcess.cc +src/SensitiveDetectorHelper.cc +src/setBirksConstant.cc +src/SimParticleHelper.cc +src/SimParticlePrimaryHelper.cc +src/StrawSD.cc +src/toggleProcesses.cc +src/TrackerPlaneSupportSD.cc +src/TrackerWireSD.cc +src/validGeometryOrThrow.cc +src/validPolyCones.cc +src/WorldMaker.cc +src/writePhysicalVolumes.cc +LIBRARIES PUBLIC +cetlib::cetlib +) + +cet_build_plugin(IonProducer art::module REG_SOURCE src/IonProducer_module.cc) + +cet_build_plugin(Mu2eG4 art::module REG_SOURCE src/Mu2eG4_module.cc) + +cet_build_plugin(Mu2eG4MT art::module REG_SOURCE src/Mu2eG4MT_module.cc) + + +install_source(SUBDIRS src) +install_headers(SUBDIRS inc) +install_fhicl(SUBDIRS fcl SUBDIRNAME Mu2eG4) diff --git a/Mu2eG4Helper/CMakeLists.txt b/Mu2eG4Helper/CMakeLists.txt new file mode 100644 index 0000000000..c3c74b696c --- /dev/null +++ b/Mu2eG4Helper/CMakeLists.txt @@ -0,0 +1,12 @@ +cet_make_library( + SOURCE +src/AntiLeakRegistry.cc +src/Mu2eG4Helper_service.cc +src/VolumeInfo.cc +LIBRARIES PUBLIC +cetlib::cetlib +) + + +install_source(SUBDIRS src) +install_headers(SUBDIRS inc) diff --git a/Mu2eHallGeom/CMakeLists.txt b/Mu2eHallGeom/CMakeLists.txt new file mode 100644 index 0000000000..5df8ca5f89 --- /dev/null +++ b/Mu2eHallGeom/CMakeLists.txt @@ -0,0 +1,10 @@ +cet_make_library( + SOURCE +src/Mu2eHall.cc +LIBRARIES PUBLIC +cetlib::cetlib +) + + +install_source(SUBDIRS src) +install_headers(SUBDIRS inc) diff --git a/Mu2eInterfaces/CMakeLists.txt b/Mu2eInterfaces/CMakeLists.txt new file mode 100644 index 0000000000..226439d77e --- /dev/null +++ b/Mu2eInterfaces/CMakeLists.txt @@ -0,0 +1,11 @@ +cet_make_library( + SOURCE +src/ConditionsEntity.cc +src/Detector.cc +LIBRARIES PUBLIC +cetlib::cetlib +) + + +install_source(SUBDIRS src) +install_headers(SUBDIRS inc) diff --git a/Mu2eKinKal/CMakeLists.txt b/Mu2eKinKal/CMakeLists.txt new file mode 100644 index 0000000000..e37cad37eb --- /dev/null +++ b/Mu2eKinKal/CMakeLists.txt @@ -0,0 +1,34 @@ +cet_make_library( + SOURCE +src/BkgANNSHU.cc +src/CADSHU.cc +src/Chi2SHU.cc +src/DriftANNSHU.cc +src/KKBField.cc +src/KKConstantBField.cc +src/KKFitSettings.cc +src/KKFitUtilities.cc +src/KKMaterial.cc +src/KKSHFlag.cc +src/KKStrawMaterial.cc +src/StrawHitUpdaters.cc +src/StrawXingUpdater.cc +src/WHSIterator.cc +src/WHSMask.cc +src/WireHitState.cc +LIBRARIES PUBLIC +cetlib::cetlib +) + +cet_build_plugin(CentralHelixFit art::module REG_SOURCE src/CentralHelixFit_module.cc) + +cet_build_plugin(CosmicTrackSeedFilter art::module REG_SOURCE src/CosmicTrackSeedFilter_module.cc) + +cet_build_plugin(KinematicLineFit art::module REG_SOURCE src/KinematicLineFit_module.cc) + +cet_build_plugin(LoopHelixFit art::module REG_SOURCE src/LoopHelixFit_module.cc) + + +install_source(SUBDIRS src) +install_headers(SUBDIRS inc) +install_fhicl(SUBDIRS fcl SUBDIRNAME Mu2eKinKal) diff --git a/Mu2eUtilities/CMakeLists.txt b/Mu2eUtilities/CMakeLists.txt new file mode 100644 index 0000000000..3384a135bd --- /dev/null +++ b/Mu2eUtilities/CMakeLists.txt @@ -0,0 +1,61 @@ +cet_make_library( + SOURCE +src/BinnedSpectrum.cc +src/BuildLinearFitMatrixSums.cc +src/CaloPulseShape.cc +src/checkSimParticleCollection.cc +src/compressPdgId.cc +src/ConversionSpectrum.cc +src/CoordinateString.cc +src/CosmicTrackUtils.cc +src/CzarneckiSpectrum.cc +src/EjectedProtonSpectrum.cc +src/EventWeightHelper.cc +src/fromStrings.cc +src/GeneratorSummaryHistograms.cc +src/HelixTool.cc +src/HistTrackSum.cc +src/KalRepInstanceNameDecoder.cc +src/LsqSums2.cc +src/LsqSums4.cc +src/McUtilsToolBase.cc +src/MedianCalculator.cc +src/ModuleHistToolBase.cc +src/MuonCaptureSpectrum.cc +src/MVATools.cc +src/ParametricFit.cc +src/particleEnteringG4Volume.cc +src/PhysicalVolumeMultiHelper.cc +src/PionCaptureSpectrum.cc +src/PointLinePCA_XYZ.cc +src/PoissonHistogramBinning.cc +src/polar3Vector.cc +src/ProtonPulseRandPDF.cc +src/RandomLimitedExpo.cc +src/RandomUnitSphere.cc +src/rm48.cc +src/ShankerWatanabeSpectrum.cc +src/SimParticleCollectionPrinter.cc +src/SimParticleGetTau.cc +src/simParticleList.cc +src/SimParticleParentGetter.cc +src/SimpleSpectrum.cc +src/SortedStepPoints.cc +src/STMUtils.cc +src/Table.cc +src/TrackCuts.cc +src/TrackerBFieldInfo.cc +src/TrackPatRecType.cc +src/TrackTool.cc +src/TriggerResultsNavigator.cc +src/TrkSpecies.cc +src/TwoLinePCA.cc +src/TwoLinePCA_XYZ.cc +src/VectorVolume.cc +LIBRARIES PUBLIC +cetlib::cetlib +) + + +install_source(SUBDIRS src) +install_headers(SUBDIRS inc) diff --git a/PTMGeom/CMakeLists.txt b/PTMGeom/CMakeLists.txt new file mode 100644 index 0000000000..0f7910dac3 --- /dev/null +++ b/PTMGeom/CMakeLists.txt @@ -0,0 +1,13 @@ +cet_make_library( + SOURCE +src/PTM.cc +src/PTMHead.cc +src/PTMPWC.cc +src/PTMStand.cc +LIBRARIES PUBLIC +cetlib::cetlib +) + + +install_source(SUBDIRS src) +install_headers(SUBDIRS inc) diff --git a/ParticleID/CMakeLists.txt b/ParticleID/CMakeLists.txt new file mode 100644 index 0000000000..461550b716 --- /dev/null +++ b/ParticleID/CMakeLists.txt @@ -0,0 +1,18 @@ +cet_make_library( + SOURCE +src/PIDLogL1D.cc +src/PIDLogLEp.cc +src/PIDLogLRatio.cc +src/PIDUtilities.cc +LIBRARIES PUBLIC +cetlib::cetlib +) + +cet_build_plugin(ParticleID art::module REG_SOURCE src/ParticleID_module.cc) + +cet_build_plugin(ParticleIDRead art::module REG_SOURCE src/ParticleIDRead_module.cc) + + +install_source(SUBDIRS src) +install_headers(SUBDIRS inc) +install_fhicl(SUBDIRS fcl SUBDIRNAME ParticleID) diff --git a/Print/CMakeLists.txt b/Print/CMakeLists.txt new file mode 100644 index 0000000000..279a74a678 --- /dev/null +++ b/Print/CMakeLists.txt @@ -0,0 +1,61 @@ +cet_make_library( + SOURCE +src/BkgClusterPrinter.cc +src/BkgQualPrinter.cc +src/CaloClusterMCPrinter.cc +src/CaloClusterPrinter.cc +src/CaloDigiPrinter.cc +src/CaloHitMCPrinter.cc +src/CaloHitPrinter.cc +src/CaloRecoDigiPrinter.cc +src/CaloShowerStepPrinter.cc +src/ComboHitPrinter.cc +src/CosmicLivetimePrinter.cc +src/CosmicTrackSeedPrinter.cc +src/CrvCoincidenceClusterPrinter.cc +src/CrvDigiMCPrinter.cc +src/CrvDigiPrinter.cc +src/CrvRecoPulsePrinter.cc +src/CrvStepPrinter.cc +src/EventWindowMarkerPrinter.cc +src/GenParticlePrinter.cc +src/HelixSeedPrinter.cc +src/KalRepPrinter.cc +src/KalSeedPrinter.cc +src/MCTrajectoryPrinter.cc +src/PhysicalVolumePrinter.cc +src/PrimaryParticlePrinter.cc +src/ProtonBunchIntensityPrinter.cc +src/ProtonBunchTimeMCPrinter.cc +src/ProtonBunchTimePrinter.cc +src/SimParticlePrinter.cc +src/SimParticlePtrPrinter.cc +src/StatusG4Printer.cc +src/StepPointMCPrinter.cc +src/STMWaveformDigiPrinter.cc +src/StrawDigiADCWaveformPrinter.cc +src/StrawDigiMCPrinter.cc +src/StrawDigiPrinter.cc +src/StrawGasStepPrinter.cc +src/StrawHitFlagPrinter.cc +src/StrawHitPrinter.cc +src/TimeClusterPrinter.cc +src/TrackClusterMatchPrinter.cc +src/TrackSummaryPrinter.cc +src/TriggerInfoPrinter.cc +src/TriggerResultsPrinter.cc +src/TrkCaloIntersectPrinter.cc +LIBRARIES PUBLIC +cetlib::cetlib +) + +cet_build_plugin(DataProductDump art::module REG_SOURCE src/DataProductDump_module.cc) + +cet_build_plugin(PrintModule art::module REG_SOURCE src/PrintModule_module.cc) + +cet_build_plugin(RunSubrunEvent art::module REG_SOURCE src/RunSubrunEvent_module.cc) + + +install_source(SUBDIRS src) +install_headers(SUBDIRS inc) +install_fhicl(SUBDIRS fcl SUBDIRNAME Print) diff --git a/ProditionsService/CMakeLists.txt b/ProditionsService/CMakeLists.txt new file mode 100644 index 0000000000..957de3c385 --- /dev/null +++ b/ProditionsService/CMakeLists.txt @@ -0,0 +1,13 @@ +cet_make_library( + SOURCE +src/ProditionsService_service.cc +LIBRARIES PUBLIC +cetlib::cetlib +) + +cet_build_plugin(ProditionsTest art::module REG_SOURCE src/ProditionsTest_module.cc) + + +install_source(SUBDIRS src) +install_headers(SUBDIRS inc) +install_fhicl(SUBDIRS fcl SUBDIRNAME ProditionsService) diff --git a/ProductionSolenoidGeom/CMakeLists.txt b/ProductionSolenoidGeom/CMakeLists.txt new file mode 100644 index 0000000000..8fc8de6594 --- /dev/null +++ b/ProductionSolenoidGeom/CMakeLists.txt @@ -0,0 +1,12 @@ +cet_make_library( + SOURCE +src/PSEnclosure.cc +src/PSExternalShielding.cc +src/PSShield.cc +LIBRARIES PUBLIC +cetlib::cetlib +) + + +install_source(SUBDIRS src) +install_headers(SUBDIRS inc) diff --git a/ProductionTargetGeom/CMakeLists.txt b/ProductionTargetGeom/CMakeLists.txt new file mode 100644 index 0000000000..01bd54ebc2 --- /dev/null +++ b/ProductionTargetGeom/CMakeLists.txt @@ -0,0 +1,10 @@ +cet_make_library( + SOURCE +src/ProductionTarget.cc +LIBRARIES PUBLIC +cetlib::cetlib +) + + +install_source(SUBDIRS src) +install_headers(SUBDIRS inc) diff --git a/ProtonBeamDumpGeom/CMakeLists.txt b/ProtonBeamDumpGeom/CMakeLists.txt new file mode 100644 index 0000000000..4b8e1d8aba --- /dev/null +++ b/ProtonBeamDumpGeom/CMakeLists.txt @@ -0,0 +1,10 @@ +cet_make_library( + SOURCE +src/ProtonBeamDump.cc +LIBRARIES PUBLIC +cetlib::cetlib +) + + +install_source(SUBDIRS src) +install_headers(SUBDIRS inc) diff --git a/RecoDataProducts/CMakeLists.txt b/RecoDataProducts/CMakeLists.txt new file mode 100644 index 0000000000..72236e5ca5 --- /dev/null +++ b/RecoDataProducts/CMakeLists.txt @@ -0,0 +1,41 @@ +cet_make_library( + SOURCE +src/AlgorithmID.cc +src/BkgClusterFlag.cc +src/BkgQual.cc +src/ComboHit.cc +src/CosmicTrack.cc +src/CrvDigi.cc +src/CrvRecoPulse.cc +src/ExtMonFNALRawCluster.cc +src/ExtMonFNALRawHit.cc +src/ExtMonFNALRecoCluster.cc +src/ExtMonFNALRecoClusterCollection.cc +src/ExtMonFNALTrkFitQuality.cc +src/ExtMonFNALTrkParam.cc +src/ExtMonUCITofHit.cc +src/HelixVal.cc +src/KalSeed.cc +src/KalSegment.cc +src/PIDProduct.cc +src/RobustHelix.cc +src/StrawDigi.cc +src/StrawDigiFlag.cc +src/StrawHit.cc +src/StrawHitFlag.cc +src/TrackClusterMatch.cc +src/TrackSummary.cc +src/TrkCaloHitPID.cc +src/TrkExtTraj.cc +src/TrkExtTrajPoint.cc +src/TrkFitDirection.cc +src/TrkFitFlag.cc +src/TrkQual.cc +src/TrkToCaloExtrapol.cc +LIBRARIES PUBLIC +cetlib::cetlib +) + + +install_source(SUBDIRS src) +install_headers(SUBDIRS inc) diff --git a/STMConditions/CMakeLists.txt b/STMConditions/CMakeLists.txt new file mode 100644 index 0000000000..696013dec5 --- /dev/null +++ b/STMConditions/CMakeLists.txt @@ -0,0 +1,11 @@ +cet_make_library( + SOURCE +src/STMEnergyCalibMaker.cc +LIBRARIES PUBLIC +cetlib::cetlib +) + + +install_source(SUBDIRS src) +install_headers(SUBDIRS inc) +install_fhicl(SUBDIRS fcl SUBDIRNAME STMConditions) diff --git a/STMConfig/CMakeLists.txt b/STMConfig/CMakeLists.txt new file mode 100644 index 0000000000..04a44744b2 --- /dev/null +++ b/STMConfig/CMakeLists.txt @@ -0,0 +1 @@ +install_headers(SUBDIRS inc) diff --git a/STMGeom/CMakeLists.txt b/STMGeom/CMakeLists.txt new file mode 100644 index 0000000000..04a44744b2 --- /dev/null +++ b/STMGeom/CMakeLists.txt @@ -0,0 +1 @@ +install_headers(SUBDIRS inc) diff --git a/STMReco/CMakeLists.txt b/STMReco/CMakeLists.txt new file mode 100644 index 0000000000..eb3a478f82 --- /dev/null +++ b/STMReco/CMakeLists.txt @@ -0,0 +1,15 @@ +cet_build_plugin(MakeSTMHits art::module REG_SOURCE src/MakeSTMHits_module.cc) + +cet_build_plugin(PlotSTMEnergySpectrum art::module REG_SOURCE src/PlotSTMEnergySpectrum_module.cc) + +cet_build_plugin(PlotSTMMWDSpectrum art::module REG_SOURCE src/PlotSTMMWDSpectrum_module.cc) + +cet_build_plugin(PlotSTMWaveformDigis art::module REG_SOURCE src/PlotSTMWaveformDigis_module.cc) + +cet_build_plugin(STMMovingWindowDeconvolution art::module REG_SOURCE src/STMMovingWindowDeconvolution_module.cc) + +cet_build_plugin(STMZeroSuppression art::module REG_SOURCE src/STMZeroSuppression_module.cc) + + +install_source(SUBDIRS src) +install_fhicl(SUBDIRS fcl SUBDIRNAME STMReco) diff --git a/SeedService/CMakeLists.txt b/SeedService/CMakeLists.txt new file mode 100644 index 0000000000..c3db069a4f --- /dev/null +++ b/SeedService/CMakeLists.txt @@ -0,0 +1,12 @@ +cet_make_library( + SOURCE +src/SeedService_service.cc +LIBRARIES PUBLIC +cetlib::cetlib +) + +cet_build_plugin(SeedTest01 art::module REG_SOURCE src/SeedTest01_module.cc) + + +install_source(SUBDIRS src) +install_headers(SUBDIRS inc) diff --git a/ServicesGeom/CMakeLists.txt b/ServicesGeom/CMakeLists.txt new file mode 100644 index 0000000000..b1290abe10 --- /dev/null +++ b/ServicesGeom/CMakeLists.txt @@ -0,0 +1,11 @@ +cet_make_library( + SOURCE +src/ElectronicRack.cc +src/Pipe.cc +LIBRARIES PUBLIC +cetlib::cetlib +) + + +install_source(SUBDIRS src) +install_headers(SUBDIRS inc) diff --git a/SimulationConditions/CMakeLists.txt b/SimulationConditions/CMakeLists.txt new file mode 100644 index 0000000000..61a1d9498b --- /dev/null +++ b/SimulationConditions/CMakeLists.txt @@ -0,0 +1,13 @@ +cet_make_library( + SOURCE +src/SimBookkeeperCache.cc +src/SimBookkeeper.cc +src/SimBookkeeperMaker.cc +LIBRARIES PUBLIC +cetlib::cetlib +) + + +install_source(SUBDIRS src) +install_headers(SUBDIRS inc) +install_fhicl(SUBDIRS fcl SUBDIRNAME SimulationConditions) diff --git a/SimulationConfig/CMakeLists.txt b/SimulationConfig/CMakeLists.txt new file mode 100644 index 0000000000..04a44744b2 --- /dev/null +++ b/SimulationConfig/CMakeLists.txt @@ -0,0 +1 @@ +install_headers(SUBDIRS inc) diff --git a/Sources/CMakeLists.txt b/Sources/CMakeLists.txt new file mode 100644 index 0000000000..3f5d770402 --- /dev/null +++ b/Sources/CMakeLists.txt @@ -0,0 +1,19 @@ +cet_make_library( + SOURCE +src/CosmicCORSIKA.cc +src/ExtMonFNALMARSUtils.cc +src/FromCorsikaBinary_source.cc +src/FromEMFMARSFileWeighted_source.cc +src/FromExtMonFNALMARSFile_source.cc +src/FromSTMTestBeamData_source.cc +src/FromTrackerPrototypeData_source.cc +src/PBISequence_source.cc +src/STMTestBeamFileNameDecoder.cc +src/STMTestBeamHeaders.cc +LIBRARIES PUBLIC +cetlib::cetlib +) + + +install_source(SUBDIRS src) +install_headers(SUBDIRS inc) diff --git a/StoppingTargetGeom/CMakeLists.txt b/StoppingTargetGeom/CMakeLists.txt new file mode 100644 index 0000000000..894b647c24 --- /dev/null +++ b/StoppingTargetGeom/CMakeLists.txt @@ -0,0 +1,10 @@ +cet_make_library( + SOURCE +src/zBinningForFoils.cc +LIBRARIES PUBLIC +cetlib::cetlib +) + + +install_source(SUBDIRS src) +install_headers(SUBDIRS inc) diff --git a/TEveEventDisplay/CMakeLists.txt b/TEveEventDisplay/CMakeLists.txt new file mode 100644 index 0000000000..115ee97b62 --- /dev/null +++ b/TEveEventDisplay/CMakeLists.txt @@ -0,0 +1,30 @@ +cet_make_library( + SOURCE +src/Collection_Filler.cc +src/Geom_Interface.cc +src/TEveMu2eCalorimeter.cc +src/TEveMu2eCluster.cc +src/TEveMu2eCRV.cc +src/TEveMu2eCRVEvent.cc +src/TEveMu2eCustomHelix.cc +src/TEveMu2eDataInterface.cc +src/TEveMu2eHit.cc +src/TEveMu2eMainWindow.cc +src/TEveMu2eMCInterface.cc +src/TEveMu2eMCTraj.cc +src/TEveMu2eProjectionInterface.cc +src/TEveMu2eStraightTrack.cc +src/TEveMu2eTracker.cc +LIBRARIES PUBLIC +cetlib::cetlib +) + +cet_build_plugin(TEveEventDisplay art::module REG_SOURCE src/TEveEventDisplay_module.cc) + +cet_build_plugin(TEveGDMLTest art::module REG_SOURCE src/TEveGDMLTest_module.cc) + +cet_build_plugin(TEveNonGDMLTest art::module REG_SOURCE src/TEveNonGDMLTest_module.cc) + + +install_source(SUBDIRS src) +install_fhicl(SUBDIRS fcl SUBDIRNAME TEveEventDisplay) diff --git a/TestTools/CMakeLists.txt b/TestTools/CMakeLists.txt new file mode 100644 index 0000000000..25c4d62765 --- /dev/null +++ b/TestTools/CMakeLists.txt @@ -0,0 +1,10 @@ +cet_make_library( + SOURCE +src/TestClass.cc +LIBRARIES PUBLIC +cetlib::cetlib +) + + +install_source(SUBDIRS src) +install_headers(SUBDIRS inc) diff --git a/TrackCaloMatching/CMakeLists.txt b/TrackCaloMatching/CMakeLists.txt new file mode 100644 index 0000000000..cecfad9bfa --- /dev/null +++ b/TrackCaloMatching/CMakeLists.txt @@ -0,0 +1,15 @@ +cet_build_plugin(TrackCaloIntersection art::module REG_SOURCE src/TrackCaloIntersection_module.cc) + +cet_build_plugin(TrackCaloIntersectionMVA art::module REG_SOURCE src/TrackCaloIntersectionMVA_module.cc) + +cet_build_plugin(TrackCaloMatchingExtend art::module REG_SOURCE src/TrackCaloMatchingExtend_module.cc) + +cet_build_plugin(TrackCaloMatching art::module REG_SOURCE src/TrackCaloMatching_module.cc) + +cet_build_plugin(TrackCaloMatchingMVA art::module REG_SOURCE src/TrackCaloMatchingMVA_module.cc) + +cet_build_plugin(TrkExtrapol art::module REG_SOURCE src/TrkExtrapol_module.cc) + + +install_source(SUBDIRS src) +install_fhicl(SUBDIRS fcl SUBDIRNAME TrackCaloMatching) diff --git a/TrackerConditions/CMakeLists.txt b/TrackerConditions/CMakeLists.txt new file mode 100644 index 0000000000..b6ce4641dc --- /dev/null +++ b/TrackerConditions/CMakeLists.txt @@ -0,0 +1,28 @@ +cet_make_library( + SOURCE +src/AlignedTrackerMaker.cc +src/DriftInfo.cc +src/FullReadoutStraw.cc +src/FullReadoutStrawMaker.cc +src/Mu2eDetector.cc +src/Mu2eDetectorMaker.cc +src/Mu2eMaterial.cc +src/Mu2eMaterialMaker.cc +src/StrawDrift.cc +src/StrawDriftMaker.cc +src/StrawElectronics.cc +src/StrawElectronicsMaker.cc +src/StrawPhysics.cc +src/StrawPhysicsMaker.cc +src/StrawResponse.cc +src/StrawResponseMaker.cc +src/TrackerStatus.cc +src/TrackerStatusMaker.cc +LIBRARIES PUBLIC +cetlib::cetlib +) + + +install_source(SUBDIRS src) +install_headers(SUBDIRS inc) +install_fhicl(SUBDIRS fcl SUBDIRNAME TrackerConditions) diff --git a/TrackerConfig/CMakeLists.txt b/TrackerConfig/CMakeLists.txt new file mode 100644 index 0000000000..04a44744b2 --- /dev/null +++ b/TrackerConfig/CMakeLists.txt @@ -0,0 +1 @@ +install_headers(SUBDIRS inc) diff --git a/TrackerGeom/CMakeLists.txt b/TrackerGeom/CMakeLists.txt new file mode 100644 index 0000000000..bb91145362 --- /dev/null +++ b/TrackerGeom/CMakeLists.txt @@ -0,0 +1,16 @@ +cet_make_library( + SOURCE +src/Manifold.cc +src/Panel.cc +src/Plane.cc +src/Straw.cc +src/SupportModel.cc +src/SupportStructure.cc +src/Tracker.cc +LIBRARIES PUBLIC +cetlib::cetlib +) + + +install_source(SUBDIRS src) +install_headers(SUBDIRS inc) diff --git a/TrackerMC/CMakeLists.txt b/TrackerMC/CMakeLists.txt new file mode 100644 index 0000000000..e5033af2d1 --- /dev/null +++ b/TrackerMC/CMakeLists.txt @@ -0,0 +1,20 @@ +cet_make_library( + SOURCE +src/StrawCluster.cc +src/StrawClusterSequence.cc +src/StrawClusterSequencePair.cc +src/StrawWaveform.cc +LIBRARIES PUBLIC +cetlib::cetlib +) + +cet_build_plugin(MakeMCKalSeed art::module REG_SOURCE src/MakeMCKalSeed_module.cc) + +cet_build_plugin(MakeStrawGasSteps art::module REG_SOURCE src/MakeStrawGasSteps_module.cc) + +cet_build_plugin(StrawDigisFromStrawGasSteps art::module REG_SOURCE src/StrawDigisFromStrawGasSteps_module.cc) + + +install_source(SUBDIRS src) +install_headers(SUBDIRS inc) +install_fhicl(SUBDIRS fcl SUBDIRNAME TrackerMC) diff --git a/Trigger/CMakeLists.txt b/Trigger/CMakeLists.txt new file mode 100644 index 0000000000..9fd23864d8 --- /dev/null +++ b/Trigger/CMakeLists.txt @@ -0,0 +1,13 @@ +cet_build_plugin(DigiFilter art::module REG_SOURCE src/DigiFilter_module.cc) + +cet_build_plugin(EvalWeightedEventCounts art::module REG_SOURCE src/EvalWeightedEventCounts_module.cc) + +cet_build_plugin(MergeTriggerInfo art::module REG_SOURCE src/MergeTriggerInfo_module.cc) + +cet_build_plugin(PrescaleEvent art::module REG_SOURCE src/PrescaleEvent_module.cc) + +cet_build_plugin(ReadTriggerInfo art::module REG_SOURCE src/ReadTriggerInfo_module.cc) + + +install_source(SUBDIRS src) +install_fhicl(SUBDIRS fcl SUBDIRNAME Trigger) diff --git a/TrkDiag/CMakeLists.txt b/TrkDiag/CMakeLists.txt new file mode 100644 index 0000000000..12dbe52cfa --- /dev/null +++ b/TrkDiag/CMakeLists.txt @@ -0,0 +1,39 @@ +cet_make_library( + SOURCE +src/TrkCaloDiag.cc +src/TrkComp.cc +src/TrkMCTools.cc +LIBRARIES PUBLIC +cetlib::cetlib +) + +cet_build_plugin(BinnedSpectrumWeight art::module REG_SOURCE src/BinnedSpectrumWeight_module.cc) + +cet_build_plugin(BkgDiag art::module REG_SOURCE src/BkgDiag_module.cc) + +cet_build_plugin(ComboHitDiag art::module REG_SOURCE src/ComboHitDiag_module.cc) + +cet_build_plugin(HelixDiag art::module REG_SOURCE src/HelixDiag_module.cc) + +cet_build_plugin(ProtonBunchTimeDiag art::module REG_SOURCE src/ProtonBunchTimeDiag_module.cc) + +cet_build_plugin(RMCWeight art::module REG_SOURCE src/RMCWeight_module.cc) + +cet_build_plugin(StrawHitDiag art::module REG_SOURCE src/StrawHitDiag_module.cc) + +cet_build_plugin(StrawResponseTest art::module REG_SOURCE src/StrawResponseTest_module.cc) + +cet_build_plugin(TimeClusterDiag art::module REG_SOURCE src/TimeClusterDiag_module.cc) + +cet_build_plugin(TrackPID art::module REG_SOURCE src/TrackPID_module.cc) + +cet_build_plugin(TrackQuality art::module REG_SOURCE src/TrackQuality_module.cc) + +cet_build_plugin(TrkGeomTest art::module REG_SOURCE src/TrkGeomTest_module.cc) + +cet_build_plugin(TrkRecoDiag art::module REG_SOURCE src/TrkRecoDiag_module.cc) + + +install_source(SUBDIRS src) +install_headers(SUBDIRS inc) +install_fhicl(SUBDIRS fcl SUBDIRNAME TrkDiag) diff --git a/TrkExt/CMakeLists.txt b/TrkExt/CMakeLists.txt new file mode 100644 index 0000000000..0550933a1a --- /dev/null +++ b/TrkExt/CMakeLists.txt @@ -0,0 +1,20 @@ +cet_make_library( + SOURCE +src/TrkExtDetectors.cc +src/TrkExtDiag.cc +src/TrkExtInstanceName.cc +src/TrkExtMaterial.cc +src/TrkExtMCHits.cc +src/TrkExtProtonAbsorber.cc +src/TrkExtShape.cc +src/TrkExtStoppingTarget.cc +src/TrkExtToyDS.cc +LIBRARIES PUBLIC +cetlib::cetlib +) + +cet_build_plugin(TrkExt art::module REG_SOURCE src/TrkExt_module.cc) + + +install_source(SUBDIRS src) +install_headers(SUBDIRS inc) diff --git a/TrkFilters/CMakeLists.txt b/TrkFilters/CMakeLists.txt new file mode 100644 index 0000000000..d6ef263adc --- /dev/null +++ b/TrkFilters/CMakeLists.txt @@ -0,0 +1,9 @@ +cet_build_plugin(HelixFilter art::module REG_SOURCE src/HelixFilter_module.cc) + +cet_build_plugin(SeedFilter art::module REG_SOURCE src/SeedFilter_module.cc) + +cet_build_plugin(TimeClusterFilter art::module REG_SOURCE src/TimeClusterFilter_module.cc) + + +install_source(SUBDIRS src) +install_fhicl(SUBDIRS fcl SUBDIRNAME TrkFilters) diff --git a/TrkHitReco/CMakeLists.txt b/TrkHitReco/CMakeLists.txt new file mode 100644 index 0000000000..721307d8ee --- /dev/null +++ b/TrkHitReco/CMakeLists.txt @@ -0,0 +1,29 @@ +cet_make_library( + SOURCE +src/ComboPeakFitRoot.cc +src/PeakFit.cc +src/PeakFitFunction.cc +src/PeakFitParams.cc +src/PeakFitRoot.cc +src/StrawHitRecoUtils.cc +src/TNTClusterer.cc +LIBRARIES PUBLIC +cetlib::cetlib +) + +cet_build_plugin(CombineStrawHits art::module REG_SOURCE src/CombineStrawHits_module.cc) + +cet_build_plugin(FlagBkgHits art::module REG_SOURCE src/FlagBkgHits_module.cc) + +cet_build_plugin(MakeStereoHits art::module REG_SOURCE src/MakeStereoHits_module.cc) + +cet_build_plugin(ProtonBunchTimeFromStrawDigis art::module REG_SOURCE src/ProtonBunchTimeFromStrawDigis_module.cc) + +cet_build_plugin(ReadStrawDigi art::module REG_SOURCE src/ReadStrawDigi_module.cc) + +cet_build_plugin(StrawHitReco art::module REG_SOURCE src/StrawHitReco_module.cc) + + +install_source(SUBDIRS src) +install_headers(SUBDIRS inc) +install_fhicl(SUBDIRS fcl SUBDIRNAME TrkHitReco) diff --git a/TrkPatRec/CMakeLists.txt b/TrkPatRec/CMakeLists.txt new file mode 100644 index 0000000000..60991a0cd4 --- /dev/null +++ b/TrkPatRec/CMakeLists.txt @@ -0,0 +1,24 @@ +cet_make_library( + SOURCE +src/KalFinalFitDiag_tool.cc +src/KalSeedFitDiag_tool.cc +src/RobustHelixFinderDiag_tool.cc +src/TimeAndPhiClusterFinderDiag_tool.cc +LIBRARIES PUBLIC +cetlib::cetlib +) + +cet_build_plugin(KalFinalFit art::module REG_SOURCE src/KalFinalFit_module.cc) + +cet_build_plugin(KalSeedFit art::module REG_SOURCE src/KalSeedFit_module.cc) + +cet_build_plugin(RobustHelixFinder art::module REG_SOURCE src/RobustHelixFinder_module.cc) + +cet_build_plugin(TimeAndPhiClusterFinder art::module REG_SOURCE src/TimeAndPhiClusterFinder_module.cc) + +cet_build_plugin(TimeClusterFinder art::module REG_SOURCE src/TimeClusterFinder_module.cc) + + +install_source(SUBDIRS src) +install_headers(SUBDIRS inc) +install_fhicl(SUBDIRS fcl SUBDIRNAME TrkPatRec) diff --git a/TrkReco/CMakeLists.txt b/TrkReco/CMakeLists.txt new file mode 100644 index 0000000000..beb1799567 --- /dev/null +++ b/TrkReco/CMakeLists.txt @@ -0,0 +1,28 @@ +cet_make_library( + SOURCE +src/AmbigResolver.cc +src/DoubletAmbigResolver.cc +src/FixedAmbigResolver.cc +src/HitAmbigResolver.cc +src/KalFit.cc +src/KalFitData.cc +src/PanelAmbigResolver.cc +src/PanelAmbigStructs.cc +src/PanelStateIterator.cc +src/RobustHelixFinderData.cc +src/RobustHelixFit.cc +src/TrkDef.cc +src/TrkPrintUtils.cc +src/TrkRecoMcUtils_tool.cc +src/TrkTimeCalculator.cc +src/TrkUtilities.cc +LIBRARIES PUBLIC +cetlib::cetlib +) + +cet_build_plugin(MergeHelices art::module REG_SOURCE src/MergeHelices_module.cc) + + +install_source(SUBDIRS src) +install_headers(SUBDIRS inc) +install_fhicl(SUBDIRS fcl SUBDIRNAME TrkReco) diff --git a/UtilityModules/CMakeLists.txt b/UtilityModules/CMakeLists.txt new file mode 100644 index 0000000000..430219cf70 --- /dev/null +++ b/UtilityModules/CMakeLists.txt @@ -0,0 +1,8 @@ +cet_build_plugin(ModifyTrackSPM art::module REG_SOURCE src/ModifyTrackSPM_module.cc) + +cet_build_plugin(NullProducer art::module REG_SOURCE src/NullProducer_module.cc) + +cet_build_plugin(ReadTrackSPM art::module REG_SOURCE src/ReadTrackSPM_module.cc) + + +install_source(SUBDIRS src) diff --git a/Validation/CMakeLists.txt b/Validation/CMakeLists.txt new file mode 100644 index 0000000000..637ec94dbb --- /dev/null +++ b/Validation/CMakeLists.txt @@ -0,0 +1,49 @@ +cet_make_library( + SOURCE +src/ValBkgCluster.cc +src/ValBkgQual.cc +src/ValCaloCluster.cc +src/ValCaloDigi.cc +src/ValCaloHit.cc +src/ValCaloRecoDigi.cc +src/ValCaloShowerStep.cc +src/ValComboHit.cc +src/valCompare_main.cc +src/ValCrvCoincidenceCluster.cc +src/ValCrvDigi.cc +src/ValCrvDigiMC.cc +src/ValCrvRecoPulse.cc +src/ValCrvStep.cc +src/ValEventWindowMarker.cc +src/ValGenParticle.cc +src/ValHelixSeed.cc +src/ValId.cc +src/ValKalSeed.cc +src/ValProtonBunchIntensity.cc +src/ValProtonBunchTime.cc +src/ValProtonBunchTimeMC.cc +src/ValSimParticle.cc +src/ValStatusG4.cc +src/ValStepPointMC.cc +src/ValSTMWaveformDigi.cc +src/ValStrawDigiADCWaveform.cc +src/ValStrawDigi.cc +src/ValStrawDigiMC.cc +src/ValStrawGasStep.cc +src/ValStrawHit.cc +src/ValStrawHitFlag.cc +src/ValTimeCluster.cc +src/ValTrackClusterMatch.cc +src/ValTrackSummary.cc +src/ValTriggerInfo.cc +src/ValTriggerResults.cc +LIBRARIES PUBLIC +cetlib::cetlib +) + +cet_build_plugin(Validation art::module REG_SOURCE src/Validation_module.cc) + + +install_source(SUBDIRS src) +install_headers(SUBDIRS inc) +install_fhicl(SUBDIRS fcl SUBDIRNAME Validation) diff --git a/make_cmake.sh b/make_cmake.sh new file mode 100755 index 0000000000..f680f5579c --- /dev/null +++ b/make_cmake.sh @@ -0,0 +1,58 @@ +for dir in */;do + cd $dir + dirname=`echo $dir|sed 's|/||g'` + + if [ -f CMakeLists.txt ];then + mv CMakeLists.txt{,.bak} + fi + + if [ -d src ]; then + + make_lib=0 + for file in src/*.cc;do + if [[ $file =~ "_module.cc" ]]; then + continue + fi + make_lib=1 + break + done + + if [ $make_lib -eq 1 ];then + echo 'cet_make_library( + SOURCE' >CMakeLists.txt + + for file in src/*.cc;do + if [[ $file =~ "_module.cc" ]]; then + continue + fi + echo $file >>CMakeLists.txt + done + + echo "LIBRARIES PUBLIC" >>CMakeLists.txt + echo "cetlib::cetlib" >>CMakeLists.txt # For example + echo ")" >>CMakeLists.txt + echo >>CMakeLists.txt + fi + + modcount=`ls src/*_module.cc 2>/dev/null |wc -l` + if [ $modcount -gt 0 ]; then + for file in src/*_module.cc;do + modname=`echo $file|sed 's|src/||g;s/_module.cc//g'` + echo "cet_build_plugin($modname art::module REG_SOURCE $file)" >>CMakeLists.txt + echo >> CMakeLists.txt + done + fi + + echo >>CMakeLists.txt + echo "install_source(SUBDIRS src)" >> CMakeLists.txt + + fi + if [ -d inc ]; then + echo "install_headers(SUBDIRS inc)" >> CMakeLists.txt + fi + if [ -d fcl ]; then + echo "install_fhicl(SUBDIRS fcl SUBDIRNAME $dirname)" >> CMakeLists.txt + fi + + cd .. +done diff --git a/ups/product_deps b/ups/product_deps new file mode 100644 index 0000000000..aa49928118 --- /dev/null +++ b/ups/product_deps @@ -0,0 +1,353 @@ +######################################################################## +# product_deps +# +# Define attributes of a package to be built and distributed as a UPS +# product. +# +# This file is parsed as a consequence of sourcing the +# setup_for_development or setup_deps shell-agnostic scripts. +# +# Generated by cetmodules 3.21.01 at Wed Mar 08 10:41:17 CST 2023 +######################################################################## + +#################################### +# Basic information. + +################## +# parent +################## +# +# The parent line - if present - must be the first non-comment line in +# the file, defining the product's name and version. Any information not +# specified will be taken from the CMake project( VERSION +# ) call in the CMakeLists.txt in the parent directory to +# the one containing this file. +# +# Recommended: +# +parent offline +# +# Deprecated (will produce a warning): +# +#> parent []... + +################## +# chain[s] +################## +# +# List the UPS chains ("-c", -t, "new," "current," "old...") to be defined +# for the package. The trailing `s' is optional and without meaning. +# Multiple chains may be specified with one or more declarations. +# +#> chains ... + +################## +# defaultqual +################## +# +# The default colon-delimited qualifier set used if one is not provided +# to setup_for_development. Build type (debug, opt or prof) is optional. +# +# Deprecated - a qualifier should generally be provided to the +# invocation of setup_for_development or setup_deps. +# +defaultqual s124:e28 + +################## +# noarch +################## +# +# Specify this keyword if the package is architecture-independent. This +# does not necessarily imply a lack of qualifiers or of a +# fully-qualified (fq) subdirectory in the installed package. +# +#> noarch + +################## +# no_fq_dir +################## +# +# Specify this keyword if the UPS package should not have a +# fully-qualified (fq) subdirectory in the installed package. This does +# not necessarily imply noarch or a lack of qualifiers, but caution +# should be observed if using this keyword for architecture-dependent +# packages or those with qualifiers to avoid overwritten files when +# multiple different variants of the package are installed in the same +# UPS area. +# +#> no_fq_dir + +################## +# define_pythonpath +################## +# +# If define_pythonpath is enabled, the appropriate path will be appended +# to PYTHONPATH. +# +#> define_pythonpath +#################################### + +#################################### +# Directory specifications. +# +# These optional definitions specify the installed directories where +# various files headers, libraries, and executables will be found. Some +# have defaults; others must be specified if files of that type are to +# be installed. Minimize configuration complexity by using only those +# definitions necessary for the package. +# +################## +# Notes: +# +# * Use directory specifications only if the defaults are inappropriate +# for your product. +# +# * A specification with defaults may be obviated by specifying a base +# of `-' as the only argument. +# +# * A directory will be created and appropriate UPS table file entries +# made *if and only if* files of that type are installed using the +# appropriate directive. +# +################## +# Format: +# +#> [] +# +# may be `-' (negate defaults), "product_dir", or "fq_dir" as +# desired. +# +# Available s and defaults: +# +#> bindir fq_dir bin +# +# Built binaries for public use. +# +#> cmakemoduledir product_dir Modules +# +# CMake modules. +# +#> fcldir product_dir fcl +# +# FHiCL framework configuration files. +# +#> fwdir +# +# Framework data. +# +#> gdmldir product_dir gdml +# +# GDML geometry description files. +# +#> incdir product_dir include +# +# Headers. +# +#> libdir fq_dir lib +# +# Compiled and other libraries. +# +#> perllib product_dir perl5lib +# +# Perl modules, etc. +# +#> set_fwdir +# +# An additional location for framework data to be added to +# FW_SEARCH_PATH; may be specified multiple times. +# +#> set_wpdir +# +# An additional location for wirecell data to be added to +# WIRECELL_PATH; may be specified multiple times. +# +#> testdir product_dir test +# +# Tests. +# +#> wpdir +# +# Wirecell data. +# +#################################### + +#################################### +# Product table. +# +# Table defining *all* direct UPS package dependencies. +# +################## +# Format: +# +#> product version qual [""] +#> [] [] +#>... +#> end_product_list +# +# may be a UPS version, a chain option (-c, -t, etc.) or a +# chain name with a preceding `-'. +# +# Valid values: +# +# * [!] +# +# A single qualifier whose presence in the parent's qualifier will +# trigger the setup of the specified version of the product. A prefix +# of `!' will negate the match. +# +# * |- +# +# The specified version of the product will always be set up +# regardless of the parent's qualifiers. Use `-' as a placeholder if +# is to be specified. +# +# * -nq- +# +# Specify explicitly that this product should be set up when the +# parent is unqualified. +# +# * -default- +# +# The specified version of the product will be set up if no other +# product table entry for this product is applicable to the parent's +# qualifiers. +# +# Valid values: +# +# * only_for_build +# +# The specified product will be set up for building only, and will not +# be added to the table file. +# +# * optional +# +# It will not be an error if the specified product is not available to +# be set up. +# +################## +# Notes. +# +# * Under older versions of the product table format ("" +# or unspecified), -nq- had the same meaning as `-' above. When +# updating a product_deps file these entries should be reviewed when +# is selected. +# +# * "" is a valid alias for "". +# +# * Under most circumstances (the parent is anything other than +# cetmodules), an entry for cetmodules is required. +# +# * It is an error for more than one non-( == "-default-") +# entry to match for a given product. +# +product version qual flags +art_root_io v1_12_04 +gallery v1_21_03 +geant4 v4_11_1_p02a +xerces_c v3_2_3e +artdaq_core_mu2e v1_09_03 +BTrk v1_02_44 +KinKal v02_04_03 +cry v1_7q +gsl v2_7 +swig - only_for_build +cetmodules v3_21_02 - only_for_build +end_product_list +#################################### + +#################################### +# Qualifier table. +# +# For each valid qualifer set of the parent, specify how dependencies +# should be set up. +# +# Format: +# +#> qualifier ... [] +#> ... [] +#>... +#> end_qualifier_list +# +# may be a product name or "compiler." +# +# may be a colon-delimited qualifier set, or "-nq-" as a +# column placeholder in the case of no parent qualifiers. +# +# Unless is "compiler", may be a colon-delimited +# qualifier set, or: +# +# * - +# +# The dependency is not required for this and will not +# be set up. +# +# * -nq- +# +# The dependency will be set up without qualifiers. +# +# * -b- (deprecated) +# +# A build-only dependency for this . If the dependency is +# set up in this way, it will be set up without qualifiers. For more +# flexibility, use the product table to specify the only_for_build +# nature of the dependency and the qualifier table to specifiy how it +# should be set up. +# +# If is "compiler", must be `-' (no compiler +# required) or the name of the UPS product for the desired compiler. Any +# qualifiers required to set up the compiler should be specified in the +# appropriate column for that product. +# +################## +# Notes. +# +# * A column for every product in the product table (see above) is +# *required* unless the only_for_build flag is specified, in which +# case it is optional. +# +qualifier art_root_io gallery geant4 xerces_c artdaq_core_mu2e BTrk KinKal cry gsl +e28:debug e28:debug e28:debug e28:mt:debug e28 e28:s124:debug e28:p3915:debug e28:p3915:debug e28:debug -nq- +e28:prof e28:prof e28:prof e28:mt:prof e28 e28:s124:prof e28:p3915:prof e28:p3915:prof e28:prof -nq- +end_qualifier_list +#################################### + +#################################### +# Table fragment. +# +# Any lines between "table_fragment_begin" and "table_fragment_end" will +# be copied to the table file verbatim. +table_fragment_begin + +# envSet (MU2E_BASE_RELEASE, \${OFFLINE_DIR} ) +# envSet (MU2E_SEARCH_PATH, \${OFFLINE_DIR}/config:\${MU2E_DATA_PATH}:/cvmfs/mu2e.opensciencegrid.org/DataFiles ) +# envSet (FHICL_FILE_PATH, \${OFFLINE_DIR}/config:\${OFFLINE_DIR}/config/Offline/fcl ) +# envSet (OFFLINE_VERSION, \${UPS_PROD_VERSION} ) +# pathAppend( ROOT_INCLUDE_PATH, \${OFFLINE_INC}) + +# exeActionRequired(GetFQDir) +# envSet (OFFLINE_LIB, \${OFFLINE_DIR}/\${OFFLINE_FQ}/lib ) +# pathAppend( CET_PLUGIN_PATH, \${OFFLINE_LIB} ) +# pathPrepend(PATH, "\${OFFLINE_DIR}/\${OFFLINE_FQ}/bin") + +# if ( test \`uname\` = "Darwin" ) +# pathPrepend(DYLD_LIBRARY_PATH, \${\${UPS_PROD_NAME_UC}_LIB}) +# else() +# pathPrepend(LD_LIBRARY_PATH, \${\${UPS_PROD_NAME_UC}_LIB}) +# endif ( test \`uname\` = "Darwin" ) + +table_fragment_end +#################################### + +#################################### +# Backmatter. +# +# Comments and editor-specific metadata. + +# Preserve tabs and formatting in emacs and vi / vim: + +### Local Variables: +### mode: sh +### tab-width: 8 +### End: + +# vi:set ts=8 noexpandtab: diff --git a/ups/setup_deps b/ups/setup_deps new file mode 100644 index 0000000000..c04900af9e --- /dev/null +++ b/ups/setup_deps @@ -0,0 +1,260 @@ +######################################################################## +# This script is shell-agnostic, which involves much acrobatics to avoid +# causing errors in one interpreter or another (*stares in csh*). +# +# There should be as little as possible here, with most of the heavy +# lifting done by other small scripts. +# +# When sourcing this file from a script, you may have to tell this +# source file where it is via the fw_db shell (or env) variable, i.e. +# set fw_db=/some/path; source /some/path/this_file +# or fw_db=/some/path; . /some/path/this_file +# +# Generated by cetmodules 3.21.01 at Wed Mar 08 10:41:17 CST 2023 +######################################################################## + +######################################################################## +# NO USER-SERVICEABLE PARTS BELOW. +######################################################################## + +# Determine shell flavor. +true && test $?shell = 1 && set _cetpkg_shell_flavor=csh || _cetpkg_shell_flavor=sh + +#################################### +# A common set of commands to use to hide as many shell flavor +# differences as possible. + +################## +# IMPORTANT NOTE: +# +# Following extensive tests in multiple shells, I have reached the +# conclusion that it is not actually possible for a function to mirror +# the semantics of an assignment with respect to the status code of `` +# and compound statements joined with "||" or "&&". To handle this, we +# write a large chunk of shell code to a temporary file in the current +# directory a.k.a. CETPKG_BUILD with shell variable assignments correct +# according to the shell flavor, and then source it. This also allows us +# to deal with the fact that some shells don't pass arguments to sourced +# scripts *stares harder in csh*. +# +# 2020-06-24 CHG. +################## + +# If we're C-flavored, set up the commands using alias. +test "$_cetpkg_shell_flavor" = csh && \ + set _cetpkg_nobuild="nobuild" && \ + set _cetpkg_shell_var_set=set\\1 && \ + set _cetpkg_to_stderr="| sh -c 'cat 1>\\&2'" && \ + alias vecho_ 'if ($?vv == 1) echo \>\> \!*' && \ + alias unsetenv_ unsetenv && \ + alias tnotnull "eval '"'test $?'"\!* -eq 1' && eval '"'test -n "$'"\!*"'"'"'" && \ + alias nullout "\!* >& /dev/null" && \ + alias __TOP_EOF__ '' && \ + alias return exit + +# For Bourne-flavored shells, use functions. +test "$_cetpkg_shell_flavor" = sh && \ + _cetpkg_nobuild="nobuild" && \ + _cetpkg_shell_var_set= && \ + _cetpkg_to_stderr='1>\&2' && \ + eval 'vecho_() { test -n "${vv-}" && echo ">> $*"; return 0; }' && \ + eval 'setenv() { eval "$1=\"\${2-}\"; export $1"; }' && \ + eval 'unsetenv_() { unset "$@"; }' && \ + eval 'source() { . "$@"; }' && \ + eval 'tnotnull() { eval "test -n \"\${$1-}\""; }' && \ + eval 'nullout() { "$@" >/dev/null 2>&1; }' +#################################### + +################## +# Check for UPS (uses alias for return in C-flavored shells). +test -z "$UPS_DIR" && \ + ( echo ""; echo "ERROR: you MUST set up UPS"; echo "" ) && \ + return 1 || true +################## + +#################################### +# Need to find ourselves to set CETPKG_SOURCE. + +# Define empty variables for C-flavor shells to make things easier. +test "$_cetpkg_shell_flavor" = csh && \ + set _cetpkg_fw_db= _cetpkg_myself= _cetpkg_mydir= + +# If user has set fw_db, identify our top-level source directory now. +test "$_cetpkg_shell_flavor" = csh && tnotnull fw_db && \ + set _cetpkg_fw_db=`sh -c "cd $fw_db:q >/dev/null 2>&1 && /bin/pwd -P"` && \ + vecho_ "found ourselves through fw_db" || true +test "$_cetpkg_shell_flavor" = sh && tnotnull fw_db && \ + _cetpkg_fw_db=`sh -c "cd \"$fw_db\" >/dev/null 2>&1 && /bin/pwd -P"` && \ + vecho_ "found ourselves through fw_db" || true + +################## +# For Bash and zsh, identify ourselves now so we don't have to go +# through acrobatics later in the sourced script. +test "$_cetpkg_shell_flavor" = sh && tnotnull BASH_SOURCE && \ + _cetpkg_myself="$BASH_SOURCE" && test -n "$BASH_SOURCE" && \ + vecho_ "found ourselves through BASH_SOURCE" || true +test "$_cetpkg_shell_flavor" = sh -a -z "$_cetpkg_myself" && \ + tnotnull ZSH_VERSION && eval '_cetpkg_myself="${(%):-%x}"' && \ + test -n "$_cetpkg_myself" && \ + vecho_ "found ourselves through ZSH prompt logic" || true +test "$_cetpkg_shell_flavor" = sh && tnotnull _cetpkg_myself && \ + _cetpkg_mydir=`dirname "$_cetpkg_myself"` && \ + _cetpkg_fw_db=`sh -c "cd $_cetpkg_mydir >/dev/null 2>&1 && /bin/pwd -P"` || true +################## + +################## +# History is applicable only for interactive t/csh. +test -z "$_cetpkg_fw_db" -a "$_cetpkg_shell_flavor" = csh -a $?history = 0 && \ + set history=5 || true +test -z "$_cetpkg_fw_db" -a "$_cetpkg_shell_flavor" = csh && \ + set _cetpkg_mydir=`history 1|sed -Ee 's/^[[:space:][:digit:]:]*.*\bsource[[:space:]]+//'` && \ + test -n "$_cetpkg_mydir" && set _cetpkg_mydir=`dirname $_cetpkg_mydir[1]:q` && \ + set _cetpkg_fw_db=`sh -c "cd $_cetpkg_mydir:q >/dev/null 2>&1 && /bin/pwd -P"` && \ + vecho_ 'setting db via interactive history' || true +################## + +# Set CETPKG_SOURCE. +test -n "$_cetpkg_fw_db" && \ + vecho_ "_cetpkg_fw_db=$_cetpkg_fw_db" && \ + setenv CETPKG_SOURCE `dirname $_cetpkg_fw_db` || \ + printf "WARNING: please set shell or env. variable fw_db (to be the path to the\n\ + framework source code). Fix this and other errors may go away.\n" +#################################### + +################## +# Set CETPKG_BUILD. +setenv CETPKG_BUILD `/bin/pwd -P` +################## + +######################################################################## +# Write the rest of ourselves to a file and source it to handle status +# code semantics for variable assignments. +# +# Note that even here we have to play a trick or two due to the fact +# that we have to deal with the difference in the way sh- and csh-flavor +# shells handle a quoted delimiter word for a HERE document: the latter +# expect the delimiter to include the quoting; the former do not. This +# is the reason for the C-flavored __TOP_EOF__ alias, and the explicit +# return at the end of the sourced script. +# +######################################################################## + +sed -Ee 's&(^|[^[:alnum:]_])__SET__([[:space:]]+)&'$_cetpkg_shell_var_set'&g' \ + -e 's&__SETUP_ARGS__&'"$*"'&g' \ + -e 's&__TO_STDERR__&'"$_cetpkg_to_stderr"'&g' \ + > ./setup_common.$_cetpkg_shell_flavor <<\__TOP_EOF__ +######################################################################## + +#################################### +# Personality check: are we setup_deps or setup_for_development? +# +# If we're sourcing setup.in directly (e.g. for cetmodules itself) then +# we select "setup_for_development" behavior, otherwise _cetpkg_nobuild +# will be set appropriately by CMake's CONFIGURE() command for +# setup_for_development or setup_deps. + +test -z "$_cetpkg_nobuild" -o "$_cetpkg_nobuild" = "--nobuild" || \ + __SET__ _cetpkg_nobuild="" || true +#################################### + +#################################### +# Initial info. + +printf "\n"; +test -z "$_cetpkg_nobuild" && \ + echo "The working build directory is $CETPKG_BUILD" || true +cat <= 2.00.00" || true +test -n "$_cetpkg_status" -o -z "$_cetpkg_cetmsetup" || setup -B $_cetpkg_cetmsetup +test $? != 0 && __SET__ _cetpkg_status=1 && \ + echo "ERROR: setup of $_cetpkg_cetmsetup has failed" || true +test -z "$_cetpkg_status$_cetpkg_cetmsetup" && setenv PATH `dropit -sfe "$CETPKG_SOURCE/bin"` && __SET__ _cetpkg_cettop="$CETPKG_SOURCE" || true +test -z "$_cetpkg_status$_cetpkg_cettop" -a -n "$CETMODULES_DIR" && __SET__ _cetpkg_cettop="$CETMODULES_DIR" +#################################### + +######################################################################## +# A bootstrapped Perl environment is only needed if we're building +# cetmodules itself. + +test -n "$_cetpkg_status" || test -n "$CETMODULES_DIR" || \ + setup cetpkgsupport +test $? != 0 && __SET__ _cetpkg_status=1 && \ + echo "ERROR: setup of cetpkgsupport has failed" || true +test -n "$_cetpkg_status" || test -n "$CETMODULES_DIR" || \ + "$_cetpkg_cettop/libexec/bootstrap-perl-env" > \ + "$CETPKG_BUILD/bootstrap.log" +test $? != 0 && __SET__ _cetpkg_status=1 && \ + echo "ERROR: bootstrap of Perl environment for cetmodules has failed: see $CETPKG_BUILD/bootstrap.log" || true +test -n "$_cetpkg_status" || test -n "$CETMODULES_DIR" || \ + eval "`perl -I\"$CETPKG_BUILD/$CET_SUBDIR/CPAN/lib/perl5\" -Mlocal::lib=\"$CETPKG_BUILD/$CET_SUBDIR/CPAN\",\"$CETPKG_BUILD/$CET_SUBDIR/cpan_build\"\`test \$?shell = 1 && printf \",--shelltype=csh\"\``" +test $? != 0 && __SET__ _cetpkg_status=1 && \ + echo "ERROR: setup of Perl environment for cetmodules has failed" || true + +#################################### +# Generate the setup script to set up dependencies. + +test -n "$_cetpkg_status" || \ + __SET__ _cetpkg_setup="`${_cetpkg_cettop}/libexec/set_dev_products $_cetpkg_nobuild __SETUP_ARGS__`" +test $? != 0 -o -z "$_cetpkg_setup" && __SET__ _cetpkg_status=1 && \ + echo "ERROR: generation of setup script has failed" || true +#################################### + +#################################### +# Source the setup script to set up dependencies. + +test -n "$_cetpkg_status" || source "$_cetpkg_setup" +test $? != 0 && __SET__ _cetpkg_status=1 && \ + echo "ERROR: setup of required products has failed" || true +__SET__ _cetpkg_setup_errlog="$CETPKG_BUILD/cetpkg_setup.err" +test -s "$_cetpkg_setup_errlog" && cat "$_cetpkg_setup_errlog" || \ + rm -f "$_cetpkg_setup_errlog" +#################################### + +cat <\> \!*' && \ + alias unsetenv_ unsetenv && \ + alias tnotnull "eval '"'test $?'"\!* -eq 1' && eval '"'test -n "$'"\!*"'"'"'" && \ + alias nullout "\!* >& /dev/null" && \ + alias __TOP_EOF__ '' && \ + alias return exit + +# For Bourne-flavored shells, use functions. +test "$_cetpkg_shell_flavor" = sh && \ + _cetpkg_nobuild="" && \ + _cetpkg_shell_var_set= && \ + _cetpkg_to_stderr='1>\&2' && \ + eval 'vecho_() { test -n "${vv-}" && echo ">> $*"; return 0; }' && \ + eval 'setenv() { eval "$1=\"\${2-}\"; export $1"; }' && \ + eval 'unsetenv_() { unset "$@"; }' && \ + eval 'source() { . "$@"; }' && \ + eval 'tnotnull() { eval "test -n \"\${$1-}\""; }' && \ + eval 'nullout() { "$@" >/dev/null 2>&1; }' +#################################### + +################## +# Check for UPS (uses alias for return in C-flavored shells). +test -z "$UPS_DIR" && \ + ( echo ""; echo "ERROR: you MUST set up UPS"; echo "" ) && \ + return 1 || true +################## + +#################################### +# Need to find ourselves to set CETPKG_SOURCE. + +# Define empty variables for C-flavor shells to make things easier. +test "$_cetpkg_shell_flavor" = csh && \ + set _cetpkg_fw_db= _cetpkg_myself= _cetpkg_mydir= + +# If user has set fw_db, identify our top-level source directory now. +test "$_cetpkg_shell_flavor" = csh && tnotnull fw_db && \ + set _cetpkg_fw_db=`sh -c "cd $fw_db:q >/dev/null 2>&1 && /bin/pwd -P"` && \ + vecho_ "found ourselves through fw_db" || true +test "$_cetpkg_shell_flavor" = sh && tnotnull fw_db && \ + _cetpkg_fw_db=`sh -c "cd \"$fw_db\" >/dev/null 2>&1 && /bin/pwd -P"` && \ + vecho_ "found ourselves through fw_db" || true + +################## +# For Bash and zsh, identify ourselves now so we don't have to go +# through acrobatics later in the sourced script. +test "$_cetpkg_shell_flavor" = sh && tnotnull BASH_SOURCE && \ + _cetpkg_myself="$BASH_SOURCE" && test -n "$BASH_SOURCE" && \ + vecho_ "found ourselves through BASH_SOURCE" || true +test "$_cetpkg_shell_flavor" = sh -a -z "$_cetpkg_myself" && \ + tnotnull ZSH_VERSION && eval '_cetpkg_myself="${(%):-%x}"' && \ + test -n "$_cetpkg_myself" && \ + vecho_ "found ourselves through ZSH prompt logic" || true +test "$_cetpkg_shell_flavor" = sh && tnotnull _cetpkg_myself && \ + _cetpkg_mydir=`dirname "$_cetpkg_myself"` && \ + _cetpkg_fw_db=`sh -c "cd $_cetpkg_mydir >/dev/null 2>&1 && /bin/pwd -P"` || true +################## + +################## +# History is applicable only for interactive t/csh. +test -z "$_cetpkg_fw_db" -a "$_cetpkg_shell_flavor" = csh -a $?history = 0 && \ + set history=5 || true +test -z "$_cetpkg_fw_db" -a "$_cetpkg_shell_flavor" = csh && \ + set _cetpkg_mydir=`history 1|sed -Ee 's/^[[:space:][:digit:]:]*.*\bsource[[:space:]]+//'` && \ + test -n "$_cetpkg_mydir" && set _cetpkg_mydir=`dirname $_cetpkg_mydir[1]:q` && \ + set _cetpkg_fw_db=`sh -c "cd $_cetpkg_mydir:q >/dev/null 2>&1 && /bin/pwd -P"` && \ + vecho_ 'setting db via interactive history' || true +################## + +# Set CETPKG_SOURCE. +test -n "$_cetpkg_fw_db" && \ + vecho_ "_cetpkg_fw_db=$_cetpkg_fw_db" && \ + setenv CETPKG_SOURCE `dirname $_cetpkg_fw_db` || \ + printf "WARNING: please set shell or env. variable fw_db (to be the path to the\n\ + framework source code). Fix this and other errors may go away.\n" +#################################### + +################## +# Set CETPKG_BUILD. +setenv CETPKG_BUILD `/bin/pwd -P` +################## + +######################################################################## +# Write the rest of ourselves to a file and source it to handle status +# code semantics for variable assignments. +# +# Note that even here we have to play a trick or two due to the fact +# that we have to deal with the difference in the way sh- and csh-flavor +# shells handle a quoted delimiter word for a HERE document: the latter +# expect the delimiter to include the quoting; the former do not. This +# is the reason for the C-flavored __TOP_EOF__ alias, and the explicit +# return at the end of the sourced script. +# +######################################################################## + +sed -Ee 's&(^|[^[:alnum:]_])__SET__([[:space:]]+)&'$_cetpkg_shell_var_set'&g' \ + -e 's&__SETUP_ARGS__&'"$*"'&g' \ + -e 's&__TO_STDERR__&'"$_cetpkg_to_stderr"'&g' \ + > ./setup_common.$_cetpkg_shell_flavor <<\__TOP_EOF__ +######################################################################## + +#################################### +# Personality check: are we setup_deps or setup_for_development? +# +# If we're sourcing setup.in directly (e.g. for cetmodules itself) then +# we select "setup_for_development" behavior, otherwise _cetpkg_nobuild +# will be set appropriately by CMake's CONFIGURE() command for +# setup_for_development or setup_deps. + +test -z "$_cetpkg_nobuild" -o "$_cetpkg_nobuild" = "--nobuild" || \ + __SET__ _cetpkg_nobuild="" || true +#################################### + +#################################### +# Initial info. + +printf "\n"; +test -z "$_cetpkg_nobuild" && \ + echo "The working build directory is $CETPKG_BUILD" || true +cat <= 2.00.00" || true +test -n "$_cetpkg_status" -o -z "$_cetpkg_cetmsetup" || setup -B $_cetpkg_cetmsetup +test $? != 0 && __SET__ _cetpkg_status=1 && \ + echo "ERROR: setup of $_cetpkg_cetmsetup has failed" || true +test -z "$_cetpkg_status$_cetpkg_cetmsetup" && setenv PATH `dropit -sfe "$CETPKG_SOURCE/bin"` && __SET__ _cetpkg_cettop="$CETPKG_SOURCE" || true +test -z "$_cetpkg_status$_cetpkg_cettop" -a -n "$CETMODULES_DIR" && __SET__ _cetpkg_cettop="$CETMODULES_DIR" +#################################### + +######################################################################## +# A bootstrapped Perl environment is only needed if we're building +# cetmodules itself. + +test -n "$_cetpkg_status" || test -n "$CETMODULES_DIR" || \ + setup cetpkgsupport +test $? != 0 && __SET__ _cetpkg_status=1 && \ + echo "ERROR: setup of cetpkgsupport has failed" || true +test -n "$_cetpkg_status" || test -n "$CETMODULES_DIR" || \ + "$_cetpkg_cettop/libexec/bootstrap-perl-env" > \ + "$CETPKG_BUILD/bootstrap.log" +test $? != 0 && __SET__ _cetpkg_status=1 && \ + echo "ERROR: bootstrap of Perl environment for cetmodules has failed: see $CETPKG_BUILD/bootstrap.log" || true +test -n "$_cetpkg_status" || test -n "$CETMODULES_DIR" || \ + eval "`perl -I\"$CETPKG_BUILD/$CET_SUBDIR/CPAN/lib/perl5\" -Mlocal::lib=\"$CETPKG_BUILD/$CET_SUBDIR/CPAN\",\"$CETPKG_BUILD/$CET_SUBDIR/cpan_build\"\`test \$?shell = 1 && printf \",--shelltype=csh\"\``" +test $? != 0 && __SET__ _cetpkg_status=1 && \ + echo "ERROR: setup of Perl environment for cetmodules has failed" || true + +#################################### +# Generate the setup script to set up dependencies. + +test -n "$_cetpkg_status" || \ + __SET__ _cetpkg_setup="`${_cetpkg_cettop}/libexec/set_dev_products $_cetpkg_nobuild __SETUP_ARGS__`" +test $? != 0 -o -z "$_cetpkg_setup" && __SET__ _cetpkg_status=1 && \ + echo "ERROR: generation of setup script has failed" || true +#################################### + +#################################### +# Source the setup script to set up dependencies. + +test -n "$_cetpkg_status" || source "$_cetpkg_setup" +test $? != 0 && __SET__ _cetpkg_status=1 && \ + echo "ERROR: setup of required products has failed" || true +__SET__ _cetpkg_setup_errlog="$CETPKG_BUILD/cetpkg_setup.err" +test -s "$_cetpkg_setup_errlog" && cat "$_cetpkg_setup_errlog" || \ + rm -f "$_cetpkg_setup_errlog" +#################################### + +cat < Date: Fri, 20 Oct 2023 16:51:51 -0500 Subject: [PATCH 007/213] Almost working CMake --- Analyses/CMakeLists.txt | 604 +++++++++++++----- AnalysisConditions/CMakeLists.txt | 17 + AnalysisConfig/CMakeLists.txt | 7 + AnalysisUtilities/CMakeLists.txt | 0 BFieldGeom/CMakeLists.txt | 21 +- BFieldTest/CMakeLists.txt | 11 +- BTrkData/CMakeLists.txt | 14 +- BeamlineGeom/CMakeLists.txt | 10 +- CMakeLists.txt | 103 +-- CRVConditions/CMakeLists.txt | 18 +- CRVConfig/CMakeLists.txt | 9 + CRVFilters/CMakeLists.txt | 6 +- CRVReco/CMakeLists.txt | 22 +- CRVResponse/CMakeLists.txt | 74 ++- CalPatRec/CMakeLists.txt | 98 ++- CaloCluster/CMakeLists.txt | 34 +- CaloConditions/CMakeLists.txt | 21 +- CaloConfig/CMakeLists.txt | 8 + CaloDiag/CMakeLists.txt | 26 +- CaloFilters/CMakeLists.txt | 48 +- CaloMC/CMakeLists.txt | 50 +- CaloReco/CMakeLists.txt | 28 +- CalorimeterGeom/CMakeLists.txt | 18 +- CommonMC/CMakeLists.txt | 69 +- Compression/CMakeLists.txt | 22 +- ConditionsBase/CMakeLists.txt | 7 + ConditionsService/CMakeLists.txt | 18 +- ConfigTools/CMakeLists.txt | 14 +- CosmicRayShieldGeom/CMakeLists.txt | 27 +- CosmicReco/CMakeLists.txt | 77 ++- DAQ/CMakeLists.txt | 52 +- DAQConditions/CMakeLists.txt | 13 +- DAQConfig/CMakeLists.txt | 7 + DataProducts/CMakeLists.txt | 37 +- DbService/CMakeLists.txt | 48 +- DbTables/CMakeLists.txt | 21 +- DetectorSolenoidGeom/CMakeLists.txt | 9 +- EventDisplay/CMakeLists.txt | 38 +- EventGenerator/CMakeLists.txt | 237 +++++-- EventMixing/CMakeLists.txt | 28 +- ExternalShieldingGeom/CMakeLists.txt | 12 +- ExtinctionMonitorFNAL/Analyses/CMakeLists.txt | 131 ++++ ExtinctionMonitorFNAL/CMakeLists.txt | 8 + .../ComponentTests/CMakeLists.txt | 18 + .../Digitization/CMakeLists.txt | 24 + ExtinctionMonitorFNAL/Geometry/CMakeLists.txt | 21 + .../Reconstruction/CMakeLists.txt | 38 ++ .../TruthAlgs/CMakeLists.txt | 19 + .../Utilities/CMakeLists.txt | 15 + Filters/CMakeLists.txt | 265 +++++--- GeneralUtilities/CMakeLists.txt | 69 +- GeomPrimitives/CMakeLists.txt | 15 +- GeometryService/CMakeLists.txt | 112 ++-- GlobalConstantsService/CMakeLists.txt | 25 +- HelloWorld/CMakeLists.txt | 16 +- KalmanTests/CMakeLists.txt | 0 KinKalGeom/CMakeLists.txt | 18 +- MBSGeom/CMakeLists.txt | 8 + MCDataProducts/CMakeLists.txt | 52 +- MECOStyleProtonAbsorberGeom/CMakeLists.txt | 9 +- Mu2e/CMakeLists.txt | 11 +- Mu2eBTrk/CMakeLists.txt | 22 +- Mu2eG4/CMakeLists.txt | 296 +++++---- Mu2eG4Helper/CMakeLists.txt | 15 +- Mu2eHallGeom/CMakeLists.txt | 9 +- Mu2eInterfaces/CMakeLists.txt | 10 +- Mu2eKinKal/CMakeLists.txt | 77 ++- Mu2eReco/CMakeLists.txt | 0 Mu2eUtilities/CMakeLists.txt | 126 ++-- PTMGeom/CMakeLists.txt | 15 +- ParticleID/CMakeLists.txt | 25 +- Print/CMakeLists.txt | 144 +++-- ProditionsService/CMakeLists.txt | 33 +- ProductionSolenoidGeom/CMakeLists.txt | 13 +- ProductionTargetGeom/CMakeLists.txt | 9 +- ProtonBeamDumpGeom/CMakeLists.txt | 9 +- RecoDataProducts/CMakeLists.txt | 81 ++- STMConditions/CMakeLists.txt | 11 +- STMConfig/CMakeLists.txt | 7 + STMGeom/CMakeLists.txt | 14 + STMReco/CMakeLists.txt | 31 +- SeedService/CMakeLists.txt | 25 +- ServicesGeom/CMakeLists.txt | 10 +- SimulationConditions/CMakeLists.txt | 15 +- SimulationConfig/CMakeLists.txt | 7 + Sources/CMakeLists.txt | 60 +- StoppingTargetGeom/CMakeLists.txt | 9 +- TEveEventDisplay/CMakeLists.txt | 58 +- TestTools/CMakeLists.txt | 7 +- TrackCaloMatching/CMakeLists.txt | 31 +- TrackerConditions/CMakeLists.txt | 53 +- TrackerConfig/CMakeLists.txt | 15 + TrackerGeom/CMakeLists.txt | 23 +- TrackerMC/CMakeLists.txt | 38 +- Trigger/CMakeLists.txt | 26 +- TrkDiag/CMakeLists.txt | 92 ++- TrkExt/CMakeLists.txt | 39 +- TrkFilters/CMakeLists.txt | 16 +- TrkHitReco/CMakeLists.txt | 53 +- TrkPatRec/CMakeLists.txt | 46 +- TrkReco/CMakeLists.txt | 62 +- UtilityModules/CMakeLists.txt | 16 +- Validation/CMakeLists.txt | 125 ++-- bin/CMakeLists.txt | 0 boost_fix/CMakeLists.txt | 0 scripts/CMakeLists.txt | 0 ups_install/CMakeLists.txt | 0 107 files changed, 3247 insertions(+), 1383 deletions(-) create mode 100644 AnalysisUtilities/CMakeLists.txt create mode 100644 ExtinctionMonitorFNAL/Analyses/CMakeLists.txt create mode 100644 ExtinctionMonitorFNAL/ComponentTests/CMakeLists.txt create mode 100644 ExtinctionMonitorFNAL/Digitization/CMakeLists.txt create mode 100644 ExtinctionMonitorFNAL/Geometry/CMakeLists.txt create mode 100644 ExtinctionMonitorFNAL/Reconstruction/CMakeLists.txt create mode 100644 ExtinctionMonitorFNAL/TruthAlgs/CMakeLists.txt create mode 100644 ExtinctionMonitorFNAL/Utilities/CMakeLists.txt create mode 100644 KalmanTests/CMakeLists.txt create mode 100644 Mu2eReco/CMakeLists.txt create mode 100644 bin/CMakeLists.txt create mode 100644 boost_fix/CMakeLists.txt create mode 100644 scripts/CMakeLists.txt create mode 100644 ups_install/CMakeLists.txt diff --git a/Analyses/CMakeLists.txt b/Analyses/CMakeLists.txt index 0b01176fa2..92ae107a30 100644 --- a/Analyses/CMakeLists.txt +++ b/Analyses/CMakeLists.txt @@ -1,173 +1,437 @@ -cet_build_plugin(BFieldPlotter art::module REG_SOURCE src/BFieldPlotter_module.cc) - -cet_build_plugin(CaloCalibAna art::module REG_SOURCE src/CaloCalibAna_module.cc) - -cet_build_plugin(CaloCalib art::module REG_SOURCE src/CaloCalib_module.cc) - -cet_build_plugin(CaloClusterCompare art::module REG_SOURCE src/CaloClusterCompare_module.cc) - -cet_build_plugin(CaloDigiAna art::module REG_SOURCE src/CaloDigiAna_module.cc LIBRARIES REG ROOT::Hist) - -cet_build_plugin(CaloHitFinderInspect art::module REG_SOURCE src/CaloHitFinderInspect_module.cc) - -cet_build_plugin(CaloTrackMatchExample art::module REG_SOURCE src/CaloTrackMatchExample_module.cc) - -cet_build_plugin(CollectionSizeAnalyzer art::module REG_SOURCE src/CollectionSizeAnalyzer_module.cc) - -cet_build_plugin(CompressionCheck0 art::module REG_SOURCE src/CompressionCheck0_module.cc) - -cet_build_plugin(CORSIKAGenPlots art::module REG_SOURCE src/CORSIKAGenPlots_module.cc) - -cet_build_plugin(CosmicAnalysis art::module REG_SOURCE src/CosmicAnalysis_module.cc) - -cet_build_plugin(CosmicFilter art::module REG_SOURCE src/CosmicFilter_module.cc LIBRARIES REG ROOT::Hist) - -cet_build_plugin(CountPionDecays art::module REG_SOURCE src/CountPionDecays_module.cc) - -cet_build_plugin(CRYGenPlots art::module REG_SOURCE src/CRYGenPlots_module.cc) - -cet_build_plugin(DiskCal00 art::module REG_SOURCE src/DiskCal00_module.cc) - -cet_build_plugin(EMFCSimpleDumper art::module REG_SOURCE src/EMFCSimpleDumper_module.cc) - -cet_build_plugin(EventIDSequencePrinter art::module REG_SOURCE src/EventIDSequencePrinter_module.cc) - -cet_build_plugin(EventLister art::module REG_SOURCE src/EventLister_module.cc) - -cet_build_plugin(ExtremeHitTimes art::module REG_SOURCE src/ExtremeHitTimes_module.cc) - -cet_build_plugin(FilterEmptyEvents art::module REG_SOURCE src/FilterEmptyEvents_module.cc) - -cet_build_plugin(FilterVDHits art::module REG_SOURCE src/FilterVDHits_module.cc) - -cet_build_plugin(G4ReactionAnalyzer art::module REG_SOURCE src/G4ReactionAnalyzer_module.cc LIBRARIES REG ROOT::Hist) - -cet_build_plugin(GenParticlesAnalyzer art::module REG_SOURCE src/GenParticlesAnalyzer_module.cc) - -cet_build_plugin(GeomVis art::module REG_SOURCE src/GeomVis_module.cc) - -cet_build_plugin(Histforpabs art::module REG_SOURCE src/Histforpabs_module.cc LIBRARIES REG art_root_io::TFileService_service) - -cet_build_plugin(InteractiveRoot art::module REG_SOURCE src/InteractiveRoot_module.cc) - -cet_build_plugin(KineticFracAnalysis art::module REG_SOURCE src/KineticFracAnalysis_module.cc) - -cet_build_plugin(materailsPropStudy art::module REG_SOURCE src/materailsPropStudy_module.cc) - -cet_build_plugin(MTVerification art::module REG_SOURCE src/MTVerification_module.cc) - -cet_build_plugin(Mu2eG4StudyCalo01ReadBack art::module REG_SOURCE src/Mu2eG4StudyCalo01ReadBack_module.cc) - -cet_build_plugin(Mu2eG4StudyReadBack art::module REG_SOURCE src/Mu2eG4StudyReadBack_module.cc) - -cet_build_plugin(ParticleIDScan art::module REG_SOURCE src/ParticleIDScan_module.cc LIBRARIES REG art_root_io::tfile_support) - -cet_build_plugin(PbarAnalysis2 art::module REG_SOURCE src/PbarAnalysis2_module.cc) - -cet_build_plugin(pbars1hist art::module REG_SOURCE src/pbars1hist_module.cc) - -cet_build_plugin(PionMomentumAnalyzer art::module REG_SOURCE src/PionMomentumAnalyzer_module.cc) - -cet_build_plugin(PointerCheck art::module REG_SOURCE src/PointerCheck_module.cc) - -cet_build_plugin(PrimaryProtonEnergyDumper art::module REG_SOURCE src/PrimaryProtonEnergyDumper_module.cc) - -cet_build_plugin(PrintGenParticles art::module REG_SOURCE src/PrintGenParticles_module.cc) - -cet_build_plugin(PrintSTMGeom art::module REG_SOURCE src/PrintSTMGeom_module.cc) - -cet_build_plugin(PrintStrawHits art::module REG_SOURCE src/PrintStrawHits_module.cc) - -cet_build_plugin(PrintTrackerGeom art::module REG_SOURCE src/PrintTrackerGeom_module.cc) - -cet_build_plugin(ProtonBunchIntensityAnalyzer art::module REG_SOURCE src/ProtonBunchIntensityAnalyzer_module.cc) - -cet_build_plugin(PtrTest0 art::module REG_SOURCE src/PtrTest0_module.cc) - -cet_build_plugin(PtrTest art::module REG_SOURCE src/PtrTest_module.cc) - -cet_build_plugin(ReadAntiProtonSteps art::module REG_SOURCE src/ReadAntiProtonSteps_module.cc) - -cet_build_plugin(ReadBack0 art::module REG_SOURCE src/ReadBack0_module.cc) - -cet_build_plugin(ReadBack art::module REG_SOURCE src/ReadBack_module.cc) - -cet_build_plugin(ReadCaloDigi art::module REG_SOURCE src/ReadCaloDigi_module.cc) - -cet_build_plugin(ReadMCTrajectories art::module REG_SOURCE src/ReadMCTrajectories_module.cc) - -cet_build_plugin(ReadPSVacuum art::module REG_SOURCE src/ReadPSVacuum_module.cc) - -cet_build_plugin(ReadPTM art::module REG_SOURCE src/ReadPTM_module.cc) - -cet_build_plugin(ReadPtr art::module REG_SOURCE src/ReadPtr_module.cc) - -cet_build_plugin(ReadStrawDigiReco art::module REG_SOURCE src/ReadStrawDigiReco_module.cc) - -cet_build_plugin(ReadStrawHitReco art::module REG_SOURCE src/ReadStrawHitReco_module.cc) - -cet_build_plugin(ReadTrackCaloMatching art::module REG_SOURCE src/ReadTrackCaloMatching_module.cc) - -cet_build_plugin(ReadTrackCaloMatchingMVA art::module REG_SOURCE src/ReadTrackCaloMatchingMVA_module.cc) - -cet_build_plugin(ReadTrackerSteps art::module REG_SOURCE src/ReadTrackerSteps_module.cc) - -cet_build_plugin(ReadTrkExtrapol art::module REG_SOURCE src/ReadTrkExtrapol_module.cc) - -cet_build_plugin(ReadTrkExtrapolMVA art::module REG_SOURCE src/ReadTrkExtrapolMVA_module.cc) - -cet_build_plugin(ReadVirtualDetector art::module REG_SOURCE src/ReadVirtualDetector_module.cc) - -cet_build_plugin(SelectiveStepPtPrinter art::module REG_SOURCE src/SelectiveStepPtPrinter_module.cc) - -cet_build_plugin(SelectPiMinusAtTS5 art::module REG_SOURCE src/SelectPiMinusAtTS5_module.cc) - -cet_build_plugin(SensitiveTargetEnergyDumper art::module REG_SOURCE src/SensitiveTargetEnergyDumper_module.cc) - -cet_build_plugin(SimParticleAnalyzer art::module REG_SOURCE src/SimParticleAnalyzer_module.cc) - -cet_build_plugin(SimParticleCheck00 art::module REG_SOURCE src/SimParticleCheck00_module.cc) - -cet_build_plugin(SimParticleDumperCompact art::module REG_SOURCE src/SimParticleDumperCompact_module.cc) - -cet_build_plugin(SimParticlesPrinter art::module REG_SOURCE src/SimParticlesPrinter_module.cc) - -cet_build_plugin(StatusG4Analyzer art::module REG_SOURCE src/StatusG4Analyzer_module.cc) - -cet_build_plugin(StepPointMC1stHitDumper art::module REG_SOURCE src/StepPointMC1stHitDumper_module.cc) - -cet_build_plugin(StepPointMCDumperCalo art::module REG_SOURCE src/StepPointMCDumperCalo_module.cc) - -cet_build_plugin(StepPointMCDumperCompact art::module REG_SOURCE src/StepPointMCDumperCompact_module.cc) - -cet_build_plugin(StepPointMCDumper art::module REG_SOURCE src/StepPointMCDumper_module.cc) - -cet_build_plugin(StepPointsPrinter art::module REG_SOURCE src/StepPointsPrinter_module.cc) - -cet_build_plugin(StoppedParticlesDumper art::module REG_SOURCE src/StoppedParticlesDumper_module.cc) - -cet_build_plugin(StoppedParticlesPrinter art::module REG_SOURCE src/StoppedParticlesPrinter_module.cc) - -cet_build_plugin(TrackSummaryDataAnalyzer art::module REG_SOURCE src/TrackSummaryDataAnalyzer_module.cc) - -cet_build_plugin(TrackSummaryMaker art::module REG_SOURCE src/TrackSummaryMaker_module.cc) - -cet_build_plugin(TrackSummaryMCAnalyzer art::module REG_SOURCE src/TrackSummaryMCAnalyzer_module.cc) - -cet_build_plugin(TrackSummaryTruthMaker art::module REG_SOURCE src/TrackSummaryTruthMaker_module.cc) - -cet_build_plugin(TrackSummaryTruthRFSelector art::module REG_SOURCE src/TrackSummaryTruthRFSelector_module.cc) - -cet_build_plugin(TSTrackAna art::module REG_SOURCE src/TSTrackAna_module.cc) - -cet_build_plugin(TVirtDebug art::module REG_SOURCE src/TVirtDebug_module.cc) - -cet_build_plugin(ViewAllProvenances art::module REG_SOURCE src/ViewAllProvenances_module.cc) - -cet_build_plugin(ViewProvenance art::module REG_SOURCE src/ViewProvenance_module.cc) - -cet_build_plugin(VMMonitor art::module REG_SOURCE src/VMMonitor_module.cc) - +cet_build_plugin(BFieldPlotter art::module + REG_SOURCE src/BFieldPlotter_module.cc + LIBRARIES REG + offline::BFieldGeom + art_root_io::TFileService_service + ROOT::Hist +) + +cet_build_plugin(CaloCalibAna art::module + REG_SOURCE src/CaloCalibAna_module.cc + LIBRARIES REG + art_root_io::TFileService_service +) + +cet_build_plugin(CaloCalib art::module + REG_SOURCE src/CaloCalib_module.cc + LIBRARIES REG +) + +cet_build_plugin(CaloClusterCompare art::module + REG_SOURCE src/CaloClusterCompare_module.cc + LIBRARIES REG +) + +cet_build_plugin(CaloDigiAna art::module + REG_SOURCE src/CaloDigiAna_module.cc + LIBRARIES REG +) + +cet_build_plugin(CaloHitFinderInspect art::module + REG_SOURCE src/CaloHitFinderInspect_module.cc + LIBRARIES REG +) + +cet_build_plugin(CaloTrackMatchExample art::module + REG_SOURCE src/CaloTrackMatchExample_module.cc + LIBRARIES REG +) + +cet_build_plugin(CollectionSizeAnalyzer art::module + REG_SOURCE src/CollectionSizeAnalyzer_module.cc + LIBRARIES REG +) + +cet_build_plugin(CompressionCheck0 art::module + REG_SOURCE src/CompressionCheck0_module.cc + LIBRARIES REG +) + +cet_build_plugin(CORSIKAGenPlots art::module + REG_SOURCE src/CORSIKAGenPlots_module.cc + LIBRARIES REG + art_root_io::TFileService_service +) + +cet_build_plugin(CosmicAnalysis art::module + REG_SOURCE src/CosmicAnalysis_module.cc + LIBRARIES REG +) + +cet_build_plugin(CosmicFilter art::module + REG_SOURCE src/CosmicFilter_module.cc + LIBRARIES REG +) + +cet_build_plugin(CountPionDecays art::module + REG_SOURCE src/CountPionDecays_module.cc + LIBRARIES REG +) + +cet_build_plugin(CRYGenPlots art::module + REG_SOURCE src/CRYGenPlots_module.cc + LIBRARIES REG + art_root_io::TFileService_service +) + +cet_build_plugin(DiskCal00 art::module + REG_SOURCE src/DiskCal00_module.cc + LIBRARIES REG +) + +cet_build_plugin(EMFCSimpleDumper art::module + REG_SOURCE src/EMFCSimpleDumper_module.cc + LIBRARIES REG +) + +cet_build_plugin(EventIDSequencePrinter art::module + REG_SOURCE src/EventIDSequencePrinter_module.cc + LIBRARIES REG +) + +cet_build_plugin(EventLister art::module + REG_SOURCE src/EventLister_module.cc + LIBRARIES REG +) + +cet_build_plugin(ExtremeHitTimes art::module + REG_SOURCE src/ExtremeHitTimes_module.cc + LIBRARIES REG + art_root_io::TFileService_service +) + +cet_build_plugin(FilterEmptyEvents art::module + REG_SOURCE src/FilterEmptyEvents_module.cc + LIBRARIES REG +) + +cet_build_plugin(FilterVDHits art::module + REG_SOURCE src/FilterVDHits_module.cc + LIBRARIES REG +) + +cet_build_plugin(G4ReactionAnalyzer art::module + REG_SOURCE src/G4ReactionAnalyzer_module.cc + LIBRARIES REG +) + +cet_build_plugin(GenParticlesAnalyzer art::module + REG_SOURCE src/GenParticlesAnalyzer_module.cc + LIBRARIES REG +) + +cet_build_plugin(GeomVis art::module + REG_SOURCE src/GeomVis_module.cc + LIBRARIES REG +) + +cet_build_plugin(Histforpabs art::module + REG_SOURCE src/Histforpabs_module.cc + LIBRARIES REG +) + +cet_build_plugin(InteractiveRoot art::module + REG_SOURCE src/InteractiveRoot_module.cc + LIBRARIES REG + art_root_io::TFileService_service +) + +cet_build_plugin(KineticFracAnalysis art::module + REG_SOURCE src/KineticFracAnalysis_module.cc + LIBRARIES REG +) + +cet_build_plugin(materailsPropStudy art::module + REG_SOURCE src/materailsPropStudy_module.cc + LIBRARIES REG + art_root_io::TFileService_service +) + +cet_build_plugin(MTVerification art::module + REG_SOURCE src/MTVerification_module.cc + LIBRARIES REG +) + +cet_build_plugin(Mu2eG4StudyCalo01ReadBack art::module + REG_SOURCE src/Mu2eG4StudyCalo01ReadBack_module.cc + LIBRARIES REG +) + +cet_build_plugin(Mu2eG4StudyReadBack art::module + REG_SOURCE src/Mu2eG4StudyReadBack_module.cc + LIBRARIES REG +) + +cet_build_plugin(ParticleIDScan art::module + REG_SOURCE src/ParticleIDScan_module.cc + LIBRARIES REG + art_root_io::TFileService_service +) + +cet_build_plugin(PbarAnalysis2 art::module + REG_SOURCE src/PbarAnalysis2_module.cc + LIBRARIES REG +) + +cet_build_plugin(pbars1hist art::module + REG_SOURCE src/pbars1hist_module.cc + LIBRARIES REG +) + +cet_build_plugin(PionMomentumAnalyzer art::module + REG_SOURCE src/PionMomentumAnalyzer_module.cc + LIBRARIES REG +) + +cet_build_plugin(PointerCheck art::module + REG_SOURCE src/PointerCheck_module.cc + LIBRARIES REG +) + +cet_build_plugin(PrimaryProtonEnergyDumper art::module + REG_SOURCE src/PrimaryProtonEnergyDumper_module.cc + LIBRARIES REG +) + +cet_build_plugin(PrintGenParticles art::module + REG_SOURCE src/PrintGenParticles_module.cc + LIBRARIES REG +) + +cet_build_plugin(PrintSTMGeom art::module + REG_SOURCE src/PrintSTMGeom_module.cc + LIBRARIES REG +) + +cet_build_plugin(PrintStrawHits art::module + REG_SOURCE src/PrintStrawHits_module.cc + LIBRARIES REG +) + +cet_build_plugin(PrintTrackerGeom art::module + REG_SOURCE src/PrintTrackerGeom_module.cc + LIBRARIES REG +) + +cet_build_plugin(ProtonBunchIntensityAnalyzer art::module + REG_SOURCE src/ProtonBunchIntensityAnalyzer_module.cc + LIBRARIES REG +) + +cet_build_plugin(PtrTest0 art::module + REG_SOURCE src/PtrTest0_module.cc + LIBRARIES REG +) + +cet_build_plugin(PtrTest art::module + REG_SOURCE src/PtrTest_module.cc + LIBRARIES REG +) + +cet_build_plugin(ReadAntiProtonSteps art::module + REG_SOURCE src/ReadAntiProtonSteps_module.cc + LIBRARIES REG +) + +cet_build_plugin(ReadBack0 art::module + REG_SOURCE src/ReadBack0_module.cc + LIBRARIES REG +) + +cet_build_plugin(ReadBack art::module + REG_SOURCE src/ReadBack_module.cc + LIBRARIES REG +) + +cet_build_plugin(ReadCaloDigi art::module + REG_SOURCE src/ReadCaloDigi_module.cc + LIBRARIES REG +) + +cet_build_plugin(ReadMCTrajectories art::module + REG_SOURCE src/ReadMCTrajectories_module.cc + LIBRARIES REG +) + +cet_build_plugin(ReadPSVacuum art::module + REG_SOURCE src/ReadPSVacuum_module.cc + LIBRARIES REG +) + +cet_build_plugin(ReadPTM art::module + REG_SOURCE src/ReadPTM_module.cc + LIBRARIES REG +) + +cet_build_plugin(ReadPtr art::module + REG_SOURCE src/ReadPtr_module.cc + LIBRARIES REG +) + +cet_build_plugin(ReadStrawDigiReco art::module + REG_SOURCE src/ReadStrawDigiReco_module.cc + LIBRARIES REG +) + +cet_build_plugin(ReadStrawHitReco art::module + REG_SOURCE src/ReadStrawHitReco_module.cc + LIBRARIES REG +) + +cet_build_plugin(ReadTrackCaloMatching art::module + REG_SOURCE src/ReadTrackCaloMatching_module.cc + LIBRARIES REG +) + +cet_build_plugin(ReadTrackCaloMatchingMVA art::module + REG_SOURCE src/ReadTrackCaloMatchingMVA_module.cc + LIBRARIES REG +) + +cet_build_plugin(ReadTrackerSteps art::module + REG_SOURCE src/ReadTrackerSteps_module.cc + LIBRARIES REG +) + +cet_build_plugin(ReadTrkExtrapol art::module + REG_SOURCE src/ReadTrkExtrapol_module.cc + LIBRARIES REG +) + +cet_build_plugin(ReadTrkExtrapolMVA art::module + REG_SOURCE src/ReadTrkExtrapolMVA_module.cc + LIBRARIES REG +) + +cet_build_plugin(ReadVirtualDetector art::module + REG_SOURCE src/ReadVirtualDetector_module.cc + LIBRARIES REG +) + +cet_build_plugin(SelectiveStepPtPrinter art::module + REG_SOURCE src/SelectiveStepPtPrinter_module.cc + LIBRARIES REG +) + +cet_build_plugin(SelectPiMinusAtTS5 art::module + REG_SOURCE src/SelectPiMinusAtTS5_module.cc + LIBRARIES REG +) + +cet_build_plugin(SensitiveTargetEnergyDumper art::module + REG_SOURCE src/SensitiveTargetEnergyDumper_module.cc + LIBRARIES REG +) + +cet_build_plugin(SimParticleAnalyzer art::module + REG_SOURCE src/SimParticleAnalyzer_module.cc + LIBRARIES REG +) + +cet_build_plugin(SimParticleCheck00 art::module + REG_SOURCE src/SimParticleCheck00_module.cc + LIBRARIES REG +) + +cet_build_plugin(SimParticleDumperCompact art::module + REG_SOURCE src/SimParticleDumperCompact_module.cc + LIBRARIES REG +) + +cet_build_plugin(SimParticlesPrinter art::module + REG_SOURCE src/SimParticlesPrinter_module.cc + LIBRARIES REG +) + +cet_build_plugin(StatusG4Analyzer art::module + REG_SOURCE src/StatusG4Analyzer_module.cc + LIBRARIES REG +) + +cet_build_plugin(StepPointMC1stHitDumper art::module + REG_SOURCE src/StepPointMC1stHitDumper_module.cc + LIBRARIES REG +) + +cet_build_plugin(StepPointMCDumperCalo art::module + REG_SOURCE src/StepPointMCDumperCalo_module.cc + LIBRARIES REG +) + +cet_build_plugin(StepPointMCDumperCompact art::module + REG_SOURCE src/StepPointMCDumperCompact_module.cc + LIBRARIES REG +) + +cet_build_plugin(StepPointMCDumper art::module + REG_SOURCE src/StepPointMCDumper_module.cc + LIBRARIES REG +) + +cet_build_plugin(StepPointsPrinter art::module + REG_SOURCE src/StepPointsPrinter_module.cc + LIBRARIES REG +) + +cet_build_plugin(StoppedParticlesDumper art::module + REG_SOURCE src/StoppedParticlesDumper_module.cc + LIBRARIES REG +) + +cet_build_plugin(StoppedParticlesPrinter art::module + REG_SOURCE src/StoppedParticlesPrinter_module.cc + LIBRARIES REG +) + +cet_build_plugin(TrackSummaryDataAnalyzer art::module + REG_SOURCE src/TrackSummaryDataAnalyzer_module.cc + LIBRARIES REG +) + +cet_build_plugin(TrackSummaryMaker art::module + REG_SOURCE src/TrackSummaryMaker_module.cc + LIBRARIES REG +) + +cet_build_plugin(TrackSummaryMCAnalyzer art::module + REG_SOURCE src/TrackSummaryMCAnalyzer_module.cc + LIBRARIES REG +) + +cet_build_plugin(TrackSummaryTruthMaker art::module + REG_SOURCE src/TrackSummaryTruthMaker_module.cc + LIBRARIES REG +) + +cet_build_plugin(TrackSummaryTruthRFSelector art::module + REG_SOURCE src/TrackSummaryTruthRFSelector_module.cc + LIBRARIES REG +) + +cet_build_plugin(TSTrackAna art::module + REG_SOURCE src/TSTrackAna_module.cc + LIBRARIES REG +) + +cet_build_plugin(TVirtDebug art::module + REG_SOURCE src/TVirtDebug_module.cc + LIBRARIES REG +) + +cet_build_plugin(ViewAllProvenances art::module + REG_SOURCE src/ViewAllProvenances_module.cc + LIBRARIES REG +) + +cet_build_plugin(ViewProvenance art::module + REG_SOURCE src/ViewProvenance_module.cc + LIBRARIES REG +) + +cet_build_plugin(VMMonitor art::module + REG_SOURCE src/VMMonitor_module.cc + LIBRARIES REG +) install_source(SUBDIRS src) install_fhicl(SUBDIRS fcl SUBDIRNAME Analyses) diff --git a/AnalysisConditions/CMakeLists.txt b/AnalysisConditions/CMakeLists.txt index 01300267a3..b799a8e4c5 100644 --- a/AnalysisConditions/CMakeLists.txt +++ b/AnalysisConditions/CMakeLists.txt @@ -1,2 +1,19 @@ +cet_make_library(INTERFACE + SOURCE + inc/MVACatalogCache.hh + inc/MVACatalog.hh + inc/MVACatalogMaker.hh + inc/TrkQualCatalogCache.hh + inc/TrkQualCatalog.hh + LIBRARIES INTERFACE + + offline::AnalysisConfig + offline::DbService + offline::DbTables + offline::Mu2eInterfaces + offline::Mu2eUtilities + offline::RecoDataProducts +) + install_headers(SUBDIRS inc) install_fhicl(SUBDIRS fcl SUBDIRNAME AnalysisConditions) diff --git a/AnalysisConfig/CMakeLists.txt b/AnalysisConfig/CMakeLists.txt index 04a44744b2..b262f112dc 100644 --- a/AnalysisConfig/CMakeLists.txt +++ b/AnalysisConfig/CMakeLists.txt @@ -1 +1,8 @@ +cet_make_library(INTERFACE + SOURCE + inc/MVACatalogConfig.hh + LIBRARIES INTERFACE + +) + install_headers(SUBDIRS inc) diff --git a/AnalysisUtilities/CMakeLists.txt b/AnalysisUtilities/CMakeLists.txt new file mode 100644 index 0000000000..e69de29bb2 diff --git a/BFieldGeom/CMakeLists.txt b/BFieldGeom/CMakeLists.txt index a30f692f35..2fd126ef50 100644 --- a/BFieldGeom/CMakeLists.txt +++ b/BFieldGeom/CMakeLists.txt @@ -1,15 +1,18 @@ cet_make_library( SOURCE -src/BFCacheManager.cc -src/BFGridMap.cc -src/BFieldManager.cc -src/BFInterpolationStyle.cc -src/BFMapType.cc -src/BFParamMap.cc -LIBRARIES PUBLIC -cetlib::cetlib + src/BFCacheManager.cc + src/BFGridMap.cc + src/BFieldManager.cc + src/BFInterpolationStyle.cc + src/BFMapType.cc + src/BFParamMap.cc + LIBRARIES PUBLIC + messagefacility::MF_MessageLogger + GSL::gsl + offline::DataProducts + offline::GeneralUtilities + offline::Mu2eInterfaces ) - install_source(SUBDIRS src) install_headers(SUBDIRS inc) diff --git a/BFieldTest/CMakeLists.txt b/BFieldTest/CMakeLists.txt index e6438f8419..a96dd18630 100644 --- a/BFieldTest/CMakeLists.txt +++ b/BFieldTest/CMakeLists.txt @@ -1,6 +1,11 @@ -cet_build_plugin(BFieldSymmetry art::module REG_SOURCE src/BFieldSymmetry_module.cc) - -cet_build_plugin(BFieldTest art::module REG_SOURCE src/BFieldTest_module.cc) +cet_build_plugin(BFieldSymmetry art::module + REG_SOURCE src/BFieldSymmetry_module.cc + LIBRARIES REG +) +cet_build_plugin(BFieldTest art::module + REG_SOURCE src/BFieldTest_module.cc + LIBRARIES REG +) install_source(SUBDIRS src) diff --git a/BTrkData/CMakeLists.txt b/BTrkData/CMakeLists.txt index baed02deba..db3c8da181 100644 --- a/BTrkData/CMakeLists.txt +++ b/BTrkData/CMakeLists.txt @@ -1,12 +1,14 @@ cet_make_library( SOURCE -src/Doublet.cc -src/TrkCaloHit.cc -src/TrkStrawHit.cc -LIBRARIES PUBLIC -cetlib::cetlib + src/Doublet.cc + src/TrkCaloHit.cc + src/TrkStrawHit.cc + LIBRARIES PUBLIC + + offline::RecoDataProducts + offline::TrackerConditions + offline::TrackerGeom ) - install_source(SUBDIRS src) install_headers(SUBDIRS inc) diff --git a/BeamlineGeom/CMakeLists.txt b/BeamlineGeom/CMakeLists.txt index affe5f5a63..b7a8df0d52 100644 --- a/BeamlineGeom/CMakeLists.txt +++ b/BeamlineGeom/CMakeLists.txt @@ -1,10 +1,12 @@ cet_make_library( SOURCE -src/TSdA.cc -LIBRARIES PUBLIC -cetlib::cetlib + src/TSdA.cc + LIBRARIES PUBLIC + + offline::GeneralUtilities + offline::GeomPrimitives + offline::Mu2eInterfaces ) - install_source(SUBDIRS src) install_headers(SUBDIRS inc) diff --git a/CMakeLists.txt b/CMakeLists.txt index 3288471683..7f441f71af 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -11,81 +11,92 @@ cet_cmake_env() cet_set_compiler_flags(DIAGS VIGILANT WERROR NO_UNDEFINED - EXTRA_FLAGS -pedantic - ) + EXTRA_FLAGS -pedantic -Wno-unused-parameter -Wno-type-limits -Wno-ignored-qualifiers -Wno-unused-but-set-parameter -Wno-extra -Wno-non-virtual-dtor +) - include_directories(..) +include_directories(..) - find_package(art_root_io REQUIRED) +find_package(art_root_io REQUIRED) +find_package(GSL REQUIRED) +find_package(PostgreSQL REQUIRED) +find_package(CURL REQUIRED) +find_package(Boost COMPONENTS iostreams program_options REQUIRED) +find_package(XercesC REQUIRED) +find_package(BLAS REQUIRED) + +# BTrk and KinKal have non-standard Find*.cmake... +include_directories($ENV{KINKAL_INC}) +include_directories($ENV{BTRK_INC}) +link_directories($ENV{KINKAL_LIB}) +link_directories($ENV{BTRK_LIB}) include(ArtDictionary) include(BuildPlugins) -add_subdirectory(Analyses) +#add_subdirectory(Analyses) add_subdirectory(AnalysisConditions) add_subdirectory(AnalysisConfig) -#add_subdirectory(AnalysisUtilities) +add_subdirectory(AnalysisUtilities) add_subdirectory(BeamlineGeom) add_subdirectory(BFieldGeom) -add_subdirectory(BFieldTest) -#add_subdirectory(bin) -#add_subdirectory(boost_fix) +#add_subdirectory(BFieldTest) +add_subdirectory(bin) +add_subdirectory(boost_fix) add_subdirectory(BTrkData) -add_subdirectory(CaloCluster) +#add_subdirectory(CaloCluster) add_subdirectory(CaloConditions) add_subdirectory(CaloConfig) -add_subdirectory(CaloDiag) -add_subdirectory(CaloFilters) -add_subdirectory(CaloMC) -add_subdirectory(CaloReco) +#add_subdirectory(CaloDiag) +#add_subdirectory(CaloFilters) +#add_subdirectory(CaloMC) +#add_subdirectory(CaloReco) add_subdirectory(CalorimeterGeom) -add_subdirectory(CalPatRec) -add_subdirectory(CommonMC) -add_subdirectory(Compression) +#add_subdirectory(CalPatRec) +#add_subdirectory(CommonMC) +#add_subdirectory(Compression) add_subdirectory(ConditionsBase) add_subdirectory(ConditionsService) add_subdirectory(ConfigTools) add_subdirectory(CosmicRayShieldGeom) -add_subdirectory(CosmicReco) +#add_subdirectory(CosmicReco) add_subdirectory(CRVConditions) add_subdirectory(CRVConfig) -add_subdirectory(CRVFilters) -add_subdirectory(CRVReco) -add_subdirectory(CRVResponse) -add_subdirectory(DAQ) +#add_subdirectory(CRVFilters) +#add_subdirectory(CRVReco) +#add_subdirectory(CRVResponse) +#add_subdirectory(DAQ) add_subdirectory(DAQConditions) add_subdirectory(DAQConfig) add_subdirectory(DataProducts) add_subdirectory(DbService) add_subdirectory(DbTables) add_subdirectory(DetectorSolenoidGeom) -add_subdirectory(EventDisplay) -add_subdirectory(EventGenerator) -add_subdirectory(EventMixing) +#add_subdirectory(EventDisplay) +#add_subdirectory(EventGenerator) +#add_subdirectory(EventMixing) add_subdirectory(ExternalShieldingGeom) add_subdirectory(ExtinctionMonitorFNAL) -#add_subdirectory(fcl) -add_subdirectory(Filters) +#add_subdirectory(Filters) add_subdirectory(GeneralUtilities) add_subdirectory(GeometryService) add_subdirectory(GeomPrimitives) add_subdirectory(GlobalConstantsService) -add_subdirectory(HelloWorld) -#add_subdirectory(KalmanTests) +#add_subdirectory(HelloWorld) +add_subdirectory(KalmanTests) add_subdirectory(KinKalGeom) add_subdirectory(MBSGeom) add_subdirectory(MCDataProducts) add_subdirectory(MECOStyleProtonAbsorberGeom) add_subdirectory(Mu2e) add_subdirectory(Mu2eBTrk) -add_subdirectory(Mu2eG4) +#add_subdirectory(Mu2eG4) add_subdirectory(Mu2eG4Helper) add_subdirectory(Mu2eHallGeom) add_subdirectory(Mu2eInterfaces) add_subdirectory(Mu2eKinKal) -#add_subdirectory(Mu2eReco) +add_subdirectory(Mu2eReco) add_subdirectory(Mu2eUtilities) -add_subdirectory(ParticleID) +#add_subdirectory(ParticleID) add_subdirectory(Print) add_subdirectory(ProditionsService) add_subdirectory(ProductionSolenoidGeom) @@ -93,7 +104,7 @@ add_subdirectory(ProductionTargetGeom) add_subdirectory(ProtonBeamDumpGeom) add_subdirectory(PTMGeom) add_subdirectory(RecoDataProducts) -#add_subdirectory(scripts) +add_subdirectory(scripts) add_subdirectory(SeedService) add_subdirectory(ServicesGeom) add_subdirectory(SimulationConditions) @@ -102,24 +113,24 @@ add_subdirectory(Sources) add_subdirectory(STMConditions) add_subdirectory(STMConfig) add_subdirectory(STMGeom) -add_subdirectory(STMReco) +#add_subdirectory(STMReco) add_subdirectory(StoppingTargetGeom) add_subdirectory(TestTools) -add_subdirectory(TEveEventDisplay) -add_subdirectory(TrackCaloMatching) +#add_subdirectory(TEveEventDisplay) +#add_subdirectory(TrackCaloMatching) add_subdirectory(TrackerConditions) add_subdirectory(TrackerConfig) add_subdirectory(TrackerGeom) -add_subdirectory(TrackerMC) -add_subdirectory(Trigger) -add_subdirectory(TrkDiag) -add_subdirectory(TrkExt) -add_subdirectory(TrkFilters) -add_subdirectory(TrkHitReco) -add_subdirectory(TrkPatRec) -add_subdirectory(TrkReco) -#add_subdirectory(ups_install) -add_subdirectory(UtilityModules) +#add_subdirectory(TrackerMC) +#add_subdirectory(Trigger) +#add_subdirectory(TrkDiag) +#add_subdirectory(TrkExt) +#add_subdirectory(TrkFilters) +#add_subdirectory(TrkHitReco) +#add_subdirectory(TrkPatRec) +#add_subdirectory(TrkReco) +add_subdirectory(ups_install) +#add_subdirectory(UtilityModules) add_subdirectory(Validation) install_fhicl(SUBDIRS fcl) diff --git a/CRVConditions/CMakeLists.txt b/CRVConditions/CMakeLists.txt index 96ec34beb9..8202748e5d 100644 --- a/CRVConditions/CMakeLists.txt +++ b/CRVConditions/CMakeLists.txt @@ -1,13 +1,19 @@ cet_make_library( SOURCE -src/CRVCalibMaker.cc -src/CRVOrdinalMaker.cc -src/CRVStatusMaker.cc -LIBRARIES PUBLIC -cetlib::cetlib + src/CRVCalibMaker.cc + src/CRVOrdinalMaker.cc + src/CRVStatusMaker.cc + LIBRARIES PUBLIC + + offline::ConfigTools + offline::CosmicRayShieldGeom + offline::CRVConfig + offline::DataProducts + offline::DbTables + offline::GeometryService + offline::Mu2eInterfaces ) - install_source(SUBDIRS src) install_headers(SUBDIRS inc) install_fhicl(SUBDIRS fcl SUBDIRNAME CRVConditions) diff --git a/CRVConfig/CMakeLists.txt b/CRVConfig/CMakeLists.txt index 04a44744b2..f92cc293ea 100644 --- a/CRVConfig/CMakeLists.txt +++ b/CRVConfig/CMakeLists.txt @@ -1 +1,10 @@ +cet_make_library(INTERFACE + SOURCE + inc/CRVCalibConfig.hh + inc/CRVOrdinalConfig.hh + inc/CRVStatusConfig.hh + LIBRARIES INTERFACE + +) + install_headers(SUBDIRS inc) diff --git a/CRVFilters/CMakeLists.txt b/CRVFilters/CMakeLists.txt index 3fc8787d6c..c4906cbed7 100644 --- a/CRVFilters/CMakeLists.txt +++ b/CRVFilters/CMakeLists.txt @@ -1,5 +1,7 @@ -cet_build_plugin(CrvCoincidenceClusterFilter art::module REG_SOURCE src/CrvCoincidenceClusterFilter_module.cc) - +cet_build_plugin(CrvCoincidenceClusterFilter art::module + REG_SOURCE src/CrvCoincidenceClusterFilter_module.cc + LIBRARIES REG +) install_source(SUBDIRS src) install_fhicl(SUBDIRS fcl SUBDIRNAME CRVFilters) diff --git a/CRVReco/CMakeLists.txt b/CRVReco/CMakeLists.txt index 56c1c2f03f..fc79ce6e6a 100644 --- a/CRVReco/CMakeLists.txt +++ b/CRVReco/CMakeLists.txt @@ -1,15 +1,23 @@ cet_make_library( SOURCE -src/CrvHelper.cc -src/MakeCrvRecoPulses.cc -LIBRARIES PUBLIC -cetlib::cetlib + src/CrvHelper.cc + src/MakeCrvRecoPulses.cc + LIBRARIES PUBLIC + + offline::CosmicRayShieldGeom + offline::DataProducts + offline::GeometryService ) -cet_build_plugin(CrvCoincidenceFinder art::module REG_SOURCE src/CrvCoincidenceFinder_module.cc) - -cet_build_plugin(CrvRecoPulsesFinder art::module REG_SOURCE src/CrvRecoPulsesFinder_module.cc) +cet_build_plugin(CrvCoincidenceFinder art::module + REG_SOURCE src/CrvCoincidenceFinder_module.cc + LIBRARIES REG +) +cet_build_plugin(CrvRecoPulsesFinder art::module + REG_SOURCE src/CrvRecoPulsesFinder_module.cc + LIBRARIES REG +) install_source(SUBDIRS src) install_headers(SUBDIRS inc) diff --git a/CRVResponse/CMakeLists.txt b/CRVResponse/CMakeLists.txt index 4ce55fe623..6ef7e3dddb 100644 --- a/CRVResponse/CMakeLists.txt +++ b/CRVResponse/CMakeLists.txt @@ -1,37 +1,71 @@ cet_make_library( SOURCE -src/CrvMCHelper.cc -src/DrawLookupTableHistograms.cc -src/MakeCrvDigis.cc -src/MakeCrvPhotons.cc -src/MakeCrvSiPMCharges.cc -src/MakeCrvWaveforms.cc -LIBRARIES PUBLIC -cetlib::cetlib + src/CrvMCHelper.cc + src/DrawLookupTableHistograms.cc + src/MakeCrvDigis.cc + src/MakeCrvPhotons.cc + src/MakeCrvSiPMCharges.cc + src/MakeCrvWaveforms.cc + LIBRARIES PUBLIC + + offline::MCDataProducts + offline::RecoDataProducts ) -cet_build_plugin(CrvCalibration art::module REG_SOURCE src/CrvCalibration_module.cc) - -cet_build_plugin(CrvCoincidenceClusterMatchMC art::module REG_SOURCE src/CrvCoincidenceClusterMatchMC_module.cc) +cet_build_plugin(CrvCalibration art::module + REG_SOURCE src/CrvCalibration_module.cc + LIBRARIES REG +) -cet_build_plugin(CrvDigitizer art::module REG_SOURCE src/CrvDigitizer_module.cc) +cet_build_plugin(CrvCoincidenceClusterMatchMC art::module + REG_SOURCE src/CrvCoincidenceClusterMatchMC_module.cc + LIBRARIES REG +) -cet_build_plugin(CrvPedestalFinder art::module REG_SOURCE src/CrvPedestalFinder_module.cc) +cet_build_plugin(CrvDigitizer art::module + REG_SOURCE src/CrvDigitizer_module.cc + LIBRARIES REG +) -cet_build_plugin(CrvPhotonGenerator art::module REG_SOURCE src/CrvPhotonGenerator_module.cc) +cet_build_plugin(CrvPedestalFinder art::module + REG_SOURCE src/CrvPedestalFinder_module.cc + LIBRARIES REG +) -cet_build_plugin(CrvPlot art::module REG_SOURCE src/CrvPlot_module.cc) +cet_build_plugin(CrvPhotonGenerator art::module + REG_SOURCE src/CrvPhotonGenerator_module.cc + LIBRARIES REG +) -cet_build_plugin(CrvSiPMChargeGenerator art::module REG_SOURCE src/CrvSiPMChargeGenerator_module.cc) +cet_build_plugin(CrvPlot art::module + REG_SOURCE src/CrvPlot_module.cc + LIBRARIES REG +) -cet_build_plugin(CrvStepsFromStepPointMCs art::module REG_SOURCE src/CrvStepsFromStepPointMCs_module.cc) +cet_build_plugin(CrvSiPMChargeGenerator art::module + REG_SOURCE src/CrvSiPMChargeGenerator_module.cc + LIBRARIES REG +) -cet_build_plugin(CRVTest art::module REG_SOURCE src/CRVTest_module.cc) +cet_build_plugin(CrvStepsFromStepPointMCs art::module + REG_SOURCE src/CrvStepsFromStepPointMCs_module.cc + LIBRARIES REG +) -cet_build_plugin(CrvWaveformsGenerator art::module REG_SOURCE src/CrvWaveformsGenerator_module.cc) +cet_build_plugin(CRVTest art::module + REG_SOURCE src/CRVTest_module.cc + LIBRARIES REG +) -cet_build_plugin(MakeCrvCoincidenceClusterMCAssns art::module REG_SOURCE src/MakeCrvCoincidenceClusterMCAssns_module.cc) +cet_build_plugin(CrvWaveformsGenerator art::module + REG_SOURCE src/CrvWaveformsGenerator_module.cc + LIBRARIES REG +) +cet_build_plugin(MakeCrvCoincidenceClusterMCAssns art::module + REG_SOURCE src/MakeCrvCoincidenceClusterMCAssns_module.cc + LIBRARIES REG +) install_source(SUBDIRS src) install_headers(SUBDIRS inc) diff --git a/CalPatRec/CMakeLists.txt b/CalPatRec/CMakeLists.txt index 6227d21058..bb12928a47 100644 --- a/CalPatRec/CMakeLists.txt +++ b/CalPatRec/CMakeLists.txt @@ -1,43 +1,87 @@ cet_make_library( SOURCE -src/CalHelixFinderAlg.cc -src/CalHelixFinderData.cc -src/CalHelixFinderDiag_tool.cc -src/CalTimePeakFinderDiag_tool.cc -src/DeltaCandidate.cc -src/DeltaFinderAlg.cc -src/DeltaFinderAlg_findProtons.cc -src/DeltaFinderDiag_tool.cc -src/DeltaFinder_types.cc -src/DeltaSeed.cc -src/HlPrint_ComboHit.cc -src/MergePatRecDiag_tool.cc -src/ObjectDumpUtils.cc -src/PhiClusterFinderDiag_tool.cc -src/ProtonCandidate.cc -src/TZClusterFinderDiag_tool.cc -LIBRARIES PUBLIC -cetlib::cetlib + src/CalHelixFinderAlg.cc + src/CalHelixFinderData.cc + src/CalHelixFinderDiag_tool.cc + src/CalTimePeakFinderDiag_tool.cc + src/DeltaCandidate.cc + src/DeltaFinderAlg.cc + src/DeltaFinderAlg_findProtons.cc + src/DeltaFinderDiag_tool.cc + src/DeltaFinder_types.cc + src/DeltaSeed.cc + src/HlPrint_ComboHit.cc + src/MergePatRecDiag_tool.cc + src/ObjectDumpUtils.cc + src/PhiClusterFinderDiag_tool.cc + src/ProtonCandidate.cc + src/TZClusterFinderDiag_tool.cc + LIBRARIES PUBLIC + + offline::BFieldGeom + offline::BTrkData + offline::CalorimeterGeom + offline::ConditionsService + offline::DataProducts + offline::GeometryService + offline::MCDataProducts + offline::Mu2eUtilities + offline::RecoDataProducts + offline::TrackerGeom + offline::TrkReco ) -cet_build_plugin(CalHelixFinder art::module REG_SOURCE src/CalHelixFinder_module.cc) +cet_build_plugin(CalHelixFinder art::module + REG_SOURCE src/CalHelixFinder_module.cc + LIBRARIES REG +) -cet_build_plugin(CalTimePeakFinder art::module REG_SOURCE src/CalTimePeakFinder_module.cc) +cet_build_plugin(CalTimePeakFinder art::module + REG_SOURCE src/CalTimePeakFinder_module.cc + LIBRARIES REG +) -cet_build_plugin(ComboHitFilter art::module REG_SOURCE src/ComboHitFilter_module.cc) +cet_build_plugin(ComboHitFilter art::module + REG_SOURCE src/ComboHitFilter_module.cc + LIBRARIES REG +) -cet_build_plugin(DeltaFinderAna art::module REG_SOURCE src/DeltaFinderAna_module.cc) +cet_build_plugin(DeltaFinderAna art::module + REG_SOURCE src/DeltaFinderAna_module.cc + LIBRARIES REG +) -cet_build_plugin(DeltaFinder art::module REG_SOURCE src/DeltaFinder_module.cc) +cet_build_plugin(DeltaFinder art::module + REG_SOURCE src/DeltaFinder_module.cc + LIBRARIES REG +) -cet_build_plugin(MergeHelixFinder art::module REG_SOURCE src/MergeHelixFinder_module.cc) +cet_build_plugin(MergeHelixFinder art::module + REG_SOURCE src/MergeHelixFinder_module.cc + LIBRARIES REG +) -cet_build_plugin(PhiClusterFinder art::module REG_SOURCE src/PhiClusterFinder_module.cc) +cet_build_plugin(PhiClusterFinder art::module + REG_SOURCE src/PhiClusterFinder_module.cc + LIBRARIES REG +) -cet_build_plugin(PrefetchData art::module REG_SOURCE src/PrefetchData_module.cc) +cet_build_plugin(PrefetchData art::module + REG_SOURCE src/PrefetchData_module.cc + LIBRARIES REG +) -cet_build_plugin(TZClusterFinder art::module REG_SOURCE src/TZClusterFinder_module.cc) +cet_build_plugin(TZClusterFinder art::module + REG_SOURCE src/TZClusterFinder_module.cc + LIBRARIES REG +) +art_dictionary( + CLASSES_DEF_XML ${CMAKE_CURRENT_SOURCE_DIR}/src/classes_def.xml + CLASSES_H ${CMAKE_CURRENT_SOURCE_DIR}/src/classes.h + DICTIONARY_LIBRARIES + offline::CalPatRec +) install_source(SUBDIRS src) install_headers(SUBDIRS inc) diff --git a/CaloCluster/CMakeLists.txt b/CaloCluster/CMakeLists.txt index b22e4f9328..52b5e33f6a 100644 --- a/CaloCluster/CMakeLists.txt +++ b/CaloCluster/CMakeLists.txt @@ -1,20 +1,34 @@ cet_make_library( SOURCE -src/ClusterAssociator.cc -src/ClusterFinder.cc -src/ClusterUtils.cc -LIBRARIES PUBLIC -cetlib::cetlib + src/ClusterAssociator.cc + src/ClusterFinder.cc + src/ClusterUtils.cc + LIBRARIES PUBLIC + + offline::CalorimeterGeom + offline::GeometryService + offline::RecoDataProducts ) -cet_build_plugin(CaloClusterFast art::module REG_SOURCE src/CaloClusterFast_module.cc) - -cet_build_plugin(CaloClusterMaker art::module REG_SOURCE src/CaloClusterMaker_module.cc) +cet_build_plugin(CaloClusterFast art::module + REG_SOURCE src/CaloClusterFast_module.cc + LIBRARIES REG +) -cet_build_plugin(CaloProtoClusterMaker art::module REG_SOURCE src/CaloProtoClusterMaker_module.cc) +cet_build_plugin(CaloClusterMaker art::module + REG_SOURCE src/CaloClusterMaker_module.cc + LIBRARIES REG +) -cet_build_plugin(CaloTrigger art::module REG_SOURCE src/CaloTrigger_module.cc) +cet_build_plugin(CaloProtoClusterMaker art::module + REG_SOURCE src/CaloProtoClusterMaker_module.cc + LIBRARIES REG +) +cet_build_plugin(CaloTrigger art::module + REG_SOURCE src/CaloTrigger_module.cc + LIBRARIES REG +) install_source(SUBDIRS src) install_headers(SUBDIRS inc) diff --git a/CaloConditions/CMakeLists.txt b/CaloConditions/CMakeLists.txt index ee86071e73..5c46d747f1 100644 --- a/CaloConditions/CMakeLists.txt +++ b/CaloConditions/CMakeLists.txt @@ -1,14 +1,21 @@ cet_make_library( SOURCE -src/CalCalib.cc -src/CalCalibMaker.cc -src/CaloDAQMap.cc -src/CaloDAQMapMaker.cc -LIBRARIES PUBLIC -cetlib::cetlib + src/CalCalib.cc + src/CalCalibMaker.cc + src/CaloDAQMap.cc + src/CaloDAQMapMaker.cc + LIBRARIES PUBLIC + + offline::CaloConfig + offline::CalorimeterGeom + offline::ConfigTools + offline::DataProducts + offline::DbService + offline::DbTables + offline::Mu2eInterfaces + offline::ProditionsService ) - install_source(SUBDIRS src) install_headers(SUBDIRS inc) install_fhicl(SUBDIRS fcl SUBDIRNAME CaloConditions) diff --git a/CaloConfig/CMakeLists.txt b/CaloConfig/CMakeLists.txt index 04a44744b2..43af8b7d5c 100644 --- a/CaloConfig/CMakeLists.txt +++ b/CaloConfig/CMakeLists.txt @@ -1 +1,9 @@ +cet_make_library(INTERFACE + SOURCE + inc/CalCalibConfig.hh + inc/CaloDAQMapConfig.hh + LIBRARIES INTERFACE + +) + install_headers(SUBDIRS inc) diff --git a/CaloDiag/CMakeLists.txt b/CaloDiag/CMakeLists.txt index 5ed16636cc..6866e5a406 100644 --- a/CaloDiag/CMakeLists.txt +++ b/CaloDiag/CMakeLists.txt @@ -1,12 +1,26 @@ -cet_build_plugin(CaloClusterCheck art::module REG_SOURCE src/CaloClusterCheck_module.cc) +cet_build_plugin(CaloClusterCheck art::module + REG_SOURCE src/CaloClusterCheck_module.cc + LIBRARIES REG +) -cet_build_plugin(CaloExample art::module REG_SOURCE src/CaloExample_module.cc) +cet_build_plugin(CaloExample art::module + REG_SOURCE src/CaloExample_module.cc + LIBRARIES REG +) -cet_build_plugin(CaloMCInspector art::module REG_SOURCE src/CaloMCInspector_module.cc) +cet_build_plugin(CaloMCInspector art::module + REG_SOURCE src/CaloMCInspector_module.cc + LIBRARIES REG +) -cet_build_plugin(CaloNeutron art::module REG_SOURCE src/CaloNeutron_module.cc) - -cet_build_plugin(CaloNNDiag art::module REG_SOURCE src/CaloNNDiag_module.cc) +cet_build_plugin(CaloNeutron art::module + REG_SOURCE src/CaloNeutron_module.cc + LIBRARIES REG +) +cet_build_plugin(CaloNNDiag art::module + REG_SOURCE src/CaloNNDiag_module.cc + LIBRARIES REG +) install_source(SUBDIRS src) diff --git a/CaloFilters/CMakeLists.txt b/CaloFilters/CMakeLists.txt index 437263ffad..ae761f7070 100644 --- a/CaloFilters/CMakeLists.txt +++ b/CaloFilters/CMakeLists.txt @@ -1,17 +1,37 @@ -cet_build_plugin(CaloClusterCounterFilter art::module REG_SOURCE src/CaloClusterCounterFilter_module.cc) - -cet_build_plugin(CaloCosmicCalib art::module REG_SOURCE src/CaloCosmicCalib_module.cc) - -cet_build_plugin(CaloLikelihood art::module REG_SOURCE src/CaloLikelihood_module.cc) - -cet_build_plugin(EcalTriggerPreselect art::module REG_SOURCE src/EcalTriggerPreselect_module.cc) - -cet_build_plugin(FilterEcalMixedTrigger art::module REG_SOURCE src/FilterEcalMixedTrigger_module.cc) - -cet_build_plugin(FilterEcalMVATrigger art::module REG_SOURCE src/FilterEcalMVATrigger_module.cc) - -cet_build_plugin(FilterEcalNNTrigger art::module REG_SOURCE src/FilterEcalNNTrigger_module.cc) - +cet_build_plugin(CaloClusterCounterFilter art::module + REG_SOURCE src/CaloClusterCounterFilter_module.cc + LIBRARIES REG +) + +cet_build_plugin(CaloCosmicCalib art::module + REG_SOURCE src/CaloCosmicCalib_module.cc + LIBRARIES REG +) + +cet_build_plugin(CaloLikelihood art::module + REG_SOURCE src/CaloLikelihood_module.cc + LIBRARIES REG +) + +cet_build_plugin(EcalTriggerPreselect art::module + REG_SOURCE src/EcalTriggerPreselect_module.cc + LIBRARIES REG +) + +cet_build_plugin(FilterEcalMixedTrigger art::module + REG_SOURCE src/FilterEcalMixedTrigger_module.cc + LIBRARIES REG +) + +cet_build_plugin(FilterEcalMVATrigger art::module + REG_SOURCE src/FilterEcalMVATrigger_module.cc + LIBRARIES REG +) + +cet_build_plugin(FilterEcalNNTrigger art::module + REG_SOURCE src/FilterEcalNNTrigger_module.cc + LIBRARIES REG +) install_source(SUBDIRS src) install_fhicl(SUBDIRS fcl SUBDIRNAME CaloFilters) diff --git a/CaloMC/CMakeLists.txt b/CaloMC/CMakeLists.txt index 41c45e9261..0a3b788d60 100644 --- a/CaloMC/CMakeLists.txt +++ b/CaloMC/CMakeLists.txt @@ -1,26 +1,48 @@ cet_make_library( SOURCE -src/CaloNoiseARFitter.cc -src/CaloNoiseSimGenerator.cc -src/CaloPhotonPropagation.cc -src/CaloWFExtractor.cc -src/ShowerStepUtil.cc -LIBRARIES PUBLIC -cetlib::cetlib + src/CaloNoiseARFitter.cc + src/CaloNoiseSimGenerator.cc + src/CaloPhotonPropagation.cc + src/CaloWFExtractor.cc + src/ShowerStepUtil.cc + LIBRARIES PUBLIC + + offline::CalorimeterGeom + offline::ConditionsService + offline::GeometryService + offline::Mu2eUtilities + offline::SeedService ) -cet_build_plugin(CaloClusterTruthMatch art::module REG_SOURCE src/CaloClusterTruthMatch_module.cc) - -cet_build_plugin(CaloDigiMaker art::module REG_SOURCE src/CaloDigiMaker_module.cc) +cet_build_plugin(CaloClusterTruthMatch art::module + REG_SOURCE src/CaloClusterTruthMatch_module.cc + LIBRARIES REG +) -cet_build_plugin(CaloHitTruthMatch art::module REG_SOURCE src/CaloHitTruthMatch_module.cc) +cet_build_plugin(CaloDigiMaker art::module + REG_SOURCE src/CaloDigiMaker_module.cc + LIBRARIES REG +) -cet_build_plugin(CaloShowerROMaker art::module REG_SOURCE src/CaloShowerROMaker_module.cc) +cet_build_plugin(CaloHitTruthMatch art::module + REG_SOURCE src/CaloHitTruthMatch_module.cc + LIBRARIES REG +) -cet_build_plugin(CaloShowerStepMaker art::module REG_SOURCE src/CaloShowerStepMaker_module.cc) +cet_build_plugin(CaloShowerROMaker art::module + REG_SOURCE src/CaloShowerROMaker_module.cc + LIBRARIES REG +) -cet_build_plugin(CaloShowerUpdater art::module REG_SOURCE src/CaloShowerUpdater_module.cc) +cet_build_plugin(CaloShowerStepMaker art::module + REG_SOURCE src/CaloShowerStepMaker_module.cc + LIBRARIES REG +) +cet_build_plugin(CaloShowerUpdater art::module + REG_SOURCE src/CaloShowerUpdater_module.cc + LIBRARIES REG +) install_source(SUBDIRS src) install_headers(SUBDIRS inc) diff --git a/CaloReco/CMakeLists.txt b/CaloReco/CMakeLists.txt index 629b6cb3be..3fa4045864 100644 --- a/CaloReco/CMakeLists.txt +++ b/CaloReco/CMakeLists.txt @@ -1,18 +1,28 @@ cet_make_library( SOURCE -src/CaloRawWFProcessor.cc -src/CaloTemplateWFProcessor.cc -src/CaloTemplateWFUtil.cc -LIBRARIES PUBLIC -cetlib::cetlib + src/CaloRawWFProcessor.cc + src/CaloTemplateWFProcessor.cc + src/CaloTemplateWFUtil.cc + LIBRARIES PUBLIC + + offline::ConditionsService + offline::Mu2eUtilities ) -cet_build_plugin(CaloHitMakerFast art::module REG_SOURCE src/CaloHitMakerFast_module.cc) - -cet_build_plugin(CaloHitMaker art::module REG_SOURCE src/CaloHitMaker_module.cc) +cet_build_plugin(CaloHitMakerFast art::module + REG_SOURCE src/CaloHitMakerFast_module.cc + LIBRARIES REG +) -cet_build_plugin(CaloRecoDigiMaker art::module REG_SOURCE src/CaloRecoDigiMaker_module.cc) +cet_build_plugin(CaloHitMaker art::module + REG_SOURCE src/CaloHitMaker_module.cc + LIBRARIES REG +) +cet_build_plugin(CaloRecoDigiMaker art::module + REG_SOURCE src/CaloRecoDigiMaker_module.cc + LIBRARIES REG +) install_source(SUBDIRS src) install_headers(SUBDIRS inc) diff --git a/CalorimeterGeom/CMakeLists.txt b/CalorimeterGeom/CMakeLists.txt index 7a0ff53125..1c1310cd3c 100644 --- a/CalorimeterGeom/CMakeLists.txt +++ b/CalorimeterGeom/CMakeLists.txt @@ -1,15 +1,15 @@ cet_make_library( SOURCE -src/CaloGeomUtil.cc -src/CrystalCondReader.cc -src/DiskCalorimeter.cc -src/Disk.cc -src/SquareMapper.cc -src/SquareShiftMapper.cc -LIBRARIES PUBLIC -cetlib::cetlib + src/CaloGeomUtil.cc + src/CrystalCondReader.cc + src/DiskCalorimeter.cc + src/Disk.cc + src/SquareMapper.cc + src/SquareShiftMapper.cc + LIBRARIES PUBLIC + + offline::Mu2eInterfaces ) - install_source(SUBDIRS src) install_headers(SUBDIRS inc) diff --git a/CommonMC/CMakeLists.txt b/CommonMC/CMakeLists.txt index 749340b6b4..c73d51a7af 100644 --- a/CommonMC/CMakeLists.txt +++ b/CommonMC/CMakeLists.txt @@ -1,23 +1,52 @@ -cet_build_plugin(CosmicTimeOffset art::module REG_SOURCE src/CosmicTimeOffset_module.cc) - -cet_build_plugin(EventWindowMarkerProducer art::module REG_SOURCE src/EventWindowMarkerProducer_module.cc) - -cet_build_plugin(FindMCPrimary art::module REG_SOURCE src/FindMCPrimary_module.cc) - -cet_build_plugin(GenEventCountReader art::module REG_SOURCE src/GenEventCountReader_module.cc) - -cet_build_plugin(InFlightStepDumper art::module REG_SOURCE src/InFlightStepDumper_module.cc) - -cet_build_plugin(NullMCPrimary art::module REG_SOURCE src/NullMCPrimary_module.cc) - -cet_build_plugin(ProtonTimeOffset art::module REG_SOURCE src/ProtonTimeOffset_module.cc) - -cet_build_plugin(SelectRecoMC art::module REG_SOURCE src/SelectRecoMC_module.cc) - -cet_build_plugin(SimParticleDaughterSelector art::module REG_SOURCE src/SimParticleDaughterSelector_module.cc) - -cet_build_plugin(StoppedParticlesFinder art::module REG_SOURCE src/StoppedParticlesFinder_module.cc) - +cet_build_plugin(CosmicTimeOffset art::module + REG_SOURCE src/CosmicTimeOffset_module.cc + LIBRARIES REG +) + +cet_build_plugin(EventWindowMarkerProducer art::module + REG_SOURCE src/EventWindowMarkerProducer_module.cc + LIBRARIES REG +) + +cet_build_plugin(FindMCPrimary art::module + REG_SOURCE src/FindMCPrimary_module.cc + LIBRARIES REG +) + +cet_build_plugin(GenEventCountReader art::module + REG_SOURCE src/GenEventCountReader_module.cc + LIBRARIES REG +) + +cet_build_plugin(InFlightStepDumper art::module + REG_SOURCE src/InFlightStepDumper_module.cc + LIBRARIES REG +) + +cet_build_plugin(NullMCPrimary art::module + REG_SOURCE src/NullMCPrimary_module.cc + LIBRARIES REG +) + +cet_build_plugin(ProtonTimeOffset art::module + REG_SOURCE src/ProtonTimeOffset_module.cc + LIBRARIES REG +) + +cet_build_plugin(SelectRecoMC art::module + REG_SOURCE src/SelectRecoMC_module.cc + LIBRARIES REG +) + +cet_build_plugin(SimParticleDaughterSelector art::module + REG_SOURCE src/SimParticleDaughterSelector_module.cc + LIBRARIES REG +) + +cet_build_plugin(StoppedParticlesFinder art::module + REG_SOURCE src/StoppedParticlesFinder_module.cc + LIBRARIES REG +) install_source(SUBDIRS src) install_fhicl(SUBDIRS fcl SUBDIRNAME CommonMC) diff --git a/Compression/CMakeLists.txt b/Compression/CMakeLists.txt index b93a46c1a1..b2d2f5769a 100644 --- a/Compression/CMakeLists.txt +++ b/Compression/CMakeLists.txt @@ -1,16 +1,24 @@ cet_make_library( SOURCE -src/CompressionLevel.cc -LIBRARIES PUBLIC -cetlib::cetlib + src/CompressionLevel.cc + LIBRARIES PUBLIC + ) -cet_build_plugin(CompressDetStepMCs art::module REG_SOURCE src/CompressDetStepMCs_module.cc) - -cet_build_plugin(CompressDigiMCsCheck art::module REG_SOURCE src/CompressDigiMCsCheck_module.cc) +cet_build_plugin(CompressDetStepMCs art::module + REG_SOURCE src/CompressDetStepMCs_module.cc + LIBRARIES REG +) -cet_build_plugin(CompressDigiMCs art::module REG_SOURCE src/CompressDigiMCs_module.cc) +cet_build_plugin(CompressDigiMCsCheck art::module + REG_SOURCE src/CompressDigiMCsCheck_module.cc + LIBRARIES REG +) +cet_build_plugin(CompressDigiMCs art::module + REG_SOURCE src/CompressDigiMCs_module.cc + LIBRARIES REG +) install_source(SUBDIRS src) install_headers(SUBDIRS inc) diff --git a/ConditionsBase/CMakeLists.txt b/ConditionsBase/CMakeLists.txt index 04a44744b2..bf51eb90a0 100644 --- a/ConditionsBase/CMakeLists.txt +++ b/ConditionsBase/CMakeLists.txt @@ -1 +1,8 @@ +cet_make_library(INTERFACE + SOURCE + inc/TrackerCalibrationStructs.hh + LIBRARIES INTERFACE + +) + install_headers(SUBDIRS inc) diff --git a/ConditionsService/CMakeLists.txt b/ConditionsService/CMakeLists.txt index 31d49f2d93..cb729fa5a3 100644 --- a/ConditionsService/CMakeLists.txt +++ b/ConditionsService/CMakeLists.txt @@ -1,13 +1,19 @@ cet_make_library( SOURCE -src/AcceleratorParams.cc -src/CalorimeterCalibrations.cc -src/ConditionsService_service.cc -src/ExtMonFNALConditions.cc -LIBRARIES PUBLIC -cetlib::cetlib + src/AcceleratorParams.cc + src/CalorimeterCalibrations.cc + src/ExtMonFNALConditions.cc + LIBRARIES PUBLIC + + offline::ConfigTools + offline::Mu2eInterfaces ) +cet_build_plugin(ConditionsService art::service + REG_SOURCE src/ConditionsService_service.cc + LIBRARIES REG + offline::ConditionsService +) install_source(SUBDIRS src) install_headers(SUBDIRS inc) diff --git a/ConfigTools/CMakeLists.txt b/ConfigTools/CMakeLists.txt index 39d0775a99..a220506f99 100644 --- a/ConfigTools/CMakeLists.txt +++ b/ConfigTools/CMakeLists.txt @@ -1,13 +1,13 @@ cet_make_library( SOURCE -src/checkForStale.cc -src/requireUniqueKey.cc -src/SimpleConfig.cc -src/SimpleConfigRecord.cc -LIBRARIES PUBLIC -cetlib::cetlib + src/checkForStale.cc + src/requireUniqueKey.cc + src/SimpleConfig.cc + src/SimpleConfigRecord.cc + LIBRARIES PUBLIC + messagefacility::MF_MessageLogger + offline::GeneralUtilities ) - install_source(SUBDIRS src) install_headers(SUBDIRS inc) diff --git a/CosmicRayShieldGeom/CMakeLists.txt b/CosmicRayShieldGeom/CMakeLists.txt index a5e4d55b3b..721db95664 100644 --- a/CosmicRayShieldGeom/CMakeLists.txt +++ b/CosmicRayShieldGeom/CMakeLists.txt @@ -1,19 +1,20 @@ cet_make_library( SOURCE -src/CosmicRayShield.cc -src/CRSAbsorberLayer.cc -src/CRSAluminumSheet.cc -src/CRSFEB.cc -src/CRSScintillatorBar.cc -src/CRSScintillatorBarDetail.cc -src/CRSScintillatorLayer.cc -src/CRSScintillatorModule.cc -src/CRSScintillatorShield.cc -src/CRSSupportStructure.cc -LIBRARIES PUBLIC -cetlib::cetlib + src/CosmicRayShield.cc + src/CRSAbsorberLayer.cc + src/CRSAluminumSheet.cc + src/CRSFEB.cc + src/CRSScintillatorBar.cc + src/CRSScintillatorBarDetail.cc + src/CRSScintillatorLayer.cc + src/CRSScintillatorModule.cc + src/CRSScintillatorShield.cc + src/CRSSupportStructure.cc + LIBRARIES PUBLIC + + offline::DataProducts + offline::Mu2eInterfaces ) - install_source(SUBDIRS src) install_headers(SUBDIRS inc) diff --git a/CosmicReco/CMakeLists.txt b/CosmicReco/CMakeLists.txt index d76de86287..a4f5fc35ae 100644 --- a/CosmicReco/CMakeLists.txt +++ b/CosmicReco/CMakeLists.txt @@ -1,36 +1,75 @@ cet_make_library( SOURCE -src/CosmicTrackFit.cc -src/CosmicTrackMCInfo.cc -src/DriftFitUtils.cc -src/MinuitDriftFitter.cc -src/PDFFit.cc -LIBRARIES PUBLIC -cetlib::cetlib + src/CosmicTrackFit.cc + src/CosmicTrackMCInfo.cc + src/DriftFitUtils.cc + src/MinuitDriftFitter.cc + src/PDFFit.cc + LIBRARIES PUBLIC + + offline::BTrkData + offline::DataProducts + offline::GeometryService + offline::Mu2eUtilities + offline::RecoDataProducts + offline::TrackerConditions + offline::TrackerGeom ) -cet_build_plugin(CosmicAnalyzer art::module REG_SOURCE src/CosmicAnalyzer_module.cc) - -cet_build_plugin(CosmicFitDisplay art::module REG_SOURCE src/CosmicFitDisplay_module.cc) +cet_build_plugin(CosmicAnalyzer art::module + REG_SOURCE src/CosmicAnalyzer_module.cc + LIBRARIES REG +) -cet_build_plugin(CosmicMCRecoDiff art::module REG_SOURCE src/CosmicMCRecoDiff_module.cc) +cet_build_plugin(CosmicFitDisplay art::module + REG_SOURCE src/CosmicFitDisplay_module.cc + LIBRARIES REG +) -cet_build_plugin(CosmicMuonInfo art::module REG_SOURCE src/CosmicMuonInfo_module.cc) +cet_build_plugin(CosmicMCRecoDiff art::module + REG_SOURCE src/CosmicMCRecoDiff_module.cc + LIBRARIES REG +) -cet_build_plugin(CosmicSeedFilter art::module REG_SOURCE src/CosmicSeedFilter_module.cc) +cet_build_plugin(CosmicMuonInfo art::module + REG_SOURCE src/CosmicMuonInfo_module.cc + LIBRARIES REG +) -cet_build_plugin(CosmicShowerFilter art::module REG_SOURCE src/CosmicShowerFilter_module.cc) +cet_build_plugin(CosmicSeedFilter art::module + REG_SOURCE src/CosmicSeedFilter_module.cc + LIBRARIES REG +) -cet_build_plugin(CosmicTrackDetails art::module REG_SOURCE src/CosmicTrackDetails_module.cc) +cet_build_plugin(CosmicShowerFilter art::module + REG_SOURCE src/CosmicShowerFilter_module.cc + LIBRARIES REG +) -cet_build_plugin(CosmicTrackDiag art::module REG_SOURCE src/CosmicTrackDiag_module.cc) +cet_build_plugin(CosmicTrackDetails art::module + REG_SOURCE src/CosmicTrackDetails_module.cc + LIBRARIES REG +) -cet_build_plugin(CosmicTrackFinder art::module REG_SOURCE src/CosmicTrackFinder_module.cc) +cet_build_plugin(CosmicTrackDiag art::module + REG_SOURCE src/CosmicTrackDiag_module.cc + LIBRARIES REG +) -cet_build_plugin(LineFinder art::module REG_SOURCE src/LineFinder_module.cc) +cet_build_plugin(CosmicTrackFinder art::module + REG_SOURCE src/CosmicTrackFinder_module.cc + LIBRARIES REG +) -cet_build_plugin(SimpleTimeCluster art::module REG_SOURCE src/SimpleTimeCluster_module.cc) +cet_build_plugin(LineFinder art::module + REG_SOURCE src/LineFinder_module.cc + LIBRARIES REG +) +cet_build_plugin(SimpleTimeCluster art::module + REG_SOURCE src/SimpleTimeCluster_module.cc + LIBRARIES REG +) install_source(SUBDIRS src) install_headers(SUBDIRS inc) diff --git a/DAQ/CMakeLists.txt b/DAQ/CMakeLists.txt index f45e3febb3..8b26b91815 100644 --- a/DAQ/CMakeLists.txt +++ b/DAQ/CMakeLists.txt @@ -1,28 +1,54 @@ cet_make_library( SOURCE -src/CaloDAQUtilities.cc -LIBRARIES PUBLIC -cetlib::cetlib + src/CaloDAQUtilities.cc + LIBRARIES PUBLIC + ) -cet_build_plugin(ArtBinaryPacketsFromDigis art::module REG_SOURCE src/ArtBinaryPacketsFromDigis_module.cc) - -cet_build_plugin(ArtFragmentsFromDTCEvents art::module REG_SOURCE src/ArtFragmentsFromDTCEvents_module.cc) +cet_build_plugin(ArtBinaryPacketsFromDigis art::module + REG_SOURCE src/ArtBinaryPacketsFromDigis_module.cc + LIBRARIES REG +) -cet_build_plugin(CaloHitsFromFragments art::module REG_SOURCE src/CaloHitsFromFragments_module.cc) +cet_build_plugin(ArtFragmentsFromDTCEvents art::module + REG_SOURCE src/ArtFragmentsFromDTCEvents_module.cc + LIBRARIES REG +) -cet_build_plugin(CaloRecoFromFragments art::module REG_SOURCE src/CaloRecoFromFragments_module.cc) +cet_build_plugin(CaloHitsFromFragments art::module + REG_SOURCE src/CaloHitsFromFragments_module.cc + LIBRARIES REG +) -cet_build_plugin(CrvDigisFromFragments art::module REG_SOURCE src/CrvDigisFromFragments_module.cc) +cet_build_plugin(CaloRecoFromFragments art::module + REG_SOURCE src/CaloRecoFromFragments_module.cc + LIBRARIES REG +) -cet_build_plugin(FragmentAna art::module REG_SOURCE src/FragmentAna_module.cc) +cet_build_plugin(CrvDigisFromFragments art::module + REG_SOURCE src/CrvDigisFromFragments_module.cc + LIBRARIES REG +) -cet_build_plugin(PrefetchDAQData art::module REG_SOURCE src/PrefetchDAQData_module.cc) +cet_build_plugin(FragmentAna art::module + REG_SOURCE src/FragmentAna_module.cc + LIBRARIES REG +) -cet_build_plugin(StrawHitRecoFromFragments art::module REG_SOURCE src/StrawHitRecoFromFragments_module.cc) +cet_build_plugin(PrefetchDAQData art::module + REG_SOURCE src/PrefetchDAQData_module.cc + LIBRARIES REG +) -cet_build_plugin(StrawRecoFromFragments art::module REG_SOURCE src/StrawRecoFromFragments_module.cc) +cet_build_plugin(StrawHitRecoFromFragments art::module + REG_SOURCE src/StrawHitRecoFromFragments_module.cc + LIBRARIES REG +) +cet_build_plugin(StrawRecoFromFragments art::module + REG_SOURCE src/StrawRecoFromFragments_module.cc + LIBRARIES REG +) install_source(SUBDIRS src) install_headers(SUBDIRS inc) diff --git a/DAQConditions/CMakeLists.txt b/DAQConditions/CMakeLists.txt index 5db5af411e..1af890d361 100644 --- a/DAQConditions/CMakeLists.txt +++ b/DAQConditions/CMakeLists.txt @@ -1,12 +1,15 @@ cet_make_library( SOURCE -src/EventTiming.cc -src/EventTimingMaker.cc -LIBRARIES PUBLIC -cetlib::cetlib + src/EventTiming.cc + src/EventTimingMaker.cc + LIBRARIES PUBLIC + + offline::DAQConfig + offline::DataProducts + offline::Mu2eInterfaces + offline::TrackerGeom ) - install_source(SUBDIRS src) install_headers(SUBDIRS inc) install_fhicl(SUBDIRS fcl SUBDIRNAME DAQConditions) diff --git a/DAQConfig/CMakeLists.txt b/DAQConfig/CMakeLists.txt index 04a44744b2..27cca3ab6a 100644 --- a/DAQConfig/CMakeLists.txt +++ b/DAQConfig/CMakeLists.txt @@ -1 +1,8 @@ +cet_make_library(INTERFACE + SOURCE + inc/EventTimingConfig.hh + LIBRARIES INTERFACE + +) + install_headers(SUBDIRS inc) diff --git a/DataProducts/CMakeLists.txt b/DataProducts/CMakeLists.txt index dd8a71c54e..5f4faa12a4 100644 --- a/DataProducts/CMakeLists.txt +++ b/DataProducts/CMakeLists.txt @@ -1,22 +1,29 @@ cet_make_library( SOURCE -src/CaloRawSiPMId.cc -src/CaloSiPMId.cc -src/CompressedPDGCode.cc -src/CrystalId.cc -src/ExtMonFNALChipId.cc -src/ExtMonFNALPixelId.cc -src/GenVector.cc -src/PDGCode.cc -src/STMChannel.cc -src/StrawId.cc -src/StrawIdMask.cc -src/StrawStatus.cc -src/VirtualDetectorId.cc -LIBRARIES PUBLIC -cetlib::cetlib + src/CaloRawSiPMId.cc + src/CaloSiPMId.cc + src/CompressedPDGCode.cc + src/CrystalId.cc + src/ExtMonFNALChipId.cc + src/ExtMonFNALPixelId.cc + src/GenVector.cc + src/PDGCode.cc + src/STMChannel.cc + src/StrawId.cc + src/StrawIdMask.cc + src/StrawStatus.cc + src/VirtualDetectorId.cc + LIBRARIES PUBLIC + ROOT::MathMore + offline::GeneralUtilities ) +art_dictionary( + CLASSES_DEF_XML ${CMAKE_CURRENT_SOURCE_DIR}/src/classes_def.xml + CLASSES_H ${CMAKE_CURRENT_SOURCE_DIR}/src/classes.h + DICTIONARY_LIBRARIES + offline::DataProducts +) install_source(SUBDIRS src) install_headers(SUBDIRS inc) diff --git a/DbService/CMakeLists.txt b/DbService/CMakeLists.txt index 3a636fa84c..ed94ec3476 100644 --- a/DbService/CMakeLists.txt +++ b/DbService/CMakeLists.txt @@ -1,21 +1,43 @@ cet_make_library( SOURCE -src/DbEngine.cc -src/DbIdList.cc -src/DbReader.cc -src/DbService_service.cc -src/DbSql.cc -src/DbTool.cc -src/dbTool_main.cc -src/DbValTool.cc -src/EpicsTool.cc -src/epicsTool_main.cc -LIBRARIES PUBLIC -cetlib::cetlib + src/DbEngine.cc + src/DbIdList.cc + src/DbReader.cc + src/DbSql.cc + src/DbTool.cc + src/DbValTool.cc + src/EpicsTool.cc + LIBRARIES PUBLIC + PostgreSQL::PostgreSQL + CURL::libcurl + offline::ConfigTools + offline::DbTables + offline::GeneralUtilities ) -cet_build_plugin(DbServiceTest art::module REG_SOURCE src/DbServiceTest_module.cc) +cet_make_exec(NAME dbTool + SOURCE src/dbTool_main.cc + LIBRARIES offline::DbService +) + +cet_make_exec(NAME epicsTool + SOURCE src/epicsTool_main.cc + LIBRARIES + offline::DbService + Boost::program_options +) +cet_build_plugin(DbService art::service + REG_SOURCE src/DbService_service.cc + LIBRARIES REG + offline::DbService +) + +cet_build_plugin(DbServiceTest art::module + REG_SOURCE src/DbServiceTest_module.cc + LIBRARIES REG + offline::DbService +) install_source(SUBDIRS src) install_headers(SUBDIRS inc) diff --git a/DbTables/CMakeLists.txt b/DbTables/CMakeLists.txt index c34581589e..3b68b462f2 100644 --- a/DbTables/CMakeLists.txt +++ b/DbTables/CMakeLists.txt @@ -1,16 +1,17 @@ cet_make_library( SOURCE -src/DbCache.cc -src/DbIoV.cc -src/DbSet.cc -src/DbTable.cc -src/DbTableFactory.cc -src/DbUtil.cc -src/DbValCache.cc -LIBRARIES PUBLIC -cetlib::cetlib + src/DbCache.cc + src/DbIoV.cc + src/DbSet.cc + src/DbTable.cc + src/DbTableFactory.cc + src/DbUtil.cc + src/DbValCache.cc + LIBRARIES PUBLIC + + offline::DataProducts + offline::GeneralUtilities ) - install_source(SUBDIRS src) install_headers(SUBDIRS inc) diff --git a/DetectorSolenoidGeom/CMakeLists.txt b/DetectorSolenoidGeom/CMakeLists.txt index 84714ce49a..092eaaf578 100644 --- a/DetectorSolenoidGeom/CMakeLists.txt +++ b/DetectorSolenoidGeom/CMakeLists.txt @@ -1,10 +1,11 @@ cet_make_library( SOURCE -src/DetectorSolenoid.cc -LIBRARIES PUBLIC -cetlib::cetlib + src/DetectorSolenoid.cc + LIBRARIES PUBLIC + + offline::GeomPrimitives + offline::Mu2eInterfaces ) - install_source(SUBDIRS src) install_headers(SUBDIRS inc) diff --git a/EventDisplay/CMakeLists.txt b/EventDisplay/CMakeLists.txt index 939888de21..fb57269d3b 100644 --- a/EventDisplay/CMakeLists.txt +++ b/EventDisplay/CMakeLists.txt @@ -1,15 +1,39 @@ cet_make_library( SOURCE -src/ContentSelector.cc -src/DataInterface.cc -src/EventDisplayFrame.cc -src/TrackColorSelector.cc -LIBRARIES PUBLIC -cetlib::cetlib + src/ContentSelector.cc + src/DataInterface.cc + src/EventDisplayFrame.cc + src/TrackColorSelector.cc + LIBRARIES PUBLIC + + offline::BTrkData + offline::CalorimeterGeom + offline::ConfigTools + offline::CosmicRayShieldGeom + offline::CRVConditions + offline::DataProducts + offline::DetectorSolenoidGeom + offline::GeometryService + offline::GlobalConstantsService + offline::MCDataProducts + offline::Mu2eUtilities + offline::RecoDataProducts + offline::StoppingTargetGeom + offline::TrackerGeom + offline::TrkReco ) -cet_build_plugin(EventDisplay art::module REG_SOURCE src/EventDisplay_module.cc) +cet_build_plugin(EventDisplay art::module + REG_SOURCE src/EventDisplay_module.cc + LIBRARIES REG +) +art_dictionary( + CLASSES_DEF_XML ${CMAKE_CURRENT_SOURCE_DIR}/src/classes_def.xml + CLASSES_H ${CMAKE_CURRENT_SOURCE_DIR}/src/classes.h + DICTIONARY_LIBRARIES + offline::EventDisplay +) install_source(SUBDIRS src) install_fhicl(SUBDIRS fcl SUBDIRNAME EventDisplay) diff --git a/EventGenerator/CMakeLists.txt b/EventGenerator/CMakeLists.txt index 681c1897ea..801536443b 100644 --- a/EventGenerator/CMakeLists.txt +++ b/EventGenerator/CMakeLists.txt @@ -1,100 +1,223 @@ cet_make_library( SOURCE -src/CosmicCRY.cc -src/CosmicDYB.cc -src/CosmicFromTH2.cc -src/DIOGenerator_tool.cc -src/DYBGenerator.cc -src/ExtMonFNALGunImpl.cc -src/FromG4BLFile.cc -src/MuCap1809keVGammaGenerator_tool.cc -src/MuCapDeuteronGenerator_tool.cc -src/MuCapNeutronGenerator_tool.cc -src/MuCapPhotonGenerator_tool.cc -src/MuCapProtonGenerator_tool.cc -src/MuplusMichelGenerator_tool.cc -src/ParticleGun.cc -src/ParticleGunImpl.cc -src/PiCaptureEffects.cc -src/PrimaryProtonGunImpl.cc -LIBRARIES PUBLIC -cetlib::cetlib + src/CosmicCRY.cc + src/CosmicDYB.cc + src/CosmicFromTH2.cc + src/DIOGenerator_tool.cc + src/DYBGenerator.cc + src/ExtMonFNALGunImpl.cc + src/FromG4BLFile.cc + src/MuCap1809keVGammaGenerator_tool.cc + src/MuCapDeuteronGenerator_tool.cc + src/MuCapNeutronGenerator_tool.cc + src/MuCapPhotonGenerator_tool.cc + src/MuCapProtonGenerator_tool.cc + src/MuplusMichelGenerator_tool.cc + src/ParticleGun.cc + src/ParticleGunImpl.cc + src/PiCaptureEffects.cc + src/PrimaryProtonGunImpl.cc + LIBRARIES PUBLIC + + offline::CalorimeterGeom + offline::ConditionsService + offline::ConfigTools + offline::DataProducts + offline::ExtinctionMonitorFNAL_Geometry + offline::GeneralUtilities + offline::GeometryService + offline::GlobalConstantsService + offline::MCDataProducts + offline::Mu2eUtilities + offline::ProductionTargetGeom + offline::SeedService + offline::StoppingTargetGeom ) -cet_build_plugin(AntiProtonGun art::module REG_SOURCE src/AntiProtonGun_module.cc) - -cet_build_plugin(CaloCalibGun art::module REG_SOURCE src/CaloCalibGun_module.cc) +cet_build_plugin(AntiProtonGun art::module + REG_SOURCE src/AntiProtonGun_module.cc + LIBRARIES REG +) -cet_build_plugin(CaloTBGun art::module REG_SOURCE src/CaloTBGun_module.cc) +cet_build_plugin(CaloCalibGun art::module + REG_SOURCE src/CaloCalibGun_module.cc + LIBRARIES REG +) -cet_build_plugin(CeEndpoint art::module REG_SOURCE src/CeEndpoint_module.cc) +cet_build_plugin(CaloTBGun art::module + REG_SOURCE src/CaloTBGun_module.cc + LIBRARIES REG +) -cet_build_plugin(CORSIKAEventGenerator art::module REG_SOURCE src/CORSIKAEventGenerator_module.cc) +cet_build_plugin(CeEndpoint art::module + REG_SOURCE src/CeEndpoint_module.cc + LIBRARIES REG +) -cet_build_plugin(CRYEventGenerator art::module REG_SOURCE src/CRYEventGenerator_module.cc) +cet_build_plugin(CORSIKAEventGenerator art::module + REG_SOURCE src/CORSIKAEventGenerator_module.cc + LIBRARIES REG +) -cet_build_plugin(CryResampler art::module REG_SOURCE src/CryResampler_module.cc) +cet_build_plugin(CRYEventGenerator art::module + REG_SOURCE src/CRYEventGenerator_module.cc + LIBRARIES REG +) -cet_build_plugin(DecayInOrbitWeight art::module REG_SOURCE src/DecayInOrbitWeight_module.cc) +cet_build_plugin(CryResampler art::module + REG_SOURCE src/CryResampler_module.cc + LIBRARIES REG +) -cet_build_plugin(EplusFromStoppedPion art::module REG_SOURCE src/EplusFromStoppedPion_module.cc) +cet_build_plugin(DecayInOrbitWeight art::module + REG_SOURCE src/DecayInOrbitWeight_module.cc + LIBRARIES REG +) -cet_build_plugin(EventGenerator art::module REG_SOURCE src/EventGenerator_module.cc) +cet_build_plugin(EplusFromStoppedPion art::module + REG_SOURCE src/EplusFromStoppedPion_module.cc + LIBRARIES REG +) -cet_build_plugin(ExtMonFNALBoxGenerator art::module REG_SOURCE src/ExtMonFNALBoxGenerator_module.cc) +cet_build_plugin(EventGenerator art::module + REG_SOURCE src/EventGenerator_module.cc + LIBRARIES REG +) -cet_build_plugin(ExtMonFNALGun art::module REG_SOURCE src/ExtMonFNALGun_module.cc) +cet_build_plugin(ExtMonFNALBoxGenerator art::module + REG_SOURCE src/ExtMonFNALBoxGenerator_module.cc + LIBRARIES REG +) -cet_build_plugin(ExtMonFNALRoomGenerator art::module REG_SOURCE src/ExtMonFNALRoomGenerator_module.cc) +cet_build_plugin(ExtMonFNALGun art::module + REG_SOURCE src/ExtMonFNALGun_module.cc + LIBRARIES REG +) -cet_build_plugin(FlatMuonDaughterGenerator art::module REG_SOURCE src/FlatMuonDaughterGenerator_module.cc) +cet_build_plugin(ExtMonFNALRoomGenerator art::module + REG_SOURCE src/ExtMonFNALRoomGenerator_module.cc + LIBRARIES REG +) -cet_build_plugin(FromAsciiMomentumAndPosition art::module REG_SOURCE src/FromAsciiMomentumAndPosition_module.cc) +cet_build_plugin(FlatMuonDaughterGenerator art::module + REG_SOURCE src/FlatMuonDaughterGenerator_module.cc + LIBRARIES REG +) -cet_build_plugin(FromSimParticleCompact art::module REG_SOURCE src/FromSimParticleCompact_module.cc) +cet_build_plugin(FromAsciiMomentumAndPosition art::module + REG_SOURCE src/FromAsciiMomentumAndPosition_module.cc + LIBRARIES REG +) -cet_build_plugin(FromStepPointMCs art::module REG_SOURCE src/FromStepPointMCs_module.cc) +cet_build_plugin(FromSimParticleCompact art::module + REG_SOURCE src/FromSimParticleCompact_module.cc + LIBRARIES REG +) -cet_build_plugin(FromStepPointMCsRotateTarget art::module REG_SOURCE src/FromStepPointMCsRotateTarget_module.cc) +cet_build_plugin(FromStepPointMCs art::module + REG_SOURCE src/FromStepPointMCs_module.cc + LIBRARIES REG +) -cet_build_plugin(G4BeamlineGenerator art::module REG_SOURCE src/G4BeamlineGenerator_module.cc) +cet_build_plugin(FromStepPointMCsRotateTarget art::module + REG_SOURCE src/FromStepPointMCsRotateTarget_module.cc + LIBRARIES REG +) -cet_build_plugin(GeneratorPlots art::module REG_SOURCE src/GeneratorPlots_module.cc) +cet_build_plugin(G4BeamlineGenerator art::module + REG_SOURCE src/G4BeamlineGenerator_module.cc + LIBRARIES REG +) -cet_build_plugin(GenEventCounter art::module REG_SOURCE src/GenEventCounter_module.cc) +cet_build_plugin(GeneratorPlots art::module + REG_SOURCE src/GeneratorPlots_module.cc + LIBRARIES REG +) -cet_build_plugin(InFlightParticleSampler art::module REG_SOURCE src/InFlightParticleSampler_module.cc) +cet_build_plugin(GenEventCounter art::module + REG_SOURCE src/GenEventCounter_module.cc + LIBRARIES REG +) -cet_build_plugin(LeadingLog art::module REG_SOURCE src/LeadingLog_module.cc) +cet_build_plugin(InFlightParticleSampler art::module + REG_SOURCE src/InFlightParticleSampler_module.cc + LIBRARIES REG +) -cet_build_plugin(MuStopProductsGun art::module REG_SOURCE src/MuStopProductsGun_module.cc) +cet_build_plugin(LeadingLog art::module + REG_SOURCE src/LeadingLog_module.cc + LIBRARIES REG +) -cet_build_plugin(PBIWeight art::module REG_SOURCE src/PBIWeight_module.cc) +cet_build_plugin(MuStopProductsGun art::module + REG_SOURCE src/MuStopProductsGun_module.cc + LIBRARIES REG +) -cet_build_plugin(Pileup art::module REG_SOURCE src/Pileup_module.cc) +cet_build_plugin(PBIWeight art::module + REG_SOURCE src/PBIWeight_module.cc + LIBRARIES REG +) -cet_build_plugin(PrimaryAntiProtonGun art::module REG_SOURCE src/PrimaryAntiProtonGun_module.cc) +cet_build_plugin(Pileup art::module + REG_SOURCE src/Pileup_module.cc + LIBRARIES REG +) -cet_build_plugin(PrimaryProtonGun art::module REG_SOURCE src/PrimaryProtonGun_module.cc) +cet_build_plugin(PrimaryAntiProtonGun art::module + REG_SOURCE src/PrimaryAntiProtonGun_module.cc + LIBRARIES REG +) -cet_build_plugin(RanTest art::module REG_SOURCE src/RanTest_module.cc) +cet_build_plugin(PrimaryProtonGun art::module + REG_SOURCE src/PrimaryProtonGun_module.cc + LIBRARIES REG +) -cet_build_plugin(RMCGun art::module REG_SOURCE src/RMCGun_module.cc) +cet_build_plugin(RanTest art::module + REG_SOURCE src/RanTest_module.cc + LIBRARIES REG +) -cet_build_plugin(RPCGun art::module REG_SOURCE src/RPCGun_module.cc) +cet_build_plugin(RMCGun art::module + REG_SOURCE src/RMCGun_module.cc + LIBRARIES REG +) -cet_build_plugin(SingleProcessGenerator art::module REG_SOURCE src/SingleProcessGenerator_module.cc) +cet_build_plugin(RPCGun art::module + REG_SOURCE src/RPCGun_module.cc + LIBRARIES REG +) -cet_build_plugin(StoppedMuonRMCGun art::module REG_SOURCE src/StoppedMuonRMCGun_module.cc) +cet_build_plugin(SingleProcessGenerator art::module + REG_SOURCE src/SingleProcessGenerator_module.cc + LIBRARIES REG +) -cet_build_plugin(StoppedMuonXRayGammaRayGun art::module REG_SOURCE src/StoppedMuonXRayGammaRayGun_module.cc) +cet_build_plugin(StoppedMuonRMCGun art::module + REG_SOURCE src/StoppedMuonRMCGun_module.cc + LIBRARIES REG +) -cet_build_plugin(StoppedMuplusDecayGun art::module REG_SOURCE src/StoppedMuplusDecayGun_module.cc) +cet_build_plugin(StoppedMuonXRayGammaRayGun art::module + REG_SOURCE src/StoppedMuonXRayGammaRayGun_module.cc + LIBRARIES REG +) -cet_build_plugin(StoppedParticleG4Gun art::module REG_SOURCE src/StoppedParticleG4Gun_module.cc) +cet_build_plugin(StoppedMuplusDecayGun art::module + REG_SOURCE src/StoppedMuplusDecayGun_module.cc + LIBRARIES REG +) -cet_build_plugin(StoppedParticleReactionGun art::module REG_SOURCE src/StoppedParticleReactionGun_module.cc) +cet_build_plugin(StoppedParticleG4Gun art::module + REG_SOURCE src/StoppedParticleG4Gun_module.cc + LIBRARIES REG +) +cet_build_plugin(StoppedParticleReactionGun art::module + REG_SOURCE src/StoppedParticleReactionGun_module.cc + LIBRARIES REG +) install_source(SUBDIRS src) install_headers(SUBDIRS inc) diff --git a/EventMixing/CMakeLists.txt b/EventMixing/CMakeLists.txt index 0f3573d5f4..1c61623c3b 100644 --- a/EventMixing/CMakeLists.txt +++ b/EventMixing/CMakeLists.txt @@ -1,18 +1,30 @@ cet_make_library( SOURCE -src/Mu2eProductMixer.cc -LIBRARIES PUBLIC -cetlib::cetlib + src/Mu2eProductMixer.cc + LIBRARIES PUBLIC + + offline::MCDataProducts ) -cet_build_plugin(MixBackgroundFrames art::module REG_SOURCE src/MixBackgroundFrames_module.cc) - -cet_build_plugin(ProtonBunchIntensityFlat art::module REG_SOURCE src/ProtonBunchIntensityFlat_module.cc) +cet_build_plugin(MixBackgroundFrames art::module + REG_SOURCE src/MixBackgroundFrames_module.cc + LIBRARIES REG +) -cet_build_plugin(ProtonBunchIntensityLogNormal art::module REG_SOURCE src/ProtonBunchIntensityLogNormal_module.cc) +cet_build_plugin(ProtonBunchIntensityFlat art::module + REG_SOURCE src/ProtonBunchIntensityFlat_module.cc + LIBRARIES REG +) -cet_build_plugin(ResamplingMixer art::module REG_SOURCE src/ResamplingMixer_module.cc) +cet_build_plugin(ProtonBunchIntensityLogNormal art::module + REG_SOURCE src/ProtonBunchIntensityLogNormal_module.cc + LIBRARIES REG +) +cet_build_plugin(ResamplingMixer art::module + REG_SOURCE src/ResamplingMixer_module.cc + LIBRARIES REG +) install_source(SUBDIRS src) install_headers(SUBDIRS inc) diff --git a/ExternalShieldingGeom/CMakeLists.txt b/ExternalShieldingGeom/CMakeLists.txt index e46d4d92a8..7a56909c5f 100644 --- a/ExternalShieldingGeom/CMakeLists.txt +++ b/ExternalShieldingGeom/CMakeLists.txt @@ -1,12 +1,12 @@ cet_make_library( SOURCE -src/ExtShieldDownstream.cc -src/ExtShieldUpstream.cc -src/Saddle.cc -LIBRARIES PUBLIC -cetlib::cetlib + src/ExtShieldDownstream.cc + src/ExtShieldUpstream.cc + src/Saddle.cc + LIBRARIES PUBLIC + + offline::Mu2eInterfaces ) - install_source(SUBDIRS src) install_headers(SUBDIRS inc) diff --git a/ExtinctionMonitorFNAL/Analyses/CMakeLists.txt b/ExtinctionMonitorFNAL/Analyses/CMakeLists.txt new file mode 100644 index 0000000000..2ed7c14af3 --- /dev/null +++ b/ExtinctionMonitorFNAL/Analyses/CMakeLists.txt @@ -0,0 +1,131 @@ +cet_make_library( + SOURCE + src/EMFPatRecEffHistograms.cc + src/EMFPatRecFakeHistograms.cc + src/EMFRawHitHistograms.cc + src/EMFRecoClusterHistograms.cc + src/EMFSimHitHistograms.cc + LIBRARIES PUBLIC + + offline::ConditionsService + offline::DataProducts + offline::MCDataProducts + offline::RecoDataProducts + art_root_io::TFileService_service + ROOT::Hist +) + +cet_build_plugin(EMFBoxFluxAnalyzer art::module + REG_SOURCE src/EMFBoxFluxAnalyzer_module.cc + LIBRARIES REG + offline::ExtinctionMonitorFNAL_Analyses + offline::ExtinctionMonitorFNAL_Utilities + ROOT::Tree +) + +cet_build_plugin(EMFBoxMuonAnalyzer art::module + REG_SOURCE src/EMFBoxMuonAnalyzer_module.cc + LIBRARIES REG + offline::ExtinctionMonitorFNAL_Analyses + ROOT::Tree +) + +cet_build_plugin(EMFDetHistPatRec art::module + REG_SOURCE src/EMFDetHistPatRec_module.cc + LIBRARIES REG + offline::ExtinctionMonitorFNAL_Analyses +) + +cet_build_plugin(EMFDetHistRawHits art::module + REG_SOURCE src/EMFDetHistRawHits_module.cc + LIBRARIES REG + offline::ExtinctionMonitorFNAL_Analyses +) + +cet_build_plugin(EMFDetHistRecoClusters art::module + REG_SOURCE src/EMFDetHistRecoClusters_module.cc + LIBRARIES REG + offline::ExtinctionMonitorFNAL_Analyses +) + +cet_build_plugin(EMFDetHistSimHits art::module + REG_SOURCE src/EMFDetHistSimHits_module.cc + LIBRARIES REG + offline::ExtinctionMonitorFNAL_Analyses +) + +cet_build_plugin(EMFDetMCHistPatRec art::module + REG_SOURCE src/EMFDetMCHistPatRec_module.cc + LIBRARIES REG + offline::ExtinctionMonitorFNAL_Analyses + offline::ExtinctionMonitorFNAL_Reconstruction +) + +cet_build_plugin(EMFDetPrintRawClusters art::module + REG_SOURCE src/EMFDetPrintRawClusters_module.cc + LIBRARIES REG + offline::ExtinctionMonitorFNAL_Analyses +) + +cet_build_plugin(EMFDetPrintRawHits art::module + REG_SOURCE src/EMFDetPrintRawHits_module.cc + LIBRARIES REG + offline::ExtinctionMonitorFNAL_Analyses +) + +cet_build_plugin(EMFDetPrintRawHitTruth art::module + REG_SOURCE src/EMFDetPrintRawHitTruth_module.cc + LIBRARIES REG + offline::ExtinctionMonitorFNAL_Analyses +) + +cet_build_plugin(EMFDetPrintRecoClusters art::module + REG_SOURCE src/EMFDetPrintRecoClusters_module.cc + LIBRARIES REG + offline::ExtinctionMonitorFNAL_Analyses +) + +cet_build_plugin(EMFDetPrintRecoClusterTruth art::module + REG_SOURCE src/EMFDetPrintRecoClusterTruth_module.cc + LIBRARIES REG + offline::ExtinctionMonitorFNAL_Analyses +) + +cet_build_plugin(EMFDetPrintSim art::module + REG_SOURCE src/EMFDetPrintSim_module.cc + LIBRARIES REG + offline::ExtinctionMonitorFNAL_Analyses +) + +cet_build_plugin(EMFDigiTuning art::module + REG_SOURCE src/EMFDigiTuning_module.cc + LIBRARIES REG + offline::ExtinctionMonitorFNAL_Analyses +) + +cet_build_plugin(EMFRawHitsValidator art::module + REG_SOURCE src/EMFRawHitsValidator_module.cc + LIBRARIES REG + offline::ExtinctionMonitorFNAL_Analyses +) + +cet_build_plugin(EMFRoomFluxAnalyzer art::module + REG_SOURCE src/EMFRoomFluxAnalyzer_module.cc + LIBRARIES REG + offline::ExtinctionMonitorFNAL_Analyses +) + +cet_build_plugin(MARSGenParticleDumper art::module + REG_SOURCE src/MARSGenParticleDumper_module.cc + LIBRARIES REG + offline::ExtinctionMonitorFNAL_Analyses +) + +cet_build_plugin(MARSGenParticleHist art::module + REG_SOURCE src/MARSGenParticleHist_module.cc + LIBRARIES REG + offline::ExtinctionMonitorFNAL_Analyses +) + +install_source(SUBDIRS src) +install_headers(SUBDIRS inc) diff --git a/ExtinctionMonitorFNAL/CMakeLists.txt b/ExtinctionMonitorFNAL/CMakeLists.txt index 9a2ebc60e4..a1135e8f0e 100644 --- a/ExtinctionMonitorFNAL/CMakeLists.txt +++ b/ExtinctionMonitorFNAL/CMakeLists.txt @@ -1 +1,9 @@ +add_subdirectory(Analyses) +add_subdirectory(ComponentTests) +add_subdirectory(Digitization) +add_subdirectory(Geometry) +add_subdirectory(Reconstruction) +add_subdirectory(TruthAlgs) +add_subdirectory(Utilities) + install_fhicl(SUBDIRS fcl SUBDIRNAME ExtinctionMonitorFNAL) diff --git a/ExtinctionMonitorFNAL/ComponentTests/CMakeLists.txt b/ExtinctionMonitorFNAL/ComponentTests/CMakeLists.txt new file mode 100644 index 0000000000..88309b75a0 --- /dev/null +++ b/ExtinctionMonitorFNAL/ComponentTests/CMakeLists.txt @@ -0,0 +1,18 @@ +cet_build_plugin(PixelIdConverterTest art::module + REG_SOURCE src/PixelIdConverterTest_module.cc + LIBRARIES REG +) + +cet_build_plugin(TrackExtrapolatorTest2 art::module + REG_SOURCE src/TrackExtrapolatorTest2_module.cc + LIBRARIES REG + offline::MCDataProducts + art_root_io::TFileService_service +) + +cet_build_plugin(TrackExtrapolatorTest art::module + REG_SOURCE src/TrackExtrapolatorTest_module.cc + LIBRARIES REG +) + +install_source(SUBDIRS src) diff --git a/ExtinctionMonitorFNAL/Digitization/CMakeLists.txt b/ExtinctionMonitorFNAL/Digitization/CMakeLists.txt new file mode 100644 index 0000000000..870db31577 --- /dev/null +++ b/ExtinctionMonitorFNAL/Digitization/CMakeLists.txt @@ -0,0 +1,24 @@ +cet_make_library( + SOURCE + src/PixelNoise.cc + src/PixelToTCircuit.cc + src/ProtonPulseShape.cc + src/SiliconProperties.cc + LIBRARIES PUBLIC + + offline::ConditionsService + offline::DataProducts + offline::GeometryService + offline::MCDataProducts + offline::Mu2eUtilities + offline::RecoDataProducts +) + +cet_build_plugin(ExtMonFNALHitMaker art::module + REG_SOURCE src/ExtMonFNALHitMaker_module.cc + LIBRARIES REG + offline::ExtinctionMonitorFNAL_Digitization +) + +install_source(SUBDIRS src) +install_headers(SUBDIRS inc) diff --git a/ExtinctionMonitorFNAL/Geometry/CMakeLists.txt b/ExtinctionMonitorFNAL/Geometry/CMakeLists.txt new file mode 100644 index 0000000000..77c722511b --- /dev/null +++ b/ExtinctionMonitorFNAL/Geometry/CMakeLists.txt @@ -0,0 +1,21 @@ +cet_make_library( + SOURCE + src/ExtMonFNALBuilding.cc + src/ExtMonFNAL.cc + src/ExtMonFNALMagnet.cc + src/ExtMonFNALModule.cc + src/ExtMonFNALModuleIdConverter.cc + src/ExtMonFNALMuonID.cc + src/ExtMonFNALPixelChip.cc + src/ExtMonFNALPixelIdConverter.cc + src/ExtMonFNALPlane.cc + src/ExtMonFNALPlaneStack.cc + src/PixelNeighbors.cc + LIBRARIES PUBLIC + + offline::DataProducts + offline::Mu2eInterfaces +) + +install_source(SUBDIRS src) +install_headers(SUBDIRS inc) diff --git a/ExtinctionMonitorFNAL/Reconstruction/CMakeLists.txt b/ExtinctionMonitorFNAL/Reconstruction/CMakeLists.txt new file mode 100644 index 0000000000..2643ab5747 --- /dev/null +++ b/ExtinctionMonitorFNAL/Reconstruction/CMakeLists.txt @@ -0,0 +1,38 @@ +cet_make_library( + SOURCE + src/ClusterOnTrackPrecisionTool.cc + src/LinearRegression.cc + src/PixelHitLookup.cc + src/PixelRecoUtils.cc + src/TrackExtrapolator.cc + LIBRARIES PUBLIC + + offline::RecoDataProducts +) + +cet_build_plugin(EMFPatRecFromTracklets art::module + REG_SOURCE src/EMFPatRecFromTracklets_module.cc + LIBRARIES REG + offline::ExtinctionMonitorFNAL_Reconstruction +) + +cet_build_plugin(EMFTrackClusterArbiter art::module + REG_SOURCE src/EMFTrackClusterArbiter_module.cc + LIBRARIES REG + offline::ExtinctionMonitorFNAL_Reconstruction +) + +cet_build_plugin(ExtMonFNALRawClusterization art::module + REG_SOURCE src/ExtMonFNALRawClusterization_module.cc + LIBRARIES REG + offline::ExtinctionMonitorFNAL_Reconstruction +) + +cet_build_plugin(ExtMonFNALRecoClusterization art::module + REG_SOURCE src/ExtMonFNALRecoClusterization_module.cc + LIBRARIES REG + offline::ExtinctionMonitorFNAL_Reconstruction +) + +install_source(SUBDIRS src) +install_headers(SUBDIRS inc) diff --git a/ExtinctionMonitorFNAL/TruthAlgs/CMakeLists.txt b/ExtinctionMonitorFNAL/TruthAlgs/CMakeLists.txt new file mode 100644 index 0000000000..3a8181d3e0 --- /dev/null +++ b/ExtinctionMonitorFNAL/TruthAlgs/CMakeLists.txt @@ -0,0 +1,19 @@ +cet_build_plugin(PatRecTruthMaker art::module + REG_SOURCE src/PatRecTruthMaker_module.cc + LIBRARIES REG + offline::MCDataProducts +) + +cet_build_plugin(RecoClusterTruthMaker art::module + REG_SOURCE src/RecoClusterTruthMaker_module.cc + LIBRARIES REG + offline::MCDataProducts +) + +cet_build_plugin(SimParticleMARSAssnsMaker art::module + REG_SOURCE src/SimParticleMARSAssnsMaker_module.cc + LIBRARIES REG + offline::MCDataProducts +) + +install_source(SUBDIRS src) diff --git a/ExtinctionMonitorFNAL/Utilities/CMakeLists.txt b/ExtinctionMonitorFNAL/Utilities/CMakeLists.txt new file mode 100644 index 0000000000..96eb96cd4b --- /dev/null +++ b/ExtinctionMonitorFNAL/Utilities/CMakeLists.txt @@ -0,0 +1,15 @@ +cet_make_library( + SOURCE + src/EMFRandomizationParticleDefs.cc + src/EMFRandomizationSourceDefs.cc + src/getCharge.cc + LIBRARIES PUBLIC + + offline::DataProducts + offline::GlobalConstantsService + offline::MCDataProducts + offline::ProtonBeamDumpGeom +) + +install_source(SUBDIRS src) +install_headers(SUBDIRS inc) diff --git a/Filters/CMakeLists.txt b/Filters/CMakeLists.txt index a277133424..6d61e07cb6 100644 --- a/Filters/CMakeLists.txt +++ b/Filters/CMakeLists.txt @@ -1,79 +1,192 @@ -cet_build_plugin(BunchIntensityFilter art::module REG_SOURCE src/BunchIntensityFilter_module.cc) - -cet_build_plugin(CaloShowerSimFilter art::module REG_SOURCE src/CaloShowerSimFilter_module.cc) - -cet_build_plugin(ChooseTrackFilter art::module REG_SOURCE src/ChooseTrackFilter_module.cc) - -cet_build_plugin(CompressPhysicalVolumes art::module REG_SOURCE src/CompressPhysicalVolumes_module.cc) - -cet_build_plugin(CompressStepPointMCs art::module REG_SOURCE src/CompressStepPointMCs_module.cc) - -cet_build_plugin(CosmicMixingFilter art::module REG_SOURCE src/CosmicMixingFilter_module.cc) - -cet_build_plugin(DetectorStepFilter art::module REG_SOURCE src/DetectorStepFilter_module.cc) - -cet_build_plugin(EMFBoxHitsFilter art::module REG_SOURCE src/EMFBoxHitsFilter_module.cc) - -cet_build_plugin(EMFPixelHitsFilter art::module REG_SOURCE src/EMFPixelHitsFilter_module.cc) - -cet_build_plugin(EMFPixelSimFilter art::module REG_SOURCE src/EMFPixelSimFilter_module.cc) - -cet_build_plugin(FilterCosmicsStage1 art::module REG_SOURCE src/FilterCosmicsStage1_module.cc) - -cet_build_plugin(FilterG4Out art::module REG_SOURCE src/FilterG4Out_module.cc) - -cet_build_plugin(FilterStatusG4 art::module REG_SOURCE src/FilterStatusG4_module.cc) - -cet_build_plugin(FilterStepPointAngleVsTarget art::module REG_SOURCE src/FilterStepPointAngleVsTarget_module.cc) - -cet_build_plugin(FilterStepPointKinEnPDG art::module REG_SOURCE src/FilterStepPointKinEnPDG_module.cc) - -cet_build_plugin(FilterStepPointMomentum art::module REG_SOURCE src/FilterStepPointMomentum_module.cc) - -cet_build_plugin(FilterStepPointPDG art::module REG_SOURCE src/FilterStepPointPDG_module.cc) - -cet_build_plugin(FilterStepPointPositionMomentum art::module REG_SOURCE src/FilterStepPointPositionMomentum_module.cc) - -cet_build_plugin(FilterStepPointPzVsTarget art::module REG_SOURCE src/FilterStepPointPzVsTarget_module.cc) - -cet_build_plugin(FilterStepPointReflection art::module REG_SOURCE src/FilterStepPointReflection_module.cc) - -cet_build_plugin(GenParticleMomFilter art::module REG_SOURCE src/GenParticleMomFilter_module.cc) - -cet_build_plugin(KilledEventFilter art::module REG_SOURCE src/KilledEventFilter_module.cc) - -cet_build_plugin(ParticleCodeFilter art::module REG_SOURCE src/ParticleCodeFilter_module.cc) - -cet_build_plugin(RandomPrescaleFilter art::module REG_SOURCE src/RandomPrescaleFilter_module.cc) - -cet_build_plugin(RecoMomFilter art::module REG_SOURCE src/RecoMomFilter_module.cc) - -cet_build_plugin(SelectEvents art::module REG_SOURCE src/SelectEvents_module.cc) - -cet_build_plugin(SelectStepPointsByTime art::module REG_SOURCE src/SelectStepPointsByTime_module.cc) - -cet_build_plugin(StepPointFilter art::module REG_SOURCE src/StepPointFilter_module.cc) - -cet_build_plugin(StepPointMCCollectionUpdater art::module REG_SOURCE src/StepPointMCCollectionUpdater_module.cc) - -cet_build_plugin(StepPointsInDigis art::module REG_SOURCE src/StepPointsInDigis_module.cc) - -cet_build_plugin(StrawDigiMCFilter art::module REG_SOURCE src/StrawDigiMCFilter_module.cc) - -cet_build_plugin(TrackerStepPointFilter art::module REG_SOURCE src/TrackerStepPointFilter_module.cc) - -cet_build_plugin(TrackSummaryTruthUpdater art::module REG_SOURCE src/TrackSummaryTruthUpdater_module.cc) - -cet_build_plugin(TriggerResultsFilter art::module REG_SOURCE src/TriggerResultsFilter_module.cc) - -cet_build_plugin(TrkPatRecFilter art::module REG_SOURCE src/TrkPatRecFilter_module.cc) - -cet_build_plugin(TrkQualFilter art::module REG_SOURCE src/TrkQualFilter_module.cc) - -cet_build_plugin(VetoIncorrectHits art::module REG_SOURCE src/VetoIncorrectHits_module.cc) - -cet_build_plugin(WeightSamplingFilter art::module REG_SOURCE src/WeightSamplingFilter_module.cc) - +cet_build_plugin(BunchIntensityFilter art::module + REG_SOURCE src/BunchIntensityFilter_module.cc + LIBRARIES REG +) + +cet_build_plugin(CaloShowerSimFilter art::module + REG_SOURCE src/CaloShowerSimFilter_module.cc + LIBRARIES REG +) + +cet_build_plugin(ChooseTrackFilter art::module + REG_SOURCE src/ChooseTrackFilter_module.cc + LIBRARIES REG +) + +cet_build_plugin(CompressPhysicalVolumes art::module + REG_SOURCE src/CompressPhysicalVolumes_module.cc + LIBRARIES REG +) + +cet_build_plugin(CompressStepPointMCs art::module + REG_SOURCE src/CompressStepPointMCs_module.cc + LIBRARIES REG +) + +cet_build_plugin(CosmicMixingFilter art::module + REG_SOURCE src/CosmicMixingFilter_module.cc + LIBRARIES REG +) + +cet_build_plugin(DetectorStepFilter art::module + REG_SOURCE src/DetectorStepFilter_module.cc + LIBRARIES REG +) + +cet_build_plugin(EMFBoxHitsFilter art::module + REG_SOURCE src/EMFBoxHitsFilter_module.cc + LIBRARIES REG +) + +cet_build_plugin(EMFPixelHitsFilter art::module + REG_SOURCE src/EMFPixelHitsFilter_module.cc + LIBRARIES REG +) + +cet_build_plugin(EMFPixelSimFilter art::module + REG_SOURCE src/EMFPixelSimFilter_module.cc + LIBRARIES REG +) + +cet_build_plugin(FilterCosmicsStage1 art::module + REG_SOURCE src/FilterCosmicsStage1_module.cc + LIBRARIES REG +) + +cet_build_plugin(FilterG4Out art::module + REG_SOURCE src/FilterG4Out_module.cc + LIBRARIES REG +) + +cet_build_plugin(FilterStatusG4 art::module + REG_SOURCE src/FilterStatusG4_module.cc + LIBRARIES REG +) + +cet_build_plugin(FilterStepPointAngleVsTarget art::module + REG_SOURCE src/FilterStepPointAngleVsTarget_module.cc + LIBRARIES REG +) + +cet_build_plugin(FilterStepPointKinEnPDG art::module + REG_SOURCE src/FilterStepPointKinEnPDG_module.cc + LIBRARIES REG +) + +cet_build_plugin(FilterStepPointMomentum art::module + REG_SOURCE src/FilterStepPointMomentum_module.cc + LIBRARIES REG +) + +cet_build_plugin(FilterStepPointPDG art::module + REG_SOURCE src/FilterStepPointPDG_module.cc + LIBRARIES REG +) + +cet_build_plugin(FilterStepPointPositionMomentum art::module + REG_SOURCE src/FilterStepPointPositionMomentum_module.cc + LIBRARIES REG +) + +cet_build_plugin(FilterStepPointPzVsTarget art::module + REG_SOURCE src/FilterStepPointPzVsTarget_module.cc + LIBRARIES REG +) + +cet_build_plugin(FilterStepPointReflection art::module + REG_SOURCE src/FilterStepPointReflection_module.cc + LIBRARIES REG +) + +cet_build_plugin(GenParticleMomFilter art::module + REG_SOURCE src/GenParticleMomFilter_module.cc + LIBRARIES REG +) + +cet_build_plugin(KilledEventFilter art::module + REG_SOURCE src/KilledEventFilter_module.cc + LIBRARIES REG +) + +cet_build_plugin(ParticleCodeFilter art::module + REG_SOURCE src/ParticleCodeFilter_module.cc + LIBRARIES REG +) + +cet_build_plugin(RandomPrescaleFilter art::module + REG_SOURCE src/RandomPrescaleFilter_module.cc + LIBRARIES REG +) + +cet_build_plugin(RecoMomFilter art::module + REG_SOURCE src/RecoMomFilter_module.cc + LIBRARIES REG +) + +cet_build_plugin(SelectEvents art::module + REG_SOURCE src/SelectEvents_module.cc + LIBRARIES REG +) + +cet_build_plugin(SelectStepPointsByTime art::module + REG_SOURCE src/SelectStepPointsByTime_module.cc + LIBRARIES REG +) + +cet_build_plugin(StepPointFilter art::module + REG_SOURCE src/StepPointFilter_module.cc + LIBRARIES REG +) + +cet_build_plugin(StepPointMCCollectionUpdater art::module + REG_SOURCE src/StepPointMCCollectionUpdater_module.cc + LIBRARIES REG +) + +cet_build_plugin(StepPointsInDigis art::module + REG_SOURCE src/StepPointsInDigis_module.cc + LIBRARIES REG +) + +cet_build_plugin(StrawDigiMCFilter art::module + REG_SOURCE src/StrawDigiMCFilter_module.cc + LIBRARIES REG +) + +cet_build_plugin(TrackerStepPointFilter art::module + REG_SOURCE src/TrackerStepPointFilter_module.cc + LIBRARIES REG +) + +cet_build_plugin(TrackSummaryTruthUpdater art::module + REG_SOURCE src/TrackSummaryTruthUpdater_module.cc + LIBRARIES REG +) + +cet_build_plugin(TriggerResultsFilter art::module + REG_SOURCE src/TriggerResultsFilter_module.cc + LIBRARIES REG +) + +cet_build_plugin(TrkPatRecFilter art::module + REG_SOURCE src/TrkPatRecFilter_module.cc + LIBRARIES REG +) + +cet_build_plugin(TrkQualFilter art::module + REG_SOURCE src/TrkQualFilter_module.cc + LIBRARIES REG +) + +cet_build_plugin(VetoIncorrectHits art::module + REG_SOURCE src/VetoIncorrectHits_module.cc + LIBRARIES REG +) + +cet_build_plugin(WeightSamplingFilter art::module + REG_SOURCE src/WeightSamplingFilter_module.cc + LIBRARIES REG +) install_source(SUBDIRS src) install_fhicl(SUBDIRS fcl SUBDIRNAME Filters) diff --git a/GeneralUtilities/CMakeLists.txt b/GeneralUtilities/CMakeLists.txt index e0d5116402..b41e90be26 100644 --- a/GeneralUtilities/CMakeLists.txt +++ b/GeneralUtilities/CMakeLists.txt @@ -1,38 +1,43 @@ cet_make_library( SOURCE -src/Angles.cc -src/Binning.cc -src/CombineTwoDPoints.cc -src/CsvReader.cc -src/DigitalFiltering.cc -src/HepTransform.cc -src/LinePointPCA.cc -src/LineSegmentPCA.cc -src/MinMax.cc -src/NUBinning.cc -src/OrientationResolver.cc -src/ParameterSetFromFile.cc -src/ParameterSetHelpers.cc -src/PathnameWithNextVersion.cc -src/RMS.cc -src/RootNameTitleHelper.cc -src/SplineInterpolation.cc -src/splitLine.cc -src/splitString.cc -src/sqrtOrThrow.cc -src/TimeUtility.cc -src/toHex.cc -src/to_string.cc -src/trimInPlace.cc -src/TwoBodyKinematics.cc -src/TwoDPoint.cc -src/TwoDPointTest_main.cc -src/TwoDWeight.cc -src/VMInfo.cc -LIBRARIES PUBLIC -cetlib::cetlib + src/Angles.cc + src/Binning.cc + src/CombineTwoDPoints.cc + src/CsvReader.cc + src/DigitalFiltering.cc + src/HepTransform.cc + src/LinePointPCA.cc + src/LineSegmentPCA.cc + src/MinMax.cc + src/NUBinning.cc + src/OrientationResolver.cc + src/ParameterSetFromFile.cc + src/ParameterSetHelpers.cc + src/PathnameWithNextVersion.cc + src/RMS.cc + src/RootNameTitleHelper.cc + src/SplineInterpolation.cc + src/splitLine.cc + src/splitString.cc + src/sqrtOrThrow.cc + src/TimeUtility.cc + src/toHex.cc + src/to_string.cc + src/trimInPlace.cc + src/TwoBodyKinematics.cc + src/TwoDPoint.cc + src/TwoDPointTest_main.cc + src/TwoDWeight.cc + src/VMInfo.cc + LIBRARIES PUBLIC + ROOT::MathMore + ROOT::GenVector + Boost::headers + cetlib_except::cetlib_except + CLHEP::CLHEP + fhiclcpp::fhiclcpp + canvas::canvas ) - install_source(SUBDIRS src) install_headers(SUBDIRS inc) diff --git a/GeomPrimitives/CMakeLists.txt b/GeomPrimitives/CMakeLists.txt index 869e0dfd66..3bc5c3357a 100644 --- a/GeomPrimitives/CMakeLists.txt +++ b/GeomPrimitives/CMakeLists.txt @@ -1,13 +1,14 @@ cet_make_library( SOURCE -src/PlacedTubs.cc -src/Polycone.cc -src/Polyhedra.cc -src/Tube.cc -LIBRARIES PUBLIC -cetlib::cetlib + src/PlacedTubs.cc + src/Polycone.cc + src/Polyhedra.cc + src/Tube.cc + LIBRARIES PUBLIC + Boost::headers + CLHEP::CLHEP + cetlib_except::cetlib_except ) - install_source(SUBDIRS src) install_headers(SUBDIRS inc) diff --git a/GeometryService/CMakeLists.txt b/GeometryService/CMakeLists.txt index 6ab6800da5..a89eb4d9f3 100644 --- a/GeometryService/CMakeLists.txt +++ b/GeometryService/CMakeLists.txt @@ -1,49 +1,77 @@ cet_make_library( SOURCE -src/BeamlineMaker.cc -src/BFieldConfigMaker.cc -src/BFieldManagerMaker.cc -src/CosmicRayShieldMaker.cc -src/DetectorSolenoidMaker.cc -src/DetectorSolenoidShieldingMaker.cc -src/DetectorSystemMaker.cc -src/DiskCalorimeterMaker.cc -src/ElectronicRackMaker.cc -src/ExtMonFNALBuildingMaker.cc -src/ExtMonFNALMagnetMaker.cc -src/ExtMonFNAL_Maker.cc -src/ExtMonFNALMuonIDMaker.cc -src/ExtShieldDownstreamMaker.cc -src/ExtShieldUpstreamMaker.cc -src/G4GeometryOptions.cc -src/GeometryService_service.cc -src/MBSMaker.cc -src/MECOStyleProtonAbsorberMaker.cc -src/Mu2eCoordTransform.cc -src/Mu2eEnvelope.cc -src/Mu2eHallMaker.cc -src/NotchManager.cc -src/PipeMaker.cc -src/ProductionSolenoidMaker.cc -src/ProductionTargetMaker.cc -src/ProtonBeamDumpMaker.cc -src/PSEnclosureMaker.cc -src/PSShieldMaker.cc -src/PSVacuumMaker.cc -src/PTMMaker.cc -src/SaddleMaker.cc -src/STMMaker.cc -src/StoppingTargetMaker.cc -src/TrackerMaker.cc -src/TSdAMaker.cc -src/VirtualDetector.cc -src/VirtualDetectorMaker.cc -src/WorldG4.cc -src/WorldG4Maker.cc -LIBRARIES PUBLIC -cetlib::cetlib + src/BeamlineMaker.cc + src/BFieldConfigMaker.cc + src/BFieldManagerMaker.cc + src/CosmicRayShieldMaker.cc + src/DetectorSolenoidMaker.cc + src/DetectorSolenoidShieldingMaker.cc + src/DetectorSystemMaker.cc + src/DiskCalorimeterMaker.cc + src/ElectronicRackMaker.cc + src/ExtMonFNALBuildingMaker.cc + src/ExtMonFNALMagnetMaker.cc + src/ExtMonFNAL_Maker.cc + src/ExtMonFNALMuonIDMaker.cc + src/ExtShieldDownstreamMaker.cc + src/ExtShieldUpstreamMaker.cc + src/G4GeometryOptions.cc + src/MBSMaker.cc + src/MECOStyleProtonAbsorberMaker.cc + src/Mu2eCoordTransform.cc + src/Mu2eEnvelope.cc + src/Mu2eHallMaker.cc + src/NotchManager.cc + src/PipeMaker.cc + src/ProductionSolenoidMaker.cc + src/ProductionTargetMaker.cc + src/ProtonBeamDumpMaker.cc + src/PSEnclosureMaker.cc + src/PSShieldMaker.cc + src/PSVacuumMaker.cc + src/PTMMaker.cc + src/SaddleMaker.cc + src/STMMaker.cc + src/StoppingTargetMaker.cc + src/TrackerMaker.cc + src/TSdAMaker.cc + src/VirtualDetector.cc + src/VirtualDetectorMaker.cc + src/WorldG4.cc + src/WorldG4Maker.cc + LIBRARIES PUBLIC + Boost::iostreams + offline::BeamlineGeom + offline::BFieldGeom + offline::CalorimeterGeom + offline::ConfigTools + offline::CosmicRayShieldGeom + offline::DataProducts + offline::DetectorSolenoidGeom + offline::ExternalShieldingGeom + offline::ExtinctionMonitorFNAL_Geometry + offline::GeneralUtilities + offline::GeomPrimitives + offline::GlobalConstantsService + offline::MBSGeom + offline::MECOStyleProtonAbsorberGeom + offline::Mu2eHallGeom + offline::Mu2eInterfaces + offline::ProductionSolenoidGeom + offline::ProductionTargetGeom + offline::ProtonBeamDumpGeom + offline::PTMGeom + offline::ServicesGeom + offline::STMGeom + offline::StoppingTargetGeom + offline::TrackerGeom ) +cet_build_plugin(GeometryService art::service + REG_SOURCE src/GeometryService_service.cc + LIBRARIES REG + offline::GeometryService +) install_source(SUBDIRS src) install_headers(SUBDIRS inc) diff --git a/GlobalConstantsService/CMakeLists.txt b/GlobalConstantsService/CMakeLists.txt index 18e9da035d..f24f2f19c1 100644 --- a/GlobalConstantsService/CMakeLists.txt +++ b/GlobalConstantsService/CMakeLists.txt @@ -1,16 +1,23 @@ cet_make_library( SOURCE -src/GlobalConstantsService.cc -src/GlobalConstantsService_service.cc -src/MassCache.cc -src/ParticleData.cc -src/ParticleDataList.cc -src/PhysicsParams.cc -src/unknownPDGIdName.cc -LIBRARIES PUBLIC -cetlib::cetlib + src/GlobalConstantsService.cc + src/MassCache.cc + src/ParticleData.cc + src/ParticleDataList.cc + src/PhysicsParams.cc + src/unknownPDGIdName.cc + LIBRARIES PUBLIC + art::Framework_Core + offline::ConfigTools + offline::DataProducts + offline::Mu2eInterfaces ) +cet_build_plugin(GlobalConstantsService art::service + REG_SOURCE src/GlobalConstantsService_service.cc + LIBRARIES REG + offline::GlobalConstantsService +) install_source(SUBDIRS src) install_headers(SUBDIRS inc) diff --git a/HelloWorld/CMakeLists.txt b/HelloWorld/CMakeLists.txt index 2bf89a3f13..f4b1990b91 100644 --- a/HelloWorld/CMakeLists.txt +++ b/HelloWorld/CMakeLists.txt @@ -1,8 +1,16 @@ -cet_build_plugin(HelloProducer art::module REG_SOURCE src/HelloProducer_module.cc) +cet_build_plugin(HelloProducer art::module + REG_SOURCE src/HelloProducer_module.cc + LIBRARIES REG +) -cet_build_plugin(HelloWorld2 art::module REG_SOURCE src/HelloWorld2_module.cc) - -cet_build_plugin(HelloWorld art::module REG_SOURCE src/HelloWorld_module.cc) +cet_build_plugin(HelloWorld2 art::module + REG_SOURCE src/HelloWorld2_module.cc + LIBRARIES REG +) +cet_build_plugin(HelloWorld art::module + REG_SOURCE src/HelloWorld_module.cc + LIBRARIES REG +) install_source(SUBDIRS src) diff --git a/KalmanTests/CMakeLists.txt b/KalmanTests/CMakeLists.txt new file mode 100644 index 0000000000..e69de29bb2 diff --git a/KinKalGeom/CMakeLists.txt b/KinKalGeom/CMakeLists.txt index c91b491049..ad82cc0821 100644 --- a/KinKalGeom/CMakeLists.txt +++ b/KinKalGeom/CMakeLists.txt @@ -1,15 +1,15 @@ cet_make_library( SOURCE -src/DetectorSolenoid.cc -src/StoppingTarget.cc -src/SurfaceId.cc -src/SurfaceMap.cc -src/TestCRV.cc -src/Tracker.cc -LIBRARIES PUBLIC -cetlib::cetlib + src/DetectorSolenoid.cc + src/StoppingTarget.cc + src/SurfaceId.cc + src/SurfaceMap.cc + src/TestCRV.cc + src/Tracker.cc + LIBRARIES PUBLIC + KinKal_Geometry + offline::GeneralUtilities ) - install_source(SUBDIRS src) install_headers(SUBDIRS inc) diff --git a/MBSGeom/CMakeLists.txt b/MBSGeom/CMakeLists.txt index 3e2803f8df..03a5672432 100644 --- a/MBSGeom/CMakeLists.txt +++ b/MBSGeom/CMakeLists.txt @@ -1,3 +1,11 @@ +cet_make_library(INTERFACE + SOURCE + inc/MBS.hh + LIBRARIES INTERFACE + + offline::GeomPrimitives + offline::Mu2eInterfaces +) install_source(SUBDIRS src) install_headers(SUBDIRS inc) diff --git a/MCDataProducts/CMakeLists.txt b/MCDataProducts/CMakeLists.txt index 5cbc02ee3a..3c5ab32135 100644 --- a/MCDataProducts/CMakeLists.txt +++ b/MCDataProducts/CMakeLists.txt @@ -1,29 +1,37 @@ cet_make_library( SOURCE -src/CaloClusterMC.cc -src/CaloHitMC.cc -src/CosmicLivetime.cc -src/CrvDigiMC.cc -src/ExtMonFNALSimHit.cc -src/G4BeamlineInfo.cc -src/GenId.cc -src/MARSInfo.cc -src/MCRelationship.cc -src/PhysicalVolumeInfo.cc -src/PhysicalVolumeInfoMultiCollection.cc -src/ProcessCode.cc -src/SimParticle.cc -src/StageParticle.cc -src/StatusG4.cc -src/StepFilterMode.cc -src/StepInstanceName.cc -src/StepPointMC.cc -src/StrawDigiMC.cc -src/TrackSummaryTruthAssns.cc -LIBRARIES PUBLIC -cetlib::cetlib + src/CaloClusterMC.cc + src/CaloHitMC.cc + src/CosmicLivetime.cc + src/CrvDigiMC.cc + src/ExtMonFNALSimHit.cc + src/G4BeamlineInfo.cc + src/GenId.cc + src/MARSInfo.cc + src/MCRelationship.cc + src/PhysicalVolumeInfo.cc + src/PhysicalVolumeInfoMultiCollection.cc + src/ProcessCode.cc + src/SimParticle.cc + src/StageParticle.cc + src/StatusG4.cc + src/StepFilterMode.cc + src/StepInstanceName.cc + src/StepPointMC.cc + src/StrawDigiMC.cc + src/TrackSummaryTruthAssns.cc + LIBRARIES PUBLIC + + offline::DataProducts + offline::RecoDataProducts ) +art_dictionary( NO_CHECK_CLASS_VERSION # For some reason this segfaults + CLASSES_DEF_XML ${CMAKE_CURRENT_SOURCE_DIR}/src/classes_def.xml + CLASSES_H ${CMAKE_CURRENT_SOURCE_DIR}/src/classes.h + DICTIONARY_LIBRARIES + offline::MCDataProducts +) install_source(SUBDIRS src) install_headers(SUBDIRS inc) diff --git a/MECOStyleProtonAbsorberGeom/CMakeLists.txt b/MECOStyleProtonAbsorberGeom/CMakeLists.txt index f5ca915c97..51cc0f4ad2 100644 --- a/MECOStyleProtonAbsorberGeom/CMakeLists.txt +++ b/MECOStyleProtonAbsorberGeom/CMakeLists.txt @@ -1,10 +1,11 @@ cet_make_library( SOURCE -src/MECOStyleProtonAbsorber.cc -LIBRARIES PUBLIC -cetlib::cetlib + src/MECOStyleProtonAbsorber.cc + LIBRARIES PUBLIC + + offline::GeomPrimitives + offline::Mu2eInterfaces ) - install_source(SUBDIRS src) install_headers(SUBDIRS inc) diff --git a/Mu2e/CMakeLists.txt b/Mu2e/CMakeLists.txt index 42194d7fb8..32817199cc 100644 --- a/Mu2e/CMakeLists.txt +++ b/Mu2e/CMakeLists.txt @@ -1,9 +1,10 @@ -cet_make_library( +cet_make_exec(NAME mu2e SOURCE -src/mu2e_main.cc -LIBRARIES PUBLIC -cetlib::cetlib + src/mu2e_main.cc + LIBRARIES + art::Framework_Core + art::Framework_Art + ) - install_source(SUBDIRS src) diff --git a/Mu2eBTrk/CMakeLists.txt b/Mu2eBTrk/CMakeLists.txt index 53b4940abc..dd1808404f 100644 --- a/Mu2eBTrk/CMakeLists.txt +++ b/Mu2eBTrk/CMakeLists.txt @@ -1,12 +1,22 @@ cet_make_library( SOURCE -src/BaBarMu2eField.cc -src/DetStrawElem.cc -src/ParticleInfo.cc -LIBRARIES PUBLIC -cetlib::cetlib + src/BaBarMu2eField.cc + src/DetStrawElem.cc + src/ParticleInfo.cc + LIBRARIES PUBLIC + + offline::BFieldGeom + offline::ConfigTools + offline::DataProducts + offline::GeometryService + offline::GlobalConstantsService + offline::TrackerGeom + BTrk_BaBar + BTrk_BbrGeom + BTrk_BField + BTrk_DetectorModel + BTrk_TrkBase ) - install_source(SUBDIRS src) install_headers(SUBDIRS inc) diff --git a/Mu2eG4/CMakeLists.txt b/Mu2eG4/CMakeLists.txt index d938ffaca9..4a31d888ab 100644 --- a/Mu2eG4/CMakeLists.txt +++ b/Mu2eG4/CMakeLists.txt @@ -1,139 +1,175 @@ cet_make_library( SOURCE -src/addStepLimiter.cc -src/CaloCrateSD.cc -src/CaloCrystalSD.cc -src/CaloReadoutCardSD.cc -src/CaloReadoutSD.cc -src/checkConfigRelics.cc -src/checkForOverlaps.cc -src/checkParticleCodeForG4.cc -src/constructCRV.cc -src/constructDiskCalorimeter.cc -src/constructDS.cc -src/constructDummyStoppingTarget.cc -src/ConstructEnvBox_tool.cc -src/ConstructEnvCalo01_tool.cc -src/ConstructEnvMuCapture_tool.cc -src/ConstructEnvNBoxes_tool.cc -src/ConstructEnvTube_tool.cc -src/constructExternalShielding.cc -src/constructExtMonFNALBuilding.cc -src/constructExtMonFNAL.cc -src/constructHall.cc -src/constructHaymanRings.cc -src/ConstructMaterials.cc -src/constructMBS.cc -src/constructMSTM.cc -src/constructProtonAbsorber.cc -src/constructProtonBeamDump.cc -src/constructPS.cc -src/constructPSEnclosure.cc -src/constructPSShield.cc -src/constructPTM.cc -src/constructSaddles.cc -src/constructServicesGeom.cc -src/constructSTM.cc -src/constructStoppingTarget.cc -src/constructStudyEnv_v001.cc -src/constructStudyEnv_v002.cc -src/constructStudyEnv_v003.cc -src/constructStudyEnv_v004.cc -src/constructTargetPS.cc -src/ConstructTrackerDetail5.cc -src/constructTrackerv5.cc -src/constructTS.cc -src/constructTSdA.cc -src/constructVirtualDetectors.cc -src/constructVirtualDetectorSDs.cc -src/constructVisualizationRegions.cc -src/constructWorldVolume.cc -src/CRVSD.cc -src/customizeChargedPionDecay.cc -src/DuplicateLogicalVolumeChecker.cc -src/EventNumberList.cc -src/exportG4PDT.cc -src/ExtMonFNALPixelSD.cc -src/FieldMgr.cc -src/findMaterialOrThrow.cc -src/finishNesting.cc -src/generateFieldMap.cc -src/getPhysicalVolumeOrThrow.cc -src/HelicalProtonAbsorber.cc -src/InitEnvToolBase.cc -src/MaterialFinder.cc -src/MTMasterThread.cc -src/Mu2eG4ActionInitialization.cc -src/Mu2eG4Config.cc -src/Mu2eG4CustomizationPhysicsConstructor.cc -src/Mu2eG4Cuts.cc -src/Mu2eG4DecayMuonsWithSpinPhysicsConstructor.cc -src/Mu2eG4DSGradientMagneticField.cc -src/Mu2eG4EventAction.cc -src/Mu2eG4GlobalMagneticField.cc -src/Mu2eG4Inputs.cc -src/Mu2eG4IOConfigHelper.cc -src/Mu2eG4MasterRunAction.cc -src/Mu2eG4MinDEDXPhysicsConstructor.cc -src/Mu2eG4MinimalModularPhysicsList.cc -src/Mu2eG4MinimalPhysicsConstructor.cc -src/Mu2eG4MTRunManager.cc -src/Mu2eG4PerThreadStorage.cc -src/Mu2eG4PrimaryGeneratorAction.cc -src/Mu2eG4PrimaryType.cc -src/Mu2eG4ResourceLimits.cc -src/Mu2eG4RunAction.cc -src/Mu2eG4SensitiveDetector.cc -src/Mu2eG4StackingAction.cc -src/Mu2eG4StepLimiterPhysicsConstructor.cc -src/Mu2eG4SteppingAction.cc -src/Mu2eG4SteppingVerbose.cc -src/Mu2eG4TrackingAction.cc -src/Mu2eG4TrajectoryControl.cc -src/Mu2eG4UserHelpers.cc -src/Mu2eG4UserTrackInformation.cc -src/Mu2eG4VisCommands.cc -src/Mu2eG4WorkerRunManager.cc -src/Mu2eRecorderProcess.cc -src/Mu2eSpecialCutsProcess.cc -src/Mu2eStudyWorld.cc -src/Mu2eUniverse.cc -src/Mu2eWorld.cc -src/nestBox.cc -src/nestCons.cc -src/nestExtrudedSolid.cc -src/nestPolycone.cc -src/nestPolyhedra.cc -src/nestTorus.cc -src/nestTrp.cc -src/nestTubs.cc -src/PhysicalVolumeHelper.cc -src/physicsListDecider.cc -src/PhysicsProcessInfo.cc -src/preG4InitializeTasks.cc -src/ReflectionProcess.cc -src/SensitiveDetectorHelper.cc -src/setBirksConstant.cc -src/SimParticleHelper.cc -src/SimParticlePrimaryHelper.cc -src/StrawSD.cc -src/toggleProcesses.cc -src/TrackerPlaneSupportSD.cc -src/TrackerWireSD.cc -src/validGeometryOrThrow.cc -src/validPolyCones.cc -src/WorldMaker.cc -src/writePhysicalVolumes.cc -LIBRARIES PUBLIC -cetlib::cetlib + src/addStepLimiter.cc + src/CaloCrateSD.cc + src/CaloCrystalSD.cc + src/CaloReadoutCardSD.cc + src/CaloReadoutSD.cc + src/checkConfigRelics.cc + src/checkForOverlaps.cc + src/checkParticleCodeForG4.cc + src/constructCRV.cc + src/constructDiskCalorimeter.cc + src/constructDS.cc + src/constructDummyStoppingTarget.cc + src/ConstructEnvBox_tool.cc + src/ConstructEnvCalo01_tool.cc + src/ConstructEnvMuCapture_tool.cc + src/ConstructEnvNBoxes_tool.cc + src/ConstructEnvTube_tool.cc + src/constructExternalShielding.cc + src/constructExtMonFNALBuilding.cc + src/constructExtMonFNAL.cc + src/constructHall.cc + src/constructHaymanRings.cc + src/ConstructMaterials.cc + src/constructMBS.cc + src/constructMSTM.cc + src/constructProtonAbsorber.cc + src/constructProtonBeamDump.cc + src/constructPS.cc + src/constructPSEnclosure.cc + src/constructPSShield.cc + src/constructPTM.cc + src/constructSaddles.cc + src/constructServicesGeom.cc + src/constructSTM.cc + src/constructStoppingTarget.cc + src/constructStudyEnv_v001.cc + src/constructStudyEnv_v002.cc + src/constructStudyEnv_v003.cc + src/constructStudyEnv_v004.cc + src/constructTargetPS.cc + src/ConstructTrackerDetail5.cc + src/constructTrackerv5.cc + src/constructTS.cc + src/constructTSdA.cc + src/constructVirtualDetectors.cc + src/constructVirtualDetectorSDs.cc + src/constructVisualizationRegions.cc + src/constructWorldVolume.cc + src/CRVSD.cc + src/customizeChargedPionDecay.cc + src/DuplicateLogicalVolumeChecker.cc + src/EventNumberList.cc + src/exportG4PDT.cc + src/ExtMonFNALPixelSD.cc + src/FieldMgr.cc + src/findMaterialOrThrow.cc + src/finishNesting.cc + src/generateFieldMap.cc + src/getPhysicalVolumeOrThrow.cc + src/HelicalProtonAbsorber.cc + src/InitEnvToolBase.cc + src/MaterialFinder.cc + src/MTMasterThread.cc + src/Mu2eG4ActionInitialization.cc + src/Mu2eG4Config.cc + src/Mu2eG4CustomizationPhysicsConstructor.cc + src/Mu2eG4Cuts.cc + src/Mu2eG4DecayMuonsWithSpinPhysicsConstructor.cc + src/Mu2eG4DSGradientMagneticField.cc + src/Mu2eG4EventAction.cc + src/Mu2eG4GlobalMagneticField.cc + src/Mu2eG4Inputs.cc + src/Mu2eG4IOConfigHelper.cc + src/Mu2eG4MasterRunAction.cc + src/Mu2eG4MinDEDXPhysicsConstructor.cc + src/Mu2eG4MinimalModularPhysicsList.cc + src/Mu2eG4MinimalPhysicsConstructor.cc + src/Mu2eG4MTRunManager.cc + src/Mu2eG4PerThreadStorage.cc + src/Mu2eG4PrimaryGeneratorAction.cc + src/Mu2eG4PrimaryType.cc + src/Mu2eG4ResourceLimits.cc + src/Mu2eG4RunAction.cc + src/Mu2eG4SensitiveDetector.cc + src/Mu2eG4StackingAction.cc + src/Mu2eG4StepLimiterPhysicsConstructor.cc + src/Mu2eG4SteppingAction.cc + src/Mu2eG4SteppingVerbose.cc + src/Mu2eG4TrackingAction.cc + src/Mu2eG4TrajectoryControl.cc + src/Mu2eG4UserHelpers.cc + src/Mu2eG4UserTrackInformation.cc + src/Mu2eG4VisCommands.cc + src/Mu2eG4WorkerRunManager.cc + src/Mu2eRecorderProcess.cc + src/Mu2eSpecialCutsProcess.cc + src/Mu2eStudyWorld.cc + src/Mu2eUniverse.cc + src/Mu2eWorld.cc + src/nestBox.cc + src/nestCons.cc + src/nestExtrudedSolid.cc + src/nestPolycone.cc + src/nestPolyhedra.cc + src/nestTorus.cc + src/nestTrp.cc + src/nestTubs.cc + src/PhysicalVolumeHelper.cc + src/physicsListDecider.cc + src/PhysicsProcessInfo.cc + src/preG4InitializeTasks.cc + src/ReflectionProcess.cc + src/SensitiveDetectorHelper.cc + src/setBirksConstant.cc + src/SimParticleHelper.cc + src/SimParticlePrimaryHelper.cc + src/StrawSD.cc + src/toggleProcesses.cc + src/TrackerPlaneSupportSD.cc + src/TrackerWireSD.cc + src/validGeometryOrThrow.cc + src/validPolyCones.cc + src/WorldMaker.cc + src/writePhysicalVolumes.cc + LIBRARIES PUBLIC + + offline::BeamlineGeom + offline::BFieldGeom + offline::CalorimeterGeom + offline::ConfigTools + offline::CosmicRayShieldGeom + offline::DataProducts + offline::DetectorSolenoidGeom + offline::ExternalShieldingGeom + offline::ExtinctionMonitorFNAL_Geometry + offline::GeneralUtilities + offline::GeometryService + offline::GeomPrimitives + offline::GlobalConstantsService + offline::MBSGeom + offline::MCDataProducts + offline::MECOStyleProtonAbsorberGeom + offline::Mu2eG4Helper + offline::Mu2eHallGeom + offline::Mu2eUtilities + offline::ProductionSolenoidGeom + offline::ProductionTargetGeom + offline::ProtonBeamDumpGeom + offline::PTMGeom + offline::SeedService + offline::ServicesGeom + offline::STMGeom + offline::StoppingTargetGeom + offline::TrackerGeom ) -cet_build_plugin(IonProducer art::module REG_SOURCE src/IonProducer_module.cc) - -cet_build_plugin(Mu2eG4 art::module REG_SOURCE src/Mu2eG4_module.cc) +cet_build_plugin(IonProducer art::module + REG_SOURCE src/IonProducer_module.cc + LIBRARIES REG +) -cet_build_plugin(Mu2eG4MT art::module REG_SOURCE src/Mu2eG4MT_module.cc) +cet_build_plugin(Mu2eG4 art::module + REG_SOURCE src/Mu2eG4_module.cc + LIBRARIES REG +) +cet_build_plugin(Mu2eG4MT art::module + REG_SOURCE src/Mu2eG4MT_module.cc + LIBRARIES REG +) install_source(SUBDIRS src) install_headers(SUBDIRS inc) diff --git a/Mu2eG4Helper/CMakeLists.txt b/Mu2eG4Helper/CMakeLists.txt index c3c74b696c..07b6d91c93 100644 --- a/Mu2eG4Helper/CMakeLists.txt +++ b/Mu2eG4Helper/CMakeLists.txt @@ -1,12 +1,17 @@ cet_make_library( SOURCE -src/AntiLeakRegistry.cc -src/Mu2eG4Helper_service.cc -src/VolumeInfo.cc -LIBRARIES PUBLIC -cetlib::cetlib + src/AntiLeakRegistry.cc + src/VolumeInfo.cc + LIBRARIES PUBLIC + + offline::GeometryService ) +cet_build_plugin(Mu2eG4Helper art::service + REG_SOURCE src/Mu2eG4Helper_service.cc + LIBRARIES REG + offline::Mu2eG4Helper +) install_source(SUBDIRS src) install_headers(SUBDIRS inc) diff --git a/Mu2eHallGeom/CMakeLists.txt b/Mu2eHallGeom/CMakeLists.txt index 5df8ca5f89..f971b1b49b 100644 --- a/Mu2eHallGeom/CMakeLists.txt +++ b/Mu2eHallGeom/CMakeLists.txt @@ -1,10 +1,11 @@ cet_make_library( SOURCE -src/Mu2eHall.cc -LIBRARIES PUBLIC -cetlib::cetlib + src/Mu2eHall.cc + LIBRARIES PUBLIC + + offline::GeomPrimitives + offline::Mu2eInterfaces ) - install_source(SUBDIRS src) install_headers(SUBDIRS inc) diff --git a/Mu2eInterfaces/CMakeLists.txt b/Mu2eInterfaces/CMakeLists.txt index 226439d77e..4c9eebc507 100644 --- a/Mu2eInterfaces/CMakeLists.txt +++ b/Mu2eInterfaces/CMakeLists.txt @@ -1,11 +1,11 @@ cet_make_library( SOURCE -src/ConditionsEntity.cc -src/Detector.cc -LIBRARIES PUBLIC -cetlib::cetlib + src/ConditionsEntity.cc + src/Detector.cc + LIBRARIES PUBLIC + + offline::DbTables ) - install_source(SUBDIRS src) install_headers(SUBDIRS inc) diff --git a/Mu2eKinKal/CMakeLists.txt b/Mu2eKinKal/CMakeLists.txt index e37cad37eb..76b384e238 100644 --- a/Mu2eKinKal/CMakeLists.txt +++ b/Mu2eKinKal/CMakeLists.txt @@ -1,33 +1,64 @@ cet_make_library( SOURCE -src/BkgANNSHU.cc -src/CADSHU.cc -src/Chi2SHU.cc -src/DriftANNSHU.cc -src/KKBField.cc -src/KKConstantBField.cc -src/KKFitSettings.cc -src/KKFitUtilities.cc -src/KKMaterial.cc -src/KKSHFlag.cc -src/KKStrawMaterial.cc -src/StrawHitUpdaters.cc -src/StrawXingUpdater.cc -src/WHSIterator.cc -src/WHSMask.cc -src/WireHitState.cc -LIBRARIES PUBLIC -cetlib::cetlib + src/BkgANNSHU.cc + src/CADSHU.cc + src/Chi2SHU.cc + src/DriftANNSHU.cc + src/KKBField.cc + src/KKConstantBField.cc + src/KKFitSettings.cc + src/KKFitUtilities.cc + src/KKMaterial.cc + src/KKSHFlag.cc + src/KKStrawMaterial.cc + src/StrawHitUpdaters.cc + src/StrawXingUpdater.cc + src/WHSIterator.cc + src/WHSMask.cc + src/WireHitState.cc + LIBRARIES PUBLIC + BLAS::BLAS + KinKal_Detector + KinKal_Fit + KinKal_General + KinKal_MatEnv + offline::BFieldGeom + offline::CalorimeterGeom + offline::ConfigTools + offline::DataProducts + offline::GeneralUtilities + offline::GeometryService + offline::KinKalGeom + offline::RecoDataProducts + offline::TrackerConditions + offline::TrackerGeom + ROOT::ROOTTMVASofie + ROOT::TMVA ) -cet_build_plugin(CentralHelixFit art::module REG_SOURCE src/CentralHelixFit_module.cc) - -cet_build_plugin(CosmicTrackSeedFilter art::module REG_SOURCE src/CosmicTrackSeedFilter_module.cc) +cet_build_plugin(CentralHelixFit art::module + REG_SOURCE src/CentralHelixFit_module.cc + LIBRARIES REG + offline::Mu2eKinKal +) -cet_build_plugin(KinematicLineFit art::module REG_SOURCE src/KinematicLineFit_module.cc) +cet_build_plugin(CosmicTrackSeedFilter art::module + REG_SOURCE src/CosmicTrackSeedFilter_module.cc + LIBRARIES REG + offline::Mu2eKinKal +) -cet_build_plugin(LoopHelixFit art::module REG_SOURCE src/LoopHelixFit_module.cc) +cet_build_plugin(KinematicLineFit art::module + REG_SOURCE src/KinematicLineFit_module.cc + LIBRARIES REG + offline::Mu2eKinKal +) +cet_build_plugin(LoopHelixFit art::module + REG_SOURCE src/LoopHelixFit_module.cc + LIBRARIES REG + offline::Mu2eKinKal +) install_source(SUBDIRS src) install_headers(SUBDIRS inc) diff --git a/Mu2eReco/CMakeLists.txt b/Mu2eReco/CMakeLists.txt new file mode 100644 index 0000000000..e69de29bb2 diff --git a/Mu2eUtilities/CMakeLists.txt b/Mu2eUtilities/CMakeLists.txt index 3384a135bd..16113746be 100644 --- a/Mu2eUtilities/CMakeLists.txt +++ b/Mu2eUtilities/CMakeLists.txt @@ -1,61 +1,77 @@ cet_make_library( SOURCE -src/BinnedSpectrum.cc -src/BuildLinearFitMatrixSums.cc -src/CaloPulseShape.cc -src/checkSimParticleCollection.cc -src/compressPdgId.cc -src/ConversionSpectrum.cc -src/CoordinateString.cc -src/CosmicTrackUtils.cc -src/CzarneckiSpectrum.cc -src/EjectedProtonSpectrum.cc -src/EventWeightHelper.cc -src/fromStrings.cc -src/GeneratorSummaryHistograms.cc -src/HelixTool.cc -src/HistTrackSum.cc -src/KalRepInstanceNameDecoder.cc -src/LsqSums2.cc -src/LsqSums4.cc -src/McUtilsToolBase.cc -src/MedianCalculator.cc -src/ModuleHistToolBase.cc -src/MuonCaptureSpectrum.cc -src/MVATools.cc -src/ParametricFit.cc -src/particleEnteringG4Volume.cc -src/PhysicalVolumeMultiHelper.cc -src/PionCaptureSpectrum.cc -src/PointLinePCA_XYZ.cc -src/PoissonHistogramBinning.cc -src/polar3Vector.cc -src/ProtonPulseRandPDF.cc -src/RandomLimitedExpo.cc -src/RandomUnitSphere.cc -src/rm48.cc -src/ShankerWatanabeSpectrum.cc -src/SimParticleCollectionPrinter.cc -src/SimParticleGetTau.cc -src/simParticleList.cc -src/SimParticleParentGetter.cc -src/SimpleSpectrum.cc -src/SortedStepPoints.cc -src/STMUtils.cc -src/Table.cc -src/TrackCuts.cc -src/TrackerBFieldInfo.cc -src/TrackPatRecType.cc -src/TrackTool.cc -src/TriggerResultsNavigator.cc -src/TrkSpecies.cc -src/TwoLinePCA.cc -src/TwoLinePCA_XYZ.cc -src/VectorVolume.cc -LIBRARIES PUBLIC -cetlib::cetlib + src/BinnedSpectrum.cc + src/BuildLinearFitMatrixSums.cc + src/CaloPulseShape.cc + src/checkSimParticleCollection.cc + src/compressPdgId.cc + src/ConversionSpectrum.cc + src/CoordinateString.cc + src/CosmicTrackUtils.cc + src/CzarneckiSpectrum.cc + src/EjectedProtonSpectrum.cc + src/EventWeightHelper.cc + src/fromStrings.cc + src/GeneratorSummaryHistograms.cc + src/HelixTool.cc + src/HistTrackSum.cc + src/KalRepInstanceNameDecoder.cc + src/LsqSums2.cc + src/LsqSums4.cc + src/McUtilsToolBase.cc + src/MedianCalculator.cc + src/ModuleHistToolBase.cc + src/MuonCaptureSpectrum.cc + src/MVATools.cc + src/ParametricFit.cc + src/particleEnteringG4Volume.cc + src/PhysicalVolumeMultiHelper.cc + src/PionCaptureSpectrum.cc + src/PointLinePCA_XYZ.cc + src/PoissonHistogramBinning.cc + src/polar3Vector.cc + src/ProtonPulseRandPDF.cc + src/RandomLimitedExpo.cc + src/RandomUnitSphere.cc + src/rm48.cc + src/ShankerWatanabeSpectrum.cc + src/SimParticleCollectionPrinter.cc + src/SimParticleGetTau.cc + src/simParticleList.cc + src/SimParticleParentGetter.cc + src/SimpleSpectrum.cc + src/SortedStepPoints.cc + src/STMUtils.cc + src/Table.cc + src/TrackCuts.cc + src/TrackerBFieldInfo.cc + src/TrackPatRecType.cc + src/TrackTool.cc + src/TriggerResultsNavigator.cc + src/TrkSpecies.cc + src/TwoLinePCA.cc + src/TwoLinePCA_XYZ.cc + src/VectorVolume.cc + LIBRARIES PUBLIC + art_root_io::tfile_support + offline::BFieldGeom + offline::ConditionsService + offline::ConfigTools + offline::DataProducts + offline::GeneralUtilities + offline::GeometryService + offline::GeomPrimitives + offline::GlobalConstantsService + offline::MCDataProducts + offline::RecoDataProducts + offline::SeedService + offline::STMConditions + offline::StoppingTargetGeom + offline::TrackerGeom + ROOT::Hist + ROOT::Matrix + XercesC::XercesC ) - install_source(SUBDIRS src) install_headers(SUBDIRS inc) diff --git a/PTMGeom/CMakeLists.txt b/PTMGeom/CMakeLists.txt index 0f7910dac3..f1f895a5cb 100644 --- a/PTMGeom/CMakeLists.txt +++ b/PTMGeom/CMakeLists.txt @@ -1,13 +1,14 @@ cet_make_library( SOURCE -src/PTM.cc -src/PTMHead.cc -src/PTMPWC.cc -src/PTMStand.cc -LIBRARIES PUBLIC -cetlib::cetlib + src/PTM.cc + src/PTMHead.cc + src/PTMPWC.cc + src/PTMStand.cc + LIBRARIES PUBLIC + + offline::GeomPrimitives + offline::Mu2eInterfaces ) - install_source(SUBDIRS src) install_headers(SUBDIRS inc) diff --git a/ParticleID/CMakeLists.txt b/ParticleID/CMakeLists.txt index 461550b716..85b31d32b2 100644 --- a/ParticleID/CMakeLists.txt +++ b/ParticleID/CMakeLists.txt @@ -1,17 +1,24 @@ cet_make_library( SOURCE -src/PIDLogL1D.cc -src/PIDLogLEp.cc -src/PIDLogLRatio.cc -src/PIDUtilities.cc -LIBRARIES PUBLIC -cetlib::cetlib + src/PIDLogL1D.cc + src/PIDLogLEp.cc + src/PIDLogLRatio.cc + src/PIDUtilities.cc + LIBRARIES PUBLIC + + offline::ConfigTools + offline::GeneralUtilities ) -cet_build_plugin(ParticleID art::module REG_SOURCE src/ParticleID_module.cc) - -cet_build_plugin(ParticleIDRead art::module REG_SOURCE src/ParticleIDRead_module.cc) +cet_build_plugin(ParticleID art::module + REG_SOURCE src/ParticleID_module.cc + LIBRARIES REG +) +cet_build_plugin(ParticleIDRead art::module + REG_SOURCE src/ParticleIDRead_module.cc + LIBRARIES REG +) install_source(SUBDIRS src) install_headers(SUBDIRS inc) diff --git a/Print/CMakeLists.txt b/Print/CMakeLists.txt index 279a74a678..50b2fa1d96 100644 --- a/Print/CMakeLists.txt +++ b/Print/CMakeLists.txt @@ -1,60 +1,104 @@ cet_make_library( SOURCE -src/BkgClusterPrinter.cc -src/BkgQualPrinter.cc -src/CaloClusterMCPrinter.cc -src/CaloClusterPrinter.cc -src/CaloDigiPrinter.cc -src/CaloHitMCPrinter.cc -src/CaloHitPrinter.cc -src/CaloRecoDigiPrinter.cc -src/CaloShowerStepPrinter.cc -src/ComboHitPrinter.cc -src/CosmicLivetimePrinter.cc -src/CosmicTrackSeedPrinter.cc -src/CrvCoincidenceClusterPrinter.cc -src/CrvDigiMCPrinter.cc -src/CrvDigiPrinter.cc -src/CrvRecoPulsePrinter.cc -src/CrvStepPrinter.cc -src/EventWindowMarkerPrinter.cc -src/GenParticlePrinter.cc -src/HelixSeedPrinter.cc -src/KalRepPrinter.cc -src/KalSeedPrinter.cc -src/MCTrajectoryPrinter.cc -src/PhysicalVolumePrinter.cc -src/PrimaryParticlePrinter.cc -src/ProtonBunchIntensityPrinter.cc -src/ProtonBunchTimeMCPrinter.cc -src/ProtonBunchTimePrinter.cc -src/SimParticlePrinter.cc -src/SimParticlePtrPrinter.cc -src/StatusG4Printer.cc -src/StepPointMCPrinter.cc -src/STMWaveformDigiPrinter.cc -src/StrawDigiADCWaveformPrinter.cc -src/StrawDigiMCPrinter.cc -src/StrawDigiPrinter.cc -src/StrawGasStepPrinter.cc -src/StrawHitFlagPrinter.cc -src/StrawHitPrinter.cc -src/TimeClusterPrinter.cc -src/TrackClusterMatchPrinter.cc -src/TrackSummaryPrinter.cc -src/TriggerInfoPrinter.cc -src/TriggerResultsPrinter.cc -src/TrkCaloIntersectPrinter.cc -LIBRARIES PUBLIC -cetlib::cetlib + src/BkgClusterPrinter.cc + src/BkgQualPrinter.cc + src/CaloClusterMCPrinter.cc + src/CaloClusterPrinter.cc + src/CaloDigiPrinter.cc + src/CaloHitMCPrinter.cc + src/CaloHitPrinter.cc + src/CaloRecoDigiPrinter.cc + src/CaloShowerStepPrinter.cc + src/ComboHitPrinter.cc + src/CosmicLivetimePrinter.cc + src/CosmicTrackSeedPrinter.cc + src/CrvCoincidenceClusterPrinter.cc + src/CrvDigiMCPrinter.cc + src/CrvDigiPrinter.cc + src/CrvRecoPulsePrinter.cc + src/CrvStepPrinter.cc + src/EventWindowMarkerPrinter.cc + src/GenParticlePrinter.cc + src/HelixSeedPrinter.cc + src/KalRepPrinter.cc + src/KalSeedPrinter.cc + src/MCTrajectoryPrinter.cc + src/PhysicalVolumePrinter.cc + src/PrimaryParticlePrinter.cc + src/ProtonBunchIntensityPrinter.cc + src/ProtonBunchTimeMCPrinter.cc + src/ProtonBunchTimePrinter.cc + src/SimParticlePrinter.cc + src/SimParticlePtrPrinter.cc + src/StatusG4Printer.cc + src/StepPointMCPrinter.cc + src/STMWaveformDigiPrinter.cc + src/StrawDigiADCWaveformPrinter.cc + src/StrawDigiMCPrinter.cc + src/StrawDigiPrinter.cc + src/StrawGasStepPrinter.cc + src/StrawHitFlagPrinter.cc + src/StrawHitPrinter.cc + src/TimeClusterPrinter.cc + src/TrackClusterMatchPrinter.cc + src/TrackSummaryPrinter.cc + src/TriggerInfoPrinter.cc + src/TriggerResultsPrinter.cc + src/TrkCaloIntersectPrinter.cc + LIBRARIES PUBLIC + KinKal_General + offline::ConditionsService + offline::DataProducts + offline::GeometryService + offline::GlobalConstantsService + offline::MCDataProducts + offline::Mu2eUtilities + offline::RecoDataProducts ) -cet_build_plugin(DataProductDump art::module REG_SOURCE src/DataProductDump_module.cc) +cet_make_exec(NAME artProductSizes + SOURCE + artProductSizes/Arguments.cc + artProductSizes/artProductSizes_main.cc + artProductSizes/rootFileSizeTools.cc + artProductSizes/RootSizeOnDisk.cc + LIBRARIES + offline::Print +) -cet_build_plugin(PrintModule art::module REG_SOURCE src/PrintModule_module.cc) +cet_make_exec(NAME deps + SOURCE + deps/deps_main.cc + LIBRARIES + offline::Print +) -cet_build_plugin(RunSubrunEvent art::module REG_SOURCE src/RunSubrunEvent_module.cc) +cet_make_exec(NAME eventCount + SOURCE + eventCount/Arguments.cc + eventCount/eventCount_main.cc + eventCount/FileInfo.cc + LIBRARIES + offline::Print +) +cet_build_plugin(DataProductDump art::module + REG_SOURCE src/DataProductDump_module.cc + LIBRARIES REG + offline::Print +) + +cet_build_plugin(PrintModule art::module + REG_SOURCE src/PrintModule_module.cc + LIBRARIES REG + offline::Print +) + +cet_build_plugin(RunSubrunEvent art::module + REG_SOURCE src/RunSubrunEvent_module.cc + LIBRARIES REG + offline::Print +) install_source(SUBDIRS src) install_headers(SUBDIRS inc) diff --git a/ProditionsService/CMakeLists.txt b/ProditionsService/CMakeLists.txt index 957de3c385..f0996661fb 100644 --- a/ProditionsService/CMakeLists.txt +++ b/ProditionsService/CMakeLists.txt @@ -1,12 +1,35 @@ -cet_make_library( +cet_make_library(INTERFACE SOURCE -src/ProditionsService_service.cc -LIBRARIES PUBLIC -cetlib::cetlib + inc/ProditionsHandle.hh + inc/ProditionsService.hh + LIBRARIES INTERFACE + + offline::AnalysisConfig + offline::CaloConfig + offline::CRVConfig + offline::DAQConfig + offline::DbTables + offline::Mu2eInterfaces + offline::SimulationConfig + offline::STMConfig + offline::TrackerConfig ) -cet_build_plugin(ProditionsTest art::module REG_SOURCE src/ProditionsTest_module.cc) +cet_build_plugin(ProditionsService art::service + REG_SOURCE src/ProditionsService_service.cc + LIBRARIES REG + offline::AnalysisConditions + offline::CaloConditions + offline::CRVConditions + offline::ProditionsService + offline::SimulationConditions +) +cet_build_plugin(ProditionsTest art::module + REG_SOURCE src/ProditionsTest_module.cc + LIBRARIES REG + offline::ProditionsService +) install_source(SUBDIRS src) install_headers(SUBDIRS inc) diff --git a/ProductionSolenoidGeom/CMakeLists.txt b/ProductionSolenoidGeom/CMakeLists.txt index 8fc8de6594..f8b7523906 100644 --- a/ProductionSolenoidGeom/CMakeLists.txt +++ b/ProductionSolenoidGeom/CMakeLists.txt @@ -1,12 +1,13 @@ cet_make_library( SOURCE -src/PSEnclosure.cc -src/PSExternalShielding.cc -src/PSShield.cc -LIBRARIES PUBLIC -cetlib::cetlib + src/PSEnclosure.cc + src/PSExternalShielding.cc + src/PSShield.cc + LIBRARIES PUBLIC + + offline::GeomPrimitives + offline::Mu2eInterfaces ) - install_source(SUBDIRS src) install_headers(SUBDIRS inc) diff --git a/ProductionTargetGeom/CMakeLists.txt b/ProductionTargetGeom/CMakeLists.txt index 01bd54ebc2..d6e4472e1f 100644 --- a/ProductionTargetGeom/CMakeLists.txt +++ b/ProductionTargetGeom/CMakeLists.txt @@ -1,10 +1,11 @@ cet_make_library( SOURCE -src/ProductionTarget.cc -LIBRARIES PUBLIC -cetlib::cetlib + src/ProductionTarget.cc + LIBRARIES PUBLIC + + offline::GeomPrimitives + offline::Mu2eInterfaces ) - install_source(SUBDIRS src) install_headers(SUBDIRS inc) diff --git a/ProtonBeamDumpGeom/CMakeLists.txt b/ProtonBeamDumpGeom/CMakeLists.txt index 4b8e1d8aba..7494238574 100644 --- a/ProtonBeamDumpGeom/CMakeLists.txt +++ b/ProtonBeamDumpGeom/CMakeLists.txt @@ -1,10 +1,11 @@ cet_make_library( SOURCE -src/ProtonBeamDump.cc -LIBRARIES PUBLIC -cetlib::cetlib + src/ProtonBeamDump.cc + LIBRARIES PUBLIC + + offline::Mu2eHallGeom + offline::Mu2eInterfaces ) - install_source(SUBDIRS src) install_headers(SUBDIRS inc) diff --git a/RecoDataProducts/CMakeLists.txt b/RecoDataProducts/CMakeLists.txt index 72236e5ca5..7a499397f1 100644 --- a/RecoDataProducts/CMakeLists.txt +++ b/RecoDataProducts/CMakeLists.txt @@ -1,41 +1,54 @@ cet_make_library( SOURCE -src/AlgorithmID.cc -src/BkgClusterFlag.cc -src/BkgQual.cc -src/ComboHit.cc -src/CosmicTrack.cc -src/CrvDigi.cc -src/CrvRecoPulse.cc -src/ExtMonFNALRawCluster.cc -src/ExtMonFNALRawHit.cc -src/ExtMonFNALRecoCluster.cc -src/ExtMonFNALRecoClusterCollection.cc -src/ExtMonFNALTrkFitQuality.cc -src/ExtMonFNALTrkParam.cc -src/ExtMonUCITofHit.cc -src/HelixVal.cc -src/KalSeed.cc -src/KalSegment.cc -src/PIDProduct.cc -src/RobustHelix.cc -src/StrawDigi.cc -src/StrawDigiFlag.cc -src/StrawHit.cc -src/StrawHitFlag.cc -src/TrackClusterMatch.cc -src/TrackSummary.cc -src/TrkCaloHitPID.cc -src/TrkExtTraj.cc -src/TrkExtTrajPoint.cc -src/TrkFitDirection.cc -src/TrkFitFlag.cc -src/TrkQual.cc -src/TrkToCaloExtrapol.cc -LIBRARIES PUBLIC -cetlib::cetlib + src/AlgorithmID.cc + src/BkgClusterFlag.cc + src/BkgQual.cc + src/ComboHit.cc + src/CosmicTrack.cc + src/CrvDigi.cc + src/CrvRecoPulse.cc + src/ExtMonFNALRawCluster.cc + src/ExtMonFNALRawHit.cc + src/ExtMonFNALRecoCluster.cc + src/ExtMonFNALRecoClusterCollection.cc + src/ExtMonFNALTrkFitQuality.cc + src/ExtMonFNALTrkParam.cc + src/ExtMonUCITofHit.cc + src/HelixVal.cc + src/KalSeed.cc + src/KalSegment.cc + src/PIDProduct.cc + src/RobustHelix.cc + src/StrawDigi.cc + src/StrawDigiFlag.cc + src/StrawHit.cc + src/StrawHitFlag.cc + src/TrackClusterMatch.cc + src/TrackSummary.cc + src/TrkCaloHitPID.cc + src/TrkExtTraj.cc + src/TrkExtTrajPoint.cc + src/TrkFitDirection.cc + src/TrkFitFlag.cc + src/TrkQual.cc + src/TrkToCaloExtrapol.cc + LIBRARIES PUBLIC + BTrk_BbrGeom + BTrk_KalmanTrack + BTrk_ProbTools + KinKal_Trajectory + offline::DataProducts + offline::GeneralUtilities + offline::KinKalGeom + offline::TrackerConditions ) +art_dictionary( NO_CHECK_CLASS_VERSION # For some reason this segfaults + CLASSES_DEF_XML ${CMAKE_CURRENT_SOURCE_DIR}/src/classes_def.xml + CLASSES_H ${CMAKE_CURRENT_SOURCE_DIR}/src/classes.h + DICTIONARY_LIBRARIES + offline::RecoDataProducts +) install_source(SUBDIRS src) install_headers(SUBDIRS inc) diff --git a/STMConditions/CMakeLists.txt b/STMConditions/CMakeLists.txt index 696013dec5..3cb5ae5858 100644 --- a/STMConditions/CMakeLists.txt +++ b/STMConditions/CMakeLists.txt @@ -1,11 +1,14 @@ cet_make_library( SOURCE -src/STMEnergyCalibMaker.cc -LIBRARIES PUBLIC -cetlib::cetlib + src/STMEnergyCalibMaker.cc + LIBRARIES PUBLIC + + offline::DataProducts + offline::DbTables + offline::Mu2eInterfaces + offline::STMConfig ) - install_source(SUBDIRS src) install_headers(SUBDIRS inc) install_fhicl(SUBDIRS fcl SUBDIRNAME STMConditions) diff --git a/STMConfig/CMakeLists.txt b/STMConfig/CMakeLists.txt index 04a44744b2..f0d7fe6aee 100644 --- a/STMConfig/CMakeLists.txt +++ b/STMConfig/CMakeLists.txt @@ -1 +1,8 @@ +cet_make_library(INTERFACE + SOURCE + inc/STMEnergyCalibConfig.hh + LIBRARIES INTERFACE + +) + install_headers(SUBDIRS inc) diff --git a/STMGeom/CMakeLists.txt b/STMGeom/CMakeLists.txt index 04a44744b2..7df2bd9095 100644 --- a/STMGeom/CMakeLists.txt +++ b/STMGeom/CMakeLists.txt @@ -1 +1,15 @@ +cet_make_library(INTERFACE + SOURCE + inc/GeDetector.hh + inc/PermanentMagnet.hh + inc/ShieldPipe.hh + inc/STMCollimator.hh + inc/STM.hh + inc/SupportTable.hh + inc/TransportPipe.hh + LIBRARIES INTERFACE + + offline::Mu2eInterfaces +) + install_headers(SUBDIRS inc) diff --git a/STMReco/CMakeLists.txt b/STMReco/CMakeLists.txt index eb3a478f82..26adb9cb38 100644 --- a/STMReco/CMakeLists.txt +++ b/STMReco/CMakeLists.txt @@ -1,15 +1,32 @@ -cet_build_plugin(MakeSTMHits art::module REG_SOURCE src/MakeSTMHits_module.cc) +cet_build_plugin(MakeSTMHits art::module + REG_SOURCE src/MakeSTMHits_module.cc + LIBRARIES REG +) -cet_build_plugin(PlotSTMEnergySpectrum art::module REG_SOURCE src/PlotSTMEnergySpectrum_module.cc) +cet_build_plugin(PlotSTMEnergySpectrum art::module + REG_SOURCE src/PlotSTMEnergySpectrum_module.cc + LIBRARIES REG +) -cet_build_plugin(PlotSTMMWDSpectrum art::module REG_SOURCE src/PlotSTMMWDSpectrum_module.cc) +cet_build_plugin(PlotSTMMWDSpectrum art::module + REG_SOURCE src/PlotSTMMWDSpectrum_module.cc + LIBRARIES REG +) -cet_build_plugin(PlotSTMWaveformDigis art::module REG_SOURCE src/PlotSTMWaveformDigis_module.cc) +cet_build_plugin(PlotSTMWaveformDigis art::module + REG_SOURCE src/PlotSTMWaveformDigis_module.cc + LIBRARIES REG +) -cet_build_plugin(STMMovingWindowDeconvolution art::module REG_SOURCE src/STMMovingWindowDeconvolution_module.cc) - -cet_build_plugin(STMZeroSuppression art::module REG_SOURCE src/STMZeroSuppression_module.cc) +cet_build_plugin(STMMovingWindowDeconvolution art::module + REG_SOURCE src/STMMovingWindowDeconvolution_module.cc + LIBRARIES REG +) +cet_build_plugin(STMZeroSuppression art::module + REG_SOURCE src/STMZeroSuppression_module.cc + LIBRARIES REG +) install_source(SUBDIRS src) install_fhicl(SUBDIRS fcl SUBDIRNAME STMReco) diff --git a/SeedService/CMakeLists.txt b/SeedService/CMakeLists.txt index c3db069a4f..0e071e598b 100644 --- a/SeedService/CMakeLists.txt +++ b/SeedService/CMakeLists.txt @@ -1,12 +1,27 @@ -cet_make_library( +cet_make_library(INTERFACE SOURCE -src/SeedService_service.cc -LIBRARIES PUBLIC -cetlib::cetlib + inc/ArtState.hh + inc/EngineId.hh + inc/SeedService.hh + LIBRARIES INTERFACE + art::Framework_Core + fhiclcpp::fhiclcpp + ) -cet_build_plugin(SeedTest01 art::module REG_SOURCE src/SeedTest01_module.cc) +cet_build_plugin(SeedService art::service + REG_SOURCE src/SeedService_service.cc + IMPL_SOURCE src/SeedService_service.cc + LIBRARIES PUBLIC + offline::SeedService +) +cet_build_plugin(SeedTest01 art::module + REG_SOURCE src/SeedTest01_module.cc + LIBRARIES REG + offline::SeedService + offline::SeedService_SeedService_service +) install_source(SUBDIRS src) install_headers(SUBDIRS inc) diff --git a/ServicesGeom/CMakeLists.txt b/ServicesGeom/CMakeLists.txt index b1290abe10..5a67d2fc3a 100644 --- a/ServicesGeom/CMakeLists.txt +++ b/ServicesGeom/CMakeLists.txt @@ -1,11 +1,11 @@ cet_make_library( SOURCE -src/ElectronicRack.cc -src/Pipe.cc -LIBRARIES PUBLIC -cetlib::cetlib + src/ElectronicRack.cc + src/Pipe.cc + LIBRARIES PUBLIC + + offline::Mu2eInterfaces ) - install_source(SUBDIRS src) install_headers(SUBDIRS inc) diff --git a/SimulationConditions/CMakeLists.txt b/SimulationConditions/CMakeLists.txt index 61a1d9498b..de677b2342 100644 --- a/SimulationConditions/CMakeLists.txt +++ b/SimulationConditions/CMakeLists.txt @@ -1,13 +1,16 @@ cet_make_library( SOURCE -src/SimBookkeeperCache.cc -src/SimBookkeeper.cc -src/SimBookkeeperMaker.cc -LIBRARIES PUBLIC -cetlib::cetlib + src/SimBookkeeperCache.cc + src/SimBookkeeper.cc + src/SimBookkeeperMaker.cc + LIBRARIES PUBLIC + art::Framework_Core + offline::DbService + offline::DbTables + offline::Mu2eInterfaces + offline::SimulationConfig ) - install_source(SUBDIRS src) install_headers(SUBDIRS inc) install_fhicl(SUBDIRS fcl SUBDIRNAME SimulationConditions) diff --git a/SimulationConfig/CMakeLists.txt b/SimulationConfig/CMakeLists.txt index 04a44744b2..6f78bd810f 100644 --- a/SimulationConfig/CMakeLists.txt +++ b/SimulationConfig/CMakeLists.txt @@ -1 +1,8 @@ +cet_make_library(INTERFACE + SOURCE + inc/SimBookkeeperConfig.hh + LIBRARIES INTERFACE + +) + install_headers(SUBDIRS inc) diff --git a/Sources/CMakeLists.txt b/Sources/CMakeLists.txt index 3f5d770402..9d2395c2d6 100644 --- a/Sources/CMakeLists.txt +++ b/Sources/CMakeLists.txt @@ -1,17 +1,53 @@ cet_make_library( SOURCE -src/CosmicCORSIKA.cc -src/ExtMonFNALMARSUtils.cc -src/FromCorsikaBinary_source.cc -src/FromEMFMARSFileWeighted_source.cc -src/FromExtMonFNALMARSFile_source.cc -src/FromSTMTestBeamData_source.cc -src/FromTrackerPrototypeData_source.cc -src/PBISequence_source.cc -src/STMTestBeamFileNameDecoder.cc -src/STMTestBeamHeaders.cc -LIBRARIES PUBLIC -cetlib::cetlib + src/CosmicCORSIKA.cc + src/ExtMonFNALMARSUtils.cc + src/STMTestBeamFileNameDecoder.cc + src/STMTestBeamHeaders.cc + LIBRARIES PUBLIC + + offline::CalorimeterGeom + offline::DataProducts + offline::ExtinctionMonitorFNAL_Geometry + offline::GeneralUtilities + offline::GeometryService + offline::GlobalConstantsService + offline::MCDataProducts + offline::Mu2eUtilities + offline::RecoDataProducts + offline::SeedService +) +cet_build_plugin(FromCorsikaBinary art::source + REG_SOURCE src/FromCorsikaBinary_source.cc + LIBRARIES REG + offline::Sources + offline::SeedService_SeedService_service +) +cet_build_plugin(FromEMFMARSFileWeighted art::source + REG_SOURCE src/FromEMFMARSFileWeighted_source.cc + LIBRARIES REG + offline::Sources +) +cet_build_plugin(FromExtMonFNALMARSFile art::source + REG_SOURCE src/FromExtMonFNALMARSFile_source.cc + LIBRARIES REG + offline::Sources +) +cet_build_plugin(FromSTMTestBeamData art::source + REG_SOURCE src/FromSTMTestBeamData_source.cc + LIBRARIES REG + offline::Sources +) +cet_build_plugin(FromTrackerPrototypeData art::source + REG_SOURCE src/FromTrackerPrototypeData_source.cc + LIBRARIES REG + offline::Sources + ROOT::Tree +) +cet_build_plugin(PBISequence art::source + REG_SOURCE src/PBISequence_source.cc + LIBRARIES REG + offline::Sources ) diff --git a/StoppingTargetGeom/CMakeLists.txt b/StoppingTargetGeom/CMakeLists.txt index 894b647c24..1eb89c39a4 100644 --- a/StoppingTargetGeom/CMakeLists.txt +++ b/StoppingTargetGeom/CMakeLists.txt @@ -1,10 +1,11 @@ cet_make_library( SOURCE -src/zBinningForFoils.cc -LIBRARIES PUBLIC -cetlib::cetlib + src/zBinningForFoils.cc + LIBRARIES PUBLIC + + offline::GeneralUtilities + offline::Mu2eInterfaces ) - install_source(SUBDIRS src) install_headers(SUBDIRS inc) diff --git a/TEveEventDisplay/CMakeLists.txt b/TEveEventDisplay/CMakeLists.txt index 115ee97b62..b7c85c12d0 100644 --- a/TEveEventDisplay/CMakeLists.txt +++ b/TEveEventDisplay/CMakeLists.txt @@ -1,30 +1,48 @@ cet_make_library( SOURCE -src/Collection_Filler.cc -src/Geom_Interface.cc -src/TEveMu2eCalorimeter.cc -src/TEveMu2eCluster.cc -src/TEveMu2eCRV.cc -src/TEveMu2eCRVEvent.cc -src/TEveMu2eCustomHelix.cc -src/TEveMu2eDataInterface.cc -src/TEveMu2eHit.cc -src/TEveMu2eMainWindow.cc -src/TEveMu2eMCInterface.cc -src/TEveMu2eMCTraj.cc -src/TEveMu2eProjectionInterface.cc -src/TEveMu2eStraightTrack.cc -src/TEveMu2eTracker.cc -LIBRARIES PUBLIC -cetlib::cetlib + src/Collection_Filler.cc + src/Geom_Interface.cc + src/TEveMu2eCalorimeter.cc + src/TEveMu2eCluster.cc + src/TEveMu2eCRV.cc + src/TEveMu2eCRVEvent.cc + src/TEveMu2eCustomHelix.cc + src/TEveMu2eDataInterface.cc + src/TEveMu2eHit.cc + src/TEveMu2eMainWindow.cc + src/TEveMu2eMCInterface.cc + src/TEveMu2eMCTraj.cc + src/TEveMu2eProjectionInterface.cc + src/TEveMu2eStraightTrack.cc + src/TEveMu2eTracker.cc + LIBRARIES PUBLIC + + offline::ConfigTools + offline::GeometryService + offline::GlobalConstantsService ) -cet_build_plugin(TEveEventDisplay art::module REG_SOURCE src/TEveEventDisplay_module.cc) +cet_build_plugin(TEveEventDisplay art::module + REG_SOURCE src/TEveEventDisplay_module.cc + LIBRARIES REG +) -cet_build_plugin(TEveGDMLTest art::module REG_SOURCE src/TEveGDMLTest_module.cc) +cet_build_plugin(TEveGDMLTest art::module + REG_SOURCE src/TEveGDMLTest_module.cc + LIBRARIES REG +) -cet_build_plugin(TEveNonGDMLTest art::module REG_SOURCE src/TEveNonGDMLTest_module.cc) +cet_build_plugin(TEveNonGDMLTest art::module + REG_SOURCE src/TEveNonGDMLTest_module.cc + LIBRARIES REG +) +art_dictionary( + CLASSES_DEF_XML ${CMAKE_CURRENT_SOURCE_DIR}/src/classes_def.xml + CLASSES_H ${CMAKE_CURRENT_SOURCE_DIR}/src/classes.h + DICTIONARY_LIBRARIES + offline::TEveEventDisplay +) install_source(SUBDIRS src) install_fhicl(SUBDIRS fcl SUBDIRNAME TEveEventDisplay) diff --git a/TestTools/CMakeLists.txt b/TestTools/CMakeLists.txt index 25c4d62765..1d43baf99d 100644 --- a/TestTools/CMakeLists.txt +++ b/TestTools/CMakeLists.txt @@ -1,10 +1,9 @@ cet_make_library( SOURCE -src/TestClass.cc -LIBRARIES PUBLIC -cetlib::cetlib + src/TestClass.cc + LIBRARIES PUBLIC + ) - install_source(SUBDIRS src) install_headers(SUBDIRS inc) diff --git a/TrackCaloMatching/CMakeLists.txt b/TrackCaloMatching/CMakeLists.txt index cecfad9bfa..fcfaca31e7 100644 --- a/TrackCaloMatching/CMakeLists.txt +++ b/TrackCaloMatching/CMakeLists.txt @@ -1,15 +1,32 @@ -cet_build_plugin(TrackCaloIntersection art::module REG_SOURCE src/TrackCaloIntersection_module.cc) +cet_build_plugin(TrackCaloIntersection art::module + REG_SOURCE src/TrackCaloIntersection_module.cc + LIBRARIES REG +) -cet_build_plugin(TrackCaloIntersectionMVA art::module REG_SOURCE src/TrackCaloIntersectionMVA_module.cc) +cet_build_plugin(TrackCaloIntersectionMVA art::module + REG_SOURCE src/TrackCaloIntersectionMVA_module.cc + LIBRARIES REG +) -cet_build_plugin(TrackCaloMatchingExtend art::module REG_SOURCE src/TrackCaloMatchingExtend_module.cc) +cet_build_plugin(TrackCaloMatchingExtend art::module + REG_SOURCE src/TrackCaloMatchingExtend_module.cc + LIBRARIES REG +) -cet_build_plugin(TrackCaloMatching art::module REG_SOURCE src/TrackCaloMatching_module.cc) +cet_build_plugin(TrackCaloMatching art::module + REG_SOURCE src/TrackCaloMatching_module.cc + LIBRARIES REG +) -cet_build_plugin(TrackCaloMatchingMVA art::module REG_SOURCE src/TrackCaloMatchingMVA_module.cc) - -cet_build_plugin(TrkExtrapol art::module REG_SOURCE src/TrkExtrapol_module.cc) +cet_build_plugin(TrackCaloMatchingMVA art::module + REG_SOURCE src/TrackCaloMatchingMVA_module.cc + LIBRARIES REG +) +cet_build_plugin(TrkExtrapol art::module + REG_SOURCE src/TrkExtrapol_module.cc + LIBRARIES REG +) install_source(SUBDIRS src) install_fhicl(SUBDIRS fcl SUBDIRNAME TrackCaloMatching) diff --git a/TrackerConditions/CMakeLists.txt b/TrackerConditions/CMakeLists.txt index b6ce4641dc..f1a03ebf60 100644 --- a/TrackerConditions/CMakeLists.txt +++ b/TrackerConditions/CMakeLists.txt @@ -1,28 +1,39 @@ cet_make_library( SOURCE -src/AlignedTrackerMaker.cc -src/DriftInfo.cc -src/FullReadoutStraw.cc -src/FullReadoutStrawMaker.cc -src/Mu2eDetector.cc -src/Mu2eDetectorMaker.cc -src/Mu2eMaterial.cc -src/Mu2eMaterialMaker.cc -src/StrawDrift.cc -src/StrawDriftMaker.cc -src/StrawElectronics.cc -src/StrawElectronicsMaker.cc -src/StrawPhysics.cc -src/StrawPhysicsMaker.cc -src/StrawResponse.cc -src/StrawResponseMaker.cc -src/TrackerStatus.cc -src/TrackerStatusMaker.cc -LIBRARIES PUBLIC -cetlib::cetlib + src/AlignedTrackerMaker.cc + src/DriftInfo.cc + src/FullReadoutStraw.cc + src/FullReadoutStrawMaker.cc + src/Mu2eDetector.cc + src/Mu2eDetectorMaker.cc + src/Mu2eMaterial.cc + src/Mu2eMaterialMaker.cc + src/StrawDrift.cc + src/StrawDriftMaker.cc + src/StrawElectronics.cc + src/StrawElectronicsMaker.cc + src/StrawPhysics.cc + src/StrawPhysicsMaker.cc + src/StrawResponse.cc + src/StrawResponseMaker.cc + src/TrackerStatus.cc + src/TrackerStatusMaker.cc + LIBRARIES PUBLIC + BTrk_MatEnv + offline::BFieldGeom + offline::DAQConditions + offline::DataProducts + offline::DbService + offline::DbTables + offline::GeneralUtilities + offline::GeometryService + offline::Mu2eBTrk + offline::Mu2eInterfaces + offline::ProditionsService + offline::TrackerConfig + offline::TrackerGeom ) - install_source(SUBDIRS src) install_headers(SUBDIRS inc) install_fhicl(SUBDIRS fcl SUBDIRNAME TrackerConditions) diff --git a/TrackerConfig/CMakeLists.txt b/TrackerConfig/CMakeLists.txt index 04a44744b2..9adbf8ea2e 100644 --- a/TrackerConfig/CMakeLists.txt +++ b/TrackerConfig/CMakeLists.txt @@ -1 +1,16 @@ +cet_make_library(INTERFACE + SOURCE + inc/AlignedTrackerConfig.hh + inc/FullReadoutStrawConfig.hh + inc/Mu2eDetectorConfig.hh + inc/Mu2eMaterialConfig.hh + inc/StrawDriftConfig.hh + inc/StrawElectronicsConfig.hh + inc/StrawPhysicsConfig.hh + inc/StrawResponseConfig.hh + inc/TrackerStatusConfig.hh + LIBRARIES INTERFACE + +) + install_headers(SUBDIRS inc) diff --git a/TrackerGeom/CMakeLists.txt b/TrackerGeom/CMakeLists.txt index bb91145362..7da27550f5 100644 --- a/TrackerGeom/CMakeLists.txt +++ b/TrackerGeom/CMakeLists.txt @@ -1,16 +1,19 @@ cet_make_library( SOURCE -src/Manifold.cc -src/Panel.cc -src/Plane.cc -src/Straw.cc -src/SupportModel.cc -src/SupportStructure.cc -src/Tracker.cc -LIBRARIES PUBLIC -cetlib::cetlib + src/Manifold.cc + src/Panel.cc + src/Plane.cc + src/Straw.cc + src/SupportModel.cc + src/SupportStructure.cc + src/Tracker.cc + LIBRARIES PUBLIC + + offline::DataProducts + offline::GeneralUtilities + offline::GeomPrimitives + offline::Mu2eInterfaces ) - install_source(SUBDIRS src) install_headers(SUBDIRS inc) diff --git a/TrackerMC/CMakeLists.txt b/TrackerMC/CMakeLists.txt index e5033af2d1..74e1af478d 100644 --- a/TrackerMC/CMakeLists.txt +++ b/TrackerMC/CMakeLists.txt @@ -1,19 +1,39 @@ cet_make_library( SOURCE -src/StrawCluster.cc -src/StrawClusterSequence.cc -src/StrawClusterSequencePair.cc -src/StrawWaveform.cc -LIBRARIES PUBLIC -cetlib::cetlib + src/StrawCluster.cc + src/StrawClusterSequence.cc + src/StrawClusterSequencePair.cc + src/StrawWaveform.cc + LIBRARIES PUBLIC + + offline::ConditionsService + offline::DataProducts + offline::MCDataProducts + offline::TrackerConditions + offline::TrackerGeom ) -cet_build_plugin(MakeMCKalSeed art::module REG_SOURCE src/MakeMCKalSeed_module.cc) +cet_build_plugin(MakeMCKalSeed art::module + REG_SOURCE src/MakeMCKalSeed_module.cc + LIBRARIES REG +) -cet_build_plugin(MakeStrawGasSteps art::module REG_SOURCE src/MakeStrawGasSteps_module.cc) +cet_build_plugin(MakeStrawGasSteps art::module + REG_SOURCE src/MakeStrawGasSteps_module.cc + LIBRARIES REG +) -cet_build_plugin(StrawDigisFromStrawGasSteps art::module REG_SOURCE src/StrawDigisFromStrawGasSteps_module.cc) +cet_build_plugin(StrawDigisFromStrawGasSteps art::module + REG_SOURCE src/StrawDigisFromStrawGasSteps_module.cc + LIBRARIES REG +) +art_dictionary( + CLASSES_DEF_XML ${CMAKE_CURRENT_SOURCE_DIR}/src/classes_def.xml + CLASSES_H ${CMAKE_CURRENT_SOURCE_DIR}/src/classes.h + DICTIONARY_LIBRARIES + offline::TrackerMC +) install_source(SUBDIRS src) install_headers(SUBDIRS inc) diff --git a/Trigger/CMakeLists.txt b/Trigger/CMakeLists.txt index 9fd23864d8..cbfde2b3d2 100644 --- a/Trigger/CMakeLists.txt +++ b/Trigger/CMakeLists.txt @@ -1,13 +1,27 @@ -cet_build_plugin(DigiFilter art::module REG_SOURCE src/DigiFilter_module.cc) +cet_build_plugin(DigiFilter art::module + REG_SOURCE src/DigiFilter_module.cc + LIBRARIES REG +) -cet_build_plugin(EvalWeightedEventCounts art::module REG_SOURCE src/EvalWeightedEventCounts_module.cc) +cet_build_plugin(EvalWeightedEventCounts art::module + REG_SOURCE src/EvalWeightedEventCounts_module.cc + LIBRARIES REG +) -cet_build_plugin(MergeTriggerInfo art::module REG_SOURCE src/MergeTriggerInfo_module.cc) +cet_build_plugin(MergeTriggerInfo art::module + REG_SOURCE src/MergeTriggerInfo_module.cc + LIBRARIES REG +) -cet_build_plugin(PrescaleEvent art::module REG_SOURCE src/PrescaleEvent_module.cc) - -cet_build_plugin(ReadTriggerInfo art::module REG_SOURCE src/ReadTriggerInfo_module.cc) +cet_build_plugin(PrescaleEvent art::module + REG_SOURCE src/PrescaleEvent_module.cc + LIBRARIES REG +) +cet_build_plugin(ReadTriggerInfo art::module + REG_SOURCE src/ReadTriggerInfo_module.cc + LIBRARIES REG +) install_source(SUBDIRS src) install_fhicl(SUBDIRS fcl SUBDIRNAME Trigger) diff --git a/TrkDiag/CMakeLists.txt b/TrkDiag/CMakeLists.txt index 12dbe52cfa..4d8577a685 100644 --- a/TrkDiag/CMakeLists.txt +++ b/TrkDiag/CMakeLists.txt @@ -1,38 +1,94 @@ cet_make_library( SOURCE -src/TrkCaloDiag.cc -src/TrkComp.cc -src/TrkMCTools.cc -LIBRARIES PUBLIC -cetlib::cetlib + src/TrkCaloDiag.cc + src/TrkComp.cc + src/TrkMCTools.cc + LIBRARIES PUBLIC + + offline::BFieldGeom + offline::BTrkData + offline::ConfigTools + offline::DataProducts + offline::GeometryService + offline::MCDataProducts + offline::Mu2eUtilities + offline::ParticleID + offline::RecoDataProducts + offline::SeedService + offline::TrackerGeom ) -cet_build_plugin(BinnedSpectrumWeight art::module REG_SOURCE src/BinnedSpectrumWeight_module.cc) +cet_build_plugin(BinnedSpectrumWeight art::module + REG_SOURCE src/BinnedSpectrumWeight_module.cc + LIBRARIES REG +) -cet_build_plugin(BkgDiag art::module REG_SOURCE src/BkgDiag_module.cc) +cet_build_plugin(BkgDiag art::module + REG_SOURCE src/BkgDiag_module.cc + LIBRARIES REG +) -cet_build_plugin(ComboHitDiag art::module REG_SOURCE src/ComboHitDiag_module.cc) +cet_build_plugin(ComboHitDiag art::module + REG_SOURCE src/ComboHitDiag_module.cc + LIBRARIES REG +) -cet_build_plugin(HelixDiag art::module REG_SOURCE src/HelixDiag_module.cc) +cet_build_plugin(HelixDiag art::module + REG_SOURCE src/HelixDiag_module.cc + LIBRARIES REG +) -cet_build_plugin(ProtonBunchTimeDiag art::module REG_SOURCE src/ProtonBunchTimeDiag_module.cc) +cet_build_plugin(ProtonBunchTimeDiag art::module + REG_SOURCE src/ProtonBunchTimeDiag_module.cc + LIBRARIES REG +) -cet_build_plugin(RMCWeight art::module REG_SOURCE src/RMCWeight_module.cc) +cet_build_plugin(RMCWeight art::module + REG_SOURCE src/RMCWeight_module.cc + LIBRARIES REG +) -cet_build_plugin(StrawHitDiag art::module REG_SOURCE src/StrawHitDiag_module.cc) +cet_build_plugin(StrawHitDiag art::module + REG_SOURCE src/StrawHitDiag_module.cc + LIBRARIES REG +) -cet_build_plugin(StrawResponseTest art::module REG_SOURCE src/StrawResponseTest_module.cc) +cet_build_plugin(StrawResponseTest art::module + REG_SOURCE src/StrawResponseTest_module.cc + LIBRARIES REG +) -cet_build_plugin(TimeClusterDiag art::module REG_SOURCE src/TimeClusterDiag_module.cc) +cet_build_plugin(TimeClusterDiag art::module + REG_SOURCE src/TimeClusterDiag_module.cc + LIBRARIES REG +) -cet_build_plugin(TrackPID art::module REG_SOURCE src/TrackPID_module.cc) +cet_build_plugin(TrackPID art::module + REG_SOURCE src/TrackPID_module.cc + LIBRARIES REG +) -cet_build_plugin(TrackQuality art::module REG_SOURCE src/TrackQuality_module.cc) +cet_build_plugin(TrackQuality art::module + REG_SOURCE src/TrackQuality_module.cc + LIBRARIES REG +) -cet_build_plugin(TrkGeomTest art::module REG_SOURCE src/TrkGeomTest_module.cc) +cet_build_plugin(TrkGeomTest art::module + REG_SOURCE src/TrkGeomTest_module.cc + LIBRARIES REG +) -cet_build_plugin(TrkRecoDiag art::module REG_SOURCE src/TrkRecoDiag_module.cc) +cet_build_plugin(TrkRecoDiag art::module + REG_SOURCE src/TrkRecoDiag_module.cc + LIBRARIES REG +) +art_dictionary( + CLASSES_DEF_XML ${CMAKE_CURRENT_SOURCE_DIR}/src/classes_def.xml + CLASSES_H ${CMAKE_CURRENT_SOURCE_DIR}/src/classes.h + DICTIONARY_LIBRARIES + offline::TrkDiag +) install_source(SUBDIRS src) install_headers(SUBDIRS inc) diff --git a/TrkExt/CMakeLists.txt b/TrkExt/CMakeLists.txt index 0550933a1a..5f0cd823ae 100644 --- a/TrkExt/CMakeLists.txt +++ b/TrkExt/CMakeLists.txt @@ -1,20 +1,33 @@ cet_make_library( SOURCE -src/TrkExtDetectors.cc -src/TrkExtDiag.cc -src/TrkExtInstanceName.cc -src/TrkExtMaterial.cc -src/TrkExtMCHits.cc -src/TrkExtProtonAbsorber.cc -src/TrkExtShape.cc -src/TrkExtStoppingTarget.cc -src/TrkExtToyDS.cc -LIBRARIES PUBLIC -cetlib::cetlib + src/TrkExtDetectors.cc + src/TrkExtDiag.cc + src/TrkExtInstanceName.cc + src/TrkExtMaterial.cc + src/TrkExtMCHits.cc + src/TrkExtProtonAbsorber.cc + src/TrkExtShape.cc + src/TrkExtStoppingTarget.cc + src/TrkExtToyDS.cc + LIBRARIES PUBLIC + + offline::BFieldGeom + offline::BTrkData + offline::ConfigTools + offline::DataProducts + offline::DetectorSolenoidGeom + offline::GeneralUtilities + offline::GeometryService + offline::MCDataProducts + offline::MECOStyleProtonAbsorberGeom + offline::RecoDataProducts + offline::StoppingTargetGeom ) -cet_build_plugin(TrkExt art::module REG_SOURCE src/TrkExt_module.cc) - +cet_build_plugin(TrkExt art::module + REG_SOURCE src/TrkExt_module.cc + LIBRARIES REG +) install_source(SUBDIRS src) install_headers(SUBDIRS inc) diff --git a/TrkFilters/CMakeLists.txt b/TrkFilters/CMakeLists.txt index d6ef263adc..1bfb6dd6c0 100644 --- a/TrkFilters/CMakeLists.txt +++ b/TrkFilters/CMakeLists.txt @@ -1,9 +1,17 @@ -cet_build_plugin(HelixFilter art::module REG_SOURCE src/HelixFilter_module.cc) +cet_build_plugin(HelixFilter art::module + REG_SOURCE src/HelixFilter_module.cc + LIBRARIES REG +) -cet_build_plugin(SeedFilter art::module REG_SOURCE src/SeedFilter_module.cc) - -cet_build_plugin(TimeClusterFilter art::module REG_SOURCE src/TimeClusterFilter_module.cc) +cet_build_plugin(SeedFilter art::module + REG_SOURCE src/SeedFilter_module.cc + LIBRARIES REG +) +cet_build_plugin(TimeClusterFilter art::module + REG_SOURCE src/TimeClusterFilter_module.cc + LIBRARIES REG +) install_source(SUBDIRS src) install_fhicl(SUBDIRS fcl SUBDIRNAME TrkFilters) diff --git a/TrkHitReco/CMakeLists.txt b/TrkHitReco/CMakeLists.txt index 721307d8ee..28962e725a 100644 --- a/TrkHitReco/CMakeLists.txt +++ b/TrkHitReco/CMakeLists.txt @@ -1,28 +1,49 @@ cet_make_library( SOURCE -src/ComboPeakFitRoot.cc -src/PeakFit.cc -src/PeakFitFunction.cc -src/PeakFitParams.cc -src/PeakFitRoot.cc -src/StrawHitRecoUtils.cc -src/TNTClusterer.cc -LIBRARIES PUBLIC -cetlib::cetlib + src/ComboPeakFitRoot.cc + src/PeakFit.cc + src/PeakFitFunction.cc + src/PeakFitParams.cc + src/PeakFitRoot.cc + src/StrawHitRecoUtils.cc + src/TNTClusterer.cc + LIBRARIES PUBLIC + + offline::DataProducts + offline::RecoDataProducts + offline::TrackerConditions + offline::TrackerGeom ) -cet_build_plugin(CombineStrawHits art::module REG_SOURCE src/CombineStrawHits_module.cc) - -cet_build_plugin(FlagBkgHits art::module REG_SOURCE src/FlagBkgHits_module.cc) +cet_build_plugin(CombineStrawHits art::module + REG_SOURCE src/CombineStrawHits_module.cc + LIBRARIES REG +) -cet_build_plugin(MakeStereoHits art::module REG_SOURCE src/MakeStereoHits_module.cc) +cet_build_plugin(FlagBkgHits art::module + REG_SOURCE src/FlagBkgHits_module.cc + LIBRARIES REG +) -cet_build_plugin(ProtonBunchTimeFromStrawDigis art::module REG_SOURCE src/ProtonBunchTimeFromStrawDigis_module.cc) +cet_build_plugin(MakeStereoHits art::module + REG_SOURCE src/MakeStereoHits_module.cc + LIBRARIES REG +) -cet_build_plugin(ReadStrawDigi art::module REG_SOURCE src/ReadStrawDigi_module.cc) +cet_build_plugin(ProtonBunchTimeFromStrawDigis art::module + REG_SOURCE src/ProtonBunchTimeFromStrawDigis_module.cc + LIBRARIES REG +) -cet_build_plugin(StrawHitReco art::module REG_SOURCE src/StrawHitReco_module.cc) +cet_build_plugin(ReadStrawDigi art::module + REG_SOURCE src/ReadStrawDigi_module.cc + LIBRARIES REG +) +cet_build_plugin(StrawHitReco art::module + REG_SOURCE src/StrawHitReco_module.cc + LIBRARIES REG +) install_source(SUBDIRS src) install_headers(SUBDIRS inc) diff --git a/TrkPatRec/CMakeLists.txt b/TrkPatRec/CMakeLists.txt index 60991a0cd4..6678ff371e 100644 --- a/TrkPatRec/CMakeLists.txt +++ b/TrkPatRec/CMakeLists.txt @@ -1,23 +1,45 @@ cet_make_library( SOURCE -src/KalFinalFitDiag_tool.cc -src/KalSeedFitDiag_tool.cc -src/RobustHelixFinderDiag_tool.cc -src/TimeAndPhiClusterFinderDiag_tool.cc -LIBRARIES PUBLIC -cetlib::cetlib + src/KalFinalFitDiag_tool.cc + src/KalSeedFitDiag_tool.cc + src/RobustHelixFinderDiag_tool.cc + src/TimeAndPhiClusterFinderDiag_tool.cc + LIBRARIES PUBLIC + + offline::BTrkData + offline::CalorimeterGeom + offline::GeometryService + offline::MCDataProducts + offline::Mu2eUtilities + offline::RecoDataProducts + offline::TrackerGeom + offline::TrkReco ) -cet_build_plugin(KalFinalFit art::module REG_SOURCE src/KalFinalFit_module.cc) - -cet_build_plugin(KalSeedFit art::module REG_SOURCE src/KalSeedFit_module.cc) +cet_build_plugin(KalFinalFit art::module + REG_SOURCE src/KalFinalFit_module.cc + LIBRARIES REG +) -cet_build_plugin(RobustHelixFinder art::module REG_SOURCE src/RobustHelixFinder_module.cc) +cet_build_plugin(KalSeedFit art::module + REG_SOURCE src/KalSeedFit_module.cc + LIBRARIES REG +) -cet_build_plugin(TimeAndPhiClusterFinder art::module REG_SOURCE src/TimeAndPhiClusterFinder_module.cc) +cet_build_plugin(RobustHelixFinder art::module + REG_SOURCE src/RobustHelixFinder_module.cc + LIBRARIES REG +) -cet_build_plugin(TimeClusterFinder art::module REG_SOURCE src/TimeClusterFinder_module.cc) +cet_build_plugin(TimeAndPhiClusterFinder art::module + REG_SOURCE src/TimeAndPhiClusterFinder_module.cc + LIBRARIES REG +) +cet_build_plugin(TimeClusterFinder art::module + REG_SOURCE src/TimeClusterFinder_module.cc + LIBRARIES REG +) install_source(SUBDIRS src) install_headers(SUBDIRS inc) diff --git a/TrkReco/CMakeLists.txt b/TrkReco/CMakeLists.txt index beb1799567..3f1c9d1deb 100644 --- a/TrkReco/CMakeLists.txt +++ b/TrkReco/CMakeLists.txt @@ -1,27 +1,51 @@ cet_make_library( SOURCE -src/AmbigResolver.cc -src/DoubletAmbigResolver.cc -src/FixedAmbigResolver.cc -src/HitAmbigResolver.cc -src/KalFit.cc -src/KalFitData.cc -src/PanelAmbigResolver.cc -src/PanelAmbigStructs.cc -src/PanelStateIterator.cc -src/RobustHelixFinderData.cc -src/RobustHelixFit.cc -src/TrkDef.cc -src/TrkPrintUtils.cc -src/TrkRecoMcUtils_tool.cc -src/TrkTimeCalculator.cc -src/TrkUtilities.cc -LIBRARIES PUBLIC -cetlib::cetlib + src/AmbigResolver.cc + src/DoubletAmbigResolver.cc + src/FixedAmbigResolver.cc + src/HitAmbigResolver.cc + src/KalFit.cc + src/KalFitData.cc + src/PanelAmbigResolver.cc + src/PanelAmbigStructs.cc + src/PanelStateIterator.cc + src/RobustHelixFinderData.cc + src/RobustHelixFit.cc + src/TrkDef.cc + src/TrkPrintUtils.cc + src/TrkRecoMcUtils_tool.cc + src/TrkTimeCalculator.cc + src/TrkUtilities.cc + LIBRARIES PUBLIC + + offline::BFieldGeom + offline::BTrkData + offline::CalorimeterGeom + offline::ConditionsService + offline::DataProducts + offline::GeneralUtilities + offline::GeometryService + offline::MCDataProducts + offline::Mu2eBTrk + offline::Mu2eUtilities + offline::ProditionsService + offline::RecoDataProducts + offline::StoppingTargetGeom + offline::TrackerConditions + offline::TrackerGeom ) -cet_build_plugin(MergeHelices art::module REG_SOURCE src/MergeHelices_module.cc) +cet_build_plugin(MergeHelices art::module + REG_SOURCE src/MergeHelices_module.cc + LIBRARIES REG +) +art_dictionary( + CLASSES_DEF_XML ${CMAKE_CURRENT_SOURCE_DIR}/src/classes_def.xml + CLASSES_H ${CMAKE_CURRENT_SOURCE_DIR}/src/classes.h + DICTIONARY_LIBRARIES + offline::TrkReco +) install_source(SUBDIRS src) install_headers(SUBDIRS inc) diff --git a/UtilityModules/CMakeLists.txt b/UtilityModules/CMakeLists.txt index 430219cf70..ada137029a 100644 --- a/UtilityModules/CMakeLists.txt +++ b/UtilityModules/CMakeLists.txt @@ -1,8 +1,16 @@ -cet_build_plugin(ModifyTrackSPM art::module REG_SOURCE src/ModifyTrackSPM_module.cc) +cet_build_plugin(ModifyTrackSPM art::module + REG_SOURCE src/ModifyTrackSPM_module.cc + LIBRARIES REG +) -cet_build_plugin(NullProducer art::module REG_SOURCE src/NullProducer_module.cc) - -cet_build_plugin(ReadTrackSPM art::module REG_SOURCE src/ReadTrackSPM_module.cc) +cet_build_plugin(NullProducer art::module + REG_SOURCE src/NullProducer_module.cc + LIBRARIES REG +) +cet_build_plugin(ReadTrackSPM art::module + REG_SOURCE src/ReadTrackSPM_module.cc + LIBRARIES REG +) install_source(SUBDIRS src) diff --git a/Validation/CMakeLists.txt b/Validation/CMakeLists.txt index 637ec94dbb..8119aa8cf6 100644 --- a/Validation/CMakeLists.txt +++ b/Validation/CMakeLists.txt @@ -1,49 +1,92 @@ cet_make_library( SOURCE -src/ValBkgCluster.cc -src/ValBkgQual.cc -src/ValCaloCluster.cc -src/ValCaloDigi.cc -src/ValCaloHit.cc -src/ValCaloRecoDigi.cc -src/ValCaloShowerStep.cc -src/ValComboHit.cc -src/valCompare_main.cc -src/ValCrvCoincidenceCluster.cc -src/ValCrvDigi.cc -src/ValCrvDigiMC.cc -src/ValCrvRecoPulse.cc -src/ValCrvStep.cc -src/ValEventWindowMarker.cc -src/ValGenParticle.cc -src/ValHelixSeed.cc -src/ValId.cc -src/ValKalSeed.cc -src/ValProtonBunchIntensity.cc -src/ValProtonBunchTime.cc -src/ValProtonBunchTimeMC.cc -src/ValSimParticle.cc -src/ValStatusG4.cc -src/ValStepPointMC.cc -src/ValSTMWaveformDigi.cc -src/ValStrawDigiADCWaveform.cc -src/ValStrawDigi.cc -src/ValStrawDigiMC.cc -src/ValStrawGasStep.cc -src/ValStrawHit.cc -src/ValStrawHitFlag.cc -src/ValTimeCluster.cc -src/ValTrackClusterMatch.cc -src/ValTrackSummary.cc -src/ValTriggerInfo.cc -src/ValTriggerResults.cc -LIBRARIES PUBLIC -cetlib::cetlib + src/ValBkgCluster.cc + src/ValBkgQual.cc + src/ValCaloCluster.cc + src/ValCaloDigi.cc + src/ValCaloHit.cc + src/ValCaloRecoDigi.cc + src/ValCaloShowerStep.cc + src/ValComboHit.cc + src/ValCrvCoincidenceCluster.cc + src/ValCrvDigi.cc + src/ValCrvDigiMC.cc + src/ValCrvRecoPulse.cc + src/ValCrvStep.cc + src/ValEventWindowMarker.cc + src/ValGenParticle.cc + src/ValHelixSeed.cc + src/ValId.cc + src/ValKalSeed.cc + src/ValProtonBunchIntensity.cc + src/ValProtonBunchTime.cc + src/ValProtonBunchTimeMC.cc + src/ValSimParticle.cc + src/ValStatusG4.cc + src/ValStepPointMC.cc + src/ValSTMWaveformDigi.cc + src/ValStrawDigiADCWaveform.cc + src/ValStrawDigi.cc + src/ValStrawDigiMC.cc + src/ValStrawGasStep.cc + src/ValStrawHit.cc + src/ValStrawHitFlag.cc + src/ValTimeCluster.cc + src/ValTrackClusterMatch.cc + src/ValTrackSummary.cc + src/ValTriggerInfo.cc + src/ValTriggerResults.cc + LIBRARIES PUBLIC + + offline::DataProducts + offline::GeometryService + offline::KinKalGeom + offline::MCDataProducts + offline::Mu2eKinKal + offline::Mu2eUtilities + offline::RecoDataProducts + offline::TrackerGeom ) -cet_build_plugin(Validation art::module REG_SOURCE src/Validation_module.cc) +cet_make_library(LIBRARY_NAME Validation_Root + SOURCE + root/TValCompare.cc + root/TValHist.cc + root/TValHistE.cc + root/TValHistH.cc + root/TValHistP.cc + root/TValHist2.cc + root/TValPar.cc + LIBRARIES PUBLIC + BTrk_difAlgebra + offline::Validation + ROOT::Postscript + ROOT::Core + ROOT::Cling + ROOT::RIO +) + +cet_make_exec(NAME valCompare + SOURCE src/valCompare_main.cc + LIBRARIES + offline::Validation_Root + offline::Validation_dict +) +cet_build_plugin(Validation art::module + REG_SOURCE src/Validation_module.cc + LIBRARIES REG + offline::Validation_Root + offline::Validation_dict +) + +art_dictionary( + CLASSES_DEF_XML ${CMAKE_CURRENT_SOURCE_DIR}/root/classes_def.xml + CLASSES_H ${CMAKE_CURRENT_SOURCE_DIR}/root/classes.h + DICTIONARY_LIBRARIES + offline::Validation_Root +) -install_source(SUBDIRS src) +install_source(SUBDIRS src root) install_headers(SUBDIRS inc) install_fhicl(SUBDIRS fcl SUBDIRNAME Validation) diff --git a/bin/CMakeLists.txt b/bin/CMakeLists.txt new file mode 100644 index 0000000000..e69de29bb2 diff --git a/boost_fix/CMakeLists.txt b/boost_fix/CMakeLists.txt new file mode 100644 index 0000000000..e69de29bb2 diff --git a/scripts/CMakeLists.txt b/scripts/CMakeLists.txt new file mode 100644 index 0000000000..e69de29bb2 diff --git a/ups_install/CMakeLists.txt b/ups_install/CMakeLists.txt new file mode 100644 index 0000000000..e69de29bb2 From bc41341659ac69569fcba75ce65dfabb5a2afa6e Mon Sep 17 00:00:00 2001 From: Eric Flumerfelt Date: Fri, 20 Oct 2023 16:52:03 -0500 Subject: [PATCH 008/213] Automate some more CMake generation --- make_cmake.sh | 103 ++++++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 91 insertions(+), 12 deletions(-) diff --git a/make_cmake.sh b/make_cmake.sh index f680f5579c..e995ebe193 100755 --- a/make_cmake.sh +++ b/make_cmake.sh @@ -5,47 +5,126 @@ for dir in */;do if [ -f CMakeLists.txt ];then mv CMakeLists.txt{,.bak} fi - - if [ -d src ]; then + + lib_list='' + for file in src/*.cc inc/*.hh;do + if ! [ -f $file ]; then continue; fi + if [[ $file =~ "_.*.cc" ]]; then + continue + fi + if [[ $file =~ "_.*.hh" ]]; then + continue + fi + lib_list="$lib_list`grep Offline/ $file|grep -v $dir|sed 's|.*Offline/|offline::|g;s|/.*||g'|uniq|tr '\n' ','`" + done + lib_list=`echo $lib_list|tr ',' '\n'|sort|uniq|awk '{print " "$1}'` make_lib=0 + make_ilib=0 for file in src/*.cc;do - if [[ $file =~ "_module.cc" ]]; then + if ! [ -f $file ]; then continue; fi + if [[ $file =~ "_.*.cc" ]]; then continue fi make_lib=1 break done + for file in inc/*.hh;do + if ! [ -f $file ]; then continue; fi + make_ilib=1 + break + done if [ $make_lib -eq 1 ];then echo 'cet_make_library( - SOURCE' >CMakeLists.txt + SOURCE' >CMakeLists.txt for file in src/*.cc;do - if [[ $file =~ "_module.cc" ]]; then + if [[ $file =~ "_.*.cc" ]]; then continue fi - echo $file >>CMakeLists.txt + echo " $file" >>CMakeLists.txt done - echo "LIBRARIES PUBLIC" >>CMakeLists.txt - echo "cetlib::cetlib" >>CMakeLists.txt # For example + echo " LIBRARIES PUBLIC" >>CMakeLists.txt + echo "$lib_list" >>CMakeLists.txt + echo ")" >>CMakeLists.txt + echo >>CMakeLists.txt + + elif [ $make_ilib -eq 1 ];then + echo 'cet_make_library(INTERFACE + SOURCE' >>CMakeLists.txt + + for file in inc/*.hh;do + echo " $file" >>CMakeLists.txt + done + + echo " LIBRARIES INTERFACE" >>CMakeLists.txt + echo "$lib_list" >>CMakeLists.txt echo ")" >>CMakeLists.txt echo >>CMakeLists.txt + + fi + + execcount=`ls src/*_main.cc 2>/dev/null|wc -l` + if [ execcount -gt 0 ]; then + for file in src/*_main.cc;do + execname=`echo $file|sed 's|src/||g;s/_main.cc//g'` + echo "cet_make_exec(NAME $execname + SOURCE $file + LIBRARIES" >>CMakeLists.txt + echo " offline::$dirname" >>CMakeLists.txt + file_lib_list="`grep Offline/ $file|grep -v $dir|sed 's|.*Offline/|offline::|g;s|/.*||g'|uniq|tr '\n' ','`" + file_lib_list=`echo $file_lib_list|tr ',' '\n'|sort|uniq|awk '{print " "$1}'` + echo "$file_lib_list" >>CMakeLists.txt + echo ")" >>CMakeLists.txt + echo >> CMakeLists.txt + done + fi + + svccount=`ls src/*_service.cc 2>/dev/null|wc -l` + if [ $svccount -gt 0 ]; then + for file in src/*_service.cc;do + svcname=`echo $file|sed 's|src/||g;s/_service.cc//g'` + echo "cet_build_plugin($svcname art::service + REG_SOURCE $file + LIBRARIES REG" >>CMakeLists.txt + echo " offline::$dirname" >>CMakeLists.txt + file_lib_list="`grep Offline/ $file|grep -v $dir|sed 's|.*Offline/|offline::|g;s|/.*||g'|uniq|tr '\n' ','`" + file_lib_list=`echo $file_lib_list|tr ',' '\n'|sort|uniq|awk '{print " "$1}'` + echo "$file_lib_list" >>CMakeLists.txt + echo ")" >>CMakeLists.txt + echo >> CMakeLists.txt + done fi modcount=`ls src/*_module.cc 2>/dev/null |wc -l` if [ $modcount -gt 0 ]; then for file in src/*_module.cc;do modname=`echo $file|sed 's|src/||g;s/_module.cc//g'` - echo "cet_build_plugin($modname art::module REG_SOURCE $file)" >>CMakeLists.txt + echo "cet_build_plugin($modname art::module + REG_SOURCE $file + LIBRARIES REG" >>CMakeLists.txt + echo " offline::$dirname" >>CMakeLists.txt + file_lib_list="`grep Offline/ $file|grep -v $dir|sed 's|.*Offline/|offline::|g;s|/.*||g'|uniq|tr '\n' ','`" + file_lib_list=`echo $file_lib_list|tr ',' '\n'|sort|uniq|awk '{print " "$1}'` + echo "$file_lib_list" >>CMakeLists.txt + echo ")" >>CMakeLists.txt echo >> CMakeLists.txt done fi - echo >>CMakeLists.txt - echo "install_source(SUBDIRS src)" >> CMakeLists.txt - + if [ -f src/classes.h ]; then + echo 'art_dictionary( NO_CHECK_CLASS_VERSION # For some reason this segfaults' >>CMakeLists.txt + echo ' CLASSES_DEF_XML ${CMAKE_CURRENT_SOURCE_DIR}/src/classes_def.xml' >>CMakeLists.txt + echo ' CLASSES_H ${CMAKE_CURRENT_SOURCE_DIR}/src/classes.h' >>CMakeLists.txt + echo ' DICTIONARY_LIBRARIES' >>CMakeLists.txt + echo " offline::$dirname" >>CMakeLists.txt + echo ')' >>CMakeLists.txt + fi + + if [ -d src ]; then + echo "install_source(SUBDIRS src)" >> CMakeLists.txt fi if [ -d inc ]; then echo "install_headers(SUBDIRS inc)" >> CMakeLists.txt From cd953cf3bf794084c543d257d3a90e2a69c91405 Mon Sep 17 00:00:00 2001 From: Eric Flumerfelt Date: Fri, 20 Oct 2023 19:24:51 -0500 Subject: [PATCH 009/213] Re-run with updated make_cmake.sh, make sure CMake runs properly. --- Analyses/CMakeLists.txt | 429 +++++++++++++++++- BFieldTest/CMakeLists.txt | 6 + CMakeLists.txt | 68 +-- CRVFilters/CMakeLists.txt | 5 + CRVReco/CMakeLists.txt | 14 + CRVResponse/CMakeLists.txt | 89 ++++ CalPatRec/CMakeLists.txt | 146 +++++- CaloCluster/CMakeLists.txt | 21 + CaloDiag/CMakeLists.txt | 28 +- CaloFilters/CMakeLists.txt | 33 ++ CaloMC/CMakeLists.txt | 42 ++ CaloReco/CMakeLists.txt | 18 + CommonMC/CMakeLists.txt | 32 +- Compression/CMakeLists.txt | 13 + ConditionsService/CMakeLists.txt | 2 + CosmicReco/CMakeLists.txt | 90 ++++ DAQ/CMakeLists.txt | 49 ++ DataProducts/CMakeLists.txt | 11 +- DbService/CMakeLists.txt | 20 +- EventDisplay/CMakeLists.txt | 17 +- EventGenerator/CMakeLists.txt | 355 ++++++++++++++- EventMixing/CMakeLists.txt | 21 + ExtinctionMonitorFNAL/Analyses/CMakeLists.txt | 54 ++- ExtinctionMonitorFNAL/CMakeLists.txt | 1 + .../ComponentTests/CMakeLists.txt | 7 + .../Digitization/CMakeLists.txt | 7 + .../Reconstruction/CMakeLists.txt | 9 +- .../TruthAlgs/CMakeLists.txt | 6 + Filters/CMakeLists.txt | 86 +++- GeneralUtilities/CMakeLists.txt | 10 +- GeomPrimitives/CMakeLists.txt | 1 + GeometryService/CMakeLists.txt | 20 + GlobalConstantsService/CMakeLists.txt | 1 + HelloWorld/CMakeLists.txt | 4 + MCDataProducts/CMakeLists.txt | 9 +- Mu2e/CMakeLists.txt | 4 +- Mu2eG4/CMakeLists.txt | 67 ++- Mu2eG4Helper/CMakeLists.txt | 1 + Mu2eKinKal/CMakeLists.txt | 21 +- ParticleID/CMakeLists.txt | 12 + Print/CMakeLists.txt | 3 + ProditionsService/CMakeLists.txt | 10 +- RecoDataProducts/CMakeLists.txt | 11 +- STMReco/CMakeLists.txt | 25 + SeedService/CMakeLists.txt | 2 + Sources/CMakeLists.txt | 1 - TEveEventDisplay/CMakeLists.txt | 17 +- TrackCaloMatching/CMakeLists.txt | 24 +- TrackerMC/CMakeLists.txt | 45 +- Trigger/CMakeLists.txt | 14 + TrkDiag/CMakeLists.txt | 102 ++++- TrkExt/CMakeLists.txt | 9 + TrkFilters/CMakeLists.txt | 15 +- TrkHitReco/CMakeLists.txt | 37 ++ TrkPatRec/CMakeLists.txt | 110 ++++- TrkReco/CMakeLists.txt | 28 +- UtilityModules/CMakeLists.txt | 9 +- Validation/CMakeLists.txt | 6 +- boost_fix/CMakeLists.txt | 6 + make_cmake.sh | 62 ++- 60 files changed, 2211 insertions(+), 154 deletions(-) diff --git a/Analyses/CMakeLists.txt b/Analyses/CMakeLists.txt index 92ae107a30..5241f35736 100644 --- a/Analyses/CMakeLists.txt +++ b/Analyses/CMakeLists.txt @@ -1,8 +1,10 @@ cet_build_plugin(BFieldPlotter art::module REG_SOURCE src/BFieldPlotter_module.cc LIBRARIES REG - offline::BFieldGeom art_root_io::TFileService_service + + offline::BFieldGeom + offline::GeometryService ROOT::Hist ) @@ -10,427 +12,852 @@ cet_build_plugin(CaloCalibAna art::module REG_SOURCE src/CaloCalibAna_module.cc LIBRARIES REG art_root_io::TFileService_service + + + offline::CaloCluster + offline::CalorimeterGeom + offline::ConditionsService + offline::DataProducts + offline::GeometryService + offline::GlobalConstantsService + offline::MCDataProducts + offline::RecoDataProducts ) cet_build_plugin(CaloCalib art::module REG_SOURCE src/CaloCalib_module.cc LIBRARIES REG + + + offline::CalorimeterGeom + offline::DataProducts + offline::GeometryService + offline::GlobalConstantsService + offline::MCDataProducts + offline::RecoDataProducts ) cet_build_plugin(CaloClusterCompare art::module REG_SOURCE src/CaloClusterCompare_module.cc LIBRARIES REG + + + offline::RecoDataProducts ) cet_build_plugin(CaloDigiAna art::module REG_SOURCE src/CaloDigiAna_module.cc LIBRARIES REG + + + offline::CalorimeterGeom + offline::ConditionsService + offline::DataProducts + offline::GeometryService + offline::GlobalConstantsService + offline::RecoDataProducts ) cet_build_plugin(CaloHitFinderInspect art::module REG_SOURCE src/CaloHitFinderInspect_module.cc LIBRARIES REG + + + offline::CalorimeterGeom + offline::ConditionsService + offline::GeometryService + offline::GlobalConstantsService + offline::MCDataProducts + offline::RecoDataProducts ) cet_build_plugin(CaloTrackMatchExample art::module REG_SOURCE src/CaloTrackMatchExample_module.cc LIBRARIES REG + + + offline::CalorimeterGeom + offline::GeometryService + offline::GlobalConstantsService + offline::MCDataProducts + offline::RecoDataProducts ) cet_build_plugin(CollectionSizeAnalyzer art::module REG_SOURCE src/CollectionSizeAnalyzer_module.cc LIBRARIES REG + + + offline::MCDataProducts ) cet_build_plugin(CompressionCheck0 art::module REG_SOURCE src/CompressionCheck0_module.cc LIBRARIES REG + + + offline::GeneralUtilities + offline::MCDataProducts + offline::RecoDataProducts ) cet_build_plugin(CORSIKAGenPlots art::module REG_SOURCE src/CORSIKAGenPlots_module.cc LIBRARIES REG art_root_io::TFileService_service + + + offline::DataProducts + offline::GlobalConstantsService + offline::MCDataProducts + offline::Mu2eUtilities ) cet_build_plugin(CosmicAnalysis art::module REG_SOURCE src/CosmicAnalysis_module.cc LIBRARIES REG + + + offline::BTrkData + offline::CosmicRayShieldGeom + offline::DataProducts + offline::GeometryService + offline::MCDataProducts + offline::Mu2eUtilities + offline::RecoDataProducts ) cet_build_plugin(CosmicFilter art::module REG_SOURCE src/CosmicFilter_module.cc LIBRARIES REG + + + offline::CalorimeterGeom + offline::GeometryService + offline::MCDataProducts + offline::RecoDataProducts + offline::TrackerGeom ) cet_build_plugin(CountPionDecays art::module REG_SOURCE src/CountPionDecays_module.cc LIBRARIES REG + + + offline::DataProducts + offline::MCDataProducts ) cet_build_plugin(CRYGenPlots art::module REG_SOURCE src/CRYGenPlots_module.cc LIBRARIES REG art_root_io::TFileService_service + + + offline::DataProducts + offline::GlobalConstantsService + offline::MCDataProducts + offline::Mu2eUtilities ) cet_build_plugin(DiskCal00 art::module REG_SOURCE src/DiskCal00_module.cc LIBRARIES REG + + + offline::CalorimeterGeom + offline::DataProducts + offline::GeometryService + offline::MCDataProducts + offline::RecoDataProducts ) cet_build_plugin(EMFCSimpleDumper art::module REG_SOURCE src/EMFCSimpleDumper_module.cc LIBRARIES REG + + + offline::DataProducts + offline::ExtinctionMonitorFNAL_Geometry + offline::GeometryService + offline::GlobalConstantsService + offline::MCDataProducts + offline::ProtonBeamDumpGeom ) cet_build_plugin(EventIDSequencePrinter art::module REG_SOURCE src/EventIDSequencePrinter_module.cc LIBRARIES REG + + ) cet_build_plugin(EventLister art::module REG_SOURCE src/EventLister_module.cc LIBRARIES REG + + ) cet_build_plugin(ExtremeHitTimes art::module REG_SOURCE src/ExtremeHitTimes_module.cc LIBRARIES REG art_root_io::TFileService_service + + + offline::MCDataProducts ) cet_build_plugin(FilterEmptyEvents art::module REG_SOURCE src/FilterEmptyEvents_module.cc LIBRARIES REG + + + offline::CalorimeterGeom + offline::GeometryService + offline::MCDataProducts + offline::RecoDataProducts ) cet_build_plugin(FilterVDHits art::module REG_SOURCE src/FilterVDHits_module.cc LIBRARIES REG + + + offline::MCDataProducts + offline::Mu2eUtilities ) cet_build_plugin(G4ReactionAnalyzer art::module REG_SOURCE src/G4ReactionAnalyzer_module.cc LIBRARIES REG + + + offline::MCDataProducts ) cet_build_plugin(GenParticlesAnalyzer art::module REG_SOURCE src/GenParticlesAnalyzer_module.cc LIBRARIES REG + + + offline::MCDataProducts + offline::Mu2eUtilities ) cet_build_plugin(GeomVis art::module REG_SOURCE src/GeomVis_module.cc LIBRARIES REG + + + offline::DataProducts + offline::MCDataProducts ) cet_build_plugin(Histforpabs art::module REG_SOURCE src/Histforpabs_module.cc LIBRARIES REG + + + offline::GeometryService + offline::MCDataProducts ) cet_build_plugin(InteractiveRoot art::module REG_SOURCE src/InteractiveRoot_module.cc LIBRARIES REG art_root_io::TFileService_service + + + offline::MCDataProducts ) cet_build_plugin(KineticFracAnalysis art::module REG_SOURCE src/KineticFracAnalysis_module.cc LIBRARIES REG + + + offline::CalorimeterGeom + offline::DataProducts + offline::GeneralUtilities + offline::GeometryService + offline::GlobalConstantsService + offline::MCDataProducts + offline::RecoDataProducts + offline::TrackerGeom ) cet_build_plugin(materailsPropStudy art::module REG_SOURCE src/materailsPropStudy_module.cc LIBRARIES REG art_root_io::TFileService_service + + + offline::SeedService ) cet_build_plugin(MTVerification art::module REG_SOURCE src/MTVerification_module.cc LIBRARIES REG + + + offline::MCDataProducts ) cet_build_plugin(Mu2eG4StudyCalo01ReadBack art::module REG_SOURCE src/Mu2eG4StudyCalo01ReadBack_module.cc LIBRARIES REG + + + offline::ConditionsService + offline::GeometryService + offline::GlobalConstantsService + offline::MCDataProducts ) cet_build_plugin(Mu2eG4StudyReadBack art::module REG_SOURCE src/Mu2eG4StudyReadBack_module.cc LIBRARIES REG + + + offline::ConditionsService + offline::GeometryService + offline::GlobalConstantsService + offline::MCDataProducts ) cet_build_plugin(ParticleIDScan art::module REG_SOURCE src/ParticleIDScan_module.cc LIBRARIES REG art_root_io::TFileService_service + + + offline::ParticleID ) cet_build_plugin(PbarAnalysis2 art::module REG_SOURCE src/PbarAnalysis2_module.cc LIBRARIES REG + + + offline::CaloCluster + offline::CalorimeterGeom + offline::ConditionsService + offline::DataProducts + offline::GeometryService + offline::GlobalConstantsService + offline::MCDataProducts + offline::RecoDataProducts + offline::TrackerGeom ) cet_build_plugin(pbars1hist art::module REG_SOURCE src/pbars1hist_module.cc LIBRARIES REG + + + offline::DataProducts + offline::GeometryService + offline::GlobalConstantsService + offline::MCDataProducts + offline::ProductionTargetGeom ) cet_build_plugin(PionMomentumAnalyzer art::module REG_SOURCE src/PionMomentumAnalyzer_module.cc LIBRARIES REG + + + offline::GlobalConstantsService + offline::MCDataProducts + offline::Mu2eUtilities ) cet_build_plugin(PointerCheck art::module REG_SOURCE src/PointerCheck_module.cc LIBRARIES REG + + + offline::MCDataProducts ) cet_build_plugin(PrimaryProtonEnergyDumper art::module REG_SOURCE src/PrimaryProtonEnergyDumper_module.cc LIBRARIES REG + + + offline::ConfigTools + offline::DataProducts + offline::GeometryService + offline::GlobalConstantsService + offline::MCDataProducts + offline::Mu2eUtilities + offline::ProductionTargetGeom ) cet_build_plugin(PrintGenParticles art::module REG_SOURCE src/PrintGenParticles_module.cc LIBRARIES REG + + + offline::MCDataProducts ) cet_build_plugin(PrintSTMGeom art::module REG_SOURCE src/PrintSTMGeom_module.cc LIBRARIES REG + + + offline::CosmicRayShieldGeom + offline::DetectorSolenoidGeom + offline::GeometryService + offline::STMGeom + offline::StoppingTargetGeom + offline::TrackerGeom ) cet_build_plugin(PrintStrawHits art::module REG_SOURCE src/PrintStrawHits_module.cc LIBRARIES REG + + + offline::RecoDataProducts ) cet_build_plugin(PrintTrackerGeom art::module REG_SOURCE src/PrintTrackerGeom_module.cc LIBRARIES REG + + + offline::GeometryService + offline::TrackerGeom ) cet_build_plugin(ProtonBunchIntensityAnalyzer art::module REG_SOURCE src/ProtonBunchIntensityAnalyzer_module.cc LIBRARIES REG + + + offline::MCDataProducts ) cet_build_plugin(PtrTest0 art::module REG_SOURCE src/PtrTest0_module.cc LIBRARIES REG + + + offline::MCDataProducts ) cet_build_plugin(PtrTest art::module REG_SOURCE src/PtrTest_module.cc LIBRARIES REG + + + offline::RecoDataProducts ) cet_build_plugin(ReadAntiProtonSteps art::module REG_SOURCE src/ReadAntiProtonSteps_module.cc LIBRARIES REG + + + offline::ConditionsService + offline::GeometryService + offline::GlobalConstantsService + offline::MCDataProducts ) cet_build_plugin(ReadBack0 art::module REG_SOURCE src/ReadBack0_module.cc LIBRARIES REG + + + offline::GeometryService + offline::MCDataProducts + offline::TrackerGeom ) cet_build_plugin(ReadBack art::module REG_SOURCE src/ReadBack_module.cc LIBRARIES REG + + + offline::CalorimeterGeom + offline::CosmicRayShieldGeom + offline::GeometryService + offline::GlobalConstantsService + offline::MCDataProducts + offline::Mu2eUtilities + offline::RecoDataProducts + offline::TrackerGeom ) cet_build_plugin(ReadCaloDigi art::module REG_SOURCE src/ReadCaloDigi_module.cc LIBRARIES REG + + + offline::CalorimeterGeom + offline::ConditionsService + offline::DataProducts + offline::GeometryService + offline::GlobalConstantsService + offline::MCDataProducts + offline::RecoDataProducts + offline::SeedService ) cet_build_plugin(ReadMCTrajectories art::module REG_SOURCE src/ReadMCTrajectories_module.cc LIBRARIES REG + + + offline::MCDataProducts ) cet_build_plugin(ReadPSVacuum art::module REG_SOURCE src/ReadPSVacuum_module.cc LIBRARIES REG + + + offline::ConditionsService + offline::GeometryService + offline::MCDataProducts ) cet_build_plugin(ReadPTM art::module REG_SOURCE src/ReadPTM_module.cc LIBRARIES REG + + + offline::ConditionsService + offline::GeometryService + offline::MCDataProducts ) cet_build_plugin(ReadPtr art::module REG_SOURCE src/ReadPtr_module.cc LIBRARIES REG + + + offline::RecoDataProducts ) cet_build_plugin(ReadStrawDigiReco art::module REG_SOURCE src/ReadStrawDigiReco_module.cc LIBRARIES REG + + + offline::RecoDataProducts ) cet_build_plugin(ReadStrawHitReco art::module REG_SOURCE src/ReadStrawHitReco_module.cc LIBRARIES REG + + + offline::GeometryService + offline::ProditionsService + offline::RecoDataProducts + offline::TrackerConditions + offline::TrackerGeom ) cet_build_plugin(ReadTrackCaloMatching art::module REG_SOURCE src/ReadTrackCaloMatching_module.cc LIBRARIES REG + + + offline::ConditionsService + offline::GeometryService + offline::RecoDataProducts + offline::TrackerGeom ) cet_build_plugin(ReadTrackCaloMatchingMVA art::module REG_SOURCE src/ReadTrackCaloMatchingMVA_module.cc LIBRARIES REG + + + offline::CalorimeterGeom + offline::DataProducts + offline::GeometryService + offline::MCDataProducts + offline::RecoDataProducts ) cet_build_plugin(ReadTrackerSteps art::module REG_SOURCE src/ReadTrackerSteps_module.cc LIBRARIES REG + + + offline::ConditionsService + offline::GeometryService + offline::MCDataProducts + offline::TrackerGeom ) cet_build_plugin(ReadTrkExtrapol art::module REG_SOURCE src/ReadTrkExtrapol_module.cc LIBRARIES REG + + + offline::ConditionsService + offline::GeometryService + offline::RecoDataProducts + offline::TrackerGeom ) cet_build_plugin(ReadTrkExtrapolMVA art::module REG_SOURCE src/ReadTrkExtrapolMVA_module.cc LIBRARIES REG + + + offline::ConditionsService + offline::GeometryService + offline::RecoDataProducts + offline::TrackerGeom ) cet_build_plugin(ReadVirtualDetector art::module REG_SOURCE src/ReadVirtualDetector_module.cc LIBRARIES REG + + + offline::ConditionsService + offline::GeometryService + offline::GlobalConstantsService + offline::MCDataProducts + offline::Mu2eUtilities ) cet_build_plugin(SelectiveStepPtPrinter art::module REG_SOURCE src/SelectiveStepPtPrinter_module.cc LIBRARIES REG + + + offline::MCDataProducts ) cet_build_plugin(SelectPiMinusAtTS5 art::module REG_SOURCE src/SelectPiMinusAtTS5_module.cc LIBRARIES REG + + + offline::DataProducts + offline::MCDataProducts + offline::Mu2eUtilities ) cet_build_plugin(SensitiveTargetEnergyDumper art::module REG_SOURCE src/SensitiveTargetEnergyDumper_module.cc LIBRARIES REG + + + offline::ConfigTools + offline::DataProducts + offline::GeometryService + offline::GlobalConstantsService + offline::MCDataProducts + offline::Mu2eUtilities + offline::ProductionTargetGeom ) cet_build_plugin(SimParticleAnalyzer art::module REG_SOURCE src/SimParticleAnalyzer_module.cc LIBRARIES REG + + + offline::MCDataProducts ) cet_build_plugin(SimParticleCheck00 art::module REG_SOURCE src/SimParticleCheck00_module.cc LIBRARIES REG + + + offline::MCDataProducts ) cet_build_plugin(SimParticleDumperCompact art::module REG_SOURCE src/SimParticleDumperCompact_module.cc LIBRARIES REG + + + offline::MCDataProducts ) cet_build_plugin(SimParticlesPrinter art::module REG_SOURCE src/SimParticlesPrinter_module.cc LIBRARIES REG + + + offline::MCDataProducts + offline::Mu2eUtilities ) cet_build_plugin(StatusG4Analyzer art::module REG_SOURCE src/StatusG4Analyzer_module.cc LIBRARIES REG + + + offline::MCDataProducts ) cet_build_plugin(StepPointMC1stHitDumper art::module REG_SOURCE src/StepPointMC1stHitDumper_module.cc LIBRARIES REG + + + offline::GlobalConstantsService + offline::MCDataProducts + offline::Mu2eUtilities ) cet_build_plugin(StepPointMCDumperCalo art::module REG_SOURCE src/StepPointMCDumperCalo_module.cc LIBRARIES REG + + + offline::GlobalConstantsService + offline::MCDataProducts ) cet_build_plugin(StepPointMCDumperCompact art::module REG_SOURCE src/StepPointMCDumperCompact_module.cc LIBRARIES REG + + + offline::MCDataProducts ) cet_build_plugin(StepPointMCDumper art::module REG_SOURCE src/StepPointMCDumper_module.cc LIBRARIES REG + + + offline::GeometryService + offline::GlobalConstantsService + offline::MCDataProducts + offline::Mu2eUtilities ) cet_build_plugin(StepPointsPrinter art::module REG_SOURCE src/StepPointsPrinter_module.cc LIBRARIES REG + + + offline::MCDataProducts ) cet_build_plugin(StoppedParticlesDumper art::module REG_SOURCE src/StoppedParticlesDumper_module.cc LIBRARIES REG + + + offline::GlobalConstantsService + offline::MCDataProducts + offline::Mu2eUtilities ) cet_build_plugin(StoppedParticlesPrinter art::module REG_SOURCE src/StoppedParticlesPrinter_module.cc LIBRARIES REG + + + offline::DataProducts + offline::MCDataProducts ) cet_build_plugin(TrackSummaryDataAnalyzer art::module REG_SOURCE src/TrackSummaryDataAnalyzer_module.cc LIBRARIES REG + + + offline::Mu2eUtilities + offline::RecoDataProducts ) cet_build_plugin(TrackSummaryMaker art::module REG_SOURCE src/TrackSummaryMaker_module.cc LIBRARIES REG + + + offline::DataProducts + offline::GeometryService + offline::Mu2eUtilities + offline::RecoDataProducts ) cet_build_plugin(TrackSummaryMCAnalyzer art::module REG_SOURCE src/TrackSummaryMCAnalyzer_module.cc LIBRARIES REG + + + offline::MCDataProducts + offline::Mu2eUtilities + offline::RecoDataProducts ) cet_build_plugin(TrackSummaryTruthMaker art::module REG_SOURCE src/TrackSummaryTruthMaker_module.cc LIBRARIES REG + + + offline::BTrkData + offline::MCDataProducts + offline::Mu2eUtilities + offline::RecoDataProducts ) cet_build_plugin(TrackSummaryTruthRFSelector art::module REG_SOURCE src/TrackSummaryTruthRFSelector_module.cc LIBRARIES REG + + + offline::MCDataProducts + offline::RecoDataProducts ) cet_build_plugin(TSTrackAna art::module REG_SOURCE src/TSTrackAna_module.cc LIBRARIES REG + + + offline::MCDataProducts ) cet_build_plugin(TVirtDebug art::module REG_SOURCE src/TVirtDebug_module.cc LIBRARIES REG + + + offline::GeometryService + offline::MCDataProducts ) cet_build_plugin(ViewAllProvenances art::module REG_SOURCE src/ViewAllProvenances_module.cc LIBRARIES REG + + ) cet_build_plugin(ViewProvenance art::module REG_SOURCE src/ViewProvenance_module.cc LIBRARIES REG + + + offline::MCDataProducts ) cet_build_plugin(VMMonitor art::module REG_SOURCE src/VMMonitor_module.cc LIBRARIES REG + + + offline::GeneralUtilities ) install_source(SUBDIRS src) diff --git a/BFieldTest/CMakeLists.txt b/BFieldTest/CMakeLists.txt index a96dd18630..72146125be 100644 --- a/BFieldTest/CMakeLists.txt +++ b/BFieldTest/CMakeLists.txt @@ -1,11 +1,17 @@ cet_build_plugin(BFieldSymmetry art::module REG_SOURCE src/BFieldSymmetry_module.cc LIBRARIES REG + offline::BFieldGeom + offline::GeometryService + offline::SeedService ) cet_build_plugin(BFieldTest art::module REG_SOURCE src/BFieldTest_module.cc LIBRARIES REG + offline::BFieldGeom + offline::GeneralUtilities + offline::GeometryService ) install_source(SUBDIRS src) diff --git a/CMakeLists.txt b/CMakeLists.txt index 7f441f71af..4a2ce9893b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -33,55 +33,55 @@ link_directories($ENV{BTRK_LIB}) include(ArtDictionary) include(BuildPlugins) -#add_subdirectory(Analyses) +add_subdirectory(Analyses) add_subdirectory(AnalysisConditions) add_subdirectory(AnalysisConfig) add_subdirectory(AnalysisUtilities) add_subdirectory(BeamlineGeom) add_subdirectory(BFieldGeom) -#add_subdirectory(BFieldTest) +add_subdirectory(BFieldTest) add_subdirectory(bin) add_subdirectory(boost_fix) add_subdirectory(BTrkData) -#add_subdirectory(CaloCluster) +add_subdirectory(CaloCluster) add_subdirectory(CaloConditions) add_subdirectory(CaloConfig) -#add_subdirectory(CaloDiag) -#add_subdirectory(CaloFilters) -#add_subdirectory(CaloMC) -#add_subdirectory(CaloReco) +add_subdirectory(CaloDiag) +add_subdirectory(CaloFilters) +add_subdirectory(CaloMC) +add_subdirectory(CaloReco) add_subdirectory(CalorimeterGeom) -#add_subdirectory(CalPatRec) -#add_subdirectory(CommonMC) -#add_subdirectory(Compression) +add_subdirectory(CalPatRec) +add_subdirectory(CommonMC) +add_subdirectory(Compression) add_subdirectory(ConditionsBase) add_subdirectory(ConditionsService) add_subdirectory(ConfigTools) add_subdirectory(CosmicRayShieldGeom) -#add_subdirectory(CosmicReco) +add_subdirectory(CosmicReco) add_subdirectory(CRVConditions) add_subdirectory(CRVConfig) -#add_subdirectory(CRVFilters) -#add_subdirectory(CRVReco) -#add_subdirectory(CRVResponse) -#add_subdirectory(DAQ) +add_subdirectory(CRVFilters) +add_subdirectory(CRVReco) +add_subdirectory(CRVResponse) +add_subdirectory(DAQ) add_subdirectory(DAQConditions) add_subdirectory(DAQConfig) add_subdirectory(DataProducts) add_subdirectory(DbService) add_subdirectory(DbTables) add_subdirectory(DetectorSolenoidGeom) -#add_subdirectory(EventDisplay) -#add_subdirectory(EventGenerator) -#add_subdirectory(EventMixing) +add_subdirectory(EventDisplay) +add_subdirectory(EventGenerator) +add_subdirectory(EventMixing) add_subdirectory(ExternalShieldingGeom) add_subdirectory(ExtinctionMonitorFNAL) -#add_subdirectory(Filters) +add_subdirectory(Filters) add_subdirectory(GeneralUtilities) add_subdirectory(GeometryService) add_subdirectory(GeomPrimitives) add_subdirectory(GlobalConstantsService) -#add_subdirectory(HelloWorld) +add_subdirectory(HelloWorld) add_subdirectory(KalmanTests) add_subdirectory(KinKalGeom) add_subdirectory(MBSGeom) @@ -89,14 +89,14 @@ add_subdirectory(MCDataProducts) add_subdirectory(MECOStyleProtonAbsorberGeom) add_subdirectory(Mu2e) add_subdirectory(Mu2eBTrk) -#add_subdirectory(Mu2eG4) +add_subdirectory(Mu2eG4) add_subdirectory(Mu2eG4Helper) add_subdirectory(Mu2eHallGeom) add_subdirectory(Mu2eInterfaces) add_subdirectory(Mu2eKinKal) add_subdirectory(Mu2eReco) add_subdirectory(Mu2eUtilities) -#add_subdirectory(ParticleID) +add_subdirectory(ParticleID) add_subdirectory(Print) add_subdirectory(ProditionsService) add_subdirectory(ProductionSolenoidGeom) @@ -113,24 +113,24 @@ add_subdirectory(Sources) add_subdirectory(STMConditions) add_subdirectory(STMConfig) add_subdirectory(STMGeom) -#add_subdirectory(STMReco) +add_subdirectory(STMReco) add_subdirectory(StoppingTargetGeom) add_subdirectory(TestTools) -#add_subdirectory(TEveEventDisplay) -#add_subdirectory(TrackCaloMatching) +add_subdirectory(TEveEventDisplay) +add_subdirectory(TrackCaloMatching) add_subdirectory(TrackerConditions) add_subdirectory(TrackerConfig) add_subdirectory(TrackerGeom) -#add_subdirectory(TrackerMC) -#add_subdirectory(Trigger) -#add_subdirectory(TrkDiag) -#add_subdirectory(TrkExt) -#add_subdirectory(TrkFilters) -#add_subdirectory(TrkHitReco) -#add_subdirectory(TrkPatRec) -#add_subdirectory(TrkReco) +add_subdirectory(TrackerMC) +add_subdirectory(Trigger) +add_subdirectory(TrkDiag) +add_subdirectory(TrkExt) +add_subdirectory(TrkFilters) +add_subdirectory(TrkHitReco) +add_subdirectory(TrkPatRec) +add_subdirectory(TrkReco) add_subdirectory(ups_install) -#add_subdirectory(UtilityModules) +add_subdirectory(UtilityModules) add_subdirectory(Validation) install_fhicl(SUBDIRS fcl) diff --git a/CRVFilters/CMakeLists.txt b/CRVFilters/CMakeLists.txt index c4906cbed7..ff9a6315e9 100644 --- a/CRVFilters/CMakeLists.txt +++ b/CRVFilters/CMakeLists.txt @@ -1,6 +1,11 @@ cet_build_plugin(CrvCoincidenceClusterFilter art::module REG_SOURCE src/CrvCoincidenceClusterFilter_module.cc LIBRARIES REG + offline::CalorimeterGeom + offline::ConfigTools + offline::GeometryService + offline::GlobalConstantsService + offline::RecoDataProducts ) install_source(SUBDIRS src) diff --git a/CRVReco/CMakeLists.txt b/CRVReco/CMakeLists.txt index fc79ce6e6a..225d1b96b4 100644 --- a/CRVReco/CMakeLists.txt +++ b/CRVReco/CMakeLists.txt @@ -12,11 +12,25 @@ cet_make_library( cet_build_plugin(CrvCoincidenceFinder art::module REG_SOURCE src/CrvCoincidenceFinder_module.cc LIBRARIES REG + offline::CRVReco + + offline::CosmicRayShieldGeom + offline::DataProducts + offline::GeometryService + offline::RecoDataProducts ) cet_build_plugin(CrvRecoPulsesFinder art::module REG_SOURCE src/CrvRecoPulsesFinder_module.cc LIBRARIES REG + offline::CRVReco + + offline::CosmicRayShieldGeom + offline::CRVConditions + offline::DataProducts + offline::GeometryService + offline::ProditionsService + offline::RecoDataProducts ) install_source(SUBDIRS src) diff --git a/CRVResponse/CMakeLists.txt b/CRVResponse/CMakeLists.txt index 6ef7e3dddb..fc71c07705 100644 --- a/CRVResponse/CMakeLists.txt +++ b/CRVResponse/CMakeLists.txt @@ -15,56 +15,145 @@ cet_make_library( cet_build_plugin(CrvCalibration art::module REG_SOURCE src/CrvCalibration_module.cc LIBRARIES REG + offline::CRVResponse + + offline::CosmicRayShieldGeom + offline::GeometryService + offline::RecoDataProducts ) cet_build_plugin(CrvCoincidenceClusterMatchMC art::module REG_SOURCE src/CrvCoincidenceClusterMatchMC_module.cc LIBRARIES REG + offline::CRVResponse + + offline::ConditionsService + offline::CosmicRayShieldGeom + offline::DataProducts + offline::GeometryService + offline::MCDataProducts + offline::RecoDataProducts ) cet_build_plugin(CrvDigitizer art::module REG_SOURCE src/CrvDigitizer_module.cc LIBRARIES REG + offline::CRVResponse + + offline::CosmicRayShieldGeom + offline::CRVConditions + offline::DAQConditions + offline::DataProducts + offline::GeometryService + offline::MCDataProducts + offline::ProditionsService + offline::RecoDataProducts ) cet_build_plugin(CrvPedestalFinder art::module REG_SOURCE src/CrvPedestalFinder_module.cc LIBRARIES REG + offline::CRVResponse + + offline::CosmicRayShieldGeom + offline::GeometryService + offline::RecoDataProducts ) cet_build_plugin(CrvPhotonGenerator art::module REG_SOURCE src/CrvPhotonGenerator_module.cc LIBRARIES REG + offline::CRVResponse + + offline::ConditionsService + offline::ConfigTools + offline::CosmicRayShieldGeom + offline::DAQConditions + offline::DataProducts + offline::GeometryService + offline::GlobalConstantsService + offline::MCDataProducts + offline::ProditionsService + offline::SeedService ) cet_build_plugin(CrvPlot art::module REG_SOURCE src/CrvPlot_module.cc LIBRARIES REG + offline::CRVResponse + + offline::ConditionsService + offline::CosmicRayShieldGeom + offline::CRVConditions + offline::DataProducts + offline::GeometryService + offline::MCDataProducts + offline::ProditionsService + offline::RecoDataProducts ) cet_build_plugin(CrvSiPMChargeGenerator art::module REG_SOURCE src/CrvSiPMChargeGenerator_module.cc LIBRARIES REG + offline::CRVResponse + + offline::ConditionsService + offline::ConfigTools + offline::CosmicRayShieldGeom + offline::DAQConditions + offline::DataProducts + offline::GeometryService + offline::MCDataProducts + offline::ProditionsService + offline::SeedService ) cet_build_plugin(CrvStepsFromStepPointMCs art::module REG_SOURCE src/CrvStepsFromStepPointMCs_module.cc LIBRARIES REG + offline::CRVResponse + + offline::DataProducts + offline::GeometryService + offline::GlobalConstantsService + offline::MCDataProducts + offline::ProditionsService ) cet_build_plugin(CRVTest art::module REG_SOURCE src/CRVTest_module.cc LIBRARIES REG + offline::CRVResponse + + offline::CosmicRayShieldGeom + offline::DataProducts + offline::GeometryService + offline::MCDataProducts + offline::RecoDataProducts ) cet_build_plugin(CrvWaveformsGenerator art::module REG_SOURCE src/CrvWaveformsGenerator_module.cc LIBRARIES REG + offline::CRVResponse + + offline::ConfigTools + offline::CosmicRayShieldGeom + offline::CRVConditions + offline::DAQConditions + offline::DataProducts + offline::GeometryService + offline::MCDataProducts + offline::ProditionsService + offline::SeedService ) cet_build_plugin(MakeCrvCoincidenceClusterMCAssns art::module REG_SOURCE src/MakeCrvCoincidenceClusterMCAssns_module.cc LIBRARIES REG + offline::CRVResponse + + offline::MCDataProducts ) install_source(SUBDIRS src) diff --git a/CalPatRec/CMakeLists.txt b/CalPatRec/CMakeLists.txt index bb12928a47..21ec7bda5b 100644 --- a/CalPatRec/CMakeLists.txt +++ b/CalPatRec/CMakeLists.txt @@ -2,20 +2,14 @@ cet_make_library( SOURCE src/CalHelixFinderAlg.cc src/CalHelixFinderData.cc - src/CalHelixFinderDiag_tool.cc - src/CalTimePeakFinderDiag_tool.cc src/DeltaCandidate.cc src/DeltaFinderAlg.cc src/DeltaFinderAlg_findProtons.cc - src/DeltaFinderDiag_tool.cc src/DeltaFinder_types.cc src/DeltaSeed.cc src/HlPrint_ComboHit.cc - src/MergePatRecDiag_tool.cc src/ObjectDumpUtils.cc - src/PhiClusterFinderDiag_tool.cc src/ProtonCandidate.cc - src/TZClusterFinderDiag_tool.cc LIBRARIES PUBLIC offline::BFieldGeom @@ -34,55 +28,185 @@ cet_make_library( cet_build_plugin(CalHelixFinder art::module REG_SOURCE src/CalHelixFinder_module.cc LIBRARIES REG + offline::CalPatRec + + offline::BFieldGeom + offline::CalorimeterGeom + offline::ConditionsService + offline::ConfigTools + offline::GeometryService + offline::Mu2eUtilities + offline::RecoDataProducts + offline::TrackerGeom ) cet_build_plugin(CalTimePeakFinder art::module REG_SOURCE src/CalTimePeakFinder_module.cc LIBRARIES REG + offline::CalPatRec + + offline::CalorimeterGeom + offline::ConditionsService + offline::ConfigTools + offline::GeometryService + offline::Mu2eUtilities + offline::RecoDataProducts + offline::TrackerGeom ) cet_build_plugin(ComboHitFilter art::module REG_SOURCE src/ComboHitFilter_module.cc LIBRARIES REG + offline::CalPatRec + + offline::CalorimeterGeom + offline::ConditionsService + offline::GeometryService + offline::MCDataProducts + offline::Mu2eUtilities + offline::RecoDataProducts + offline::TrackerGeom ) cet_build_plugin(DeltaFinderAna art::module REG_SOURCE src/DeltaFinderAna_module.cc LIBRARIES REG + offline::CalPatRec + + offline::ConditionsService + offline::DataProducts + offline::GeometryService + offline::MCDataProducts + offline::RecoDataProducts + offline::TrackerGeom ) cet_build_plugin(DeltaFinder art::module REG_SOURCE src/DeltaFinder_module.cc LIBRARIES REG + offline::CalPatRec + + offline::CalorimeterGeom + offline::ConditionsService + offline::GeometryService + offline::Mu2eUtilities + offline::RecoDataProducts + offline::TrackerGeom ) cet_build_plugin(MergeHelixFinder art::module REG_SOURCE src/MergeHelixFinder_module.cc LIBRARIES REG + offline::CalPatRec + + offline::BTrkData + offline::CalorimeterGeom + offline::ConfigTools + offline::GeometryService + offline::Mu2eUtilities + offline::RecoDataProducts + offline::TrkReco ) cet_build_plugin(PhiClusterFinder art::module REG_SOURCE src/PhiClusterFinder_module.cc LIBRARIES REG + offline::CalPatRec + + offline::ConfigTools + offline::GeneralUtilities + offline::Mu2eUtilities + offline::RecoDataProducts + offline::TrkReco ) cet_build_plugin(PrefetchData art::module REG_SOURCE src/PrefetchData_module.cc LIBRARIES REG + offline::CalPatRec + + offline::ConditionsService + offline::GeometryService + offline::MCDataProducts + offline::Mu2eUtilities + offline::RecoDataProducts + offline::TrackerGeom ) cet_build_plugin(TZClusterFinder art::module REG_SOURCE src/TZClusterFinder_module.cc LIBRARIES REG + offline::CalPatRec + + offline::ConfigTools + offline::Mu2eUtilities + offline::RecoDataProducts +) + +cet_build_plugin(CalHelixFinderDiag art::tool + REG_SOURCE src/CalHelixFinderDiag_tool.cc + LIBRARIES REG + offline::CalPatRec + + offline::MCDataProducts + offline::Mu2eUtilities +) + +cet_build_plugin(CalTimePeakFinderDiag art::tool + REG_SOURCE src/CalTimePeakFinderDiag_tool.cc + LIBRARIES REG + offline::CalPatRec + + offline::BTrkData + offline::Mu2eUtilities + offline::RecoDataProducts + offline::TrackerGeom +) + +cet_build_plugin(DeltaFinderDiag art::tool + REG_SOURCE src/DeltaFinderDiag_tool.cc + LIBRARIES REG + offline::CalPatRec + + offline::DataProducts + offline::MCDataProducts + offline::Mu2eUtilities +) + +cet_build_plugin(MergePatRecDiag art::tool + REG_SOURCE src/MergePatRecDiag_tool.cc + LIBRARIES REG + offline::CalPatRec + + offline::Mu2eUtilities +) + +cet_build_plugin(PhiClusterFinderDiag art::tool + REG_SOURCE src/PhiClusterFinderDiag_tool.cc + LIBRARIES REG + offline::CalPatRec + + offline::MCDataProducts + offline::Mu2eUtilities + offline::RecoDataProducts ) -art_dictionary( - CLASSES_DEF_XML ${CMAKE_CURRENT_SOURCE_DIR}/src/classes_def.xml - CLASSES_H ${CMAKE_CURRENT_SOURCE_DIR}/src/classes.h - DICTIONARY_LIBRARIES - offline::CalPatRec +cet_build_plugin(TZClusterFinderDiag art::tool + REG_SOURCE src/TZClusterFinderDiag_tool.cc + LIBRARIES REG + offline::CalPatRec + + offline::MCDataProducts + offline::Mu2eUtilities + offline::RecoDataProducts ) +art_dictionary( NO_CHECK_CLASS_VERSION # For some reason this segfaults + CLASSES_DEF_XML ${CMAKE_CURRENT_SOURCE_DIR}/src/classes_def.xml + CLASSES_H ${CMAKE_CURRENT_SOURCE_DIR}/src/classes.h + DICTIONARY_LIBRARIES + offline::CalPatRec +) install_source(SUBDIRS src) install_headers(SUBDIRS inc) install_fhicl(SUBDIRS fcl SUBDIRNAME CalPatRec) diff --git a/CaloCluster/CMakeLists.txt b/CaloCluster/CMakeLists.txt index 52b5e33f6a..97db4e58dd 100644 --- a/CaloCluster/CMakeLists.txt +++ b/CaloCluster/CMakeLists.txt @@ -13,21 +13,42 @@ cet_make_library( cet_build_plugin(CaloClusterFast art::module REG_SOURCE src/CaloClusterFast_module.cc LIBRARIES REG + offline::CaloCluster + + offline::CalorimeterGeom + offline::GeometryService + offline::RecoDataProducts ) cet_build_plugin(CaloClusterMaker art::module REG_SOURCE src/CaloClusterMaker_module.cc LIBRARIES REG + offline::CaloCluster + + offline::CalorimeterGeom + offline::GeometryService + offline::RecoDataProducts ) cet_build_plugin(CaloProtoClusterMaker art::module REG_SOURCE src/CaloProtoClusterMaker_module.cc LIBRARIES REG + offline::CaloCluster + + offline::CalorimeterGeom + offline::GeometryService + offline::RecoDataProducts ) cet_build_plugin(CaloTrigger art::module REG_SOURCE src/CaloTrigger_module.cc LIBRARIES REG + offline::CaloCluster + + offline::CalorimeterGeom + offline::ConditionsService + offline::GeometryService + offline::RecoDataProducts ) install_source(SUBDIRS src) diff --git a/CaloDiag/CMakeLists.txt b/CaloDiag/CMakeLists.txt index 6866e5a406..0e32e7940c 100644 --- a/CaloDiag/CMakeLists.txt +++ b/CaloDiag/CMakeLists.txt @@ -1,26 +1,52 @@ cet_build_plugin(CaloClusterCheck art::module REG_SOURCE src/CaloClusterCheck_module.cc LIBRARIES REG + offline::CalorimeterGeom + offline::DataProducts + offline::GeometryService + offline::MCDataProducts + offline::RecoDataProducts ) cet_build_plugin(CaloExample art::module REG_SOURCE src/CaloExample_module.cc - LIBRARIES REG + LIBRARIES REG + offline::CaloCluster + offline::CalorimeterGeom + offline::ConditionsService + offline::DataProducts + offline::GeometryService + offline::MCDataProducts + offline::RecoDataProducts ) cet_build_plugin(CaloMCInspector art::module REG_SOURCE src/CaloMCInspector_module.cc LIBRARIES REG + offline::MCDataProducts + offline::RecoDataProducts ) cet_build_plugin(CaloNeutron art::module REG_SOURCE src/CaloNeutron_module.cc LIBRARIES REG + offline::CalorimeterGeom + offline::ConditionsService + offline::DataProducts + offline::GeometryService + offline::MCDataProducts ) cet_build_plugin(CaloNNDiag art::module REG_SOURCE src/CaloNNDiag_module.cc LIBRARIES REG + offline::CaloCluster + offline::CalorimeterGeom + offline::ConditionsService + offline::DataProducts + offline::GeometryService + offline::MCDataProducts + offline::RecoDataProducts ) install_source(SUBDIRS src) diff --git a/CaloFilters/CMakeLists.txt b/CaloFilters/CMakeLists.txt index ae761f7070..2639d264d0 100644 --- a/CaloFilters/CMakeLists.txt +++ b/CaloFilters/CMakeLists.txt @@ -1,36 +1,69 @@ cet_build_plugin(CaloClusterCounterFilter art::module REG_SOURCE src/CaloClusterCounterFilter_module.cc LIBRARIES REG + offline::CalorimeterGeom + offline::ConfigTools + offline::GeometryService + offline::GlobalConstantsService + offline::RecoDataProducts ) cet_build_plugin(CaloCosmicCalib art::module REG_SOURCE src/CaloCosmicCalib_module.cc LIBRARIES REG + offline::CalorimeterGeom + offline::GeometryService + offline::RecoDataProducts ) cet_build_plugin(CaloLikelihood art::module REG_SOURCE src/CaloLikelihood_module.cc LIBRARIES REG + offline::CaloCluster + offline::CalorimeterGeom + offline::ConfigTools + offline::GeometryService + offline::GlobalConstantsService + offline::RecoDataProducts ) cet_build_plugin(EcalTriggerPreselect art::module REG_SOURCE src/EcalTriggerPreselect_module.cc LIBRARIES REG + offline::CalorimeterGeom + offline::ConditionsService + offline::GeometryService + offline::MCDataProducts + offline::RecoDataProducts ) cet_build_plugin(FilterEcalMixedTrigger art::module REG_SOURCE src/FilterEcalMixedTrigger_module.cc LIBRARIES REG + offline::CalorimeterGeom + offline::ConditionsService + offline::ConfigTools + offline::GeometryService + offline::RecoDataProducts ) cet_build_plugin(FilterEcalMVATrigger art::module REG_SOURCE src/FilterEcalMVATrigger_module.cc LIBRARIES REG + offline::CalorimeterGeom + offline::ConditionsService + offline::ConfigTools + offline::GeometryService + offline::RecoDataProducts ) cet_build_plugin(FilterEcalNNTrigger art::module REG_SOURCE src/FilterEcalNNTrigger_module.cc LIBRARIES REG + offline::CalorimeterGeom + offline::GeometryService + offline::Mu2eUtilities + offline::RecoDataProducts ) install_source(SUBDIRS src) diff --git a/CaloMC/CMakeLists.txt b/CaloMC/CMakeLists.txt index 0a3b788d60..18faf9c605 100644 --- a/CaloMC/CMakeLists.txt +++ b/CaloMC/CMakeLists.txt @@ -17,31 +17,73 @@ cet_make_library( cet_build_plugin(CaloClusterTruthMatch art::module REG_SOURCE src/CaloClusterTruthMatch_module.cc LIBRARIES REG + offline::CaloMC + + offline::MCDataProducts + offline::RecoDataProducts ) cet_build_plugin(CaloDigiMaker art::module REG_SOURCE src/CaloDigiMaker_module.cc LIBRARIES REG + offline::CaloMC + + offline::CalorimeterGeom + offline::ConditionsService + offline::DAQConditions + offline::DataProducts + offline::GeometryService + offline::MCDataProducts + offline::Mu2eUtilities + offline::ProditionsService + offline::RecoDataProducts + offline::SeedService ) cet_build_plugin(CaloHitTruthMatch art::module REG_SOURCE src/CaloHitTruthMatch_module.cc LIBRARIES REG + offline::CaloMC + + offline::ConditionsService + offline::MCDataProducts + offline::Mu2eUtilities + offline::RecoDataProducts ) cet_build_plugin(CaloShowerROMaker art::module REG_SOURCE src/CaloShowerROMaker_module.cc LIBRARIES REG + offline::CaloMC + + offline::CalorimeterGeom + offline::ConditionsService + offline::DAQConditions + offline::DataProducts + offline::GeometryService + offline::GlobalConstantsService + offline::MCDataProducts + offline::ProditionsService + offline::SeedService ) cet_build_plugin(CaloShowerStepMaker art::module REG_SOURCE src/CaloShowerStepMaker_module.cc LIBRARIES REG + offline::CaloMC + + offline::CalorimeterGeom + offline::GeometryService + offline::MCDataProducts + offline::Mu2eUtilities ) cet_build_plugin(CaloShowerUpdater art::module REG_SOURCE src/CaloShowerUpdater_module.cc LIBRARIES REG + offline::CaloMC + + offline::MCDataProducts ) install_source(SUBDIRS src) diff --git a/CaloReco/CMakeLists.txt b/CaloReco/CMakeLists.txt index 3fa4045864..295b2eb82b 100644 --- a/CaloReco/CMakeLists.txt +++ b/CaloReco/CMakeLists.txt @@ -12,16 +12,34 @@ cet_make_library( cet_build_plugin(CaloHitMakerFast art::module REG_SOURCE src/CaloHitMakerFast_module.cc LIBRARIES REG + offline::CaloReco + + offline::ConditionsService + offline::DataProducts + offline::GeneralUtilities + offline::RecoDataProducts ) cet_build_plugin(CaloHitMaker art::module REG_SOURCE src/CaloHitMaker_module.cc LIBRARIES REG + offline::CaloReco + + offline::CalorimeterGeom + offline::DataProducts + offline::GeometryService + offline::RecoDataProducts ) cet_build_plugin(CaloRecoDigiMaker art::module REG_SOURCE src/CaloRecoDigiMaker_module.cc LIBRARIES REG + offline::CaloReco + + offline::ConditionsService + offline::DAQConditions + offline::ProditionsService + offline::RecoDataProducts ) install_source(SUBDIRS src) diff --git a/CommonMC/CMakeLists.txt b/CommonMC/CMakeLists.txt index c73d51a7af..667d3b3b6c 100644 --- a/CommonMC/CMakeLists.txt +++ b/CommonMC/CMakeLists.txt @@ -1,51 +1,81 @@ cet_build_plugin(CosmicTimeOffset art::module REG_SOURCE src/CosmicTimeOffset_module.cc - LIBRARIES REG + LIBRARIES REG + offline::MCDataProducts + offline::SeedService ) cet_build_plugin(EventWindowMarkerProducer art::module REG_SOURCE src/EventWindowMarkerProducer_module.cc LIBRARIES REG + offline::DAQConditions + offline::DataProducts + offline::MCDataProducts + offline::ProditionsService + offline::RecoDataProducts + offline::SeedService ) cet_build_plugin(FindMCPrimary art::module REG_SOURCE src/FindMCPrimary_module.cc LIBRARIES REG + offline::MCDataProducts ) cet_build_plugin(GenEventCountReader art::module REG_SOURCE src/GenEventCountReader_module.cc LIBRARIES REG + offline::MCDataProducts ) cet_build_plugin(InFlightStepDumper art::module REG_SOURCE src/InFlightStepDumper_module.cc LIBRARIES REG + offline::GeneralUtilities + offline::MCDataProducts ) cet_build_plugin(NullMCPrimary art::module REG_SOURCE src/NullMCPrimary_module.cc LIBRARIES REG + offline::MCDataProducts ) cet_build_plugin(ProtonTimeOffset art::module REG_SOURCE src/ProtonTimeOffset_module.cc LIBRARIES REG + offline::MCDataProducts + offline::Mu2eUtilities + offline::SeedService ) cet_build_plugin(SelectRecoMC art::module REG_SOURCE src/SelectRecoMC_module.cc LIBRARIES REG + offline::ConditionsService + offline::DataProducts + offline::GeometryService + offline::MCDataProducts + offline::ProditionsService + offline::RecoDataProducts + offline::TrackerConditions + offline::TrackerGeom + offline::TrkDiag ) cet_build_plugin(SimParticleDaughterSelector art::module REG_SOURCE src/SimParticleDaughterSelector_module.cc LIBRARIES REG + offline::DataProducts + offline::MCDataProducts ) cet_build_plugin(StoppedParticlesFinder art::module REG_SOURCE src/StoppedParticlesFinder_module.cc LIBRARIES REG + offline::DataProducts + offline::MCDataProducts + offline::Mu2eUtilities ) install_source(SUBDIRS src) diff --git a/Compression/CMakeLists.txt b/Compression/CMakeLists.txt index b2d2f5769a..137f686a88 100644 --- a/Compression/CMakeLists.txt +++ b/Compression/CMakeLists.txt @@ -8,16 +8,29 @@ cet_make_library( cet_build_plugin(CompressDetStepMCs art::module REG_SOURCE src/CompressDetStepMCs_module.cc LIBRARIES REG + offline::Compression + + offline::MCDataProducts + offline::Mu2eUtilities ) cet_build_plugin(CompressDigiMCsCheck art::module REG_SOURCE src/CompressDigiMCsCheck_module.cc LIBRARIES REG + offline::Compression + + offline::DataProducts + offline::MCDataProducts ) cet_build_plugin(CompressDigiMCs art::module REG_SOURCE src/CompressDigiMCs_module.cc LIBRARIES REG + offline::Compression + + offline::DataProducts + offline::MCDataProducts + offline::Mu2eUtilities ) install_source(SUBDIRS src) diff --git a/ConditionsService/CMakeLists.txt b/ConditionsService/CMakeLists.txt index cb729fa5a3..1d4c13d258 100644 --- a/ConditionsService/CMakeLists.txt +++ b/ConditionsService/CMakeLists.txt @@ -13,6 +13,8 @@ cet_build_plugin(ConditionsService art::service REG_SOURCE src/ConditionsService_service.cc LIBRARIES REG offline::ConditionsService + + offline::GeometryService ) install_source(SUBDIRS src) diff --git a/CosmicReco/CMakeLists.txt b/CosmicReco/CMakeLists.txt index a4f5fc35ae..f94091702b 100644 --- a/CosmicReco/CMakeLists.txt +++ b/CosmicReco/CMakeLists.txt @@ -19,56 +19,146 @@ cet_make_library( cet_build_plugin(CosmicAnalyzer art::module REG_SOURCE src/CosmicAnalyzer_module.cc LIBRARIES REG + offline::CosmicReco + + offline::DataProducts + offline::GeneralUtilities + offline::GeometryService + offline::MCDataProducts + offline::Mu2eUtilities + offline::ProditionsService + offline::RecoDataProducts + offline::TrkDiag ) cet_build_plugin(CosmicFitDisplay art::module REG_SOURCE src/CosmicFitDisplay_module.cc LIBRARIES REG + offline::CosmicReco + + offline::GeneralUtilities + offline::GeometryService + offline::MCDataProducts + offline::Mu2eUtilities + offline::RecoDataProducts + offline::TrackerGeom + offline::TrkDiag ) cet_build_plugin(CosmicMCRecoDiff art::module REG_SOURCE src/CosmicMCRecoDiff_module.cc LIBRARIES REG + offline::CosmicReco + + offline::DataProducts + offline::GeneralUtilities + offline::GeometryService + offline::MCDataProducts + offline::Mu2eUtilities + offline::ProditionsService + offline::RecoDataProducts + offline::TrackerConditions + offline::TrackerGeom + offline::TrkDiag ) cet_build_plugin(CosmicMuonInfo art::module REG_SOURCE src/CosmicMuonInfo_module.cc LIBRARIES REG + offline::CosmicReco + + offline::DataProducts + offline::MCDataProducts + offline::RecoDataProducts ) cet_build_plugin(CosmicSeedFilter art::module REG_SOURCE src/CosmicSeedFilter_module.cc LIBRARIES REG + offline::CosmicReco + + offline::RecoDataProducts ) cet_build_plugin(CosmicShowerFilter art::module REG_SOURCE src/CosmicShowerFilter_module.cc LIBRARIES REG + offline::CosmicReco + + offline::ProditionsService + offline::RecoDataProducts + offline::TrackerConditions ) cet_build_plugin(CosmicTrackDetails art::module REG_SOURCE src/CosmicTrackDetails_module.cc LIBRARIES REG + offline::CosmicReco + + offline::DataProducts + offline::GeneralUtilities + offline::GeometryService + offline::MCDataProducts + offline::Mu2eUtilities + offline::ProditionsService + offline::RecoDataProducts + offline::TrackerConditions + offline::TrackerGeom + offline::TrkDiag ) cet_build_plugin(CosmicTrackDiag art::module REG_SOURCE src/CosmicTrackDiag_module.cc LIBRARIES REG + offline::CosmicReco + + offline::DataProducts + offline::GeneralUtilities + offline::GeometryService + offline::MCDataProducts + offline::Mu2eUtilities + offline::ProditionsService + offline::RecoDataProducts + offline::TrkDiag ) cet_build_plugin(CosmicTrackFinder art::module REG_SOURCE src/CosmicTrackFinder_module.cc LIBRARIES REG + offline::CosmicReco + + offline::BTrkData + offline::GeneralUtilities + offline::GeometryService + offline::Mu2eUtilities + offline::ProditionsService + offline::RecoDataProducts + offline::TrackerGeom + offline::TrkReco ) cet_build_plugin(LineFinder art::module REG_SOURCE src/LineFinder_module.cc LIBRARIES REG + offline::CosmicReco + + offline::GeometryService + offline::Mu2eUtilities + offline::ProditionsService + offline::RecoDataProducts + offline::TrackerGeom ) cet_build_plugin(SimpleTimeCluster art::module REG_SOURCE src/SimpleTimeCluster_module.cc LIBRARIES REG + offline::CosmicReco + + offline::DataProducts + offline::GeneralUtilities + offline::Mu2eUtilities + offline::RecoDataProducts + offline::TrkReco ) install_source(SUBDIRS src) diff --git a/DAQ/CMakeLists.txt b/DAQ/CMakeLists.txt index 8b26b91815..55ecccfcff 100644 --- a/DAQ/CMakeLists.txt +++ b/DAQ/CMakeLists.txt @@ -8,46 +8,95 @@ cet_make_library( cet_build_plugin(ArtBinaryPacketsFromDigis art::module REG_SOURCE src/ArtBinaryPacketsFromDigis_module.cc LIBRARIES REG + offline::DAQ + + offline::CaloConditions + offline::CalorimeterGeom + offline::CosmicRayShieldGeom + offline::CRVConditions + offline::GeometryService + offline::ProditionsService + offline::RecoDataProducts + offline::SeedService ) cet_build_plugin(ArtFragmentsFromDTCEvents art::module REG_SOURCE src/ArtFragmentsFromDTCEvents_module.cc LIBRARIES REG + offline::DAQ + ) cet_build_plugin(CaloHitsFromFragments art::module REG_SOURCE src/CaloHitsFromFragments_module.cc LIBRARIES REG + offline::DAQ + + offline::CaloConditions + offline::ProditionsService + offline::RecoDataProducts ) cet_build_plugin(CaloRecoFromFragments art::module REG_SOURCE src/CaloRecoFromFragments_module.cc LIBRARIES REG + offline::DAQ + + offline::CaloConditions + offline::ProditionsService + offline::RecoDataProducts ) cet_build_plugin(CrvDigisFromFragments art::module REG_SOURCE src/CrvDigisFromFragments_module.cc LIBRARIES REG + offline::DAQ + + offline::CRVConditions + offline::ProditionsService + offline::RecoDataProducts ) cet_build_plugin(FragmentAna art::module REG_SOURCE src/FragmentAna_module.cc LIBRARIES REG + offline::DAQ + + offline::DataProducts ) cet_build_plugin(PrefetchDAQData art::module REG_SOURCE src/PrefetchDAQData_module.cc LIBRARIES REG + offline::DAQ + + offline::RecoDataProducts ) cet_build_plugin(StrawHitRecoFromFragments art::module REG_SOURCE src/StrawHitRecoFromFragments_module.cc LIBRARIES REG + offline::DAQ + + offline::ConditionsBase + offline::ConditionsService + offline::ConfigTools + offline::DataProducts + offline::GeometryService + offline::ProditionsService + offline::RecoDataProducts + offline::TrackerConditions + offline::TrackerGeom + offline::TrkHitReco ) cet_build_plugin(StrawRecoFromFragments art::module REG_SOURCE src/StrawRecoFromFragments_module.cc LIBRARIES REG + offline::DAQ + + offline::DataProducts + offline::RecoDataProducts ) install_source(SUBDIRS src) diff --git a/DataProducts/CMakeLists.txt b/DataProducts/CMakeLists.txt index 5f4faa12a4..1eb6d7f0f2 100644 --- a/DataProducts/CMakeLists.txt +++ b/DataProducts/CMakeLists.txt @@ -18,12 +18,11 @@ cet_make_library( offline::GeneralUtilities ) -art_dictionary( - CLASSES_DEF_XML ${CMAKE_CURRENT_SOURCE_DIR}/src/classes_def.xml - CLASSES_H ${CMAKE_CURRENT_SOURCE_DIR}/src/classes.h - DICTIONARY_LIBRARIES - offline::DataProducts +art_dictionary( NO_CHECK_CLASS_VERSION # For some reason this segfaults + CLASSES_DEF_XML ${CMAKE_CURRENT_SOURCE_DIR}/src/classes_def.xml + CLASSES_H ${CMAKE_CURRENT_SOURCE_DIR}/src/classes.h + DICTIONARY_LIBRARIES + offline::DataProducts ) - install_source(SUBDIRS src) install_headers(SUBDIRS inc) diff --git a/DbService/CMakeLists.txt b/DbService/CMakeLists.txt index ed94ec3476..d34a6f7a27 100644 --- a/DbService/CMakeLists.txt +++ b/DbService/CMakeLists.txt @@ -16,27 +16,35 @@ cet_make_library( ) cet_make_exec(NAME dbTool - SOURCE src/dbTool_main.cc - LIBRARIES offline::DbService + SOURCE src/dbTool_main.cc + LIBRARIES + offline::DbService + ) -cet_make_exec(NAME epicsTool - SOURCE src/epicsTool_main.cc - LIBRARIES - offline::DbService +cet_make_exec(NAME epicsTool + SOURCE src/epicsTool_main.cc + LIBRARIES Boost::program_options + offline::DbService + ) cet_build_plugin(DbService art::service REG_SOURCE src/DbService_service.cc LIBRARIES REG offline::DbService + + offline::ConfigTools + offline::DbTables ) cet_build_plugin(DbServiceTest art::module REG_SOURCE src/DbServiceTest_module.cc LIBRARIES REG offline::DbService + + offline::DbTables ) install_source(SUBDIRS src) diff --git a/EventDisplay/CMakeLists.txt b/EventDisplay/CMakeLists.txt index fb57269d3b..38d1cdbb80 100644 --- a/EventDisplay/CMakeLists.txt +++ b/EventDisplay/CMakeLists.txt @@ -26,14 +26,19 @@ cet_make_library( cet_build_plugin(EventDisplay art::module REG_SOURCE src/EventDisplay_module.cc LIBRARIES REG + offline::EventDisplay + + offline::CRVConditions + offline::MCDataProducts + offline::ProditionsService + offline::RecoDataProducts ) -art_dictionary( - CLASSES_DEF_XML ${CMAKE_CURRENT_SOURCE_DIR}/src/classes_def.xml - CLASSES_H ${CMAKE_CURRENT_SOURCE_DIR}/src/classes.h - DICTIONARY_LIBRARIES - offline::EventDisplay +art_dictionary( NO_CHECK_CLASS_VERSION # For some reason this segfaults + CLASSES_DEF_XML ${CMAKE_CURRENT_SOURCE_DIR}/src/classes_def.xml + CLASSES_H ${CMAKE_CURRENT_SOURCE_DIR}/src/classes.h + DICTIONARY_LIBRARIES + offline::EventDisplay ) - install_source(SUBDIRS src) install_fhicl(SUBDIRS fcl SUBDIRNAME EventDisplay) diff --git a/EventGenerator/CMakeLists.txt b/EventGenerator/CMakeLists.txt index 801536443b..f3df51ca17 100644 --- a/EventGenerator/CMakeLists.txt +++ b/EventGenerator/CMakeLists.txt @@ -3,16 +3,9 @@ cet_make_library( src/CosmicCRY.cc src/CosmicDYB.cc src/CosmicFromTH2.cc - src/DIOGenerator_tool.cc src/DYBGenerator.cc src/ExtMonFNALGunImpl.cc src/FromG4BLFile.cc - src/MuCap1809keVGammaGenerator_tool.cc - src/MuCapDeuteronGenerator_tool.cc - src/MuCapNeutronGenerator_tool.cc - src/MuCapPhotonGenerator_tool.cc - src/MuCapProtonGenerator_tool.cc - src/MuplusMichelGenerator_tool.cc src/ParticleGun.cc src/ParticleGunImpl.cc src/PiCaptureEffects.cc @@ -37,186 +30,534 @@ cet_make_library( cet_build_plugin(AntiProtonGun art::module REG_SOURCE src/AntiProtonGun_module.cc LIBRARIES REG + offline::EventGenerator + + offline::ConfigTools + offline::DataProducts + offline::GeometryService + offline::GlobalConstantsService + offline::MCDataProducts + offline::Mu2eUtilities + offline::ProductionTargetGeom + offline::SeedService ) cet_build_plugin(CaloCalibGun art::module REG_SOURCE src/CaloCalibGun_module.cc LIBRARIES REG + offline::EventGenerator + + offline::CalorimeterGeom + offline::DataProducts + offline::GeometryService + offline::MCDataProducts + offline::Mu2eUtilities + offline::SeedService ) cet_build_plugin(CaloTBGun art::module REG_SOURCE src/CaloTBGun_module.cc LIBRARIES REG + offline::EventGenerator + + offline::CalorimeterGeom + offline::ConfigTools + offline::DataProducts + offline::GeometryService + offline::GlobalConstantsService + offline::MCDataProducts + offline::SeedService ) cet_build_plugin(CeEndpoint art::module REG_SOURCE src/CeEndpoint_module.cc LIBRARIES REG + offline::EventGenerator + + offline::DataProducts + offline::GlobalConstantsService + offline::MCDataProducts + offline::Mu2eUtilities + offline::SeedService ) cet_build_plugin(CORSIKAEventGenerator art::module REG_SOURCE src/CORSIKAEventGenerator_module.cc LIBRARIES REG + offline::EventGenerator + + offline::CalorimeterGeom + offline::ConfigTools + offline::ExtinctionMonitorFNAL_Geometry + offline::GeneralUtilities + offline::GeometryService + offline::MCDataProducts + offline::Mu2eUtilities + offline::SeedService ) cet_build_plugin(CRYEventGenerator art::module REG_SOURCE src/CRYEventGenerator_module.cc LIBRARIES REG + offline::EventGenerator + + offline::ConfigTools + offline::MCDataProducts + offline::SeedService ) cet_build_plugin(CryResampler art::module REG_SOURCE src/CryResampler_module.cc LIBRARIES REG + offline::EventGenerator + + offline::ConfigTools + offline::GeneralUtilities + offline::GlobalConstantsService + offline::MCDataProducts + offline::SeedService ) cet_build_plugin(DecayInOrbitWeight art::module REG_SOURCE src/DecayInOrbitWeight_module.cc LIBRARIES REG + offline::EventGenerator + + offline::ConfigTools + offline::MCDataProducts + offline::Mu2eUtilities + offline::SeedService ) cet_build_plugin(EplusFromStoppedPion art::module REG_SOURCE src/EplusFromStoppedPion_module.cc LIBRARIES REG + offline::EventGenerator + + offline::GeneralUtilities + offline::GlobalConstantsService + offline::MCDataProducts + offline::Mu2eUtilities + offline::SeedService ) cet_build_plugin(EventGenerator art::module REG_SOURCE src/EventGenerator_module.cc LIBRARIES REG + offline::EventGenerator + + offline::ConfigTools + offline::MCDataProducts + offline::SeedService ) cet_build_plugin(ExtMonFNALBoxGenerator art::module REG_SOURCE src/ExtMonFNALBoxGenerator_module.cc LIBRARIES REG + offline::EventGenerator + + offline::ConditionsService + offline::ConfigTools + offline::DataProducts + offline::ExtinctionMonitorFNAL_Geometry + offline::GeometryService + offline::GlobalConstantsService + offline::MCDataProducts + offline::SeedService ) cet_build_plugin(ExtMonFNALGun art::module REG_SOURCE src/ExtMonFNALGun_module.cc LIBRARIES REG + offline::EventGenerator + + offline::MCDataProducts + offline::SeedService ) cet_build_plugin(ExtMonFNALRoomGenerator art::module REG_SOURCE src/ExtMonFNALRoomGenerator_module.cc LIBRARIES REG + offline::EventGenerator + + offline::ConfigTools + offline::DataProducts + offline::ExtinctionMonitorFNAL_Geometry + offline::GeometryService + offline::GlobalConstantsService + offline::MCDataProducts + offline::ProtonBeamDumpGeom + offline::SeedService ) cet_build_plugin(FlatMuonDaughterGenerator art::module REG_SOURCE src/FlatMuonDaughterGenerator_module.cc LIBRARIES REG + offline::EventGenerator + + offline::DataProducts + offline::GlobalConstantsService + offline::MCDataProducts + offline::Mu2eUtilities + offline::SeedService ) cet_build_plugin(FromAsciiMomentumAndPosition art::module REG_SOURCE src/FromAsciiMomentumAndPosition_module.cc LIBRARIES REG + offline::EventGenerator + + offline::ConditionsService + offline::ConfigTools + offline::DataProducts + offline::GeneralUtilities + offline::GeometryService + offline::GlobalConstantsService + offline::MCDataProducts + offline::Mu2eUtilities + offline::ProductionTargetGeom + offline::SeedService ) cet_build_plugin(FromSimParticleCompact art::module REG_SOURCE src/FromSimParticleCompact_module.cc LIBRARIES REG + offline::EventGenerator + + offline::ConfigTools + offline::DataProducts + offline::GeometryService + offline::GlobalConstantsService + offline::MCDataProducts + offline::Mu2eUtilities + offline::ProductionTargetGeom + offline::SeedService ) cet_build_plugin(FromStepPointMCs art::module REG_SOURCE src/FromStepPointMCs_module.cc LIBRARIES REG + offline::EventGenerator + + offline::GlobalConstantsService + offline::MCDataProducts ) cet_build_plugin(FromStepPointMCsRotateTarget art::module REG_SOURCE src/FromStepPointMCsRotateTarget_module.cc LIBRARIES REG + offline::EventGenerator + + offline::GeometryService + offline::GlobalConstantsService + offline::MCDataProducts + offline::ProductionTargetGeom + offline::SeedService ) cet_build_plugin(G4BeamlineGenerator art::module REG_SOURCE src/G4BeamlineGenerator_module.cc LIBRARIES REG + offline::EventGenerator + + offline::ConfigTools + offline::MCDataProducts + offline::SeedService ) cet_build_plugin(GeneratorPlots art::module REG_SOURCE src/GeneratorPlots_module.cc LIBRARIES REG + offline::EventGenerator + + offline::DataProducts + offline::GeneralUtilities + offline::MCDataProducts ) cet_build_plugin(GenEventCounter art::module REG_SOURCE src/GenEventCounter_module.cc LIBRARIES REG + offline::EventGenerator + + offline::MCDataProducts ) cet_build_plugin(InFlightParticleSampler art::module REG_SOURCE src/InFlightParticleSampler_module.cc LIBRARIES REG + offline::EventGenerator + + offline::GeneralUtilities + offline::GlobalConstantsService + offline::MCDataProducts + offline::Mu2eUtilities + offline::SeedService ) cet_build_plugin(LeadingLog art::module REG_SOURCE src/LeadingLog_module.cc LIBRARIES REG + offline::EventGenerator + + offline::DataProducts + offline::GlobalConstantsService + offline::MCDataProducts + offline::Mu2eUtilities + offline::SeedService ) cet_build_plugin(MuStopProductsGun art::module REG_SOURCE src/MuStopProductsGun_module.cc LIBRARIES REG + offline::EventGenerator + + offline::ConfigTools + offline::DataProducts + offline::GeneralUtilities + offline::GlobalConstantsService + offline::MCDataProducts + offline::Mu2eUtilities + offline::SeedService ) cet_build_plugin(PBIWeight art::module REG_SOURCE src/PBIWeight_module.cc LIBRARIES REG + offline::EventGenerator + + offline::MCDataProducts ) cet_build_plugin(Pileup art::module REG_SOURCE src/Pileup_module.cc LIBRARIES REG + offline::EventGenerator + + offline::DataProducts + offline::GlobalConstantsService + offline::MCDataProducts + offline::Mu2eUtilities + offline::SeedService ) cet_build_plugin(PrimaryAntiProtonGun art::module REG_SOURCE src/PrimaryAntiProtonGun_module.cc LIBRARIES REG + offline::EventGenerator + + offline::ConditionsService + offline::ConfigTools + offline::DataProducts + offline::GeneralUtilities + offline::GeometryService + offline::GlobalConstantsService + offline::MCDataProducts + offline::Mu2eUtilities + offline::ProductionTargetGeom + offline::SeedService ) cet_build_plugin(PrimaryProtonGun art::module REG_SOURCE src/PrimaryProtonGun_module.cc LIBRARIES REG + offline::EventGenerator + + offline::MCDataProducts + offline::SeedService ) cet_build_plugin(RanTest art::module REG_SOURCE src/RanTest_module.cc LIBRARIES REG + offline::EventGenerator + + offline::MCDataProducts + offline::SeedService ) cet_build_plugin(RMCGun art::module REG_SOURCE src/RMCGun_module.cc LIBRARIES REG + offline::EventGenerator + + offline::ConfigTools + offline::DataProducts + offline::GeneralUtilities + offline::GlobalConstantsService + offline::MCDataProducts + offline::Mu2eUtilities + offline::SeedService ) cet_build_plugin(RPCGun art::module REG_SOURCE src/RPCGun_module.cc LIBRARIES REG + offline::EventGenerator + + offline::DataProducts + offline::GlobalConstantsService + offline::MCDataProducts + offline::Mu2eUtilities + offline::SeedService ) cet_build_plugin(SingleProcessGenerator art::module REG_SOURCE src/SingleProcessGenerator_module.cc LIBRARIES REG + offline::EventGenerator + + offline::DataProducts + offline::GlobalConstantsService + offline::MCDataProducts + offline::Mu2eUtilities + offline::SeedService ) cet_build_plugin(StoppedMuonRMCGun art::module REG_SOURCE src/StoppedMuonRMCGun_module.cc LIBRARIES REG + offline::EventGenerator + + offline::ConfigTools + offline::DataProducts + offline::GeneralUtilities + offline::GlobalConstantsService + offline::MCDataProducts + offline::Mu2eUtilities + offline::SeedService ) cet_build_plugin(StoppedMuonXRayGammaRayGun art::module REG_SOURCE src/StoppedMuonXRayGammaRayGun_module.cc LIBRARIES REG + offline::EventGenerator + + offline::ConfigTools + offline::DataProducts + offline::GeneralUtilities + offline::GeometryService + offline::MCDataProducts + offline::Mu2eUtilities + offline::SeedService + offline::StoppingTargetGeom ) cet_build_plugin(StoppedMuplusDecayGun art::module REG_SOURCE src/StoppedMuplusDecayGun_module.cc LIBRARIES REG + offline::EventGenerator + + offline::DataProducts + offline::GeneralUtilities + offline::GlobalConstantsService + offline::MCDataProducts + offline::Mu2eUtilities + offline::SeedService ) cet_build_plugin(StoppedParticleG4Gun art::module REG_SOURCE src/StoppedParticleG4Gun_module.cc LIBRARIES REG + offline::EventGenerator + + offline::DataProducts + offline::GeneralUtilities + offline::GlobalConstantsService + offline::MCDataProducts + offline::Mu2eUtilities + offline::SeedService ) cet_build_plugin(StoppedParticleReactionGun art::module REG_SOURCE src/StoppedParticleReactionGun_module.cc LIBRARIES REG + offline::EventGenerator + + offline::ConfigTools + offline::DataProducts + offline::GeneralUtilities + offline::GlobalConstantsService + offline::MCDataProducts + offline::Mu2eUtilities + offline::SeedService +) + +cet_build_plugin(DIOGenerator art::tool + REG_SOURCE src/DIOGenerator_tool.cc + LIBRARIES REG + offline::EventGenerator + + offline::DataProducts + offline::GlobalConstantsService + offline::MCDataProducts + offline::Mu2eUtilities +) + +cet_build_plugin(MuCap1809keVGammaGenerator art::tool + REG_SOURCE src/MuCap1809keVGammaGenerator_tool.cc + LIBRARIES REG + offline::EventGenerator + + offline::DataProducts + offline::GlobalConstantsService + offline::MCDataProducts + offline::Mu2eUtilities +) + +cet_build_plugin(MuCapDeuteronGenerator art::tool + REG_SOURCE src/MuCapDeuteronGenerator_tool.cc + LIBRARIES REG + offline::EventGenerator + + offline::DataProducts + offline::GlobalConstantsService + offline::MCDataProducts + offline::Mu2eUtilities +) + +cet_build_plugin(MuCapNeutronGenerator art::tool + REG_SOURCE src/MuCapNeutronGenerator_tool.cc + LIBRARIES REG + offline::EventGenerator + + offline::DataProducts + offline::GlobalConstantsService + offline::MCDataProducts + offline::Mu2eUtilities +) + +cet_build_plugin(MuCapPhotonGenerator art::tool + REG_SOURCE src/MuCapPhotonGenerator_tool.cc + LIBRARIES REG + offline::EventGenerator + + offline::DataProducts + offline::GlobalConstantsService + offline::MCDataProducts + offline::Mu2eUtilities +) + +cet_build_plugin(MuCapProtonGenerator art::tool + REG_SOURCE src/MuCapProtonGenerator_tool.cc + LIBRARIES REG + offline::EventGenerator + + offline::DataProducts + offline::GlobalConstantsService + offline::MCDataProducts + offline::Mu2eUtilities +) + +cet_build_plugin(MuplusMichelGenerator art::tool + REG_SOURCE src/MuplusMichelGenerator_tool.cc + LIBRARIES REG + offline::EventGenerator + + offline::DataProducts + offline::GlobalConstantsService + offline::MCDataProducts + offline::Mu2eUtilities ) install_source(SUBDIRS src) diff --git a/EventMixing/CMakeLists.txt b/EventMixing/CMakeLists.txt index 1c61623c3b..e63ce27c78 100644 --- a/EventMixing/CMakeLists.txt +++ b/EventMixing/CMakeLists.txt @@ -9,21 +9,42 @@ cet_make_library( cet_build_plugin(MixBackgroundFrames art::module REG_SOURCE src/MixBackgroundFrames_module.cc LIBRARIES REG + offline::EventMixing + + offline::MCDataProducts + offline::Mu2eUtilities + offline::ProditionsService + offline::SeedService + offline::SimulationConditions ) cet_build_plugin(ProtonBunchIntensityFlat art::module REG_SOURCE src/ProtonBunchIntensityFlat_module.cc LIBRARIES REG + offline::EventMixing + + offline::MCDataProducts + offline::Mu2eUtilities + offline::SeedService ) cet_build_plugin(ProtonBunchIntensityLogNormal art::module REG_SOURCE src/ProtonBunchIntensityLogNormal_module.cc LIBRARIES REG + offline::EventMixing + + offline::MCDataProducts + offline::Mu2eUtilities + offline::SeedService ) cet_build_plugin(ResamplingMixer art::module REG_SOURCE src/ResamplingMixer_module.cc LIBRARIES REG + offline::EventMixing + + offline::Mu2eUtilities + offline::SeedService ) install_source(SUBDIRS src) diff --git a/ExtinctionMonitorFNAL/Analyses/CMakeLists.txt b/ExtinctionMonitorFNAL/Analyses/CMakeLists.txt index 2ed7c14af3..2437405836 100644 --- a/ExtinctionMonitorFNAL/Analyses/CMakeLists.txt +++ b/ExtinctionMonitorFNAL/Analyses/CMakeLists.txt @@ -18,8 +18,13 @@ cet_make_library( cet_build_plugin(EMFBoxFluxAnalyzer art::module REG_SOURCE src/EMFBoxFluxAnalyzer_module.cc LIBRARIES REG - offline::ExtinctionMonitorFNAL_Analyses + offline::ConfigTools + offline::DataProducts offline::ExtinctionMonitorFNAL_Utilities + offline::GeneralUtilities + offline::GeometryService + offline::GlobalConstantsService + offline::MCDataProducts ROOT::Tree ) @@ -28,30 +33,40 @@ cet_build_plugin(EMFBoxMuonAnalyzer art::module LIBRARIES REG offline::ExtinctionMonitorFNAL_Analyses ROOT::Tree + offline::GeometryService + offline::MCDataProducts ) cet_build_plugin(EMFDetHistPatRec art::module REG_SOURCE src/EMFDetHistPatRec_module.cc LIBRARIES REG offline::ExtinctionMonitorFNAL_Analyses + offline::GeometryService + offline::RecoDataProducts ) cet_build_plugin(EMFDetHistRawHits art::module REG_SOURCE src/EMFDetHistRawHits_module.cc LIBRARIES REG offline::ExtinctionMonitorFNAL_Analyses + offline::GeometryService + offline::RecoDataProducts ) cet_build_plugin(EMFDetHistRecoClusters art::module REG_SOURCE src/EMFDetHistRecoClusters_module.cc LIBRARIES REG offline::ExtinctionMonitorFNAL_Analyses + offline::GeometryService + offline::RecoDataProducts ) cet_build_plugin(EMFDetHistSimHits art::module REG_SOURCE src/EMFDetHistSimHits_module.cc LIBRARIES REG offline::ExtinctionMonitorFNAL_Analyses + offline::GeometryService + offline::MCDataProducts ) cet_build_plugin(EMFDetMCHistPatRec art::module @@ -59,72 +74,109 @@ cet_build_plugin(EMFDetMCHistPatRec art::module LIBRARIES REG offline::ExtinctionMonitorFNAL_Analyses offline::ExtinctionMonitorFNAL_Reconstruction + offline::GeometryService + offline::MCDataProducts + offline::RecoDataProducts ) cet_build_plugin(EMFDetPrintRawClusters art::module REG_SOURCE src/EMFDetPrintRawClusters_module.cc LIBRARIES REG offline::ExtinctionMonitorFNAL_Analyses + + offline::RecoDataProducts ) cet_build_plugin(EMFDetPrintRawHits art::module REG_SOURCE src/EMFDetPrintRawHits_module.cc LIBRARIES REG offline::ExtinctionMonitorFNAL_Analyses + + offline::RecoDataProducts ) cet_build_plugin(EMFDetPrintRawHitTruth art::module REG_SOURCE src/EMFDetPrintRawHitTruth_module.cc LIBRARIES REG offline::ExtinctionMonitorFNAL_Analyses + offline::GeometryService + offline::MCDataProducts + offline::RecoDataProducts ) cet_build_plugin(EMFDetPrintRecoClusters art::module REG_SOURCE src/EMFDetPrintRecoClusters_module.cc LIBRARIES REG offline::ExtinctionMonitorFNAL_Analyses + + offline::RecoDataProducts ) cet_build_plugin(EMFDetPrintRecoClusterTruth art::module REG_SOURCE src/EMFDetPrintRecoClusterTruth_module.cc LIBRARIES REG offline::ExtinctionMonitorFNAL_Analyses + + offline::MCDataProducts + offline::RecoDataProducts ) cet_build_plugin(EMFDetPrintSim art::module REG_SOURCE src/EMFDetPrintSim_module.cc LIBRARIES REG offline::ExtinctionMonitorFNAL_Analyses + + offline::MCDataProducts ) cet_build_plugin(EMFDigiTuning art::module REG_SOURCE src/EMFDigiTuning_module.cc LIBRARIES REG offline::ExtinctionMonitorFNAL_Analyses + offline::GeometryService + offline::RecoDataProducts ) cet_build_plugin(EMFRawHitsValidator art::module REG_SOURCE src/EMFRawHitsValidator_module.cc LIBRARIES REG offline::ExtinctionMonitorFNAL_Analyses + offline::GeometryService + offline::RecoDataProducts ) cet_build_plugin(EMFRoomFluxAnalyzer art::module REG_SOURCE src/EMFRoomFluxAnalyzer_module.cc LIBRARIES REG offline::ExtinctionMonitorFNAL_Analyses + + offline::ConfigTools + offline::DataProducts + offline::GeneralUtilities + offline::GeometryService + offline::GlobalConstantsService + offline::MCDataProducts + offline::ProtonBeamDumpGeom ) cet_build_plugin(MARSGenParticleDumper art::module REG_SOURCE src/MARSGenParticleDumper_module.cc LIBRARIES REG offline::ExtinctionMonitorFNAL_Analyses + offline::GeometryService + offline::GlobalConstantsService + offline::MCDataProducts + offline::ProtonBeamDumpGeom ) cet_build_plugin(MARSGenParticleHist art::module REG_SOURCE src/MARSGenParticleHist_module.cc LIBRARIES REG offline::ExtinctionMonitorFNAL_Analyses + + offline::GeometryService + offline::MCDataProducts + offline::ProtonBeamDumpGeom ) install_source(SUBDIRS src) diff --git a/ExtinctionMonitorFNAL/CMakeLists.txt b/ExtinctionMonitorFNAL/CMakeLists.txt index a1135e8f0e..4746a9e6b0 100644 --- a/ExtinctionMonitorFNAL/CMakeLists.txt +++ b/ExtinctionMonitorFNAL/CMakeLists.txt @@ -1,3 +1,4 @@ + add_subdirectory(Analyses) add_subdirectory(ComponentTests) add_subdirectory(Digitization) diff --git a/ExtinctionMonitorFNAL/ComponentTests/CMakeLists.txt b/ExtinctionMonitorFNAL/ComponentTests/CMakeLists.txt index 88309b75a0..893dc11ebf 100644 --- a/ExtinctionMonitorFNAL/ComponentTests/CMakeLists.txt +++ b/ExtinctionMonitorFNAL/ComponentTests/CMakeLists.txt @@ -1,18 +1,25 @@ cet_build_plugin(PixelIdConverterTest art::module REG_SOURCE src/PixelIdConverterTest_module.cc LIBRARIES REG + offline::DataProducts + offline::GeometryService + offline::SeedService ) cet_build_plugin(TrackExtrapolatorTest2 art::module REG_SOURCE src/TrackExtrapolatorTest2_module.cc LIBRARIES REG + offline::GeometryService offline::MCDataProducts + offline::RecoDataProducts art_root_io::TFileService_service ) cet_build_plugin(TrackExtrapolatorTest art::module REG_SOURCE src/TrackExtrapolatorTest_module.cc LIBRARIES REG + offline::GeometryService + offline::RecoDataProducts ) install_source(SUBDIRS src) diff --git a/ExtinctionMonitorFNAL/Digitization/CMakeLists.txt b/ExtinctionMonitorFNAL/Digitization/CMakeLists.txt index 870db31577..e26aafcaac 100644 --- a/ExtinctionMonitorFNAL/Digitization/CMakeLists.txt +++ b/ExtinctionMonitorFNAL/Digitization/CMakeLists.txt @@ -18,6 +18,13 @@ cet_build_plugin(ExtMonFNALHitMaker art::module REG_SOURCE src/ExtMonFNALHitMaker_module.cc LIBRARIES REG offline::ExtinctionMonitorFNAL_Digitization + + offline::ConditionsService + offline::GeometryService + offline::GlobalConstantsService + offline::MCDataProducts + offline::RecoDataProducts + offline::SeedService ) install_source(SUBDIRS src) diff --git a/ExtinctionMonitorFNAL/Reconstruction/CMakeLists.txt b/ExtinctionMonitorFNAL/Reconstruction/CMakeLists.txt index 2643ab5747..b11078ef58 100644 --- a/ExtinctionMonitorFNAL/Reconstruction/CMakeLists.txt +++ b/ExtinctionMonitorFNAL/Reconstruction/CMakeLists.txt @@ -6,7 +6,6 @@ cet_make_library( src/PixelRecoUtils.cc src/TrackExtrapolator.cc LIBRARIES PUBLIC - offline::RecoDataProducts ) @@ -14,24 +13,32 @@ cet_build_plugin(EMFPatRecFromTracklets art::module REG_SOURCE src/EMFPatRecFromTracklets_module.cc LIBRARIES REG offline::ExtinctionMonitorFNAL_Reconstruction + offline::GeometryService + offline::RecoDataProducts ) cet_build_plugin(EMFTrackClusterArbiter art::module REG_SOURCE src/EMFTrackClusterArbiter_module.cc LIBRARIES REG offline::ExtinctionMonitorFNAL_Reconstruction + + offline::RecoDataProducts ) cet_build_plugin(ExtMonFNALRawClusterization art::module REG_SOURCE src/ExtMonFNALRawClusterization_module.cc LIBRARIES REG offline::ExtinctionMonitorFNAL_Reconstruction + offline::GeometryService + offline::RecoDataProducts ) cet_build_plugin(ExtMonFNALRecoClusterization art::module REG_SOURCE src/ExtMonFNALRecoClusterization_module.cc LIBRARIES REG offline::ExtinctionMonitorFNAL_Reconstruction + offline::GeometryService + offline::RecoDataProducts ) install_source(SUBDIRS src) diff --git a/ExtinctionMonitorFNAL/TruthAlgs/CMakeLists.txt b/ExtinctionMonitorFNAL/TruthAlgs/CMakeLists.txt index 3a8181d3e0..eac7c4a1d2 100644 --- a/ExtinctionMonitorFNAL/TruthAlgs/CMakeLists.txt +++ b/ExtinctionMonitorFNAL/TruthAlgs/CMakeLists.txt @@ -1,19 +1,25 @@ cet_build_plugin(PatRecTruthMaker art::module REG_SOURCE src/PatRecTruthMaker_module.cc LIBRARIES REG + offline::MCDataProducts + offline::RecoDataProducts ) cet_build_plugin(RecoClusterTruthMaker art::module REG_SOURCE src/RecoClusterTruthMaker_module.cc LIBRARIES REG + offline::MCDataProducts + offline::RecoDataProducts ) cet_build_plugin(SimParticleMARSAssnsMaker art::module REG_SOURCE src/SimParticleMARSAssnsMaker_module.cc LIBRARIES REG + offline::MCDataProducts + offline::Mu2eUtilities ) install_source(SUBDIRS src) diff --git a/Filters/CMakeLists.txt b/Filters/CMakeLists.txt index 6d61e07cb6..cbb41752e0 100644 --- a/Filters/CMakeLists.txt +++ b/Filters/CMakeLists.txt @@ -1,126 +1,188 @@ cet_build_plugin(BunchIntensityFilter art::module REG_SOURCE src/BunchIntensityFilter_module.cc LIBRARIES REG + offline::BFieldGeom + offline::GeometryService + offline::MCDataProducts + offline::RecoDataProducts ) cet_build_plugin(CaloShowerSimFilter art::module REG_SOURCE src/CaloShowerSimFilter_module.cc LIBRARIES REG + offline::MCDataProducts ) cet_build_plugin(ChooseTrackFilter art::module REG_SOURCE src/ChooseTrackFilter_module.cc LIBRARIES REG + offline::CalorimeterGeom + offline::DataProducts + offline::GeometryService + offline::MCDataProducts + offline::RecoDataProducts ) cet_build_plugin(CompressPhysicalVolumes art::module REG_SOURCE src/CompressPhysicalVolumes_module.cc LIBRARIES REG + offline::MCDataProducts + offline::Mu2eUtilities ) cet_build_plugin(CompressStepPointMCs art::module REG_SOURCE src/CompressStepPointMCs_module.cc - LIBRARIES REG + LIBRARIES REG + offline::ConditionsService + offline::MCDataProducts + offline::Mu2eUtilities ) cet_build_plugin(CosmicMixingFilter art::module REG_SOURCE src/CosmicMixingFilter_module.cc LIBRARIES REG + offline::BFieldGeom + offline::ConditionsService + offline::DataProducts + offline::GeometryService + offline::GlobalConstantsService + offline::MCDataProducts + offline::RecoDataProducts + offline::TrkReco ) cet_build_plugin(DetectorStepFilter art::module REG_SOURCE src/DetectorStepFilter_module.cc LIBRARIES REG + offline::ConditionsService + offline::DataProducts + offline::MCDataProducts ) cet_build_plugin(EMFBoxHitsFilter art::module REG_SOURCE src/EMFBoxHitsFilter_module.cc LIBRARIES REG + offline::DataProducts + offline::ExtinctionMonitorFNAL_Geometry + offline::GeometryService + offline::MCDataProducts + offline::Mu2eUtilities + offline::RecoDataProducts ) cet_build_plugin(EMFPixelHitsFilter art::module REG_SOURCE src/EMFPixelHitsFilter_module.cc LIBRARIES REG + offline::MCDataProducts + offline::Mu2eUtilities + offline::RecoDataProducts ) cet_build_plugin(EMFPixelSimFilter art::module REG_SOURCE src/EMFPixelSimFilter_module.cc LIBRARIES REG + offline::MCDataProducts + offline::Mu2eUtilities ) cet_build_plugin(FilterCosmicsStage1 art::module REG_SOURCE src/FilterCosmicsStage1_module.cc LIBRARIES REG + offline::MCDataProducts ) cet_build_plugin(FilterG4Out art::module REG_SOURCE src/FilterG4Out_module.cc LIBRARIES REG + offline::MCDataProducts + offline::Mu2eUtilities ) cet_build_plugin(FilterStatusG4 art::module REG_SOURCE src/FilterStatusG4_module.cc LIBRARIES REG + offline::MCDataProducts ) cet_build_plugin(FilterStepPointAngleVsTarget art::module REG_SOURCE src/FilterStepPointAngleVsTarget_module.cc LIBRARIES REG + offline::DataProducts + offline::MCDataProducts ) cet_build_plugin(FilterStepPointKinEnPDG art::module REG_SOURCE src/FilterStepPointKinEnPDG_module.cc LIBRARIES REG + offline::GlobalConstantsService + offline::MCDataProducts ) cet_build_plugin(FilterStepPointMomentum art::module REG_SOURCE src/FilterStepPointMomentum_module.cc LIBRARIES REG + offline::MCDataProducts ) cet_build_plugin(FilterStepPointPDG art::module REG_SOURCE src/FilterStepPointPDG_module.cc LIBRARIES REG + offline::DataProducts + offline::MCDataProducts ) cet_build_plugin(FilterStepPointPositionMomentum art::module REG_SOURCE src/FilterStepPointPositionMomentum_module.cc LIBRARIES REG + offline::DataProducts + offline::MCDataProducts ) cet_build_plugin(FilterStepPointPzVsTarget art::module REG_SOURCE src/FilterStepPointPzVsTarget_module.cc LIBRARIES REG + offline::DataProducts + offline::MCDataProducts ) cet_build_plugin(FilterStepPointReflection art::module REG_SOURCE src/FilterStepPointReflection_module.cc LIBRARIES REG + offline::DataProducts + offline::GeometryService + offline::MCDataProducts ) cet_build_plugin(GenParticleMomFilter art::module REG_SOURCE src/GenParticleMomFilter_module.cc LIBRARIES REG + offline::DataProducts + offline::MCDataProducts ) cet_build_plugin(KilledEventFilter art::module REG_SOURCE src/KilledEventFilter_module.cc LIBRARIES REG + offline::MCDataProducts ) cet_build_plugin(ParticleCodeFilter art::module REG_SOURCE src/ParticleCodeFilter_module.cc LIBRARIES REG + offline::DataProducts + offline::MCDataProducts ) cet_build_plugin(RandomPrescaleFilter art::module REG_SOURCE src/RandomPrescaleFilter_module.cc LIBRARIES REG + offline::SeedService ) cet_build_plugin(RecoMomFilter art::module REG_SOURCE src/RecoMomFilter_module.cc LIBRARIES REG + offline::RecoDataProducts ) cet_build_plugin(SelectEvents art::module @@ -131,61 +193,83 @@ cet_build_plugin(SelectEvents art::module cet_build_plugin(SelectStepPointsByTime art::module REG_SOURCE src/SelectStepPointsByTime_module.cc LIBRARIES REG + offline::MCDataProducts ) cet_build_plugin(StepPointFilter art::module REG_SOURCE src/StepPointFilter_module.cc LIBRARIES REG + offline::MCDataProducts ) cet_build_plugin(StepPointMCCollectionUpdater art::module REG_SOURCE src/StepPointMCCollectionUpdater_module.cc LIBRARIES REG + offline::MCDataProducts ) cet_build_plugin(StepPointsInDigis art::module REG_SOURCE src/StepPointsInDigis_module.cc LIBRARIES REG + offline::MCDataProducts ) cet_build_plugin(StrawDigiMCFilter art::module REG_SOURCE src/StrawDigiMCFilter_module.cc LIBRARIES REG + offline::MCDataProducts ) cet_build_plugin(TrackerStepPointFilter art::module REG_SOURCE src/TrackerStepPointFilter_module.cc LIBRARIES REG + offline::MCDataProducts ) cet_build_plugin(TrackSummaryTruthUpdater art::module REG_SOURCE src/TrackSummaryTruthUpdater_module.cc LIBRARIES REG + offline::MCDataProducts ) cet_build_plugin(TriggerResultsFilter art::module REG_SOURCE src/TriggerResultsFilter_module.cc LIBRARIES REG + offline::Mu2eUtilities ) cet_build_plugin(TrkPatRecFilter art::module REG_SOURCE src/TrkPatRecFilter_module.cc LIBRARIES REG + offline::MCDataProducts + offline::RecoDataProducts ) cet_build_plugin(TrkQualFilter art::module REG_SOURCE src/TrkQualFilter_module.cc LIBRARIES REG + offline::AnalysisConditions + offline::Mu2eUtilities + offline::ProditionsService + offline::RecoDataProducts ) cet_build_plugin(VetoIncorrectHits art::module REG_SOURCE src/VetoIncorrectHits_module.cc LIBRARIES REG + offline::CosmicRayShieldGeom + offline::GeometryService + offline::MCDataProducts + offline::Mu2eUtilities + offline::TrackerGeom ) cet_build_plugin(WeightSamplingFilter art::module REG_SOURCE src/WeightSamplingFilter_module.cc LIBRARIES REG + offline::DataProducts + offline::MCDataProducts + offline::SeedService ) install_source(SUBDIRS src) diff --git a/GeneralUtilities/CMakeLists.txt b/GeneralUtilities/CMakeLists.txt index b41e90be26..63acf7b4f6 100644 --- a/GeneralUtilities/CMakeLists.txt +++ b/GeneralUtilities/CMakeLists.txt @@ -26,7 +26,6 @@ cet_make_library( src/trimInPlace.cc src/TwoBodyKinematics.cc src/TwoDPoint.cc - src/TwoDPointTest_main.cc src/TwoDWeight.cc src/VMInfo.cc LIBRARIES PUBLIC @@ -36,7 +35,14 @@ cet_make_library( cetlib_except::cetlib_except CLHEP::CLHEP fhiclcpp::fhiclcpp - canvas::canvas + canvas::canvas +) + +cet_make_exec(NAME TwoDPointTest + SOURCE src/TwoDPointTest_main.cc + LIBRARIES + offline::GeneralUtilities + ) install_source(SUBDIRS src) diff --git a/GeomPrimitives/CMakeLists.txt b/GeomPrimitives/CMakeLists.txt index 3bc5c3357a..bc53d63243 100644 --- a/GeomPrimitives/CMakeLists.txt +++ b/GeomPrimitives/CMakeLists.txt @@ -8,6 +8,7 @@ cet_make_library( Boost::headers CLHEP::CLHEP cetlib_except::cetlib_except + ) install_source(SUBDIRS src) diff --git a/GeometryService/CMakeLists.txt b/GeometryService/CMakeLists.txt index a89eb4d9f3..05b5b7cd42 100644 --- a/GeometryService/CMakeLists.txt +++ b/GeometryService/CMakeLists.txt @@ -71,6 +71,26 @@ cet_build_plugin(GeometryService art::service REG_SOURCE src/GeometryService_service.cc LIBRARIES REG offline::GeometryService + + offline::BeamlineGeom + offline::BFieldGeom + offline::CalorimeterGeom + offline::ConfigTools + offline::CosmicRayShieldGeom + offline::DetectorSolenoidGeom + offline::ExternalShieldingGeom + offline::ExtinctionMonitorFNAL_Geometry + offline::MBSGeom + offline::MECOStyleProtonAbsorberGeom + offline::Mu2eHallGeom + offline::ProductionSolenoidGeom + offline::ProductionTargetGeom + offline::ProtonBeamDumpGeom + offline::PTMGeom + offline::ServicesGeom + offline::STMGeom + offline::StoppingTargetGeom + offline::TrackerGeom ) install_source(SUBDIRS src) diff --git a/GlobalConstantsService/CMakeLists.txt b/GlobalConstantsService/CMakeLists.txt index f24f2f19c1..fc13b8e9a7 100644 --- a/GlobalConstantsService/CMakeLists.txt +++ b/GlobalConstantsService/CMakeLists.txt @@ -17,6 +17,7 @@ cet_build_plugin(GlobalConstantsService art::service REG_SOURCE src/GlobalConstantsService_service.cc LIBRARIES REG offline::GlobalConstantsService + ) install_source(SUBDIRS src) diff --git a/HelloWorld/CMakeLists.txt b/HelloWorld/CMakeLists.txt index f4b1990b91..dc98903580 100644 --- a/HelloWorld/CMakeLists.txt +++ b/HelloWorld/CMakeLists.txt @@ -1,16 +1,20 @@ cet_build_plugin(HelloProducer art::module REG_SOURCE src/HelloProducer_module.cc LIBRARIES REG + + offline::MCDataProducts ) cet_build_plugin(HelloWorld2 art::module REG_SOURCE src/HelloWorld2_module.cc LIBRARIES REG + ) cet_build_plugin(HelloWorld art::module REG_SOURCE src/HelloWorld_module.cc LIBRARIES REG + ) install_source(SUBDIRS src) diff --git a/MCDataProducts/CMakeLists.txt b/MCDataProducts/CMakeLists.txt index 3c5ab32135..dfc407d88e 100644 --- a/MCDataProducts/CMakeLists.txt +++ b/MCDataProducts/CMakeLists.txt @@ -27,11 +27,10 @@ cet_make_library( ) art_dictionary( NO_CHECK_CLASS_VERSION # For some reason this segfaults - CLASSES_DEF_XML ${CMAKE_CURRENT_SOURCE_DIR}/src/classes_def.xml - CLASSES_H ${CMAKE_CURRENT_SOURCE_DIR}/src/classes.h - DICTIONARY_LIBRARIES - offline::MCDataProducts + CLASSES_DEF_XML ${CMAKE_CURRENT_SOURCE_DIR}/src/classes_def.xml + CLASSES_H ${CMAKE_CURRENT_SOURCE_DIR}/src/classes.h + DICTIONARY_LIBRARIES + offline::MCDataProducts ) - install_source(SUBDIRS src) install_headers(SUBDIRS inc) diff --git a/Mu2e/CMakeLists.txt b/Mu2e/CMakeLists.txt index 32817199cc..adb60bf5e2 100644 --- a/Mu2e/CMakeLists.txt +++ b/Mu2e/CMakeLists.txt @@ -1,10 +1,8 @@ cet_make_exec(NAME mu2e - SOURCE - src/mu2e_main.cc + SOURCE src/mu2e_main.cc LIBRARIES art::Framework_Core art::Framework_Art - ) install_source(SUBDIRS src) diff --git a/Mu2eG4/CMakeLists.txt b/Mu2eG4/CMakeLists.txt index 4a31d888ab..82d7469595 100644 --- a/Mu2eG4/CMakeLists.txt +++ b/Mu2eG4/CMakeLists.txt @@ -12,11 +12,6 @@ cet_make_library( src/constructDiskCalorimeter.cc src/constructDS.cc src/constructDummyStoppingTarget.cc - src/ConstructEnvBox_tool.cc - src/ConstructEnvCalo01_tool.cc - src/ConstructEnvMuCapture_tool.cc - src/ConstructEnvNBoxes_tool.cc - src/ConstructEnvTube_tool.cc src/constructExternalShielding.cc src/constructExtMonFNALBuilding.cc src/constructExtMonFNAL.cc @@ -159,16 +154,78 @@ cet_make_library( cet_build_plugin(IonProducer art::module REG_SOURCE src/IonProducer_module.cc LIBRARIES REG + offline::Mu2eG4 + + offline::DataProducts + offline::MCDataProducts ) cet_build_plugin(Mu2eG4 art::module REG_SOURCE src/Mu2eG4_module.cc LIBRARIES REG + offline::Mu2eG4 + + offline::ConfigTools + offline::GeometryService + offline::MCDataProducts + offline::Mu2eHallGeom + offline::SeedService ) cet_build_plugin(Mu2eG4MT art::module REG_SOURCE src/Mu2eG4MT_module.cc LIBRARIES REG + offline::Mu2eG4 + + offline::ConfigTools + offline::GeometryService + offline::MCDataProducts + offline::Mu2eHallGeom +) + +cet_build_plugin(ConstructEnvBox art::tool + REG_SOURCE src/ConstructEnvBox_tool.cc + LIBRARIES REG + offline::Mu2eG4 + + offline::ConfigTools + offline::Mu2eG4Helper +) + +cet_build_plugin(ConstructEnvCalo01 art::tool + REG_SOURCE src/ConstructEnvCalo01_tool.cc + LIBRARIES REG + offline::Mu2eG4 + + offline::ConfigTools + offline::Mu2eG4Helper +) + +cet_build_plugin(ConstructEnvMuCapture art::tool + REG_SOURCE src/ConstructEnvMuCapture_tool.cc + LIBRARIES REG + offline::Mu2eG4 + + offline::ConfigTools + offline::Mu2eG4Helper +) + +cet_build_plugin(ConstructEnvNBoxes art::tool + REG_SOURCE src/ConstructEnvNBoxes_tool.cc + LIBRARIES REG + offline::Mu2eG4 + + offline::ConfigTools + offline::Mu2eG4Helper +) + +cet_build_plugin(ConstructEnvTube art::tool + REG_SOURCE src/ConstructEnvTube_tool.cc + LIBRARIES REG + offline::Mu2eG4 + + offline::ConfigTools + offline::Mu2eG4Helper ) install_source(SUBDIRS src) diff --git a/Mu2eG4Helper/CMakeLists.txt b/Mu2eG4Helper/CMakeLists.txt index 07b6d91c93..9e8e95860e 100644 --- a/Mu2eG4Helper/CMakeLists.txt +++ b/Mu2eG4Helper/CMakeLists.txt @@ -11,6 +11,7 @@ cet_build_plugin(Mu2eG4Helper art::service REG_SOURCE src/Mu2eG4Helper_service.cc LIBRARIES REG offline::Mu2eG4Helper + ) install_source(SUBDIRS src) diff --git a/Mu2eKinKal/CMakeLists.txt b/Mu2eKinKal/CMakeLists.txt index 76b384e238..652322782d 100644 --- a/Mu2eKinKal/CMakeLists.txt +++ b/Mu2eKinKal/CMakeLists.txt @@ -22,6 +22,7 @@ cet_make_library( KinKal_Fit KinKal_General KinKal_MatEnv + offline::BFieldGeom offline::CalorimeterGeom offline::ConfigTools @@ -29,7 +30,6 @@ cet_make_library( offline::GeneralUtilities offline::GeometryService offline::KinKalGeom - offline::RecoDataProducts offline::TrackerConditions offline::TrackerGeom ROOT::ROOTTMVASofie @@ -40,24 +40,43 @@ cet_build_plugin(CentralHelixFit art::module REG_SOURCE src/CentralHelixFit_module.cc LIBRARIES REG offline::Mu2eKinKal + + offline::GeneralUtilities + offline::TrkReco ) cet_build_plugin(CosmicTrackSeedFilter art::module REG_SOURCE src/CosmicTrackSeedFilter_module.cc LIBRARIES REG offline::Mu2eKinKal + + offline::RecoDataProducts ) cet_build_plugin(KinematicLineFit art::module REG_SOURCE src/KinematicLineFit_module.cc LIBRARIES REG offline::Mu2eKinKal + + offline::BFieldGeom + offline::CalorimeterGeom + offline::DataProducts + offline::GeneralUtilities + offline::GeometryService + offline::GlobalConstantsService + offline::Mu2eUtilities + offline::ProditionsService + offline::RecoDataProducts + offline::TrackerConditions + offline::TrackerGeom + offline::TrkReco ) cet_build_plugin(LoopHelixFit art::module REG_SOURCE src/LoopHelixFit_module.cc LIBRARIES REG offline::Mu2eKinKal + ) install_source(SUBDIRS src) diff --git a/ParticleID/CMakeLists.txt b/ParticleID/CMakeLists.txt index 85b31d32b2..8b50ba9b4d 100644 --- a/ParticleID/CMakeLists.txt +++ b/ParticleID/CMakeLists.txt @@ -13,11 +13,23 @@ cet_make_library( cet_build_plugin(ParticleID art::module REG_SOURCE src/ParticleID_module.cc LIBRARIES REG + offline::ParticleID + + offline::BTrkData + offline::ConditionsService + offline::ConfigTools + offline::GeometryService + offline::ProditionsService + offline::RecoDataProducts + offline::TrackerConditions ) cet_build_plugin(ParticleIDRead art::module REG_SOURCE src/ParticleIDRead_module.cc LIBRARIES REG + offline::ParticleID + + offline::RecoDataProducts ) install_source(SUBDIRS src) diff --git a/Print/CMakeLists.txt b/Print/CMakeLists.txt index 50b2fa1d96..9bd34a9c4a 100644 --- a/Print/CMakeLists.txt +++ b/Print/CMakeLists.txt @@ -86,18 +86,21 @@ cet_build_plugin(DataProductDump art::module REG_SOURCE src/DataProductDump_module.cc LIBRARIES REG offline::Print + ) cet_build_plugin(PrintModule art::module REG_SOURCE src/PrintModule_module.cc LIBRARIES REG offline::Print + ) cet_build_plugin(RunSubrunEvent art::module REG_SOURCE src/RunSubrunEvent_module.cc LIBRARIES REG offline::Print + ) install_source(SUBDIRS src) diff --git a/ProditionsService/CMakeLists.txt b/ProditionsService/CMakeLists.txt index f0996661fb..5da43519c7 100644 --- a/ProditionsService/CMakeLists.txt +++ b/ProditionsService/CMakeLists.txt @@ -18,17 +18,25 @@ cet_make_library(INTERFACE cet_build_plugin(ProditionsService art::service REG_SOURCE src/ProditionsService_service.cc LIBRARIES REG + offline::ProditionsService + offline::AnalysisConditions offline::CaloConditions offline::CRVConditions - offline::ProditionsService + offline::DAQConditions + offline::DbService + offline::GeometryService offline::SimulationConditions + offline::STMConditions + offline::TrackerConditions ) cet_build_plugin(ProditionsTest art::module REG_SOURCE src/ProditionsTest_module.cc LIBRARIES REG offline::ProditionsService + + offline::CRVConditions ) install_source(SUBDIRS src) diff --git a/RecoDataProducts/CMakeLists.txt b/RecoDataProducts/CMakeLists.txt index 7a499397f1..8725d5618e 100644 --- a/RecoDataProducts/CMakeLists.txt +++ b/RecoDataProducts/CMakeLists.txt @@ -37,18 +37,19 @@ cet_make_library( BTrk_KalmanTrack BTrk_ProbTools KinKal_Trajectory + offline::DataProducts offline::GeneralUtilities offline::KinKalGeom + offline::Mu2eKinKal offline::TrackerConditions ) art_dictionary( NO_CHECK_CLASS_VERSION # For some reason this segfaults - CLASSES_DEF_XML ${CMAKE_CURRENT_SOURCE_DIR}/src/classes_def.xml - CLASSES_H ${CMAKE_CURRENT_SOURCE_DIR}/src/classes.h - DICTIONARY_LIBRARIES - offline::RecoDataProducts + CLASSES_DEF_XML ${CMAKE_CURRENT_SOURCE_DIR}/src/classes_def.xml + CLASSES_H ${CMAKE_CURRENT_SOURCE_DIR}/src/classes.h + DICTIONARY_LIBRARIES + offline::RecoDataProducts ) - install_source(SUBDIRS src) install_headers(SUBDIRS inc) diff --git a/STMReco/CMakeLists.txt b/STMReco/CMakeLists.txt index 26adb9cb38..2fb2391d3f 100644 --- a/STMReco/CMakeLists.txt +++ b/STMReco/CMakeLists.txt @@ -1,31 +1,56 @@ cet_build_plugin(MakeSTMHits art::module REG_SOURCE src/MakeSTMHits_module.cc LIBRARIES REG + offline::GlobalConstantsService + offline::Mu2eUtilities + offline::ProditionsService + offline::RecoDataProducts + offline::STMConditions ) cet_build_plugin(PlotSTMEnergySpectrum art::module REG_SOURCE src/PlotSTMEnergySpectrum_module.cc LIBRARIES REG + offline::GlobalConstantsService + offline::MCDataProducts + offline::RecoDataProducts ) cet_build_plugin(PlotSTMMWDSpectrum art::module REG_SOURCE src/PlotSTMMWDSpectrum_module.cc LIBRARIES REG + offline::GlobalConstantsService + offline::MCDataProducts + offline::RecoDataProducts ) cet_build_plugin(PlotSTMWaveformDigis art::module REG_SOURCE src/PlotSTMWaveformDigis_module.cc LIBRARIES REG + offline::DataProducts + offline::Mu2eUtilities + offline::ProditionsService + offline::RecoDataProducts + offline::STMConditions ) cet_build_plugin(STMMovingWindowDeconvolution art::module REG_SOURCE src/STMMovingWindowDeconvolution_module.cc LIBRARIES REG + offline::GlobalConstantsService + offline::Mu2eUtilities + offline::ProditionsService + offline::RecoDataProducts + offline::STMConditions ) cet_build_plugin(STMZeroSuppression art::module REG_SOURCE src/STMZeroSuppression_module.cc LIBRARIES REG + offline::Mu2eUtilities + offline::ProditionsService + offline::RecoDataProducts + offline::STMConditions ) install_source(SUBDIRS src) diff --git a/SeedService/CMakeLists.txt b/SeedService/CMakeLists.txt index 0e071e598b..81e9c2fda3 100644 --- a/SeedService/CMakeLists.txt +++ b/SeedService/CMakeLists.txt @@ -14,6 +14,7 @@ cet_build_plugin(SeedService art::service IMPL_SOURCE src/SeedService_service.cc LIBRARIES PUBLIC offline::SeedService + ) cet_build_plugin(SeedTest01 art::module @@ -21,6 +22,7 @@ cet_build_plugin(SeedTest01 art::module LIBRARIES REG offline::SeedService offline::SeedService_SeedService_service + ) install_source(SUBDIRS src) diff --git a/Sources/CMakeLists.txt b/Sources/CMakeLists.txt index 9d2395c2d6..dc11c8defa 100644 --- a/Sources/CMakeLists.txt +++ b/Sources/CMakeLists.txt @@ -50,6 +50,5 @@ cet_build_plugin(PBISequence art::source offline::Sources ) - install_source(SUBDIRS src) install_headers(SUBDIRS inc) diff --git a/TEveEventDisplay/CMakeLists.txt b/TEveEventDisplay/CMakeLists.txt index b7c85c12d0..ad908378c3 100644 --- a/TEveEventDisplay/CMakeLists.txt +++ b/TEveEventDisplay/CMakeLists.txt @@ -25,24 +25,29 @@ cet_make_library( cet_build_plugin(TEveEventDisplay art::module REG_SOURCE src/TEveEventDisplay_module.cc LIBRARIES REG + offline::TEveEventDisplay + ) cet_build_plugin(TEveGDMLTest art::module REG_SOURCE src/TEveGDMLTest_module.cc LIBRARIES REG + offline::TEveEventDisplay + ) cet_build_plugin(TEveNonGDMLTest art::module REG_SOURCE src/TEveNonGDMLTest_module.cc LIBRARIES REG + offline::TEveEventDisplay + ) -art_dictionary( - CLASSES_DEF_XML ${CMAKE_CURRENT_SOURCE_DIR}/src/classes_def.xml - CLASSES_H ${CMAKE_CURRENT_SOURCE_DIR}/src/classes.h - DICTIONARY_LIBRARIES - offline::TEveEventDisplay +art_dictionary( NO_CHECK_CLASS_VERSION # For some reason this segfaults + CLASSES_DEF_XML ${CMAKE_CURRENT_SOURCE_DIR}/src/classes_def.xml + CLASSES_H ${CMAKE_CURRENT_SOURCE_DIR}/src/classes.h + DICTIONARY_LIBRARIES + offline::TEveEventDisplay ) - install_source(SUBDIRS src) install_fhicl(SUBDIRS fcl SUBDIRNAME TEveEventDisplay) diff --git a/TrackCaloMatching/CMakeLists.txt b/TrackCaloMatching/CMakeLists.txt index fcfaca31e7..8b35a1a154 100644 --- a/TrackCaloMatching/CMakeLists.txt +++ b/TrackCaloMatching/CMakeLists.txt @@ -1,31 +1,53 @@ cet_build_plugin(TrackCaloIntersection art::module REG_SOURCE src/TrackCaloIntersection_module.cc - LIBRARIES REG + LIBRARIES REG + offline::CalorimeterGeom + offline::GeometryService + offline::RecoDataProducts ) cet_build_plugin(TrackCaloIntersectionMVA art::module REG_SOURCE src/TrackCaloIntersectionMVA_module.cc LIBRARIES REG + offline::CalorimeterGeom + offline::GeometryService + offline::RecoDataProducts ) cet_build_plugin(TrackCaloMatchingExtend art::module REG_SOURCE src/TrackCaloMatchingExtend_module.cc LIBRARIES REG + offline::CalorimeterGeom + offline::GeometryService + offline::RecoDataProducts ) cet_build_plugin(TrackCaloMatching art::module REG_SOURCE src/TrackCaloMatching_module.cc LIBRARIES REG + offline::CalorimeterGeom + offline::ConditionsService + offline::GeometryService + offline::RecoDataProducts ) cet_build_plugin(TrackCaloMatchingMVA art::module REG_SOURCE src/TrackCaloMatchingMVA_module.cc LIBRARIES REG + offline::CalorimeterGeom + offline::GeometryService + offline::RecoDataProducts ) cet_build_plugin(TrkExtrapol art::module REG_SOURCE src/TrkExtrapol_module.cc LIBRARIES REG + offline::CalorimeterGeom + offline::ConditionsService + offline::GeometryService + offline::MCDataProducts + offline::RecoDataProducts + offline::TrackerGeom ) install_source(SUBDIRS src) diff --git a/TrackerMC/CMakeLists.txt b/TrackerMC/CMakeLists.txt index 74e1af478d..096760bf9c 100644 --- a/TrackerMC/CMakeLists.txt +++ b/TrackerMC/CMakeLists.txt @@ -16,25 +16,58 @@ cet_make_library( cet_build_plugin(MakeMCKalSeed art::module REG_SOURCE src/MakeMCKalSeed_module.cc LIBRARIES REG + offline::TrackerMC + + offline::BFieldGeom + offline::ConditionsService + offline::GeometryService + offline::MCDataProducts + offline::ProditionsService + offline::RecoDataProducts + offline::SeedService + offline::TrackerGeom ) cet_build_plugin(MakeStrawGasSteps art::module REG_SOURCE src/MakeStrawGasSteps_module.cc LIBRARIES REG + offline::TrackerMC + + offline::BFieldGeom + offline::GeometryService + offline::GlobalConstantsService + offline::MCDataProducts + offline::Mu2eUtilities + offline::ProditionsService + offline::TrackerConditions + offline::TrackerGeom ) cet_build_plugin(StrawDigisFromStrawGasSteps art::module REG_SOURCE src/StrawDigisFromStrawGasSteps_module.cc LIBRARIES REG + offline::TrackerMC + + offline::BFieldGeom + offline::ConditionsService + offline::ConfigTools + offline::DataProducts + offline::GeometryService + offline::MCDataProducts + offline::Mu2eUtilities + offline::ProditionsService + offline::RecoDataProducts + offline::SeedService + offline::TrackerConditions + offline::TrackerGeom ) -art_dictionary( - CLASSES_DEF_XML ${CMAKE_CURRENT_SOURCE_DIR}/src/classes_def.xml - CLASSES_H ${CMAKE_CURRENT_SOURCE_DIR}/src/classes.h - DICTIONARY_LIBRARIES - offline::TrackerMC +art_dictionary( NO_CHECK_CLASS_VERSION # For some reason this segfaults + CLASSES_DEF_XML ${CMAKE_CURRENT_SOURCE_DIR}/src/classes_def.xml + CLASSES_H ${CMAKE_CURRENT_SOURCE_DIR}/src/classes.h + DICTIONARY_LIBRARIES + offline::TrackerMC ) - install_source(SUBDIRS src) install_headers(SUBDIRS inc) install_fhicl(SUBDIRS fcl SUBDIRNAME TrackerMC) diff --git a/Trigger/CMakeLists.txt b/Trigger/CMakeLists.txt index cbfde2b3d2..5917859a91 100644 --- a/Trigger/CMakeLists.txt +++ b/Trigger/CMakeLists.txt @@ -1,26 +1,40 @@ cet_build_plugin(DigiFilter art::module REG_SOURCE src/DigiFilter_module.cc LIBRARIES REG + offline::RecoDataProducts ) cet_build_plugin(EvalWeightedEventCounts art::module REG_SOURCE src/EvalWeightedEventCounts_module.cc LIBRARIES REG + offline::MCDataProducts ) cet_build_plugin(MergeTriggerInfo art::module REG_SOURCE src/MergeTriggerInfo_module.cc LIBRARIES REG + offline::RecoDataProducts ) cet_build_plugin(PrescaleEvent art::module REG_SOURCE src/PrescaleEvent_module.cc LIBRARIES REG + ) cet_build_plugin(ReadTriggerInfo art::module REG_SOURCE src/ReadTriggerInfo_module.cc LIBRARIES REG + + offline::BFieldGeom + offline::ConditionsService + offline::DataProducts + offline::GeometryService + offline::GlobalConstantsService + offline::MCDataProducts + offline::Mu2eUtilities + offline::RecoDataProducts + offline::TrackerGeom ) install_source(SUBDIRS src) diff --git a/TrkDiag/CMakeLists.txt b/TrkDiag/CMakeLists.txt index 4d8577a685..dae2591a77 100644 --- a/TrkDiag/CMakeLists.txt +++ b/TrkDiag/CMakeLists.txt @@ -21,75 +21,165 @@ cet_make_library( cet_build_plugin(BinnedSpectrumWeight art::module REG_SOURCE src/BinnedSpectrumWeight_module.cc LIBRARIES REG + offline::TrkDiag + + offline::ConfigTools + offline::MCDataProducts + offline::Mu2eUtilities + offline::SeedService ) cet_build_plugin(BkgDiag art::module REG_SOURCE src/BkgDiag_module.cc LIBRARIES REG + offline::TrkDiag + + offline::DataProducts + offline::GeometryService + offline::MCDataProducts + offline::RecoDataProducts ) cet_build_plugin(ComboHitDiag art::module REG_SOURCE src/ComboHitDiag_module.cc LIBRARIES REG + offline::TrkDiag + + offline::GeometryService + offline::MCDataProducts + offline::ProditionsService + offline::RecoDataProducts + offline::TrackerConditions ) cet_build_plugin(HelixDiag art::module REG_SOURCE src/HelixDiag_module.cc LIBRARIES REG + offline::TrkDiag + + offline::BFieldGeom + offline::GeneralUtilities + offline::GeometryService + offline::GlobalConstantsService + offline::MCDataProducts + offline::Mu2eUtilities + offline::RecoDataProducts + offline::TrkReco ) cet_build_plugin(ProtonBunchTimeDiag art::module REG_SOURCE src/ProtonBunchTimeDiag_module.cc LIBRARIES REG + offline::TrkDiag + + offline::DataProducts + offline::MCDataProducts + offline::RecoDataProducts ) cet_build_plugin(RMCWeight art::module REG_SOURCE src/RMCWeight_module.cc LIBRARIES REG + offline::TrkDiag + + offline::ConfigTools + offline::MCDataProducts + offline::Mu2eUtilities + offline::SeedService ) cet_build_plugin(StrawHitDiag art::module REG_SOURCE src/StrawHitDiag_module.cc LIBRARIES REG + offline::TrkDiag + + offline::ConditionsService + offline::DataProducts + offline::GeometryService + offline::MCDataProducts + offline::ProditionsService + offline::RecoDataProducts + offline::TrackerConditions + offline::TrackerGeom ) cet_build_plugin(StrawResponseTest art::module REG_SOURCE src/StrawResponseTest_module.cc LIBRARIES REG + offline::TrkDiag + + offline::ProditionsService + offline::TrackerConditions ) cet_build_plugin(TimeClusterDiag art::module REG_SOURCE src/TimeClusterDiag_module.cc LIBRARIES REG + offline::TrkDiag + + offline::CalorimeterGeom + offline::GeneralUtilities + offline::GeometryService + offline::MCDataProducts + offline::RecoDataProducts + offline::TrkReco ) cet_build_plugin(TrackPID art::module REG_SOURCE src/TrackPID_module.cc LIBRARIES REG + offline::TrkDiag + + offline::CalorimeterGeom + offline::GeometryService + offline::Mu2eUtilities + offline::RecoDataProducts ) cet_build_plugin(TrackQuality art::module REG_SOURCE src/TrackQuality_module.cc LIBRARIES REG + offline::TrkDiag + + offline::AnalysisConditions + offline::GlobalConstantsService + offline::Mu2eUtilities + offline::ProditionsService + offline::RecoDataProducts ) cet_build_plugin(TrkGeomTest art::module REG_SOURCE src/TrkGeomTest_module.cc LIBRARIES REG + offline::TrkDiag + + offline::GeometryService + offline::ProditionsService + offline::TrackerConditions + offline::TrackerGeom ) cet_build_plugin(TrkRecoDiag art::module REG_SOURCE src/TrkRecoDiag_module.cc LIBRARIES REG + offline::TrkDiag + + offline::BFieldGeom + offline::GeneralUtilities + offline::GeometryService + offline::GlobalConstantsService + offline::MCDataProducts + offline::Mu2eUtilities + offline::RecoDataProducts + offline::TrkReco ) -art_dictionary( - CLASSES_DEF_XML ${CMAKE_CURRENT_SOURCE_DIR}/src/classes_def.xml - CLASSES_H ${CMAKE_CURRENT_SOURCE_DIR}/src/classes.h - DICTIONARY_LIBRARIES - offline::TrkDiag +art_dictionary( NO_CHECK_CLASS_VERSION # For some reason this segfaults + CLASSES_DEF_XML ${CMAKE_CURRENT_SOURCE_DIR}/src/classes_def.xml + CLASSES_H ${CMAKE_CURRENT_SOURCE_DIR}/src/classes.h + DICTIONARY_LIBRARIES + offline::TrkDiag ) - install_source(SUBDIRS src) install_headers(SUBDIRS inc) install_fhicl(SUBDIRS fcl SUBDIRNAME TrkDiag) diff --git a/TrkExt/CMakeLists.txt b/TrkExt/CMakeLists.txt index 5f0cd823ae..5b9bbcf11d 100644 --- a/TrkExt/CMakeLists.txt +++ b/TrkExt/CMakeLists.txt @@ -27,6 +27,15 @@ cet_make_library( cet_build_plugin(TrkExt art::module REG_SOURCE src/TrkExt_module.cc LIBRARIES REG + offline::TrkExt + + offline::BFieldGeom + offline::BTrkData + offline::DataProducts + offline::GeneralUtilities + offline::GeometryService + offline::MCDataProducts + offline::RecoDataProducts ) install_source(SUBDIRS src) diff --git a/TrkFilters/CMakeLists.txt b/TrkFilters/CMakeLists.txt index 1bfb6dd6c0..0b4aa4bf06 100644 --- a/TrkFilters/CMakeLists.txt +++ b/TrkFilters/CMakeLists.txt @@ -1,16 +1,25 @@ cet_build_plugin(HelixFilter art::module REG_SOURCE src/HelixFilter_module.cc - LIBRARIES REG + LIBRARIES REG + offline::BFieldGeom + offline::DataProducts + offline::GeneralUtilities + offline::GeometryService + offline::Mu2eUtilities + offline::RecoDataProducts + offline::TrackerGeom ) cet_build_plugin(SeedFilter art::module REG_SOURCE src/SeedFilter_module.cc - LIBRARIES REG + LIBRARIES REG + offline::RecoDataProducts ) cet_build_plugin(TimeClusterFilter art::module REG_SOURCE src/TimeClusterFilter_module.cc - LIBRARIES REG + LIBRARIES REG + offline::RecoDataProducts ) install_source(SUBDIRS src) diff --git a/TrkHitReco/CMakeLists.txt b/TrkHitReco/CMakeLists.txt index 28962e725a..1b53a52358 100644 --- a/TrkHitReco/CMakeLists.txt +++ b/TrkHitReco/CMakeLists.txt @@ -18,31 +18,68 @@ cet_make_library( cet_build_plugin(CombineStrawHits art::module REG_SOURCE src/CombineStrawHits_module.cc LIBRARIES REG + offline::TrkHitReco + + offline::DataProducts + offline::RecoDataProducts ) cet_build_plugin(FlagBkgHits art::module REG_SOURCE src/FlagBkgHits_module.cc LIBRARIES REG + offline::TrkHitReco + + offline::ConditionsService + offline::ConfigTools + offline::DataProducts + offline::MCDataProducts + offline::RecoDataProducts ) cet_build_plugin(MakeStereoHits art::module REG_SOURCE src/MakeStereoHits_module.cc LIBRARIES REG + offline::TrkHitReco + + offline::GeneralUtilities + offline::GeometryService + offline::Mu2eUtilities + offline::RecoDataProducts + offline::TrackerGeom ) cet_build_plugin(ProtonBunchTimeFromStrawDigis art::module REG_SOURCE src/ProtonBunchTimeFromStrawDigis_module.cc LIBRARIES REG + offline::TrkHitReco + + offline::ProditionsService + offline::RecoDataProducts + offline::TrackerConditions ) cet_build_plugin(ReadStrawDigi art::module REG_SOURCE src/ReadStrawDigi_module.cc LIBRARIES REG + offline::TrkHitReco + + offline::RecoDataProducts ) cet_build_plugin(StrawHitReco art::module REG_SOURCE src/StrawHitReco_module.cc LIBRARIES REG + offline::TrkHitReco + + offline::ConditionsBase + offline::ConditionsService + offline::ConfigTools + offline::DataProducts + offline::GeometryService + offline::ProditionsService + offline::RecoDataProducts + offline::TrackerConditions + offline::TrackerGeom ) install_source(SUBDIRS src) diff --git a/TrkPatRec/CMakeLists.txt b/TrkPatRec/CMakeLists.txt index 6678ff371e..d8491246b7 100644 --- a/TrkPatRec/CMakeLists.txt +++ b/TrkPatRec/CMakeLists.txt @@ -1,44 +1,130 @@ -cet_make_library( +cet_make_library(INTERFACE SOURCE - src/KalFinalFitDiag_tool.cc - src/KalSeedFitDiag_tool.cc - src/RobustHelixFinderDiag_tool.cc - src/TimeAndPhiClusterFinderDiag_tool.cc - LIBRARIES PUBLIC + inc/KalFinalFit_types.hh + inc/KalSeedFit_types.hh + inc/RobustHelixFinder_types.hh + inc/TimeAndPhiClusterFinder_types.hh + inc/TrkHitFilter.hh + LIBRARIES INTERFACE + +) + +cet_build_plugin(KalFinalFit art::module + REG_SOURCE src/KalFinalFit_module.cc + LIBRARIES REG + offline::TrkPatRec offline::BTrkData offline::CalorimeterGeom + offline::DataProducts + offline::GeneralUtilities offline::GeometryService - offline::MCDataProducts offline::Mu2eUtilities + offline::ProditionsService offline::RecoDataProducts + offline::TrackerConditions offline::TrackerGeom offline::TrkReco ) -cet_build_plugin(KalFinalFit art::module - REG_SOURCE src/KalFinalFit_module.cc - LIBRARIES REG -) - cet_build_plugin(KalSeedFit art::module REG_SOURCE src/KalSeedFit_module.cc LIBRARIES REG + offline::TrkPatRec + + offline::BFieldGeom + offline::BTrkData + offline::ConditionsService + offline::DataProducts + offline::GeneralUtilities + offline::GeometryService + offline::Mu2eUtilities + offline::ProditionsService + offline::RecoDataProducts + offline::TrackerConditions + offline::TrackerGeom + offline::TrkReco ) cet_build_plugin(RobustHelixFinder art::module REG_SOURCE src/RobustHelixFinder_module.cc LIBRARIES REG + offline::TrkPatRec + + offline::boost_fix + offline::CalorimeterGeom + offline::ConfigTools + offline::DataProducts + offline::GeneralUtilities + offline::GeometryService + offline::Mu2eUtilities + offline::ProditionsService + offline::RecoDataProducts + offline::TrackerGeom + offline::TrkReco ) cet_build_plugin(TimeAndPhiClusterFinder art::module REG_SOURCE src/TimeAndPhiClusterFinder_module.cc LIBRARIES REG + offline::TrkPatRec + + offline::Mu2eUtilities + offline::RecoDataProducts ) cet_build_plugin(TimeClusterFinder art::module REG_SOURCE src/TimeClusterFinder_module.cc LIBRARIES REG + offline::TrkPatRec + + offline::GeneralUtilities + offline::Mu2eUtilities + offline::RecoDataProducts + offline::TrkReco +) + +cet_build_plugin(KalFinalFitDiag art::tool + REG_SOURCE src/KalFinalFitDiag_tool.cc + LIBRARIES REG + offline::TrkPatRec + + offline::BTrkData + offline::CalorimeterGeom + offline::Mu2eUtilities + offline::TrackerGeom + offline::TrkReco +) + +cet_build_plugin(KalSeedFitDiag art::tool + REG_SOURCE src/KalSeedFitDiag_tool.cc + LIBRARIES REG + offline::TrkPatRec + + offline::BTrkData + offline::Mu2eUtilities + offline::TrkReco +) + +cet_build_plugin(RobustHelixFinderDiag art::tool + REG_SOURCE src/RobustHelixFinderDiag_tool.cc + LIBRARIES REG + offline::TrkPatRec + + offline::BTrkData + offline::Mu2eUtilities + offline::TrkReco +) + +cet_build_plugin(TimeAndPhiClusterFinderDiag art::tool + REG_SOURCE src/TimeAndPhiClusterFinderDiag_tool.cc + LIBRARIES REG + offline::TrkPatRec + + offline::GeometryService + offline::MCDataProducts + offline::Mu2eUtilities + offline::RecoDataProducts ) install_source(SUBDIRS src) diff --git a/TrkReco/CMakeLists.txt b/TrkReco/CMakeLists.txt index 3f1c9d1deb..7f95edd253 100644 --- a/TrkReco/CMakeLists.txt +++ b/TrkReco/CMakeLists.txt @@ -13,7 +13,6 @@ cet_make_library( src/RobustHelixFit.cc src/TrkDef.cc src/TrkPrintUtils.cc - src/TrkRecoMcUtils_tool.cc src/TrkTimeCalculator.cc src/TrkUtilities.cc LIBRARIES PUBLIC @@ -25,7 +24,6 @@ cet_make_library( offline::DataProducts offline::GeneralUtilities offline::GeometryService - offline::MCDataProducts offline::Mu2eBTrk offline::Mu2eUtilities offline::ProditionsService @@ -38,15 +36,31 @@ cet_make_library( cet_build_plugin(MergeHelices art::module REG_SOURCE src/MergeHelices_module.cc LIBRARIES REG + offline::TrkReco + + offline::Mu2eUtilities + offline::RecoDataProducts ) -art_dictionary( - CLASSES_DEF_XML ${CMAKE_CURRENT_SOURCE_DIR}/src/classes_def.xml - CLASSES_H ${CMAKE_CURRENT_SOURCE_DIR}/src/classes.h - DICTIONARY_LIBRARIES - offline::TrkReco +cet_build_plugin(TrkRecoMcUtils art::tool + REG_SOURCE src/TrkRecoMcUtils_tool.cc + LIBRARIES REG + offline::TrkReco + + offline::BTrkData + offline::ConditionsService + offline::MCDataProducts + offline::Mu2eUtilities + offline::RecoDataProducts + offline::TrackerGeom ) +art_dictionary( NO_CHECK_CLASS_VERSION # For some reason this segfaults + CLASSES_DEF_XML ${CMAKE_CURRENT_SOURCE_DIR}/src/classes_def.xml + CLASSES_H ${CMAKE_CURRENT_SOURCE_DIR}/src/classes.h + DICTIONARY_LIBRARIES + offline::TrkReco +) install_source(SUBDIRS src) install_headers(SUBDIRS inc) install_fhicl(SUBDIRS fcl SUBDIRNAME TrkReco) diff --git a/UtilityModules/CMakeLists.txt b/UtilityModules/CMakeLists.txt index ada137029a..4805380d90 100644 --- a/UtilityModules/CMakeLists.txt +++ b/UtilityModules/CMakeLists.txt @@ -1,16 +1,19 @@ cet_build_plugin(ModifyTrackSPM art::module REG_SOURCE src/ModifyTrackSPM_module.cc - LIBRARIES REG + LIBRARIES REG + offline::MCDataProducts ) cet_build_plugin(NullProducer art::module REG_SOURCE src/NullProducer_module.cc - LIBRARIES REG + LIBRARIES REG + offline::SeedService ) cet_build_plugin(ReadTrackSPM art::module REG_SOURCE src/ReadTrackSPM_module.cc - LIBRARIES REG + LIBRARIES REG + offline::MCDataProducts ) install_source(SUBDIRS src) diff --git a/Validation/CMakeLists.txt b/Validation/CMakeLists.txt index 8119aa8cf6..5eabb19190 100644 --- a/Validation/CMakeLists.txt +++ b/Validation/CMakeLists.txt @@ -68,9 +68,10 @@ cet_make_library(LIBRARY_NAME Validation_Root cet_make_exec(NAME valCompare SOURCE src/valCompare_main.cc - LIBRARIES + LIBRARIES offline::Validation_Root offline::Validation_dict + ) cet_build_plugin(Validation art::module @@ -78,6 +79,7 @@ cet_build_plugin(Validation art::module LIBRARIES REG offline::Validation_Root offline::Validation_dict + ) art_dictionary( @@ -85,7 +87,7 @@ art_dictionary( CLASSES_H ${CMAKE_CURRENT_SOURCE_DIR}/root/classes.h DICTIONARY_LIBRARIES offline::Validation_Root -) + ) install_source(SUBDIRS src root) install_headers(SUBDIRS inc) diff --git a/boost_fix/CMakeLists.txt b/boost_fix/CMakeLists.txt index e69de29bb2..2c815590be 100644 --- a/boost_fix/CMakeLists.txt +++ b/boost_fix/CMakeLists.txt @@ -0,0 +1,6 @@ +cet_make_library(INTERFACE + SOURCE + accumulators/statistics.hpp + accumulators/statistics/stats.hpp + LIBRARIES INTERFACE +) \ No newline at end of file diff --git a/make_cmake.sh b/make_cmake.sh index e995ebe193..f17be1fe9e 100755 --- a/make_cmake.sh +++ b/make_cmake.sh @@ -9,10 +9,10 @@ for dir in */;do lib_list='' for file in src/*.cc inc/*.hh;do if ! [ -f $file ]; then continue; fi - if [[ $file =~ "_.*.cc" ]]; then + if [[ $file =~ _.*\.cc ]]; then continue fi - if [[ $file =~ "_.*.hh" ]]; then + if [[ $file =~ _.*\.hh ]]; then continue fi lib_list="$lib_list`grep Offline/ $file|grep -v $dir|sed 's|.*Offline/|offline::|g;s|/.*||g'|uniq|tr '\n' ','`" @@ -23,7 +23,7 @@ for dir in */;do make_ilib=0 for file in src/*.cc;do if ! [ -f $file ]; then continue; fi - if [[ $file =~ "_.*.cc" ]]; then + if [[ $file =~ _.*\.cc ]]; then continue fi make_lib=1 @@ -40,7 +40,7 @@ for dir in */;do SOURCE' >CMakeLists.txt for file in src/*.cc;do - if [[ $file =~ "_.*.cc" ]]; then + if [[ $file =~ _.*\.cc ]]; then continue fi echo " $file" >>CMakeLists.txt @@ -67,13 +67,15 @@ for dir in */;do fi execcount=`ls src/*_main.cc 2>/dev/null|wc -l` - if [ execcount -gt 0 ]; then + if [ $execcount -gt 0 ]; then for file in src/*_main.cc;do execname=`echo $file|sed 's|src/||g;s/_main.cc//g'` echo "cet_make_exec(NAME $execname SOURCE $file LIBRARIES" >>CMakeLists.txt - echo " offline::$dirname" >>CMakeLists.txt + if [ $make_lib -eq 1 ] || [ $make_ilib -eq 1 ]; then + echo " offline::$dirname" >>CMakeLists.txt + fi file_lib_list="`grep Offline/ $file|grep -v $dir|sed 's|.*Offline/|offline::|g;s|/.*||g'|uniq|tr '\n' ','`" file_lib_list=`echo $file_lib_list|tr ',' '\n'|sort|uniq|awk '{print " "$1}'` echo "$file_lib_list" >>CMakeLists.txt @@ -89,7 +91,27 @@ for dir in */;do echo "cet_build_plugin($svcname art::service REG_SOURCE $file LIBRARIES REG" >>CMakeLists.txt - echo " offline::$dirname" >>CMakeLists.txt + if [ $make_lib -eq 1 ] || [ $make_ilib -eq 1 ]; then + echo " offline::$dirname" >>CMakeLists.txt + fi + file_lib_list="`grep Offline/ $file|grep -v $dir|sed 's|.*Offline/|offline::|g;s|/.*||g'|uniq|tr '\n' ','`" + file_lib_list=`echo $file_lib_list|tr ',' '\n'|sort|uniq|awk '{print " "$1}'` + echo "$file_lib_list" >>CMakeLists.txt + echo ")" >>CMakeLists.txt + echo >> CMakeLists.txt + done + fi + + srccount=`ls src/*_source.cc 2>/dev/null |wc -l` + if [ $srccount -gt 0 ]; then + for file in src/*_module.cc;do + srcname=`echo $file|sed 's|src/||g;s/_source.cc//g'` + echo "cet_build_plugin($modname art::source + REG_SOURCE $file + LIBRARIES REG" >>CMakeLists.txt + if [ $make_lib -eq 1 ] || [ $make_ilib -eq 1 ]; then + echo " offline::$dirname" >>CMakeLists.txt + fi file_lib_list="`grep Offline/ $file|grep -v $dir|sed 's|.*Offline/|offline::|g;s|/.*||g'|uniq|tr '\n' ','`" file_lib_list=`echo $file_lib_list|tr ',' '\n'|sort|uniq|awk '{print " "$1}'` echo "$file_lib_list" >>CMakeLists.txt @@ -105,7 +127,27 @@ for dir in */;do echo "cet_build_plugin($modname art::module REG_SOURCE $file LIBRARIES REG" >>CMakeLists.txt - echo " offline::$dirname" >>CMakeLists.txt + if [ $make_lib -eq 1 ] || [ $make_ilib -eq 1 ]; then + echo " offline::$dirname" >>CMakeLists.txt + fi + file_lib_list="`grep Offline/ $file|grep -v $dir|sed 's|.*Offline/|offline::|g;s|/.*||g'|uniq|tr '\n' ','`" + file_lib_list=`echo $file_lib_list|tr ',' '\n'|sort|uniq|awk '{print " "$1}'` + echo "$file_lib_list" >>CMakeLists.txt + echo ")" >>CMakeLists.txt + echo >> CMakeLists.txt + done + fi + + toolcount=`ls src/*_tool.cc 2>/dev/null |wc -l` + if [ $toolcount -gt 0 ]; then + for file in src/*_tool.cc;do + toolname=`echo $file|sed 's|src/||g;s/_tool.cc//g'` + echo "cet_build_plugin($toolname art::tool + REG_SOURCE $file + LIBRARIES REG" >>CMakeLists.txt + if [ $make_lib -eq 1 ] || [ $make_ilib -eq 1 ]; then + echo " offline::$dirname" >>CMakeLists.txt + fi file_lib_list="`grep Offline/ $file|grep -v $dir|sed 's|.*Offline/|offline::|g;s|/.*||g'|uniq|tr '\n' ','`" file_lib_list=`echo $file_lib_list|tr ',' '\n'|sort|uniq|awk '{print " "$1}'` echo "$file_lib_list" >>CMakeLists.txt @@ -119,7 +161,9 @@ for dir in */;do echo ' CLASSES_DEF_XML ${CMAKE_CURRENT_SOURCE_DIR}/src/classes_def.xml' >>CMakeLists.txt echo ' CLASSES_H ${CMAKE_CURRENT_SOURCE_DIR}/src/classes.h' >>CMakeLists.txt echo ' DICTIONARY_LIBRARIES' >>CMakeLists.txt - echo " offline::$dirname" >>CMakeLists.txt + if [ $make_lib -eq 1 ] || [ $make_ilib -eq 1 ]; then + echo " offline::$dirname" >>CMakeLists.txt + fi echo ')' >>CMakeLists.txt fi From 8861b9c3cac1b8cc4e3715906f9c3b7279f35fa2 Mon Sep 17 00:00:00 2001 From: Eric Flumerfelt Date: Mon, 23 Oct 2023 14:32:46 -0500 Subject: [PATCH 010/213] Update CMake with more libraries, working on getting a working build... --- Analyses/CMakeLists.txt | 130 +++++++----------- BFieldTest/CMakeLists.txt | 5 +- CMakeLists.txt | 1 + CRVReco/CMakeLists.txt | 2 + CRVResponse/CMakeLists.txt | 6 + CalPatRec/CMakeLists.txt | 1 + CaloCluster/CMakeLists.txt | 2 + CaloDiag/CMakeLists.txt | 5 + CaloFilters/CMakeLists.txt | 5 + CaloMC/CMakeLists.txt | 6 +- CommonMC/CMakeLists.txt | 9 +- Compression/CMakeLists.txt | 2 + CosmicReco/CMakeLists.txt | 2 + DAQ/CMakeLists.txt | 6 +- EventGenerator/CMakeLists.txt | 1 + .../Reconstruction/CMakeLists.txt | 3 + Filters/CMakeLists.txt | 10 +- Mu2eKinKal/CMakeLists.txt | 3 +- ParticleID/CMakeLists.txt | 4 +- STMReco/CMakeLists.txt | 2 + TEveEventDisplay/CMakeLists.txt | 1 + TrackCaloMatching/CMakeLists.txt | 6 + TrackerMC/CMakeLists.txt | 1 + Trigger/CMakeLists.txt | 1 + TrkExt/CMakeLists.txt | 1 + TrkHitReco/CMakeLists.txt | 3 + TrkReco/CMakeLists.txt | 2 +- UtilityModules/CMakeLists.txt | 2 +- 28 files changed, 127 insertions(+), 95 deletions(-) diff --git a/Analyses/CMakeLists.txt b/Analyses/CMakeLists.txt index 5241f35736..b7a340841d 100644 --- a/Analyses/CMakeLists.txt +++ b/Analyses/CMakeLists.txt @@ -27,7 +27,7 @@ cet_build_plugin(CaloCalibAna art::module cet_build_plugin(CaloCalib art::module REG_SOURCE src/CaloCalib_module.cc LIBRARIES REG - + art_root_io::TFileService_service offline::CalorimeterGeom offline::DataProducts @@ -40,15 +40,14 @@ cet_build_plugin(CaloCalib art::module cet_build_plugin(CaloClusterCompare art::module REG_SOURCE src/CaloClusterCompare_module.cc LIBRARIES REG - - + art_root_io::TFileService_service offline::RecoDataProducts ) cet_build_plugin(CaloDigiAna art::module REG_SOURCE src/CaloDigiAna_module.cc LIBRARIES REG - + art_root_io::TFileService_service offline::CalorimeterGeom offline::ConditionsService @@ -61,8 +60,7 @@ cet_build_plugin(CaloDigiAna art::module cet_build_plugin(CaloHitFinderInspect art::module REG_SOURCE src/CaloHitFinderInspect_module.cc LIBRARIES REG - - + art_root_io::TFileService_service offline::CalorimeterGeom offline::ConditionsService offline::GeometryService @@ -74,8 +72,7 @@ cet_build_plugin(CaloHitFinderInspect art::module cet_build_plugin(CaloTrackMatchExample art::module REG_SOURCE src/CaloTrackMatchExample_module.cc LIBRARIES REG - - + art_root_io::TFileService_service offline::CalorimeterGeom offline::GeometryService offline::GlobalConstantsService @@ -86,16 +83,14 @@ cet_build_plugin(CaloTrackMatchExample art::module cet_build_plugin(CollectionSizeAnalyzer art::module REG_SOURCE src/CollectionSizeAnalyzer_module.cc LIBRARIES REG - - + art_root_io::TFileService_service offline::MCDataProducts ) cet_build_plugin(CompressionCheck0 art::module REG_SOURCE src/CompressionCheck0_module.cc LIBRARIES REG - - + art_root_io::TFileService_service offline::GeneralUtilities offline::MCDataProducts offline::RecoDataProducts @@ -130,8 +125,7 @@ cet_build_plugin(CosmicAnalysis art::module cet_build_plugin(CosmicFilter art::module REG_SOURCE src/CosmicFilter_module.cc LIBRARIES REG - - + art_root_io::TFileService_service offline::CalorimeterGeom offline::GeometryService offline::MCDataProducts @@ -163,8 +157,7 @@ cet_build_plugin(CRYGenPlots art::module cet_build_plugin(DiskCal00 art::module REG_SOURCE src/DiskCal00_module.cc LIBRARIES REG - - + art_root_io::TFileService_service offline::CalorimeterGeom offline::DataProducts offline::GeometryService @@ -175,8 +168,7 @@ cet_build_plugin(DiskCal00 art::module cet_build_plugin(EMFCSimpleDumper art::module REG_SOURCE src/EMFCSimpleDumper_module.cc LIBRARIES REG - - + art_root_io::TFileService_service offline::DataProducts offline::ExtinctionMonitorFNAL_Geometry offline::GeometryService @@ -195,6 +187,7 @@ cet_build_plugin(EventIDSequencePrinter art::module cet_build_plugin(EventLister art::module REG_SOURCE src/EventLister_module.cc LIBRARIES REG + art_root_io::TFileService_service ) @@ -231,8 +224,7 @@ cet_build_plugin(FilterVDHits art::module cet_build_plugin(G4ReactionAnalyzer art::module REG_SOURCE src/G4ReactionAnalyzer_module.cc LIBRARIES REG - - + art_root_io::TFileService_service offline::MCDataProducts ) @@ -248,16 +240,18 @@ cet_build_plugin(GenParticlesAnalyzer art::module cet_build_plugin(GeomVis art::module REG_SOURCE src/GeomVis_module.cc LIBRARIES REG - - + art_root_io::TFileService_service offline::DataProducts offline::MCDataProducts + ROOT::Geom + ROOT::Physics ) cet_build_plugin(Histforpabs art::module REG_SOURCE src/Histforpabs_module.cc LIBRARIES REG + art_root_io::TFileService_service offline::GeometryService offline::MCDataProducts @@ -275,8 +269,7 @@ cet_build_plugin(InteractiveRoot art::module cet_build_plugin(KineticFracAnalysis art::module REG_SOURCE src/KineticFracAnalysis_module.cc LIBRARIES REG - - + art_root_io::TFileService_service offline::CalorimeterGeom offline::DataProducts offline::GeneralUtilities @@ -291,9 +284,10 @@ cet_build_plugin(materailsPropStudy art::module REG_SOURCE src/materailsPropStudy_module.cc LIBRARIES REG art_root_io::TFileService_service - - + BTrk_MatEnv + BTrk_TrkBase offline::SeedService + ROOT::Tree ) cet_build_plugin(MTVerification art::module @@ -307,8 +301,7 @@ cet_build_plugin(MTVerification art::module cet_build_plugin(Mu2eG4StudyCalo01ReadBack art::module REG_SOURCE src/Mu2eG4StudyCalo01ReadBack_module.cc LIBRARIES REG - - + art_root_io::TFileService_service offline::ConditionsService offline::GeometryService offline::GlobalConstantsService @@ -318,8 +311,7 @@ cet_build_plugin(Mu2eG4StudyCalo01ReadBack art::module cet_build_plugin(Mu2eG4StudyReadBack art::module REG_SOURCE src/Mu2eG4StudyReadBack_module.cc LIBRARIES REG - - + art_root_io::TFileService_service offline::ConditionsService offline::GeometryService offline::GlobalConstantsService @@ -330,16 +322,13 @@ cet_build_plugin(ParticleIDScan art::module REG_SOURCE src/ParticleIDScan_module.cc LIBRARIES REG art_root_io::TFileService_service - - offline::ParticleID ) cet_build_plugin(PbarAnalysis2 art::module REG_SOURCE src/PbarAnalysis2_module.cc LIBRARIES REG - - + art_root_io::TFileService_service offline::CaloCluster offline::CalorimeterGeom offline::ConditionsService @@ -354,8 +343,7 @@ cet_build_plugin(PbarAnalysis2 art::module cet_build_plugin(pbars1hist art::module REG_SOURCE src/pbars1hist_module.cc LIBRARIES REG - - + art_root_io::TFileService_service offline::DataProducts offline::GeometryService offline::GlobalConstantsService @@ -436,8 +424,7 @@ cet_build_plugin(PrintTrackerGeom art::module cet_build_plugin(ProtonBunchIntensityAnalyzer art::module REG_SOURCE src/ProtonBunchIntensityAnalyzer_module.cc LIBRARIES REG - - + art_root_io::TFileService_service offline::MCDataProducts ) @@ -460,8 +447,7 @@ cet_build_plugin(PtrTest art::module cet_build_plugin(ReadAntiProtonSteps art::module REG_SOURCE src/ReadAntiProtonSteps_module.cc LIBRARIES REG - - + art_root_io::TFileService_service offline::ConditionsService offline::GeometryService offline::GlobalConstantsService @@ -471,8 +457,7 @@ cet_build_plugin(ReadAntiProtonSteps art::module cet_build_plugin(ReadBack0 art::module REG_SOURCE src/ReadBack0_module.cc LIBRARIES REG - - + art_root_io::TFileService_service offline::GeometryService offline::MCDataProducts offline::TrackerGeom @@ -496,8 +481,7 @@ cet_build_plugin(ReadBack art::module cet_build_plugin(ReadCaloDigi art::module REG_SOURCE src/ReadCaloDigi_module.cc LIBRARIES REG - - + art_root_io::TFileService_service offline::CalorimeterGeom offline::ConditionsService offline::DataProducts @@ -511,16 +495,14 @@ cet_build_plugin(ReadCaloDigi art::module cet_build_plugin(ReadMCTrajectories art::module REG_SOURCE src/ReadMCTrajectories_module.cc LIBRARIES REG - - + art_root_io::TFileService_service offline::MCDataProducts ) cet_build_plugin(ReadPSVacuum art::module REG_SOURCE src/ReadPSVacuum_module.cc LIBRARIES REG - - + art_root_io::TFileService_service offline::ConditionsService offline::GeometryService offline::MCDataProducts @@ -529,8 +511,7 @@ cet_build_plugin(ReadPSVacuum art::module cet_build_plugin(ReadPTM art::module REG_SOURCE src/ReadPTM_module.cc LIBRARIES REG - - + art_root_io::TFileService_service offline::ConditionsService offline::GeometryService offline::MCDataProducts @@ -539,24 +520,21 @@ cet_build_plugin(ReadPTM art::module cet_build_plugin(ReadPtr art::module REG_SOURCE src/ReadPtr_module.cc LIBRARIES REG - - + art_root_io::TFileService_service offline::RecoDataProducts ) cet_build_plugin(ReadStrawDigiReco art::module REG_SOURCE src/ReadStrawDigiReco_module.cc LIBRARIES REG - - + art_root_io::TFileService_service offline::RecoDataProducts ) cet_build_plugin(ReadStrawHitReco art::module REG_SOURCE src/ReadStrawHitReco_module.cc LIBRARIES REG - - + art_root_io::TFileService_service offline::GeometryService offline::ProditionsService offline::RecoDataProducts @@ -567,8 +545,7 @@ cet_build_plugin(ReadStrawHitReco art::module cet_build_plugin(ReadTrackCaloMatching art::module REG_SOURCE src/ReadTrackCaloMatching_module.cc LIBRARIES REG - - + art_root_io::TFileService_service offline::ConditionsService offline::GeometryService offline::RecoDataProducts @@ -578,8 +555,7 @@ cet_build_plugin(ReadTrackCaloMatching art::module cet_build_plugin(ReadTrackCaloMatchingMVA art::module REG_SOURCE src/ReadTrackCaloMatchingMVA_module.cc LIBRARIES REG - - + art_root_io::TFileService_service offline::CalorimeterGeom offline::DataProducts offline::GeometryService @@ -590,8 +566,7 @@ cet_build_plugin(ReadTrackCaloMatchingMVA art::module cet_build_plugin(ReadTrackerSteps art::module REG_SOURCE src/ReadTrackerSteps_module.cc LIBRARIES REG - - + art_root_io::TFileService_service offline::ConditionsService offline::GeometryService offline::MCDataProducts @@ -601,8 +576,7 @@ cet_build_plugin(ReadTrackerSteps art::module cet_build_plugin(ReadTrkExtrapol art::module REG_SOURCE src/ReadTrkExtrapol_module.cc LIBRARIES REG - - + art_root_io::TFileService_service offline::ConditionsService offline::GeometryService offline::RecoDataProducts @@ -612,8 +586,7 @@ cet_build_plugin(ReadTrkExtrapol art::module cet_build_plugin(ReadTrkExtrapolMVA art::module REG_SOURCE src/ReadTrkExtrapolMVA_module.cc LIBRARIES REG - - + art_root_io::TFileService_service offline::ConditionsService offline::GeometryService offline::RecoDataProducts @@ -667,7 +640,7 @@ cet_build_plugin(SensitiveTargetEnergyDumper art::module cet_build_plugin(SimParticleAnalyzer art::module REG_SOURCE src/SimParticleAnalyzer_module.cc LIBRARIES REG - + art_root_io::TFileService_service offline::MCDataProducts ) @@ -675,16 +648,14 @@ cet_build_plugin(SimParticleAnalyzer art::module cet_build_plugin(SimParticleCheck00 art::module REG_SOURCE src/SimParticleCheck00_module.cc LIBRARIES REG - - + art_root_io::TFileService_service offline::MCDataProducts ) cet_build_plugin(SimParticleDumperCompact art::module REG_SOURCE src/SimParticleDumperCompact_module.cc LIBRARIES REG - - + art_root_io::TFileService_service offline::MCDataProducts ) @@ -700,8 +671,7 @@ cet_build_plugin(SimParticlesPrinter art::module cet_build_plugin(StatusG4Analyzer art::module REG_SOURCE src/StatusG4Analyzer_module.cc LIBRARIES REG - - + art_root_io::TFileService_service offline::MCDataProducts ) @@ -718,8 +688,7 @@ cet_build_plugin(StepPointMC1stHitDumper art::module cet_build_plugin(StepPointMCDumperCalo art::module REG_SOURCE src/StepPointMCDumperCalo_module.cc LIBRARIES REG - - + art_root_io::TFileService_service offline::GlobalConstantsService offline::MCDataProducts ) @@ -727,8 +696,7 @@ cet_build_plugin(StepPointMCDumperCalo art::module cet_build_plugin(StepPointMCDumperCompact art::module REG_SOURCE src/StepPointMCDumperCompact_module.cc LIBRARIES REG - - + art_root_io::TFileService_service offline::MCDataProducts ) @@ -814,8 +782,7 @@ cet_build_plugin(TrackSummaryTruthMaker art::module cet_build_plugin(TrackSummaryTruthRFSelector art::module REG_SOURCE src/TrackSummaryTruthRFSelector_module.cc LIBRARIES REG - - + art_root_io::TFileService_service offline::MCDataProducts offline::RecoDataProducts ) @@ -823,9 +790,10 @@ cet_build_plugin(TrackSummaryTruthRFSelector art::module cet_build_plugin(TSTrackAna art::module REG_SOURCE src/TSTrackAna_module.cc LIBRARIES REG - - + art_root_io::TFileService_service offline::MCDataProducts + ROOT::Geom + ROOT::Physics ) cet_build_plugin(TVirtDebug art::module diff --git a/BFieldTest/CMakeLists.txt b/BFieldTest/CMakeLists.txt index 72146125be..c8ae4dc75f 100644 --- a/BFieldTest/CMakeLists.txt +++ b/BFieldTest/CMakeLists.txt @@ -1,9 +1,12 @@ cet_build_plugin(BFieldSymmetry art::module REG_SOURCE src/BFieldSymmetry_module.cc LIBRARIES REG + art_root_io::TFileService_service offline::BFieldGeom offline::GeometryService - offline::SeedService + offline::SeedService_SeedService_service + ROOT::Hist + ROOT::Tree ) cet_build_plugin(BFieldTest art::module diff --git a/CMakeLists.txt b/CMakeLists.txt index 4a2ce9893b..23ceea097c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -23,6 +23,7 @@ find_package(CURL REQUIRED) find_package(Boost COMPONENTS iostreams program_options REQUIRED) find_package(XercesC REQUIRED) find_package(BLAS REQUIRED) +find_package(artdaq_core_mu2e REQUIRED) # BTrk and KinKal have non-standard Find*.cmake... include_directories($ENV{KINKAL_INC}) diff --git a/CRVReco/CMakeLists.txt b/CRVReco/CMakeLists.txt index 225d1b96b4..663df3590a 100644 --- a/CRVReco/CMakeLists.txt +++ b/CRVReco/CMakeLists.txt @@ -7,6 +7,7 @@ cet_make_library( offline::CosmicRayShieldGeom offline::DataProducts offline::GeometryService + ROOT::Hist ) cet_build_plugin(CrvCoincidenceFinder art::module @@ -23,6 +24,7 @@ cet_build_plugin(CrvCoincidenceFinder art::module cet_build_plugin(CrvRecoPulsesFinder art::module REG_SOURCE src/CrvRecoPulsesFinder_module.cc LIBRARIES REG + art_root_io::TFileService_service offline::CRVReco offline::CosmicRayShieldGeom diff --git a/CRVResponse/CMakeLists.txt b/CRVResponse/CMakeLists.txt index fc71c07705..b9aead31d7 100644 --- a/CRVResponse/CMakeLists.txt +++ b/CRVResponse/CMakeLists.txt @@ -15,6 +15,7 @@ cet_make_library( cet_build_plugin(CrvCalibration art::module REG_SOURCE src/CrvCalibration_module.cc LIBRARIES REG + art_root_io::TFileService_service offline::CRVResponse offline::CosmicRayShieldGeom @@ -25,6 +26,7 @@ cet_build_plugin(CrvCalibration art::module cet_build_plugin(CrvCoincidenceClusterMatchMC art::module REG_SOURCE src/CrvCoincidenceClusterMatchMC_module.cc LIBRARIES REG + art_root_io::TFileService_service offline::CRVResponse offline::ConditionsService @@ -53,6 +55,7 @@ cet_build_plugin(CrvDigitizer art::module cet_build_plugin(CrvPedestalFinder art::module REG_SOURCE src/CrvPedestalFinder_module.cc LIBRARIES REG + art_root_io::TFileService_service offline::CRVResponse offline::CosmicRayShieldGeom @@ -80,6 +83,7 @@ cet_build_plugin(CrvPhotonGenerator art::module cet_build_plugin(CrvPlot art::module REG_SOURCE src/CrvPlot_module.cc LIBRARIES REG + art_root_io::TFileService_service offline::CRVResponse offline::ConditionsService @@ -111,6 +115,7 @@ cet_build_plugin(CrvSiPMChargeGenerator art::module cet_build_plugin(CrvStepsFromStepPointMCs art::module REG_SOURCE src/CrvStepsFromStepPointMCs_module.cc LIBRARIES REG + art_root_io::TFileService_service offline::CRVResponse offline::DataProducts @@ -123,6 +128,7 @@ cet_build_plugin(CrvStepsFromStepPointMCs art::module cet_build_plugin(CRVTest art::module REG_SOURCE src/CRVTest_module.cc LIBRARIES REG + art_root_io::TFileService_service offline::CRVResponse offline::CosmicRayShieldGeom diff --git a/CalPatRec/CMakeLists.txt b/CalPatRec/CMakeLists.txt index 21ec7bda5b..1d4d193516 100644 --- a/CalPatRec/CMakeLists.txt +++ b/CalPatRec/CMakeLists.txt @@ -23,6 +23,7 @@ cet_make_library( offline::RecoDataProducts offline::TrackerGeom offline::TrkReco + ROOT::Physics ) cet_build_plugin(CalHelixFinder art::module diff --git a/CaloCluster/CMakeLists.txt b/CaloCluster/CMakeLists.txt index 97db4e58dd..00fc01bff3 100644 --- a/CaloCluster/CMakeLists.txt +++ b/CaloCluster/CMakeLists.txt @@ -23,6 +23,7 @@ cet_build_plugin(CaloClusterFast art::module cet_build_plugin(CaloClusterMaker art::module REG_SOURCE src/CaloClusterMaker_module.cc LIBRARIES REG + art_root_io::TFileService_service offline::CaloCluster offline::CalorimeterGeom @@ -43,6 +44,7 @@ cet_build_plugin(CaloProtoClusterMaker art::module cet_build_plugin(CaloTrigger art::module REG_SOURCE src/CaloTrigger_module.cc LIBRARIES REG + art_root_io::TFileService_service offline::CaloCluster offline::CalorimeterGeom diff --git a/CaloDiag/CMakeLists.txt b/CaloDiag/CMakeLists.txt index 0e32e7940c..30d7cd70bc 100644 --- a/CaloDiag/CMakeLists.txt +++ b/CaloDiag/CMakeLists.txt @@ -1,6 +1,7 @@ cet_build_plugin(CaloClusterCheck art::module REG_SOURCE src/CaloClusterCheck_module.cc LIBRARIES REG + art_root_io::TFileService_service offline::CalorimeterGeom offline::DataProducts offline::GeometryService @@ -11,6 +12,7 @@ cet_build_plugin(CaloClusterCheck art::module cet_build_plugin(CaloExample art::module REG_SOURCE src/CaloExample_module.cc LIBRARIES REG + art_root_io::TFileService_service offline::CaloCluster offline::CalorimeterGeom offline::ConditionsService @@ -23,6 +25,7 @@ cet_build_plugin(CaloExample art::module cet_build_plugin(CaloMCInspector art::module REG_SOURCE src/CaloMCInspector_module.cc LIBRARIES REG + art_root_io::TFileService_service offline::MCDataProducts offline::RecoDataProducts ) @@ -30,6 +33,7 @@ cet_build_plugin(CaloMCInspector art::module cet_build_plugin(CaloNeutron art::module REG_SOURCE src/CaloNeutron_module.cc LIBRARIES REG + art_root_io::TFileService_service offline::CalorimeterGeom offline::ConditionsService offline::DataProducts @@ -40,6 +44,7 @@ cet_build_plugin(CaloNeutron art::module cet_build_plugin(CaloNNDiag art::module REG_SOURCE src/CaloNNDiag_module.cc LIBRARIES REG + art_root_io::TFileService_service offline::CaloCluster offline::CalorimeterGeom offline::ConditionsService diff --git a/CaloFilters/CMakeLists.txt b/CaloFilters/CMakeLists.txt index 2639d264d0..b512438bd4 100644 --- a/CaloFilters/CMakeLists.txt +++ b/CaloFilters/CMakeLists.txt @@ -1,6 +1,7 @@ cet_build_plugin(CaloClusterCounterFilter art::module REG_SOURCE src/CaloClusterCounterFilter_module.cc LIBRARIES REG + art_root_io::TFileService_service offline::CalorimeterGeom offline::ConfigTools offline::GeometryService @@ -19,6 +20,7 @@ cet_build_plugin(CaloCosmicCalib art::module cet_build_plugin(CaloLikelihood art::module REG_SOURCE src/CaloLikelihood_module.cc LIBRARIES REG + art_root_io::TFileService_service offline::CaloCluster offline::CalorimeterGeom offline::ConfigTools @@ -30,6 +32,7 @@ cet_build_plugin(CaloLikelihood art::module cet_build_plugin(EcalTriggerPreselect art::module REG_SOURCE src/EcalTriggerPreselect_module.cc LIBRARIES REG + art_root_io::TFileService_service offline::CalorimeterGeom offline::ConditionsService offline::GeometryService @@ -40,6 +43,7 @@ cet_build_plugin(EcalTriggerPreselect art::module cet_build_plugin(FilterEcalMixedTrigger art::module REG_SOURCE src/FilterEcalMixedTrigger_module.cc LIBRARIES REG + art_root_io::TFileService_service offline::CalorimeterGeom offline::ConditionsService offline::ConfigTools @@ -50,6 +54,7 @@ cet_build_plugin(FilterEcalMixedTrigger art::module cet_build_plugin(FilterEcalMVATrigger art::module REG_SOURCE src/FilterEcalMVATrigger_module.cc LIBRARIES REG + art_root_io::TFileService_service offline::CalorimeterGeom offline::ConditionsService offline::ConfigTools diff --git a/CaloMC/CMakeLists.txt b/CaloMC/CMakeLists.txt index 18faf9c605..f19efeec63 100644 --- a/CaloMC/CMakeLists.txt +++ b/CaloMC/CMakeLists.txt @@ -11,7 +11,7 @@ cet_make_library( offline::ConditionsService offline::GeometryService offline::Mu2eUtilities - offline::SeedService + offline::SeedService_SeedService_service ) cet_build_plugin(CaloClusterTruthMatch art::module @@ -37,7 +37,7 @@ cet_build_plugin(CaloDigiMaker art::module offline::Mu2eUtilities offline::ProditionsService offline::RecoDataProducts - offline::SeedService + offline::SeedService_SeedService_service ) cet_build_plugin(CaloHitTruthMatch art::module @@ -64,7 +64,7 @@ cet_build_plugin(CaloShowerROMaker art::module offline::GlobalConstantsService offline::MCDataProducts offline::ProditionsService - offline::SeedService + offline::SeedService_SeedService_service ) cet_build_plugin(CaloShowerStepMaker art::module diff --git a/CommonMC/CMakeLists.txt b/CommonMC/CMakeLists.txt index 667d3b3b6c..67a8826110 100644 --- a/CommonMC/CMakeLists.txt +++ b/CommonMC/CMakeLists.txt @@ -2,7 +2,7 @@ cet_build_plugin(CosmicTimeOffset art::module REG_SOURCE src/CosmicTimeOffset_module.cc LIBRARIES REG offline::MCDataProducts - offline::SeedService + offline::SeedService_SeedService_service ) cet_build_plugin(EventWindowMarkerProducer art::module @@ -13,7 +13,7 @@ cet_build_plugin(EventWindowMarkerProducer art::module offline::MCDataProducts offline::ProditionsService offline::RecoDataProducts - offline::SeedService + offline::SeedService_SeedService_service ) cet_build_plugin(FindMCPrimary art::module @@ -25,12 +25,14 @@ cet_build_plugin(FindMCPrimary art::module cet_build_plugin(GenEventCountReader art::module REG_SOURCE src/GenEventCountReader_module.cc LIBRARIES REG + art_root_io::TFileService_service offline::MCDataProducts ) cet_build_plugin(InFlightStepDumper art::module REG_SOURCE src/InFlightStepDumper_module.cc LIBRARIES REG + art_root_io::TFileService_service offline::GeneralUtilities offline::MCDataProducts ) @@ -46,7 +48,7 @@ cet_build_plugin(ProtonTimeOffset art::module LIBRARIES REG offline::MCDataProducts offline::Mu2eUtilities - offline::SeedService + offline::SeedService_SeedService_service ) cet_build_plugin(SelectRecoMC art::module @@ -66,6 +68,7 @@ cet_build_plugin(SelectRecoMC art::module cet_build_plugin(SimParticleDaughterSelector art::module REG_SOURCE src/SimParticleDaughterSelector_module.cc LIBRARIES REG + art_root_io::TFileService_service offline::DataProducts offline::MCDataProducts ) diff --git a/Compression/CMakeLists.txt b/Compression/CMakeLists.txt index 137f686a88..1468d88443 100644 --- a/Compression/CMakeLists.txt +++ b/Compression/CMakeLists.txt @@ -2,6 +2,7 @@ cet_make_library( SOURCE src/CompressionLevel.cc LIBRARIES PUBLIC + Boost::headers ) @@ -17,6 +18,7 @@ cet_build_plugin(CompressDetStepMCs art::module cet_build_plugin(CompressDigiMCsCheck art::module REG_SOURCE src/CompressDigiMCsCheck_module.cc LIBRARIES REG + art_root_io::TFileService_service offline::Compression offline::DataProducts diff --git a/CosmicReco/CMakeLists.txt b/CosmicReco/CMakeLists.txt index f94091702b..790b497e14 100644 --- a/CosmicReco/CMakeLists.txt +++ b/CosmicReco/CMakeLists.txt @@ -14,6 +14,7 @@ cet_make_library( offline::RecoDataProducts offline::TrackerConditions offline::TrackerGeom + ROOT::Minuit2 ) cet_build_plugin(CosmicAnalyzer art::module @@ -43,6 +44,7 @@ cet_build_plugin(CosmicFitDisplay art::module offline::RecoDataProducts offline::TrackerGeom offline::TrkDiag + ROOT::Geom ) cet_build_plugin(CosmicMCRecoDiff art::module diff --git a/DAQ/CMakeLists.txt b/DAQ/CMakeLists.txt index 55ecccfcff..a0b7edbdeb 100644 --- a/DAQ/CMakeLists.txt +++ b/DAQ/CMakeLists.txt @@ -2,6 +2,7 @@ cet_make_library( SOURCE src/CaloDAQUtilities.cc LIBRARIES PUBLIC + artdaq_core_mu2e::artdaq-core-mu2e_Data ) @@ -60,14 +61,16 @@ cet_build_plugin(CrvDigisFromFragments art::module cet_build_plugin(FragmentAna art::module REG_SOURCE src/FragmentAna_module.cc LIBRARIES REG + art_root_io::TFileService_service offline::DAQ - offline::DataProducts + ROOT::Hist ) cet_build_plugin(PrefetchDAQData art::module REG_SOURCE src/PrefetchDAQData_module.cc LIBRARIES REG + art_root_io::TFileService_service offline::DAQ offline::RecoDataProducts @@ -76,6 +79,7 @@ cet_build_plugin(PrefetchDAQData art::module cet_build_plugin(StrawHitRecoFromFragments art::module REG_SOURCE src/StrawHitRecoFromFragments_module.cc LIBRARIES REG + art_root_io::TFileService_service offline::DAQ offline::ConditionsBase diff --git a/EventGenerator/CMakeLists.txt b/EventGenerator/CMakeLists.txt index f3df51ca17..f5ffa9a397 100644 --- a/EventGenerator/CMakeLists.txt +++ b/EventGenerator/CMakeLists.txt @@ -12,6 +12,7 @@ cet_make_library( src/PrimaryProtonGunImpl.cc LIBRARIES PUBLIC + art_root_io::tfile_support offline::CalorimeterGeom offline::ConditionsService offline::ConfigTools diff --git a/ExtinctionMonitorFNAL/Reconstruction/CMakeLists.txt b/ExtinctionMonitorFNAL/Reconstruction/CMakeLists.txt index b11078ef58..04b7a246b6 100644 --- a/ExtinctionMonitorFNAL/Reconstruction/CMakeLists.txt +++ b/ExtinctionMonitorFNAL/Reconstruction/CMakeLists.txt @@ -12,6 +12,7 @@ cet_make_library( cet_build_plugin(EMFPatRecFromTracklets art::module REG_SOURCE src/EMFPatRecFromTracklets_module.cc LIBRARIES REG + art_root_io::TFileService_service offline::ExtinctionMonitorFNAL_Reconstruction offline::GeometryService offline::RecoDataProducts @@ -20,6 +21,7 @@ cet_build_plugin(EMFPatRecFromTracklets art::module cet_build_plugin(EMFTrackClusterArbiter art::module REG_SOURCE src/EMFTrackClusterArbiter_module.cc LIBRARIES REG + art_root_io::TFileService_service offline::ExtinctionMonitorFNAL_Reconstruction offline::RecoDataProducts @@ -28,6 +30,7 @@ cet_build_plugin(EMFTrackClusterArbiter art::module cet_build_plugin(ExtMonFNALRawClusterization art::module REG_SOURCE src/ExtMonFNALRawClusterization_module.cc LIBRARIES REG + art_root_io::TFileService_service offline::ExtinctionMonitorFNAL_Reconstruction offline::GeometryService offline::RecoDataProducts diff --git a/Filters/CMakeLists.txt b/Filters/CMakeLists.txt index cbb41752e0..3d939d0344 100644 --- a/Filters/CMakeLists.txt +++ b/Filters/CMakeLists.txt @@ -10,12 +10,14 @@ cet_build_plugin(BunchIntensityFilter art::module cet_build_plugin(CaloShowerSimFilter art::module REG_SOURCE src/CaloShowerSimFilter_module.cc LIBRARIES REG + art_root_io::TFileService_service offline::MCDataProducts ) cet_build_plugin(ChooseTrackFilter art::module REG_SOURCE src/ChooseTrackFilter_module.cc LIBRARIES REG + art_root_io::TFileService_service offline::CalorimeterGeom offline::DataProducts offline::GeometryService @@ -163,6 +165,7 @@ cet_build_plugin(GenParticleMomFilter art::module cet_build_plugin(KilledEventFilter art::module REG_SOURCE src/KilledEventFilter_module.cc LIBRARIES REG + art_root_io::TFileService_service offline::MCDataProducts ) @@ -176,7 +179,7 @@ cet_build_plugin(ParticleCodeFilter art::module cet_build_plugin(RandomPrescaleFilter art::module REG_SOURCE src/RandomPrescaleFilter_module.cc LIBRARIES REG - offline::SeedService + offline::SeedService_SeedService_service ) cet_build_plugin(RecoMomFilter art::module @@ -188,6 +191,7 @@ cet_build_plugin(RecoMomFilter art::module cet_build_plugin(SelectEvents art::module REG_SOURCE src/SelectEvents_module.cc LIBRARIES REG + ROOT::Tree ) cet_build_plugin(SelectStepPointsByTime art::module @@ -211,12 +215,14 @@ cet_build_plugin(StepPointMCCollectionUpdater art::module cet_build_plugin(StepPointsInDigis art::module REG_SOURCE src/StepPointsInDigis_module.cc LIBRARIES REG + art_root_io::TFileService_service offline::MCDataProducts ) cet_build_plugin(StrawDigiMCFilter art::module REG_SOURCE src/StrawDigiMCFilter_module.cc LIBRARIES REG + art_root_io::TFileService_service offline::MCDataProducts ) @@ -269,7 +275,7 @@ cet_build_plugin(WeightSamplingFilter art::module LIBRARIES REG offline::DataProducts offline::MCDataProducts - offline::SeedService + offline::SeedService_SeedService_service ) install_source(SUBDIRS src) diff --git a/Mu2eKinKal/CMakeLists.txt b/Mu2eKinKal/CMakeLists.txt index 652322782d..6213c495d1 100644 --- a/Mu2eKinKal/CMakeLists.txt +++ b/Mu2eKinKal/CMakeLists.txt @@ -22,7 +22,7 @@ cet_make_library( KinKal_Fit KinKal_General KinKal_MatEnv - + KinKal_Trajectory offline::BFieldGeom offline::CalorimeterGeom offline::ConfigTools @@ -76,6 +76,7 @@ cet_build_plugin(LoopHelixFit art::module REG_SOURCE src/LoopHelixFit_module.cc LIBRARIES REG offline::Mu2eKinKal + offline::TrkReco ) diff --git a/ParticleID/CMakeLists.txt b/ParticleID/CMakeLists.txt index 8b50ba9b4d..66d39038a0 100644 --- a/ParticleID/CMakeLists.txt +++ b/ParticleID/CMakeLists.txt @@ -5,7 +5,7 @@ cet_make_library( src/PIDLogLRatio.cc src/PIDUtilities.cc LIBRARIES PUBLIC - + ROOT::Hist offline::ConfigTools offline::GeneralUtilities ) @@ -13,6 +13,7 @@ cet_make_library( cet_build_plugin(ParticleID art::module REG_SOURCE src/ParticleID_module.cc LIBRARIES REG + art_root_io::TFileService_service offline::ParticleID offline::BTrkData @@ -27,6 +28,7 @@ cet_build_plugin(ParticleID art::module cet_build_plugin(ParticleIDRead art::module REG_SOURCE src/ParticleIDRead_module.cc LIBRARIES REG + art_root_io::TFileService_service offline::ParticleID offline::RecoDataProducts diff --git a/STMReco/CMakeLists.txt b/STMReco/CMakeLists.txt index 2fb2391d3f..9e13326f57 100644 --- a/STMReco/CMakeLists.txt +++ b/STMReco/CMakeLists.txt @@ -11,6 +11,7 @@ cet_build_plugin(MakeSTMHits art::module cet_build_plugin(PlotSTMEnergySpectrum art::module REG_SOURCE src/PlotSTMEnergySpectrum_module.cc LIBRARIES REG + art_root_io::TFileService_service offline::GlobalConstantsService offline::MCDataProducts offline::RecoDataProducts @@ -19,6 +20,7 @@ cet_build_plugin(PlotSTMEnergySpectrum art::module cet_build_plugin(PlotSTMMWDSpectrum art::module REG_SOURCE src/PlotSTMMWDSpectrum_module.cc LIBRARIES REG + art_root_io::TFileService_service offline::GlobalConstantsService offline::MCDataProducts offline::RecoDataProducts diff --git a/TEveEventDisplay/CMakeLists.txt b/TEveEventDisplay/CMakeLists.txt index ad908378c3..acae852fb3 100644 --- a/TEveEventDisplay/CMakeLists.txt +++ b/TEveEventDisplay/CMakeLists.txt @@ -20,6 +20,7 @@ cet_make_library( offline::ConfigTools offline::GeometryService offline::GlobalConstantsService + ROOT::Eve ) cet_build_plugin(TEveEventDisplay art::module diff --git a/TrackCaloMatching/CMakeLists.txt b/TrackCaloMatching/CMakeLists.txt index 8b35a1a154..2774a9133f 100644 --- a/TrackCaloMatching/CMakeLists.txt +++ b/TrackCaloMatching/CMakeLists.txt @@ -1,6 +1,7 @@ cet_build_plugin(TrackCaloIntersection art::module REG_SOURCE src/TrackCaloIntersection_module.cc LIBRARIES REG + art_root_io::TFileService_service offline::CalorimeterGeom offline::GeometryService offline::RecoDataProducts @@ -9,6 +10,7 @@ cet_build_plugin(TrackCaloIntersection art::module cet_build_plugin(TrackCaloIntersectionMVA art::module REG_SOURCE src/TrackCaloIntersectionMVA_module.cc LIBRARIES REG + art_root_io::TFileService_service offline::CalorimeterGeom offline::GeometryService offline::RecoDataProducts @@ -17,6 +19,7 @@ cet_build_plugin(TrackCaloIntersectionMVA art::module cet_build_plugin(TrackCaloMatchingExtend art::module REG_SOURCE src/TrackCaloMatchingExtend_module.cc LIBRARIES REG + art_root_io::TFileService_service offline::CalorimeterGeom offline::GeometryService offline::RecoDataProducts @@ -25,6 +28,7 @@ cet_build_plugin(TrackCaloMatchingExtend art::module cet_build_plugin(TrackCaloMatching art::module REG_SOURCE src/TrackCaloMatching_module.cc LIBRARIES REG + art_root_io::TFileService_service offline::CalorimeterGeom offline::ConditionsService offline::GeometryService @@ -34,6 +38,7 @@ cet_build_plugin(TrackCaloMatching art::module cet_build_plugin(TrackCaloMatchingMVA art::module REG_SOURCE src/TrackCaloMatchingMVA_module.cc LIBRARIES REG + art_root_io::TFileService_service offline::CalorimeterGeom offline::GeometryService offline::RecoDataProducts @@ -42,6 +47,7 @@ cet_build_plugin(TrackCaloMatchingMVA art::module cet_build_plugin(TrkExtrapol art::module REG_SOURCE src/TrkExtrapol_module.cc LIBRARIES REG + art_root_io::TFileService_service offline::CalorimeterGeom offline::ConditionsService offline::GeometryService diff --git a/TrackerMC/CMakeLists.txt b/TrackerMC/CMakeLists.txt index 096760bf9c..b208c59b0c 100644 --- a/TrackerMC/CMakeLists.txt +++ b/TrackerMC/CMakeLists.txt @@ -16,6 +16,7 @@ cet_make_library( cet_build_plugin(MakeMCKalSeed art::module REG_SOURCE src/MakeMCKalSeed_module.cc LIBRARIES REG + art_root_io::TFileService_service offline::TrackerMC offline::BFieldGeom diff --git a/Trigger/CMakeLists.txt b/Trigger/CMakeLists.txt index 5917859a91..df2ab60662 100644 --- a/Trigger/CMakeLists.txt +++ b/Trigger/CMakeLists.txt @@ -7,6 +7,7 @@ cet_build_plugin(DigiFilter art::module cet_build_plugin(EvalWeightedEventCounts art::module REG_SOURCE src/EvalWeightedEventCounts_module.cc LIBRARIES REG + art_root_io::TFileService_service offline::MCDataProducts ) diff --git a/TrkExt/CMakeLists.txt b/TrkExt/CMakeLists.txt index 5b9bbcf11d..cc805d2828 100644 --- a/TrkExt/CMakeLists.txt +++ b/TrkExt/CMakeLists.txt @@ -10,6 +10,7 @@ cet_make_library( src/TrkExtStoppingTarget.cc src/TrkExtToyDS.cc LIBRARIES PUBLIC + art_root_io::TFileService_service offline::BFieldGeom offline::BTrkData diff --git a/TrkHitReco/CMakeLists.txt b/TrkHitReco/CMakeLists.txt index 1b53a52358..6d47c6a8d9 100644 --- a/TrkHitReco/CMakeLists.txt +++ b/TrkHitReco/CMakeLists.txt @@ -27,6 +27,7 @@ cet_build_plugin(CombineStrawHits art::module cet_build_plugin(FlagBkgHits art::module REG_SOURCE src/FlagBkgHits_module.cc LIBRARIES REG + art_root_io::TFileService_service offline::TrkHitReco offline::ConditionsService @@ -51,6 +52,7 @@ cet_build_plugin(MakeStereoHits art::module cet_build_plugin(ProtonBunchTimeFromStrawDigis art::module REG_SOURCE src/ProtonBunchTimeFromStrawDigis_module.cc LIBRARIES REG + art_root_io::TFileService_service offline::TrkHitReco offline::ProditionsService @@ -69,6 +71,7 @@ cet_build_plugin(ReadStrawDigi art::module cet_build_plugin(StrawHitReco art::module REG_SOURCE src/StrawHitReco_module.cc LIBRARIES REG + art_root_io::TFileService_service offline::TrkHitReco offline::ConditionsBase diff --git a/TrkReco/CMakeLists.txt b/TrkReco/CMakeLists.txt index 7f95edd253..9e6638ad24 100644 --- a/TrkReco/CMakeLists.txt +++ b/TrkReco/CMakeLists.txt @@ -16,7 +16,7 @@ cet_make_library( src/TrkTimeCalculator.cc src/TrkUtilities.cc LIBRARIES PUBLIC - + BTrk_difAlgebra offline::BFieldGeom offline::BTrkData offline::CalorimeterGeom diff --git a/UtilityModules/CMakeLists.txt b/UtilityModules/CMakeLists.txt index 4805380d90..1c1c9008fa 100644 --- a/UtilityModules/CMakeLists.txt +++ b/UtilityModules/CMakeLists.txt @@ -7,7 +7,7 @@ cet_build_plugin(ModifyTrackSPM art::module cet_build_plugin(NullProducer art::module REG_SOURCE src/NullProducer_module.cc LIBRARIES REG - offline::SeedService + offline::SeedService_SeedService_service ) cet_build_plugin(ReadTrackSPM art::module From 76c91267e5c185bfb40d1fc68b3f670e6dd6f5a5 Mon Sep 17 00:00:00 2001 From: Eric Flumerfelt Date: Mon, 23 Oct 2023 16:06:11 -0500 Subject: [PATCH 011/213] Finish adding libraries. Successfully built all defined targets. --- CMakeLists.txt | 5 ++ CRVResponse/CMakeLists.txt | 6 +- EventDisplay/CMakeLists.txt | 5 ++ EventGenerator/CMakeLists.txt | 68 ++++++++++--------- EventMixing/CMakeLists.txt | 12 ++-- ExtinctionMonitorFNAL/Analyses/CMakeLists.txt | 4 ++ .../ComponentTests/CMakeLists.txt | 42 ++++++------ .../Digitization/CMakeLists.txt | 2 +- GeometryService/CMakeLists.txt | 3 +- Mu2eG4/CMakeLists.txt | 16 +++-- Mu2eG4Helper/CMakeLists.txt | 3 +- TEveEventDisplay/CMakeLists.txt | 10 ++- TrackCaloMatching/CMakeLists.txt | 1 + TrackerMC/CMakeLists.txt | 2 +- 14 files changed, 109 insertions(+), 70 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 23ceea097c..adf194bd01 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -24,6 +24,11 @@ find_package(Boost COMPONENTS iostreams program_options REQUIRED) find_package(XercesC REQUIRED) find_package(BLAS REQUIRED) find_package(artdaq_core_mu2e REQUIRED) +find_package(Geant4 REQUIRED) + +# TODO: Find or implement FindCRY.cmake +include_directories($ENV{CRYHOME}/src) +link_directories($ENV{CRYHOME}/lib) # BTrk and KinKal have non-standard Find*.cmake... include_directories($ENV{KINKAL_INC}) diff --git a/CRVResponse/CMakeLists.txt b/CRVResponse/CMakeLists.txt index b9aead31d7..1596f63577 100644 --- a/CRVResponse/CMakeLists.txt +++ b/CRVResponse/CMakeLists.txt @@ -77,7 +77,7 @@ cet_build_plugin(CrvPhotonGenerator art::module offline::GlobalConstantsService offline::MCDataProducts offline::ProditionsService - offline::SeedService + offline::SeedService_SeedService_service ) cet_build_plugin(CrvPlot art::module @@ -109,7 +109,7 @@ cet_build_plugin(CrvSiPMChargeGenerator art::module offline::GeometryService offline::MCDataProducts offline::ProditionsService - offline::SeedService + offline::SeedService_SeedService_service ) cet_build_plugin(CrvStepsFromStepPointMCs art::module @@ -151,7 +151,7 @@ cet_build_plugin(CrvWaveformsGenerator art::module offline::GeometryService offline::MCDataProducts offline::ProditionsService - offline::SeedService + offline::SeedService_SeedService_service ) cet_build_plugin(MakeCrvCoincidenceClusterMCAssns art::module diff --git a/EventDisplay/CMakeLists.txt b/EventDisplay/CMakeLists.txt index 38d1cdbb80..bb83716912 100644 --- a/EventDisplay/CMakeLists.txt +++ b/EventDisplay/CMakeLists.txt @@ -21,12 +21,17 @@ cet_make_library( offline::StoppingTargetGeom offline::TrackerGeom offline::TrkReco + ROOT::Gui + ROOT::Geom + ROOT::Cling ) cet_build_plugin(EventDisplay art::module REG_SOURCE src/EventDisplay_module.cc LIBRARIES REG + art_root_io::TFileService_service offline::EventDisplay + offline::EventDisplay_dict offline::CRVConditions offline::MCDataProducts diff --git a/EventGenerator/CMakeLists.txt b/EventGenerator/CMakeLists.txt index f5ffa9a397..ef4ce50002 100644 --- a/EventGenerator/CMakeLists.txt +++ b/EventGenerator/CMakeLists.txt @@ -26,6 +26,7 @@ cet_make_library( offline::ProductionTargetGeom offline::SeedService offline::StoppingTargetGeom + CRY ) cet_build_plugin(AntiProtonGun art::module @@ -40,7 +41,7 @@ cet_build_plugin(AntiProtonGun art::module offline::MCDataProducts offline::Mu2eUtilities offline::ProductionTargetGeom - offline::SeedService + offline::SeedService_SeedService_service ) cet_build_plugin(CaloCalibGun art::module @@ -53,7 +54,7 @@ cet_build_plugin(CaloCalibGun art::module offline::GeometryService offline::MCDataProducts offline::Mu2eUtilities - offline::SeedService + offline::SeedService_SeedService_service ) cet_build_plugin(CaloTBGun art::module @@ -67,7 +68,7 @@ cet_build_plugin(CaloTBGun art::module offline::GeometryService offline::GlobalConstantsService offline::MCDataProducts - offline::SeedService + offline::SeedService_SeedService_service ) cet_build_plugin(CeEndpoint art::module @@ -79,7 +80,7 @@ cet_build_plugin(CeEndpoint art::module offline::GlobalConstantsService offline::MCDataProducts offline::Mu2eUtilities - offline::SeedService + offline::SeedService_SeedService_service ) cet_build_plugin(CORSIKAEventGenerator art::module @@ -94,7 +95,7 @@ cet_build_plugin(CORSIKAEventGenerator art::module offline::GeometryService offline::MCDataProducts offline::Mu2eUtilities - offline::SeedService + offline::SeedService_SeedService_service ) cet_build_plugin(CRYEventGenerator art::module @@ -104,7 +105,7 @@ cet_build_plugin(CRYEventGenerator art::module offline::ConfigTools offline::MCDataProducts - offline::SeedService + offline::SeedService_SeedService_service ) cet_build_plugin(CryResampler art::module @@ -116,7 +117,7 @@ cet_build_plugin(CryResampler art::module offline::GeneralUtilities offline::GlobalConstantsService offline::MCDataProducts - offline::SeedService + offline::SeedService_SeedService_service ) cet_build_plugin(DecayInOrbitWeight art::module @@ -127,7 +128,7 @@ cet_build_plugin(DecayInOrbitWeight art::module offline::ConfigTools offline::MCDataProducts offline::Mu2eUtilities - offline::SeedService + offline::SeedService_SeedService_service ) cet_build_plugin(EplusFromStoppedPion art::module @@ -139,7 +140,7 @@ cet_build_plugin(EplusFromStoppedPion art::module offline::GlobalConstantsService offline::MCDataProducts offline::Mu2eUtilities - offline::SeedService + offline::SeedService_SeedService_service ) cet_build_plugin(EventGenerator art::module @@ -149,7 +150,7 @@ cet_build_plugin(EventGenerator art::module offline::ConfigTools offline::MCDataProducts - offline::SeedService + offline::SeedService_SeedService_service ) cet_build_plugin(ExtMonFNALBoxGenerator art::module @@ -164,7 +165,7 @@ cet_build_plugin(ExtMonFNALBoxGenerator art::module offline::GeometryService offline::GlobalConstantsService offline::MCDataProducts - offline::SeedService + offline::SeedService_SeedService_service ) cet_build_plugin(ExtMonFNALGun art::module @@ -173,7 +174,7 @@ cet_build_plugin(ExtMonFNALGun art::module offline::EventGenerator offline::MCDataProducts - offline::SeedService + offline::SeedService_SeedService_service ) cet_build_plugin(ExtMonFNALRoomGenerator art::module @@ -184,11 +185,12 @@ cet_build_plugin(ExtMonFNALRoomGenerator art::module offline::ConfigTools offline::DataProducts offline::ExtinctionMonitorFNAL_Geometry + offline::ExtinctionMonitorFNAL_Utilities offline::GeometryService offline::GlobalConstantsService offline::MCDataProducts offline::ProtonBeamDumpGeom - offline::SeedService + offline::SeedService_SeedService_service ) cet_build_plugin(FlatMuonDaughterGenerator art::module @@ -200,7 +202,7 @@ cet_build_plugin(FlatMuonDaughterGenerator art::module offline::GlobalConstantsService offline::MCDataProducts offline::Mu2eUtilities - offline::SeedService + offline::SeedService_SeedService_service ) cet_build_plugin(FromAsciiMomentumAndPosition art::module @@ -217,7 +219,7 @@ cet_build_plugin(FromAsciiMomentumAndPosition art::module offline::MCDataProducts offline::Mu2eUtilities offline::ProductionTargetGeom - offline::SeedService + offline::SeedService_SeedService_service ) cet_build_plugin(FromSimParticleCompact art::module @@ -232,7 +234,7 @@ cet_build_plugin(FromSimParticleCompact art::module offline::MCDataProducts offline::Mu2eUtilities offline::ProductionTargetGeom - offline::SeedService + offline::SeedService_SeedService_service ) cet_build_plugin(FromStepPointMCs art::module @@ -253,7 +255,7 @@ cet_build_plugin(FromStepPointMCsRotateTarget art::module offline::GlobalConstantsService offline::MCDataProducts offline::ProductionTargetGeom - offline::SeedService + offline::SeedService_SeedService_service ) cet_build_plugin(G4BeamlineGenerator art::module @@ -263,7 +265,7 @@ cet_build_plugin(G4BeamlineGenerator art::module offline::ConfigTools offline::MCDataProducts - offline::SeedService + offline::SeedService_SeedService_service ) cet_build_plugin(GeneratorPlots art::module @@ -293,7 +295,7 @@ cet_build_plugin(InFlightParticleSampler art::module offline::GlobalConstantsService offline::MCDataProducts offline::Mu2eUtilities - offline::SeedService + offline::SeedService_SeedService_service ) cet_build_plugin(LeadingLog art::module @@ -305,7 +307,7 @@ cet_build_plugin(LeadingLog art::module offline::GlobalConstantsService offline::MCDataProducts offline::Mu2eUtilities - offline::SeedService + offline::SeedService_SeedService_service ) cet_build_plugin(MuStopProductsGun art::module @@ -319,7 +321,7 @@ cet_build_plugin(MuStopProductsGun art::module offline::GlobalConstantsService offline::MCDataProducts offline::Mu2eUtilities - offline::SeedService + offline::SeedService_SeedService_service ) cet_build_plugin(PBIWeight art::module @@ -339,7 +341,7 @@ cet_build_plugin(Pileup art::module offline::GlobalConstantsService offline::MCDataProducts offline::Mu2eUtilities - offline::SeedService + offline::SeedService_SeedService_service ) cet_build_plugin(PrimaryAntiProtonGun art::module @@ -356,7 +358,7 @@ cet_build_plugin(PrimaryAntiProtonGun art::module offline::MCDataProducts offline::Mu2eUtilities offline::ProductionTargetGeom - offline::SeedService + offline::SeedService_SeedService_service ) cet_build_plugin(PrimaryProtonGun art::module @@ -365,7 +367,7 @@ cet_build_plugin(PrimaryProtonGun art::module offline::EventGenerator offline::MCDataProducts - offline::SeedService + offline::SeedService_SeedService_service ) cet_build_plugin(RanTest art::module @@ -374,7 +376,7 @@ cet_build_plugin(RanTest art::module offline::EventGenerator offline::MCDataProducts - offline::SeedService + offline::SeedService_SeedService_service ) cet_build_plugin(RMCGun art::module @@ -388,7 +390,7 @@ cet_build_plugin(RMCGun art::module offline::GlobalConstantsService offline::MCDataProducts offline::Mu2eUtilities - offline::SeedService + offline::SeedService_SeedService_service ) cet_build_plugin(RPCGun art::module @@ -400,7 +402,7 @@ cet_build_plugin(RPCGun art::module offline::GlobalConstantsService offline::MCDataProducts offline::Mu2eUtilities - offline::SeedService + offline::SeedService_SeedService_service ) cet_build_plugin(SingleProcessGenerator art::module @@ -412,7 +414,7 @@ cet_build_plugin(SingleProcessGenerator art::module offline::GlobalConstantsService offline::MCDataProducts offline::Mu2eUtilities - offline::SeedService + offline::SeedService_SeedService_service ) cet_build_plugin(StoppedMuonRMCGun art::module @@ -426,7 +428,7 @@ cet_build_plugin(StoppedMuonRMCGun art::module offline::GlobalConstantsService offline::MCDataProducts offline::Mu2eUtilities - offline::SeedService + offline::SeedService_SeedService_service ) cet_build_plugin(StoppedMuonXRayGammaRayGun art::module @@ -440,7 +442,7 @@ cet_build_plugin(StoppedMuonXRayGammaRayGun art::module offline::GeometryService offline::MCDataProducts offline::Mu2eUtilities - offline::SeedService + offline::SeedService_SeedService_service offline::StoppingTargetGeom ) @@ -454,7 +456,7 @@ cet_build_plugin(StoppedMuplusDecayGun art::module offline::GlobalConstantsService offline::MCDataProducts offline::Mu2eUtilities - offline::SeedService + offline::SeedService_SeedService_service ) cet_build_plugin(StoppedParticleG4Gun art::module @@ -467,7 +469,7 @@ cet_build_plugin(StoppedParticleG4Gun art::module offline::GlobalConstantsService offline::MCDataProducts offline::Mu2eUtilities - offline::SeedService + offline::SeedService_SeedService_service ) cet_build_plugin(StoppedParticleReactionGun art::module @@ -481,7 +483,7 @@ cet_build_plugin(StoppedParticleReactionGun art::module offline::GlobalConstantsService offline::MCDataProducts offline::Mu2eUtilities - offline::SeedService + offline::SeedService_SeedService_service ) cet_build_plugin(DIOGenerator art::tool diff --git a/EventMixing/CMakeLists.txt b/EventMixing/CMakeLists.txt index e63ce27c78..7491528545 100644 --- a/EventMixing/CMakeLists.txt +++ b/EventMixing/CMakeLists.txt @@ -9,12 +9,14 @@ cet_make_library( cet_build_plugin(MixBackgroundFrames art::module REG_SOURCE src/MixBackgroundFrames_module.cc LIBRARIES REG + art::Framework_IO_ProductMix + art_root_io::art_root_io offline::EventMixing offline::MCDataProducts offline::Mu2eUtilities offline::ProditionsService - offline::SeedService + offline::SeedService_SeedService_service offline::SimulationConditions ) @@ -25,7 +27,7 @@ cet_build_plugin(ProtonBunchIntensityFlat art::module offline::MCDataProducts offline::Mu2eUtilities - offline::SeedService + offline::SeedService_SeedService_service ) cet_build_plugin(ProtonBunchIntensityLogNormal art::module @@ -35,16 +37,18 @@ cet_build_plugin(ProtonBunchIntensityLogNormal art::module offline::MCDataProducts offline::Mu2eUtilities - offline::SeedService + offline::SeedService_SeedService_service ) cet_build_plugin(ResamplingMixer art::module REG_SOURCE src/ResamplingMixer_module.cc LIBRARIES REG + art::Framework_IO_ProductMix + art_root_io::art_root_io offline::EventMixing offline::Mu2eUtilities - offline::SeedService + offline::SeedService_SeedService_service ) install_source(SUBDIRS src) diff --git a/ExtinctionMonitorFNAL/Analyses/CMakeLists.txt b/ExtinctionMonitorFNAL/Analyses/CMakeLists.txt index 2437405836..b85e38b4d5 100644 --- a/ExtinctionMonitorFNAL/Analyses/CMakeLists.txt +++ b/ExtinctionMonitorFNAL/Analyses/CMakeLists.txt @@ -18,6 +18,7 @@ cet_make_library( cet_build_plugin(EMFBoxFluxAnalyzer art::module REG_SOURCE src/EMFBoxFluxAnalyzer_module.cc LIBRARIES REG + art_root_io::TFileService_service offline::ConfigTools offline::DataProducts offline::ExtinctionMonitorFNAL_Utilities @@ -149,6 +150,7 @@ cet_build_plugin(EMFRoomFluxAnalyzer art::module REG_SOURCE src/EMFRoomFluxAnalyzer_module.cc LIBRARIES REG offline::ExtinctionMonitorFNAL_Analyses + offline::ExtinctionMonitorFNAL_Utilities offline::ConfigTools offline::DataProducts @@ -163,6 +165,7 @@ cet_build_plugin(MARSGenParticleDumper art::module REG_SOURCE src/MARSGenParticleDumper_module.cc LIBRARIES REG offline::ExtinctionMonitorFNAL_Analyses + offline::ExtinctionMonitorFNAL_Utilities offline::GeometryService offline::GlobalConstantsService offline::MCDataProducts @@ -173,6 +176,7 @@ cet_build_plugin(MARSGenParticleHist art::module REG_SOURCE src/MARSGenParticleHist_module.cc LIBRARIES REG offline::ExtinctionMonitorFNAL_Analyses + offline::ExtinctionMonitorFNAL_Utilities offline::GeometryService offline::MCDataProducts diff --git a/ExtinctionMonitorFNAL/ComponentTests/CMakeLists.txt b/ExtinctionMonitorFNAL/ComponentTests/CMakeLists.txt index 893dc11ebf..fbad3ed485 100644 --- a/ExtinctionMonitorFNAL/ComponentTests/CMakeLists.txt +++ b/ExtinctionMonitorFNAL/ComponentTests/CMakeLists.txt @@ -1,25 +1,25 @@ -cet_build_plugin(PixelIdConverterTest art::module - REG_SOURCE src/PixelIdConverterTest_module.cc - LIBRARIES REG - offline::DataProducts - offline::GeometryService - offline::SeedService -) +#cet_build_plugin(PixelIdConverterTest art::module +# REG_SOURCE src/PixelIdConverterTest_module.cc +# LIBRARIES REG +# offline::DataProducts +# offline::GeometryService +# offline::SeedService_SeedService_service +#) -cet_build_plugin(TrackExtrapolatorTest2 art::module - REG_SOURCE src/TrackExtrapolatorTest2_module.cc - LIBRARIES REG - offline::GeometryService - offline::MCDataProducts - offline::RecoDataProducts - art_root_io::TFileService_service -) +#cet_build_plugin(TrackExtrapolatorTest2 art::module +# REG_SOURCE src/TrackExtrapolatorTest2_module.cc +# LIBRARIES REG +# offline::GeometryService +# offline::MCDataProducts +# offline::RecoDataProducts +# art_root_io::TFileService_service +#) -cet_build_plugin(TrackExtrapolatorTest art::module - REG_SOURCE src/TrackExtrapolatorTest_module.cc - LIBRARIES REG - offline::GeometryService - offline::RecoDataProducts -) +#cet_build_plugin(TrackExtrapolatorTest art::module +# REG_SOURCE src/TrackExtrapolatorTest_module.cc +# LIBRARIES REG +# offline::GeometryService +# offline::RecoDataProducts +#) install_source(SUBDIRS src) diff --git a/ExtinctionMonitorFNAL/Digitization/CMakeLists.txt b/ExtinctionMonitorFNAL/Digitization/CMakeLists.txt index e26aafcaac..1c44194e2f 100644 --- a/ExtinctionMonitorFNAL/Digitization/CMakeLists.txt +++ b/ExtinctionMonitorFNAL/Digitization/CMakeLists.txt @@ -24,7 +24,7 @@ cet_build_plugin(ExtMonFNALHitMaker art::module offline::GlobalConstantsService offline::MCDataProducts offline::RecoDataProducts - offline::SeedService + offline::SeedService_SeedService_service ) install_source(SUBDIRS src) diff --git a/GeometryService/CMakeLists.txt b/GeometryService/CMakeLists.txt index 05b5b7cd42..bb1a7c865b 100644 --- a/GeometryService/CMakeLists.txt +++ b/GeometryService/CMakeLists.txt @@ -69,7 +69,8 @@ cet_make_library( cet_build_plugin(GeometryService art::service REG_SOURCE src/GeometryService_service.cc - LIBRARIES REG + IMPL_SOURCE src/GeometryService_service.cc + LIBRARIES PUBLIC offline::GeometryService offline::BeamlineGeom diff --git a/Mu2eG4/CMakeLists.txt b/Mu2eG4/CMakeLists.txt index 82d7469595..51e25157e0 100644 --- a/Mu2eG4/CMakeLists.txt +++ b/Mu2eG4/CMakeLists.txt @@ -137,18 +137,25 @@ cet_make_library( offline::MBSGeom offline::MCDataProducts offline::MECOStyleProtonAbsorberGeom - offline::Mu2eG4Helper + offline::Mu2eG4Helper_Mu2eG4Helper_service offline::Mu2eHallGeom offline::Mu2eUtilities offline::ProductionSolenoidGeom offline::ProductionTargetGeom offline::ProtonBeamDumpGeom offline::PTMGeom - offline::SeedService + offline::SeedService_SeedService_service offline::ServicesGeom offline::STMGeom offline::StoppingTargetGeom offline::TrackerGeom + Geant4::G4global + Geant4::G4digits_hits + Geant4::G4processes + Geant4::G4run + Geant4::G4physicslists + Geant4::G4persistency + Geant4::G4error_propagation ) cet_build_plugin(IonProducer art::module @@ -166,10 +173,11 @@ cet_build_plugin(Mu2eG4 art::module offline::Mu2eG4 offline::ConfigTools - offline::GeometryService + offline::GeometryService_GeometryService_service offline::MCDataProducts offline::Mu2eHallGeom offline::SeedService + Geant4::G4interfaces ) cet_build_plugin(Mu2eG4MT art::module @@ -178,7 +186,7 @@ cet_build_plugin(Mu2eG4MT art::module offline::Mu2eG4 offline::ConfigTools - offline::GeometryService + offline::GeometryService_GeometryService_service offline::MCDataProducts offline::Mu2eHallGeom ) diff --git a/Mu2eG4Helper/CMakeLists.txt b/Mu2eG4Helper/CMakeLists.txt index 9e8e95860e..22c9ad7cae 100644 --- a/Mu2eG4Helper/CMakeLists.txt +++ b/Mu2eG4Helper/CMakeLists.txt @@ -9,7 +9,8 @@ cet_make_library( cet_build_plugin(Mu2eG4Helper art::service REG_SOURCE src/Mu2eG4Helper_service.cc - LIBRARIES REG + IMPL_SOURCE src/Mu2eG4Helper_service.cc + LIBRARIES PUBLIC offline::Mu2eG4Helper ) diff --git a/TEveEventDisplay/CMakeLists.txt b/TEveEventDisplay/CMakeLists.txt index acae852fb3..5706c6dd67 100644 --- a/TEveEventDisplay/CMakeLists.txt +++ b/TEveEventDisplay/CMakeLists.txt @@ -16,31 +16,39 @@ cet_make_library( src/TEveMu2eStraightTrack.cc src/TEveMu2eTracker.cc LIBRARIES PUBLIC - + BTrk_difAlgebra offline::ConfigTools offline::GeometryService offline::GlobalConstantsService + offline::RecoDataProducts ROOT::Eve + ROOT::Cling ) cet_build_plugin(TEveEventDisplay art::module REG_SOURCE src/TEveEventDisplay_module.cc LIBRARIES REG + art_root_io::TFileService_service offline::TEveEventDisplay + offline::TEveEventDisplay_dict ) cet_build_plugin(TEveGDMLTest art::module REG_SOURCE src/TEveGDMLTest_module.cc LIBRARIES REG + art_root_io::TFileService_service offline::TEveEventDisplay + offline::TEveEventDisplay_dict ) cet_build_plugin(TEveNonGDMLTest art::module REG_SOURCE src/TEveNonGDMLTest_module.cc LIBRARIES REG + art_root_io::TFileService_service offline::TEveEventDisplay + offline::TEveEventDisplay_dict ) diff --git a/TrackCaloMatching/CMakeLists.txt b/TrackCaloMatching/CMakeLists.txt index 2774a9133f..ee0e3967a3 100644 --- a/TrackCaloMatching/CMakeLists.txt +++ b/TrackCaloMatching/CMakeLists.txt @@ -33,6 +33,7 @@ cet_build_plugin(TrackCaloMatching art::module offline::ConditionsService offline::GeometryService offline::RecoDataProducts + ROOT::Physics ) cet_build_plugin(TrackCaloMatchingMVA art::module diff --git a/TrackerMC/CMakeLists.txt b/TrackerMC/CMakeLists.txt index b208c59b0c..5a9b56d709 100644 --- a/TrackerMC/CMakeLists.txt +++ b/TrackerMC/CMakeLists.txt @@ -58,7 +58,7 @@ cet_build_plugin(StrawDigisFromStrawGasSteps art::module offline::Mu2eUtilities offline::ProditionsService offline::RecoDataProducts - offline::SeedService + offline::SeedService_SeedService_service offline::TrackerConditions offline::TrackerGeom ) From b063b658a6bb76e1ac5c11a5ad1ef7f5114593f1 Mon Sep 17 00:00:00 2001 From: Eric Flumerfelt Date: Wed, 25 Oct 2023 15:50:56 -0500 Subject: [PATCH 012/213] Start working on fixing installation directories --- CMakeLists.txt | 2 +- CMakePresets.json | 12 ++++++++++++ TrkHitReco/CMakeLists.txt | 4 ++-- ups/product_deps | 4 ++-- 4 files changed, 17 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index adf194bd01..3eae28a829 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -11,7 +11,7 @@ cet_cmake_env() cet_set_compiler_flags(DIAGS VIGILANT WERROR NO_UNDEFINED - EXTRA_FLAGS -pedantic -Wno-unused-parameter -Wno-type-limits -Wno-ignored-qualifiers -Wno-unused-but-set-parameter -Wno-extra -Wno-non-virtual-dtor + EXTRA_FLAGS -pedantic -Wno-error=unused-parameter -Wno-error=type-limits -Wno-error=ignored-qualifiers -Wno-error=unused-but-set-parameter -Wno-error=extra -Wno-error=non-virtual-dtor -Wno-error=implicit-fallthrough -Wno-error=deprecated-copy ) include_directories(..) diff --git a/CMakePresets.json b/CMakePresets.json index 5ca47be1f9..8f22565635 100644 --- a/CMakePresets.json +++ b/CMakePresets.json @@ -13,6 +13,18 @@ "CMAKE_CXX_STANDARD_REQUIRED" : { "type" : "BOOL", "value" : "ON" + }, + "offline_ADD_NOARCH_DIRS_INIT" : { + "type" : "INTERNAL", + "value" : "INCLUDE_DIR;FHICL_DIR" + }, + "offline_FHICL_DIR_INIT" : { + "type" : "STRING", + "value" : "fcl/Offline" + }, + "offline_INCLUDE_DIR_INIT" : { + "type" : "STRING", + "value" : "include/Offline" } }, "description" : "Configuration settings translated from ups/product_deps", diff --git a/TrkHitReco/CMakeLists.txt b/TrkHitReco/CMakeLists.txt index 6d47c6a8d9..5fbe27d797 100644 --- a/TrkHitReco/CMakeLists.txt +++ b/TrkHitReco/CMakeLists.txt @@ -85,6 +85,6 @@ cet_build_plugin(StrawHitReco art::module offline::TrackerGeom ) -install_source(SUBDIRS src) +install_source(SUBDIRS src inc) install_headers(SUBDIRS inc) -install_fhicl(SUBDIRS fcl SUBDIRNAME TrkHitReco) +install_fhicl(SUBDIRS fcl SUBDIRNAME TrkHitReco/fcl) diff --git a/ups/product_deps b/ups/product_deps index aa49928118..bb9d2fc136 100644 --- a/ups/product_deps +++ b/ups/product_deps @@ -127,7 +127,7 @@ defaultqual s124:e28 # # CMake modules. # -#> fcldir product_dir fcl +fcldir product_dir fcl/Offline # # FHiCL framework configuration files. # @@ -139,7 +139,7 @@ defaultqual s124:e28 # # GDML geometry description files. # -#> incdir product_dir include +incdir product_dir include/Offline # # Headers. # From 69603121107f784ec41279d02be3ab5b80928c4c Mon Sep 17 00:00:00 2001 From: Eric Flumerfelt Date: Thu, 26 Oct 2023 10:16:00 -0500 Subject: [PATCH 013/213] Use more recent version of artdaq_core_mu2e --- ups/product_deps | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ups/product_deps b/ups/product_deps index bb9d2fc136..7267dbca08 100644 --- a/ups/product_deps +++ b/ups/product_deps @@ -245,7 +245,7 @@ art_root_io v1_12_04 gallery v1_21_03 geant4 v4_11_1_p02a xerces_c v3_2_3e -artdaq_core_mu2e v1_09_03 +artdaq_core_mu2e v2_00_00 BTrk v1_02_44 KinKal v02_04_03 cry v1_7q From ae36a15583b339bd8ff23d02872af35f6941e313 Mon Sep 17 00:00:00 2001 From: Eric Flumerfelt Date: Fri, 27 Oct 2023 14:45:08 -0500 Subject: [PATCH 014/213] Change product name to uppercase --- Analyses/CMakeLists.txt | 518 ++++++++-------- AnalysisConditions/CMakeLists.txt | 12 +- BFieldGeom/CMakeLists.txt | 6 +- BFieldTest/CMakeLists.txt | 12 +- BTrkData/CMakeLists.txt | 6 +- BeamlineGeom/CMakeLists.txt | 6 +- CMakeLists.txt | 4 +- CRVConditions/CMakeLists.txt | 14 +- CRVFilters/CMakeLists.txt | 10 +- CRVReco/CMakeLists.txt | 30 +- CRVResponse/CMakeLists.txt | 160 ++--- CalPatRec/CMakeLists.txt | 196 +++--- CaloCluster/CMakeLists.txt | 40 +- CaloConditions/CMakeLists.txt | 16 +- CaloDiag/CMakeLists.txt | 52 +- CaloFilters/CMakeLists.txt | 66 +- CaloMC/CMakeLists.txt | 82 +-- CaloReco/CMakeLists.txt | 34 +- CalorimeterGeom/CMakeLists.txt | 2 +- CommonMC/CMakeLists.txt | 60 +- Compression/CMakeLists.txt | 20 +- ConditionsService/CMakeLists.txt | 8 +- ConfigTools/CMakeLists.txt | 2 +- CosmicRayShieldGeom/CMakeLists.txt | 4 +- CosmicReco/CMakeLists.txt | 172 +++--- DAQ/CMakeLists.txt | 80 +-- DAQConditions/CMakeLists.txt | 8 +- DataProducts/CMakeLists.txt | 4 +- DbService/CMakeLists.txt | 20 +- DbTables/CMakeLists.txt | 4 +- DetectorSolenoidGeom/CMakeLists.txt | 4 +- EventDisplay/CMakeLists.txt | 44 +- EventGenerator/CMakeLists.txt | 566 +++++++++--------- EventMixing/CMakeLists.txt | 36 +- ExternalShieldingGeom/CMakeLists.txt | 2 +- ExtinctionMonitorFNAL/Analyses/CMakeLists.txt | 144 ++--- .../ComponentTests/CMakeLists.txt | 16 +- .../Digitization/CMakeLists.txt | 26 +- ExtinctionMonitorFNAL/Geometry/CMakeLists.txt | 4 +- .../Reconstruction/CMakeLists.txt | 24 +- .../TruthAlgs/CMakeLists.txt | 12 +- .../Utilities/CMakeLists.txt | 8 +- Filters/CMakeLists.txt | 168 +++--- GeneralUtilities/CMakeLists.txt | 2 +- GeometryService/CMakeLists.txt | 88 +-- GlobalConstantsService/CMakeLists.txt | 8 +- HelloWorld/CMakeLists.txt | 2 +- KinKalGeom/CMakeLists.txt | 2 +- MBSGeom/CMakeLists.txt | 4 +- MCDataProducts/CMakeLists.txt | 6 +- MECOStyleProtonAbsorberGeom/CMakeLists.txt | 4 +- Mu2eBTrk/CMakeLists.txt | 12 +- Mu2eG4/CMakeLists.txt | 114 ++-- Mu2eG4Helper/CMakeLists.txt | 4 +- Mu2eHallGeom/CMakeLists.txt | 4 +- Mu2eInterfaces/CMakeLists.txt | 2 +- Mu2eKinKal/CMakeLists.txt | 58 +- Mu2eUtilities/CMakeLists.txt | 28 +- PTMGeom/CMakeLists.txt | 4 +- ParticleID/CMakeLists.txt | 24 +- Print/CMakeLists.txt | 26 +- ProditionsService/CMakeLists.txt | 42 +- ProductionSolenoidGeom/CMakeLists.txt | 4 +- ProductionTargetGeom/CMakeLists.txt | 4 +- ProtonBeamDumpGeom/CMakeLists.txt | 4 +- RecoDataProducts/CMakeLists.txt | 12 +- STMConditions/CMakeLists.txt | 8 +- STMGeom/CMakeLists.txt | 2 +- STMReco/CMakeLists.txt | 50 +- SeedService/CMakeLists.txt | 6 +- ServicesGeom/CMakeLists.txt | 2 +- SimulationConditions/CMakeLists.txt | 8 +- Sources/CMakeLists.txt | 34 +- StoppingTargetGeom/CMakeLists.txt | 4 +- TEveEventDisplay/CMakeLists.txt | 22 +- TrackCaloMatching/CMakeLists.txt | 44 +- TrackerConditions/CMakeLists.txt | 24 +- TrackerGeom/CMakeLists.txt | 8 +- TrackerMC/CMakeLists.txt | 74 +-- Trigger/CMakeLists.txt | 24 +- TrkDiag/CMakeLists.txt | 180 +++--- TrkExt/CMakeLists.txt | 38 +- TrkFilters/CMakeLists.txt | 18 +- TrkHitReco/CMakeLists.txt | 70 +-- TrkPatRec/CMakeLists.txt | 128 ++-- TrkReco/CMakeLists.txt | 50 +- UtilityModules/CMakeLists.txt | 6 +- Validation/CMakeLists.txt | 28 +- ups/product_deps | 6 +- 89 files changed, 1997 insertions(+), 1997 deletions(-) diff --git a/Analyses/CMakeLists.txt b/Analyses/CMakeLists.txt index b7a340841d..b6cbe23cf3 100644 --- a/Analyses/CMakeLists.txt +++ b/Analyses/CMakeLists.txt @@ -3,8 +3,8 @@ cet_build_plugin(BFieldPlotter art::module LIBRARIES REG art_root_io::TFileService_service - offline::BFieldGeom - offline::GeometryService + Offline::BFieldGeom + Offline::GeometryService ROOT::Hist ) @@ -14,14 +14,14 @@ cet_build_plugin(CaloCalibAna art::module art_root_io::TFileService_service - offline::CaloCluster - offline::CalorimeterGeom - offline::ConditionsService - offline::DataProducts - offline::GeometryService - offline::GlobalConstantsService - offline::MCDataProducts - offline::RecoDataProducts + Offline::CaloCluster + Offline::CalorimeterGeom + Offline::ConditionsService + Offline::DataProducts + Offline::GeometryService + Offline::GlobalConstantsService + Offline::MCDataProducts + Offline::RecoDataProducts ) cet_build_plugin(CaloCalib art::module @@ -29,19 +29,19 @@ cet_build_plugin(CaloCalib art::module LIBRARIES REG art_root_io::TFileService_service - offline::CalorimeterGeom - offline::DataProducts - offline::GeometryService - offline::GlobalConstantsService - offline::MCDataProducts - offline::RecoDataProducts + Offline::CalorimeterGeom + Offline::DataProducts + Offline::GeometryService + Offline::GlobalConstantsService + Offline::MCDataProducts + Offline::RecoDataProducts ) cet_build_plugin(CaloClusterCompare art::module REG_SOURCE src/CaloClusterCompare_module.cc LIBRARIES REG art_root_io::TFileService_service - offline::RecoDataProducts + Offline::RecoDataProducts ) cet_build_plugin(CaloDigiAna art::module @@ -49,51 +49,51 @@ cet_build_plugin(CaloDigiAna art::module LIBRARIES REG art_root_io::TFileService_service - offline::CalorimeterGeom - offline::ConditionsService - offline::DataProducts - offline::GeometryService - offline::GlobalConstantsService - offline::RecoDataProducts + Offline::CalorimeterGeom + Offline::ConditionsService + Offline::DataProducts + Offline::GeometryService + Offline::GlobalConstantsService + Offline::RecoDataProducts ) cet_build_plugin(CaloHitFinderInspect art::module REG_SOURCE src/CaloHitFinderInspect_module.cc LIBRARIES REG art_root_io::TFileService_service - offline::CalorimeterGeom - offline::ConditionsService - offline::GeometryService - offline::GlobalConstantsService - offline::MCDataProducts - offline::RecoDataProducts + Offline::CalorimeterGeom + Offline::ConditionsService + Offline::GeometryService + Offline::GlobalConstantsService + Offline::MCDataProducts + Offline::RecoDataProducts ) cet_build_plugin(CaloTrackMatchExample art::module REG_SOURCE src/CaloTrackMatchExample_module.cc LIBRARIES REG art_root_io::TFileService_service - offline::CalorimeterGeom - offline::GeometryService - offline::GlobalConstantsService - offline::MCDataProducts - offline::RecoDataProducts + Offline::CalorimeterGeom + Offline::GeometryService + Offline::GlobalConstantsService + Offline::MCDataProducts + Offline::RecoDataProducts ) cet_build_plugin(CollectionSizeAnalyzer art::module REG_SOURCE src/CollectionSizeAnalyzer_module.cc LIBRARIES REG art_root_io::TFileService_service - offline::MCDataProducts + Offline::MCDataProducts ) cet_build_plugin(CompressionCheck0 art::module REG_SOURCE src/CompressionCheck0_module.cc LIBRARIES REG art_root_io::TFileService_service - offline::GeneralUtilities - offline::MCDataProducts - offline::RecoDataProducts + Offline::GeneralUtilities + Offline::MCDataProducts + Offline::RecoDataProducts ) cet_build_plugin(CORSIKAGenPlots art::module @@ -102,10 +102,10 @@ cet_build_plugin(CORSIKAGenPlots art::module art_root_io::TFileService_service - offline::DataProducts - offline::GlobalConstantsService - offline::MCDataProducts - offline::Mu2eUtilities + Offline::DataProducts + Offline::GlobalConstantsService + Offline::MCDataProducts + Offline::Mu2eUtilities ) cet_build_plugin(CosmicAnalysis art::module @@ -113,24 +113,24 @@ cet_build_plugin(CosmicAnalysis art::module LIBRARIES REG - offline::BTrkData - offline::CosmicRayShieldGeom - offline::DataProducts - offline::GeometryService - offline::MCDataProducts - offline::Mu2eUtilities - offline::RecoDataProducts + Offline::BTrkData + Offline::CosmicRayShieldGeom + Offline::DataProducts + Offline::GeometryService + Offline::MCDataProducts + Offline::Mu2eUtilities + Offline::RecoDataProducts ) cet_build_plugin(CosmicFilter art::module REG_SOURCE src/CosmicFilter_module.cc LIBRARIES REG art_root_io::TFileService_service - offline::CalorimeterGeom - offline::GeometryService - offline::MCDataProducts - offline::RecoDataProducts - offline::TrackerGeom + Offline::CalorimeterGeom + Offline::GeometryService + Offline::MCDataProducts + Offline::RecoDataProducts + Offline::TrackerGeom ) cet_build_plugin(CountPionDecays art::module @@ -138,8 +138,8 @@ cet_build_plugin(CountPionDecays art::module LIBRARIES REG - offline::DataProducts - offline::MCDataProducts + Offline::DataProducts + Offline::MCDataProducts ) cet_build_plugin(CRYGenPlots art::module @@ -148,33 +148,33 @@ cet_build_plugin(CRYGenPlots art::module art_root_io::TFileService_service - offline::DataProducts - offline::GlobalConstantsService - offline::MCDataProducts - offline::Mu2eUtilities + Offline::DataProducts + Offline::GlobalConstantsService + Offline::MCDataProducts + Offline::Mu2eUtilities ) cet_build_plugin(DiskCal00 art::module REG_SOURCE src/DiskCal00_module.cc LIBRARIES REG art_root_io::TFileService_service - offline::CalorimeterGeom - offline::DataProducts - offline::GeometryService - offline::MCDataProducts - offline::RecoDataProducts + Offline::CalorimeterGeom + Offline::DataProducts + Offline::GeometryService + Offline::MCDataProducts + Offline::RecoDataProducts ) cet_build_plugin(EMFCSimpleDumper art::module REG_SOURCE src/EMFCSimpleDumper_module.cc LIBRARIES REG art_root_io::TFileService_service - offline::DataProducts - offline::ExtinctionMonitorFNAL_Geometry - offline::GeometryService - offline::GlobalConstantsService - offline::MCDataProducts - offline::ProtonBeamDumpGeom + Offline::DataProducts + Offline::ExtinctionMonitorFNAL_Geometry + Offline::GeometryService + Offline::GlobalConstantsService + Offline::MCDataProducts + Offline::ProtonBeamDumpGeom ) cet_build_plugin(EventIDSequencePrinter art::module @@ -198,7 +198,7 @@ cet_build_plugin(ExtremeHitTimes art::module art_root_io::TFileService_service - offline::MCDataProducts + Offline::MCDataProducts ) cet_build_plugin(FilterEmptyEvents art::module @@ -206,10 +206,10 @@ cet_build_plugin(FilterEmptyEvents art::module LIBRARIES REG - offline::CalorimeterGeom - offline::GeometryService - offline::MCDataProducts - offline::RecoDataProducts + Offline::CalorimeterGeom + Offline::GeometryService + Offline::MCDataProducts + Offline::RecoDataProducts ) cet_build_plugin(FilterVDHits art::module @@ -217,15 +217,15 @@ cet_build_plugin(FilterVDHits art::module LIBRARIES REG - offline::MCDataProducts - offline::Mu2eUtilities + Offline::MCDataProducts + Offline::Mu2eUtilities ) cet_build_plugin(G4ReactionAnalyzer art::module REG_SOURCE src/G4ReactionAnalyzer_module.cc LIBRARIES REG art_root_io::TFileService_service - offline::MCDataProducts + Offline::MCDataProducts ) cet_build_plugin(GenParticlesAnalyzer art::module @@ -233,16 +233,16 @@ cet_build_plugin(GenParticlesAnalyzer art::module LIBRARIES REG - offline::MCDataProducts - offline::Mu2eUtilities + Offline::MCDataProducts + Offline::Mu2eUtilities ) cet_build_plugin(GeomVis art::module REG_SOURCE src/GeomVis_module.cc LIBRARIES REG art_root_io::TFileService_service - offline::DataProducts - offline::MCDataProducts + Offline::DataProducts + Offline::MCDataProducts ROOT::Geom ROOT::Physics ) @@ -253,8 +253,8 @@ cet_build_plugin(Histforpabs art::module art_root_io::TFileService_service - offline::GeometryService - offline::MCDataProducts + Offline::GeometryService + Offline::MCDataProducts ) cet_build_plugin(InteractiveRoot art::module @@ -263,21 +263,21 @@ cet_build_plugin(InteractiveRoot art::module art_root_io::TFileService_service - offline::MCDataProducts + Offline::MCDataProducts ) cet_build_plugin(KineticFracAnalysis art::module REG_SOURCE src/KineticFracAnalysis_module.cc LIBRARIES REG art_root_io::TFileService_service - offline::CalorimeterGeom - offline::DataProducts - offline::GeneralUtilities - offline::GeometryService - offline::GlobalConstantsService - offline::MCDataProducts - offline::RecoDataProducts - offline::TrackerGeom + Offline::CalorimeterGeom + Offline::DataProducts + Offline::GeneralUtilities + Offline::GeometryService + Offline::GlobalConstantsService + Offline::MCDataProducts + Offline::RecoDataProducts + Offline::TrackerGeom ) cet_build_plugin(materailsPropStudy art::module @@ -286,7 +286,7 @@ cet_build_plugin(materailsPropStudy art::module art_root_io::TFileService_service BTrk_MatEnv BTrk_TrkBase - offline::SeedService + Offline::SeedService ROOT::Tree ) @@ -295,60 +295,60 @@ cet_build_plugin(MTVerification art::module LIBRARIES REG - offline::MCDataProducts + Offline::MCDataProducts ) cet_build_plugin(Mu2eG4StudyCalo01ReadBack art::module REG_SOURCE src/Mu2eG4StudyCalo01ReadBack_module.cc LIBRARIES REG art_root_io::TFileService_service - offline::ConditionsService - offline::GeometryService - offline::GlobalConstantsService - offline::MCDataProducts + Offline::ConditionsService + Offline::GeometryService + Offline::GlobalConstantsService + Offline::MCDataProducts ) cet_build_plugin(Mu2eG4StudyReadBack art::module REG_SOURCE src/Mu2eG4StudyReadBack_module.cc LIBRARIES REG art_root_io::TFileService_service - offline::ConditionsService - offline::GeometryService - offline::GlobalConstantsService - offline::MCDataProducts + Offline::ConditionsService + Offline::GeometryService + Offline::GlobalConstantsService + Offline::MCDataProducts ) cet_build_plugin(ParticleIDScan art::module REG_SOURCE src/ParticleIDScan_module.cc LIBRARIES REG art_root_io::TFileService_service - offline::ParticleID + Offline::ParticleID ) cet_build_plugin(PbarAnalysis2 art::module REG_SOURCE src/PbarAnalysis2_module.cc LIBRARIES REG art_root_io::TFileService_service - offline::CaloCluster - offline::CalorimeterGeom - offline::ConditionsService - offline::DataProducts - offline::GeometryService - offline::GlobalConstantsService - offline::MCDataProducts - offline::RecoDataProducts - offline::TrackerGeom + Offline::CaloCluster + Offline::CalorimeterGeom + Offline::ConditionsService + Offline::DataProducts + Offline::GeometryService + Offline::GlobalConstantsService + Offline::MCDataProducts + Offline::RecoDataProducts + Offline::TrackerGeom ) cet_build_plugin(pbars1hist art::module REG_SOURCE src/pbars1hist_module.cc LIBRARIES REG art_root_io::TFileService_service - offline::DataProducts - offline::GeometryService - offline::GlobalConstantsService - offline::MCDataProducts - offline::ProductionTargetGeom + Offline::DataProducts + Offline::GeometryService + Offline::GlobalConstantsService + Offline::MCDataProducts + Offline::ProductionTargetGeom ) cet_build_plugin(PionMomentumAnalyzer art::module @@ -356,9 +356,9 @@ cet_build_plugin(PionMomentumAnalyzer art::module LIBRARIES REG - offline::GlobalConstantsService - offline::MCDataProducts - offline::Mu2eUtilities + Offline::GlobalConstantsService + Offline::MCDataProducts + Offline::Mu2eUtilities ) cet_build_plugin(PointerCheck art::module @@ -366,7 +366,7 @@ cet_build_plugin(PointerCheck art::module LIBRARIES REG - offline::MCDataProducts + Offline::MCDataProducts ) cet_build_plugin(PrimaryProtonEnergyDumper art::module @@ -374,13 +374,13 @@ cet_build_plugin(PrimaryProtonEnergyDumper art::module LIBRARIES REG - offline::ConfigTools - offline::DataProducts - offline::GeometryService - offline::GlobalConstantsService - offline::MCDataProducts - offline::Mu2eUtilities - offline::ProductionTargetGeom + Offline::ConfigTools + Offline::DataProducts + Offline::GeometryService + Offline::GlobalConstantsService + Offline::MCDataProducts + Offline::Mu2eUtilities + Offline::ProductionTargetGeom ) cet_build_plugin(PrintGenParticles art::module @@ -388,7 +388,7 @@ cet_build_plugin(PrintGenParticles art::module LIBRARIES REG - offline::MCDataProducts + Offline::MCDataProducts ) cet_build_plugin(PrintSTMGeom art::module @@ -396,12 +396,12 @@ cet_build_plugin(PrintSTMGeom art::module LIBRARIES REG - offline::CosmicRayShieldGeom - offline::DetectorSolenoidGeom - offline::GeometryService - offline::STMGeom - offline::StoppingTargetGeom - offline::TrackerGeom + Offline::CosmicRayShieldGeom + Offline::DetectorSolenoidGeom + Offline::GeometryService + Offline::STMGeom + Offline::StoppingTargetGeom + Offline::TrackerGeom ) cet_build_plugin(PrintStrawHits art::module @@ -409,7 +409,7 @@ cet_build_plugin(PrintStrawHits art::module LIBRARIES REG - offline::RecoDataProducts + Offline::RecoDataProducts ) cet_build_plugin(PrintTrackerGeom art::module @@ -417,15 +417,15 @@ cet_build_plugin(PrintTrackerGeom art::module LIBRARIES REG - offline::GeometryService - offline::TrackerGeom + Offline::GeometryService + Offline::TrackerGeom ) cet_build_plugin(ProtonBunchIntensityAnalyzer art::module REG_SOURCE src/ProtonBunchIntensityAnalyzer_module.cc LIBRARIES REG art_root_io::TFileService_service - offline::MCDataProducts + Offline::MCDataProducts ) cet_build_plugin(PtrTest0 art::module @@ -433,7 +433,7 @@ cet_build_plugin(PtrTest0 art::module LIBRARIES REG - offline::MCDataProducts + Offline::MCDataProducts ) cet_build_plugin(PtrTest art::module @@ -441,26 +441,26 @@ cet_build_plugin(PtrTest art::module LIBRARIES REG - offline::RecoDataProducts + Offline::RecoDataProducts ) cet_build_plugin(ReadAntiProtonSteps art::module REG_SOURCE src/ReadAntiProtonSteps_module.cc LIBRARIES REG art_root_io::TFileService_service - offline::ConditionsService - offline::GeometryService - offline::GlobalConstantsService - offline::MCDataProducts + Offline::ConditionsService + Offline::GeometryService + Offline::GlobalConstantsService + Offline::MCDataProducts ) cet_build_plugin(ReadBack0 art::module REG_SOURCE src/ReadBack0_module.cc LIBRARIES REG art_root_io::TFileService_service - offline::GeometryService - offline::MCDataProducts - offline::TrackerGeom + Offline::GeometryService + Offline::MCDataProducts + Offline::TrackerGeom ) cet_build_plugin(ReadBack art::module @@ -468,129 +468,129 @@ cet_build_plugin(ReadBack art::module LIBRARIES REG - offline::CalorimeterGeom - offline::CosmicRayShieldGeom - offline::GeometryService - offline::GlobalConstantsService - offline::MCDataProducts - offline::Mu2eUtilities - offline::RecoDataProducts - offline::TrackerGeom + Offline::CalorimeterGeom + Offline::CosmicRayShieldGeom + Offline::GeometryService + Offline::GlobalConstantsService + Offline::MCDataProducts + Offline::Mu2eUtilities + Offline::RecoDataProducts + Offline::TrackerGeom ) cet_build_plugin(ReadCaloDigi art::module REG_SOURCE src/ReadCaloDigi_module.cc LIBRARIES REG art_root_io::TFileService_service - offline::CalorimeterGeom - offline::ConditionsService - offline::DataProducts - offline::GeometryService - offline::GlobalConstantsService - offline::MCDataProducts - offline::RecoDataProducts - offline::SeedService + Offline::CalorimeterGeom + Offline::ConditionsService + Offline::DataProducts + Offline::GeometryService + Offline::GlobalConstantsService + Offline::MCDataProducts + Offline::RecoDataProducts + Offline::SeedService ) cet_build_plugin(ReadMCTrajectories art::module REG_SOURCE src/ReadMCTrajectories_module.cc LIBRARIES REG art_root_io::TFileService_service - offline::MCDataProducts + Offline::MCDataProducts ) cet_build_plugin(ReadPSVacuum art::module REG_SOURCE src/ReadPSVacuum_module.cc LIBRARIES REG art_root_io::TFileService_service - offline::ConditionsService - offline::GeometryService - offline::MCDataProducts + Offline::ConditionsService + Offline::GeometryService + Offline::MCDataProducts ) cet_build_plugin(ReadPTM art::module REG_SOURCE src/ReadPTM_module.cc LIBRARIES REG art_root_io::TFileService_service - offline::ConditionsService - offline::GeometryService - offline::MCDataProducts + Offline::ConditionsService + Offline::GeometryService + Offline::MCDataProducts ) cet_build_plugin(ReadPtr art::module REG_SOURCE src/ReadPtr_module.cc LIBRARIES REG art_root_io::TFileService_service - offline::RecoDataProducts + Offline::RecoDataProducts ) cet_build_plugin(ReadStrawDigiReco art::module REG_SOURCE src/ReadStrawDigiReco_module.cc LIBRARIES REG art_root_io::TFileService_service - offline::RecoDataProducts + Offline::RecoDataProducts ) cet_build_plugin(ReadStrawHitReco art::module REG_SOURCE src/ReadStrawHitReco_module.cc LIBRARIES REG art_root_io::TFileService_service - offline::GeometryService - offline::ProditionsService - offline::RecoDataProducts - offline::TrackerConditions - offline::TrackerGeom + Offline::GeometryService + Offline::ProditionsService + Offline::RecoDataProducts + Offline::TrackerConditions + Offline::TrackerGeom ) cet_build_plugin(ReadTrackCaloMatching art::module REG_SOURCE src/ReadTrackCaloMatching_module.cc LIBRARIES REG art_root_io::TFileService_service - offline::ConditionsService - offline::GeometryService - offline::RecoDataProducts - offline::TrackerGeom + Offline::ConditionsService + Offline::GeometryService + Offline::RecoDataProducts + Offline::TrackerGeom ) cet_build_plugin(ReadTrackCaloMatchingMVA art::module REG_SOURCE src/ReadTrackCaloMatchingMVA_module.cc LIBRARIES REG art_root_io::TFileService_service - offline::CalorimeterGeom - offline::DataProducts - offline::GeometryService - offline::MCDataProducts - offline::RecoDataProducts + Offline::CalorimeterGeom + Offline::DataProducts + Offline::GeometryService + Offline::MCDataProducts + Offline::RecoDataProducts ) cet_build_plugin(ReadTrackerSteps art::module REG_SOURCE src/ReadTrackerSteps_module.cc LIBRARIES REG art_root_io::TFileService_service - offline::ConditionsService - offline::GeometryService - offline::MCDataProducts - offline::TrackerGeom + Offline::ConditionsService + Offline::GeometryService + Offline::MCDataProducts + Offline::TrackerGeom ) cet_build_plugin(ReadTrkExtrapol art::module REG_SOURCE src/ReadTrkExtrapol_module.cc LIBRARIES REG art_root_io::TFileService_service - offline::ConditionsService - offline::GeometryService - offline::RecoDataProducts - offline::TrackerGeom + Offline::ConditionsService + Offline::GeometryService + Offline::RecoDataProducts + Offline::TrackerGeom ) cet_build_plugin(ReadTrkExtrapolMVA art::module REG_SOURCE src/ReadTrkExtrapolMVA_module.cc LIBRARIES REG art_root_io::TFileService_service - offline::ConditionsService - offline::GeometryService - offline::RecoDataProducts - offline::TrackerGeom + Offline::ConditionsService + Offline::GeometryService + Offline::RecoDataProducts + Offline::TrackerGeom ) cet_build_plugin(ReadVirtualDetector art::module @@ -598,11 +598,11 @@ cet_build_plugin(ReadVirtualDetector art::module LIBRARIES REG - offline::ConditionsService - offline::GeometryService - offline::GlobalConstantsService - offline::MCDataProducts - offline::Mu2eUtilities + Offline::ConditionsService + Offline::GeometryService + Offline::GlobalConstantsService + Offline::MCDataProducts + Offline::Mu2eUtilities ) cet_build_plugin(SelectiveStepPtPrinter art::module @@ -610,7 +610,7 @@ cet_build_plugin(SelectiveStepPtPrinter art::module LIBRARIES REG - offline::MCDataProducts + Offline::MCDataProducts ) cet_build_plugin(SelectPiMinusAtTS5 art::module @@ -618,9 +618,9 @@ cet_build_plugin(SelectPiMinusAtTS5 art::module LIBRARIES REG - offline::DataProducts - offline::MCDataProducts - offline::Mu2eUtilities + Offline::DataProducts + Offline::MCDataProducts + Offline::Mu2eUtilities ) cet_build_plugin(SensitiveTargetEnergyDumper art::module @@ -628,13 +628,13 @@ cet_build_plugin(SensitiveTargetEnergyDumper art::module LIBRARIES REG - offline::ConfigTools - offline::DataProducts - offline::GeometryService - offline::GlobalConstantsService - offline::MCDataProducts - offline::Mu2eUtilities - offline::ProductionTargetGeom + Offline::ConfigTools + Offline::DataProducts + Offline::GeometryService + Offline::GlobalConstantsService + Offline::MCDataProducts + Offline::Mu2eUtilities + Offline::ProductionTargetGeom ) cet_build_plugin(SimParticleAnalyzer art::module @@ -642,21 +642,21 @@ cet_build_plugin(SimParticleAnalyzer art::module LIBRARIES REG art_root_io::TFileService_service - offline::MCDataProducts + Offline::MCDataProducts ) cet_build_plugin(SimParticleCheck00 art::module REG_SOURCE src/SimParticleCheck00_module.cc LIBRARIES REG art_root_io::TFileService_service - offline::MCDataProducts + Offline::MCDataProducts ) cet_build_plugin(SimParticleDumperCompact art::module REG_SOURCE src/SimParticleDumperCompact_module.cc LIBRARIES REG art_root_io::TFileService_service - offline::MCDataProducts + Offline::MCDataProducts ) cet_build_plugin(SimParticlesPrinter art::module @@ -664,15 +664,15 @@ cet_build_plugin(SimParticlesPrinter art::module LIBRARIES REG - offline::MCDataProducts - offline::Mu2eUtilities + Offline::MCDataProducts + Offline::Mu2eUtilities ) cet_build_plugin(StatusG4Analyzer art::module REG_SOURCE src/StatusG4Analyzer_module.cc LIBRARIES REG art_root_io::TFileService_service - offline::MCDataProducts + Offline::MCDataProducts ) cet_build_plugin(StepPointMC1stHitDumper art::module @@ -680,24 +680,24 @@ cet_build_plugin(StepPointMC1stHitDumper art::module LIBRARIES REG - offline::GlobalConstantsService - offline::MCDataProducts - offline::Mu2eUtilities + Offline::GlobalConstantsService + Offline::MCDataProducts + Offline::Mu2eUtilities ) cet_build_plugin(StepPointMCDumperCalo art::module REG_SOURCE src/StepPointMCDumperCalo_module.cc LIBRARIES REG art_root_io::TFileService_service - offline::GlobalConstantsService - offline::MCDataProducts + Offline::GlobalConstantsService + Offline::MCDataProducts ) cet_build_plugin(StepPointMCDumperCompact art::module REG_SOURCE src/StepPointMCDumperCompact_module.cc LIBRARIES REG art_root_io::TFileService_service - offline::MCDataProducts + Offline::MCDataProducts ) cet_build_plugin(StepPointMCDumper art::module @@ -705,10 +705,10 @@ cet_build_plugin(StepPointMCDumper art::module LIBRARIES REG - offline::GeometryService - offline::GlobalConstantsService - offline::MCDataProducts - offline::Mu2eUtilities + Offline::GeometryService + Offline::GlobalConstantsService + Offline::MCDataProducts + Offline::Mu2eUtilities ) cet_build_plugin(StepPointsPrinter art::module @@ -716,7 +716,7 @@ cet_build_plugin(StepPointsPrinter art::module LIBRARIES REG - offline::MCDataProducts + Offline::MCDataProducts ) cet_build_plugin(StoppedParticlesDumper art::module @@ -724,9 +724,9 @@ cet_build_plugin(StoppedParticlesDumper art::module LIBRARIES REG - offline::GlobalConstantsService - offline::MCDataProducts - offline::Mu2eUtilities + Offline::GlobalConstantsService + Offline::MCDataProducts + Offline::Mu2eUtilities ) cet_build_plugin(StoppedParticlesPrinter art::module @@ -734,8 +734,8 @@ cet_build_plugin(StoppedParticlesPrinter art::module LIBRARIES REG - offline::DataProducts - offline::MCDataProducts + Offline::DataProducts + Offline::MCDataProducts ) cet_build_plugin(TrackSummaryDataAnalyzer art::module @@ -743,8 +743,8 @@ cet_build_plugin(TrackSummaryDataAnalyzer art::module LIBRARIES REG - offline::Mu2eUtilities - offline::RecoDataProducts + Offline::Mu2eUtilities + Offline::RecoDataProducts ) cet_build_plugin(TrackSummaryMaker art::module @@ -752,10 +752,10 @@ cet_build_plugin(TrackSummaryMaker art::module LIBRARIES REG - offline::DataProducts - offline::GeometryService - offline::Mu2eUtilities - offline::RecoDataProducts + Offline::DataProducts + Offline::GeometryService + Offline::Mu2eUtilities + Offline::RecoDataProducts ) cet_build_plugin(TrackSummaryMCAnalyzer art::module @@ -763,9 +763,9 @@ cet_build_plugin(TrackSummaryMCAnalyzer art::module LIBRARIES REG - offline::MCDataProducts - offline::Mu2eUtilities - offline::RecoDataProducts + Offline::MCDataProducts + Offline::Mu2eUtilities + Offline::RecoDataProducts ) cet_build_plugin(TrackSummaryTruthMaker art::module @@ -773,25 +773,25 @@ cet_build_plugin(TrackSummaryTruthMaker art::module LIBRARIES REG - offline::BTrkData - offline::MCDataProducts - offline::Mu2eUtilities - offline::RecoDataProducts + Offline::BTrkData + Offline::MCDataProducts + Offline::Mu2eUtilities + Offline::RecoDataProducts ) cet_build_plugin(TrackSummaryTruthRFSelector art::module REG_SOURCE src/TrackSummaryTruthRFSelector_module.cc LIBRARIES REG art_root_io::TFileService_service - offline::MCDataProducts - offline::RecoDataProducts + Offline::MCDataProducts + Offline::RecoDataProducts ) cet_build_plugin(TSTrackAna art::module REG_SOURCE src/TSTrackAna_module.cc LIBRARIES REG art_root_io::TFileService_service - offline::MCDataProducts + Offline::MCDataProducts ROOT::Geom ROOT::Physics ) @@ -801,8 +801,8 @@ cet_build_plugin(TVirtDebug art::module LIBRARIES REG - offline::GeometryService - offline::MCDataProducts + Offline::GeometryService + Offline::MCDataProducts ) cet_build_plugin(ViewAllProvenances art::module @@ -817,7 +817,7 @@ cet_build_plugin(ViewProvenance art::module LIBRARIES REG - offline::MCDataProducts + Offline::MCDataProducts ) cet_build_plugin(VMMonitor art::module @@ -825,7 +825,7 @@ cet_build_plugin(VMMonitor art::module LIBRARIES REG - offline::GeneralUtilities + Offline::GeneralUtilities ) install_source(SUBDIRS src) diff --git a/AnalysisConditions/CMakeLists.txt b/AnalysisConditions/CMakeLists.txt index b799a8e4c5..f3af2ee325 100644 --- a/AnalysisConditions/CMakeLists.txt +++ b/AnalysisConditions/CMakeLists.txt @@ -7,12 +7,12 @@ cet_make_library(INTERFACE inc/TrkQualCatalog.hh LIBRARIES INTERFACE - offline::AnalysisConfig - offline::DbService - offline::DbTables - offline::Mu2eInterfaces - offline::Mu2eUtilities - offline::RecoDataProducts + Offline::AnalysisConfig + Offline::DbService + Offline::DbTables + Offline::Mu2eInterfaces + Offline::Mu2eUtilities + Offline::RecoDataProducts ) install_headers(SUBDIRS inc) diff --git a/BFieldGeom/CMakeLists.txt b/BFieldGeom/CMakeLists.txt index 2fd126ef50..1f2159376f 100644 --- a/BFieldGeom/CMakeLists.txt +++ b/BFieldGeom/CMakeLists.txt @@ -9,9 +9,9 @@ cet_make_library( LIBRARIES PUBLIC messagefacility::MF_MessageLogger GSL::gsl - offline::DataProducts - offline::GeneralUtilities - offline::Mu2eInterfaces + Offline::DataProducts + Offline::GeneralUtilities + Offline::Mu2eInterfaces ) install_source(SUBDIRS src) diff --git a/BFieldTest/CMakeLists.txt b/BFieldTest/CMakeLists.txt index c8ae4dc75f..85257b4836 100644 --- a/BFieldTest/CMakeLists.txt +++ b/BFieldTest/CMakeLists.txt @@ -2,9 +2,9 @@ cet_build_plugin(BFieldSymmetry art::module REG_SOURCE src/BFieldSymmetry_module.cc LIBRARIES REG art_root_io::TFileService_service - offline::BFieldGeom - offline::GeometryService - offline::SeedService_SeedService_service + Offline::BFieldGeom + Offline::GeometryService + Offline::SeedService_SeedService_service ROOT::Hist ROOT::Tree ) @@ -12,9 +12,9 @@ cet_build_plugin(BFieldSymmetry art::module cet_build_plugin(BFieldTest art::module REG_SOURCE src/BFieldTest_module.cc LIBRARIES REG - offline::BFieldGeom - offline::GeneralUtilities - offline::GeometryService + Offline::BFieldGeom + Offline::GeneralUtilities + Offline::GeometryService ) install_source(SUBDIRS src) diff --git a/BTrkData/CMakeLists.txt b/BTrkData/CMakeLists.txt index db3c8da181..07231c2dba 100644 --- a/BTrkData/CMakeLists.txt +++ b/BTrkData/CMakeLists.txt @@ -5,9 +5,9 @@ cet_make_library( src/TrkStrawHit.cc LIBRARIES PUBLIC - offline::RecoDataProducts - offline::TrackerConditions - offline::TrackerGeom + Offline::RecoDataProducts + Offline::TrackerConditions + Offline::TrackerGeom ) install_source(SUBDIRS src) diff --git a/BeamlineGeom/CMakeLists.txt b/BeamlineGeom/CMakeLists.txt index b7a8df0d52..208ff8fe6d 100644 --- a/BeamlineGeom/CMakeLists.txt +++ b/BeamlineGeom/CMakeLists.txt @@ -3,9 +3,9 @@ cet_make_library( src/TSdA.cc LIBRARIES PUBLIC - offline::GeneralUtilities - offline::GeomPrimitives - offline::Mu2eInterfaces + Offline::GeneralUtilities + Offline::GeomPrimitives + Offline::Mu2eInterfaces ) install_source(SUBDIRS src) diff --git a/CMakeLists.txt b/CMakeLists.txt index 3eae28a829..1042a79b9c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -3,7 +3,7 @@ cmake_minimum_required (VERSION 3.19 FATAL_ERROR) find_package(cetmodules) -project(offline VERSION 11.00.00) +project(Offline VERSION 11.00.00) include(CetCMakeEnv) cet_cmake_env() @@ -14,7 +14,7 @@ cet_set_compiler_flags(DIAGS VIGILANT EXTRA_FLAGS -pedantic -Wno-error=unused-parameter -Wno-error=type-limits -Wno-error=ignored-qualifiers -Wno-error=unused-but-set-parameter -Wno-error=extra -Wno-error=non-virtual-dtor -Wno-error=implicit-fallthrough -Wno-error=deprecated-copy ) -include_directories(..) +include_directories(${CMAKE_CURRENT_SOURCE_DIR}/..) find_package(art_root_io REQUIRED) find_package(GSL REQUIRED) diff --git a/CRVConditions/CMakeLists.txt b/CRVConditions/CMakeLists.txt index 8202748e5d..412f994e49 100644 --- a/CRVConditions/CMakeLists.txt +++ b/CRVConditions/CMakeLists.txt @@ -5,13 +5,13 @@ cet_make_library( src/CRVStatusMaker.cc LIBRARIES PUBLIC - offline::ConfigTools - offline::CosmicRayShieldGeom - offline::CRVConfig - offline::DataProducts - offline::DbTables - offline::GeometryService - offline::Mu2eInterfaces + Offline::ConfigTools + Offline::CosmicRayShieldGeom + Offline::CRVConfig + Offline::DataProducts + Offline::DbTables + Offline::GeometryService + Offline::Mu2eInterfaces ) install_source(SUBDIRS src) diff --git a/CRVFilters/CMakeLists.txt b/CRVFilters/CMakeLists.txt index ff9a6315e9..bb46eb5053 100644 --- a/CRVFilters/CMakeLists.txt +++ b/CRVFilters/CMakeLists.txt @@ -1,11 +1,11 @@ cet_build_plugin(CrvCoincidenceClusterFilter art::module REG_SOURCE src/CrvCoincidenceClusterFilter_module.cc LIBRARIES REG - offline::CalorimeterGeom - offline::ConfigTools - offline::GeometryService - offline::GlobalConstantsService - offline::RecoDataProducts + Offline::CalorimeterGeom + Offline::ConfigTools + Offline::GeometryService + Offline::GlobalConstantsService + Offline::RecoDataProducts ) install_source(SUBDIRS src) diff --git a/CRVReco/CMakeLists.txt b/CRVReco/CMakeLists.txt index 663df3590a..af97fd49e3 100644 --- a/CRVReco/CMakeLists.txt +++ b/CRVReco/CMakeLists.txt @@ -4,35 +4,35 @@ cet_make_library( src/MakeCrvRecoPulses.cc LIBRARIES PUBLIC - offline::CosmicRayShieldGeom - offline::DataProducts - offline::GeometryService + Offline::CosmicRayShieldGeom + Offline::DataProducts + Offline::GeometryService ROOT::Hist ) cet_build_plugin(CrvCoincidenceFinder art::module REG_SOURCE src/CrvCoincidenceFinder_module.cc LIBRARIES REG - offline::CRVReco + Offline::CRVReco - offline::CosmicRayShieldGeom - offline::DataProducts - offline::GeometryService - offline::RecoDataProducts + Offline::CosmicRayShieldGeom + Offline::DataProducts + Offline::GeometryService + Offline::RecoDataProducts ) cet_build_plugin(CrvRecoPulsesFinder art::module REG_SOURCE src/CrvRecoPulsesFinder_module.cc LIBRARIES REG art_root_io::TFileService_service - offline::CRVReco + Offline::CRVReco - offline::CosmicRayShieldGeom - offline::CRVConditions - offline::DataProducts - offline::GeometryService - offline::ProditionsService - offline::RecoDataProducts + Offline::CosmicRayShieldGeom + Offline::CRVConditions + Offline::DataProducts + Offline::GeometryService + Offline::ProditionsService + Offline::RecoDataProducts ) install_source(SUBDIRS src) diff --git a/CRVResponse/CMakeLists.txt b/CRVResponse/CMakeLists.txt index 1596f63577..35d0dc60a1 100644 --- a/CRVResponse/CMakeLists.txt +++ b/CRVResponse/CMakeLists.txt @@ -8,158 +8,158 @@ cet_make_library( src/MakeCrvWaveforms.cc LIBRARIES PUBLIC - offline::MCDataProducts - offline::RecoDataProducts + Offline::MCDataProducts + Offline::RecoDataProducts ) cet_build_plugin(CrvCalibration art::module REG_SOURCE src/CrvCalibration_module.cc LIBRARIES REG art_root_io::TFileService_service - offline::CRVResponse + Offline::CRVResponse - offline::CosmicRayShieldGeom - offline::GeometryService - offline::RecoDataProducts + Offline::CosmicRayShieldGeom + Offline::GeometryService + Offline::RecoDataProducts ) cet_build_plugin(CrvCoincidenceClusterMatchMC art::module REG_SOURCE src/CrvCoincidenceClusterMatchMC_module.cc LIBRARIES REG art_root_io::TFileService_service - offline::CRVResponse + Offline::CRVResponse - offline::ConditionsService - offline::CosmicRayShieldGeom - offline::DataProducts - offline::GeometryService - offline::MCDataProducts - offline::RecoDataProducts + Offline::ConditionsService + Offline::CosmicRayShieldGeom + Offline::DataProducts + Offline::GeometryService + Offline::MCDataProducts + Offline::RecoDataProducts ) cet_build_plugin(CrvDigitizer art::module REG_SOURCE src/CrvDigitizer_module.cc LIBRARIES REG - offline::CRVResponse + Offline::CRVResponse - offline::CosmicRayShieldGeom - offline::CRVConditions - offline::DAQConditions - offline::DataProducts - offline::GeometryService - offline::MCDataProducts - offline::ProditionsService - offline::RecoDataProducts + Offline::CosmicRayShieldGeom + Offline::CRVConditions + Offline::DAQConditions + Offline::DataProducts + Offline::GeometryService + Offline::MCDataProducts + Offline::ProditionsService + Offline::RecoDataProducts ) cet_build_plugin(CrvPedestalFinder art::module REG_SOURCE src/CrvPedestalFinder_module.cc LIBRARIES REG art_root_io::TFileService_service - offline::CRVResponse + Offline::CRVResponse - offline::CosmicRayShieldGeom - offline::GeometryService - offline::RecoDataProducts + Offline::CosmicRayShieldGeom + Offline::GeometryService + Offline::RecoDataProducts ) cet_build_plugin(CrvPhotonGenerator art::module REG_SOURCE src/CrvPhotonGenerator_module.cc LIBRARIES REG - offline::CRVResponse + Offline::CRVResponse - offline::ConditionsService - offline::ConfigTools - offline::CosmicRayShieldGeom - offline::DAQConditions - offline::DataProducts - offline::GeometryService - offline::GlobalConstantsService - offline::MCDataProducts - offline::ProditionsService - offline::SeedService_SeedService_service + Offline::ConditionsService + Offline::ConfigTools + Offline::CosmicRayShieldGeom + Offline::DAQConditions + Offline::DataProducts + Offline::GeometryService + Offline::GlobalConstantsService + Offline::MCDataProducts + Offline::ProditionsService + Offline::SeedService_SeedService_service ) cet_build_plugin(CrvPlot art::module REG_SOURCE src/CrvPlot_module.cc LIBRARIES REG art_root_io::TFileService_service - offline::CRVResponse + Offline::CRVResponse - offline::ConditionsService - offline::CosmicRayShieldGeom - offline::CRVConditions - offline::DataProducts - offline::GeometryService - offline::MCDataProducts - offline::ProditionsService - offline::RecoDataProducts + Offline::ConditionsService + Offline::CosmicRayShieldGeom + Offline::CRVConditions + Offline::DataProducts + Offline::GeometryService + Offline::MCDataProducts + Offline::ProditionsService + Offline::RecoDataProducts ) cet_build_plugin(CrvSiPMChargeGenerator art::module REG_SOURCE src/CrvSiPMChargeGenerator_module.cc LIBRARIES REG - offline::CRVResponse + Offline::CRVResponse - offline::ConditionsService - offline::ConfigTools - offline::CosmicRayShieldGeom - offline::DAQConditions - offline::DataProducts - offline::GeometryService - offline::MCDataProducts - offline::ProditionsService - offline::SeedService_SeedService_service + Offline::ConditionsService + Offline::ConfigTools + Offline::CosmicRayShieldGeom + Offline::DAQConditions + Offline::DataProducts + Offline::GeometryService + Offline::MCDataProducts + Offline::ProditionsService + Offline::SeedService_SeedService_service ) cet_build_plugin(CrvStepsFromStepPointMCs art::module REG_SOURCE src/CrvStepsFromStepPointMCs_module.cc LIBRARIES REG art_root_io::TFileService_service - offline::CRVResponse + Offline::CRVResponse - offline::DataProducts - offline::GeometryService - offline::GlobalConstantsService - offline::MCDataProducts - offline::ProditionsService + Offline::DataProducts + Offline::GeometryService + Offline::GlobalConstantsService + Offline::MCDataProducts + Offline::ProditionsService ) cet_build_plugin(CRVTest art::module REG_SOURCE src/CRVTest_module.cc LIBRARIES REG art_root_io::TFileService_service - offline::CRVResponse + Offline::CRVResponse - offline::CosmicRayShieldGeom - offline::DataProducts - offline::GeometryService - offline::MCDataProducts - offline::RecoDataProducts + Offline::CosmicRayShieldGeom + Offline::DataProducts + Offline::GeometryService + Offline::MCDataProducts + Offline::RecoDataProducts ) cet_build_plugin(CrvWaveformsGenerator art::module REG_SOURCE src/CrvWaveformsGenerator_module.cc LIBRARIES REG - offline::CRVResponse + Offline::CRVResponse - offline::ConfigTools - offline::CosmicRayShieldGeom - offline::CRVConditions - offline::DAQConditions - offline::DataProducts - offline::GeometryService - offline::MCDataProducts - offline::ProditionsService - offline::SeedService_SeedService_service + Offline::ConfigTools + Offline::CosmicRayShieldGeom + Offline::CRVConditions + Offline::DAQConditions + Offline::DataProducts + Offline::GeometryService + Offline::MCDataProducts + Offline::ProditionsService + Offline::SeedService_SeedService_service ) cet_build_plugin(MakeCrvCoincidenceClusterMCAssns art::module REG_SOURCE src/MakeCrvCoincidenceClusterMCAssns_module.cc LIBRARIES REG - offline::CRVResponse + Offline::CRVResponse - offline::MCDataProducts + Offline::MCDataProducts ) install_source(SUBDIRS src) diff --git a/CalPatRec/CMakeLists.txt b/CalPatRec/CMakeLists.txt index 1d4d193516..a62285b0b3 100644 --- a/CalPatRec/CMakeLists.txt +++ b/CalPatRec/CMakeLists.txt @@ -12,201 +12,201 @@ cet_make_library( src/ProtonCandidate.cc LIBRARIES PUBLIC - offline::BFieldGeom - offline::BTrkData - offline::CalorimeterGeom - offline::ConditionsService - offline::DataProducts - offline::GeometryService - offline::MCDataProducts - offline::Mu2eUtilities - offline::RecoDataProducts - offline::TrackerGeom - offline::TrkReco + Offline::BFieldGeom + Offline::BTrkData + Offline::CalorimeterGeom + Offline::ConditionsService + Offline::DataProducts + Offline::GeometryService + Offline::MCDataProducts + Offline::Mu2eUtilities + Offline::RecoDataProducts + Offline::TrackerGeom + Offline::TrkReco ROOT::Physics ) cet_build_plugin(CalHelixFinder art::module REG_SOURCE src/CalHelixFinder_module.cc LIBRARIES REG - offline::CalPatRec + Offline::CalPatRec - offline::BFieldGeom - offline::CalorimeterGeom - offline::ConditionsService - offline::ConfigTools - offline::GeometryService - offline::Mu2eUtilities - offline::RecoDataProducts - offline::TrackerGeom + Offline::BFieldGeom + Offline::CalorimeterGeom + Offline::ConditionsService + Offline::ConfigTools + Offline::GeometryService + Offline::Mu2eUtilities + Offline::RecoDataProducts + Offline::TrackerGeom ) cet_build_plugin(CalTimePeakFinder art::module REG_SOURCE src/CalTimePeakFinder_module.cc LIBRARIES REG - offline::CalPatRec + Offline::CalPatRec - offline::CalorimeterGeom - offline::ConditionsService - offline::ConfigTools - offline::GeometryService - offline::Mu2eUtilities - offline::RecoDataProducts - offline::TrackerGeom + Offline::CalorimeterGeom + Offline::ConditionsService + Offline::ConfigTools + Offline::GeometryService + Offline::Mu2eUtilities + Offline::RecoDataProducts + Offline::TrackerGeom ) cet_build_plugin(ComboHitFilter art::module REG_SOURCE src/ComboHitFilter_module.cc LIBRARIES REG - offline::CalPatRec + Offline::CalPatRec - offline::CalorimeterGeom - offline::ConditionsService - offline::GeometryService - offline::MCDataProducts - offline::Mu2eUtilities - offline::RecoDataProducts - offline::TrackerGeom + Offline::CalorimeterGeom + Offline::ConditionsService + Offline::GeometryService + Offline::MCDataProducts + Offline::Mu2eUtilities + Offline::RecoDataProducts + Offline::TrackerGeom ) cet_build_plugin(DeltaFinderAna art::module REG_SOURCE src/DeltaFinderAna_module.cc LIBRARIES REG - offline::CalPatRec + Offline::CalPatRec - offline::ConditionsService - offline::DataProducts - offline::GeometryService - offline::MCDataProducts - offline::RecoDataProducts - offline::TrackerGeom + Offline::ConditionsService + Offline::DataProducts + Offline::GeometryService + Offline::MCDataProducts + Offline::RecoDataProducts + Offline::TrackerGeom ) cet_build_plugin(DeltaFinder art::module REG_SOURCE src/DeltaFinder_module.cc LIBRARIES REG - offline::CalPatRec + Offline::CalPatRec - offline::CalorimeterGeom - offline::ConditionsService - offline::GeometryService - offline::Mu2eUtilities - offline::RecoDataProducts - offline::TrackerGeom + Offline::CalorimeterGeom + Offline::ConditionsService + Offline::GeometryService + Offline::Mu2eUtilities + Offline::RecoDataProducts + Offline::TrackerGeom ) cet_build_plugin(MergeHelixFinder art::module REG_SOURCE src/MergeHelixFinder_module.cc LIBRARIES REG - offline::CalPatRec + Offline::CalPatRec - offline::BTrkData - offline::CalorimeterGeom - offline::ConfigTools - offline::GeometryService - offline::Mu2eUtilities - offline::RecoDataProducts - offline::TrkReco + Offline::BTrkData + Offline::CalorimeterGeom + Offline::ConfigTools + Offline::GeometryService + Offline::Mu2eUtilities + Offline::RecoDataProducts + Offline::TrkReco ) cet_build_plugin(PhiClusterFinder art::module REG_SOURCE src/PhiClusterFinder_module.cc LIBRARIES REG - offline::CalPatRec + Offline::CalPatRec - offline::ConfigTools - offline::GeneralUtilities - offline::Mu2eUtilities - offline::RecoDataProducts - offline::TrkReco + Offline::ConfigTools + Offline::GeneralUtilities + Offline::Mu2eUtilities + Offline::RecoDataProducts + Offline::TrkReco ) cet_build_plugin(PrefetchData art::module REG_SOURCE src/PrefetchData_module.cc LIBRARIES REG - offline::CalPatRec + Offline::CalPatRec - offline::ConditionsService - offline::GeometryService - offline::MCDataProducts - offline::Mu2eUtilities - offline::RecoDataProducts - offline::TrackerGeom + Offline::ConditionsService + Offline::GeometryService + Offline::MCDataProducts + Offline::Mu2eUtilities + Offline::RecoDataProducts + Offline::TrackerGeom ) cet_build_plugin(TZClusterFinder art::module REG_SOURCE src/TZClusterFinder_module.cc LIBRARIES REG - offline::CalPatRec + Offline::CalPatRec - offline::ConfigTools - offline::Mu2eUtilities - offline::RecoDataProducts + Offline::ConfigTools + Offline::Mu2eUtilities + Offline::RecoDataProducts ) cet_build_plugin(CalHelixFinderDiag art::tool REG_SOURCE src/CalHelixFinderDiag_tool.cc LIBRARIES REG - offline::CalPatRec + Offline::CalPatRec - offline::MCDataProducts - offline::Mu2eUtilities + Offline::MCDataProducts + Offline::Mu2eUtilities ) cet_build_plugin(CalTimePeakFinderDiag art::tool REG_SOURCE src/CalTimePeakFinderDiag_tool.cc LIBRARIES REG - offline::CalPatRec + Offline::CalPatRec - offline::BTrkData - offline::Mu2eUtilities - offline::RecoDataProducts - offline::TrackerGeom + Offline::BTrkData + Offline::Mu2eUtilities + Offline::RecoDataProducts + Offline::TrackerGeom ) cet_build_plugin(DeltaFinderDiag art::tool REG_SOURCE src/DeltaFinderDiag_tool.cc LIBRARIES REG - offline::CalPatRec + Offline::CalPatRec - offline::DataProducts - offline::MCDataProducts - offline::Mu2eUtilities + Offline::DataProducts + Offline::MCDataProducts + Offline::Mu2eUtilities ) cet_build_plugin(MergePatRecDiag art::tool REG_SOURCE src/MergePatRecDiag_tool.cc LIBRARIES REG - offline::CalPatRec + Offline::CalPatRec - offline::Mu2eUtilities + Offline::Mu2eUtilities ) cet_build_plugin(PhiClusterFinderDiag art::tool REG_SOURCE src/PhiClusterFinderDiag_tool.cc LIBRARIES REG - offline::CalPatRec + Offline::CalPatRec - offline::MCDataProducts - offline::Mu2eUtilities - offline::RecoDataProducts + Offline::MCDataProducts + Offline::Mu2eUtilities + Offline::RecoDataProducts ) cet_build_plugin(TZClusterFinderDiag art::tool REG_SOURCE src/TZClusterFinderDiag_tool.cc LIBRARIES REG - offline::CalPatRec + Offline::CalPatRec - offline::MCDataProducts - offline::Mu2eUtilities - offline::RecoDataProducts + Offline::MCDataProducts + Offline::Mu2eUtilities + Offline::RecoDataProducts ) art_dictionary( NO_CHECK_CLASS_VERSION # For some reason this segfaults CLASSES_DEF_XML ${CMAKE_CURRENT_SOURCE_DIR}/src/classes_def.xml CLASSES_H ${CMAKE_CURRENT_SOURCE_DIR}/src/classes.h DICTIONARY_LIBRARIES - offline::CalPatRec + Offline::CalPatRec ) install_source(SUBDIRS src) install_headers(SUBDIRS inc) diff --git a/CaloCluster/CMakeLists.txt b/CaloCluster/CMakeLists.txt index 00fc01bff3..64fedcef9a 100644 --- a/CaloCluster/CMakeLists.txt +++ b/CaloCluster/CMakeLists.txt @@ -5,52 +5,52 @@ cet_make_library( src/ClusterUtils.cc LIBRARIES PUBLIC - offline::CalorimeterGeom - offline::GeometryService - offline::RecoDataProducts + Offline::CalorimeterGeom + Offline::GeometryService + Offline::RecoDataProducts ) cet_build_plugin(CaloClusterFast art::module REG_SOURCE src/CaloClusterFast_module.cc LIBRARIES REG - offline::CaloCluster + Offline::CaloCluster - offline::CalorimeterGeom - offline::GeometryService - offline::RecoDataProducts + Offline::CalorimeterGeom + Offline::GeometryService + Offline::RecoDataProducts ) cet_build_plugin(CaloClusterMaker art::module REG_SOURCE src/CaloClusterMaker_module.cc LIBRARIES REG art_root_io::TFileService_service - offline::CaloCluster + Offline::CaloCluster - offline::CalorimeterGeom - offline::GeometryService - offline::RecoDataProducts + Offline::CalorimeterGeom + Offline::GeometryService + Offline::RecoDataProducts ) cet_build_plugin(CaloProtoClusterMaker art::module REG_SOURCE src/CaloProtoClusterMaker_module.cc LIBRARIES REG - offline::CaloCluster + Offline::CaloCluster - offline::CalorimeterGeom - offline::GeometryService - offline::RecoDataProducts + Offline::CalorimeterGeom + Offline::GeometryService + Offline::RecoDataProducts ) cet_build_plugin(CaloTrigger art::module REG_SOURCE src/CaloTrigger_module.cc LIBRARIES REG art_root_io::TFileService_service - offline::CaloCluster + Offline::CaloCluster - offline::CalorimeterGeom - offline::ConditionsService - offline::GeometryService - offline::RecoDataProducts + Offline::CalorimeterGeom + Offline::ConditionsService + Offline::GeometryService + Offline::RecoDataProducts ) install_source(SUBDIRS src) diff --git a/CaloConditions/CMakeLists.txt b/CaloConditions/CMakeLists.txt index 5c46d747f1..0fe3304ece 100644 --- a/CaloConditions/CMakeLists.txt +++ b/CaloConditions/CMakeLists.txt @@ -6,14 +6,14 @@ cet_make_library( src/CaloDAQMapMaker.cc LIBRARIES PUBLIC - offline::CaloConfig - offline::CalorimeterGeom - offline::ConfigTools - offline::DataProducts - offline::DbService - offline::DbTables - offline::Mu2eInterfaces - offline::ProditionsService + Offline::CaloConfig + Offline::CalorimeterGeom + Offline::ConfigTools + Offline::DataProducts + Offline::DbService + Offline::DbTables + Offline::Mu2eInterfaces + Offline::ProditionsService ) install_source(SUBDIRS src) diff --git a/CaloDiag/CMakeLists.txt b/CaloDiag/CMakeLists.txt index 30d7cd70bc..af11183c55 100644 --- a/CaloDiag/CMakeLists.txt +++ b/CaloDiag/CMakeLists.txt @@ -2,56 +2,56 @@ cet_build_plugin(CaloClusterCheck art::module REG_SOURCE src/CaloClusterCheck_module.cc LIBRARIES REG art_root_io::TFileService_service - offline::CalorimeterGeom - offline::DataProducts - offline::GeometryService - offline::MCDataProducts - offline::RecoDataProducts + Offline::CalorimeterGeom + Offline::DataProducts + Offline::GeometryService + Offline::MCDataProducts + Offline::RecoDataProducts ) cet_build_plugin(CaloExample art::module REG_SOURCE src/CaloExample_module.cc LIBRARIES REG art_root_io::TFileService_service - offline::CaloCluster - offline::CalorimeterGeom - offline::ConditionsService - offline::DataProducts - offline::GeometryService - offline::MCDataProducts - offline::RecoDataProducts + Offline::CaloCluster + Offline::CalorimeterGeom + Offline::ConditionsService + Offline::DataProducts + Offline::GeometryService + Offline::MCDataProducts + Offline::RecoDataProducts ) cet_build_plugin(CaloMCInspector art::module REG_SOURCE src/CaloMCInspector_module.cc LIBRARIES REG art_root_io::TFileService_service - offline::MCDataProducts - offline::RecoDataProducts + Offline::MCDataProducts + Offline::RecoDataProducts ) cet_build_plugin(CaloNeutron art::module REG_SOURCE src/CaloNeutron_module.cc LIBRARIES REG art_root_io::TFileService_service - offline::CalorimeterGeom - offline::ConditionsService - offline::DataProducts - offline::GeometryService - offline::MCDataProducts + Offline::CalorimeterGeom + Offline::ConditionsService + Offline::DataProducts + Offline::GeometryService + Offline::MCDataProducts ) cet_build_plugin(CaloNNDiag art::module REG_SOURCE src/CaloNNDiag_module.cc LIBRARIES REG art_root_io::TFileService_service - offline::CaloCluster - offline::CalorimeterGeom - offline::ConditionsService - offline::DataProducts - offline::GeometryService - offline::MCDataProducts - offline::RecoDataProducts + Offline::CaloCluster + Offline::CalorimeterGeom + Offline::ConditionsService + Offline::DataProducts + Offline::GeometryService + Offline::MCDataProducts + Offline::RecoDataProducts ) install_source(SUBDIRS src) diff --git a/CaloFilters/CMakeLists.txt b/CaloFilters/CMakeLists.txt index b512438bd4..21fe6c28ce 100644 --- a/CaloFilters/CMakeLists.txt +++ b/CaloFilters/CMakeLists.txt @@ -2,73 +2,73 @@ cet_build_plugin(CaloClusterCounterFilter art::module REG_SOURCE src/CaloClusterCounterFilter_module.cc LIBRARIES REG art_root_io::TFileService_service - offline::CalorimeterGeom - offline::ConfigTools - offline::GeometryService - offline::GlobalConstantsService - offline::RecoDataProducts + Offline::CalorimeterGeom + Offline::ConfigTools + Offline::GeometryService + Offline::GlobalConstantsService + Offline::RecoDataProducts ) cet_build_plugin(CaloCosmicCalib art::module REG_SOURCE src/CaloCosmicCalib_module.cc LIBRARIES REG - offline::CalorimeterGeom - offline::GeometryService - offline::RecoDataProducts + Offline::CalorimeterGeom + Offline::GeometryService + Offline::RecoDataProducts ) cet_build_plugin(CaloLikelihood art::module REG_SOURCE src/CaloLikelihood_module.cc LIBRARIES REG art_root_io::TFileService_service - offline::CaloCluster - offline::CalorimeterGeom - offline::ConfigTools - offline::GeometryService - offline::GlobalConstantsService - offline::RecoDataProducts + Offline::CaloCluster + Offline::CalorimeterGeom + Offline::ConfigTools + Offline::GeometryService + Offline::GlobalConstantsService + Offline::RecoDataProducts ) cet_build_plugin(EcalTriggerPreselect art::module REG_SOURCE src/EcalTriggerPreselect_module.cc LIBRARIES REG art_root_io::TFileService_service - offline::CalorimeterGeom - offline::ConditionsService - offline::GeometryService - offline::MCDataProducts - offline::RecoDataProducts + Offline::CalorimeterGeom + Offline::ConditionsService + Offline::GeometryService + Offline::MCDataProducts + Offline::RecoDataProducts ) cet_build_plugin(FilterEcalMixedTrigger art::module REG_SOURCE src/FilterEcalMixedTrigger_module.cc LIBRARIES REG art_root_io::TFileService_service - offline::CalorimeterGeom - offline::ConditionsService - offline::ConfigTools - offline::GeometryService - offline::RecoDataProducts + Offline::CalorimeterGeom + Offline::ConditionsService + Offline::ConfigTools + Offline::GeometryService + Offline::RecoDataProducts ) cet_build_plugin(FilterEcalMVATrigger art::module REG_SOURCE src/FilterEcalMVATrigger_module.cc LIBRARIES REG art_root_io::TFileService_service - offline::CalorimeterGeom - offline::ConditionsService - offline::ConfigTools - offline::GeometryService - offline::RecoDataProducts + Offline::CalorimeterGeom + Offline::ConditionsService + Offline::ConfigTools + Offline::GeometryService + Offline::RecoDataProducts ) cet_build_plugin(FilterEcalNNTrigger art::module REG_SOURCE src/FilterEcalNNTrigger_module.cc LIBRARIES REG - offline::CalorimeterGeom - offline::GeometryService - offline::Mu2eUtilities - offline::RecoDataProducts + Offline::CalorimeterGeom + Offline::GeometryService + Offline::Mu2eUtilities + Offline::RecoDataProducts ) install_source(SUBDIRS src) diff --git a/CaloMC/CMakeLists.txt b/CaloMC/CMakeLists.txt index f19efeec63..e9b517312c 100644 --- a/CaloMC/CMakeLists.txt +++ b/CaloMC/CMakeLists.txt @@ -7,83 +7,83 @@ cet_make_library( src/ShowerStepUtil.cc LIBRARIES PUBLIC - offline::CalorimeterGeom - offline::ConditionsService - offline::GeometryService - offline::Mu2eUtilities - offline::SeedService_SeedService_service + Offline::CalorimeterGeom + Offline::ConditionsService + Offline::GeometryService + Offline::Mu2eUtilities + Offline::SeedService_SeedService_service ) cet_build_plugin(CaloClusterTruthMatch art::module REG_SOURCE src/CaloClusterTruthMatch_module.cc LIBRARIES REG - offline::CaloMC + Offline::CaloMC - offline::MCDataProducts - offline::RecoDataProducts + Offline::MCDataProducts + Offline::RecoDataProducts ) cet_build_plugin(CaloDigiMaker art::module REG_SOURCE src/CaloDigiMaker_module.cc LIBRARIES REG - offline::CaloMC + Offline::CaloMC - offline::CalorimeterGeom - offline::ConditionsService - offline::DAQConditions - offline::DataProducts - offline::GeometryService - offline::MCDataProducts - offline::Mu2eUtilities - offline::ProditionsService - offline::RecoDataProducts - offline::SeedService_SeedService_service + Offline::CalorimeterGeom + Offline::ConditionsService + Offline::DAQConditions + Offline::DataProducts + Offline::GeometryService + Offline::MCDataProducts + Offline::Mu2eUtilities + Offline::ProditionsService + Offline::RecoDataProducts + Offline::SeedService_SeedService_service ) cet_build_plugin(CaloHitTruthMatch art::module REG_SOURCE src/CaloHitTruthMatch_module.cc LIBRARIES REG - offline::CaloMC + Offline::CaloMC - offline::ConditionsService - offline::MCDataProducts - offline::Mu2eUtilities - offline::RecoDataProducts + Offline::ConditionsService + Offline::MCDataProducts + Offline::Mu2eUtilities + Offline::RecoDataProducts ) cet_build_plugin(CaloShowerROMaker art::module REG_SOURCE src/CaloShowerROMaker_module.cc LIBRARIES REG - offline::CaloMC + Offline::CaloMC - offline::CalorimeterGeom - offline::ConditionsService - offline::DAQConditions - offline::DataProducts - offline::GeometryService - offline::GlobalConstantsService - offline::MCDataProducts - offline::ProditionsService - offline::SeedService_SeedService_service + Offline::CalorimeterGeom + Offline::ConditionsService + Offline::DAQConditions + Offline::DataProducts + Offline::GeometryService + Offline::GlobalConstantsService + Offline::MCDataProducts + Offline::ProditionsService + Offline::SeedService_SeedService_service ) cet_build_plugin(CaloShowerStepMaker art::module REG_SOURCE src/CaloShowerStepMaker_module.cc LIBRARIES REG - offline::CaloMC + Offline::CaloMC - offline::CalorimeterGeom - offline::GeometryService - offline::MCDataProducts - offline::Mu2eUtilities + Offline::CalorimeterGeom + Offline::GeometryService + Offline::MCDataProducts + Offline::Mu2eUtilities ) cet_build_plugin(CaloShowerUpdater art::module REG_SOURCE src/CaloShowerUpdater_module.cc LIBRARIES REG - offline::CaloMC + Offline::CaloMC - offline::MCDataProducts + Offline::MCDataProducts ) install_source(SUBDIRS src) diff --git a/CaloReco/CMakeLists.txt b/CaloReco/CMakeLists.txt index 295b2eb82b..95808a71ba 100644 --- a/CaloReco/CMakeLists.txt +++ b/CaloReco/CMakeLists.txt @@ -5,41 +5,41 @@ cet_make_library( src/CaloTemplateWFUtil.cc LIBRARIES PUBLIC - offline::ConditionsService - offline::Mu2eUtilities + Offline::ConditionsService + Offline::Mu2eUtilities ) cet_build_plugin(CaloHitMakerFast art::module REG_SOURCE src/CaloHitMakerFast_module.cc LIBRARIES REG - offline::CaloReco + Offline::CaloReco - offline::ConditionsService - offline::DataProducts - offline::GeneralUtilities - offline::RecoDataProducts + Offline::ConditionsService + Offline::DataProducts + Offline::GeneralUtilities + Offline::RecoDataProducts ) cet_build_plugin(CaloHitMaker art::module REG_SOURCE src/CaloHitMaker_module.cc LIBRARIES REG - offline::CaloReco + Offline::CaloReco - offline::CalorimeterGeom - offline::DataProducts - offline::GeometryService - offline::RecoDataProducts + Offline::CalorimeterGeom + Offline::DataProducts + Offline::GeometryService + Offline::RecoDataProducts ) cet_build_plugin(CaloRecoDigiMaker art::module REG_SOURCE src/CaloRecoDigiMaker_module.cc LIBRARIES REG - offline::CaloReco + Offline::CaloReco - offline::ConditionsService - offline::DAQConditions - offline::ProditionsService - offline::RecoDataProducts + Offline::ConditionsService + Offline::DAQConditions + Offline::ProditionsService + Offline::RecoDataProducts ) install_source(SUBDIRS src) diff --git a/CalorimeterGeom/CMakeLists.txt b/CalorimeterGeom/CMakeLists.txt index 1c1310cd3c..bd8f12f98a 100644 --- a/CalorimeterGeom/CMakeLists.txt +++ b/CalorimeterGeom/CMakeLists.txt @@ -8,7 +8,7 @@ cet_make_library( src/SquareShiftMapper.cc LIBRARIES PUBLIC - offline::Mu2eInterfaces + Offline::Mu2eInterfaces ) install_source(SUBDIRS src) diff --git a/CommonMC/CMakeLists.txt b/CommonMC/CMakeLists.txt index 67a8826110..f335e87381 100644 --- a/CommonMC/CMakeLists.txt +++ b/CommonMC/CMakeLists.txt @@ -1,84 +1,84 @@ cet_build_plugin(CosmicTimeOffset art::module REG_SOURCE src/CosmicTimeOffset_module.cc LIBRARIES REG - offline::MCDataProducts - offline::SeedService_SeedService_service + Offline::MCDataProducts + Offline::SeedService_SeedService_service ) cet_build_plugin(EventWindowMarkerProducer art::module REG_SOURCE src/EventWindowMarkerProducer_module.cc LIBRARIES REG - offline::DAQConditions - offline::DataProducts - offline::MCDataProducts - offline::ProditionsService - offline::RecoDataProducts - offline::SeedService_SeedService_service + Offline::DAQConditions + Offline::DataProducts + Offline::MCDataProducts + Offline::ProditionsService + Offline::RecoDataProducts + Offline::SeedService_SeedService_service ) cet_build_plugin(FindMCPrimary art::module REG_SOURCE src/FindMCPrimary_module.cc LIBRARIES REG - offline::MCDataProducts + Offline::MCDataProducts ) cet_build_plugin(GenEventCountReader art::module REG_SOURCE src/GenEventCountReader_module.cc LIBRARIES REG art_root_io::TFileService_service - offline::MCDataProducts + Offline::MCDataProducts ) cet_build_plugin(InFlightStepDumper art::module REG_SOURCE src/InFlightStepDumper_module.cc LIBRARIES REG art_root_io::TFileService_service - offline::GeneralUtilities - offline::MCDataProducts + Offline::GeneralUtilities + Offline::MCDataProducts ) cet_build_plugin(NullMCPrimary art::module REG_SOURCE src/NullMCPrimary_module.cc LIBRARIES REG - offline::MCDataProducts + Offline::MCDataProducts ) cet_build_plugin(ProtonTimeOffset art::module REG_SOURCE src/ProtonTimeOffset_module.cc LIBRARIES REG - offline::MCDataProducts - offline::Mu2eUtilities - offline::SeedService_SeedService_service + Offline::MCDataProducts + Offline::Mu2eUtilities + Offline::SeedService_SeedService_service ) cet_build_plugin(SelectRecoMC art::module REG_SOURCE src/SelectRecoMC_module.cc LIBRARIES REG - offline::ConditionsService - offline::DataProducts - offline::GeometryService - offline::MCDataProducts - offline::ProditionsService - offline::RecoDataProducts - offline::TrackerConditions - offline::TrackerGeom - offline::TrkDiag + Offline::ConditionsService + Offline::DataProducts + Offline::GeometryService + Offline::MCDataProducts + Offline::ProditionsService + Offline::RecoDataProducts + Offline::TrackerConditions + Offline::TrackerGeom + Offline::TrkDiag ) cet_build_plugin(SimParticleDaughterSelector art::module REG_SOURCE src/SimParticleDaughterSelector_module.cc LIBRARIES REG art_root_io::TFileService_service - offline::DataProducts - offline::MCDataProducts + Offline::DataProducts + Offline::MCDataProducts ) cet_build_plugin(StoppedParticlesFinder art::module REG_SOURCE src/StoppedParticlesFinder_module.cc LIBRARIES REG - offline::DataProducts - offline::MCDataProducts - offline::Mu2eUtilities + Offline::DataProducts + Offline::MCDataProducts + Offline::Mu2eUtilities ) install_source(SUBDIRS src) diff --git a/Compression/CMakeLists.txt b/Compression/CMakeLists.txt index 1468d88443..92b9ccdf39 100644 --- a/Compression/CMakeLists.txt +++ b/Compression/CMakeLists.txt @@ -9,30 +9,30 @@ cet_make_library( cet_build_plugin(CompressDetStepMCs art::module REG_SOURCE src/CompressDetStepMCs_module.cc LIBRARIES REG - offline::Compression + Offline::Compression - offline::MCDataProducts - offline::Mu2eUtilities + Offline::MCDataProducts + Offline::Mu2eUtilities ) cet_build_plugin(CompressDigiMCsCheck art::module REG_SOURCE src/CompressDigiMCsCheck_module.cc LIBRARIES REG art_root_io::TFileService_service - offline::Compression + Offline::Compression - offline::DataProducts - offline::MCDataProducts + Offline::DataProducts + Offline::MCDataProducts ) cet_build_plugin(CompressDigiMCs art::module REG_SOURCE src/CompressDigiMCs_module.cc LIBRARIES REG - offline::Compression + Offline::Compression - offline::DataProducts - offline::MCDataProducts - offline::Mu2eUtilities + Offline::DataProducts + Offline::MCDataProducts + Offline::Mu2eUtilities ) install_source(SUBDIRS src) diff --git a/ConditionsService/CMakeLists.txt b/ConditionsService/CMakeLists.txt index 1d4c13d258..1e588091ba 100644 --- a/ConditionsService/CMakeLists.txt +++ b/ConditionsService/CMakeLists.txt @@ -5,16 +5,16 @@ cet_make_library( src/ExtMonFNALConditions.cc LIBRARIES PUBLIC - offline::ConfigTools - offline::Mu2eInterfaces + Offline::ConfigTools + Offline::Mu2eInterfaces ) cet_build_plugin(ConditionsService art::service REG_SOURCE src/ConditionsService_service.cc LIBRARIES REG - offline::ConditionsService + Offline::ConditionsService - offline::GeometryService + Offline::GeometryService ) install_source(SUBDIRS src) diff --git a/ConfigTools/CMakeLists.txt b/ConfigTools/CMakeLists.txt index a220506f99..61c73a6e38 100644 --- a/ConfigTools/CMakeLists.txt +++ b/ConfigTools/CMakeLists.txt @@ -6,7 +6,7 @@ cet_make_library( src/SimpleConfigRecord.cc LIBRARIES PUBLIC messagefacility::MF_MessageLogger - offline::GeneralUtilities + Offline::GeneralUtilities ) install_source(SUBDIRS src) diff --git a/CosmicRayShieldGeom/CMakeLists.txt b/CosmicRayShieldGeom/CMakeLists.txt index 721db95664..02c3452508 100644 --- a/CosmicRayShieldGeom/CMakeLists.txt +++ b/CosmicRayShieldGeom/CMakeLists.txt @@ -12,8 +12,8 @@ cet_make_library( src/CRSSupportStructure.cc LIBRARIES PUBLIC - offline::DataProducts - offline::Mu2eInterfaces + Offline::DataProducts + Offline::Mu2eInterfaces ) install_source(SUBDIRS src) diff --git a/CosmicReco/CMakeLists.txt b/CosmicReco/CMakeLists.txt index 790b497e14..d6a2de6574 100644 --- a/CosmicReco/CMakeLists.txt +++ b/CosmicReco/CMakeLists.txt @@ -7,160 +7,160 @@ cet_make_library( src/PDFFit.cc LIBRARIES PUBLIC - offline::BTrkData - offline::DataProducts - offline::GeometryService - offline::Mu2eUtilities - offline::RecoDataProducts - offline::TrackerConditions - offline::TrackerGeom + Offline::BTrkData + Offline::DataProducts + Offline::GeometryService + Offline::Mu2eUtilities + Offline::RecoDataProducts + Offline::TrackerConditions + Offline::TrackerGeom ROOT::Minuit2 ) cet_build_plugin(CosmicAnalyzer art::module REG_SOURCE src/CosmicAnalyzer_module.cc LIBRARIES REG - offline::CosmicReco + Offline::CosmicReco - offline::DataProducts - offline::GeneralUtilities - offline::GeometryService - offline::MCDataProducts - offline::Mu2eUtilities - offline::ProditionsService - offline::RecoDataProducts - offline::TrkDiag + Offline::DataProducts + Offline::GeneralUtilities + Offline::GeometryService + Offline::MCDataProducts + Offline::Mu2eUtilities + Offline::ProditionsService + Offline::RecoDataProducts + Offline::TrkDiag ) cet_build_plugin(CosmicFitDisplay art::module REG_SOURCE src/CosmicFitDisplay_module.cc LIBRARIES REG - offline::CosmicReco + Offline::CosmicReco - offline::GeneralUtilities - offline::GeometryService - offline::MCDataProducts - offline::Mu2eUtilities - offline::RecoDataProducts - offline::TrackerGeom - offline::TrkDiag + Offline::GeneralUtilities + Offline::GeometryService + Offline::MCDataProducts + Offline::Mu2eUtilities + Offline::RecoDataProducts + Offline::TrackerGeom + Offline::TrkDiag ROOT::Geom ) cet_build_plugin(CosmicMCRecoDiff art::module REG_SOURCE src/CosmicMCRecoDiff_module.cc LIBRARIES REG - offline::CosmicReco + Offline::CosmicReco - offline::DataProducts - offline::GeneralUtilities - offline::GeometryService - offline::MCDataProducts - offline::Mu2eUtilities - offline::ProditionsService - offline::RecoDataProducts - offline::TrackerConditions - offline::TrackerGeom - offline::TrkDiag + Offline::DataProducts + Offline::GeneralUtilities + Offline::GeometryService + Offline::MCDataProducts + Offline::Mu2eUtilities + Offline::ProditionsService + Offline::RecoDataProducts + Offline::TrackerConditions + Offline::TrackerGeom + Offline::TrkDiag ) cet_build_plugin(CosmicMuonInfo art::module REG_SOURCE src/CosmicMuonInfo_module.cc LIBRARIES REG - offline::CosmicReco + Offline::CosmicReco - offline::DataProducts - offline::MCDataProducts - offline::RecoDataProducts + Offline::DataProducts + Offline::MCDataProducts + Offline::RecoDataProducts ) cet_build_plugin(CosmicSeedFilter art::module REG_SOURCE src/CosmicSeedFilter_module.cc LIBRARIES REG - offline::CosmicReco + Offline::CosmicReco - offline::RecoDataProducts + Offline::RecoDataProducts ) cet_build_plugin(CosmicShowerFilter art::module REG_SOURCE src/CosmicShowerFilter_module.cc LIBRARIES REG - offline::CosmicReco + Offline::CosmicReco - offline::ProditionsService - offline::RecoDataProducts - offline::TrackerConditions + Offline::ProditionsService + Offline::RecoDataProducts + Offline::TrackerConditions ) cet_build_plugin(CosmicTrackDetails art::module REG_SOURCE src/CosmicTrackDetails_module.cc LIBRARIES REG - offline::CosmicReco + Offline::CosmicReco - offline::DataProducts - offline::GeneralUtilities - offline::GeometryService - offline::MCDataProducts - offline::Mu2eUtilities - offline::ProditionsService - offline::RecoDataProducts - offline::TrackerConditions - offline::TrackerGeom - offline::TrkDiag + Offline::DataProducts + Offline::GeneralUtilities + Offline::GeometryService + Offline::MCDataProducts + Offline::Mu2eUtilities + Offline::ProditionsService + Offline::RecoDataProducts + Offline::TrackerConditions + Offline::TrackerGeom + Offline::TrkDiag ) cet_build_plugin(CosmicTrackDiag art::module REG_SOURCE src/CosmicTrackDiag_module.cc LIBRARIES REG - offline::CosmicReco + Offline::CosmicReco - offline::DataProducts - offline::GeneralUtilities - offline::GeometryService - offline::MCDataProducts - offline::Mu2eUtilities - offline::ProditionsService - offline::RecoDataProducts - offline::TrkDiag + Offline::DataProducts + Offline::GeneralUtilities + Offline::GeometryService + Offline::MCDataProducts + Offline::Mu2eUtilities + Offline::ProditionsService + Offline::RecoDataProducts + Offline::TrkDiag ) cet_build_plugin(CosmicTrackFinder art::module REG_SOURCE src/CosmicTrackFinder_module.cc LIBRARIES REG - offline::CosmicReco + Offline::CosmicReco - offline::BTrkData - offline::GeneralUtilities - offline::GeometryService - offline::Mu2eUtilities - offline::ProditionsService - offline::RecoDataProducts - offline::TrackerGeom - offline::TrkReco + Offline::BTrkData + Offline::GeneralUtilities + Offline::GeometryService + Offline::Mu2eUtilities + Offline::ProditionsService + Offline::RecoDataProducts + Offline::TrackerGeom + Offline::TrkReco ) cet_build_plugin(LineFinder art::module REG_SOURCE src/LineFinder_module.cc LIBRARIES REG - offline::CosmicReco + Offline::CosmicReco - offline::GeometryService - offline::Mu2eUtilities - offline::ProditionsService - offline::RecoDataProducts - offline::TrackerGeom + Offline::GeometryService + Offline::Mu2eUtilities + Offline::ProditionsService + Offline::RecoDataProducts + Offline::TrackerGeom ) cet_build_plugin(SimpleTimeCluster art::module REG_SOURCE src/SimpleTimeCluster_module.cc LIBRARIES REG - offline::CosmicReco + Offline::CosmicReco - offline::DataProducts - offline::GeneralUtilities - offline::Mu2eUtilities - offline::RecoDataProducts - offline::TrkReco + Offline::DataProducts + Offline::GeneralUtilities + Offline::Mu2eUtilities + Offline::RecoDataProducts + Offline::TrkReco ) install_source(SUBDIRS src) diff --git a/DAQ/CMakeLists.txt b/DAQ/CMakeLists.txt index a0b7edbdeb..b95c1f8b83 100644 --- a/DAQ/CMakeLists.txt +++ b/DAQ/CMakeLists.txt @@ -9,61 +9,61 @@ cet_make_library( cet_build_plugin(ArtBinaryPacketsFromDigis art::module REG_SOURCE src/ArtBinaryPacketsFromDigis_module.cc LIBRARIES REG - offline::DAQ + Offline::DAQ - offline::CaloConditions - offline::CalorimeterGeom - offline::CosmicRayShieldGeom - offline::CRVConditions - offline::GeometryService - offline::ProditionsService - offline::RecoDataProducts - offline::SeedService + Offline::CaloConditions + Offline::CalorimeterGeom + Offline::CosmicRayShieldGeom + Offline::CRVConditions + Offline::GeometryService + Offline::ProditionsService + Offline::RecoDataProducts + Offline::SeedService ) cet_build_plugin(ArtFragmentsFromDTCEvents art::module REG_SOURCE src/ArtFragmentsFromDTCEvents_module.cc LIBRARIES REG - offline::DAQ + Offline::DAQ ) cet_build_plugin(CaloHitsFromFragments art::module REG_SOURCE src/CaloHitsFromFragments_module.cc LIBRARIES REG - offline::DAQ + Offline::DAQ - offline::CaloConditions - offline::ProditionsService - offline::RecoDataProducts + Offline::CaloConditions + Offline::ProditionsService + Offline::RecoDataProducts ) cet_build_plugin(CaloRecoFromFragments art::module REG_SOURCE src/CaloRecoFromFragments_module.cc LIBRARIES REG - offline::DAQ + Offline::DAQ - offline::CaloConditions - offline::ProditionsService - offline::RecoDataProducts + Offline::CaloConditions + Offline::ProditionsService + Offline::RecoDataProducts ) cet_build_plugin(CrvDigisFromFragments art::module REG_SOURCE src/CrvDigisFromFragments_module.cc LIBRARIES REG - offline::DAQ + Offline::DAQ - offline::CRVConditions - offline::ProditionsService - offline::RecoDataProducts + Offline::CRVConditions + Offline::ProditionsService + Offline::RecoDataProducts ) cet_build_plugin(FragmentAna art::module REG_SOURCE src/FragmentAna_module.cc LIBRARIES REG art_root_io::TFileService_service - offline::DAQ - offline::DataProducts + Offline::DAQ + Offline::DataProducts ROOT::Hist ) @@ -71,36 +71,36 @@ cet_build_plugin(PrefetchDAQData art::module REG_SOURCE src/PrefetchDAQData_module.cc LIBRARIES REG art_root_io::TFileService_service - offline::DAQ + Offline::DAQ - offline::RecoDataProducts + Offline::RecoDataProducts ) cet_build_plugin(StrawHitRecoFromFragments art::module REG_SOURCE src/StrawHitRecoFromFragments_module.cc LIBRARIES REG art_root_io::TFileService_service - offline::DAQ + Offline::DAQ - offline::ConditionsBase - offline::ConditionsService - offline::ConfigTools - offline::DataProducts - offline::GeometryService - offline::ProditionsService - offline::RecoDataProducts - offline::TrackerConditions - offline::TrackerGeom - offline::TrkHitReco + Offline::ConditionsBase + Offline::ConditionsService + Offline::ConfigTools + Offline::DataProducts + Offline::GeometryService + Offline::ProditionsService + Offline::RecoDataProducts + Offline::TrackerConditions + Offline::TrackerGeom + Offline::TrkHitReco ) cet_build_plugin(StrawRecoFromFragments art::module REG_SOURCE src/StrawRecoFromFragments_module.cc LIBRARIES REG - offline::DAQ + Offline::DAQ - offline::DataProducts - offline::RecoDataProducts + Offline::DataProducts + Offline::RecoDataProducts ) install_source(SUBDIRS src) diff --git a/DAQConditions/CMakeLists.txt b/DAQConditions/CMakeLists.txt index 1af890d361..200d81aa9a 100644 --- a/DAQConditions/CMakeLists.txt +++ b/DAQConditions/CMakeLists.txt @@ -4,10 +4,10 @@ cet_make_library( src/EventTimingMaker.cc LIBRARIES PUBLIC - offline::DAQConfig - offline::DataProducts - offline::Mu2eInterfaces - offline::TrackerGeom + Offline::DAQConfig + Offline::DataProducts + Offline::Mu2eInterfaces + Offline::TrackerGeom ) install_source(SUBDIRS src) diff --git a/DataProducts/CMakeLists.txt b/DataProducts/CMakeLists.txt index 1eb6d7f0f2..2e959a67e7 100644 --- a/DataProducts/CMakeLists.txt +++ b/DataProducts/CMakeLists.txt @@ -15,14 +15,14 @@ cet_make_library( src/VirtualDetectorId.cc LIBRARIES PUBLIC ROOT::MathMore - offline::GeneralUtilities + Offline::GeneralUtilities ) art_dictionary( NO_CHECK_CLASS_VERSION # For some reason this segfaults CLASSES_DEF_XML ${CMAKE_CURRENT_SOURCE_DIR}/src/classes_def.xml CLASSES_H ${CMAKE_CURRENT_SOURCE_DIR}/src/classes.h DICTIONARY_LIBRARIES - offline::DataProducts + Offline::DataProducts ) install_source(SUBDIRS src) install_headers(SUBDIRS inc) diff --git a/DbService/CMakeLists.txt b/DbService/CMakeLists.txt index d34a6f7a27..24cf183c1a 100644 --- a/DbService/CMakeLists.txt +++ b/DbService/CMakeLists.txt @@ -10,15 +10,15 @@ cet_make_library( LIBRARIES PUBLIC PostgreSQL::PostgreSQL CURL::libcurl - offline::ConfigTools - offline::DbTables - offline::GeneralUtilities + Offline::ConfigTools + Offline::DbTables + Offline::GeneralUtilities ) cet_make_exec(NAME dbTool SOURCE src/dbTool_main.cc LIBRARIES - offline::DbService + Offline::DbService ) @@ -26,25 +26,25 @@ cet_make_exec(NAME epicsTool SOURCE src/epicsTool_main.cc LIBRARIES Boost::program_options - offline::DbService + Offline::DbService ) cet_build_plugin(DbService art::service REG_SOURCE src/DbService_service.cc LIBRARIES REG - offline::DbService + Offline::DbService - offline::ConfigTools - offline::DbTables + Offline::ConfigTools + Offline::DbTables ) cet_build_plugin(DbServiceTest art::module REG_SOURCE src/DbServiceTest_module.cc LIBRARIES REG - offline::DbService + Offline::DbService - offline::DbTables + Offline::DbTables ) install_source(SUBDIRS src) diff --git a/DbTables/CMakeLists.txt b/DbTables/CMakeLists.txt index 3b68b462f2..494e40c016 100644 --- a/DbTables/CMakeLists.txt +++ b/DbTables/CMakeLists.txt @@ -9,8 +9,8 @@ cet_make_library( src/DbValCache.cc LIBRARIES PUBLIC - offline::DataProducts - offline::GeneralUtilities + Offline::DataProducts + Offline::GeneralUtilities ) install_source(SUBDIRS src) diff --git a/DetectorSolenoidGeom/CMakeLists.txt b/DetectorSolenoidGeom/CMakeLists.txt index 092eaaf578..e426968eb5 100644 --- a/DetectorSolenoidGeom/CMakeLists.txt +++ b/DetectorSolenoidGeom/CMakeLists.txt @@ -3,8 +3,8 @@ cet_make_library( src/DetectorSolenoid.cc LIBRARIES PUBLIC - offline::GeomPrimitives - offline::Mu2eInterfaces + Offline::GeomPrimitives + Offline::Mu2eInterfaces ) install_source(SUBDIRS src) diff --git a/EventDisplay/CMakeLists.txt b/EventDisplay/CMakeLists.txt index bb83716912..265c05b0f4 100644 --- a/EventDisplay/CMakeLists.txt +++ b/EventDisplay/CMakeLists.txt @@ -6,21 +6,21 @@ cet_make_library( src/TrackColorSelector.cc LIBRARIES PUBLIC - offline::BTrkData - offline::CalorimeterGeom - offline::ConfigTools - offline::CosmicRayShieldGeom - offline::CRVConditions - offline::DataProducts - offline::DetectorSolenoidGeom - offline::GeometryService - offline::GlobalConstantsService - offline::MCDataProducts - offline::Mu2eUtilities - offline::RecoDataProducts - offline::StoppingTargetGeom - offline::TrackerGeom - offline::TrkReco + Offline::BTrkData + Offline::CalorimeterGeom + Offline::ConfigTools + Offline::CosmicRayShieldGeom + Offline::CRVConditions + Offline::DataProducts + Offline::DetectorSolenoidGeom + Offline::GeometryService + Offline::GlobalConstantsService + Offline::MCDataProducts + Offline::Mu2eUtilities + Offline::RecoDataProducts + Offline::StoppingTargetGeom + Offline::TrackerGeom + Offline::TrkReco ROOT::Gui ROOT::Geom ROOT::Cling @@ -30,20 +30,20 @@ cet_build_plugin(EventDisplay art::module REG_SOURCE src/EventDisplay_module.cc LIBRARIES REG art_root_io::TFileService_service - offline::EventDisplay - offline::EventDisplay_dict + Offline::EventDisplay + Offline::EventDisplay_dict - offline::CRVConditions - offline::MCDataProducts - offline::ProditionsService - offline::RecoDataProducts + Offline::CRVConditions + Offline::MCDataProducts + Offline::ProditionsService + Offline::RecoDataProducts ) art_dictionary( NO_CHECK_CLASS_VERSION # For some reason this segfaults CLASSES_DEF_XML ${CMAKE_CURRENT_SOURCE_DIR}/src/classes_def.xml CLASSES_H ${CMAKE_CURRENT_SOURCE_DIR}/src/classes.h DICTIONARY_LIBRARIES - offline::EventDisplay + Offline::EventDisplay ) install_source(SUBDIRS src) install_fhicl(SUBDIRS fcl SUBDIRNAME EventDisplay) diff --git a/EventGenerator/CMakeLists.txt b/EventGenerator/CMakeLists.txt index ef4ce50002..77030f176d 100644 --- a/EventGenerator/CMakeLists.txt +++ b/EventGenerator/CMakeLists.txt @@ -13,554 +13,554 @@ cet_make_library( LIBRARIES PUBLIC art_root_io::tfile_support - offline::CalorimeterGeom - offline::ConditionsService - offline::ConfigTools - offline::DataProducts - offline::ExtinctionMonitorFNAL_Geometry - offline::GeneralUtilities - offline::GeometryService - offline::GlobalConstantsService - offline::MCDataProducts - offline::Mu2eUtilities - offline::ProductionTargetGeom - offline::SeedService - offline::StoppingTargetGeom + Offline::CalorimeterGeom + Offline::ConditionsService + Offline::ConfigTools + Offline::DataProducts + Offline::ExtinctionMonitorFNAL_Geometry + Offline::GeneralUtilities + Offline::GeometryService + Offline::GlobalConstantsService + Offline::MCDataProducts + Offline::Mu2eUtilities + Offline::ProductionTargetGeom + Offline::SeedService + Offline::StoppingTargetGeom CRY ) cet_build_plugin(AntiProtonGun art::module REG_SOURCE src/AntiProtonGun_module.cc LIBRARIES REG - offline::EventGenerator + Offline::EventGenerator - offline::ConfigTools - offline::DataProducts - offline::GeometryService - offline::GlobalConstantsService - offline::MCDataProducts - offline::Mu2eUtilities - offline::ProductionTargetGeom - offline::SeedService_SeedService_service + Offline::ConfigTools + Offline::DataProducts + Offline::GeometryService + Offline::GlobalConstantsService + Offline::MCDataProducts + Offline::Mu2eUtilities + Offline::ProductionTargetGeom + Offline::SeedService_SeedService_service ) cet_build_plugin(CaloCalibGun art::module REG_SOURCE src/CaloCalibGun_module.cc LIBRARIES REG - offline::EventGenerator + Offline::EventGenerator - offline::CalorimeterGeom - offline::DataProducts - offline::GeometryService - offline::MCDataProducts - offline::Mu2eUtilities - offline::SeedService_SeedService_service + Offline::CalorimeterGeom + Offline::DataProducts + Offline::GeometryService + Offline::MCDataProducts + Offline::Mu2eUtilities + Offline::SeedService_SeedService_service ) cet_build_plugin(CaloTBGun art::module REG_SOURCE src/CaloTBGun_module.cc LIBRARIES REG - offline::EventGenerator + Offline::EventGenerator - offline::CalorimeterGeom - offline::ConfigTools - offline::DataProducts - offline::GeometryService - offline::GlobalConstantsService - offline::MCDataProducts - offline::SeedService_SeedService_service + Offline::CalorimeterGeom + Offline::ConfigTools + Offline::DataProducts + Offline::GeometryService + Offline::GlobalConstantsService + Offline::MCDataProducts + Offline::SeedService_SeedService_service ) cet_build_plugin(CeEndpoint art::module REG_SOURCE src/CeEndpoint_module.cc LIBRARIES REG - offline::EventGenerator + Offline::EventGenerator - offline::DataProducts - offline::GlobalConstantsService - offline::MCDataProducts - offline::Mu2eUtilities - offline::SeedService_SeedService_service + Offline::DataProducts + Offline::GlobalConstantsService + Offline::MCDataProducts + Offline::Mu2eUtilities + Offline::SeedService_SeedService_service ) cet_build_plugin(CORSIKAEventGenerator art::module REG_SOURCE src/CORSIKAEventGenerator_module.cc LIBRARIES REG - offline::EventGenerator + Offline::EventGenerator - offline::CalorimeterGeom - offline::ConfigTools - offline::ExtinctionMonitorFNAL_Geometry - offline::GeneralUtilities - offline::GeometryService - offline::MCDataProducts - offline::Mu2eUtilities - offline::SeedService_SeedService_service + Offline::CalorimeterGeom + Offline::ConfigTools + Offline::ExtinctionMonitorFNAL_Geometry + Offline::GeneralUtilities + Offline::GeometryService + Offline::MCDataProducts + Offline::Mu2eUtilities + Offline::SeedService_SeedService_service ) cet_build_plugin(CRYEventGenerator art::module REG_SOURCE src/CRYEventGenerator_module.cc LIBRARIES REG - offline::EventGenerator + Offline::EventGenerator - offline::ConfigTools - offline::MCDataProducts - offline::SeedService_SeedService_service + Offline::ConfigTools + Offline::MCDataProducts + Offline::SeedService_SeedService_service ) cet_build_plugin(CryResampler art::module REG_SOURCE src/CryResampler_module.cc LIBRARIES REG - offline::EventGenerator + Offline::EventGenerator - offline::ConfigTools - offline::GeneralUtilities - offline::GlobalConstantsService - offline::MCDataProducts - offline::SeedService_SeedService_service + Offline::ConfigTools + Offline::GeneralUtilities + Offline::GlobalConstantsService + Offline::MCDataProducts + Offline::SeedService_SeedService_service ) cet_build_plugin(DecayInOrbitWeight art::module REG_SOURCE src/DecayInOrbitWeight_module.cc LIBRARIES REG - offline::EventGenerator + Offline::EventGenerator - offline::ConfigTools - offline::MCDataProducts - offline::Mu2eUtilities - offline::SeedService_SeedService_service + Offline::ConfigTools + Offline::MCDataProducts + Offline::Mu2eUtilities + Offline::SeedService_SeedService_service ) cet_build_plugin(EplusFromStoppedPion art::module REG_SOURCE src/EplusFromStoppedPion_module.cc LIBRARIES REG - offline::EventGenerator + Offline::EventGenerator - offline::GeneralUtilities - offline::GlobalConstantsService - offline::MCDataProducts - offline::Mu2eUtilities - offline::SeedService_SeedService_service + Offline::GeneralUtilities + Offline::GlobalConstantsService + Offline::MCDataProducts + Offline::Mu2eUtilities + Offline::SeedService_SeedService_service ) cet_build_plugin(EventGenerator art::module REG_SOURCE src/EventGenerator_module.cc LIBRARIES REG - offline::EventGenerator + Offline::EventGenerator - offline::ConfigTools - offline::MCDataProducts - offline::SeedService_SeedService_service + Offline::ConfigTools + Offline::MCDataProducts + Offline::SeedService_SeedService_service ) cet_build_plugin(ExtMonFNALBoxGenerator art::module REG_SOURCE src/ExtMonFNALBoxGenerator_module.cc LIBRARIES REG - offline::EventGenerator + Offline::EventGenerator - offline::ConditionsService - offline::ConfigTools - offline::DataProducts - offline::ExtinctionMonitorFNAL_Geometry - offline::GeometryService - offline::GlobalConstantsService - offline::MCDataProducts - offline::SeedService_SeedService_service + Offline::ConditionsService + Offline::ConfigTools + Offline::DataProducts + Offline::ExtinctionMonitorFNAL_Geometry + Offline::GeometryService + Offline::GlobalConstantsService + Offline::MCDataProducts + Offline::SeedService_SeedService_service ) cet_build_plugin(ExtMonFNALGun art::module REG_SOURCE src/ExtMonFNALGun_module.cc LIBRARIES REG - offline::EventGenerator + Offline::EventGenerator - offline::MCDataProducts - offline::SeedService_SeedService_service + Offline::MCDataProducts + Offline::SeedService_SeedService_service ) cet_build_plugin(ExtMonFNALRoomGenerator art::module REG_SOURCE src/ExtMonFNALRoomGenerator_module.cc LIBRARIES REG - offline::EventGenerator + Offline::EventGenerator - offline::ConfigTools - offline::DataProducts - offline::ExtinctionMonitorFNAL_Geometry - offline::ExtinctionMonitorFNAL_Utilities - offline::GeometryService - offline::GlobalConstantsService - offline::MCDataProducts - offline::ProtonBeamDumpGeom - offline::SeedService_SeedService_service + Offline::ConfigTools + Offline::DataProducts + Offline::ExtinctionMonitorFNAL_Geometry + Offline::ExtinctionMonitorFNAL_Utilities + Offline::GeometryService + Offline::GlobalConstantsService + Offline::MCDataProducts + Offline::ProtonBeamDumpGeom + Offline::SeedService_SeedService_service ) cet_build_plugin(FlatMuonDaughterGenerator art::module REG_SOURCE src/FlatMuonDaughterGenerator_module.cc LIBRARIES REG - offline::EventGenerator + Offline::EventGenerator - offline::DataProducts - offline::GlobalConstantsService - offline::MCDataProducts - offline::Mu2eUtilities - offline::SeedService_SeedService_service + Offline::DataProducts + Offline::GlobalConstantsService + Offline::MCDataProducts + Offline::Mu2eUtilities + Offline::SeedService_SeedService_service ) cet_build_plugin(FromAsciiMomentumAndPosition art::module REG_SOURCE src/FromAsciiMomentumAndPosition_module.cc LIBRARIES REG - offline::EventGenerator + Offline::EventGenerator - offline::ConditionsService - offline::ConfigTools - offline::DataProducts - offline::GeneralUtilities - offline::GeometryService - offline::GlobalConstantsService - offline::MCDataProducts - offline::Mu2eUtilities - offline::ProductionTargetGeom - offline::SeedService_SeedService_service + Offline::ConditionsService + Offline::ConfigTools + Offline::DataProducts + Offline::GeneralUtilities + Offline::GeometryService + Offline::GlobalConstantsService + Offline::MCDataProducts + Offline::Mu2eUtilities + Offline::ProductionTargetGeom + Offline::SeedService_SeedService_service ) cet_build_plugin(FromSimParticleCompact art::module REG_SOURCE src/FromSimParticleCompact_module.cc LIBRARIES REG - offline::EventGenerator + Offline::EventGenerator - offline::ConfigTools - offline::DataProducts - offline::GeometryService - offline::GlobalConstantsService - offline::MCDataProducts - offline::Mu2eUtilities - offline::ProductionTargetGeom - offline::SeedService_SeedService_service + Offline::ConfigTools + Offline::DataProducts + Offline::GeometryService + Offline::GlobalConstantsService + Offline::MCDataProducts + Offline::Mu2eUtilities + Offline::ProductionTargetGeom + Offline::SeedService_SeedService_service ) cet_build_plugin(FromStepPointMCs art::module REG_SOURCE src/FromStepPointMCs_module.cc LIBRARIES REG - offline::EventGenerator + Offline::EventGenerator - offline::GlobalConstantsService - offline::MCDataProducts + Offline::GlobalConstantsService + Offline::MCDataProducts ) cet_build_plugin(FromStepPointMCsRotateTarget art::module REG_SOURCE src/FromStepPointMCsRotateTarget_module.cc LIBRARIES REG - offline::EventGenerator + Offline::EventGenerator - offline::GeometryService - offline::GlobalConstantsService - offline::MCDataProducts - offline::ProductionTargetGeom - offline::SeedService_SeedService_service + Offline::GeometryService + Offline::GlobalConstantsService + Offline::MCDataProducts + Offline::ProductionTargetGeom + Offline::SeedService_SeedService_service ) cet_build_plugin(G4BeamlineGenerator art::module REG_SOURCE src/G4BeamlineGenerator_module.cc LIBRARIES REG - offline::EventGenerator + Offline::EventGenerator - offline::ConfigTools - offline::MCDataProducts - offline::SeedService_SeedService_service + Offline::ConfigTools + Offline::MCDataProducts + Offline::SeedService_SeedService_service ) cet_build_plugin(GeneratorPlots art::module REG_SOURCE src/GeneratorPlots_module.cc LIBRARIES REG - offline::EventGenerator + Offline::EventGenerator - offline::DataProducts - offline::GeneralUtilities - offline::MCDataProducts + Offline::DataProducts + Offline::GeneralUtilities + Offline::MCDataProducts ) cet_build_plugin(GenEventCounter art::module REG_SOURCE src/GenEventCounter_module.cc LIBRARIES REG - offline::EventGenerator + Offline::EventGenerator - offline::MCDataProducts + Offline::MCDataProducts ) cet_build_plugin(InFlightParticleSampler art::module REG_SOURCE src/InFlightParticleSampler_module.cc LIBRARIES REG - offline::EventGenerator + Offline::EventGenerator - offline::GeneralUtilities - offline::GlobalConstantsService - offline::MCDataProducts - offline::Mu2eUtilities - offline::SeedService_SeedService_service + Offline::GeneralUtilities + Offline::GlobalConstantsService + Offline::MCDataProducts + Offline::Mu2eUtilities + Offline::SeedService_SeedService_service ) cet_build_plugin(LeadingLog art::module REG_SOURCE src/LeadingLog_module.cc LIBRARIES REG - offline::EventGenerator + Offline::EventGenerator - offline::DataProducts - offline::GlobalConstantsService - offline::MCDataProducts - offline::Mu2eUtilities - offline::SeedService_SeedService_service + Offline::DataProducts + Offline::GlobalConstantsService + Offline::MCDataProducts + Offline::Mu2eUtilities + Offline::SeedService_SeedService_service ) cet_build_plugin(MuStopProductsGun art::module REG_SOURCE src/MuStopProductsGun_module.cc LIBRARIES REG - offline::EventGenerator + Offline::EventGenerator - offline::ConfigTools - offline::DataProducts - offline::GeneralUtilities - offline::GlobalConstantsService - offline::MCDataProducts - offline::Mu2eUtilities - offline::SeedService_SeedService_service + Offline::ConfigTools + Offline::DataProducts + Offline::GeneralUtilities + Offline::GlobalConstantsService + Offline::MCDataProducts + Offline::Mu2eUtilities + Offline::SeedService_SeedService_service ) cet_build_plugin(PBIWeight art::module REG_SOURCE src/PBIWeight_module.cc LIBRARIES REG - offline::EventGenerator + Offline::EventGenerator - offline::MCDataProducts + Offline::MCDataProducts ) cet_build_plugin(Pileup art::module REG_SOURCE src/Pileup_module.cc LIBRARIES REG - offline::EventGenerator + Offline::EventGenerator - offline::DataProducts - offline::GlobalConstantsService - offline::MCDataProducts - offline::Mu2eUtilities - offline::SeedService_SeedService_service + Offline::DataProducts + Offline::GlobalConstantsService + Offline::MCDataProducts + Offline::Mu2eUtilities + Offline::SeedService_SeedService_service ) cet_build_plugin(PrimaryAntiProtonGun art::module REG_SOURCE src/PrimaryAntiProtonGun_module.cc LIBRARIES REG - offline::EventGenerator + Offline::EventGenerator - offline::ConditionsService - offline::ConfigTools - offline::DataProducts - offline::GeneralUtilities - offline::GeometryService - offline::GlobalConstantsService - offline::MCDataProducts - offline::Mu2eUtilities - offline::ProductionTargetGeom - offline::SeedService_SeedService_service + Offline::ConditionsService + Offline::ConfigTools + Offline::DataProducts + Offline::GeneralUtilities + Offline::GeometryService + Offline::GlobalConstantsService + Offline::MCDataProducts + Offline::Mu2eUtilities + Offline::ProductionTargetGeom + Offline::SeedService_SeedService_service ) cet_build_plugin(PrimaryProtonGun art::module REG_SOURCE src/PrimaryProtonGun_module.cc LIBRARIES REG - offline::EventGenerator + Offline::EventGenerator - offline::MCDataProducts - offline::SeedService_SeedService_service + Offline::MCDataProducts + Offline::SeedService_SeedService_service ) cet_build_plugin(RanTest art::module REG_SOURCE src/RanTest_module.cc LIBRARIES REG - offline::EventGenerator + Offline::EventGenerator - offline::MCDataProducts - offline::SeedService_SeedService_service + Offline::MCDataProducts + Offline::SeedService_SeedService_service ) cet_build_plugin(RMCGun art::module REG_SOURCE src/RMCGun_module.cc LIBRARIES REG - offline::EventGenerator + Offline::EventGenerator - offline::ConfigTools - offline::DataProducts - offline::GeneralUtilities - offline::GlobalConstantsService - offline::MCDataProducts - offline::Mu2eUtilities - offline::SeedService_SeedService_service + Offline::ConfigTools + Offline::DataProducts + Offline::GeneralUtilities + Offline::GlobalConstantsService + Offline::MCDataProducts + Offline::Mu2eUtilities + Offline::SeedService_SeedService_service ) cet_build_plugin(RPCGun art::module REG_SOURCE src/RPCGun_module.cc LIBRARIES REG - offline::EventGenerator + Offline::EventGenerator - offline::DataProducts - offline::GlobalConstantsService - offline::MCDataProducts - offline::Mu2eUtilities - offline::SeedService_SeedService_service + Offline::DataProducts + Offline::GlobalConstantsService + Offline::MCDataProducts + Offline::Mu2eUtilities + Offline::SeedService_SeedService_service ) cet_build_plugin(SingleProcessGenerator art::module REG_SOURCE src/SingleProcessGenerator_module.cc LIBRARIES REG - offline::EventGenerator + Offline::EventGenerator - offline::DataProducts - offline::GlobalConstantsService - offline::MCDataProducts - offline::Mu2eUtilities - offline::SeedService_SeedService_service + Offline::DataProducts + Offline::GlobalConstantsService + Offline::MCDataProducts + Offline::Mu2eUtilities + Offline::SeedService_SeedService_service ) cet_build_plugin(StoppedMuonRMCGun art::module REG_SOURCE src/StoppedMuonRMCGun_module.cc LIBRARIES REG - offline::EventGenerator + Offline::EventGenerator - offline::ConfigTools - offline::DataProducts - offline::GeneralUtilities - offline::GlobalConstantsService - offline::MCDataProducts - offline::Mu2eUtilities - offline::SeedService_SeedService_service + Offline::ConfigTools + Offline::DataProducts + Offline::GeneralUtilities + Offline::GlobalConstantsService + Offline::MCDataProducts + Offline::Mu2eUtilities + Offline::SeedService_SeedService_service ) cet_build_plugin(StoppedMuonXRayGammaRayGun art::module REG_SOURCE src/StoppedMuonXRayGammaRayGun_module.cc LIBRARIES REG - offline::EventGenerator + Offline::EventGenerator - offline::ConfigTools - offline::DataProducts - offline::GeneralUtilities - offline::GeometryService - offline::MCDataProducts - offline::Mu2eUtilities - offline::SeedService_SeedService_service - offline::StoppingTargetGeom + Offline::ConfigTools + Offline::DataProducts + Offline::GeneralUtilities + Offline::GeometryService + Offline::MCDataProducts + Offline::Mu2eUtilities + Offline::SeedService_SeedService_service + Offline::StoppingTargetGeom ) cet_build_plugin(StoppedMuplusDecayGun art::module REG_SOURCE src/StoppedMuplusDecayGun_module.cc LIBRARIES REG - offline::EventGenerator + Offline::EventGenerator - offline::DataProducts - offline::GeneralUtilities - offline::GlobalConstantsService - offline::MCDataProducts - offline::Mu2eUtilities - offline::SeedService_SeedService_service + Offline::DataProducts + Offline::GeneralUtilities + Offline::GlobalConstantsService + Offline::MCDataProducts + Offline::Mu2eUtilities + Offline::SeedService_SeedService_service ) cet_build_plugin(StoppedParticleG4Gun art::module REG_SOURCE src/StoppedParticleG4Gun_module.cc LIBRARIES REG - offline::EventGenerator + Offline::EventGenerator - offline::DataProducts - offline::GeneralUtilities - offline::GlobalConstantsService - offline::MCDataProducts - offline::Mu2eUtilities - offline::SeedService_SeedService_service + Offline::DataProducts + Offline::GeneralUtilities + Offline::GlobalConstantsService + Offline::MCDataProducts + Offline::Mu2eUtilities + Offline::SeedService_SeedService_service ) cet_build_plugin(StoppedParticleReactionGun art::module REG_SOURCE src/StoppedParticleReactionGun_module.cc LIBRARIES REG - offline::EventGenerator + Offline::EventGenerator - offline::ConfigTools - offline::DataProducts - offline::GeneralUtilities - offline::GlobalConstantsService - offline::MCDataProducts - offline::Mu2eUtilities - offline::SeedService_SeedService_service + Offline::ConfigTools + Offline::DataProducts + Offline::GeneralUtilities + Offline::GlobalConstantsService + Offline::MCDataProducts + Offline::Mu2eUtilities + Offline::SeedService_SeedService_service ) cet_build_plugin(DIOGenerator art::tool REG_SOURCE src/DIOGenerator_tool.cc LIBRARIES REG - offline::EventGenerator + Offline::EventGenerator - offline::DataProducts - offline::GlobalConstantsService - offline::MCDataProducts - offline::Mu2eUtilities + Offline::DataProducts + Offline::GlobalConstantsService + Offline::MCDataProducts + Offline::Mu2eUtilities ) cet_build_plugin(MuCap1809keVGammaGenerator art::tool REG_SOURCE src/MuCap1809keVGammaGenerator_tool.cc LIBRARIES REG - offline::EventGenerator + Offline::EventGenerator - offline::DataProducts - offline::GlobalConstantsService - offline::MCDataProducts - offline::Mu2eUtilities + Offline::DataProducts + Offline::GlobalConstantsService + Offline::MCDataProducts + Offline::Mu2eUtilities ) cet_build_plugin(MuCapDeuteronGenerator art::tool REG_SOURCE src/MuCapDeuteronGenerator_tool.cc LIBRARIES REG - offline::EventGenerator + Offline::EventGenerator - offline::DataProducts - offline::GlobalConstantsService - offline::MCDataProducts - offline::Mu2eUtilities + Offline::DataProducts + Offline::GlobalConstantsService + Offline::MCDataProducts + Offline::Mu2eUtilities ) cet_build_plugin(MuCapNeutronGenerator art::tool REG_SOURCE src/MuCapNeutronGenerator_tool.cc LIBRARIES REG - offline::EventGenerator + Offline::EventGenerator - offline::DataProducts - offline::GlobalConstantsService - offline::MCDataProducts - offline::Mu2eUtilities + Offline::DataProducts + Offline::GlobalConstantsService + Offline::MCDataProducts + Offline::Mu2eUtilities ) cet_build_plugin(MuCapPhotonGenerator art::tool REG_SOURCE src/MuCapPhotonGenerator_tool.cc LIBRARIES REG - offline::EventGenerator + Offline::EventGenerator - offline::DataProducts - offline::GlobalConstantsService - offline::MCDataProducts - offline::Mu2eUtilities + Offline::DataProducts + Offline::GlobalConstantsService + Offline::MCDataProducts + Offline::Mu2eUtilities ) cet_build_plugin(MuCapProtonGenerator art::tool REG_SOURCE src/MuCapProtonGenerator_tool.cc LIBRARIES REG - offline::EventGenerator + Offline::EventGenerator - offline::DataProducts - offline::GlobalConstantsService - offline::MCDataProducts - offline::Mu2eUtilities + Offline::DataProducts + Offline::GlobalConstantsService + Offline::MCDataProducts + Offline::Mu2eUtilities ) cet_build_plugin(MuplusMichelGenerator art::tool REG_SOURCE src/MuplusMichelGenerator_tool.cc LIBRARIES REG - offline::EventGenerator + Offline::EventGenerator - offline::DataProducts - offline::GlobalConstantsService - offline::MCDataProducts - offline::Mu2eUtilities + Offline::DataProducts + Offline::GlobalConstantsService + Offline::MCDataProducts + Offline::Mu2eUtilities ) install_source(SUBDIRS src) diff --git a/EventMixing/CMakeLists.txt b/EventMixing/CMakeLists.txt index 7491528545..5c75e7defe 100644 --- a/EventMixing/CMakeLists.txt +++ b/EventMixing/CMakeLists.txt @@ -3,7 +3,7 @@ cet_make_library( src/Mu2eProductMixer.cc LIBRARIES PUBLIC - offline::MCDataProducts + Offline::MCDataProducts ) cet_build_plugin(MixBackgroundFrames art::module @@ -11,33 +11,33 @@ cet_build_plugin(MixBackgroundFrames art::module LIBRARIES REG art::Framework_IO_ProductMix art_root_io::art_root_io - offline::EventMixing + Offline::EventMixing - offline::MCDataProducts - offline::Mu2eUtilities - offline::ProditionsService - offline::SeedService_SeedService_service - offline::SimulationConditions + Offline::MCDataProducts + Offline::Mu2eUtilities + Offline::ProditionsService + Offline::SeedService_SeedService_service + Offline::SimulationConditions ) cet_build_plugin(ProtonBunchIntensityFlat art::module REG_SOURCE src/ProtonBunchIntensityFlat_module.cc LIBRARIES REG - offline::EventMixing + Offline::EventMixing - offline::MCDataProducts - offline::Mu2eUtilities - offline::SeedService_SeedService_service + Offline::MCDataProducts + Offline::Mu2eUtilities + Offline::SeedService_SeedService_service ) cet_build_plugin(ProtonBunchIntensityLogNormal art::module REG_SOURCE src/ProtonBunchIntensityLogNormal_module.cc LIBRARIES REG - offline::EventMixing + Offline::EventMixing - offline::MCDataProducts - offline::Mu2eUtilities - offline::SeedService_SeedService_service + Offline::MCDataProducts + Offline::Mu2eUtilities + Offline::SeedService_SeedService_service ) cet_build_plugin(ResamplingMixer art::module @@ -45,10 +45,10 @@ cet_build_plugin(ResamplingMixer art::module LIBRARIES REG art::Framework_IO_ProductMix art_root_io::art_root_io - offline::EventMixing + Offline::EventMixing - offline::Mu2eUtilities - offline::SeedService_SeedService_service + Offline::Mu2eUtilities + Offline::SeedService_SeedService_service ) install_source(SUBDIRS src) diff --git a/ExternalShieldingGeom/CMakeLists.txt b/ExternalShieldingGeom/CMakeLists.txt index 7a56909c5f..075b7f8ee5 100644 --- a/ExternalShieldingGeom/CMakeLists.txt +++ b/ExternalShieldingGeom/CMakeLists.txt @@ -5,7 +5,7 @@ cet_make_library( src/Saddle.cc LIBRARIES PUBLIC - offline::Mu2eInterfaces + Offline::Mu2eInterfaces ) install_source(SUBDIRS src) diff --git a/ExtinctionMonitorFNAL/Analyses/CMakeLists.txt b/ExtinctionMonitorFNAL/Analyses/CMakeLists.txt index b85e38b4d5..b495be6f2d 100644 --- a/ExtinctionMonitorFNAL/Analyses/CMakeLists.txt +++ b/ExtinctionMonitorFNAL/Analyses/CMakeLists.txt @@ -7,10 +7,10 @@ cet_make_library( src/EMFSimHitHistograms.cc LIBRARIES PUBLIC - offline::ConditionsService - offline::DataProducts - offline::MCDataProducts - offline::RecoDataProducts + Offline::ConditionsService + Offline::DataProducts + Offline::MCDataProducts + Offline::RecoDataProducts art_root_io::TFileService_service ROOT::Hist ) @@ -19,168 +19,168 @@ cet_build_plugin(EMFBoxFluxAnalyzer art::module REG_SOURCE src/EMFBoxFluxAnalyzer_module.cc LIBRARIES REG art_root_io::TFileService_service - offline::ConfigTools - offline::DataProducts - offline::ExtinctionMonitorFNAL_Utilities - offline::GeneralUtilities - offline::GeometryService - offline::GlobalConstantsService - offline::MCDataProducts + Offline::ConfigTools + Offline::DataProducts + Offline::ExtinctionMonitorFNAL_Utilities + Offline::GeneralUtilities + Offline::GeometryService + Offline::GlobalConstantsService + Offline::MCDataProducts ROOT::Tree ) cet_build_plugin(EMFBoxMuonAnalyzer art::module REG_SOURCE src/EMFBoxMuonAnalyzer_module.cc LIBRARIES REG - offline::ExtinctionMonitorFNAL_Analyses + Offline::ExtinctionMonitorFNAL_Analyses ROOT::Tree - offline::GeometryService - offline::MCDataProducts + Offline::GeometryService + Offline::MCDataProducts ) cet_build_plugin(EMFDetHistPatRec art::module REG_SOURCE src/EMFDetHistPatRec_module.cc LIBRARIES REG - offline::ExtinctionMonitorFNAL_Analyses - offline::GeometryService - offline::RecoDataProducts + Offline::ExtinctionMonitorFNAL_Analyses + Offline::GeometryService + Offline::RecoDataProducts ) cet_build_plugin(EMFDetHistRawHits art::module REG_SOURCE src/EMFDetHistRawHits_module.cc LIBRARIES REG - offline::ExtinctionMonitorFNAL_Analyses - offline::GeometryService - offline::RecoDataProducts + Offline::ExtinctionMonitorFNAL_Analyses + Offline::GeometryService + Offline::RecoDataProducts ) cet_build_plugin(EMFDetHistRecoClusters art::module REG_SOURCE src/EMFDetHistRecoClusters_module.cc LIBRARIES REG - offline::ExtinctionMonitorFNAL_Analyses - offline::GeometryService - offline::RecoDataProducts + Offline::ExtinctionMonitorFNAL_Analyses + Offline::GeometryService + Offline::RecoDataProducts ) cet_build_plugin(EMFDetHistSimHits art::module REG_SOURCE src/EMFDetHistSimHits_module.cc LIBRARIES REG - offline::ExtinctionMonitorFNAL_Analyses - offline::GeometryService - offline::MCDataProducts + Offline::ExtinctionMonitorFNAL_Analyses + Offline::GeometryService + Offline::MCDataProducts ) cet_build_plugin(EMFDetMCHistPatRec art::module REG_SOURCE src/EMFDetMCHistPatRec_module.cc LIBRARIES REG - offline::ExtinctionMonitorFNAL_Analyses - offline::ExtinctionMonitorFNAL_Reconstruction - offline::GeometryService - offline::MCDataProducts - offline::RecoDataProducts + Offline::ExtinctionMonitorFNAL_Analyses + Offline::ExtinctionMonitorFNAL_Reconstruction + Offline::GeometryService + Offline::MCDataProducts + Offline::RecoDataProducts ) cet_build_plugin(EMFDetPrintRawClusters art::module REG_SOURCE src/EMFDetPrintRawClusters_module.cc LIBRARIES REG - offline::ExtinctionMonitorFNAL_Analyses + Offline::ExtinctionMonitorFNAL_Analyses - offline::RecoDataProducts + Offline::RecoDataProducts ) cet_build_plugin(EMFDetPrintRawHits art::module REG_SOURCE src/EMFDetPrintRawHits_module.cc LIBRARIES REG - offline::ExtinctionMonitorFNAL_Analyses + Offline::ExtinctionMonitorFNAL_Analyses - offline::RecoDataProducts + Offline::RecoDataProducts ) cet_build_plugin(EMFDetPrintRawHitTruth art::module REG_SOURCE src/EMFDetPrintRawHitTruth_module.cc LIBRARIES REG - offline::ExtinctionMonitorFNAL_Analyses - offline::GeometryService - offline::MCDataProducts - offline::RecoDataProducts + Offline::ExtinctionMonitorFNAL_Analyses + Offline::GeometryService + Offline::MCDataProducts + Offline::RecoDataProducts ) cet_build_plugin(EMFDetPrintRecoClusters art::module REG_SOURCE src/EMFDetPrintRecoClusters_module.cc LIBRARIES REG - offline::ExtinctionMonitorFNAL_Analyses + Offline::ExtinctionMonitorFNAL_Analyses - offline::RecoDataProducts + Offline::RecoDataProducts ) cet_build_plugin(EMFDetPrintRecoClusterTruth art::module REG_SOURCE src/EMFDetPrintRecoClusterTruth_module.cc LIBRARIES REG - offline::ExtinctionMonitorFNAL_Analyses + Offline::ExtinctionMonitorFNAL_Analyses - offline::MCDataProducts - offline::RecoDataProducts + Offline::MCDataProducts + Offline::RecoDataProducts ) cet_build_plugin(EMFDetPrintSim art::module REG_SOURCE src/EMFDetPrintSim_module.cc LIBRARIES REG - offline::ExtinctionMonitorFNAL_Analyses + Offline::ExtinctionMonitorFNAL_Analyses - offline::MCDataProducts + Offline::MCDataProducts ) cet_build_plugin(EMFDigiTuning art::module REG_SOURCE src/EMFDigiTuning_module.cc LIBRARIES REG - offline::ExtinctionMonitorFNAL_Analyses - offline::GeometryService - offline::RecoDataProducts + Offline::ExtinctionMonitorFNAL_Analyses + Offline::GeometryService + Offline::RecoDataProducts ) cet_build_plugin(EMFRawHitsValidator art::module REG_SOURCE src/EMFRawHitsValidator_module.cc LIBRARIES REG - offline::ExtinctionMonitorFNAL_Analyses - offline::GeometryService - offline::RecoDataProducts + Offline::ExtinctionMonitorFNAL_Analyses + Offline::GeometryService + Offline::RecoDataProducts ) cet_build_plugin(EMFRoomFluxAnalyzer art::module REG_SOURCE src/EMFRoomFluxAnalyzer_module.cc LIBRARIES REG - offline::ExtinctionMonitorFNAL_Analyses - offline::ExtinctionMonitorFNAL_Utilities + Offline::ExtinctionMonitorFNAL_Analyses + Offline::ExtinctionMonitorFNAL_Utilities - offline::ConfigTools - offline::DataProducts - offline::GeneralUtilities - offline::GeometryService - offline::GlobalConstantsService - offline::MCDataProducts - offline::ProtonBeamDumpGeom + Offline::ConfigTools + Offline::DataProducts + Offline::GeneralUtilities + Offline::GeometryService + Offline::GlobalConstantsService + Offline::MCDataProducts + Offline::ProtonBeamDumpGeom ) cet_build_plugin(MARSGenParticleDumper art::module REG_SOURCE src/MARSGenParticleDumper_module.cc LIBRARIES REG - offline::ExtinctionMonitorFNAL_Analyses - offline::ExtinctionMonitorFNAL_Utilities - offline::GeometryService - offline::GlobalConstantsService - offline::MCDataProducts - offline::ProtonBeamDumpGeom + Offline::ExtinctionMonitorFNAL_Analyses + Offline::ExtinctionMonitorFNAL_Utilities + Offline::GeometryService + Offline::GlobalConstantsService + Offline::MCDataProducts + Offline::ProtonBeamDumpGeom ) cet_build_plugin(MARSGenParticleHist art::module REG_SOURCE src/MARSGenParticleHist_module.cc LIBRARIES REG - offline::ExtinctionMonitorFNAL_Analyses - offline::ExtinctionMonitorFNAL_Utilities + Offline::ExtinctionMonitorFNAL_Analyses + Offline::ExtinctionMonitorFNAL_Utilities - offline::GeometryService - offline::MCDataProducts - offline::ProtonBeamDumpGeom + Offline::GeometryService + Offline::MCDataProducts + Offline::ProtonBeamDumpGeom ) install_source(SUBDIRS src) diff --git a/ExtinctionMonitorFNAL/ComponentTests/CMakeLists.txt b/ExtinctionMonitorFNAL/ComponentTests/CMakeLists.txt index fbad3ed485..0fe3d0dec0 100644 --- a/ExtinctionMonitorFNAL/ComponentTests/CMakeLists.txt +++ b/ExtinctionMonitorFNAL/ComponentTests/CMakeLists.txt @@ -1,25 +1,25 @@ #cet_build_plugin(PixelIdConverterTest art::module # REG_SOURCE src/PixelIdConverterTest_module.cc # LIBRARIES REG -# offline::DataProducts -# offline::GeometryService -# offline::SeedService_SeedService_service +# Offline::DataProducts +# Offline::GeometryService +# Offline::SeedService_SeedService_service #) #cet_build_plugin(TrackExtrapolatorTest2 art::module # REG_SOURCE src/TrackExtrapolatorTest2_module.cc # LIBRARIES REG -# offline::GeometryService -# offline::MCDataProducts -# offline::RecoDataProducts +# Offline::GeometryService +# Offline::MCDataProducts +# Offline::RecoDataProducts # art_root_io::TFileService_service #) #cet_build_plugin(TrackExtrapolatorTest art::module # REG_SOURCE src/TrackExtrapolatorTest_module.cc # LIBRARIES REG -# offline::GeometryService -# offline::RecoDataProducts +# Offline::GeometryService +# Offline::RecoDataProducts #) install_source(SUBDIRS src) diff --git a/ExtinctionMonitorFNAL/Digitization/CMakeLists.txt b/ExtinctionMonitorFNAL/Digitization/CMakeLists.txt index 1c44194e2f..ee00a9a3ba 100644 --- a/ExtinctionMonitorFNAL/Digitization/CMakeLists.txt +++ b/ExtinctionMonitorFNAL/Digitization/CMakeLists.txt @@ -6,25 +6,25 @@ cet_make_library( src/SiliconProperties.cc LIBRARIES PUBLIC - offline::ConditionsService - offline::DataProducts - offline::GeometryService - offline::MCDataProducts - offline::Mu2eUtilities - offline::RecoDataProducts + Offline::ConditionsService + Offline::DataProducts + Offline::GeometryService + Offline::MCDataProducts + Offline::Mu2eUtilities + Offline::RecoDataProducts ) cet_build_plugin(ExtMonFNALHitMaker art::module REG_SOURCE src/ExtMonFNALHitMaker_module.cc LIBRARIES REG - offline::ExtinctionMonitorFNAL_Digitization + Offline::ExtinctionMonitorFNAL_Digitization - offline::ConditionsService - offline::GeometryService - offline::GlobalConstantsService - offline::MCDataProducts - offline::RecoDataProducts - offline::SeedService_SeedService_service + Offline::ConditionsService + Offline::GeometryService + Offline::GlobalConstantsService + Offline::MCDataProducts + Offline::RecoDataProducts + Offline::SeedService_SeedService_service ) install_source(SUBDIRS src) diff --git a/ExtinctionMonitorFNAL/Geometry/CMakeLists.txt b/ExtinctionMonitorFNAL/Geometry/CMakeLists.txt index 77c722511b..09c72bd7a9 100644 --- a/ExtinctionMonitorFNAL/Geometry/CMakeLists.txt +++ b/ExtinctionMonitorFNAL/Geometry/CMakeLists.txt @@ -13,8 +13,8 @@ cet_make_library( src/PixelNeighbors.cc LIBRARIES PUBLIC - offline::DataProducts - offline::Mu2eInterfaces + Offline::DataProducts + Offline::Mu2eInterfaces ) install_source(SUBDIRS src) diff --git a/ExtinctionMonitorFNAL/Reconstruction/CMakeLists.txt b/ExtinctionMonitorFNAL/Reconstruction/CMakeLists.txt index 04b7a246b6..79bff5f865 100644 --- a/ExtinctionMonitorFNAL/Reconstruction/CMakeLists.txt +++ b/ExtinctionMonitorFNAL/Reconstruction/CMakeLists.txt @@ -6,42 +6,42 @@ cet_make_library( src/PixelRecoUtils.cc src/TrackExtrapolator.cc LIBRARIES PUBLIC - offline::RecoDataProducts + Offline::RecoDataProducts ) cet_build_plugin(EMFPatRecFromTracklets art::module REG_SOURCE src/EMFPatRecFromTracklets_module.cc LIBRARIES REG art_root_io::TFileService_service - offline::ExtinctionMonitorFNAL_Reconstruction - offline::GeometryService - offline::RecoDataProducts + Offline::ExtinctionMonitorFNAL_Reconstruction + Offline::GeometryService + Offline::RecoDataProducts ) cet_build_plugin(EMFTrackClusterArbiter art::module REG_SOURCE src/EMFTrackClusterArbiter_module.cc LIBRARIES REG art_root_io::TFileService_service - offline::ExtinctionMonitorFNAL_Reconstruction + Offline::ExtinctionMonitorFNAL_Reconstruction - offline::RecoDataProducts + Offline::RecoDataProducts ) cet_build_plugin(ExtMonFNALRawClusterization art::module REG_SOURCE src/ExtMonFNALRawClusterization_module.cc LIBRARIES REG art_root_io::TFileService_service - offline::ExtinctionMonitorFNAL_Reconstruction - offline::GeometryService - offline::RecoDataProducts + Offline::ExtinctionMonitorFNAL_Reconstruction + Offline::GeometryService + Offline::RecoDataProducts ) cet_build_plugin(ExtMonFNALRecoClusterization art::module REG_SOURCE src/ExtMonFNALRecoClusterization_module.cc LIBRARIES REG - offline::ExtinctionMonitorFNAL_Reconstruction - offline::GeometryService - offline::RecoDataProducts + Offline::ExtinctionMonitorFNAL_Reconstruction + Offline::GeometryService + Offline::RecoDataProducts ) install_source(SUBDIRS src) diff --git a/ExtinctionMonitorFNAL/TruthAlgs/CMakeLists.txt b/ExtinctionMonitorFNAL/TruthAlgs/CMakeLists.txt index eac7c4a1d2..b83074ec75 100644 --- a/ExtinctionMonitorFNAL/TruthAlgs/CMakeLists.txt +++ b/ExtinctionMonitorFNAL/TruthAlgs/CMakeLists.txt @@ -2,24 +2,24 @@ cet_build_plugin(PatRecTruthMaker art::module REG_SOURCE src/PatRecTruthMaker_module.cc LIBRARIES REG - offline::MCDataProducts - offline::RecoDataProducts + Offline::MCDataProducts + Offline::RecoDataProducts ) cet_build_plugin(RecoClusterTruthMaker art::module REG_SOURCE src/RecoClusterTruthMaker_module.cc LIBRARIES REG - offline::MCDataProducts - offline::RecoDataProducts + Offline::MCDataProducts + Offline::RecoDataProducts ) cet_build_plugin(SimParticleMARSAssnsMaker art::module REG_SOURCE src/SimParticleMARSAssnsMaker_module.cc LIBRARIES REG - offline::MCDataProducts - offline::Mu2eUtilities + Offline::MCDataProducts + Offline::Mu2eUtilities ) install_source(SUBDIRS src) diff --git a/ExtinctionMonitorFNAL/Utilities/CMakeLists.txt b/ExtinctionMonitorFNAL/Utilities/CMakeLists.txt index 96eb96cd4b..783bffe8a2 100644 --- a/ExtinctionMonitorFNAL/Utilities/CMakeLists.txt +++ b/ExtinctionMonitorFNAL/Utilities/CMakeLists.txt @@ -5,10 +5,10 @@ cet_make_library( src/getCharge.cc LIBRARIES PUBLIC - offline::DataProducts - offline::GlobalConstantsService - offline::MCDataProducts - offline::ProtonBeamDumpGeom + Offline::DataProducts + Offline::GlobalConstantsService + Offline::MCDataProducts + Offline::ProtonBeamDumpGeom ) install_source(SUBDIRS src) diff --git a/Filters/CMakeLists.txt b/Filters/CMakeLists.txt index 3d939d0344..40fdaca5fb 100644 --- a/Filters/CMakeLists.txt +++ b/Filters/CMakeLists.txt @@ -1,191 +1,191 @@ cet_build_plugin(BunchIntensityFilter art::module REG_SOURCE src/BunchIntensityFilter_module.cc LIBRARIES REG - offline::BFieldGeom - offline::GeometryService - offline::MCDataProducts - offline::RecoDataProducts + Offline::BFieldGeom + Offline::GeometryService + Offline::MCDataProducts + Offline::RecoDataProducts ) cet_build_plugin(CaloShowerSimFilter art::module REG_SOURCE src/CaloShowerSimFilter_module.cc LIBRARIES REG art_root_io::TFileService_service - offline::MCDataProducts + Offline::MCDataProducts ) cet_build_plugin(ChooseTrackFilter art::module REG_SOURCE src/ChooseTrackFilter_module.cc LIBRARIES REG art_root_io::TFileService_service - offline::CalorimeterGeom - offline::DataProducts - offline::GeometryService - offline::MCDataProducts - offline::RecoDataProducts + Offline::CalorimeterGeom + Offline::DataProducts + Offline::GeometryService + Offline::MCDataProducts + Offline::RecoDataProducts ) cet_build_plugin(CompressPhysicalVolumes art::module REG_SOURCE src/CompressPhysicalVolumes_module.cc LIBRARIES REG - offline::MCDataProducts - offline::Mu2eUtilities + Offline::MCDataProducts + Offline::Mu2eUtilities ) cet_build_plugin(CompressStepPointMCs art::module REG_SOURCE src/CompressStepPointMCs_module.cc LIBRARIES REG - offline::ConditionsService - offline::MCDataProducts - offline::Mu2eUtilities + Offline::ConditionsService + Offline::MCDataProducts + Offline::Mu2eUtilities ) cet_build_plugin(CosmicMixingFilter art::module REG_SOURCE src/CosmicMixingFilter_module.cc LIBRARIES REG - offline::BFieldGeom - offline::ConditionsService - offline::DataProducts - offline::GeometryService - offline::GlobalConstantsService - offline::MCDataProducts - offline::RecoDataProducts - offline::TrkReco + Offline::BFieldGeom + Offline::ConditionsService + Offline::DataProducts + Offline::GeometryService + Offline::GlobalConstantsService + Offline::MCDataProducts + Offline::RecoDataProducts + Offline::TrkReco ) cet_build_plugin(DetectorStepFilter art::module REG_SOURCE src/DetectorStepFilter_module.cc LIBRARIES REG - offline::ConditionsService - offline::DataProducts - offline::MCDataProducts + Offline::ConditionsService + Offline::DataProducts + Offline::MCDataProducts ) cet_build_plugin(EMFBoxHitsFilter art::module REG_SOURCE src/EMFBoxHitsFilter_module.cc LIBRARIES REG - offline::DataProducts - offline::ExtinctionMonitorFNAL_Geometry - offline::GeometryService - offline::MCDataProducts - offline::Mu2eUtilities - offline::RecoDataProducts + Offline::DataProducts + Offline::ExtinctionMonitorFNAL_Geometry + Offline::GeometryService + Offline::MCDataProducts + Offline::Mu2eUtilities + Offline::RecoDataProducts ) cet_build_plugin(EMFPixelHitsFilter art::module REG_SOURCE src/EMFPixelHitsFilter_module.cc LIBRARIES REG - offline::MCDataProducts - offline::Mu2eUtilities - offline::RecoDataProducts + Offline::MCDataProducts + Offline::Mu2eUtilities + Offline::RecoDataProducts ) cet_build_plugin(EMFPixelSimFilter art::module REG_SOURCE src/EMFPixelSimFilter_module.cc LIBRARIES REG - offline::MCDataProducts - offline::Mu2eUtilities + Offline::MCDataProducts + Offline::Mu2eUtilities ) cet_build_plugin(FilterCosmicsStage1 art::module REG_SOURCE src/FilterCosmicsStage1_module.cc LIBRARIES REG - offline::MCDataProducts + Offline::MCDataProducts ) cet_build_plugin(FilterG4Out art::module REG_SOURCE src/FilterG4Out_module.cc LIBRARIES REG - offline::MCDataProducts - offline::Mu2eUtilities + Offline::MCDataProducts + Offline::Mu2eUtilities ) cet_build_plugin(FilterStatusG4 art::module REG_SOURCE src/FilterStatusG4_module.cc LIBRARIES REG - offline::MCDataProducts + Offline::MCDataProducts ) cet_build_plugin(FilterStepPointAngleVsTarget art::module REG_SOURCE src/FilterStepPointAngleVsTarget_module.cc LIBRARIES REG - offline::DataProducts - offline::MCDataProducts + Offline::DataProducts + Offline::MCDataProducts ) cet_build_plugin(FilterStepPointKinEnPDG art::module REG_SOURCE src/FilterStepPointKinEnPDG_module.cc LIBRARIES REG - offline::GlobalConstantsService - offline::MCDataProducts + Offline::GlobalConstantsService + Offline::MCDataProducts ) cet_build_plugin(FilterStepPointMomentum art::module REG_SOURCE src/FilterStepPointMomentum_module.cc LIBRARIES REG - offline::MCDataProducts + Offline::MCDataProducts ) cet_build_plugin(FilterStepPointPDG art::module REG_SOURCE src/FilterStepPointPDG_module.cc LIBRARIES REG - offline::DataProducts - offline::MCDataProducts + Offline::DataProducts + Offline::MCDataProducts ) cet_build_plugin(FilterStepPointPositionMomentum art::module REG_SOURCE src/FilterStepPointPositionMomentum_module.cc LIBRARIES REG - offline::DataProducts - offline::MCDataProducts + Offline::DataProducts + Offline::MCDataProducts ) cet_build_plugin(FilterStepPointPzVsTarget art::module REG_SOURCE src/FilterStepPointPzVsTarget_module.cc LIBRARIES REG - offline::DataProducts - offline::MCDataProducts + Offline::DataProducts + Offline::MCDataProducts ) cet_build_plugin(FilterStepPointReflection art::module REG_SOURCE src/FilterStepPointReflection_module.cc LIBRARIES REG - offline::DataProducts - offline::GeometryService - offline::MCDataProducts + Offline::DataProducts + Offline::GeometryService + Offline::MCDataProducts ) cet_build_plugin(GenParticleMomFilter art::module REG_SOURCE src/GenParticleMomFilter_module.cc LIBRARIES REG - offline::DataProducts - offline::MCDataProducts + Offline::DataProducts + Offline::MCDataProducts ) cet_build_plugin(KilledEventFilter art::module REG_SOURCE src/KilledEventFilter_module.cc LIBRARIES REG art_root_io::TFileService_service - offline::MCDataProducts + Offline::MCDataProducts ) cet_build_plugin(ParticleCodeFilter art::module REG_SOURCE src/ParticleCodeFilter_module.cc LIBRARIES REG - offline::DataProducts - offline::MCDataProducts + Offline::DataProducts + Offline::MCDataProducts ) cet_build_plugin(RandomPrescaleFilter art::module REG_SOURCE src/RandomPrescaleFilter_module.cc LIBRARIES REG - offline::SeedService_SeedService_service + Offline::SeedService_SeedService_service ) cet_build_plugin(RecoMomFilter art::module REG_SOURCE src/RecoMomFilter_module.cc LIBRARIES REG - offline::RecoDataProducts + Offline::RecoDataProducts ) cet_build_plugin(SelectEvents art::module @@ -197,85 +197,85 @@ cet_build_plugin(SelectEvents art::module cet_build_plugin(SelectStepPointsByTime art::module REG_SOURCE src/SelectStepPointsByTime_module.cc LIBRARIES REG - offline::MCDataProducts + Offline::MCDataProducts ) cet_build_plugin(StepPointFilter art::module REG_SOURCE src/StepPointFilter_module.cc LIBRARIES REG - offline::MCDataProducts + Offline::MCDataProducts ) cet_build_plugin(StepPointMCCollectionUpdater art::module REG_SOURCE src/StepPointMCCollectionUpdater_module.cc LIBRARIES REG - offline::MCDataProducts + Offline::MCDataProducts ) cet_build_plugin(StepPointsInDigis art::module REG_SOURCE src/StepPointsInDigis_module.cc LIBRARIES REG art_root_io::TFileService_service - offline::MCDataProducts + Offline::MCDataProducts ) cet_build_plugin(StrawDigiMCFilter art::module REG_SOURCE src/StrawDigiMCFilter_module.cc LIBRARIES REG art_root_io::TFileService_service - offline::MCDataProducts + Offline::MCDataProducts ) cet_build_plugin(TrackerStepPointFilter art::module REG_SOURCE src/TrackerStepPointFilter_module.cc LIBRARIES REG - offline::MCDataProducts + Offline::MCDataProducts ) cet_build_plugin(TrackSummaryTruthUpdater art::module REG_SOURCE src/TrackSummaryTruthUpdater_module.cc LIBRARIES REG - offline::MCDataProducts + Offline::MCDataProducts ) cet_build_plugin(TriggerResultsFilter art::module REG_SOURCE src/TriggerResultsFilter_module.cc LIBRARIES REG - offline::Mu2eUtilities + Offline::Mu2eUtilities ) cet_build_plugin(TrkPatRecFilter art::module REG_SOURCE src/TrkPatRecFilter_module.cc LIBRARIES REG - offline::MCDataProducts - offline::RecoDataProducts + Offline::MCDataProducts + Offline::RecoDataProducts ) cet_build_plugin(TrkQualFilter art::module REG_SOURCE src/TrkQualFilter_module.cc LIBRARIES REG - offline::AnalysisConditions - offline::Mu2eUtilities - offline::ProditionsService - offline::RecoDataProducts + Offline::AnalysisConditions + Offline::Mu2eUtilities + Offline::ProditionsService + Offline::RecoDataProducts ) cet_build_plugin(VetoIncorrectHits art::module REG_SOURCE src/VetoIncorrectHits_module.cc LIBRARIES REG - offline::CosmicRayShieldGeom - offline::GeometryService - offline::MCDataProducts - offline::Mu2eUtilities - offline::TrackerGeom + Offline::CosmicRayShieldGeom + Offline::GeometryService + Offline::MCDataProducts + Offline::Mu2eUtilities + Offline::TrackerGeom ) cet_build_plugin(WeightSamplingFilter art::module REG_SOURCE src/WeightSamplingFilter_module.cc LIBRARIES REG - offline::DataProducts - offline::MCDataProducts - offline::SeedService_SeedService_service + Offline::DataProducts + Offline::MCDataProducts + Offline::SeedService_SeedService_service ) install_source(SUBDIRS src) diff --git a/GeneralUtilities/CMakeLists.txt b/GeneralUtilities/CMakeLists.txt index 63acf7b4f6..b9c9e3adc9 100644 --- a/GeneralUtilities/CMakeLists.txt +++ b/GeneralUtilities/CMakeLists.txt @@ -41,7 +41,7 @@ cet_make_library( cet_make_exec(NAME TwoDPointTest SOURCE src/TwoDPointTest_main.cc LIBRARIES - offline::GeneralUtilities + Offline::GeneralUtilities ) diff --git a/GeometryService/CMakeLists.txt b/GeometryService/CMakeLists.txt index bb1a7c865b..3c0758c8bd 100644 --- a/GeometryService/CMakeLists.txt +++ b/GeometryService/CMakeLists.txt @@ -41,57 +41,57 @@ cet_make_library( src/WorldG4Maker.cc LIBRARIES PUBLIC Boost::iostreams - offline::BeamlineGeom - offline::BFieldGeom - offline::CalorimeterGeom - offline::ConfigTools - offline::CosmicRayShieldGeom - offline::DataProducts - offline::DetectorSolenoidGeom - offline::ExternalShieldingGeom - offline::ExtinctionMonitorFNAL_Geometry - offline::GeneralUtilities - offline::GeomPrimitives - offline::GlobalConstantsService - offline::MBSGeom - offline::MECOStyleProtonAbsorberGeom - offline::Mu2eHallGeom - offline::Mu2eInterfaces - offline::ProductionSolenoidGeom - offline::ProductionTargetGeom - offline::ProtonBeamDumpGeom - offline::PTMGeom - offline::ServicesGeom - offline::STMGeom - offline::StoppingTargetGeom - offline::TrackerGeom + Offline::BeamlineGeom + Offline::BFieldGeom + Offline::CalorimeterGeom + Offline::ConfigTools + Offline::CosmicRayShieldGeom + Offline::DataProducts + Offline::DetectorSolenoidGeom + Offline::ExternalShieldingGeom + Offline::ExtinctionMonitorFNAL_Geometry + Offline::GeneralUtilities + Offline::GeomPrimitives + Offline::GlobalConstantsService + Offline::MBSGeom + Offline::MECOStyleProtonAbsorberGeom + Offline::Mu2eHallGeom + Offline::Mu2eInterfaces + Offline::ProductionSolenoidGeom + Offline::ProductionTargetGeom + Offline::ProtonBeamDumpGeom + Offline::PTMGeom + Offline::ServicesGeom + Offline::STMGeom + Offline::StoppingTargetGeom + Offline::TrackerGeom ) cet_build_plugin(GeometryService art::service REG_SOURCE src/GeometryService_service.cc IMPL_SOURCE src/GeometryService_service.cc LIBRARIES PUBLIC - offline::GeometryService + Offline::GeometryService - offline::BeamlineGeom - offline::BFieldGeom - offline::CalorimeterGeom - offline::ConfigTools - offline::CosmicRayShieldGeom - offline::DetectorSolenoidGeom - offline::ExternalShieldingGeom - offline::ExtinctionMonitorFNAL_Geometry - offline::MBSGeom - offline::MECOStyleProtonAbsorberGeom - offline::Mu2eHallGeom - offline::ProductionSolenoidGeom - offline::ProductionTargetGeom - offline::ProtonBeamDumpGeom - offline::PTMGeom - offline::ServicesGeom - offline::STMGeom - offline::StoppingTargetGeom - offline::TrackerGeom + Offline::BeamlineGeom + Offline::BFieldGeom + Offline::CalorimeterGeom + Offline::ConfigTools + Offline::CosmicRayShieldGeom + Offline::DetectorSolenoidGeom + Offline::ExternalShieldingGeom + Offline::ExtinctionMonitorFNAL_Geometry + Offline::MBSGeom + Offline::MECOStyleProtonAbsorberGeom + Offline::Mu2eHallGeom + Offline::ProductionSolenoidGeom + Offline::ProductionTargetGeom + Offline::ProtonBeamDumpGeom + Offline::PTMGeom + Offline::ServicesGeom + Offline::STMGeom + Offline::StoppingTargetGeom + Offline::TrackerGeom ) install_source(SUBDIRS src) diff --git a/GlobalConstantsService/CMakeLists.txt b/GlobalConstantsService/CMakeLists.txt index fc13b8e9a7..42e919d6fc 100644 --- a/GlobalConstantsService/CMakeLists.txt +++ b/GlobalConstantsService/CMakeLists.txt @@ -8,15 +8,15 @@ cet_make_library( src/unknownPDGIdName.cc LIBRARIES PUBLIC art::Framework_Core - offline::ConfigTools - offline::DataProducts - offline::Mu2eInterfaces + Offline::ConfigTools + Offline::DataProducts + Offline::Mu2eInterfaces ) cet_build_plugin(GlobalConstantsService art::service REG_SOURCE src/GlobalConstantsService_service.cc LIBRARIES REG - offline::GlobalConstantsService + Offline::GlobalConstantsService ) diff --git a/HelloWorld/CMakeLists.txt b/HelloWorld/CMakeLists.txt index dc98903580..30d7eff719 100644 --- a/HelloWorld/CMakeLists.txt +++ b/HelloWorld/CMakeLists.txt @@ -2,7 +2,7 @@ cet_build_plugin(HelloProducer art::module REG_SOURCE src/HelloProducer_module.cc LIBRARIES REG - offline::MCDataProducts + Offline::MCDataProducts ) cet_build_plugin(HelloWorld2 art::module diff --git a/KinKalGeom/CMakeLists.txt b/KinKalGeom/CMakeLists.txt index ad82cc0821..268bbc1fd3 100644 --- a/KinKalGeom/CMakeLists.txt +++ b/KinKalGeom/CMakeLists.txt @@ -8,7 +8,7 @@ cet_make_library( src/Tracker.cc LIBRARIES PUBLIC KinKal_Geometry - offline::GeneralUtilities + Offline::GeneralUtilities ) install_source(SUBDIRS src) diff --git a/MBSGeom/CMakeLists.txt b/MBSGeom/CMakeLists.txt index 03a5672432..9e0dea82d4 100644 --- a/MBSGeom/CMakeLists.txt +++ b/MBSGeom/CMakeLists.txt @@ -3,8 +3,8 @@ cet_make_library(INTERFACE inc/MBS.hh LIBRARIES INTERFACE - offline::GeomPrimitives - offline::Mu2eInterfaces + Offline::GeomPrimitives + Offline::Mu2eInterfaces ) install_source(SUBDIRS src) diff --git a/MCDataProducts/CMakeLists.txt b/MCDataProducts/CMakeLists.txt index dfc407d88e..7743d9ab39 100644 --- a/MCDataProducts/CMakeLists.txt +++ b/MCDataProducts/CMakeLists.txt @@ -22,15 +22,15 @@ cet_make_library( src/TrackSummaryTruthAssns.cc LIBRARIES PUBLIC - offline::DataProducts - offline::RecoDataProducts + Offline::DataProducts + Offline::RecoDataProducts ) art_dictionary( NO_CHECK_CLASS_VERSION # For some reason this segfaults CLASSES_DEF_XML ${CMAKE_CURRENT_SOURCE_DIR}/src/classes_def.xml CLASSES_H ${CMAKE_CURRENT_SOURCE_DIR}/src/classes.h DICTIONARY_LIBRARIES - offline::MCDataProducts + Offline::MCDataProducts ) install_source(SUBDIRS src) install_headers(SUBDIRS inc) diff --git a/MECOStyleProtonAbsorberGeom/CMakeLists.txt b/MECOStyleProtonAbsorberGeom/CMakeLists.txt index 51cc0f4ad2..9f00a65903 100644 --- a/MECOStyleProtonAbsorberGeom/CMakeLists.txt +++ b/MECOStyleProtonAbsorberGeom/CMakeLists.txt @@ -3,8 +3,8 @@ cet_make_library( src/MECOStyleProtonAbsorber.cc LIBRARIES PUBLIC - offline::GeomPrimitives - offline::Mu2eInterfaces + Offline::GeomPrimitives + Offline::Mu2eInterfaces ) install_source(SUBDIRS src) diff --git a/Mu2eBTrk/CMakeLists.txt b/Mu2eBTrk/CMakeLists.txt index dd1808404f..0f3878f1ee 100644 --- a/Mu2eBTrk/CMakeLists.txt +++ b/Mu2eBTrk/CMakeLists.txt @@ -5,12 +5,12 @@ cet_make_library( src/ParticleInfo.cc LIBRARIES PUBLIC - offline::BFieldGeom - offline::ConfigTools - offline::DataProducts - offline::GeometryService - offline::GlobalConstantsService - offline::TrackerGeom + Offline::BFieldGeom + Offline::ConfigTools + Offline::DataProducts + Offline::GeometryService + Offline::GlobalConstantsService + Offline::TrackerGeom BTrk_BaBar BTrk_BbrGeom BTrk_BField diff --git a/Mu2eG4/CMakeLists.txt b/Mu2eG4/CMakeLists.txt index 51e25157e0..826ccea09b 100644 --- a/Mu2eG4/CMakeLists.txt +++ b/Mu2eG4/CMakeLists.txt @@ -121,34 +121,34 @@ cet_make_library( src/writePhysicalVolumes.cc LIBRARIES PUBLIC - offline::BeamlineGeom - offline::BFieldGeom - offline::CalorimeterGeom - offline::ConfigTools - offline::CosmicRayShieldGeom - offline::DataProducts - offline::DetectorSolenoidGeom - offline::ExternalShieldingGeom - offline::ExtinctionMonitorFNAL_Geometry - offline::GeneralUtilities - offline::GeometryService - offline::GeomPrimitives - offline::GlobalConstantsService - offline::MBSGeom - offline::MCDataProducts - offline::MECOStyleProtonAbsorberGeom - offline::Mu2eG4Helper_Mu2eG4Helper_service - offline::Mu2eHallGeom - offline::Mu2eUtilities - offline::ProductionSolenoidGeom - offline::ProductionTargetGeom - offline::ProtonBeamDumpGeom - offline::PTMGeom - offline::SeedService_SeedService_service - offline::ServicesGeom - offline::STMGeom - offline::StoppingTargetGeom - offline::TrackerGeom + Offline::BeamlineGeom + Offline::BFieldGeom + Offline::CalorimeterGeom + Offline::ConfigTools + Offline::CosmicRayShieldGeom + Offline::DataProducts + Offline::DetectorSolenoidGeom + Offline::ExternalShieldingGeom + Offline::ExtinctionMonitorFNAL_Geometry + Offline::GeneralUtilities + Offline::GeometryService + Offline::GeomPrimitives + Offline::GlobalConstantsService + Offline::MBSGeom + Offline::MCDataProducts + Offline::MECOStyleProtonAbsorberGeom + Offline::Mu2eG4Helper_Mu2eG4Helper_service + Offline::Mu2eHallGeom + Offline::Mu2eUtilities + Offline::ProductionSolenoidGeom + Offline::ProductionTargetGeom + Offline::ProtonBeamDumpGeom + Offline::PTMGeom + Offline::SeedService_SeedService_service + Offline::ServicesGeom + Offline::STMGeom + Offline::StoppingTargetGeom + Offline::TrackerGeom Geant4::G4global Geant4::G4digits_hits Geant4::G4processes @@ -161,79 +161,79 @@ cet_make_library( cet_build_plugin(IonProducer art::module REG_SOURCE src/IonProducer_module.cc LIBRARIES REG - offline::Mu2eG4 + Offline::Mu2eG4 - offline::DataProducts - offline::MCDataProducts + Offline::DataProducts + Offline::MCDataProducts ) cet_build_plugin(Mu2eG4 art::module REG_SOURCE src/Mu2eG4_module.cc LIBRARIES REG - offline::Mu2eG4 + Offline::Mu2eG4 - offline::ConfigTools - offline::GeometryService_GeometryService_service - offline::MCDataProducts - offline::Mu2eHallGeom - offline::SeedService + Offline::ConfigTools + Offline::GeometryService_GeometryService_service + Offline::MCDataProducts + Offline::Mu2eHallGeom + Offline::SeedService Geant4::G4interfaces ) cet_build_plugin(Mu2eG4MT art::module REG_SOURCE src/Mu2eG4MT_module.cc LIBRARIES REG - offline::Mu2eG4 + Offline::Mu2eG4 - offline::ConfigTools - offline::GeometryService_GeometryService_service - offline::MCDataProducts - offline::Mu2eHallGeom + Offline::ConfigTools + Offline::GeometryService_GeometryService_service + Offline::MCDataProducts + Offline::Mu2eHallGeom ) cet_build_plugin(ConstructEnvBox art::tool REG_SOURCE src/ConstructEnvBox_tool.cc LIBRARIES REG - offline::Mu2eG4 + Offline::Mu2eG4 - offline::ConfigTools - offline::Mu2eG4Helper + Offline::ConfigTools + Offline::Mu2eG4Helper ) cet_build_plugin(ConstructEnvCalo01 art::tool REG_SOURCE src/ConstructEnvCalo01_tool.cc LIBRARIES REG - offline::Mu2eG4 + Offline::Mu2eG4 - offline::ConfigTools - offline::Mu2eG4Helper + Offline::ConfigTools + Offline::Mu2eG4Helper ) cet_build_plugin(ConstructEnvMuCapture art::tool REG_SOURCE src/ConstructEnvMuCapture_tool.cc LIBRARIES REG - offline::Mu2eG4 + Offline::Mu2eG4 - offline::ConfigTools - offline::Mu2eG4Helper + Offline::ConfigTools + Offline::Mu2eG4Helper ) cet_build_plugin(ConstructEnvNBoxes art::tool REG_SOURCE src/ConstructEnvNBoxes_tool.cc LIBRARIES REG - offline::Mu2eG4 + Offline::Mu2eG4 - offline::ConfigTools - offline::Mu2eG4Helper + Offline::ConfigTools + Offline::Mu2eG4Helper ) cet_build_plugin(ConstructEnvTube art::tool REG_SOURCE src/ConstructEnvTube_tool.cc LIBRARIES REG - offline::Mu2eG4 + Offline::Mu2eG4 - offline::ConfigTools - offline::Mu2eG4Helper + Offline::ConfigTools + Offline::Mu2eG4Helper ) install_source(SUBDIRS src) diff --git a/Mu2eG4Helper/CMakeLists.txt b/Mu2eG4Helper/CMakeLists.txt index 22c9ad7cae..a77f7c0261 100644 --- a/Mu2eG4Helper/CMakeLists.txt +++ b/Mu2eG4Helper/CMakeLists.txt @@ -4,14 +4,14 @@ cet_make_library( src/VolumeInfo.cc LIBRARIES PUBLIC - offline::GeometryService + Offline::GeometryService ) cet_build_plugin(Mu2eG4Helper art::service REG_SOURCE src/Mu2eG4Helper_service.cc IMPL_SOURCE src/Mu2eG4Helper_service.cc LIBRARIES PUBLIC - offline::Mu2eG4Helper + Offline::Mu2eG4Helper ) diff --git a/Mu2eHallGeom/CMakeLists.txt b/Mu2eHallGeom/CMakeLists.txt index f971b1b49b..aac57e88a5 100644 --- a/Mu2eHallGeom/CMakeLists.txt +++ b/Mu2eHallGeom/CMakeLists.txt @@ -3,8 +3,8 @@ cet_make_library( src/Mu2eHall.cc LIBRARIES PUBLIC - offline::GeomPrimitives - offline::Mu2eInterfaces + Offline::GeomPrimitives + Offline::Mu2eInterfaces ) install_source(SUBDIRS src) diff --git a/Mu2eInterfaces/CMakeLists.txt b/Mu2eInterfaces/CMakeLists.txt index 4c9eebc507..548bd8089a 100644 --- a/Mu2eInterfaces/CMakeLists.txt +++ b/Mu2eInterfaces/CMakeLists.txt @@ -4,7 +4,7 @@ cet_make_library( src/Detector.cc LIBRARIES PUBLIC - offline::DbTables + Offline::DbTables ) install_source(SUBDIRS src) diff --git a/Mu2eKinKal/CMakeLists.txt b/Mu2eKinKal/CMakeLists.txt index 6213c495d1..bc6e4d2cd4 100644 --- a/Mu2eKinKal/CMakeLists.txt +++ b/Mu2eKinKal/CMakeLists.txt @@ -23,15 +23,15 @@ cet_make_library( KinKal_General KinKal_MatEnv KinKal_Trajectory - offline::BFieldGeom - offline::CalorimeterGeom - offline::ConfigTools - offline::DataProducts - offline::GeneralUtilities - offline::GeometryService - offline::KinKalGeom - offline::TrackerConditions - offline::TrackerGeom + Offline::BFieldGeom + Offline::CalorimeterGeom + Offline::ConfigTools + Offline::DataProducts + Offline::GeneralUtilities + Offline::GeometryService + Offline::KinKalGeom + Offline::TrackerConditions + Offline::TrackerGeom ROOT::ROOTTMVASofie ROOT::TMVA ) @@ -39,44 +39,44 @@ cet_make_library( cet_build_plugin(CentralHelixFit art::module REG_SOURCE src/CentralHelixFit_module.cc LIBRARIES REG - offline::Mu2eKinKal + Offline::Mu2eKinKal - offline::GeneralUtilities - offline::TrkReco + Offline::GeneralUtilities + Offline::TrkReco ) cet_build_plugin(CosmicTrackSeedFilter art::module REG_SOURCE src/CosmicTrackSeedFilter_module.cc LIBRARIES REG - offline::Mu2eKinKal + Offline::Mu2eKinKal - offline::RecoDataProducts + Offline::RecoDataProducts ) cet_build_plugin(KinematicLineFit art::module REG_SOURCE src/KinematicLineFit_module.cc LIBRARIES REG - offline::Mu2eKinKal + Offline::Mu2eKinKal - offline::BFieldGeom - offline::CalorimeterGeom - offline::DataProducts - offline::GeneralUtilities - offline::GeometryService - offline::GlobalConstantsService - offline::Mu2eUtilities - offline::ProditionsService - offline::RecoDataProducts - offline::TrackerConditions - offline::TrackerGeom - offline::TrkReco + Offline::BFieldGeom + Offline::CalorimeterGeom + Offline::DataProducts + Offline::GeneralUtilities + Offline::GeometryService + Offline::GlobalConstantsService + Offline::Mu2eUtilities + Offline::ProditionsService + Offline::RecoDataProducts + Offline::TrackerConditions + Offline::TrackerGeom + Offline::TrkReco ) cet_build_plugin(LoopHelixFit art::module REG_SOURCE src/LoopHelixFit_module.cc LIBRARIES REG - offline::Mu2eKinKal - offline::TrkReco + Offline::Mu2eKinKal + Offline::TrkReco ) diff --git a/Mu2eUtilities/CMakeLists.txt b/Mu2eUtilities/CMakeLists.txt index 16113746be..db13feee85 100644 --- a/Mu2eUtilities/CMakeLists.txt +++ b/Mu2eUtilities/CMakeLists.txt @@ -54,20 +54,20 @@ cet_make_library( src/VectorVolume.cc LIBRARIES PUBLIC art_root_io::tfile_support - offline::BFieldGeom - offline::ConditionsService - offline::ConfigTools - offline::DataProducts - offline::GeneralUtilities - offline::GeometryService - offline::GeomPrimitives - offline::GlobalConstantsService - offline::MCDataProducts - offline::RecoDataProducts - offline::SeedService - offline::STMConditions - offline::StoppingTargetGeom - offline::TrackerGeom + Offline::BFieldGeom + Offline::ConditionsService + Offline::ConfigTools + Offline::DataProducts + Offline::GeneralUtilities + Offline::GeometryService + Offline::GeomPrimitives + Offline::GlobalConstantsService + Offline::MCDataProducts + Offline::RecoDataProducts + Offline::SeedService + Offline::STMConditions + Offline::StoppingTargetGeom + Offline::TrackerGeom ROOT::Hist ROOT::Matrix XercesC::XercesC diff --git a/PTMGeom/CMakeLists.txt b/PTMGeom/CMakeLists.txt index f1f895a5cb..0802af1781 100644 --- a/PTMGeom/CMakeLists.txt +++ b/PTMGeom/CMakeLists.txt @@ -6,8 +6,8 @@ cet_make_library( src/PTMStand.cc LIBRARIES PUBLIC - offline::GeomPrimitives - offline::Mu2eInterfaces + Offline::GeomPrimitives + Offline::Mu2eInterfaces ) install_source(SUBDIRS src) diff --git a/ParticleID/CMakeLists.txt b/ParticleID/CMakeLists.txt index 66d39038a0..a021b0ca95 100644 --- a/ParticleID/CMakeLists.txt +++ b/ParticleID/CMakeLists.txt @@ -6,32 +6,32 @@ cet_make_library( src/PIDUtilities.cc LIBRARIES PUBLIC ROOT::Hist - offline::ConfigTools - offline::GeneralUtilities + Offline::ConfigTools + Offline::GeneralUtilities ) cet_build_plugin(ParticleID art::module REG_SOURCE src/ParticleID_module.cc LIBRARIES REG art_root_io::TFileService_service - offline::ParticleID + Offline::ParticleID - offline::BTrkData - offline::ConditionsService - offline::ConfigTools - offline::GeometryService - offline::ProditionsService - offline::RecoDataProducts - offline::TrackerConditions + Offline::BTrkData + Offline::ConditionsService + Offline::ConfigTools + Offline::GeometryService + Offline::ProditionsService + Offline::RecoDataProducts + Offline::TrackerConditions ) cet_build_plugin(ParticleIDRead art::module REG_SOURCE src/ParticleIDRead_module.cc LIBRARIES REG art_root_io::TFileService_service - offline::ParticleID + Offline::ParticleID - offline::RecoDataProducts + Offline::RecoDataProducts ) install_source(SUBDIRS src) diff --git a/Print/CMakeLists.txt b/Print/CMakeLists.txt index 9bd34a9c4a..66450d6d27 100644 --- a/Print/CMakeLists.txt +++ b/Print/CMakeLists.txt @@ -47,13 +47,13 @@ cet_make_library( src/TrkCaloIntersectPrinter.cc LIBRARIES PUBLIC KinKal_General - offline::ConditionsService - offline::DataProducts - offline::GeometryService - offline::GlobalConstantsService - offline::MCDataProducts - offline::Mu2eUtilities - offline::RecoDataProducts + Offline::ConditionsService + Offline::DataProducts + Offline::GeometryService + Offline::GlobalConstantsService + Offline::MCDataProducts + Offline::Mu2eUtilities + Offline::RecoDataProducts ) cet_make_exec(NAME artProductSizes @@ -63,14 +63,14 @@ cet_make_exec(NAME artProductSizes artProductSizes/rootFileSizeTools.cc artProductSizes/RootSizeOnDisk.cc LIBRARIES - offline::Print + Offline::Print ) cet_make_exec(NAME deps SOURCE deps/deps_main.cc LIBRARIES - offline::Print + Offline::Print ) cet_make_exec(NAME eventCount @@ -79,27 +79,27 @@ cet_make_exec(NAME eventCount eventCount/eventCount_main.cc eventCount/FileInfo.cc LIBRARIES - offline::Print + Offline::Print ) cet_build_plugin(DataProductDump art::module REG_SOURCE src/DataProductDump_module.cc LIBRARIES REG - offline::Print + Offline::Print ) cet_build_plugin(PrintModule art::module REG_SOURCE src/PrintModule_module.cc LIBRARIES REG - offline::Print + Offline::Print ) cet_build_plugin(RunSubrunEvent art::module REG_SOURCE src/RunSubrunEvent_module.cc LIBRARIES REG - offline::Print + Offline::Print ) diff --git a/ProditionsService/CMakeLists.txt b/ProditionsService/CMakeLists.txt index 5da43519c7..a005bf95b6 100644 --- a/ProditionsService/CMakeLists.txt +++ b/ProditionsService/CMakeLists.txt @@ -4,39 +4,39 @@ cet_make_library(INTERFACE inc/ProditionsService.hh LIBRARIES INTERFACE - offline::AnalysisConfig - offline::CaloConfig - offline::CRVConfig - offline::DAQConfig - offline::DbTables - offline::Mu2eInterfaces - offline::SimulationConfig - offline::STMConfig - offline::TrackerConfig + Offline::AnalysisConfig + Offline::CaloConfig + Offline::CRVConfig + Offline::DAQConfig + Offline::DbTables + Offline::Mu2eInterfaces + Offline::SimulationConfig + Offline::STMConfig + Offline::TrackerConfig ) cet_build_plugin(ProditionsService art::service REG_SOURCE src/ProditionsService_service.cc LIBRARIES REG - offline::ProditionsService + Offline::ProditionsService - offline::AnalysisConditions - offline::CaloConditions - offline::CRVConditions - offline::DAQConditions - offline::DbService - offline::GeometryService - offline::SimulationConditions - offline::STMConditions - offline::TrackerConditions + Offline::AnalysisConditions + Offline::CaloConditions + Offline::CRVConditions + Offline::DAQConditions + Offline::DbService + Offline::GeometryService + Offline::SimulationConditions + Offline::STMConditions + Offline::TrackerConditions ) cet_build_plugin(ProditionsTest art::module REG_SOURCE src/ProditionsTest_module.cc LIBRARIES REG - offline::ProditionsService + Offline::ProditionsService - offline::CRVConditions + Offline::CRVConditions ) install_source(SUBDIRS src) diff --git a/ProductionSolenoidGeom/CMakeLists.txt b/ProductionSolenoidGeom/CMakeLists.txt index f8b7523906..763ecb632d 100644 --- a/ProductionSolenoidGeom/CMakeLists.txt +++ b/ProductionSolenoidGeom/CMakeLists.txt @@ -5,8 +5,8 @@ cet_make_library( src/PSShield.cc LIBRARIES PUBLIC - offline::GeomPrimitives - offline::Mu2eInterfaces + Offline::GeomPrimitives + Offline::Mu2eInterfaces ) install_source(SUBDIRS src) diff --git a/ProductionTargetGeom/CMakeLists.txt b/ProductionTargetGeom/CMakeLists.txt index d6e4472e1f..8e22b8f86e 100644 --- a/ProductionTargetGeom/CMakeLists.txt +++ b/ProductionTargetGeom/CMakeLists.txt @@ -3,8 +3,8 @@ cet_make_library( src/ProductionTarget.cc LIBRARIES PUBLIC - offline::GeomPrimitives - offline::Mu2eInterfaces + Offline::GeomPrimitives + Offline::Mu2eInterfaces ) install_source(SUBDIRS src) diff --git a/ProtonBeamDumpGeom/CMakeLists.txt b/ProtonBeamDumpGeom/CMakeLists.txt index 7494238574..10e4fc72e4 100644 --- a/ProtonBeamDumpGeom/CMakeLists.txt +++ b/ProtonBeamDumpGeom/CMakeLists.txt @@ -3,8 +3,8 @@ cet_make_library( src/ProtonBeamDump.cc LIBRARIES PUBLIC - offline::Mu2eHallGeom - offline::Mu2eInterfaces + Offline::Mu2eHallGeom + Offline::Mu2eInterfaces ) install_source(SUBDIRS src) diff --git a/RecoDataProducts/CMakeLists.txt b/RecoDataProducts/CMakeLists.txt index 8725d5618e..50cf00c4c3 100644 --- a/RecoDataProducts/CMakeLists.txt +++ b/RecoDataProducts/CMakeLists.txt @@ -38,18 +38,18 @@ cet_make_library( BTrk_ProbTools KinKal_Trajectory - offline::DataProducts - offline::GeneralUtilities - offline::KinKalGeom - offline::Mu2eKinKal - offline::TrackerConditions + Offline::DataProducts + Offline::GeneralUtilities + Offline::KinKalGeom + Offline::Mu2eKinKal + Offline::TrackerConditions ) art_dictionary( NO_CHECK_CLASS_VERSION # For some reason this segfaults CLASSES_DEF_XML ${CMAKE_CURRENT_SOURCE_DIR}/src/classes_def.xml CLASSES_H ${CMAKE_CURRENT_SOURCE_DIR}/src/classes.h DICTIONARY_LIBRARIES - offline::RecoDataProducts + Offline::RecoDataProducts ) install_source(SUBDIRS src) install_headers(SUBDIRS inc) diff --git a/STMConditions/CMakeLists.txt b/STMConditions/CMakeLists.txt index 3cb5ae5858..1eb409b211 100644 --- a/STMConditions/CMakeLists.txt +++ b/STMConditions/CMakeLists.txt @@ -3,10 +3,10 @@ cet_make_library( src/STMEnergyCalibMaker.cc LIBRARIES PUBLIC - offline::DataProducts - offline::DbTables - offline::Mu2eInterfaces - offline::STMConfig + Offline::DataProducts + Offline::DbTables + Offline::Mu2eInterfaces + Offline::STMConfig ) install_source(SUBDIRS src) diff --git a/STMGeom/CMakeLists.txt b/STMGeom/CMakeLists.txt index 7df2bd9095..39abffc8a8 100644 --- a/STMGeom/CMakeLists.txt +++ b/STMGeom/CMakeLists.txt @@ -9,7 +9,7 @@ cet_make_library(INTERFACE inc/TransportPipe.hh LIBRARIES INTERFACE - offline::Mu2eInterfaces + Offline::Mu2eInterfaces ) install_headers(SUBDIRS inc) diff --git a/STMReco/CMakeLists.txt b/STMReco/CMakeLists.txt index 9e13326f57..93be494738 100644 --- a/STMReco/CMakeLists.txt +++ b/STMReco/CMakeLists.txt @@ -1,58 +1,58 @@ cet_build_plugin(MakeSTMHits art::module REG_SOURCE src/MakeSTMHits_module.cc LIBRARIES REG - offline::GlobalConstantsService - offline::Mu2eUtilities - offline::ProditionsService - offline::RecoDataProducts - offline::STMConditions + Offline::GlobalConstantsService + Offline::Mu2eUtilities + Offline::ProditionsService + Offline::RecoDataProducts + Offline::STMConditions ) cet_build_plugin(PlotSTMEnergySpectrum art::module REG_SOURCE src/PlotSTMEnergySpectrum_module.cc LIBRARIES REG art_root_io::TFileService_service - offline::GlobalConstantsService - offline::MCDataProducts - offline::RecoDataProducts + Offline::GlobalConstantsService + Offline::MCDataProducts + Offline::RecoDataProducts ) cet_build_plugin(PlotSTMMWDSpectrum art::module REG_SOURCE src/PlotSTMMWDSpectrum_module.cc LIBRARIES REG art_root_io::TFileService_service - offline::GlobalConstantsService - offline::MCDataProducts - offline::RecoDataProducts + Offline::GlobalConstantsService + Offline::MCDataProducts + Offline::RecoDataProducts ) cet_build_plugin(PlotSTMWaveformDigis art::module REG_SOURCE src/PlotSTMWaveformDigis_module.cc LIBRARIES REG - offline::DataProducts - offline::Mu2eUtilities - offline::ProditionsService - offline::RecoDataProducts - offline::STMConditions + Offline::DataProducts + Offline::Mu2eUtilities + Offline::ProditionsService + Offline::RecoDataProducts + Offline::STMConditions ) cet_build_plugin(STMMovingWindowDeconvolution art::module REG_SOURCE src/STMMovingWindowDeconvolution_module.cc LIBRARIES REG - offline::GlobalConstantsService - offline::Mu2eUtilities - offline::ProditionsService - offline::RecoDataProducts - offline::STMConditions + Offline::GlobalConstantsService + Offline::Mu2eUtilities + Offline::ProditionsService + Offline::RecoDataProducts + Offline::STMConditions ) cet_build_plugin(STMZeroSuppression art::module REG_SOURCE src/STMZeroSuppression_module.cc LIBRARIES REG - offline::Mu2eUtilities - offline::ProditionsService - offline::RecoDataProducts - offline::STMConditions + Offline::Mu2eUtilities + Offline::ProditionsService + Offline::RecoDataProducts + Offline::STMConditions ) install_source(SUBDIRS src) diff --git a/SeedService/CMakeLists.txt b/SeedService/CMakeLists.txt index 81e9c2fda3..dd5f58dd58 100644 --- a/SeedService/CMakeLists.txt +++ b/SeedService/CMakeLists.txt @@ -13,15 +13,15 @@ cet_build_plugin(SeedService art::service REG_SOURCE src/SeedService_service.cc IMPL_SOURCE src/SeedService_service.cc LIBRARIES PUBLIC - offline::SeedService + Offline::SeedService ) cet_build_plugin(SeedTest01 art::module REG_SOURCE src/SeedTest01_module.cc LIBRARIES REG - offline::SeedService - offline::SeedService_SeedService_service + Offline::SeedService + Offline::SeedService_SeedService_service ) diff --git a/ServicesGeom/CMakeLists.txt b/ServicesGeom/CMakeLists.txt index 5a67d2fc3a..664b333cf5 100644 --- a/ServicesGeom/CMakeLists.txt +++ b/ServicesGeom/CMakeLists.txt @@ -4,7 +4,7 @@ cet_make_library( src/Pipe.cc LIBRARIES PUBLIC - offline::Mu2eInterfaces + Offline::Mu2eInterfaces ) install_source(SUBDIRS src) diff --git a/SimulationConditions/CMakeLists.txt b/SimulationConditions/CMakeLists.txt index de677b2342..b13fa8de3f 100644 --- a/SimulationConditions/CMakeLists.txt +++ b/SimulationConditions/CMakeLists.txt @@ -5,10 +5,10 @@ cet_make_library( src/SimBookkeeperMaker.cc LIBRARIES PUBLIC art::Framework_Core - offline::DbService - offline::DbTables - offline::Mu2eInterfaces - offline::SimulationConfig + Offline::DbService + Offline::DbTables + Offline::Mu2eInterfaces + Offline::SimulationConfig ) install_source(SUBDIRS src) diff --git a/Sources/CMakeLists.txt b/Sources/CMakeLists.txt index dc11c8defa..98207282c5 100644 --- a/Sources/CMakeLists.txt +++ b/Sources/CMakeLists.txt @@ -6,48 +6,48 @@ cet_make_library( src/STMTestBeamHeaders.cc LIBRARIES PUBLIC - offline::CalorimeterGeom - offline::DataProducts - offline::ExtinctionMonitorFNAL_Geometry - offline::GeneralUtilities - offline::GeometryService - offline::GlobalConstantsService - offline::MCDataProducts - offline::Mu2eUtilities - offline::RecoDataProducts - offline::SeedService + Offline::CalorimeterGeom + Offline::DataProducts + Offline::ExtinctionMonitorFNAL_Geometry + Offline::GeneralUtilities + Offline::GeometryService + Offline::GlobalConstantsService + Offline::MCDataProducts + Offline::Mu2eUtilities + Offline::RecoDataProducts + Offline::SeedService ) cet_build_plugin(FromCorsikaBinary art::source REG_SOURCE src/FromCorsikaBinary_source.cc LIBRARIES REG - offline::Sources - offline::SeedService_SeedService_service + Offline::Sources + Offline::SeedService_SeedService_service ) cet_build_plugin(FromEMFMARSFileWeighted art::source REG_SOURCE src/FromEMFMARSFileWeighted_source.cc LIBRARIES REG - offline::Sources + Offline::Sources ) cet_build_plugin(FromExtMonFNALMARSFile art::source REG_SOURCE src/FromExtMonFNALMARSFile_source.cc LIBRARIES REG - offline::Sources + Offline::Sources ) cet_build_plugin(FromSTMTestBeamData art::source REG_SOURCE src/FromSTMTestBeamData_source.cc LIBRARIES REG - offline::Sources + Offline::Sources ) cet_build_plugin(FromTrackerPrototypeData art::source REG_SOURCE src/FromTrackerPrototypeData_source.cc LIBRARIES REG - offline::Sources + Offline::Sources ROOT::Tree ) cet_build_plugin(PBISequence art::source REG_SOURCE src/PBISequence_source.cc LIBRARIES REG - offline::Sources + Offline::Sources ) install_source(SUBDIRS src) diff --git a/StoppingTargetGeom/CMakeLists.txt b/StoppingTargetGeom/CMakeLists.txt index 1eb89c39a4..2549467edf 100644 --- a/StoppingTargetGeom/CMakeLists.txt +++ b/StoppingTargetGeom/CMakeLists.txt @@ -3,8 +3,8 @@ cet_make_library( src/zBinningForFoils.cc LIBRARIES PUBLIC - offline::GeneralUtilities - offline::Mu2eInterfaces + Offline::GeneralUtilities + Offline::Mu2eInterfaces ) install_source(SUBDIRS src) diff --git a/TEveEventDisplay/CMakeLists.txt b/TEveEventDisplay/CMakeLists.txt index 5706c6dd67..8e177e4a66 100644 --- a/TEveEventDisplay/CMakeLists.txt +++ b/TEveEventDisplay/CMakeLists.txt @@ -17,10 +17,10 @@ cet_make_library( src/TEveMu2eTracker.cc LIBRARIES PUBLIC BTrk_difAlgebra - offline::ConfigTools - offline::GeometryService - offline::GlobalConstantsService - offline::RecoDataProducts + Offline::ConfigTools + Offline::GeometryService + Offline::GlobalConstantsService + Offline::RecoDataProducts ROOT::Eve ROOT::Cling ) @@ -29,8 +29,8 @@ cet_build_plugin(TEveEventDisplay art::module REG_SOURCE src/TEveEventDisplay_module.cc LIBRARIES REG art_root_io::TFileService_service - offline::TEveEventDisplay - offline::TEveEventDisplay_dict + Offline::TEveEventDisplay + Offline::TEveEventDisplay_dict ) @@ -38,8 +38,8 @@ cet_build_plugin(TEveGDMLTest art::module REG_SOURCE src/TEveGDMLTest_module.cc LIBRARIES REG art_root_io::TFileService_service - offline::TEveEventDisplay - offline::TEveEventDisplay_dict + Offline::TEveEventDisplay + Offline::TEveEventDisplay_dict ) @@ -47,8 +47,8 @@ cet_build_plugin(TEveNonGDMLTest art::module REG_SOURCE src/TEveNonGDMLTest_module.cc LIBRARIES REG art_root_io::TFileService_service - offline::TEveEventDisplay - offline::TEveEventDisplay_dict + Offline::TEveEventDisplay + Offline::TEveEventDisplay_dict ) @@ -56,7 +56,7 @@ art_dictionary( NO_CHECK_CLASS_VERSION # For some reason this segfaults CLASSES_DEF_XML ${CMAKE_CURRENT_SOURCE_DIR}/src/classes_def.xml CLASSES_H ${CMAKE_CURRENT_SOURCE_DIR}/src/classes.h DICTIONARY_LIBRARIES - offline::TEveEventDisplay + Offline::TEveEventDisplay ) install_source(SUBDIRS src) install_fhicl(SUBDIRS fcl SUBDIRNAME TEveEventDisplay) diff --git a/TrackCaloMatching/CMakeLists.txt b/TrackCaloMatching/CMakeLists.txt index ee0e3967a3..7de0f629de 100644 --- a/TrackCaloMatching/CMakeLists.txt +++ b/TrackCaloMatching/CMakeLists.txt @@ -2,37 +2,37 @@ cet_build_plugin(TrackCaloIntersection art::module REG_SOURCE src/TrackCaloIntersection_module.cc LIBRARIES REG art_root_io::TFileService_service - offline::CalorimeterGeom - offline::GeometryService - offline::RecoDataProducts + Offline::CalorimeterGeom + Offline::GeometryService + Offline::RecoDataProducts ) cet_build_plugin(TrackCaloIntersectionMVA art::module REG_SOURCE src/TrackCaloIntersectionMVA_module.cc LIBRARIES REG art_root_io::TFileService_service - offline::CalorimeterGeom - offline::GeometryService - offline::RecoDataProducts + Offline::CalorimeterGeom + Offline::GeometryService + Offline::RecoDataProducts ) cet_build_plugin(TrackCaloMatchingExtend art::module REG_SOURCE src/TrackCaloMatchingExtend_module.cc LIBRARIES REG art_root_io::TFileService_service - offline::CalorimeterGeom - offline::GeometryService - offline::RecoDataProducts + Offline::CalorimeterGeom + Offline::GeometryService + Offline::RecoDataProducts ) cet_build_plugin(TrackCaloMatching art::module REG_SOURCE src/TrackCaloMatching_module.cc LIBRARIES REG art_root_io::TFileService_service - offline::CalorimeterGeom - offline::ConditionsService - offline::GeometryService - offline::RecoDataProducts + Offline::CalorimeterGeom + Offline::ConditionsService + Offline::GeometryService + Offline::RecoDataProducts ROOT::Physics ) @@ -40,21 +40,21 @@ cet_build_plugin(TrackCaloMatchingMVA art::module REG_SOURCE src/TrackCaloMatchingMVA_module.cc LIBRARIES REG art_root_io::TFileService_service - offline::CalorimeterGeom - offline::GeometryService - offline::RecoDataProducts + Offline::CalorimeterGeom + Offline::GeometryService + Offline::RecoDataProducts ) cet_build_plugin(TrkExtrapol art::module REG_SOURCE src/TrkExtrapol_module.cc LIBRARIES REG art_root_io::TFileService_service - offline::CalorimeterGeom - offline::ConditionsService - offline::GeometryService - offline::MCDataProducts - offline::RecoDataProducts - offline::TrackerGeom + Offline::CalorimeterGeom + Offline::ConditionsService + Offline::GeometryService + Offline::MCDataProducts + Offline::RecoDataProducts + Offline::TrackerGeom ) install_source(SUBDIRS src) diff --git a/TrackerConditions/CMakeLists.txt b/TrackerConditions/CMakeLists.txt index f1a03ebf60..00ec6e8e91 100644 --- a/TrackerConditions/CMakeLists.txt +++ b/TrackerConditions/CMakeLists.txt @@ -20,18 +20,18 @@ cet_make_library( src/TrackerStatusMaker.cc LIBRARIES PUBLIC BTrk_MatEnv - offline::BFieldGeom - offline::DAQConditions - offline::DataProducts - offline::DbService - offline::DbTables - offline::GeneralUtilities - offline::GeometryService - offline::Mu2eBTrk - offline::Mu2eInterfaces - offline::ProditionsService - offline::TrackerConfig - offline::TrackerGeom + Offline::BFieldGeom + Offline::DAQConditions + Offline::DataProducts + Offline::DbService + Offline::DbTables + Offline::GeneralUtilities + Offline::GeometryService + Offline::Mu2eBTrk + Offline::Mu2eInterfaces + Offline::ProditionsService + Offline::TrackerConfig + Offline::TrackerGeom ) install_source(SUBDIRS src) diff --git a/TrackerGeom/CMakeLists.txt b/TrackerGeom/CMakeLists.txt index 7da27550f5..86ff47a050 100644 --- a/TrackerGeom/CMakeLists.txt +++ b/TrackerGeom/CMakeLists.txt @@ -9,10 +9,10 @@ cet_make_library( src/Tracker.cc LIBRARIES PUBLIC - offline::DataProducts - offline::GeneralUtilities - offline::GeomPrimitives - offline::Mu2eInterfaces + Offline::DataProducts + Offline::GeneralUtilities + Offline::GeomPrimitives + Offline::Mu2eInterfaces ) install_source(SUBDIRS src) diff --git a/TrackerMC/CMakeLists.txt b/TrackerMC/CMakeLists.txt index 5a9b56d709..452dbdef57 100644 --- a/TrackerMC/CMakeLists.txt +++ b/TrackerMC/CMakeLists.txt @@ -6,68 +6,68 @@ cet_make_library( src/StrawWaveform.cc LIBRARIES PUBLIC - offline::ConditionsService - offline::DataProducts - offline::MCDataProducts - offline::TrackerConditions - offline::TrackerGeom + Offline::ConditionsService + Offline::DataProducts + Offline::MCDataProducts + Offline::TrackerConditions + Offline::TrackerGeom ) cet_build_plugin(MakeMCKalSeed art::module REG_SOURCE src/MakeMCKalSeed_module.cc LIBRARIES REG art_root_io::TFileService_service - offline::TrackerMC + Offline::TrackerMC - offline::BFieldGeom - offline::ConditionsService - offline::GeometryService - offline::MCDataProducts - offline::ProditionsService - offline::RecoDataProducts - offline::SeedService - offline::TrackerGeom + Offline::BFieldGeom + Offline::ConditionsService + Offline::GeometryService + Offline::MCDataProducts + Offline::ProditionsService + Offline::RecoDataProducts + Offline::SeedService + Offline::TrackerGeom ) cet_build_plugin(MakeStrawGasSteps art::module REG_SOURCE src/MakeStrawGasSteps_module.cc LIBRARIES REG - offline::TrackerMC + Offline::TrackerMC - offline::BFieldGeom - offline::GeometryService - offline::GlobalConstantsService - offline::MCDataProducts - offline::Mu2eUtilities - offline::ProditionsService - offline::TrackerConditions - offline::TrackerGeom + Offline::BFieldGeom + Offline::GeometryService + Offline::GlobalConstantsService + Offline::MCDataProducts + Offline::Mu2eUtilities + Offline::ProditionsService + Offline::TrackerConditions + Offline::TrackerGeom ) cet_build_plugin(StrawDigisFromStrawGasSteps art::module REG_SOURCE src/StrawDigisFromStrawGasSteps_module.cc LIBRARIES REG - offline::TrackerMC + Offline::TrackerMC - offline::BFieldGeom - offline::ConditionsService - offline::ConfigTools - offline::DataProducts - offline::GeometryService - offline::MCDataProducts - offline::Mu2eUtilities - offline::ProditionsService - offline::RecoDataProducts - offline::SeedService_SeedService_service - offline::TrackerConditions - offline::TrackerGeom + Offline::BFieldGeom + Offline::ConditionsService + Offline::ConfigTools + Offline::DataProducts + Offline::GeometryService + Offline::MCDataProducts + Offline::Mu2eUtilities + Offline::ProditionsService + Offline::RecoDataProducts + Offline::SeedService_SeedService_service + Offline::TrackerConditions + Offline::TrackerGeom ) art_dictionary( NO_CHECK_CLASS_VERSION # For some reason this segfaults CLASSES_DEF_XML ${CMAKE_CURRENT_SOURCE_DIR}/src/classes_def.xml CLASSES_H ${CMAKE_CURRENT_SOURCE_DIR}/src/classes.h DICTIONARY_LIBRARIES - offline::TrackerMC + Offline::TrackerMC ) install_source(SUBDIRS src) install_headers(SUBDIRS inc) diff --git a/Trigger/CMakeLists.txt b/Trigger/CMakeLists.txt index df2ab60662..64283fc8a9 100644 --- a/Trigger/CMakeLists.txt +++ b/Trigger/CMakeLists.txt @@ -1,20 +1,20 @@ cet_build_plugin(DigiFilter art::module REG_SOURCE src/DigiFilter_module.cc LIBRARIES REG - offline::RecoDataProducts + Offline::RecoDataProducts ) cet_build_plugin(EvalWeightedEventCounts art::module REG_SOURCE src/EvalWeightedEventCounts_module.cc LIBRARIES REG art_root_io::TFileService_service - offline::MCDataProducts + Offline::MCDataProducts ) cet_build_plugin(MergeTriggerInfo art::module REG_SOURCE src/MergeTriggerInfo_module.cc LIBRARIES REG - offline::RecoDataProducts + Offline::RecoDataProducts ) cet_build_plugin(PrescaleEvent art::module @@ -27,15 +27,15 @@ cet_build_plugin(ReadTriggerInfo art::module REG_SOURCE src/ReadTriggerInfo_module.cc LIBRARIES REG - offline::BFieldGeom - offline::ConditionsService - offline::DataProducts - offline::GeometryService - offline::GlobalConstantsService - offline::MCDataProducts - offline::Mu2eUtilities - offline::RecoDataProducts - offline::TrackerGeom + Offline::BFieldGeom + Offline::ConditionsService + Offline::DataProducts + Offline::GeometryService + Offline::GlobalConstantsService + Offline::MCDataProducts + Offline::Mu2eUtilities + Offline::RecoDataProducts + Offline::TrackerGeom ) install_source(SUBDIRS src) diff --git a/TrkDiag/CMakeLists.txt b/TrkDiag/CMakeLists.txt index dae2591a77..cbff4a7a1c 100644 --- a/TrkDiag/CMakeLists.txt +++ b/TrkDiag/CMakeLists.txt @@ -5,180 +5,180 @@ cet_make_library( src/TrkMCTools.cc LIBRARIES PUBLIC - offline::BFieldGeom - offline::BTrkData - offline::ConfigTools - offline::DataProducts - offline::GeometryService - offline::MCDataProducts - offline::Mu2eUtilities - offline::ParticleID - offline::RecoDataProducts - offline::SeedService - offline::TrackerGeom + Offline::BFieldGeom + Offline::BTrkData + Offline::ConfigTools + Offline::DataProducts + Offline::GeometryService + Offline::MCDataProducts + Offline::Mu2eUtilities + Offline::ParticleID + Offline::RecoDataProducts + Offline::SeedService + Offline::TrackerGeom ) cet_build_plugin(BinnedSpectrumWeight art::module REG_SOURCE src/BinnedSpectrumWeight_module.cc LIBRARIES REG - offline::TrkDiag + Offline::TrkDiag - offline::ConfigTools - offline::MCDataProducts - offline::Mu2eUtilities - offline::SeedService + Offline::ConfigTools + Offline::MCDataProducts + Offline::Mu2eUtilities + Offline::SeedService ) cet_build_plugin(BkgDiag art::module REG_SOURCE src/BkgDiag_module.cc LIBRARIES REG - offline::TrkDiag + Offline::TrkDiag - offline::DataProducts - offline::GeometryService - offline::MCDataProducts - offline::RecoDataProducts + Offline::DataProducts + Offline::GeometryService + Offline::MCDataProducts + Offline::RecoDataProducts ) cet_build_plugin(ComboHitDiag art::module REG_SOURCE src/ComboHitDiag_module.cc LIBRARIES REG - offline::TrkDiag + Offline::TrkDiag - offline::GeometryService - offline::MCDataProducts - offline::ProditionsService - offline::RecoDataProducts - offline::TrackerConditions + Offline::GeometryService + Offline::MCDataProducts + Offline::ProditionsService + Offline::RecoDataProducts + Offline::TrackerConditions ) cet_build_plugin(HelixDiag art::module REG_SOURCE src/HelixDiag_module.cc LIBRARIES REG - offline::TrkDiag + Offline::TrkDiag - offline::BFieldGeom - offline::GeneralUtilities - offline::GeometryService - offline::GlobalConstantsService - offline::MCDataProducts - offline::Mu2eUtilities - offline::RecoDataProducts - offline::TrkReco + Offline::BFieldGeom + Offline::GeneralUtilities + Offline::GeometryService + Offline::GlobalConstantsService + Offline::MCDataProducts + Offline::Mu2eUtilities + Offline::RecoDataProducts + Offline::TrkReco ) cet_build_plugin(ProtonBunchTimeDiag art::module REG_SOURCE src/ProtonBunchTimeDiag_module.cc LIBRARIES REG - offline::TrkDiag + Offline::TrkDiag - offline::DataProducts - offline::MCDataProducts - offline::RecoDataProducts + Offline::DataProducts + Offline::MCDataProducts + Offline::RecoDataProducts ) cet_build_plugin(RMCWeight art::module REG_SOURCE src/RMCWeight_module.cc LIBRARIES REG - offline::TrkDiag + Offline::TrkDiag - offline::ConfigTools - offline::MCDataProducts - offline::Mu2eUtilities - offline::SeedService + Offline::ConfigTools + Offline::MCDataProducts + Offline::Mu2eUtilities + Offline::SeedService ) cet_build_plugin(StrawHitDiag art::module REG_SOURCE src/StrawHitDiag_module.cc LIBRARIES REG - offline::TrkDiag + Offline::TrkDiag - offline::ConditionsService - offline::DataProducts - offline::GeometryService - offline::MCDataProducts - offline::ProditionsService - offline::RecoDataProducts - offline::TrackerConditions - offline::TrackerGeom + Offline::ConditionsService + Offline::DataProducts + Offline::GeometryService + Offline::MCDataProducts + Offline::ProditionsService + Offline::RecoDataProducts + Offline::TrackerConditions + Offline::TrackerGeom ) cet_build_plugin(StrawResponseTest art::module REG_SOURCE src/StrawResponseTest_module.cc LIBRARIES REG - offline::TrkDiag + Offline::TrkDiag - offline::ProditionsService - offline::TrackerConditions + Offline::ProditionsService + Offline::TrackerConditions ) cet_build_plugin(TimeClusterDiag art::module REG_SOURCE src/TimeClusterDiag_module.cc LIBRARIES REG - offline::TrkDiag + Offline::TrkDiag - offline::CalorimeterGeom - offline::GeneralUtilities - offline::GeometryService - offline::MCDataProducts - offline::RecoDataProducts - offline::TrkReco + Offline::CalorimeterGeom + Offline::GeneralUtilities + Offline::GeometryService + Offline::MCDataProducts + Offline::RecoDataProducts + Offline::TrkReco ) cet_build_plugin(TrackPID art::module REG_SOURCE src/TrackPID_module.cc LIBRARIES REG - offline::TrkDiag + Offline::TrkDiag - offline::CalorimeterGeom - offline::GeometryService - offline::Mu2eUtilities - offline::RecoDataProducts + Offline::CalorimeterGeom + Offline::GeometryService + Offline::Mu2eUtilities + Offline::RecoDataProducts ) cet_build_plugin(TrackQuality art::module REG_SOURCE src/TrackQuality_module.cc LIBRARIES REG - offline::TrkDiag + Offline::TrkDiag - offline::AnalysisConditions - offline::GlobalConstantsService - offline::Mu2eUtilities - offline::ProditionsService - offline::RecoDataProducts + Offline::AnalysisConditions + Offline::GlobalConstantsService + Offline::Mu2eUtilities + Offline::ProditionsService + Offline::RecoDataProducts ) cet_build_plugin(TrkGeomTest art::module REG_SOURCE src/TrkGeomTest_module.cc LIBRARIES REG - offline::TrkDiag + Offline::TrkDiag - offline::GeometryService - offline::ProditionsService - offline::TrackerConditions - offline::TrackerGeom + Offline::GeometryService + Offline::ProditionsService + Offline::TrackerConditions + Offline::TrackerGeom ) cet_build_plugin(TrkRecoDiag art::module REG_SOURCE src/TrkRecoDiag_module.cc LIBRARIES REG - offline::TrkDiag + Offline::TrkDiag - offline::BFieldGeom - offline::GeneralUtilities - offline::GeometryService - offline::GlobalConstantsService - offline::MCDataProducts - offline::Mu2eUtilities - offline::RecoDataProducts - offline::TrkReco + Offline::BFieldGeom + Offline::GeneralUtilities + Offline::GeometryService + Offline::GlobalConstantsService + Offline::MCDataProducts + Offline::Mu2eUtilities + Offline::RecoDataProducts + Offline::TrkReco ) art_dictionary( NO_CHECK_CLASS_VERSION # For some reason this segfaults CLASSES_DEF_XML ${CMAKE_CURRENT_SOURCE_DIR}/src/classes_def.xml CLASSES_H ${CMAKE_CURRENT_SOURCE_DIR}/src/classes.h DICTIONARY_LIBRARIES - offline::TrkDiag + Offline::TrkDiag ) install_source(SUBDIRS src) install_headers(SUBDIRS inc) diff --git a/TrkExt/CMakeLists.txt b/TrkExt/CMakeLists.txt index cc805d2828..ee5f793596 100644 --- a/TrkExt/CMakeLists.txt +++ b/TrkExt/CMakeLists.txt @@ -12,31 +12,31 @@ cet_make_library( LIBRARIES PUBLIC art_root_io::TFileService_service - offline::BFieldGeom - offline::BTrkData - offline::ConfigTools - offline::DataProducts - offline::DetectorSolenoidGeom - offline::GeneralUtilities - offline::GeometryService - offline::MCDataProducts - offline::MECOStyleProtonAbsorberGeom - offline::RecoDataProducts - offline::StoppingTargetGeom + Offline::BFieldGeom + Offline::BTrkData + Offline::ConfigTools + Offline::DataProducts + Offline::DetectorSolenoidGeom + Offline::GeneralUtilities + Offline::GeometryService + Offline::MCDataProducts + Offline::MECOStyleProtonAbsorberGeom + Offline::RecoDataProducts + Offline::StoppingTargetGeom ) cet_build_plugin(TrkExt art::module REG_SOURCE src/TrkExt_module.cc LIBRARIES REG - offline::TrkExt + Offline::TrkExt - offline::BFieldGeom - offline::BTrkData - offline::DataProducts - offline::GeneralUtilities - offline::GeometryService - offline::MCDataProducts - offline::RecoDataProducts + Offline::BFieldGeom + Offline::BTrkData + Offline::DataProducts + Offline::GeneralUtilities + Offline::GeometryService + Offline::MCDataProducts + Offline::RecoDataProducts ) install_source(SUBDIRS src) diff --git a/TrkFilters/CMakeLists.txt b/TrkFilters/CMakeLists.txt index 0b4aa4bf06..f3045f7a41 100644 --- a/TrkFilters/CMakeLists.txt +++ b/TrkFilters/CMakeLists.txt @@ -1,25 +1,25 @@ cet_build_plugin(HelixFilter art::module REG_SOURCE src/HelixFilter_module.cc LIBRARIES REG - offline::BFieldGeom - offline::DataProducts - offline::GeneralUtilities - offline::GeometryService - offline::Mu2eUtilities - offline::RecoDataProducts - offline::TrackerGeom + Offline::BFieldGeom + Offline::DataProducts + Offline::GeneralUtilities + Offline::GeometryService + Offline::Mu2eUtilities + Offline::RecoDataProducts + Offline::TrackerGeom ) cet_build_plugin(SeedFilter art::module REG_SOURCE src/SeedFilter_module.cc LIBRARIES REG - offline::RecoDataProducts + Offline::RecoDataProducts ) cet_build_plugin(TimeClusterFilter art::module REG_SOURCE src/TimeClusterFilter_module.cc LIBRARIES REG - offline::RecoDataProducts + Offline::RecoDataProducts ) install_source(SUBDIRS src) diff --git a/TrkHitReco/CMakeLists.txt b/TrkHitReco/CMakeLists.txt index 5fbe27d797..556e2b680d 100644 --- a/TrkHitReco/CMakeLists.txt +++ b/TrkHitReco/CMakeLists.txt @@ -9,80 +9,80 @@ cet_make_library( src/TNTClusterer.cc LIBRARIES PUBLIC - offline::DataProducts - offline::RecoDataProducts - offline::TrackerConditions - offline::TrackerGeom + Offline::DataProducts + Offline::RecoDataProducts + Offline::TrackerConditions + Offline::TrackerGeom ) cet_build_plugin(CombineStrawHits art::module REG_SOURCE src/CombineStrawHits_module.cc LIBRARIES REG - offline::TrkHitReco + Offline::TrkHitReco - offline::DataProducts - offline::RecoDataProducts + Offline::DataProducts + Offline::RecoDataProducts ) cet_build_plugin(FlagBkgHits art::module REG_SOURCE src/FlagBkgHits_module.cc LIBRARIES REG art_root_io::TFileService_service - offline::TrkHitReco + Offline::TrkHitReco - offline::ConditionsService - offline::ConfigTools - offline::DataProducts - offline::MCDataProducts - offline::RecoDataProducts + Offline::ConditionsService + Offline::ConfigTools + Offline::DataProducts + Offline::MCDataProducts + Offline::RecoDataProducts ) cet_build_plugin(MakeStereoHits art::module REG_SOURCE src/MakeStereoHits_module.cc LIBRARIES REG - offline::TrkHitReco + Offline::TrkHitReco - offline::GeneralUtilities - offline::GeometryService - offline::Mu2eUtilities - offline::RecoDataProducts - offline::TrackerGeom + Offline::GeneralUtilities + Offline::GeometryService + Offline::Mu2eUtilities + Offline::RecoDataProducts + Offline::TrackerGeom ) cet_build_plugin(ProtonBunchTimeFromStrawDigis art::module REG_SOURCE src/ProtonBunchTimeFromStrawDigis_module.cc LIBRARIES REG art_root_io::TFileService_service - offline::TrkHitReco + Offline::TrkHitReco - offline::ProditionsService - offline::RecoDataProducts - offline::TrackerConditions + Offline::ProditionsService + Offline::RecoDataProducts + Offline::TrackerConditions ) cet_build_plugin(ReadStrawDigi art::module REG_SOURCE src/ReadStrawDigi_module.cc LIBRARIES REG - offline::TrkHitReco + Offline::TrkHitReco - offline::RecoDataProducts + Offline::RecoDataProducts ) cet_build_plugin(StrawHitReco art::module REG_SOURCE src/StrawHitReco_module.cc LIBRARIES REG art_root_io::TFileService_service - offline::TrkHitReco + Offline::TrkHitReco - offline::ConditionsBase - offline::ConditionsService - offline::ConfigTools - offline::DataProducts - offline::GeometryService - offline::ProditionsService - offline::RecoDataProducts - offline::TrackerConditions - offline::TrackerGeom + Offline::ConditionsBase + Offline::ConditionsService + Offline::ConfigTools + Offline::DataProducts + Offline::GeometryService + Offline::ProditionsService + Offline::RecoDataProducts + Offline::TrackerConditions + Offline::TrackerGeom ) install_source(SUBDIRS src inc) diff --git a/TrkPatRec/CMakeLists.txt b/TrkPatRec/CMakeLists.txt index d8491246b7..711be20de0 100644 --- a/TrkPatRec/CMakeLists.txt +++ b/TrkPatRec/CMakeLists.txt @@ -12,119 +12,119 @@ cet_make_library(INTERFACE cet_build_plugin(KalFinalFit art::module REG_SOURCE src/KalFinalFit_module.cc LIBRARIES REG - offline::TrkPatRec + Offline::TrkPatRec - offline::BTrkData - offline::CalorimeterGeom - offline::DataProducts - offline::GeneralUtilities - offline::GeometryService - offline::Mu2eUtilities - offline::ProditionsService - offline::RecoDataProducts - offline::TrackerConditions - offline::TrackerGeom - offline::TrkReco + Offline::BTrkData + Offline::CalorimeterGeom + Offline::DataProducts + Offline::GeneralUtilities + Offline::GeometryService + Offline::Mu2eUtilities + Offline::ProditionsService + Offline::RecoDataProducts + Offline::TrackerConditions + Offline::TrackerGeom + Offline::TrkReco ) cet_build_plugin(KalSeedFit art::module REG_SOURCE src/KalSeedFit_module.cc LIBRARIES REG - offline::TrkPatRec + Offline::TrkPatRec - offline::BFieldGeom - offline::BTrkData - offline::ConditionsService - offline::DataProducts - offline::GeneralUtilities - offline::GeometryService - offline::Mu2eUtilities - offline::ProditionsService - offline::RecoDataProducts - offline::TrackerConditions - offline::TrackerGeom - offline::TrkReco + Offline::BFieldGeom + Offline::BTrkData + Offline::ConditionsService + Offline::DataProducts + Offline::GeneralUtilities + Offline::GeometryService + Offline::Mu2eUtilities + Offline::ProditionsService + Offline::RecoDataProducts + Offline::TrackerConditions + Offline::TrackerGeom + Offline::TrkReco ) cet_build_plugin(RobustHelixFinder art::module REG_SOURCE src/RobustHelixFinder_module.cc LIBRARIES REG - offline::TrkPatRec + Offline::TrkPatRec - offline::boost_fix - offline::CalorimeterGeom - offline::ConfigTools - offline::DataProducts - offline::GeneralUtilities - offline::GeometryService - offline::Mu2eUtilities - offline::ProditionsService - offline::RecoDataProducts - offline::TrackerGeom - offline::TrkReco + Offline::boost_fix + Offline::CalorimeterGeom + Offline::ConfigTools + Offline::DataProducts + Offline::GeneralUtilities + Offline::GeometryService + Offline::Mu2eUtilities + Offline::ProditionsService + Offline::RecoDataProducts + Offline::TrackerGeom + Offline::TrkReco ) cet_build_plugin(TimeAndPhiClusterFinder art::module REG_SOURCE src/TimeAndPhiClusterFinder_module.cc LIBRARIES REG - offline::TrkPatRec + Offline::TrkPatRec - offline::Mu2eUtilities - offline::RecoDataProducts + Offline::Mu2eUtilities + Offline::RecoDataProducts ) cet_build_plugin(TimeClusterFinder art::module REG_SOURCE src/TimeClusterFinder_module.cc LIBRARIES REG - offline::TrkPatRec + Offline::TrkPatRec - offline::GeneralUtilities - offline::Mu2eUtilities - offline::RecoDataProducts - offline::TrkReco + Offline::GeneralUtilities + Offline::Mu2eUtilities + Offline::RecoDataProducts + Offline::TrkReco ) cet_build_plugin(KalFinalFitDiag art::tool REG_SOURCE src/KalFinalFitDiag_tool.cc LIBRARIES REG - offline::TrkPatRec + Offline::TrkPatRec - offline::BTrkData - offline::CalorimeterGeom - offline::Mu2eUtilities - offline::TrackerGeom - offline::TrkReco + Offline::BTrkData + Offline::CalorimeterGeom + Offline::Mu2eUtilities + Offline::TrackerGeom + Offline::TrkReco ) cet_build_plugin(KalSeedFitDiag art::tool REG_SOURCE src/KalSeedFitDiag_tool.cc LIBRARIES REG - offline::TrkPatRec + Offline::TrkPatRec - offline::BTrkData - offline::Mu2eUtilities - offline::TrkReco + Offline::BTrkData + Offline::Mu2eUtilities + Offline::TrkReco ) cet_build_plugin(RobustHelixFinderDiag art::tool REG_SOURCE src/RobustHelixFinderDiag_tool.cc LIBRARIES REG - offline::TrkPatRec + Offline::TrkPatRec - offline::BTrkData - offline::Mu2eUtilities - offline::TrkReco + Offline::BTrkData + Offline::Mu2eUtilities + Offline::TrkReco ) cet_build_plugin(TimeAndPhiClusterFinderDiag art::tool REG_SOURCE src/TimeAndPhiClusterFinderDiag_tool.cc LIBRARIES REG - offline::TrkPatRec + Offline::TrkPatRec - offline::GeometryService - offline::MCDataProducts - offline::Mu2eUtilities - offline::RecoDataProducts + Offline::GeometryService + Offline::MCDataProducts + Offline::Mu2eUtilities + Offline::RecoDataProducts ) install_source(SUBDIRS src) diff --git a/TrkReco/CMakeLists.txt b/TrkReco/CMakeLists.txt index 9e6638ad24..fd71cceb5d 100644 --- a/TrkReco/CMakeLists.txt +++ b/TrkReco/CMakeLists.txt @@ -17,49 +17,49 @@ cet_make_library( src/TrkUtilities.cc LIBRARIES PUBLIC BTrk_difAlgebra - offline::BFieldGeom - offline::BTrkData - offline::CalorimeterGeom - offline::ConditionsService - offline::DataProducts - offline::GeneralUtilities - offline::GeometryService - offline::Mu2eBTrk - offline::Mu2eUtilities - offline::ProditionsService - offline::RecoDataProducts - offline::StoppingTargetGeom - offline::TrackerConditions - offline::TrackerGeom + Offline::BFieldGeom + Offline::BTrkData + Offline::CalorimeterGeom + Offline::ConditionsService + Offline::DataProducts + Offline::GeneralUtilities + Offline::GeometryService + Offline::Mu2eBTrk + Offline::Mu2eUtilities + Offline::ProditionsService + Offline::RecoDataProducts + Offline::StoppingTargetGeom + Offline::TrackerConditions + Offline::TrackerGeom ) cet_build_plugin(MergeHelices art::module REG_SOURCE src/MergeHelices_module.cc LIBRARIES REG - offline::TrkReco + Offline::TrkReco - offline::Mu2eUtilities - offline::RecoDataProducts + Offline::Mu2eUtilities + Offline::RecoDataProducts ) cet_build_plugin(TrkRecoMcUtils art::tool REG_SOURCE src/TrkRecoMcUtils_tool.cc LIBRARIES REG - offline::TrkReco + Offline::TrkReco - offline::BTrkData - offline::ConditionsService - offline::MCDataProducts - offline::Mu2eUtilities - offline::RecoDataProducts - offline::TrackerGeom + Offline::BTrkData + Offline::ConditionsService + Offline::MCDataProducts + Offline::Mu2eUtilities + Offline::RecoDataProducts + Offline::TrackerGeom ) art_dictionary( NO_CHECK_CLASS_VERSION # For some reason this segfaults CLASSES_DEF_XML ${CMAKE_CURRENT_SOURCE_DIR}/src/classes_def.xml CLASSES_H ${CMAKE_CURRENT_SOURCE_DIR}/src/classes.h DICTIONARY_LIBRARIES - offline::TrkReco + Offline::TrkReco ) install_source(SUBDIRS src) install_headers(SUBDIRS inc) diff --git a/UtilityModules/CMakeLists.txt b/UtilityModules/CMakeLists.txt index 1c1c9008fa..00e91ddc52 100644 --- a/UtilityModules/CMakeLists.txt +++ b/UtilityModules/CMakeLists.txt @@ -1,19 +1,19 @@ cet_build_plugin(ModifyTrackSPM art::module REG_SOURCE src/ModifyTrackSPM_module.cc LIBRARIES REG - offline::MCDataProducts + Offline::MCDataProducts ) cet_build_plugin(NullProducer art::module REG_SOURCE src/NullProducer_module.cc LIBRARIES REG - offline::SeedService_SeedService_service + Offline::SeedService_SeedService_service ) cet_build_plugin(ReadTrackSPM art::module REG_SOURCE src/ReadTrackSPM_module.cc LIBRARIES REG - offline::MCDataProducts + Offline::MCDataProducts ) install_source(SUBDIRS src) diff --git a/Validation/CMakeLists.txt b/Validation/CMakeLists.txt index 5eabb19190..8fbca71ac4 100644 --- a/Validation/CMakeLists.txt +++ b/Validation/CMakeLists.txt @@ -38,14 +38,14 @@ cet_make_library( src/ValTriggerResults.cc LIBRARIES PUBLIC - offline::DataProducts - offline::GeometryService - offline::KinKalGeom - offline::MCDataProducts - offline::Mu2eKinKal - offline::Mu2eUtilities - offline::RecoDataProducts - offline::TrackerGeom + Offline::DataProducts + Offline::GeometryService + Offline::KinKalGeom + Offline::MCDataProducts + Offline::Mu2eKinKal + Offline::Mu2eUtilities + Offline::RecoDataProducts + Offline::TrackerGeom ) cet_make_library(LIBRARY_NAME Validation_Root @@ -59,7 +59,7 @@ cet_make_library(LIBRARY_NAME Validation_Root root/TValPar.cc LIBRARIES PUBLIC BTrk_difAlgebra - offline::Validation + Offline::Validation ROOT::Postscript ROOT::Core ROOT::Cling @@ -69,16 +69,16 @@ cet_make_library(LIBRARY_NAME Validation_Root cet_make_exec(NAME valCompare SOURCE src/valCompare_main.cc LIBRARIES - offline::Validation_Root - offline::Validation_dict + Offline::Validation_Root + Offline::Validation_dict ) cet_build_plugin(Validation art::module REG_SOURCE src/Validation_module.cc LIBRARIES REG - offline::Validation_Root - offline::Validation_dict + Offline::Validation_Root + Offline::Validation_dict ) @@ -86,7 +86,7 @@ art_dictionary( CLASSES_DEF_XML ${CMAKE_CURRENT_SOURCE_DIR}/root/classes_def.xml CLASSES_H ${CMAKE_CURRENT_SOURCE_DIR}/root/classes.h DICTIONARY_LIBRARIES - offline::Validation_Root + Offline::Validation_Root ) install_source(SUBDIRS src root) diff --git a/ups/product_deps b/ups/product_deps index 7267dbca08..a8ff7b172d 100644 --- a/ups/product_deps +++ b/ups/product_deps @@ -25,7 +25,7 @@ # # Recommended: # -parent offline +parent Offline # # Deprecated (will produce a warning): # @@ -306,8 +306,8 @@ end_product_list # case it is optional. # qualifier art_root_io gallery geant4 xerces_c artdaq_core_mu2e BTrk KinKal cry gsl -e28:debug e28:debug e28:debug e28:mt:debug e28 e28:s124:debug e28:p3915:debug e28:p3915:debug e28:debug -nq- -e28:prof e28:prof e28:prof e28:mt:prof e28 e28:s124:prof e28:p3915:prof e28:p3915:prof e28:prof -nq- +e28:s124:trig:debug e28:debug e28:debug e28:mt:debug e28 e28:s124:debug e28:p3915:debug e28:p3915:debug e28:debug -nq- +e28:s124:trig:prof e28:prof e28:prof e28:mt:prof e28 e28:s124:prof e28:p3915:prof e28:p3915:prof e28:prof -nq- end_qualifier_list #################################### From 8724610719f8fc2e00bae7bc3d981c5eee77bda0 Mon Sep 17 00:00:00 2001 From: Eric Flumerfelt Date: Tue, 31 Oct 2023 08:33:18 -0500 Subject: [PATCH 015/213] Add missing library --- Analyses/CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/Analyses/CMakeLists.txt b/Analyses/CMakeLists.txt index b6cbe23cf3..5e3bc455bf 100644 --- a/Analyses/CMakeLists.txt +++ b/Analyses/CMakeLists.txt @@ -284,6 +284,7 @@ cet_build_plugin(materailsPropStudy art::module REG_SOURCE src/materailsPropStudy_module.cc LIBRARIES REG art_root_io::TFileService_service + BTrk_DetectorModel BTrk_MatEnv BTrk_TrkBase Offline::SeedService From 28399247a8eed830be379d33ca04fc8ffb1da28d Mon Sep 17 00:00:00 2001 From: David Nathan Brown Date: Sun, 19 Nov 2023 00:20:25 -0600 Subject: [PATCH 016/213] Add DeP triggers and LH branches --- Mu2eKinKal/test/TTTA.fcl | 67 +++++++++++++++++++++++++++++++--------- 1 file changed, 52 insertions(+), 15 deletions(-) diff --git a/Mu2eKinKal/test/TTTA.fcl b/Mu2eKinKal/test/TTTA.fcl index 7c10c6c9cb..48593db32c 100644 --- a/Mu2eKinKal/test/TTTA.fcl +++ b/Mu2eKinKal/test/TTTA.fcl @@ -24,42 +24,79 @@ source : { physics : { producers : { @table::Trigger.producers - SelectRecoMCcpr : { + SelectRecoMCDeMcpr : { @table::CommonMCTrigger.TTSelectRecoMC KalSeedCollections : [ "TTCalSeedFitDem" ] HelixSeedCollections : ["TTCalHelixMergerDeM" ] } - SelectRecoMCtpr : { + SelectRecoMCDeMtpr : { @table::CommonMCTrigger.TTSelectRecoMC KalSeedCollections : [ "TTKSFDeM" ] HelixSeedCollections : ["TTHelixMergerDeM" ] } + SelectRecoMCDePcpr : { + @table::CommonMCTrigger.TTSelectRecoMC + KalSeedCollections : [ "TTCalSeedFitDep" ] + HelixSeedCollections : ["TTCalHelixMergerDeP" ] + } + SelectRecoMCDePtpr : { + @table::CommonMCTrigger.TTSelectRecoMC + KalSeedCollections : [ "TTKSFDeP" ] + HelixSeedCollections : ["TTHelixMergerDeP" ] + } } filters : { @table::Trigger.filters } analyzers : { @table::Trigger.analyzers - TAtpr : @local::TrkAnaTrigger.TrkAnaTT - TAcpr : @local::TrkAnaTrigger.TrkAnaTT + TADeMtpr : { + @table::TrkAnaTrigger.TrkAnaDeMTT + FitType : LoopHelix + } + + TADeMcpr : { + @table::TrkAnaTrigger.TrkAnaDeMTT + FitType : LoopHelix + } + TADePtpr : { + @table::TrkAnaTrigger.TrkAnaDePTT + FitType : LoopHelix + } + TADePcpr : { + @table::TrkAnaTrigger.TrkAnaDePTT + FitType : LoopHelix + } } - EndPath : [TAtpr, TAcpr] + EndPath : [TADeMtpr, TADeMcpr, TADePtpr, TADePcpr] } #include "Offline/gen/fcl/Trigger/OnSpillTrigMenu/OnSpillTrigMenu.fcl" physics.producers.EWMProducer.SpillType : 1 #include "Production/JobConfig/common/epilog.fcl" physics.end_paths : [ EndPath ] # add MC truth matching to the relevant paths -physics.tprDeM_highP_stopTarg_trigger : [ @sequence::physics.tprDeM_highP_stopTarg_trigger, SelectRecoMCtpr] -physics.cprDeM_highP_stopTarg_trigger : [ @sequence::physics.cprDeM_highP_stopTarg_trigger, SelectRecoMCcpr] +physics.tprDeM_highP_stopTarg_trigger : [ @sequence::physics.tprDeM_highP_stopTarg_trigger, SelectRecoMCDeMtpr] +physics.cprDeM_highP_stopTarg_trigger : [ @sequence::physics.cprDeM_highP_stopTarg_trigger, SelectRecoMCDeMcpr] +physics.tprDeP_highP_stopTarg_trigger : [ @sequence::physics.tprDeP_highP_stopTarg_trigger, SelectRecoMCDePtpr] +physics.cprDeP_highP_stopTarg_trigger : [ @sequence::physics.cprDeP_highP_stopTarg_trigger, SelectRecoMCDePcpr] + +physics.analyzers.TADeMtpr.SelectEvents : [ tprDeM_highP_stopTarg_trigger ] +physics.analyzers.TADeMtpr.candidate.input : "TTKSF" +physics.analyzers.TADeMtpr.candidate.suffix : "DeM" +physics.analyzers.TADeMtpr.KalSeedMCAssns: "SelectRecoMCDeMtpr" + +physics.analyzers.TADeMcpr.SelectEvents : [ cprDeM_highP_stopTarg_trigger ] +physics.analyzers.TADeMcpr.candidate.input : "TTCalSeedFit" +physics.analyzers.TADeMcpr.candidate.suffix : "Dem" +physics.analyzers.TADeMcpr.KalSeedMCAssns: "SelectRecoMCDeMcpr" -physics.analyzers.TAtpr.SelectEvents : [ tprDeM_highP_stopTarg_trigger ] -physics.analyzers.TAtpr.candidate.input : "TTKSF" -physics.analyzers.TAtpr.candidate.suffix : "DeM" -physics.analyzers.TAtpr.KalSeedMCAssns: "SelectRecoMCtpr" +physics.analyzers.TADePtpr.SelectEvents : [ tprDeP_highP_stopTarg_trigger ] +physics.analyzers.TADePtpr.candidate.input : "TTKSF" +physics.analyzers.TADePtpr.candidate.suffix : "DeP" +physics.analyzers.TADePtpr.KalSeedMCAssns: "SelectRecoMCDePtpr" -physics.analyzers.TAcpr.SelectEvents : [ cprDeM_highP_stopTarg_trigger ] -physics.analyzers.TAcpr.candidate.input : "TTCalSeedFit" -physics.analyzers.TAcpr.candidate.suffix : "Dem" -physics.analyzers.TAcpr.KalSeedMCAssns: "SelectRecoMCcpr" +physics.analyzers.TADePcpr.SelectEvents : [ cprDeP_highP_stopTarg_trigger ] +physics.analyzers.TADePcpr.candidate.input : "TTCalSeedFit" +physics.analyzers.TADePcpr.candidate.suffix : "Dep" +physics.analyzers.TADePcpr.KalSeedMCAssns: "SelectRecoMCDePcpr" # this next is currently needed to get correct hit-level MC truth matching. It needs to be fixed at the # ComboHitCollection. This setting works, but will slow down the trigger: don't use this script for timing studies From d768dc734008592f0405cbb2569e17c9d5c5b849 Mon Sep 17 00:00:00 2001 From: Eric Flumerfelt Date: Mon, 20 Nov 2023 07:54:15 -0600 Subject: [PATCH 017/213] Both sets of flags for warnings disabled and warnings not errors --- CMakeLists.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 1042a79b9c..d6d8e46412 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -11,7 +11,8 @@ cet_cmake_env() cet_set_compiler_flags(DIAGS VIGILANT WERROR NO_UNDEFINED - EXTRA_FLAGS -pedantic -Wno-error=unused-parameter -Wno-error=type-limits -Wno-error=ignored-qualifiers -Wno-error=unused-but-set-parameter -Wno-error=extra -Wno-error=non-virtual-dtor -Wno-error=implicit-fallthrough -Wno-error=deprecated-copy + EXTRA_FLAGS -pedantic #-Wno-error=unused-parameter -Wno-error=type-limits -Wno-error=ignored-qualifiers -Wno-error=unused-but-set-parameter -Wno-error=extra -Wno-error=non-virtual-dtor -Wno-error=implicit-fallthrough -Wno-error=deprecated-copy + -Wno-unused-parameter -Wno-type-limits -Wno-ignored-qualifiers -Wno-unused-but-set-parameter -Wno-extra -Wno-non-virtual-dtor -Wno-implicit-fallthrough -Wno-deprecated-copy ) include_directories(${CMAKE_CURRENT_SOURCE_DIR}/..) From 5bd0195aec3af17e1a61291d12d743cdc678671b Mon Sep 17 00:00:00 2001 From: Eric Flumerfelt Date: Mon, 20 Nov 2023 08:55:28 -0600 Subject: [PATCH 018/213] Update to reflect changes in upstream --- BFieldTest/CMakeLists.txt | 2 +- CMakeLists.txt | 2 +- CRVResponse/CMakeLists.txt | 6 +- CaloMC/CMakeLists.txt | 7 +- CommonMC/CMakeLists.txt | 6 +- ConditionsService/CMakeLists.txt | 5 +- DbService/CMakeLists.txt | 2 + EventGenerator/CMakeLists.txt | 72 ++++++++++--------- EventMixing/CMakeLists.txt | 8 +-- .../ComponentTests/CMakeLists.txt | 2 +- .../Digitization/CMakeLists.txt | 2 +- Filters/CMakeLists.txt | 9 ++- GeometryService/CMakeLists.txt | 4 +- Mu2eG4/CMakeLists.txt | 8 +-- Mu2eG4Helper/CMakeLists.txt | 4 +- Mu2eInterfaces/CMakeLists.txt | 11 +-- ProditionsService/CMakeLists.txt | 3 +- SeedService/CMakeLists.txt | 13 ++-- Sources/CMakeLists.txt | 2 +- TrackerMC/CMakeLists.txt | 2 +- UtilityModules/CMakeLists.txt | 8 ++- ups/product_deps | 18 ++--- 22 files changed, 107 insertions(+), 89 deletions(-) diff --git a/BFieldTest/CMakeLists.txt b/BFieldTest/CMakeLists.txt index 85257b4836..827d6430d4 100644 --- a/BFieldTest/CMakeLists.txt +++ b/BFieldTest/CMakeLists.txt @@ -4,7 +4,7 @@ cet_build_plugin(BFieldSymmetry art::module art_root_io::TFileService_service Offline::BFieldGeom Offline::GeometryService - Offline::SeedService_SeedService_service + Offline::SeedService ROOT::Hist ROOT::Tree ) diff --git a/CMakeLists.txt b/CMakeLists.txt index d6d8e46412..7db1f227a2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -25,7 +25,7 @@ find_package(Boost COMPONENTS iostreams program_options REQUIRED) find_package(XercesC REQUIRED) find_package(BLAS REQUIRED) find_package(artdaq_core_mu2e REQUIRED) -find_package(Geant4 REQUIRED) +find_package(Geant4) # TODO: Find or implement FindCRY.cmake include_directories($ENV{CRYHOME}/src) diff --git a/CRVResponse/CMakeLists.txt b/CRVResponse/CMakeLists.txt index 35d0dc60a1..29f8ce33cc 100644 --- a/CRVResponse/CMakeLists.txt +++ b/CRVResponse/CMakeLists.txt @@ -77,7 +77,7 @@ cet_build_plugin(CrvPhotonGenerator art::module Offline::GlobalConstantsService Offline::MCDataProducts Offline::ProditionsService - Offline::SeedService_SeedService_service + Offline::SeedService ) cet_build_plugin(CrvPlot art::module @@ -109,7 +109,7 @@ cet_build_plugin(CrvSiPMChargeGenerator art::module Offline::GeometryService Offline::MCDataProducts Offline::ProditionsService - Offline::SeedService_SeedService_service + Offline::SeedService ) cet_build_plugin(CrvStepsFromStepPointMCs art::module @@ -151,7 +151,7 @@ cet_build_plugin(CrvWaveformsGenerator art::module Offline::GeometryService Offline::MCDataProducts Offline::ProditionsService - Offline::SeedService_SeedService_service + Offline::SeedService ) cet_build_plugin(MakeCrvCoincidenceClusterMCAssns art::module diff --git a/CaloMC/CMakeLists.txt b/CaloMC/CMakeLists.txt index e9b517312c..c3c12b7d86 100644 --- a/CaloMC/CMakeLists.txt +++ b/CaloMC/CMakeLists.txt @@ -1,6 +1,5 @@ cet_make_library( SOURCE - src/CaloNoiseARFitter.cc src/CaloNoiseSimGenerator.cc src/CaloPhotonPropagation.cc src/CaloWFExtractor.cc @@ -11,7 +10,7 @@ cet_make_library( Offline::ConditionsService Offline::GeometryService Offline::Mu2eUtilities - Offline::SeedService_SeedService_service + Offline::SeedService ) cet_build_plugin(CaloClusterTruthMatch art::module @@ -37,7 +36,7 @@ cet_build_plugin(CaloDigiMaker art::module Offline::Mu2eUtilities Offline::ProditionsService Offline::RecoDataProducts - Offline::SeedService_SeedService_service + Offline::SeedService ) cet_build_plugin(CaloHitTruthMatch art::module @@ -64,7 +63,7 @@ cet_build_plugin(CaloShowerROMaker art::module Offline::GlobalConstantsService Offline::MCDataProducts Offline::ProditionsService - Offline::SeedService_SeedService_service + Offline::SeedService ) cet_build_plugin(CaloShowerStepMaker art::module diff --git a/CommonMC/CMakeLists.txt b/CommonMC/CMakeLists.txt index f335e87381..47acc43fdb 100644 --- a/CommonMC/CMakeLists.txt +++ b/CommonMC/CMakeLists.txt @@ -2,7 +2,7 @@ cet_build_plugin(CosmicTimeOffset art::module REG_SOURCE src/CosmicTimeOffset_module.cc LIBRARIES REG Offline::MCDataProducts - Offline::SeedService_SeedService_service + Offline::SeedService ) cet_build_plugin(EventWindowMarkerProducer art::module @@ -13,7 +13,7 @@ cet_build_plugin(EventWindowMarkerProducer art::module Offline::MCDataProducts Offline::ProditionsService Offline::RecoDataProducts - Offline::SeedService_SeedService_service + Offline::SeedService ) cet_build_plugin(FindMCPrimary art::module @@ -48,7 +48,7 @@ cet_build_plugin(ProtonTimeOffset art::module LIBRARIES REG Offline::MCDataProducts Offline::Mu2eUtilities - Offline::SeedService_SeedService_service + Offline::SeedService ) cet_build_plugin(SelectRecoMC art::module diff --git a/ConditionsService/CMakeLists.txt b/ConditionsService/CMakeLists.txt index 1e588091ba..7b09ea52b8 100644 --- a/ConditionsService/CMakeLists.txt +++ b/ConditionsService/CMakeLists.txt @@ -1,12 +1,14 @@ cet_make_library( SOURCE - src/AcceleratorParams.cc + src/ConditionsService.cc src/CalorimeterCalibrations.cc src/ExtMonFNALConditions.cc LIBRARIES PUBLIC Offline::ConfigTools Offline::Mu2eInterfaces + Offline::GeometryService + art::Framework_Services_Registry ) cet_build_plugin(ConditionsService art::service @@ -14,7 +16,6 @@ cet_build_plugin(ConditionsService art::service LIBRARIES REG Offline::ConditionsService - Offline::GeometryService ) install_source(SUBDIRS src) diff --git a/DbService/CMakeLists.txt b/DbService/CMakeLists.txt index 24cf183c1a..293fd040a9 100644 --- a/DbService/CMakeLists.txt +++ b/DbService/CMakeLists.txt @@ -3,6 +3,7 @@ cet_make_library( src/DbEngine.cc src/DbIdList.cc src/DbReader.cc + src/DbService.cc src/DbSql.cc src/DbTool.cc src/DbValTool.cc @@ -13,6 +14,7 @@ cet_make_library( Offline::ConfigTools Offline::DbTables Offline::GeneralUtilities + art::Framework_Services_Registry ) cet_make_exec(NAME dbTool diff --git a/EventGenerator/CMakeLists.txt b/EventGenerator/CMakeLists.txt index 77030f176d..7b489e3d9d 100644 --- a/EventGenerator/CMakeLists.txt +++ b/EventGenerator/CMakeLists.txt @@ -41,7 +41,7 @@ cet_build_plugin(AntiProtonGun art::module Offline::MCDataProducts Offline::Mu2eUtilities Offline::ProductionTargetGeom - Offline::SeedService_SeedService_service + Offline::SeedService ) cet_build_plugin(CaloCalibGun art::module @@ -54,7 +54,7 @@ cet_build_plugin(CaloCalibGun art::module Offline::GeometryService Offline::MCDataProducts Offline::Mu2eUtilities - Offline::SeedService_SeedService_service + Offline::SeedService ) cet_build_plugin(CaloTBGun art::module @@ -68,7 +68,7 @@ cet_build_plugin(CaloTBGun art::module Offline::GeometryService Offline::GlobalConstantsService Offline::MCDataProducts - Offline::SeedService_SeedService_service + Offline::SeedService ) cet_build_plugin(CeEndpoint art::module @@ -80,7 +80,7 @@ cet_build_plugin(CeEndpoint art::module Offline::GlobalConstantsService Offline::MCDataProducts Offline::Mu2eUtilities - Offline::SeedService_SeedService_service + Offline::SeedService ) cet_build_plugin(CORSIKAEventGenerator art::module @@ -95,7 +95,7 @@ cet_build_plugin(CORSIKAEventGenerator art::module Offline::GeometryService Offline::MCDataProducts Offline::Mu2eUtilities - Offline::SeedService_SeedService_service + Offline::SeedService ) cet_build_plugin(CRYEventGenerator art::module @@ -105,7 +105,7 @@ cet_build_plugin(CRYEventGenerator art::module Offline::ConfigTools Offline::MCDataProducts - Offline::SeedService_SeedService_service + Offline::SeedService ) cet_build_plugin(CryResampler art::module @@ -117,7 +117,7 @@ cet_build_plugin(CryResampler art::module Offline::GeneralUtilities Offline::GlobalConstantsService Offline::MCDataProducts - Offline::SeedService_SeedService_service + Offline::SeedService ) cet_build_plugin(DecayInOrbitWeight art::module @@ -128,7 +128,7 @@ cet_build_plugin(DecayInOrbitWeight art::module Offline::ConfigTools Offline::MCDataProducts Offline::Mu2eUtilities - Offline::SeedService_SeedService_service + Offline::SeedService ) cet_build_plugin(EplusFromStoppedPion art::module @@ -140,7 +140,7 @@ cet_build_plugin(EplusFromStoppedPion art::module Offline::GlobalConstantsService Offline::MCDataProducts Offline::Mu2eUtilities - Offline::SeedService_SeedService_service + Offline::SeedService ) cet_build_plugin(EventGenerator art::module @@ -150,7 +150,7 @@ cet_build_plugin(EventGenerator art::module Offline::ConfigTools Offline::MCDataProducts - Offline::SeedService_SeedService_service + Offline::SeedService ) cet_build_plugin(ExtMonFNALBoxGenerator art::module @@ -165,7 +165,7 @@ cet_build_plugin(ExtMonFNALBoxGenerator art::module Offline::GeometryService Offline::GlobalConstantsService Offline::MCDataProducts - Offline::SeedService_SeedService_service + Offline::SeedService ) cet_build_plugin(ExtMonFNALGun art::module @@ -174,7 +174,7 @@ cet_build_plugin(ExtMonFNALGun art::module Offline::EventGenerator Offline::MCDataProducts - Offline::SeedService_SeedService_service + Offline::SeedService ) cet_build_plugin(ExtMonFNALRoomGenerator art::module @@ -190,7 +190,7 @@ cet_build_plugin(ExtMonFNALRoomGenerator art::module Offline::GlobalConstantsService Offline::MCDataProducts Offline::ProtonBeamDumpGeom - Offline::SeedService_SeedService_service + Offline::SeedService ) cet_build_plugin(FlatMuonDaughterGenerator art::module @@ -202,7 +202,7 @@ cet_build_plugin(FlatMuonDaughterGenerator art::module Offline::GlobalConstantsService Offline::MCDataProducts Offline::Mu2eUtilities - Offline::SeedService_SeedService_service + Offline::SeedService ) cet_build_plugin(FromAsciiMomentumAndPosition art::module @@ -219,7 +219,7 @@ cet_build_plugin(FromAsciiMomentumAndPosition art::module Offline::MCDataProducts Offline::Mu2eUtilities Offline::ProductionTargetGeom - Offline::SeedService_SeedService_service + Offline::SeedService ) cet_build_plugin(FromSimParticleCompact art::module @@ -234,7 +234,7 @@ cet_build_plugin(FromSimParticleCompact art::module Offline::MCDataProducts Offline::Mu2eUtilities Offline::ProductionTargetGeom - Offline::SeedService_SeedService_service + Offline::SeedService ) cet_build_plugin(FromStepPointMCs art::module @@ -255,7 +255,7 @@ cet_build_plugin(FromStepPointMCsRotateTarget art::module Offline::GlobalConstantsService Offline::MCDataProducts Offline::ProductionTargetGeom - Offline::SeedService_SeedService_service + Offline::SeedService ) cet_build_plugin(G4BeamlineGenerator art::module @@ -265,7 +265,13 @@ cet_build_plugin(G4BeamlineGenerator art::module Offline::ConfigTools Offline::MCDataProducts - Offline::SeedService_SeedService_service + Offline::SeedService +) + +cet_build_plugin(GammaConvFlat art::module + REG_SOURCE src/GammaConvFlat_module.cc + LIBRARIES REG + Offline::EventGenerator ) cet_build_plugin(GeneratorPlots art::module @@ -295,7 +301,7 @@ cet_build_plugin(InFlightParticleSampler art::module Offline::GlobalConstantsService Offline::MCDataProducts Offline::Mu2eUtilities - Offline::SeedService_SeedService_service + Offline::SeedService ) cet_build_plugin(LeadingLog art::module @@ -307,7 +313,7 @@ cet_build_plugin(LeadingLog art::module Offline::GlobalConstantsService Offline::MCDataProducts Offline::Mu2eUtilities - Offline::SeedService_SeedService_service + Offline::SeedService ) cet_build_plugin(MuStopProductsGun art::module @@ -321,7 +327,7 @@ cet_build_plugin(MuStopProductsGun art::module Offline::GlobalConstantsService Offline::MCDataProducts Offline::Mu2eUtilities - Offline::SeedService_SeedService_service + Offline::SeedService ) cet_build_plugin(PBIWeight art::module @@ -341,7 +347,7 @@ cet_build_plugin(Pileup art::module Offline::GlobalConstantsService Offline::MCDataProducts Offline::Mu2eUtilities - Offline::SeedService_SeedService_service + Offline::SeedService ) cet_build_plugin(PrimaryAntiProtonGun art::module @@ -358,7 +364,7 @@ cet_build_plugin(PrimaryAntiProtonGun art::module Offline::MCDataProducts Offline::Mu2eUtilities Offline::ProductionTargetGeom - Offline::SeedService_SeedService_service + Offline::SeedService ) cet_build_plugin(PrimaryProtonGun art::module @@ -367,7 +373,7 @@ cet_build_plugin(PrimaryProtonGun art::module Offline::EventGenerator Offline::MCDataProducts - Offline::SeedService_SeedService_service + Offline::SeedService ) cet_build_plugin(RanTest art::module @@ -376,7 +382,7 @@ cet_build_plugin(RanTest art::module Offline::EventGenerator Offline::MCDataProducts - Offline::SeedService_SeedService_service + Offline::SeedService ) cet_build_plugin(RMCGun art::module @@ -390,7 +396,7 @@ cet_build_plugin(RMCGun art::module Offline::GlobalConstantsService Offline::MCDataProducts Offline::Mu2eUtilities - Offline::SeedService_SeedService_service + Offline::SeedService ) cet_build_plugin(RPCGun art::module @@ -402,7 +408,7 @@ cet_build_plugin(RPCGun art::module Offline::GlobalConstantsService Offline::MCDataProducts Offline::Mu2eUtilities - Offline::SeedService_SeedService_service + Offline::SeedService ) cet_build_plugin(SingleProcessGenerator art::module @@ -414,7 +420,7 @@ cet_build_plugin(SingleProcessGenerator art::module Offline::GlobalConstantsService Offline::MCDataProducts Offline::Mu2eUtilities - Offline::SeedService_SeedService_service + Offline::SeedService ) cet_build_plugin(StoppedMuonRMCGun art::module @@ -428,7 +434,7 @@ cet_build_plugin(StoppedMuonRMCGun art::module Offline::GlobalConstantsService Offline::MCDataProducts Offline::Mu2eUtilities - Offline::SeedService_SeedService_service + Offline::SeedService ) cet_build_plugin(StoppedMuonXRayGammaRayGun art::module @@ -442,7 +448,7 @@ cet_build_plugin(StoppedMuonXRayGammaRayGun art::module Offline::GeometryService Offline::MCDataProducts Offline::Mu2eUtilities - Offline::SeedService_SeedService_service + Offline::SeedService Offline::StoppingTargetGeom ) @@ -456,7 +462,7 @@ cet_build_plugin(StoppedMuplusDecayGun art::module Offline::GlobalConstantsService Offline::MCDataProducts Offline::Mu2eUtilities - Offline::SeedService_SeedService_service + Offline::SeedService ) cet_build_plugin(StoppedParticleG4Gun art::module @@ -469,7 +475,7 @@ cet_build_plugin(StoppedParticleG4Gun art::module Offline::GlobalConstantsService Offline::MCDataProducts Offline::Mu2eUtilities - Offline::SeedService_SeedService_service + Offline::SeedService ) cet_build_plugin(StoppedParticleReactionGun art::module @@ -483,7 +489,7 @@ cet_build_plugin(StoppedParticleReactionGun art::module Offline::GlobalConstantsService Offline::MCDataProducts Offline::Mu2eUtilities - Offline::SeedService_SeedService_service + Offline::SeedService ) cet_build_plugin(DIOGenerator art::tool diff --git a/EventMixing/CMakeLists.txt b/EventMixing/CMakeLists.txt index 5c75e7defe..254aedba96 100644 --- a/EventMixing/CMakeLists.txt +++ b/EventMixing/CMakeLists.txt @@ -16,7 +16,7 @@ cet_build_plugin(MixBackgroundFrames art::module Offline::MCDataProducts Offline::Mu2eUtilities Offline::ProditionsService - Offline::SeedService_SeedService_service + Offline::SeedService Offline::SimulationConditions ) @@ -27,7 +27,7 @@ cet_build_plugin(ProtonBunchIntensityFlat art::module Offline::MCDataProducts Offline::Mu2eUtilities - Offline::SeedService_SeedService_service + Offline::SeedService ) cet_build_plugin(ProtonBunchIntensityLogNormal art::module @@ -37,7 +37,7 @@ cet_build_plugin(ProtonBunchIntensityLogNormal art::module Offline::MCDataProducts Offline::Mu2eUtilities - Offline::SeedService_SeedService_service + Offline::SeedService ) cet_build_plugin(ResamplingMixer art::module @@ -48,7 +48,7 @@ cet_build_plugin(ResamplingMixer art::module Offline::EventMixing Offline::Mu2eUtilities - Offline::SeedService_SeedService_service + Offline::SeedService ) install_source(SUBDIRS src) diff --git a/ExtinctionMonitorFNAL/ComponentTests/CMakeLists.txt b/ExtinctionMonitorFNAL/ComponentTests/CMakeLists.txt index 0fe3d0dec0..5ad9c56a3d 100644 --- a/ExtinctionMonitorFNAL/ComponentTests/CMakeLists.txt +++ b/ExtinctionMonitorFNAL/ComponentTests/CMakeLists.txt @@ -3,7 +3,7 @@ # LIBRARIES REG # Offline::DataProducts # Offline::GeometryService -# Offline::SeedService_SeedService_service +# Offline::SeedService #) #cet_build_plugin(TrackExtrapolatorTest2 art::module diff --git a/ExtinctionMonitorFNAL/Digitization/CMakeLists.txt b/ExtinctionMonitorFNAL/Digitization/CMakeLists.txt index ee00a9a3ba..c50eacb0b9 100644 --- a/ExtinctionMonitorFNAL/Digitization/CMakeLists.txt +++ b/ExtinctionMonitorFNAL/Digitization/CMakeLists.txt @@ -24,7 +24,7 @@ cet_build_plugin(ExtMonFNALHitMaker art::module Offline::GlobalConstantsService Offline::MCDataProducts Offline::RecoDataProducts - Offline::SeedService_SeedService_service + Offline::SeedService ) install_source(SUBDIRS src) diff --git a/Filters/CMakeLists.txt b/Filters/CMakeLists.txt index 40fdaca5fb..ff0ceedb69 100644 --- a/Filters/CMakeLists.txt +++ b/Filters/CMakeLists.txt @@ -155,6 +155,11 @@ cet_build_plugin(FilterStepPointReflection art::module Offline::MCDataProducts ) +cet_build_plugin(FixedFilter art::module + REG_SOURCE src/FixedFilter_module.cc + LIBRARIES REG +) + cet_build_plugin(GenParticleMomFilter art::module REG_SOURCE src/GenParticleMomFilter_module.cc LIBRARIES REG @@ -179,7 +184,7 @@ cet_build_plugin(ParticleCodeFilter art::module cet_build_plugin(RandomPrescaleFilter art::module REG_SOURCE src/RandomPrescaleFilter_module.cc LIBRARIES REG - Offline::SeedService_SeedService_service + Offline::SeedService ) cet_build_plugin(RecoMomFilter art::module @@ -275,7 +280,7 @@ cet_build_plugin(WeightSamplingFilter art::module LIBRARIES REG Offline::DataProducts Offline::MCDataProducts - Offline::SeedService_SeedService_service + Offline::SeedService ) install_source(SUBDIRS src) diff --git a/GeometryService/CMakeLists.txt b/GeometryService/CMakeLists.txt index 3c0758c8bd..18336cb54d 100644 --- a/GeometryService/CMakeLists.txt +++ b/GeometryService/CMakeLists.txt @@ -16,6 +16,7 @@ cet_make_library( src/ExtShieldDownstreamMaker.cc src/ExtShieldUpstreamMaker.cc src/G4GeometryOptions.cc + src/GeometryService.cc src/MBSMaker.cc src/MECOStyleProtonAbsorberMaker.cc src/Mu2eCoordTransform.cc @@ -69,8 +70,7 @@ cet_make_library( cet_build_plugin(GeometryService art::service REG_SOURCE src/GeometryService_service.cc - IMPL_SOURCE src/GeometryService_service.cc - LIBRARIES PUBLIC + LIBRARIES REG Offline::GeometryService Offline::BeamlineGeom diff --git a/Mu2eG4/CMakeLists.txt b/Mu2eG4/CMakeLists.txt index 826ccea09b..c506d0f478 100644 --- a/Mu2eG4/CMakeLists.txt +++ b/Mu2eG4/CMakeLists.txt @@ -137,14 +137,14 @@ cet_make_library( Offline::MBSGeom Offline::MCDataProducts Offline::MECOStyleProtonAbsorberGeom - Offline::Mu2eG4Helper_Mu2eG4Helper_service + Offline::Mu2eG4Helper Offline::Mu2eHallGeom Offline::Mu2eUtilities Offline::ProductionSolenoidGeom Offline::ProductionTargetGeom Offline::ProtonBeamDumpGeom Offline::PTMGeom - Offline::SeedService_SeedService_service + Offline::SeedService Offline::ServicesGeom Offline::STMGeom Offline::StoppingTargetGeom @@ -173,7 +173,7 @@ cet_build_plugin(Mu2eG4 art::module Offline::Mu2eG4 Offline::ConfigTools - Offline::GeometryService_GeometryService_service + Offline::GeometryService Offline::MCDataProducts Offline::Mu2eHallGeom Offline::SeedService @@ -186,7 +186,7 @@ cet_build_plugin(Mu2eG4MT art::module Offline::Mu2eG4 Offline::ConfigTools - Offline::GeometryService_GeometryService_service + Offline::GeometryService Offline::MCDataProducts Offline::Mu2eHallGeom ) diff --git a/Mu2eG4Helper/CMakeLists.txt b/Mu2eG4Helper/CMakeLists.txt index a77f7c0261..8fa09ac2fb 100644 --- a/Mu2eG4Helper/CMakeLists.txt +++ b/Mu2eG4Helper/CMakeLists.txt @@ -1,6 +1,7 @@ cet_make_library( SOURCE src/AntiLeakRegistry.cc + src/Mu2eG4Helper.cc src/VolumeInfo.cc LIBRARIES PUBLIC @@ -9,8 +10,7 @@ cet_make_library( cet_build_plugin(Mu2eG4Helper art::service REG_SOURCE src/Mu2eG4Helper_service.cc - IMPL_SOURCE src/Mu2eG4Helper_service.cc - LIBRARIES PUBLIC + LIBRARIES REG Offline::Mu2eG4Helper ) diff --git a/Mu2eInterfaces/CMakeLists.txt b/Mu2eInterfaces/CMakeLists.txt index 548bd8089a..de2fbcc135 100644 --- a/Mu2eInterfaces/CMakeLists.txt +++ b/Mu2eInterfaces/CMakeLists.txt @@ -1,11 +1,12 @@ -cet_make_library( +cet_make_library(INTERFACE SOURCE - src/ConditionsEntity.cc - src/Detector.cc - LIBRARIES PUBLIC + inc/ConditionsEntity.hh + inc/Detector.hh + inc/ProditionsCache.hh + inc/ProditionsEntity.hh + LIBRARIES INTERFACE Offline::DbTables ) -install_source(SUBDIRS src) install_headers(SUBDIRS inc) diff --git a/ProditionsService/CMakeLists.txt b/ProditionsService/CMakeLists.txt index a005bf95b6..453b98ca3b 100644 --- a/ProditionsService/CMakeLists.txt +++ b/ProditionsService/CMakeLists.txt @@ -16,8 +16,9 @@ cet_make_library(INTERFACE ) cet_build_plugin(ProditionsService art::service + IMPL_SOURCE src/ProditionsService.cc REG_SOURCE src/ProditionsService_service.cc - LIBRARIES REG + LIBRARIES PUBLIC Offline::ProditionsService Offline::AnalysisConditions diff --git a/SeedService/CMakeLists.txt b/SeedService/CMakeLists.txt index dd5f58dd58..da5c5423dd 100644 --- a/SeedService/CMakeLists.txt +++ b/SeedService/CMakeLists.txt @@ -1,9 +1,7 @@ -cet_make_library(INTERFACE +cet_make_library( SOURCE - inc/ArtState.hh - inc/EngineId.hh - inc/SeedService.hh - LIBRARIES INTERFACE + src/SeedService.cc + LIBRARIES PUBLIC art::Framework_Core fhiclcpp::fhiclcpp @@ -11,8 +9,7 @@ cet_make_library(INTERFACE cet_build_plugin(SeedService art::service REG_SOURCE src/SeedService_service.cc - IMPL_SOURCE src/SeedService_service.cc - LIBRARIES PUBLIC + LIBRARIES REG Offline::SeedService ) @@ -21,7 +18,7 @@ cet_build_plugin(SeedTest01 art::module REG_SOURCE src/SeedTest01_module.cc LIBRARIES REG Offline::SeedService - Offline::SeedService_SeedService_service + Offline::SeedService ) diff --git a/Sources/CMakeLists.txt b/Sources/CMakeLists.txt index 98207282c5..5f0ab70ea2 100644 --- a/Sources/CMakeLists.txt +++ b/Sources/CMakeLists.txt @@ -21,7 +21,7 @@ cet_build_plugin(FromCorsikaBinary art::source REG_SOURCE src/FromCorsikaBinary_source.cc LIBRARIES REG Offline::Sources - Offline::SeedService_SeedService_service + Offline::SeedService ) cet_build_plugin(FromEMFMARSFileWeighted art::source REG_SOURCE src/FromEMFMARSFileWeighted_source.cc diff --git a/TrackerMC/CMakeLists.txt b/TrackerMC/CMakeLists.txt index 452dbdef57..c0c7428173 100644 --- a/TrackerMC/CMakeLists.txt +++ b/TrackerMC/CMakeLists.txt @@ -58,7 +58,7 @@ cet_build_plugin(StrawDigisFromStrawGasSteps art::module Offline::Mu2eUtilities Offline::ProditionsService Offline::RecoDataProducts - Offline::SeedService_SeedService_service + Offline::SeedService Offline::TrackerConditions Offline::TrackerGeom ) diff --git a/UtilityModules/CMakeLists.txt b/UtilityModules/CMakeLists.txt index 00e91ddc52..b6b6fd2fb7 100644 --- a/UtilityModules/CMakeLists.txt +++ b/UtilityModules/CMakeLists.txt @@ -7,7 +7,7 @@ cet_build_plugin(ModifyTrackSPM art::module cet_build_plugin(NullProducer art::module REG_SOURCE src/NullProducer_module.cc LIBRARIES REG - Offline::SeedService_SeedService_service + Offline::SeedService ) cet_build_plugin(ReadTrackSPM art::module @@ -16,4 +16,10 @@ cet_build_plugin(ReadTrackSPM art::module Offline::MCDataProducts ) +cet_build_plugin(RecoNullProducer art::module + REG_SOURCE src/RecoNullProducer_module.cc + LIBRARIES REG + Offline::SeedService +) + install_source(SUBDIRS src) diff --git a/ups/product_deps b/ups/product_deps index a8ff7b172d..669eab9422 100644 --- a/ups/product_deps +++ b/ups/product_deps @@ -241,13 +241,13 @@ incdir product_dir include/Offline # entry to match for a given product. # product version qual flags -art_root_io v1_12_04 -gallery v1_21_03 -geant4 v4_11_1_p02a +art_root_io v1_13_01 +gallery v1_22_01 +geant4 v4_11_1_p02b xerces_c v3_2_3e -artdaq_core_mu2e v2_00_00 -BTrk v1_02_44 -KinKal v02_04_03 +artdaq_core_mu2e v2_01_02 +BTrk v1_02_45 +KinKal v02_05_00a cry v1_7q gsl v2_7 swig - only_for_build @@ -305,9 +305,9 @@ end_product_list # *required* unless the only_for_build flag is specified, in which # case it is optional. # -qualifier art_root_io gallery geant4 xerces_c artdaq_core_mu2e BTrk KinKal cry gsl -e28:s124:trig:debug e28:debug e28:debug e28:mt:debug e28 e28:s124:debug e28:p3915:debug e28:p3915:debug e28:debug -nq- -e28:s124:trig:prof e28:prof e28:prof e28:mt:prof e28 e28:s124:prof e28:p3915:prof e28:p3915:prof e28:prof -nq- +qualifier art_root_io gallery geant4 xerces_c artdaq_core_mu2e BTrk KinKal cry gsl +e28:s126:trig:debug e28:debug e28:debug e28:mt:debug e28 e28:s126:debug e28:p3915:debug e28:p3915:debug e28:debug -nq- +e28:s126:trig:prof e28:prof e28:prof e28:mt:prof e28 e28:s126:prof e28:p3915:prof e28:p3915:prof e28:prof -nq- end_qualifier_list #################################### From 5603742e0cb5dd4173faf2faa858d32fcce82d8b Mon Sep 17 00:00:00 2001 From: Eric Flumerfelt Date: Mon, 20 Nov 2023 11:53:00 -0600 Subject: [PATCH 019/213] Add s124 --- ups/product_deps | 35 +++++++++++++++++++++++------------ 1 file changed, 23 insertions(+), 12 deletions(-) diff --git a/ups/product_deps b/ups/product_deps index 669eab9422..c2a6586680 100644 --- a/ups/product_deps +++ b/ups/product_deps @@ -240,18 +240,22 @@ incdir product_dir include/Offline # * It is an error for more than one non-( == "-default-") # entry to match for a given product. # -product version qual flags -art_root_io v1_13_01 -gallery v1_22_01 -geant4 v4_11_1_p02b -xerces_c v3_2_3e -artdaq_core_mu2e v2_01_02 -BTrk v1_02_45 -KinKal v02_05_00a -cry v1_7q -gsl v2_7 -swig - only_for_build -cetmodules v3_21_02 - only_for_build +product version qual flags +art_root_io v1_13_01 s126 +art_root_io v1_12_04 s124 +gallery v1_22_01 s126 +gallery v1_21_03 s124 +geant4 v4_11_1_p02b +xerces_c v3_2_3e +artdaq_core_mu2e v2_01_02 +BTrk v1_02_45 s126 +BTrk v1_02_44 s124 +KinKal v02_05_00a s126 +KinKal v02_05_00 s124 +cry v1_7q +gsl v2_7 +swig - only_for_build +cetmodules v3_22_02 - only_for_build end_product_list #################################### @@ -308,6 +312,13 @@ end_product_list qualifier art_root_io gallery geant4 xerces_c artdaq_core_mu2e BTrk KinKal cry gsl e28:s126:trig:debug e28:debug e28:debug e28:mt:debug e28 e28:s126:debug e28:p3915:debug e28:p3915:debug e28:debug -nq- e28:s126:trig:prof e28:prof e28:prof e28:mt:prof e28 e28:s126:prof e28:p3915:prof e28:p3915:prof e28:prof -nq- +e20:s126:trig:debug e20:debug e20:debug e20:mt:debug e20 e20:s126:debug e20:p3915:debug e20:p3915:debug e20:debug -nq- +e20:s126:trig:prof e20:prof e20:prof e20:mt:prof e20 e20:s126:prof e20:p3915:prof e20:p3915:prof e20:prof -nq- + +e28:s124:trig:debug e28:debug e28:debug e28:mt:debug e28 e28:s124:debug e28:p3915:debug e28:p3915:debug e28:debug -nq- +e28:s124:trig:prof e28:prof e28:prof e28:mt:prof e28 e28:s124:prof e28:p3915:prof e28:p3915:prof e28:prof -nq- +e20:s124:trig:debug e20:debug e20:debug e20:mt:debug e20 e20:s124:debug e20:p3915:debug e20:p3915:debug e20:debug -nq- +e20:s124:trig:prof e20:prof e20:prof e20:mt:prof e20 e20:s124:prof e20:p3915:prof e20:p3915:prof e20:prof -nq- end_qualifier_list #################################### From a410f69daa2db2433bfe18458862d627604c1179 Mon Sep 17 00:00:00 2001 From: Eric Flumerfelt Date: Mon, 20 Nov 2023 12:37:28 -0600 Subject: [PATCH 020/213] Remove e20 builds --- ups/product_deps | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/ups/product_deps b/ups/product_deps index c2a6586680..203bcea592 100644 --- a/ups/product_deps +++ b/ups/product_deps @@ -245,7 +245,8 @@ art_root_io v1_13_01 s126 art_root_io v1_12_04 s124 gallery v1_22_01 s126 gallery v1_21_03 s124 -geant4 v4_11_1_p02b +geant4 v4_11_1_p02b s126 +geant4 v4_11_1_p02a s124 xerces_c v3_2_3e artdaq_core_mu2e v2_01_02 BTrk v1_02_45 s126 @@ -312,13 +313,9 @@ end_product_list qualifier art_root_io gallery geant4 xerces_c artdaq_core_mu2e BTrk KinKal cry gsl e28:s126:trig:debug e28:debug e28:debug e28:mt:debug e28 e28:s126:debug e28:p3915:debug e28:p3915:debug e28:debug -nq- e28:s126:trig:prof e28:prof e28:prof e28:mt:prof e28 e28:s126:prof e28:p3915:prof e28:p3915:prof e28:prof -nq- -e20:s126:trig:debug e20:debug e20:debug e20:mt:debug e20 e20:s126:debug e20:p3915:debug e20:p3915:debug e20:debug -nq- -e20:s126:trig:prof e20:prof e20:prof e20:mt:prof e20 e20:s126:prof e20:p3915:prof e20:p3915:prof e20:prof -nq- e28:s124:trig:debug e28:debug e28:debug e28:mt:debug e28 e28:s124:debug e28:p3915:debug e28:p3915:debug e28:debug -nq- e28:s124:trig:prof e28:prof e28:prof e28:mt:prof e28 e28:s124:prof e28:p3915:prof e28:p3915:prof e28:prof -nq- -e20:s124:trig:debug e20:debug e20:debug e20:mt:debug e20 e20:s124:debug e20:p3915:debug e20:p3915:debug e20:debug -nq- -e20:s124:trig:prof e20:prof e20:prof e20:mt:prof e20 e20:s124:prof e20:p3915:prof e20:p3915:prof e20:prof -nq- end_qualifier_list #################################### From dfb88460f77ca076292983860039ea6aae3261da Mon Sep 17 00:00:00 2001 From: Eric Flumerfelt Date: Mon, 20 Nov 2023 12:43:28 -0600 Subject: [PATCH 021/213] Export dependencies --- CMakeLists.txt | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 7db1f227a2..212b95bce5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -17,15 +17,15 @@ cet_set_compiler_flags(DIAGS VIGILANT include_directories(${CMAKE_CURRENT_SOURCE_DIR}/..) -find_package(art_root_io REQUIRED) -find_package(GSL REQUIRED) -find_package(PostgreSQL REQUIRED) -find_package(CURL REQUIRED) -find_package(Boost COMPONENTS iostreams program_options REQUIRED) -find_package(XercesC REQUIRED) -find_package(BLAS REQUIRED) -find_package(artdaq_core_mu2e REQUIRED) -find_package(Geant4) +find_package(art_root_io REQUIRED EXPORT) +find_package(GSL REQUIRED EXPORT) +find_package(PostgreSQL REQUIRED EXPORT) +find_package(CURL REQUIRED EXPORT) +find_package(Boost COMPONENTS iostreams program_options REQUIRED EXPORT) +find_package(XercesC REQUIRED EXPORT) +find_package(BLAS REQUIRED EXPORT) +find_package(artdaq_core_mu2e REQUIRED EXPORT) +find_package(Geant4 REQUIRED EXPORT) # TODO: Find or implement FindCRY.cmake include_directories($ENV{CRYHOME}/src) From ff939ff7173c3cdc5d4ccfd41652fa66d14e0da4 Mon Sep 17 00:00:00 2001 From: Eric Flumerfelt Date: Mon, 20 Nov 2023 14:54:00 -0600 Subject: [PATCH 022/213] Fix install_fhicl and install_headers to produce correct output directories --- Analyses/CMakeLists.txt | 2 +- AnalysisConditions/CMakeLists.txt | 4 +- AnalysisConfig/CMakeLists.txt | 2 +- BFieldGeom/CMakeLists.txt | 2 +- BTrkData/CMakeLists.txt | 2 +- BeamlineGeom/CMakeLists.txt | 2 +- CMakeLists.txt | 2 +- CMakePresets.json | 52 +++++++------------ CRVConditions/CMakeLists.txt | 4 +- CRVConfig/CMakeLists.txt | 2 +- CRVFilters/CMakeLists.txt | 2 +- CRVReco/CMakeLists.txt | 4 +- CRVResponse/CMakeLists.txt | 4 +- CalPatRec/CMakeLists.txt | 4 +- CaloCluster/CMakeLists.txt | 4 +- CaloConditions/CMakeLists.txt | 4 +- CaloConfig/CMakeLists.txt | 2 +- CaloFilters/CMakeLists.txt | 2 +- CaloMC/CMakeLists.txt | 4 +- CaloReco/CMakeLists.txt | 4 +- CalorimeterGeom/CMakeLists.txt | 2 +- CommonMC/CMakeLists.txt | 2 +- Compression/CMakeLists.txt | 4 +- ConditionsBase/CMakeLists.txt | 2 +- ConditionsService/CMakeLists.txt | 2 +- ConfigTools/CMakeLists.txt | 2 +- CosmicRayShieldGeom/CMakeLists.txt | 2 +- CosmicReco/CMakeLists.txt | 4 +- DAQ/CMakeLists.txt | 4 +- DAQConditions/CMakeLists.txt | 4 +- DAQConfig/CMakeLists.txt | 2 +- DataProducts/CMakeLists.txt | 2 +- DbService/CMakeLists.txt | 4 +- DbTables/CMakeLists.txt | 2 +- DetectorSolenoidGeom/CMakeLists.txt | 2 +- EventDisplay/CMakeLists.txt | 2 +- EventGenerator/CMakeLists.txt | 4 +- EventMixing/CMakeLists.txt | 4 +- ExternalShieldingGeom/CMakeLists.txt | 2 +- ExtinctionMonitorFNAL/Analyses/CMakeLists.txt | 2 +- ExtinctionMonitorFNAL/CMakeLists.txt | 2 +- .../Digitization/CMakeLists.txt | 2 +- ExtinctionMonitorFNAL/Geometry/CMakeLists.txt | 2 +- .../Reconstruction/CMakeLists.txt | 2 +- .../Utilities/CMakeLists.txt | 2 +- Filters/CMakeLists.txt | 2 +- GeneralUtilities/CMakeLists.txt | 2 +- GeomPrimitives/CMakeLists.txt | 2 +- GeometryService/CMakeLists.txt | 2 +- GlobalConstantsService/CMakeLists.txt | 2 +- KinKalGeom/CMakeLists.txt | 2 +- MBSGeom/CMakeLists.txt | 2 +- MCDataProducts/CMakeLists.txt | 2 +- MECOStyleProtonAbsorberGeom/CMakeLists.txt | 2 +- Mu2eBTrk/CMakeLists.txt | 2 +- Mu2eG4/CMakeLists.txt | 4 +- Mu2eG4Helper/CMakeLists.txt | 2 +- Mu2eHallGeom/CMakeLists.txt | 2 +- Mu2eInterfaces/CMakeLists.txt | 2 +- Mu2eKinKal/CMakeLists.txt | 4 +- Mu2eUtilities/CMakeLists.txt | 2 +- PTMGeom/CMakeLists.txt | 2 +- ParticleID/CMakeLists.txt | 4 +- Print/CMakeLists.txt | 4 +- ProditionsService/CMakeLists.txt | 4 +- ProductionSolenoidGeom/CMakeLists.txt | 2 +- ProductionTargetGeom/CMakeLists.txt | 2 +- ProtonBeamDumpGeom/CMakeLists.txt | 2 +- RecoDataProducts/CMakeLists.txt | 2 +- STMConditions/CMakeLists.txt | 4 +- STMConfig/CMakeLists.txt | 2 +- STMGeom/CMakeLists.txt | 2 +- STMReco/CMakeLists.txt | 2 +- SeedService/CMakeLists.txt | 2 +- ServicesGeom/CMakeLists.txt | 2 +- SimulationConditions/CMakeLists.txt | 4 +- SimulationConfig/CMakeLists.txt | 2 +- Sources/CMakeLists.txt | 2 +- StoppingTargetGeom/CMakeLists.txt | 2 +- TEveEventDisplay/CMakeLists.txt | 2 +- TestTools/CMakeLists.txt | 2 +- TrackCaloMatching/CMakeLists.txt | 2 +- TrackerConditions/CMakeLists.txt | 4 +- TrackerConfig/CMakeLists.txt | 2 +- TrackerGeom/CMakeLists.txt | 2 +- TrackerMC/CMakeLists.txt | 4 +- Trigger/CMakeLists.txt | 2 +- TrkDiag/CMakeLists.txt | 4 +- TrkExt/CMakeLists.txt | 2 +- TrkFilters/CMakeLists.txt | 2 +- TrkHitReco/CMakeLists.txt | 4 +- TrkPatRec/CMakeLists.txt | 4 +- TrkReco/CMakeLists.txt | 4 +- Validation/CMakeLists.txt | 4 +- make_cmake.sh | 4 +- ups/product_deps | 4 +- 96 files changed, 147 insertions(+), 159 deletions(-) diff --git a/Analyses/CMakeLists.txt b/Analyses/CMakeLists.txt index 5e3bc455bf..31ade2f95b 100644 --- a/Analyses/CMakeLists.txt +++ b/Analyses/CMakeLists.txt @@ -830,4 +830,4 @@ cet_build_plugin(VMMonitor art::module ) install_source(SUBDIRS src) -install_fhicl(SUBDIRS fcl SUBDIRNAME Analyses) +install_fhicl(SUBDIRS fcl SUBDIRNAME Offline/Analyses/fcl) diff --git a/AnalysisConditions/CMakeLists.txt b/AnalysisConditions/CMakeLists.txt index f3af2ee325..6cf3122a7c 100644 --- a/AnalysisConditions/CMakeLists.txt +++ b/AnalysisConditions/CMakeLists.txt @@ -15,5 +15,5 @@ cet_make_library(INTERFACE Offline::RecoDataProducts ) -install_headers(SUBDIRS inc) -install_fhicl(SUBDIRS fcl SUBDIRNAME AnalysisConditions) +install_headers(USE_PROJECT_NAME SUBDIRS inc) +install_fhicl(SUBDIRS fcl SUBDIRNAME Offline/AnalysisConditions/fcl) diff --git a/AnalysisConfig/CMakeLists.txt b/AnalysisConfig/CMakeLists.txt index b262f112dc..f7554913f7 100644 --- a/AnalysisConfig/CMakeLists.txt +++ b/AnalysisConfig/CMakeLists.txt @@ -5,4 +5,4 @@ cet_make_library(INTERFACE ) -install_headers(SUBDIRS inc) +install_headers(USE_PROJECT_NAME SUBDIRS inc) diff --git a/BFieldGeom/CMakeLists.txt b/BFieldGeom/CMakeLists.txt index 1f2159376f..9e1364cad4 100644 --- a/BFieldGeom/CMakeLists.txt +++ b/BFieldGeom/CMakeLists.txt @@ -15,4 +15,4 @@ cet_make_library( ) install_source(SUBDIRS src) -install_headers(SUBDIRS inc) +install_headers(USE_PROJECT_NAME SUBDIRS inc) diff --git a/BTrkData/CMakeLists.txt b/BTrkData/CMakeLists.txt index 07231c2dba..f8525baf1b 100644 --- a/BTrkData/CMakeLists.txt +++ b/BTrkData/CMakeLists.txt @@ -11,4 +11,4 @@ cet_make_library( ) install_source(SUBDIRS src) -install_headers(SUBDIRS inc) +install_headers(USE_PROJECT_NAME SUBDIRS inc) diff --git a/BeamlineGeom/CMakeLists.txt b/BeamlineGeom/CMakeLists.txt index 208ff8fe6d..bbad5ea825 100644 --- a/BeamlineGeom/CMakeLists.txt +++ b/BeamlineGeom/CMakeLists.txt @@ -9,4 +9,4 @@ cet_make_library( ) install_source(SUBDIRS src) -install_headers(SUBDIRS inc) +install_headers(USE_PROJECT_NAME SUBDIRS inc) diff --git a/CMakeLists.txt b/CMakeLists.txt index 212b95bce5..a40808b58d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -140,6 +140,6 @@ add_subdirectory(ups_install) add_subdirectory(UtilityModules) add_subdirectory(Validation) -install_fhicl(SUBDIRS fcl) +install_fhicl(SUBDIRS fcl SUBDIRNAME Offline/fcl) cet_cmake_config() \ No newline at end of file diff --git a/CMakePresets.json b/CMakePresets.json index 8f22565635..9af163464f 100644 --- a/CMakePresets.json +++ b/CMakePresets.json @@ -13,18 +13,6 @@ "CMAKE_CXX_STANDARD_REQUIRED" : { "type" : "BOOL", "value" : "ON" - }, - "offline_ADD_NOARCH_DIRS_INIT" : { - "type" : "INTERNAL", - "value" : "INCLUDE_DIR;FHICL_DIR" - }, - "offline_FHICL_DIR_INIT" : { - "type" : "STRING", - "value" : "fcl/Offline" - }, - "offline_INCLUDE_DIR_INIT" : { - "type" : "STRING", - "value" : "include/Offline" } }, "description" : "Configuration settings translated from ups/product_deps", @@ -50,6 +38,26 @@ "type" : "STRING", "value" : "$env{CETPKG_Fortran_COMPILER}" }, + "Offline_EXEC_PREFIX_INIT" : { + "type" : "STRING", + "value" : "$env{CETPKG_FQ_DIR}" + }, + "Offline_UPS_BUILD_ONLY_DEPENDENCIES_INIT" : { + "type" : "STRING", + "value" : "cetmodules" + }, + "Offline_UPS_PRODUCT_FLAVOR_INIT" : { + "type" : "STRING", + "value" : "$env{CETPKG_FLAVOR}" + }, + "Offline_UPS_PRODUCT_NAME_INIT" : { + "type" : "STRING", + "value" : "Offline" + }, + "Offline_UPS_QUALIFIER_STRING_INIT" : { + "type" : "STRING", + "value" : "$env{CETPKG_QUALSPEC}" + }, "UPS_CXX_COMPILER_ID" : { "type" : "STRING", "value" : "$env{CETPKG_CXX_COMPILER_ID}" @@ -77,26 +85,6 @@ "WANT_UPS" : { "type" : "BOOL", "value" : true - }, - "offline_EXEC_PREFIX_INIT" : { - "type" : "STRING", - "value" : "$env{CETPKG_FQ_DIR}" - }, - "offline_UPS_BUILD_ONLY_DEPENDENCIES_INIT" : { - "type" : "STRING", - "value" : "cetmodules" - }, - "offline_UPS_PRODUCT_FLAVOR_INIT" : { - "type" : "STRING", - "value" : "$env{CETPKG_FLAVOR}" - }, - "offline_UPS_PRODUCT_NAME_INIT" : { - "type" : "STRING", - "value" : "offline" - }, - "offline_UPS_QUALIFIER_STRING_INIT" : { - "type" : "STRING", - "value" : "$env{CETPKG_QUALSPEC}" } }, "description" : "Extra configuration for UPS package generation", diff --git a/CRVConditions/CMakeLists.txt b/CRVConditions/CMakeLists.txt index 412f994e49..ec1f537c51 100644 --- a/CRVConditions/CMakeLists.txt +++ b/CRVConditions/CMakeLists.txt @@ -15,5 +15,5 @@ cet_make_library( ) install_source(SUBDIRS src) -install_headers(SUBDIRS inc) -install_fhicl(SUBDIRS fcl SUBDIRNAME CRVConditions) +install_headers(USE_PROJECT_NAME SUBDIRS inc) +install_fhicl(SUBDIRS fcl SUBDIRNAME Offline/CRVConditions/fcl) diff --git a/CRVConfig/CMakeLists.txt b/CRVConfig/CMakeLists.txt index f92cc293ea..eb0e1e4ba6 100644 --- a/CRVConfig/CMakeLists.txt +++ b/CRVConfig/CMakeLists.txt @@ -7,4 +7,4 @@ cet_make_library(INTERFACE ) -install_headers(SUBDIRS inc) +install_headers(USE_PROJECT_NAME SUBDIRS inc) diff --git a/CRVFilters/CMakeLists.txt b/CRVFilters/CMakeLists.txt index bb46eb5053..fc86f66072 100644 --- a/CRVFilters/CMakeLists.txt +++ b/CRVFilters/CMakeLists.txt @@ -9,4 +9,4 @@ cet_build_plugin(CrvCoincidenceClusterFilter art::module ) install_source(SUBDIRS src) -install_fhicl(SUBDIRS fcl SUBDIRNAME CRVFilters) +install_fhicl(SUBDIRS fcl SUBDIRNAME Offline/CRVFilters/fcl) diff --git a/CRVReco/CMakeLists.txt b/CRVReco/CMakeLists.txt index af97fd49e3..df4336f683 100644 --- a/CRVReco/CMakeLists.txt +++ b/CRVReco/CMakeLists.txt @@ -36,5 +36,5 @@ cet_build_plugin(CrvRecoPulsesFinder art::module ) install_source(SUBDIRS src) -install_headers(SUBDIRS inc) -install_fhicl(SUBDIRS fcl SUBDIRNAME CRVReco) +install_headers(USE_PROJECT_NAME SUBDIRS inc) +install_fhicl(SUBDIRS fcl SUBDIRNAME Offline/CRVReco/fcl) diff --git a/CRVResponse/CMakeLists.txt b/CRVResponse/CMakeLists.txt index 29f8ce33cc..7526845fe6 100644 --- a/CRVResponse/CMakeLists.txt +++ b/CRVResponse/CMakeLists.txt @@ -163,5 +163,5 @@ cet_build_plugin(MakeCrvCoincidenceClusterMCAssns art::module ) install_source(SUBDIRS src) -install_headers(SUBDIRS inc) -install_fhicl(SUBDIRS fcl SUBDIRNAME CRVResponse) +install_headers(USE_PROJECT_NAME SUBDIRS inc) +install_fhicl(SUBDIRS fcl SUBDIRNAME Offline/CRVResponse/fcl) diff --git a/CalPatRec/CMakeLists.txt b/CalPatRec/CMakeLists.txt index a62285b0b3..624a893c29 100644 --- a/CalPatRec/CMakeLists.txt +++ b/CalPatRec/CMakeLists.txt @@ -209,5 +209,5 @@ art_dictionary( NO_CHECK_CLASS_VERSION # For some reason this segfaults Offline::CalPatRec ) install_source(SUBDIRS src) -install_headers(SUBDIRS inc) -install_fhicl(SUBDIRS fcl SUBDIRNAME CalPatRec) +install_headers(USE_PROJECT_NAME SUBDIRS inc) +install_fhicl(SUBDIRS fcl SUBDIRNAME Offline/CalPatRec/fcl) diff --git a/CaloCluster/CMakeLists.txt b/CaloCluster/CMakeLists.txt index 64fedcef9a..5c96c694b7 100644 --- a/CaloCluster/CMakeLists.txt +++ b/CaloCluster/CMakeLists.txt @@ -54,5 +54,5 @@ cet_build_plugin(CaloTrigger art::module ) install_source(SUBDIRS src) -install_headers(SUBDIRS inc) -install_fhicl(SUBDIRS fcl SUBDIRNAME CaloCluster) +install_headers(USE_PROJECT_NAME SUBDIRS inc) +install_fhicl(SUBDIRS fcl SUBDIRNAME Offline/CaloCluster/fcl) diff --git a/CaloConditions/CMakeLists.txt b/CaloConditions/CMakeLists.txt index 0fe3304ece..9978399aab 100644 --- a/CaloConditions/CMakeLists.txt +++ b/CaloConditions/CMakeLists.txt @@ -17,5 +17,5 @@ cet_make_library( ) install_source(SUBDIRS src) -install_headers(SUBDIRS inc) -install_fhicl(SUBDIRS fcl SUBDIRNAME CaloConditions) +install_headers(USE_PROJECT_NAME SUBDIRS inc) +install_fhicl(SUBDIRS fcl SUBDIRNAME Offline/CaloConditions/fcl) diff --git a/CaloConfig/CMakeLists.txt b/CaloConfig/CMakeLists.txt index 43af8b7d5c..248359ef15 100644 --- a/CaloConfig/CMakeLists.txt +++ b/CaloConfig/CMakeLists.txt @@ -6,4 +6,4 @@ cet_make_library(INTERFACE ) -install_headers(SUBDIRS inc) +install_headers(USE_PROJECT_NAME SUBDIRS inc) diff --git a/CaloFilters/CMakeLists.txt b/CaloFilters/CMakeLists.txt index 21fe6c28ce..ebe2e6830a 100644 --- a/CaloFilters/CMakeLists.txt +++ b/CaloFilters/CMakeLists.txt @@ -72,4 +72,4 @@ cet_build_plugin(FilterEcalNNTrigger art::module ) install_source(SUBDIRS src) -install_fhicl(SUBDIRS fcl SUBDIRNAME CaloFilters) +install_fhicl(SUBDIRS fcl SUBDIRNAME Offline/CaloFilters/fcl) diff --git a/CaloMC/CMakeLists.txt b/CaloMC/CMakeLists.txt index c3c12b7d86..c360e61e5b 100644 --- a/CaloMC/CMakeLists.txt +++ b/CaloMC/CMakeLists.txt @@ -86,5 +86,5 @@ cet_build_plugin(CaloShowerUpdater art::module ) install_source(SUBDIRS src) -install_headers(SUBDIRS inc) -install_fhicl(SUBDIRS fcl SUBDIRNAME CaloMC) +install_headers(USE_PROJECT_NAME SUBDIRS inc) +install_fhicl(SUBDIRS fcl SUBDIRNAME Offline/CaloMC/fcl) diff --git a/CaloReco/CMakeLists.txt b/CaloReco/CMakeLists.txt index 95808a71ba..1e1ff5c0d6 100644 --- a/CaloReco/CMakeLists.txt +++ b/CaloReco/CMakeLists.txt @@ -43,5 +43,5 @@ cet_build_plugin(CaloRecoDigiMaker art::module ) install_source(SUBDIRS src) -install_headers(SUBDIRS inc) -install_fhicl(SUBDIRS fcl SUBDIRNAME CaloReco) +install_headers(USE_PROJECT_NAME SUBDIRS inc) +install_fhicl(SUBDIRS fcl SUBDIRNAME Offline/CaloReco/fcl) diff --git a/CalorimeterGeom/CMakeLists.txt b/CalorimeterGeom/CMakeLists.txt index bd8f12f98a..7b90cc333d 100644 --- a/CalorimeterGeom/CMakeLists.txt +++ b/CalorimeterGeom/CMakeLists.txt @@ -12,4 +12,4 @@ cet_make_library( ) install_source(SUBDIRS src) -install_headers(SUBDIRS inc) +install_headers(USE_PROJECT_NAME SUBDIRS inc) diff --git a/CommonMC/CMakeLists.txt b/CommonMC/CMakeLists.txt index 47acc43fdb..7dee19a0cf 100644 --- a/CommonMC/CMakeLists.txt +++ b/CommonMC/CMakeLists.txt @@ -82,4 +82,4 @@ cet_build_plugin(StoppedParticlesFinder art::module ) install_source(SUBDIRS src) -install_fhicl(SUBDIRS fcl SUBDIRNAME CommonMC) +install_fhicl(SUBDIRS fcl SUBDIRNAME Offline/CommonMC/fcl) diff --git a/Compression/CMakeLists.txt b/Compression/CMakeLists.txt index 92b9ccdf39..743a523400 100644 --- a/Compression/CMakeLists.txt +++ b/Compression/CMakeLists.txt @@ -36,5 +36,5 @@ cet_build_plugin(CompressDigiMCs art::module ) install_source(SUBDIRS src) -install_headers(SUBDIRS inc) -install_fhicl(SUBDIRS fcl SUBDIRNAME Compression) +install_headers(USE_PROJECT_NAME SUBDIRS inc) +install_fhicl(SUBDIRS fcl SUBDIRNAME Offline/Compression/fcl) diff --git a/ConditionsBase/CMakeLists.txt b/ConditionsBase/CMakeLists.txt index bf51eb90a0..f922720ebe 100644 --- a/ConditionsBase/CMakeLists.txt +++ b/ConditionsBase/CMakeLists.txt @@ -5,4 +5,4 @@ cet_make_library(INTERFACE ) -install_headers(SUBDIRS inc) +install_headers(USE_PROJECT_NAME SUBDIRS inc) diff --git a/ConditionsService/CMakeLists.txt b/ConditionsService/CMakeLists.txt index 7b09ea52b8..0030a745aa 100644 --- a/ConditionsService/CMakeLists.txt +++ b/ConditionsService/CMakeLists.txt @@ -19,4 +19,4 @@ cet_build_plugin(ConditionsService art::service ) install_source(SUBDIRS src) -install_headers(SUBDIRS inc) +install_headers(USE_PROJECT_NAME SUBDIRS inc) diff --git a/ConfigTools/CMakeLists.txt b/ConfigTools/CMakeLists.txt index 61c73a6e38..adfb8b9e8b 100644 --- a/ConfigTools/CMakeLists.txt +++ b/ConfigTools/CMakeLists.txt @@ -10,4 +10,4 @@ cet_make_library( ) install_source(SUBDIRS src) -install_headers(SUBDIRS inc) +install_headers(USE_PROJECT_NAME SUBDIRS inc) diff --git a/CosmicRayShieldGeom/CMakeLists.txt b/CosmicRayShieldGeom/CMakeLists.txt index 02c3452508..2430ae1198 100644 --- a/CosmicRayShieldGeom/CMakeLists.txt +++ b/CosmicRayShieldGeom/CMakeLists.txt @@ -17,4 +17,4 @@ cet_make_library( ) install_source(SUBDIRS src) -install_headers(SUBDIRS inc) +install_headers(USE_PROJECT_NAME SUBDIRS inc) diff --git a/CosmicReco/CMakeLists.txt b/CosmicReco/CMakeLists.txt index d6a2de6574..b4b1ce8c61 100644 --- a/CosmicReco/CMakeLists.txt +++ b/CosmicReco/CMakeLists.txt @@ -164,5 +164,5 @@ cet_build_plugin(SimpleTimeCluster art::module ) install_source(SUBDIRS src) -install_headers(SUBDIRS inc) -install_fhicl(SUBDIRS fcl SUBDIRNAME CosmicReco) +install_headers(USE_PROJECT_NAME SUBDIRS inc) +install_fhicl(SUBDIRS fcl SUBDIRNAME Offline/CosmicReco/fcl) diff --git a/DAQ/CMakeLists.txt b/DAQ/CMakeLists.txt index b95c1f8b83..545279d3bf 100644 --- a/DAQ/CMakeLists.txt +++ b/DAQ/CMakeLists.txt @@ -104,5 +104,5 @@ cet_build_plugin(StrawRecoFromFragments art::module ) install_source(SUBDIRS src) -install_headers(SUBDIRS inc) -install_fhicl(SUBDIRS fcl SUBDIRNAME DAQ) +install_headers(USE_PROJECT_NAME SUBDIRS inc) +install_fhicl(SUBDIRS fcl SUBDIRNAME Offline/DAQ/fcl) diff --git a/DAQConditions/CMakeLists.txt b/DAQConditions/CMakeLists.txt index 200d81aa9a..17e1f2e53e 100644 --- a/DAQConditions/CMakeLists.txt +++ b/DAQConditions/CMakeLists.txt @@ -11,5 +11,5 @@ cet_make_library( ) install_source(SUBDIRS src) -install_headers(SUBDIRS inc) -install_fhicl(SUBDIRS fcl SUBDIRNAME DAQConditions) +install_headers(USE_PROJECT_NAME SUBDIRS inc) +install_fhicl(SUBDIRS fcl SUBDIRNAME Offline/DAQConditions/fcl) diff --git a/DAQConfig/CMakeLists.txt b/DAQConfig/CMakeLists.txt index 27cca3ab6a..c30a52add9 100644 --- a/DAQConfig/CMakeLists.txt +++ b/DAQConfig/CMakeLists.txt @@ -5,4 +5,4 @@ cet_make_library(INTERFACE ) -install_headers(SUBDIRS inc) +install_headers(USE_PROJECT_NAME SUBDIRS inc) diff --git a/DataProducts/CMakeLists.txt b/DataProducts/CMakeLists.txt index 2e959a67e7..34f4714ebc 100644 --- a/DataProducts/CMakeLists.txt +++ b/DataProducts/CMakeLists.txt @@ -25,4 +25,4 @@ art_dictionary( NO_CHECK_CLASS_VERSION # For some reason this segfaults Offline::DataProducts ) install_source(SUBDIRS src) -install_headers(SUBDIRS inc) +install_headers(USE_PROJECT_NAME SUBDIRS inc) diff --git a/DbService/CMakeLists.txt b/DbService/CMakeLists.txt index 293fd040a9..4abebcbb48 100644 --- a/DbService/CMakeLists.txt +++ b/DbService/CMakeLists.txt @@ -50,5 +50,5 @@ cet_build_plugin(DbServiceTest art::module ) install_source(SUBDIRS src) -install_headers(SUBDIRS inc) -install_fhicl(SUBDIRS fcl SUBDIRNAME DbService) +install_headers(USE_PROJECT_NAME SUBDIRS inc) +install_fhicl(SUBDIRS fcl SUBDIRNAME Offline/DbService/fcl) diff --git a/DbTables/CMakeLists.txt b/DbTables/CMakeLists.txt index 494e40c016..db39970084 100644 --- a/DbTables/CMakeLists.txt +++ b/DbTables/CMakeLists.txt @@ -14,4 +14,4 @@ cet_make_library( ) install_source(SUBDIRS src) -install_headers(SUBDIRS inc) +install_headers(USE_PROJECT_NAME SUBDIRS inc) diff --git a/DetectorSolenoidGeom/CMakeLists.txt b/DetectorSolenoidGeom/CMakeLists.txt index e426968eb5..7235f7ebe3 100644 --- a/DetectorSolenoidGeom/CMakeLists.txt +++ b/DetectorSolenoidGeom/CMakeLists.txt @@ -8,4 +8,4 @@ cet_make_library( ) install_source(SUBDIRS src) -install_headers(SUBDIRS inc) +install_headers(USE_PROJECT_NAME SUBDIRS inc) diff --git a/EventDisplay/CMakeLists.txt b/EventDisplay/CMakeLists.txt index 265c05b0f4..3d9dcd80e5 100644 --- a/EventDisplay/CMakeLists.txt +++ b/EventDisplay/CMakeLists.txt @@ -46,4 +46,4 @@ art_dictionary( NO_CHECK_CLASS_VERSION # For some reason this segfaults Offline::EventDisplay ) install_source(SUBDIRS src) -install_fhicl(SUBDIRS fcl SUBDIRNAME EventDisplay) +install_fhicl(SUBDIRS fcl SUBDIRNAME Offline/EventDisplay/fcl) diff --git a/EventGenerator/CMakeLists.txt b/EventGenerator/CMakeLists.txt index 7b489e3d9d..12e1b97f3d 100644 --- a/EventGenerator/CMakeLists.txt +++ b/EventGenerator/CMakeLists.txt @@ -570,5 +570,5 @@ cet_build_plugin(MuplusMichelGenerator art::tool ) install_source(SUBDIRS src) -install_headers(SUBDIRS inc) -install_fhicl(SUBDIRS fcl SUBDIRNAME EventGenerator) +install_headers(USE_PROJECT_NAME SUBDIRS inc) +install_fhicl(SUBDIRS fcl SUBDIRNAME Offline/EventGenerator/fcl) diff --git a/EventMixing/CMakeLists.txt b/EventMixing/CMakeLists.txt index 254aedba96..8bea5a5899 100644 --- a/EventMixing/CMakeLists.txt +++ b/EventMixing/CMakeLists.txt @@ -52,5 +52,5 @@ cet_build_plugin(ResamplingMixer art::module ) install_source(SUBDIRS src) -install_headers(SUBDIRS inc) -install_fhicl(SUBDIRS fcl SUBDIRNAME EventMixing) +install_headers(USE_PROJECT_NAME SUBDIRS inc) +install_fhicl(SUBDIRS fcl SUBDIRNAME Offline/EventMixing/fcl) diff --git a/ExternalShieldingGeom/CMakeLists.txt b/ExternalShieldingGeom/CMakeLists.txt index 075b7f8ee5..6ade9448b9 100644 --- a/ExternalShieldingGeom/CMakeLists.txt +++ b/ExternalShieldingGeom/CMakeLists.txt @@ -9,4 +9,4 @@ cet_make_library( ) install_source(SUBDIRS src) -install_headers(SUBDIRS inc) +install_headers(USE_PROJECT_NAME SUBDIRS inc) diff --git a/ExtinctionMonitorFNAL/Analyses/CMakeLists.txt b/ExtinctionMonitorFNAL/Analyses/CMakeLists.txt index b495be6f2d..383ded589b 100644 --- a/ExtinctionMonitorFNAL/Analyses/CMakeLists.txt +++ b/ExtinctionMonitorFNAL/Analyses/CMakeLists.txt @@ -184,4 +184,4 @@ cet_build_plugin(MARSGenParticleHist art::module ) install_source(SUBDIRS src) -install_headers(SUBDIRS inc) +install_headers(USE_PROJECT_NAME SUBDIRS inc) diff --git a/ExtinctionMonitorFNAL/CMakeLists.txt b/ExtinctionMonitorFNAL/CMakeLists.txt index 4746a9e6b0..4c15b77427 100644 --- a/ExtinctionMonitorFNAL/CMakeLists.txt +++ b/ExtinctionMonitorFNAL/CMakeLists.txt @@ -7,4 +7,4 @@ add_subdirectory(Reconstruction) add_subdirectory(TruthAlgs) add_subdirectory(Utilities) -install_fhicl(SUBDIRS fcl SUBDIRNAME ExtinctionMonitorFNAL) +install_fhicl(SUBDIRS fcl SUBDIRNAME Offline/ExtinctionMonitorFNAL/fcl) diff --git a/ExtinctionMonitorFNAL/Digitization/CMakeLists.txt b/ExtinctionMonitorFNAL/Digitization/CMakeLists.txt index c50eacb0b9..14663cd515 100644 --- a/ExtinctionMonitorFNAL/Digitization/CMakeLists.txt +++ b/ExtinctionMonitorFNAL/Digitization/CMakeLists.txt @@ -28,4 +28,4 @@ cet_build_plugin(ExtMonFNALHitMaker art::module ) install_source(SUBDIRS src) -install_headers(SUBDIRS inc) +install_headers(USE_PROJECT_NAME SUBDIRS inc) diff --git a/ExtinctionMonitorFNAL/Geometry/CMakeLists.txt b/ExtinctionMonitorFNAL/Geometry/CMakeLists.txt index 09c72bd7a9..32056d1951 100644 --- a/ExtinctionMonitorFNAL/Geometry/CMakeLists.txt +++ b/ExtinctionMonitorFNAL/Geometry/CMakeLists.txt @@ -18,4 +18,4 @@ cet_make_library( ) install_source(SUBDIRS src) -install_headers(SUBDIRS inc) +install_headers(USE_PROJECT_NAME SUBDIRS inc) diff --git a/ExtinctionMonitorFNAL/Reconstruction/CMakeLists.txt b/ExtinctionMonitorFNAL/Reconstruction/CMakeLists.txt index 79bff5f865..4461a489ef 100644 --- a/ExtinctionMonitorFNAL/Reconstruction/CMakeLists.txt +++ b/ExtinctionMonitorFNAL/Reconstruction/CMakeLists.txt @@ -45,4 +45,4 @@ cet_build_plugin(ExtMonFNALRecoClusterization art::module ) install_source(SUBDIRS src) -install_headers(SUBDIRS inc) +install_headers(USE_PROJECT_NAME SUBDIRS inc) diff --git a/ExtinctionMonitorFNAL/Utilities/CMakeLists.txt b/ExtinctionMonitorFNAL/Utilities/CMakeLists.txt index 783bffe8a2..2dd5d91ef7 100644 --- a/ExtinctionMonitorFNAL/Utilities/CMakeLists.txt +++ b/ExtinctionMonitorFNAL/Utilities/CMakeLists.txt @@ -12,4 +12,4 @@ cet_make_library( ) install_source(SUBDIRS src) -install_headers(SUBDIRS inc) +install_headers(USE_PROJECT_NAME SUBDIRS inc) diff --git a/Filters/CMakeLists.txt b/Filters/CMakeLists.txt index ff0ceedb69..8d6a7e790f 100644 --- a/Filters/CMakeLists.txt +++ b/Filters/CMakeLists.txt @@ -284,4 +284,4 @@ cet_build_plugin(WeightSamplingFilter art::module ) install_source(SUBDIRS src) -install_fhicl(SUBDIRS fcl SUBDIRNAME Filters) +install_fhicl(SUBDIRS fcl SUBDIRNAME Offline/Filters/fcl) diff --git a/GeneralUtilities/CMakeLists.txt b/GeneralUtilities/CMakeLists.txt index b9c9e3adc9..78894bc898 100644 --- a/GeneralUtilities/CMakeLists.txt +++ b/GeneralUtilities/CMakeLists.txt @@ -46,4 +46,4 @@ cet_make_exec(NAME TwoDPointTest ) install_source(SUBDIRS src) -install_headers(SUBDIRS inc) +install_headers(USE_PROJECT_NAME SUBDIRS inc) diff --git a/GeomPrimitives/CMakeLists.txt b/GeomPrimitives/CMakeLists.txt index bc53d63243..0f89130ae4 100644 --- a/GeomPrimitives/CMakeLists.txt +++ b/GeomPrimitives/CMakeLists.txt @@ -12,4 +12,4 @@ cet_make_library( ) install_source(SUBDIRS src) -install_headers(SUBDIRS inc) +install_headers(USE_PROJECT_NAME SUBDIRS inc) diff --git a/GeometryService/CMakeLists.txt b/GeometryService/CMakeLists.txt index 18336cb54d..625f87f885 100644 --- a/GeometryService/CMakeLists.txt +++ b/GeometryService/CMakeLists.txt @@ -95,4 +95,4 @@ cet_build_plugin(GeometryService art::service ) install_source(SUBDIRS src) -install_headers(SUBDIRS inc) +install_headers(USE_PROJECT_NAME SUBDIRS inc) diff --git a/GlobalConstantsService/CMakeLists.txt b/GlobalConstantsService/CMakeLists.txt index 42e919d6fc..6c6152fefa 100644 --- a/GlobalConstantsService/CMakeLists.txt +++ b/GlobalConstantsService/CMakeLists.txt @@ -21,4 +21,4 @@ cet_build_plugin(GlobalConstantsService art::service ) install_source(SUBDIRS src) -install_headers(SUBDIRS inc) +install_headers(USE_PROJECT_NAME SUBDIRS inc) diff --git a/KinKalGeom/CMakeLists.txt b/KinKalGeom/CMakeLists.txt index 268bbc1fd3..e41a961532 100644 --- a/KinKalGeom/CMakeLists.txt +++ b/KinKalGeom/CMakeLists.txt @@ -12,4 +12,4 @@ cet_make_library( ) install_source(SUBDIRS src) -install_headers(SUBDIRS inc) +install_headers(USE_PROJECT_NAME SUBDIRS inc) diff --git a/MBSGeom/CMakeLists.txt b/MBSGeom/CMakeLists.txt index 9e0dea82d4..fc1ef10198 100644 --- a/MBSGeom/CMakeLists.txt +++ b/MBSGeom/CMakeLists.txt @@ -8,4 +8,4 @@ cet_make_library(INTERFACE ) install_source(SUBDIRS src) -install_headers(SUBDIRS inc) +install_headers(USE_PROJECT_NAME SUBDIRS inc) diff --git a/MCDataProducts/CMakeLists.txt b/MCDataProducts/CMakeLists.txt index 7743d9ab39..0491d6f9aa 100644 --- a/MCDataProducts/CMakeLists.txt +++ b/MCDataProducts/CMakeLists.txt @@ -33,4 +33,4 @@ art_dictionary( NO_CHECK_CLASS_VERSION # For some reason this segfaults Offline::MCDataProducts ) install_source(SUBDIRS src) -install_headers(SUBDIRS inc) +install_headers(USE_PROJECT_NAME SUBDIRS inc) diff --git a/MECOStyleProtonAbsorberGeom/CMakeLists.txt b/MECOStyleProtonAbsorberGeom/CMakeLists.txt index 9f00a65903..d45fdee949 100644 --- a/MECOStyleProtonAbsorberGeom/CMakeLists.txt +++ b/MECOStyleProtonAbsorberGeom/CMakeLists.txt @@ -8,4 +8,4 @@ cet_make_library( ) install_source(SUBDIRS src) -install_headers(SUBDIRS inc) +install_headers(USE_PROJECT_NAME SUBDIRS inc) diff --git a/Mu2eBTrk/CMakeLists.txt b/Mu2eBTrk/CMakeLists.txt index 0f3878f1ee..685476e552 100644 --- a/Mu2eBTrk/CMakeLists.txt +++ b/Mu2eBTrk/CMakeLists.txt @@ -19,4 +19,4 @@ cet_make_library( ) install_source(SUBDIRS src) -install_headers(SUBDIRS inc) +install_headers(USE_PROJECT_NAME SUBDIRS inc) diff --git a/Mu2eG4/CMakeLists.txt b/Mu2eG4/CMakeLists.txt index c506d0f478..f523b076a3 100644 --- a/Mu2eG4/CMakeLists.txt +++ b/Mu2eG4/CMakeLists.txt @@ -237,5 +237,5 @@ cet_build_plugin(ConstructEnvTube art::tool ) install_source(SUBDIRS src) -install_headers(SUBDIRS inc) -install_fhicl(SUBDIRS fcl SUBDIRNAME Mu2eG4) +install_headers(USE_PROJECT_NAME SUBDIRS inc) +install_fhicl(SUBDIRS fcl SUBDIRNAME Offline/Mu2eG4/fcl) diff --git a/Mu2eG4Helper/CMakeLists.txt b/Mu2eG4Helper/CMakeLists.txt index 8fa09ac2fb..16c3c31e39 100644 --- a/Mu2eG4Helper/CMakeLists.txt +++ b/Mu2eG4Helper/CMakeLists.txt @@ -16,4 +16,4 @@ cet_build_plugin(Mu2eG4Helper art::service ) install_source(SUBDIRS src) -install_headers(SUBDIRS inc) +install_headers(USE_PROJECT_NAME SUBDIRS inc) diff --git a/Mu2eHallGeom/CMakeLists.txt b/Mu2eHallGeom/CMakeLists.txt index aac57e88a5..349ec423c5 100644 --- a/Mu2eHallGeom/CMakeLists.txt +++ b/Mu2eHallGeom/CMakeLists.txt @@ -8,4 +8,4 @@ cet_make_library( ) install_source(SUBDIRS src) -install_headers(SUBDIRS inc) +install_headers(USE_PROJECT_NAME SUBDIRS inc) diff --git a/Mu2eInterfaces/CMakeLists.txt b/Mu2eInterfaces/CMakeLists.txt index de2fbcc135..924cd1d922 100644 --- a/Mu2eInterfaces/CMakeLists.txt +++ b/Mu2eInterfaces/CMakeLists.txt @@ -9,4 +9,4 @@ cet_make_library(INTERFACE Offline::DbTables ) -install_headers(SUBDIRS inc) +install_headers(USE_PROJECT_NAME SUBDIRS inc) diff --git a/Mu2eKinKal/CMakeLists.txt b/Mu2eKinKal/CMakeLists.txt index bc6e4d2cd4..9f6737eed4 100644 --- a/Mu2eKinKal/CMakeLists.txt +++ b/Mu2eKinKal/CMakeLists.txt @@ -81,5 +81,5 @@ cet_build_plugin(LoopHelixFit art::module ) install_source(SUBDIRS src) -install_headers(SUBDIRS inc) -install_fhicl(SUBDIRS fcl SUBDIRNAME Mu2eKinKal) +install_headers(USE_PROJECT_NAME SUBDIRS inc) +install_fhicl(SUBDIRS fcl SUBDIRNAME Offline/Mu2eKinKal/fcl) diff --git a/Mu2eUtilities/CMakeLists.txt b/Mu2eUtilities/CMakeLists.txt index db13feee85..656be1661f 100644 --- a/Mu2eUtilities/CMakeLists.txt +++ b/Mu2eUtilities/CMakeLists.txt @@ -74,4 +74,4 @@ cet_make_library( ) install_source(SUBDIRS src) -install_headers(SUBDIRS inc) +install_headers(USE_PROJECT_NAME SUBDIRS inc) diff --git a/PTMGeom/CMakeLists.txt b/PTMGeom/CMakeLists.txt index 0802af1781..354bd797aa 100644 --- a/PTMGeom/CMakeLists.txt +++ b/PTMGeom/CMakeLists.txt @@ -11,4 +11,4 @@ cet_make_library( ) install_source(SUBDIRS src) -install_headers(SUBDIRS inc) +install_headers(USE_PROJECT_NAME SUBDIRS inc) diff --git a/ParticleID/CMakeLists.txt b/ParticleID/CMakeLists.txt index a021b0ca95..711e74bed7 100644 --- a/ParticleID/CMakeLists.txt +++ b/ParticleID/CMakeLists.txt @@ -35,5 +35,5 @@ cet_build_plugin(ParticleIDRead art::module ) install_source(SUBDIRS src) -install_headers(SUBDIRS inc) -install_fhicl(SUBDIRS fcl SUBDIRNAME ParticleID) +install_headers(USE_PROJECT_NAME SUBDIRS inc) +install_fhicl(SUBDIRS fcl SUBDIRNAME Offline/ParticleID/fcl) diff --git a/Print/CMakeLists.txt b/Print/CMakeLists.txt index 66450d6d27..1061786d82 100644 --- a/Print/CMakeLists.txt +++ b/Print/CMakeLists.txt @@ -104,5 +104,5 @@ cet_build_plugin(RunSubrunEvent art::module ) install_source(SUBDIRS src) -install_headers(SUBDIRS inc) -install_fhicl(SUBDIRS fcl SUBDIRNAME Print) +install_headers(USE_PROJECT_NAME SUBDIRS inc) +install_fhicl(SUBDIRS fcl SUBDIRNAME Offline/Print/fcl) diff --git a/ProditionsService/CMakeLists.txt b/ProditionsService/CMakeLists.txt index 453b98ca3b..367f724811 100644 --- a/ProditionsService/CMakeLists.txt +++ b/ProditionsService/CMakeLists.txt @@ -41,5 +41,5 @@ cet_build_plugin(ProditionsTest art::module ) install_source(SUBDIRS src) -install_headers(SUBDIRS inc) -install_fhicl(SUBDIRS fcl SUBDIRNAME ProditionsService) +install_headers(USE_PROJECT_NAME SUBDIRS inc) +install_fhicl(SUBDIRS fcl SUBDIRNAME Offline/ProditionsService/fcl) diff --git a/ProductionSolenoidGeom/CMakeLists.txt b/ProductionSolenoidGeom/CMakeLists.txt index 763ecb632d..f3b67aa50d 100644 --- a/ProductionSolenoidGeom/CMakeLists.txt +++ b/ProductionSolenoidGeom/CMakeLists.txt @@ -10,4 +10,4 @@ cet_make_library( ) install_source(SUBDIRS src) -install_headers(SUBDIRS inc) +install_headers(USE_PROJECT_NAME SUBDIRS inc) diff --git a/ProductionTargetGeom/CMakeLists.txt b/ProductionTargetGeom/CMakeLists.txt index 8e22b8f86e..f1ebc4d1c4 100644 --- a/ProductionTargetGeom/CMakeLists.txt +++ b/ProductionTargetGeom/CMakeLists.txt @@ -8,4 +8,4 @@ cet_make_library( ) install_source(SUBDIRS src) -install_headers(SUBDIRS inc) +install_headers(USE_PROJECT_NAME SUBDIRS inc) diff --git a/ProtonBeamDumpGeom/CMakeLists.txt b/ProtonBeamDumpGeom/CMakeLists.txt index 10e4fc72e4..7886d0ab4e 100644 --- a/ProtonBeamDumpGeom/CMakeLists.txt +++ b/ProtonBeamDumpGeom/CMakeLists.txt @@ -8,4 +8,4 @@ cet_make_library( ) install_source(SUBDIRS src) -install_headers(SUBDIRS inc) +install_headers(USE_PROJECT_NAME SUBDIRS inc) diff --git a/RecoDataProducts/CMakeLists.txt b/RecoDataProducts/CMakeLists.txt index 50cf00c4c3..fbe3480fee 100644 --- a/RecoDataProducts/CMakeLists.txt +++ b/RecoDataProducts/CMakeLists.txt @@ -52,4 +52,4 @@ art_dictionary( NO_CHECK_CLASS_VERSION # For some reason this segfaults Offline::RecoDataProducts ) install_source(SUBDIRS src) -install_headers(SUBDIRS inc) +install_headers(USE_PROJECT_NAME SUBDIRS inc) diff --git a/STMConditions/CMakeLists.txt b/STMConditions/CMakeLists.txt index 1eb409b211..9eb0aa61d3 100644 --- a/STMConditions/CMakeLists.txt +++ b/STMConditions/CMakeLists.txt @@ -10,5 +10,5 @@ cet_make_library( ) install_source(SUBDIRS src) -install_headers(SUBDIRS inc) -install_fhicl(SUBDIRS fcl SUBDIRNAME STMConditions) +install_headers(USE_PROJECT_NAME SUBDIRS inc) +install_fhicl(SUBDIRS fcl SUBDIRNAME Offline/STMConditions/fcl) diff --git a/STMConfig/CMakeLists.txt b/STMConfig/CMakeLists.txt index f0d7fe6aee..3d2548569d 100644 --- a/STMConfig/CMakeLists.txt +++ b/STMConfig/CMakeLists.txt @@ -5,4 +5,4 @@ cet_make_library(INTERFACE ) -install_headers(SUBDIRS inc) +install_headers(USE_PROJECT_NAME SUBDIRS inc) diff --git a/STMGeom/CMakeLists.txt b/STMGeom/CMakeLists.txt index 39abffc8a8..80099558d1 100644 --- a/STMGeom/CMakeLists.txt +++ b/STMGeom/CMakeLists.txt @@ -12,4 +12,4 @@ cet_make_library(INTERFACE Offline::Mu2eInterfaces ) -install_headers(SUBDIRS inc) +install_headers(USE_PROJECT_NAME SUBDIRS inc) diff --git a/STMReco/CMakeLists.txt b/STMReco/CMakeLists.txt index 93be494738..041f64cd3b 100644 --- a/STMReco/CMakeLists.txt +++ b/STMReco/CMakeLists.txt @@ -56,4 +56,4 @@ cet_build_plugin(STMZeroSuppression art::module ) install_source(SUBDIRS src) -install_fhicl(SUBDIRS fcl SUBDIRNAME STMReco) +install_fhicl(SUBDIRS fcl SUBDIRNAME Offline/STMReco/fcl) diff --git a/SeedService/CMakeLists.txt b/SeedService/CMakeLists.txt index da5c5423dd..7b6786a133 100644 --- a/SeedService/CMakeLists.txt +++ b/SeedService/CMakeLists.txt @@ -23,4 +23,4 @@ cet_build_plugin(SeedTest01 art::module ) install_source(SUBDIRS src) -install_headers(SUBDIRS inc) +install_headers(USE_PROJECT_NAME SUBDIRS inc) diff --git a/ServicesGeom/CMakeLists.txt b/ServicesGeom/CMakeLists.txt index 664b333cf5..14d04f60e9 100644 --- a/ServicesGeom/CMakeLists.txt +++ b/ServicesGeom/CMakeLists.txt @@ -8,4 +8,4 @@ cet_make_library( ) install_source(SUBDIRS src) -install_headers(SUBDIRS inc) +install_headers(USE_PROJECT_NAME SUBDIRS inc) diff --git a/SimulationConditions/CMakeLists.txt b/SimulationConditions/CMakeLists.txt index b13fa8de3f..204027e1a4 100644 --- a/SimulationConditions/CMakeLists.txt +++ b/SimulationConditions/CMakeLists.txt @@ -12,5 +12,5 @@ cet_make_library( ) install_source(SUBDIRS src) -install_headers(SUBDIRS inc) -install_fhicl(SUBDIRS fcl SUBDIRNAME SimulationConditions) +install_headers(USE_PROJECT_NAME SUBDIRS inc) +install_fhicl(SUBDIRS fcl SUBDIRNAME Offline/SimulationConditions/fcl) diff --git a/SimulationConfig/CMakeLists.txt b/SimulationConfig/CMakeLists.txt index 6f78bd810f..fc2f382903 100644 --- a/SimulationConfig/CMakeLists.txt +++ b/SimulationConfig/CMakeLists.txt @@ -5,4 +5,4 @@ cet_make_library(INTERFACE ) -install_headers(SUBDIRS inc) +install_headers(USE_PROJECT_NAME SUBDIRS inc) diff --git a/Sources/CMakeLists.txt b/Sources/CMakeLists.txt index 5f0ab70ea2..59195590e3 100644 --- a/Sources/CMakeLists.txt +++ b/Sources/CMakeLists.txt @@ -51,4 +51,4 @@ cet_build_plugin(PBISequence art::source ) install_source(SUBDIRS src) -install_headers(SUBDIRS inc) +install_headers(USE_PROJECT_NAME SUBDIRS inc) diff --git a/StoppingTargetGeom/CMakeLists.txt b/StoppingTargetGeom/CMakeLists.txt index 2549467edf..674729cd4c 100644 --- a/StoppingTargetGeom/CMakeLists.txt +++ b/StoppingTargetGeom/CMakeLists.txt @@ -8,4 +8,4 @@ cet_make_library( ) install_source(SUBDIRS src) -install_headers(SUBDIRS inc) +install_headers(USE_PROJECT_NAME SUBDIRS inc) diff --git a/TEveEventDisplay/CMakeLists.txt b/TEveEventDisplay/CMakeLists.txt index 8e177e4a66..ad67938a4d 100644 --- a/TEveEventDisplay/CMakeLists.txt +++ b/TEveEventDisplay/CMakeLists.txt @@ -59,4 +59,4 @@ art_dictionary( NO_CHECK_CLASS_VERSION # For some reason this segfaults Offline::TEveEventDisplay ) install_source(SUBDIRS src) -install_fhicl(SUBDIRS fcl SUBDIRNAME TEveEventDisplay) +install_fhicl(SUBDIRS fcl SUBDIRNAME Offline/TEveEventDisplay/fcl) diff --git a/TestTools/CMakeLists.txt b/TestTools/CMakeLists.txt index 1d43baf99d..e78728517f 100644 --- a/TestTools/CMakeLists.txt +++ b/TestTools/CMakeLists.txt @@ -6,4 +6,4 @@ cet_make_library( ) install_source(SUBDIRS src) -install_headers(SUBDIRS inc) +install_headers(USE_PROJECT_NAME SUBDIRS inc) diff --git a/TrackCaloMatching/CMakeLists.txt b/TrackCaloMatching/CMakeLists.txt index 7de0f629de..750d05a449 100644 --- a/TrackCaloMatching/CMakeLists.txt +++ b/TrackCaloMatching/CMakeLists.txt @@ -58,4 +58,4 @@ cet_build_plugin(TrkExtrapol art::module ) install_source(SUBDIRS src) -install_fhicl(SUBDIRS fcl SUBDIRNAME TrackCaloMatching) +install_fhicl(SUBDIRS fcl SUBDIRNAME Offline/TrackCaloMatching/fcl) diff --git a/TrackerConditions/CMakeLists.txt b/TrackerConditions/CMakeLists.txt index 00ec6e8e91..412eeea5e7 100644 --- a/TrackerConditions/CMakeLists.txt +++ b/TrackerConditions/CMakeLists.txt @@ -35,5 +35,5 @@ cet_make_library( ) install_source(SUBDIRS src) -install_headers(SUBDIRS inc) -install_fhicl(SUBDIRS fcl SUBDIRNAME TrackerConditions) +install_headers(USE_PROJECT_NAME SUBDIRS inc) +install_fhicl(SUBDIRS fcl SUBDIRNAME Offline/TrackerConditions/fcl) diff --git a/TrackerConfig/CMakeLists.txt b/TrackerConfig/CMakeLists.txt index 9adbf8ea2e..f480fd23fa 100644 --- a/TrackerConfig/CMakeLists.txt +++ b/TrackerConfig/CMakeLists.txt @@ -13,4 +13,4 @@ cet_make_library(INTERFACE ) -install_headers(SUBDIRS inc) +install_headers(USE_PROJECT_NAME SUBDIRS inc) diff --git a/TrackerGeom/CMakeLists.txt b/TrackerGeom/CMakeLists.txt index 86ff47a050..1f0b3bd966 100644 --- a/TrackerGeom/CMakeLists.txt +++ b/TrackerGeom/CMakeLists.txt @@ -16,4 +16,4 @@ cet_make_library( ) install_source(SUBDIRS src) -install_headers(SUBDIRS inc) +install_headers(USE_PROJECT_NAME SUBDIRS inc) diff --git a/TrackerMC/CMakeLists.txt b/TrackerMC/CMakeLists.txt index c0c7428173..b71eda98df 100644 --- a/TrackerMC/CMakeLists.txt +++ b/TrackerMC/CMakeLists.txt @@ -70,5 +70,5 @@ art_dictionary( NO_CHECK_CLASS_VERSION # For some reason this segfaults Offline::TrackerMC ) install_source(SUBDIRS src) -install_headers(SUBDIRS inc) -install_fhicl(SUBDIRS fcl SUBDIRNAME TrackerMC) +install_headers(USE_PROJECT_NAME SUBDIRS inc) +install_fhicl(SUBDIRS fcl SUBDIRNAME Offline/TrackerMC/fcl) diff --git a/Trigger/CMakeLists.txt b/Trigger/CMakeLists.txt index 64283fc8a9..180b240de7 100644 --- a/Trigger/CMakeLists.txt +++ b/Trigger/CMakeLists.txt @@ -39,4 +39,4 @@ cet_build_plugin(ReadTriggerInfo art::module ) install_source(SUBDIRS src) -install_fhicl(SUBDIRS fcl SUBDIRNAME Trigger) +install_fhicl(SUBDIRS fcl SUBDIRNAME Offline/Trigger/fcl) diff --git a/TrkDiag/CMakeLists.txt b/TrkDiag/CMakeLists.txt index cbff4a7a1c..be8a1bad1f 100644 --- a/TrkDiag/CMakeLists.txt +++ b/TrkDiag/CMakeLists.txt @@ -181,5 +181,5 @@ art_dictionary( NO_CHECK_CLASS_VERSION # For some reason this segfaults Offline::TrkDiag ) install_source(SUBDIRS src) -install_headers(SUBDIRS inc) -install_fhicl(SUBDIRS fcl SUBDIRNAME TrkDiag) +install_headers(USE_PROJECT_NAME SUBDIRS inc) +install_fhicl(SUBDIRS fcl SUBDIRNAME Offline/TrkDiag/fcl) diff --git a/TrkExt/CMakeLists.txt b/TrkExt/CMakeLists.txt index ee5f793596..345b8e215d 100644 --- a/TrkExt/CMakeLists.txt +++ b/TrkExt/CMakeLists.txt @@ -40,4 +40,4 @@ cet_build_plugin(TrkExt art::module ) install_source(SUBDIRS src) -install_headers(SUBDIRS inc) +install_headers(USE_PROJECT_NAME SUBDIRS inc) diff --git a/TrkFilters/CMakeLists.txt b/TrkFilters/CMakeLists.txt index f3045f7a41..94cf97f7c0 100644 --- a/TrkFilters/CMakeLists.txt +++ b/TrkFilters/CMakeLists.txt @@ -23,4 +23,4 @@ cet_build_plugin(TimeClusterFilter art::module ) install_source(SUBDIRS src) -install_fhicl(SUBDIRS fcl SUBDIRNAME TrkFilters) +install_fhicl(SUBDIRS fcl SUBDIRNAME Offline/TrkFilters/fcl) diff --git a/TrkHitReco/CMakeLists.txt b/TrkHitReco/CMakeLists.txt index 556e2b680d..bc52b3681c 100644 --- a/TrkHitReco/CMakeLists.txt +++ b/TrkHitReco/CMakeLists.txt @@ -86,5 +86,5 @@ cet_build_plugin(StrawHitReco art::module ) install_source(SUBDIRS src inc) -install_headers(SUBDIRS inc) -install_fhicl(SUBDIRS fcl SUBDIRNAME TrkHitReco/fcl) +install_headers(USE_PROJECT_NAME SUBDIRS inc) +install_fhicl(SUBDIRS fcl SUBDIRNAME Offline/TrkHitReco/fcl) diff --git a/TrkPatRec/CMakeLists.txt b/TrkPatRec/CMakeLists.txt index 711be20de0..c9b3cb187c 100644 --- a/TrkPatRec/CMakeLists.txt +++ b/TrkPatRec/CMakeLists.txt @@ -128,5 +128,5 @@ cet_build_plugin(TimeAndPhiClusterFinderDiag art::tool ) install_source(SUBDIRS src) -install_headers(SUBDIRS inc) -install_fhicl(SUBDIRS fcl SUBDIRNAME TrkPatRec) +install_headers(USE_PROJECT_NAME SUBDIRS inc) +install_fhicl(SUBDIRS fcl SUBDIRNAME Offline/TrkPatRec/fcl) diff --git a/TrkReco/CMakeLists.txt b/TrkReco/CMakeLists.txt index fd71cceb5d..60b67d0cd1 100644 --- a/TrkReco/CMakeLists.txt +++ b/TrkReco/CMakeLists.txt @@ -62,5 +62,5 @@ art_dictionary( NO_CHECK_CLASS_VERSION # For some reason this segfaults Offline::TrkReco ) install_source(SUBDIRS src) -install_headers(SUBDIRS inc) -install_fhicl(SUBDIRS fcl SUBDIRNAME TrkReco) +install_headers(USE_PROJECT_NAME SUBDIRS inc) +install_fhicl(SUBDIRS fcl SUBDIRNAME Offline/TrkReco/fcl) diff --git a/Validation/CMakeLists.txt b/Validation/CMakeLists.txt index 8fbca71ac4..68884e662b 100644 --- a/Validation/CMakeLists.txt +++ b/Validation/CMakeLists.txt @@ -90,5 +90,5 @@ art_dictionary( ) install_source(SUBDIRS src root) -install_headers(SUBDIRS inc) -install_fhicl(SUBDIRS fcl SUBDIRNAME Validation) +install_headers(USE_PROJECT_NAME SUBDIRS inc) +install_fhicl(SUBDIRS fcl SUBDIRNAME Offline/Validation/fcl) diff --git a/make_cmake.sh b/make_cmake.sh index f17be1fe9e..d312b1e102 100755 --- a/make_cmake.sh +++ b/make_cmake.sh @@ -171,10 +171,10 @@ for dir in */;do echo "install_source(SUBDIRS src)" >> CMakeLists.txt fi if [ -d inc ]; then - echo "install_headers(SUBDIRS inc)" >> CMakeLists.txt + echo "install_headers(USE_PROJECT_NAME SUBDIRS inc)" >> CMakeLists.txt fi if [ -d fcl ]; then - echo "install_fhicl(SUBDIRS fcl SUBDIRNAME $dirname)" >> CMakeLists.txt + echo "install_fhicl(SUBDIRS fcl SUBDIRNAME Offline/$dirname/fcl)" >> CMakeLists.txt fi cd .. diff --git a/ups/product_deps b/ups/product_deps index 203bcea592..8efeea406c 100644 --- a/ups/product_deps +++ b/ups/product_deps @@ -127,7 +127,7 @@ defaultqual s124:e28 # # CMake modules. # -fcldir product_dir fcl/Offline +#> fcldir product_dir fcl/Offline # # FHiCL framework configuration files. # @@ -139,7 +139,7 @@ fcldir product_dir fcl/Offline # # GDML geometry description files. # -incdir product_dir include/Offline +#> incdir product_dir include # # Headers. # From a16db24b05f0a7852e2bd87ac019fd842cb01630 Mon Sep 17 00:00:00 2001 From: Eric Flumerfelt Date: Tue, 21 Nov 2023 07:57:01 -0600 Subject: [PATCH 023/213] Latest attempt at getting INTERFACE targets to work with updated include dirs --- AnalysisConditions/CMakeLists.txt | 2 +- AnalysisConfig/CMakeLists.txt | 2 +- CMakePresets.json | 2 +- CRVConfig/CMakeLists.txt | 2 +- CaloConfig/CMakeLists.txt | 2 +- ConditionsBase/CMakeLists.txt | 2 +- DAQConfig/CMakeLists.txt | 2 +- MBSGeom/CMakeLists.txt | 2 +- Mu2eInterfaces/CMakeLists.txt | 2 +- ProditionsService/CMakeLists.txt | 2 +- STMConfig/CMakeLists.txt | 2 +- STMGeom/CMakeLists.txt | 2 +- SimulationConfig/CMakeLists.txt | 2 +- TrackerConfig/CMakeLists.txt | 2 +- TrkPatRec/CMakeLists.txt | 2 +- boost_fix/CMakeLists.txt | 6 ++++-- 16 files changed, 19 insertions(+), 17 deletions(-) diff --git a/AnalysisConditions/CMakeLists.txt b/AnalysisConditions/CMakeLists.txt index 6cf3122a7c..12db89bbaa 100644 --- a/AnalysisConditions/CMakeLists.txt +++ b/AnalysisConditions/CMakeLists.txt @@ -1,4 +1,4 @@ -cet_make_library(INTERFACE +cet_make_library(INTERFACE INSTALLED_PATH_BASE Offline/AnalysisConditions SOURCE inc/MVACatalogCache.hh inc/MVACatalog.hh diff --git a/AnalysisConfig/CMakeLists.txt b/AnalysisConfig/CMakeLists.txt index f7554913f7..97068c6d9a 100644 --- a/AnalysisConfig/CMakeLists.txt +++ b/AnalysisConfig/CMakeLists.txt @@ -1,4 +1,4 @@ -cet_make_library(INTERFACE +cet_make_library(INTERFACE INSTALLED_PATH_BASE Offline/AnalysisConfig SOURCE inc/MVACatalogConfig.hh LIBRARIES INTERFACE diff --git a/CMakePresets.json b/CMakePresets.json index 9af163464f..60fb4d26fe 100644 --- a/CMakePresets.json +++ b/CMakePresets.json @@ -4,7 +4,7 @@ "cacheVariables" : { "CMAKE_BUILD_TYPE" : { "type" : "STRING", - "value" : "Debug" + "value" : "RelWithDebInfo" }, "CMAKE_CXX_EXTENSIONS" : { "type" : "BOOL", diff --git a/CRVConfig/CMakeLists.txt b/CRVConfig/CMakeLists.txt index eb0e1e4ba6..74b99de1e0 100644 --- a/CRVConfig/CMakeLists.txt +++ b/CRVConfig/CMakeLists.txt @@ -1,4 +1,4 @@ -cet_make_library(INTERFACE +cet_make_library(INTERFACE INSTALLED_PATH_BASE Offline/CRVConfig SOURCE inc/CRVCalibConfig.hh inc/CRVOrdinalConfig.hh diff --git a/CaloConfig/CMakeLists.txt b/CaloConfig/CMakeLists.txt index 248359ef15..edcbba3b6e 100644 --- a/CaloConfig/CMakeLists.txt +++ b/CaloConfig/CMakeLists.txt @@ -1,4 +1,4 @@ -cet_make_library(INTERFACE +cet_make_library(INTERFACE INSTALLED_PATH_BASE Offline/CaloConfig SOURCE inc/CalCalibConfig.hh inc/CaloDAQMapConfig.hh diff --git a/ConditionsBase/CMakeLists.txt b/ConditionsBase/CMakeLists.txt index f922720ebe..be2c4b1edb 100644 --- a/ConditionsBase/CMakeLists.txt +++ b/ConditionsBase/CMakeLists.txt @@ -1,4 +1,4 @@ -cet_make_library(INTERFACE +cet_make_library(INTERFACE INSTALLED_PATH_BASE Offline/ConditionsBase SOURCE inc/TrackerCalibrationStructs.hh LIBRARIES INTERFACE diff --git a/DAQConfig/CMakeLists.txt b/DAQConfig/CMakeLists.txt index c30a52add9..8aeae67502 100644 --- a/DAQConfig/CMakeLists.txt +++ b/DAQConfig/CMakeLists.txt @@ -1,4 +1,4 @@ -cet_make_library(INTERFACE +cet_make_library(INTERFACE INSTALLED_PATH_BASE Offline/DAQConfig SOURCE inc/EventTimingConfig.hh LIBRARIES INTERFACE diff --git a/MBSGeom/CMakeLists.txt b/MBSGeom/CMakeLists.txt index fc1ef10198..bfdb675dcf 100644 --- a/MBSGeom/CMakeLists.txt +++ b/MBSGeom/CMakeLists.txt @@ -1,4 +1,4 @@ -cet_make_library(INTERFACE +cet_make_library(INTERFACE INSTALLED_PATH_BASE Offline/MBSGeom SOURCE inc/MBS.hh LIBRARIES INTERFACE diff --git a/Mu2eInterfaces/CMakeLists.txt b/Mu2eInterfaces/CMakeLists.txt index 924cd1d922..213c9a19f1 100644 --- a/Mu2eInterfaces/CMakeLists.txt +++ b/Mu2eInterfaces/CMakeLists.txt @@ -1,4 +1,4 @@ -cet_make_library(INTERFACE +cet_make_library(INTERFACE INSTALLED_PATH_BASE Offline/Mu2eInterfaces SOURCE inc/ConditionsEntity.hh inc/Detector.hh diff --git a/ProditionsService/CMakeLists.txt b/ProditionsService/CMakeLists.txt index 367f724811..7f388665d9 100644 --- a/ProditionsService/CMakeLists.txt +++ b/ProditionsService/CMakeLists.txt @@ -1,4 +1,4 @@ -cet_make_library(INTERFACE +cet_make_library(INTERFACE INSTALLED_PATH_BASE Offline/ProditionsService SOURCE inc/ProditionsHandle.hh inc/ProditionsService.hh diff --git a/STMConfig/CMakeLists.txt b/STMConfig/CMakeLists.txt index 3d2548569d..b00dfb8731 100644 --- a/STMConfig/CMakeLists.txt +++ b/STMConfig/CMakeLists.txt @@ -1,4 +1,4 @@ -cet_make_library(INTERFACE +cet_make_library(INTERFACE INSTALLED_PATH_BASE Offline/STMConfig SOURCE inc/STMEnergyCalibConfig.hh LIBRARIES INTERFACE diff --git a/STMGeom/CMakeLists.txt b/STMGeom/CMakeLists.txt index 80099558d1..db26e83d02 100644 --- a/STMGeom/CMakeLists.txt +++ b/STMGeom/CMakeLists.txt @@ -1,4 +1,4 @@ -cet_make_library(INTERFACE +cet_make_library(INTERFACE INSTALLED_PATH_BASE Offline/STMGeom SOURCE inc/GeDetector.hh inc/PermanentMagnet.hh diff --git a/SimulationConfig/CMakeLists.txt b/SimulationConfig/CMakeLists.txt index fc2f382903..b55326d3d7 100644 --- a/SimulationConfig/CMakeLists.txt +++ b/SimulationConfig/CMakeLists.txt @@ -1,4 +1,4 @@ -cet_make_library(INTERFACE +cet_make_library(INTERFACE INSTALLED_PATH_BASE Offline/SimulationConfig SOURCE inc/SimBookkeeperConfig.hh LIBRARIES INTERFACE diff --git a/TrackerConfig/CMakeLists.txt b/TrackerConfig/CMakeLists.txt index f480fd23fa..d93ec02fed 100644 --- a/TrackerConfig/CMakeLists.txt +++ b/TrackerConfig/CMakeLists.txt @@ -1,4 +1,4 @@ -cet_make_library(INTERFACE +cet_make_library(INTERFACE INSTALLED_PATH_BASE Offline/TrackerConfig SOURCE inc/AlignedTrackerConfig.hh inc/FullReadoutStrawConfig.hh diff --git a/TrkPatRec/CMakeLists.txt b/TrkPatRec/CMakeLists.txt index c9b3cb187c..4c668085a2 100644 --- a/TrkPatRec/CMakeLists.txt +++ b/TrkPatRec/CMakeLists.txt @@ -1,4 +1,4 @@ -cet_make_library(INTERFACE +cet_make_library(INTERFACE INSTALLED_PATH_BASE Offline/TrkPatRec SOURCE inc/KalFinalFit_types.hh inc/KalSeedFit_types.hh diff --git a/boost_fix/CMakeLists.txt b/boost_fix/CMakeLists.txt index 2c815590be..efc35f49dc 100644 --- a/boost_fix/CMakeLists.txt +++ b/boost_fix/CMakeLists.txt @@ -1,6 +1,8 @@ -cet_make_library(INTERFACE +cet_make_library(INTERFACE INSTALLED_PATH_BASE Offline/boost_fix SOURCE accumulators/statistics.hpp accumulators/statistics/stats.hpp LIBRARIES INTERFACE -) \ No newline at end of file +) + +install_headers(USE_PROJECT_NAME SUBDIRS accumulators accumulators/statistics) From 94a111e0fa83f65f0198176a284637f85a87cd19 Mon Sep 17 00:00:00 2001 From: sophieMu2e Date: Wed, 22 Nov 2023 08:17:32 -0600 Subject: [PATCH 024/213] store --- Analyses/src/PairConvFilter_module.cc | 60 +++++++++++++++++++++++++++ DAQ/inc/CaloDAQUtilities.hh | 5 --- 2 files changed, 60 insertions(+), 5 deletions(-) create mode 100644 Analyses/src/PairConvFilter_module.cc diff --git a/Analyses/src/PairConvFilter_module.cc b/Analyses/src/PairConvFilter_module.cc new file mode 100644 index 0000000000..820618dac6 --- /dev/null +++ b/Analyses/src/PairConvFilter_module.cc @@ -0,0 +1,60 @@ +// Purpose: Event filter for pair converions that make it through the tracker +// author: S Middleton and H Jafree, 2023 +#include "art/Framework/Core/EDFilter.h" +#include "art/Framework/Principal/Event.h" +#include "art/Framework/Services/Registry/ServiceHandle.h" +#include "fhiclcpp/ParameterSet.h" + +#include "art/Framework/Principal/Handle.h" + +// Mu2e includes. +#include "Offline/MCDataProducts/inc/StrawGasStep.hh" +#include +#include + +using namespace std; +namespace mu2e { + + class PairConvFilter : public art::EDFilter { + public: + struct Config { + using Name=fhicl::Name; + using Comment=fhicl::Comment; + fhicl::Atom StrawToken{Name("StrawGasStepCollection"),Comment("tag for straw gas step collection")}; + }; + explicit PairConvFilter(const art::EDFilter::Table& config); + virtual bool filter(art::Event& event) override; + //virtual bool beginRun(art::Run& run ); + //virtual bool endRun( art::Run& run ) override; + private: + art::InputTag _StrawToken; + const StrawGasStepCollection* _StrawCol; + }; + + PairConvFilter::PairConvFilter(const art::EDFilter::Table& config) : + EDFilter{config}, + _StrawToken(config().StrawToken()) + {} + + bool PairConvFilter::filter(art::Event& event) { + + bool pass = false; + //------------ Straw Gas Collection --------------------// + auto strawH = event.getValidHandle(_StrawToken); + _StrawCol = strawH.product(); + unsigned int nElectronSteps = 0; + unsigned int nPositronSteps = 0; + for (size_t k = 0; k < _StrawCol->size(); k++){ + StrawGasStep strawgas = (*_StrawCol)[k]; + art::Ptr const& simpart = strawgas.simParticle(); + if (simpart->pdgId()==11) ++nElectronSteps; + else if (simpart->pdgId()==-11) ++nPositronSteps; + } + + if (nElectronSteps>=10 and nPositronSteps>=10) pass=true; + return pass; + } +} + +using mu2e::PairConvFilter; +DEFINE_ART_MODULE(PairConvFilter) diff --git a/DAQ/inc/CaloDAQUtilities.hh b/DAQ/inc/CaloDAQUtilities.hh index f2a4e5a73d..bb72d87344 100644 --- a/DAQ/inc/CaloDAQUtilities.hh +++ b/DAQ/inc/CaloDAQUtilities.hh @@ -18,13 +18,8 @@ namespace mu2e { public: CaloDAQUtilities(std::string ModuleName); -<<<<<<< HEAD - uint16_t getCrystalID(CalorimeterFragment::CalorimeterHitReadoutPacket const& Hit){ return Hit.DIRACB & 0x0FFF;} - uint16_t getSiPMID (CalorimeterFragment::CalorimeterHitReadoutPacket const& Hit){ -======= uint16_t getCrystalID(CalorimeterDataDecoder::CalorimeterHitReadoutPacket const& Hit){ return Hit.DIRACB & 0x0FFF;} uint16_t getSiPMID (CalorimeterDataDecoder::CalorimeterHitReadoutPacket const& Hit){ ->>>>>>> 23471b8a49bfdf49ad32eaf72956ac616a131c4c uint16_t crystalID = getCrystalID(Hit); uint16_t sipmID = Hit.DIRACB >> 12; return (crystalID * 2 + sipmID); From 26a834ce08b57eeb5ed86b749489f14befbe1eb2 Mon Sep 17 00:00:00 2001 From: David Nathan Brown Date: Mon, 27 Nov 2023 12:42:06 -0600 Subject: [PATCH 025/213] Use correct include --- Mu2eKinKal/test/TTTA.fcl | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/Mu2eKinKal/test/TTTA.fcl b/Mu2eKinKal/test/TTTA.fcl index 48593db32c..7047c083aa 100644 --- a/Mu2eKinKal/test/TTTA.fcl +++ b/Mu2eKinKal/test/TTTA.fcl @@ -12,13 +12,6 @@ process_name : OnSpillTrigger services : @local::Services.Reco source : { module_type : RootInput - inputCommands: ["keep *", - "drop mu2e::HelixSeeds_*_*_*", - "drop mu2e::KalSeeds_*_*_*", - "drop mu2e::TriggerInfo_*_*_*", - "drop mu2e::CaloClusters_*_*_*", - "drop mu2e::TimeClusters_*_*_*" - ] } physics : { @@ -71,6 +64,7 @@ physics : { #include "Offline/gen/fcl/Trigger/OnSpillTrigMenu/OnSpillTrigMenu.fcl" physics.producers.EWMProducer.SpillType : 1 #include "Production/JobConfig/common/epilog.fcl" +#include "Production/JobConfig/reco/drop_trigger.fcl" physics.end_paths : [ EndPath ] # add MC truth matching to the relevant paths physics.tprDeM_highP_stopTarg_trigger : [ @sequence::physics.tprDeM_highP_stopTarg_trigger, SelectRecoMCDeMtpr] From f7b046aab3654969cc5567d02410804be5a18468 Mon Sep 17 00:00:00 2001 From: Eric Flumerfelt Date: Fri, 1 Dec 2023 09:06:21 -0600 Subject: [PATCH 026/213] Add modules to CMake that were added in main --- GeometryService/CMakeLists.txt | 2 +- TrkDiag/CMakeLists.txt | 7 +++++++ TrkPatRec/CMakeLists.txt | 29 +++++++++++++++++++++++++++++ 3 files changed, 37 insertions(+), 1 deletion(-) diff --git a/GeometryService/CMakeLists.txt b/GeometryService/CMakeLists.txt index 625f87f885..64eea42bf6 100644 --- a/GeometryService/CMakeLists.txt +++ b/GeometryService/CMakeLists.txt @@ -22,7 +22,7 @@ cet_make_library( src/Mu2eCoordTransform.cc src/Mu2eEnvelope.cc src/Mu2eHallMaker.cc - src/NotchManager.cc + src/NotchHoleManager.cc src/PipeMaker.cc src/ProductionSolenoidMaker.cc src/ProductionTargetMaker.cc diff --git a/TrkDiag/CMakeLists.txt b/TrkDiag/CMakeLists.txt index be8a1bad1f..d9327c9b71 100644 --- a/TrkDiag/CMakeLists.txt +++ b/TrkDiag/CMakeLists.txt @@ -88,6 +88,13 @@ cet_build_plugin(RMCWeight art::module Offline::SeedService ) +cet_build_plugin(RobustMultiHelixAnalyzer art::module + REG_SOURCE src/RobustMultiHelixAnalyzer_module.cc + LIBRARIES REG + Offline::TrkDiag +) + + cet_build_plugin(StrawHitDiag art::module REG_SOURCE src/StrawHitDiag_module.cc LIBRARIES REG diff --git a/TrkPatRec/CMakeLists.txt b/TrkPatRec/CMakeLists.txt index 4c668085a2..9c3510ce32 100644 --- a/TrkPatRec/CMakeLists.txt +++ b/TrkPatRec/CMakeLists.txt @@ -3,6 +3,7 @@ cet_make_library(INTERFACE INSTALLED_PATH_BASE Offline/TrkPatRec inc/KalFinalFit_types.hh inc/KalSeedFit_types.hh inc/RobustHelixFinder_types.hh + inc/RobustMultiHelixFinder_types.hh inc/TimeAndPhiClusterFinder_types.hh inc/TrkHitFilter.hh LIBRARIES INTERFACE @@ -64,6 +65,24 @@ cet_build_plugin(RobustHelixFinder art::module Offline::TrkReco ) +cet_build_plugin(RobustMultiHelixFinder art::module + REG_SOURCE src/RobustMultiHelixFinder_module.cc + LIBRARIES REG + Offline::TrkPatRec + + Offline::boost_fix + Offline::CalorimeterGeom + Offline::ConfigTools + Offline::DataProducts + Offline::GeneralUtilities + Offline::GeometryService + Offline::Mu2eUtilities + Offline::ProditionsService + Offline::RecoDataProducts + Offline::TrackerGeom + Offline::TrkReco +) + cet_build_plugin(TimeAndPhiClusterFinder art::module REG_SOURCE src/TimeAndPhiClusterFinder_module.cc LIBRARIES REG @@ -116,6 +135,16 @@ cet_build_plugin(RobustHelixFinderDiag art::tool Offline::TrkReco ) +cet_build_plugin(RobustMultiHelixFinderDiag art::tool + REG_SOURCE src/RobustMultiHelixFinderDiag_tool.cc + LIBRARIES REG + Offline::TrkPatRec + + Offline::BTrkData + Offline::Mu2eUtilities + Offline::TrkReco +) + cet_build_plugin(TimeAndPhiClusterFinderDiag art::tool REG_SOURCE src/TimeAndPhiClusterFinderDiag_tool.cc LIBRARIES REG From 70443b1a4280df7071d52acfeafd0068dc14c78a Mon Sep 17 00:00:00 2001 From: Eric Flumerfelt Date: Fri, 1 Dec 2023 13:14:30 -0600 Subject: [PATCH 027/213] Update for fixed INSTALLED_BASE_PATH --- AnalysisConditions/CMakeLists.txt | 2 +- AnalysisConfig/CMakeLists.txt | 2 +- CRVConfig/CMakeLists.txt | 2 +- CaloConfig/CMakeLists.txt | 2 +- ConditionsBase/CMakeLists.txt | 2 +- DAQConfig/CMakeLists.txt | 2 +- MBSGeom/CMakeLists.txt | 2 +- Mu2eInterfaces/CMakeLists.txt | 6 +++++- ProditionsService/CMakeLists.txt | 2 +- STMConfig/CMakeLists.txt | 2 +- STMGeom/CMakeLists.txt | 2 +- SimulationConfig/CMakeLists.txt | 2 +- TrackerConfig/CMakeLists.txt | 2 +- TrkPatRec/CMakeLists.txt | 2 +- boost_fix/CMakeLists.txt | 2 +- 15 files changed, 19 insertions(+), 15 deletions(-) diff --git a/AnalysisConditions/CMakeLists.txt b/AnalysisConditions/CMakeLists.txt index 12db89bbaa..277cc976c5 100644 --- a/AnalysisConditions/CMakeLists.txt +++ b/AnalysisConditions/CMakeLists.txt @@ -1,4 +1,4 @@ -cet_make_library(INTERFACE INSTALLED_PATH_BASE Offline/AnalysisConditions +cet_make_library(INTERFACE INSTALLED_PATH_BASE Offline SOURCE inc/MVACatalogCache.hh inc/MVACatalog.hh diff --git a/AnalysisConfig/CMakeLists.txt b/AnalysisConfig/CMakeLists.txt index 97068c6d9a..f03a6dcf1e 100644 --- a/AnalysisConfig/CMakeLists.txt +++ b/AnalysisConfig/CMakeLists.txt @@ -1,4 +1,4 @@ -cet_make_library(INTERFACE INSTALLED_PATH_BASE Offline/AnalysisConfig +cet_make_library(INTERFACE INSTALLED_PATH_BASE Offline SOURCE inc/MVACatalogConfig.hh LIBRARIES INTERFACE diff --git a/CRVConfig/CMakeLists.txt b/CRVConfig/CMakeLists.txt index 74b99de1e0..2f5d72539e 100644 --- a/CRVConfig/CMakeLists.txt +++ b/CRVConfig/CMakeLists.txt @@ -1,4 +1,4 @@ -cet_make_library(INTERFACE INSTALLED_PATH_BASE Offline/CRVConfig +cet_make_library(INTERFACE INSTALLED_PATH_BASE Offline SOURCE inc/CRVCalibConfig.hh inc/CRVOrdinalConfig.hh diff --git a/CaloConfig/CMakeLists.txt b/CaloConfig/CMakeLists.txt index edcbba3b6e..a461de3e0e 100644 --- a/CaloConfig/CMakeLists.txt +++ b/CaloConfig/CMakeLists.txt @@ -1,4 +1,4 @@ -cet_make_library(INTERFACE INSTALLED_PATH_BASE Offline/CaloConfig +cet_make_library(INTERFACE INSTALLED_PATH_BASE Offline SOURCE inc/CalCalibConfig.hh inc/CaloDAQMapConfig.hh diff --git a/ConditionsBase/CMakeLists.txt b/ConditionsBase/CMakeLists.txt index be2c4b1edb..082d958891 100644 --- a/ConditionsBase/CMakeLists.txt +++ b/ConditionsBase/CMakeLists.txt @@ -1,4 +1,4 @@ -cet_make_library(INTERFACE INSTALLED_PATH_BASE Offline/ConditionsBase +cet_make_library(INTERFACE INSTALLED_PATH_BASE Offline SOURCE inc/TrackerCalibrationStructs.hh LIBRARIES INTERFACE diff --git a/DAQConfig/CMakeLists.txt b/DAQConfig/CMakeLists.txt index 8aeae67502..d4b6eb0161 100644 --- a/DAQConfig/CMakeLists.txt +++ b/DAQConfig/CMakeLists.txt @@ -1,4 +1,4 @@ -cet_make_library(INTERFACE INSTALLED_PATH_BASE Offline/DAQConfig +cet_make_library(INTERFACE INSTALLED_PATH_BASE Offline SOURCE inc/EventTimingConfig.hh LIBRARIES INTERFACE diff --git a/MBSGeom/CMakeLists.txt b/MBSGeom/CMakeLists.txt index bfdb675dcf..5a63f163e6 100644 --- a/MBSGeom/CMakeLists.txt +++ b/MBSGeom/CMakeLists.txt @@ -1,4 +1,4 @@ -cet_make_library(INTERFACE INSTALLED_PATH_BASE Offline/MBSGeom +cet_make_library(INTERFACE INSTALLED_PATH_BASE Offline SOURCE inc/MBS.hh LIBRARIES INTERFACE diff --git a/Mu2eInterfaces/CMakeLists.txt b/Mu2eInterfaces/CMakeLists.txt index 213c9a19f1..2cc9ec4e4f 100644 --- a/Mu2eInterfaces/CMakeLists.txt +++ b/Mu2eInterfaces/CMakeLists.txt @@ -1,4 +1,8 @@ -cet_make_library(INTERFACE INSTALLED_PATH_BASE Offline/Mu2eInterfaces + +macro(FixSources) +endmacro() + +cet_make_library(INTERFACE INSTALLED_PATH_BASE Offline SOURCE inc/ConditionsEntity.hh inc/Detector.hh diff --git a/ProditionsService/CMakeLists.txt b/ProditionsService/CMakeLists.txt index 7f388665d9..9888c658ca 100644 --- a/ProditionsService/CMakeLists.txt +++ b/ProditionsService/CMakeLists.txt @@ -1,4 +1,4 @@ -cet_make_library(INTERFACE INSTALLED_PATH_BASE Offline/ProditionsService +cet_make_library(INTERFACE INSTALLED_PATH_BASE Offline SOURCE inc/ProditionsHandle.hh inc/ProditionsService.hh diff --git a/STMConfig/CMakeLists.txt b/STMConfig/CMakeLists.txt index b00dfb8731..ac3db8634e 100644 --- a/STMConfig/CMakeLists.txt +++ b/STMConfig/CMakeLists.txt @@ -1,4 +1,4 @@ -cet_make_library(INTERFACE INSTALLED_PATH_BASE Offline/STMConfig +cet_make_library(INTERFACE INSTALLED_PATH_BASE Offline SOURCE inc/STMEnergyCalibConfig.hh LIBRARIES INTERFACE diff --git a/STMGeom/CMakeLists.txt b/STMGeom/CMakeLists.txt index db26e83d02..d7abb0565a 100644 --- a/STMGeom/CMakeLists.txt +++ b/STMGeom/CMakeLists.txt @@ -1,4 +1,4 @@ -cet_make_library(INTERFACE INSTALLED_PATH_BASE Offline/STMGeom +cet_make_library(INTERFACE INSTALLED_PATH_BASE Offline SOURCE inc/GeDetector.hh inc/PermanentMagnet.hh diff --git a/SimulationConfig/CMakeLists.txt b/SimulationConfig/CMakeLists.txt index b55326d3d7..4ddf614d13 100644 --- a/SimulationConfig/CMakeLists.txt +++ b/SimulationConfig/CMakeLists.txt @@ -1,4 +1,4 @@ -cet_make_library(INTERFACE INSTALLED_PATH_BASE Offline/SimulationConfig +cet_make_library(INTERFACE INSTALLED_PATH_BASE Offline SOURCE inc/SimBookkeeperConfig.hh LIBRARIES INTERFACE diff --git a/TrackerConfig/CMakeLists.txt b/TrackerConfig/CMakeLists.txt index d93ec02fed..3fca27b47b 100644 --- a/TrackerConfig/CMakeLists.txt +++ b/TrackerConfig/CMakeLists.txt @@ -1,4 +1,4 @@ -cet_make_library(INTERFACE INSTALLED_PATH_BASE Offline/TrackerConfig +cet_make_library(INTERFACE INSTALLED_PATH_BASE Offline SOURCE inc/AlignedTrackerConfig.hh inc/FullReadoutStrawConfig.hh diff --git a/TrkPatRec/CMakeLists.txt b/TrkPatRec/CMakeLists.txt index 9c3510ce32..ac31992044 100644 --- a/TrkPatRec/CMakeLists.txt +++ b/TrkPatRec/CMakeLists.txt @@ -1,4 +1,4 @@ -cet_make_library(INTERFACE INSTALLED_PATH_BASE Offline/TrkPatRec +cet_make_library(INTERFACE INSTALLED_PATH_BASE Offline SOURCE inc/KalFinalFit_types.hh inc/KalSeedFit_types.hh diff --git a/boost_fix/CMakeLists.txt b/boost_fix/CMakeLists.txt index efc35f49dc..ab7aa48eb2 100644 --- a/boost_fix/CMakeLists.txt +++ b/boost_fix/CMakeLists.txt @@ -1,4 +1,4 @@ -cet_make_library(INTERFACE INSTALLED_PATH_BASE Offline/boost_fix +cet_make_library(INTERFACE INSTALLED_PATH_BASE Offline SOURCE accumulators/statistics.hpp accumulators/statistics/stats.hpp From 2ccb8ebdf698d90f778746baf238b2b0657cd1c5 Mon Sep 17 00:00:00 2001 From: ehrlich-uva Date: Tue, 12 Dec 2023 14:06:34 -0600 Subject: [PATCH 028/213] added Wideband MC and calib/reco of Wideband data --- CRVConditions/data/wideband1module.txt | 129 +++++ CRVConditions/data/wideband4modules.txt | 513 ++++++++++++++++++ CRVReco/fcl/prolog_v11.fcl | 13 + .../src/CrvCalibration_module.cc | 23 + CRVReco/src/CrvFPGArate_module.cc | 206 +++++++ .../src/CrvPedestalFinder_module.cc | 0 CRVReco/src/CrvRecoPulsesFinder_module.cc | 7 +- {CRVResponse => CRVReco}/test/calibration.C | 53 +- CRVReco/test/calibration_wideband1module.fcl | 42 ++ CRVReco/test/pedestal.C | 72 +++ CRVReco/test/pedestal_wideband1module.fcl | 36 ++ CRVReco/test/reco_wideband1module.fcl | 47 ++ CRVResponse/fcl/prolog_v11.fcl | 11 - CRVResponse/src/CrvWidebandTest_module.cc | 388 +++++++++++++ CRVResponse/test/CrvFPGArates.fcl | 40 ++ CRVResponse/test/CrvFPGArates.py | 92 ++++ CRVResponse/test/pedestal.C | 31 -- .../test/wideband/wideband4modules.fcl | 188 +++++++ .../test/wideband/widebandCRYconfig.txt | 47 ++ DAQ/src/CrvDigisFromFragments_module.cc | 6 +- ...ateCrvDigiFromFragment_wideband1module.fcl | 66 +++ EventDisplay/fcl/EventDisplayWideband.fcl | 6 +- EventDisplay/src/DataInterface.cc | 9 +- EventDisplay/src/DataInterface.h | 2 +- EventDisplay/src/EventDisplayFrame.cc | 12 +- EventGenerator/inc/CosmicCRY.hh | 2 +- EventGenerator/src/CosmicCRY.cc | 4 +- Mu2eG4/geom/geom_Wideband1module.txt | 52 ++ Mu2eG4/geom/geom_Wideband4modules.txt | 91 ++++ Mu2eG4/geom/geom_Wideband_1CrvModule.txt | 137 ----- 30 files changed, 2125 insertions(+), 200 deletions(-) create mode 100644 CRVConditions/data/wideband1module.txt create mode 100644 CRVConditions/data/wideband4modules.txt rename {CRVResponse => CRVReco}/src/CrvCalibration_module.cc (78%) create mode 100644 CRVReco/src/CrvFPGArate_module.cc rename {CRVResponse => CRVReco}/src/CrvPedestalFinder_module.cc (100%) rename {CRVResponse => CRVReco}/test/calibration.C (52%) create mode 100644 CRVReco/test/calibration_wideband1module.fcl create mode 100644 CRVReco/test/pedestal.C create mode 100644 CRVReco/test/pedestal_wideband1module.fcl create mode 100644 CRVReco/test/reco_wideband1module.fcl create mode 100644 CRVResponse/src/CrvWidebandTest_module.cc create mode 100644 CRVResponse/test/CrvFPGArates.fcl create mode 100644 CRVResponse/test/CrvFPGArates.py delete mode 100644 CRVResponse/test/pedestal.C create mode 100644 CRVResponse/test/wideband/wideband4modules.fcl create mode 100644 CRVResponse/test/wideband/widebandCRYconfig.txt create mode 100644 DAQ/test/generateCrvDigiFromFragment_wideband1module.fcl create mode 100644 Mu2eG4/geom/geom_Wideband1module.txt create mode 100644 Mu2eG4/geom/geom_Wideband4modules.txt delete mode 100644 Mu2eG4/geom/geom_Wideband_1CrvModule.txt diff --git a/CRVConditions/data/wideband1module.txt b/CRVConditions/data/wideband1module.txt new file mode 100644 index 0000000000..1efaeede37 --- /dev/null +++ b/CRVConditions/data/wideband1module.txt @@ -0,0 +1,129 @@ +Channel ROC FEB FEBchannel +0 1 2 63 +2 1 2 62 +4 1 2 61 +6 1 2 60 +8 1 2 59 +10 1 2 58 +12 1 2 57 +14 1 2 56 +16 1 2 55 +18 1 2 54 +20 1 2 53 +22 1 2 52 +24 1 2 51 +26 1 2 50 +28 1 2 49 +30 1 2 48 +32 1 2 47 +34 1 2 46 +36 1 2 45 +38 1 2 44 +40 1 2 43 +42 1 2 42 +44 1 2 41 +46 1 2 40 +48 1 2 39 +50 1 2 38 +52 1 2 37 +54 1 2 36 +56 1 2 35 +58 1 2 34 +60 1 2 33 +62 1 2 32 +64 1 2 31 +66 1 2 30 +68 1 2 29 +70 1 2 28 +72 1 2 27 +74 1 2 26 +76 1 2 25 +78 1 2 24 +80 1 2 23 +82 1 2 22 +84 1 2 21 +86 1 2 20 +88 1 2 19 +90 1 2 18 +92 1 2 17 +94 1 2 16 +96 1 2 15 +98 1 2 14 +100 1 2 13 +102 1 2 12 +104 1 2 11 +106 1 2 10 +108 1 2 9 +110 1 2 8 +112 1 2 7 +114 1 2 6 +116 1 2 5 +118 1 2 4 +120 1 2 3 +122 1 2 2 +124 1 2 1 +126 1 2 0 +128 1 1 63 +130 1 1 62 +132 1 1 61 +134 1 1 60 +136 1 1 59 +138 1 1 58 +140 1 1 57 +142 1 1 56 +144 1 1 55 +146 1 1 54 +148 1 1 53 +150 1 1 52 +152 1 1 51 +154 1 1 50 +156 1 1 49 +158 1 1 48 +160 1 1 47 +162 1 1 46 +164 1 1 45 +166 1 1 44 +168 1 1 43 +170 1 1 42 +172 1 1 41 +174 1 1 40 +176 1 1 39 +178 1 1 38 +180 1 1 37 +182 1 1 36 +184 1 1 35 +186 1 1 34 +188 1 1 33 +190 1 1 32 +192 1 1 31 +194 1 1 30 +196 1 1 29 +198 1 1 28 +200 1 1 27 +202 1 1 26 +204 1 1 25 +206 1 1 24 +208 1 1 23 +210 1 1 22 +212 1 1 21 +214 1 1 20 +216 1 1 19 +218 1 1 18 +220 1 1 17 +222 1 1 16 +224 1 1 15 +226 1 1 14 +228 1 1 13 +230 1 1 12 +232 1 1 11 +234 1 1 10 +236 1 1 9 +238 1 1 8 +240 1 1 7 +242 1 1 6 +244 1 1 5 +246 1 1 4 +248 1 1 3 +250 1 1 2 +252 1 1 1 +254 1 1 0 diff --git a/CRVConditions/data/wideband4modules.txt b/CRVConditions/data/wideband4modules.txt new file mode 100644 index 0000000000..f48359170d --- /dev/null +++ b/CRVConditions/data/wideband4modules.txt @@ -0,0 +1,513 @@ +Channel ROC FEB FEBchannel +0 1 6 63 +2 1 6 62 +4 1 6 61 +6 1 6 60 +8 1 6 59 +10 1 6 58 +12 1 6 57 +14 1 6 56 +16 1 6 55 +18 1 6 54 +20 1 6 53 +22 1 6 52 +24 1 6 51 +26 1 6 50 +28 1 6 49 +30 1 6 48 +32 1 6 47 +34 1 6 46 +36 1 6 45 +38 1 6 44 +40 1 6 43 +42 1 6 42 +44 1 6 41 +46 1 6 40 +48 1 6 39 +50 1 6 38 +52 1 6 37 +54 1 6 36 +56 1 6 35 +58 1 6 34 +60 1 6 33 +62 1 6 32 +64 1 6 31 +66 1 6 30 +68 1 6 29 +70 1 6 28 +72 1 6 27 +74 1 6 26 +76 1 6 25 +78 1 6 24 +80 1 6 23 +82 1 6 22 +84 1 6 21 +86 1 6 20 +88 1 6 19 +90 1 6 18 +92 1 6 17 +94 1 6 16 +96 1 6 15 +98 1 6 14 +100 1 6 13 +102 1 6 12 +104 1 6 11 +106 1 6 10 +108 1 6 9 +110 1 6 8 +112 1 6 7 +114 1 6 6 +116 1 6 5 +118 1 6 4 +120 1 6 3 +122 1 6 2 +124 1 6 1 +126 1 6 0 +128 1 0 63 +130 1 0 62 +132 1 0 61 +134 1 0 60 +136 1 0 59 +138 1 0 58 +140 1 0 57 +142 1 0 56 +144 1 0 55 +146 1 0 54 +148 1 0 53 +150 1 0 52 +152 1 0 51 +154 1 0 50 +156 1 0 49 +158 1 0 48 +160 1 0 47 +162 1 0 46 +164 1 0 45 +166 1 0 44 +168 1 0 43 +170 1 0 42 +172 1 0 41 +174 1 0 40 +176 1 0 39 +178 1 0 38 +180 1 0 37 +182 1 0 36 +184 1 0 35 +186 1 0 34 +188 1 0 33 +190 1 0 32 +192 1 0 31 +194 1 0 30 +196 1 0 29 +198 1 0 28 +200 1 0 27 +202 1 0 26 +204 1 0 25 +206 1 0 24 +208 1 0 23 +210 1 0 22 +212 1 0 21 +214 1 0 20 +216 1 0 19 +218 1 0 18 +220 1 0 17 +222 1 0 16 +224 1 0 15 +226 1 0 14 +228 1 0 13 +230 1 0 12 +232 1 0 11 +234 1 0 10 +236 1 0 9 +238 1 0 8 +240 1 0 7 +242 1 0 6 +244 1 0 5 +246 1 0 4 +248 1 0 3 +250 1 0 2 +252 1 0 1 +254 1 0 0 +256 1 2 63 +258 1 2 62 +260 1 2 61 +262 1 2 60 +264 1 2 59 +266 1 2 58 +268 1 2 57 +270 1 2 56 +272 1 2 55 +274 1 2 54 +276 1 2 53 +278 1 2 52 +280 1 2 51 +282 1 2 50 +284 1 2 49 +286 1 2 48 +288 1 2 47 +290 1 2 46 +292 1 2 45 +294 1 2 44 +296 1 2 43 +298 1 2 42 +300 1 2 41 +302 1 2 40 +304 1 2 39 +306 1 2 38 +308 1 2 37 +310 1 2 36 +312 1 2 35 +314 1 2 34 +316 1 2 33 +318 1 2 32 +320 1 2 31 +322 1 2 30 +324 1 2 29 +326 1 2 28 +328 1 2 27 +330 1 2 26 +332 1 2 25 +334 1 2 24 +336 1 2 23 +338 1 2 22 +340 1 2 21 +342 1 2 20 +344 1 2 19 +346 1 2 18 +348 1 2 17 +350 1 2 16 +352 1 2 15 +354 1 2 14 +356 1 2 13 +358 1 2 12 +360 1 2 11 +362 1 2 10 +364 1 2 9 +366 1 2 8 +368 1 2 7 +370 1 2 6 +372 1 2 5 +374 1 2 4 +376 1 2 3 +378 1 2 2 +380 1 2 1 +382 1 2 0 +384 1 1 63 +386 1 1 62 +388 1 1 61 +390 1 1 60 +392 1 1 59 +394 1 1 58 +396 1 1 57 +398 1 1 56 +400 1 1 55 +402 1 1 54 +404 1 1 53 +406 1 1 52 +408 1 1 51 +410 1 1 50 +412 1 1 49 +414 1 1 48 +416 1 1 47 +418 1 1 46 +420 1 1 45 +422 1 1 44 +424 1 1 43 +426 1 1 42 +428 1 1 41 +430 1 1 40 +432 1 1 39 +434 1 1 38 +436 1 1 37 +438 1 1 36 +440 1 1 35 +442 1 1 34 +444 1 1 33 +446 1 1 32 +448 1 1 31 +450 1 1 30 +452 1 1 29 +454 1 1 28 +456 1 1 27 +458 1 1 26 +460 1 1 25 +462 1 1 24 +464 1 1 23 +466 1 1 22 +468 1 1 21 +470 1 1 20 +472 1 1 19 +474 1 1 18 +476 1 1 17 +478 1 1 16 +480 1 1 15 +482 1 1 14 +484 1 1 13 +486 1 1 12 +488 1 1 11 +490 1 1 10 +492 1 1 9 +494 1 1 8 +496 1 1 7 +498 1 1 6 +500 1 1 5 +502 1 1 4 +504 1 1 3 +506 1 1 2 +508 1 1 1 +510 1 1 0 +512 1 4 63 +514 1 4 62 +516 1 4 61 +518 1 4 60 +520 1 4 59 +522 1 4 58 +524 1 4 57 +526 1 4 56 +528 1 4 55 +530 1 4 54 +532 1 4 53 +534 1 4 52 +536 1 4 51 +538 1 4 50 +540 1 4 49 +542 1 4 48 +544 1 4 47 +546 1 4 46 +548 1 4 45 +550 1 4 44 +552 1 4 43 +554 1 4 42 +556 1 4 41 +558 1 4 40 +560 1 4 39 +562 1 4 38 +564 1 4 37 +566 1 4 36 +568 1 4 35 +570 1 4 34 +572 1 4 33 +574 1 4 32 +576 1 4 31 +578 1 4 30 +580 1 4 29 +582 1 4 28 +584 1 4 27 +586 1 4 26 +588 1 4 25 +590 1 4 24 +592 1 4 23 +594 1 4 22 +596 1 4 21 +598 1 4 20 +600 1 4 19 +602 1 4 18 +604 1 4 17 +606 1 4 16 +608 1 4 15 +610 1 4 14 +612 1 4 13 +614 1 4 12 +616 1 4 11 +618 1 4 10 +620 1 4 9 +622 1 4 8 +624 1 4 7 +626 1 4 6 +628 1 4 5 +630 1 4 4 +632 1 4 3 +634 1 4 2 +636 1 4 1 +638 1 4 0 +640 1 3 63 +642 1 3 62 +644 1 3 61 +646 1 3 60 +648 1 3 59 +650 1 3 58 +652 1 3 57 +654 1 3 56 +656 1 3 55 +658 1 3 54 +660 1 3 53 +662 1 3 52 +664 1 3 51 +666 1 3 50 +668 1 3 49 +670 1 3 48 +672 1 3 47 +674 1 3 46 +676 1 3 45 +678 1 3 44 +680 1 3 43 +682 1 3 42 +684 1 3 41 +686 1 3 40 +688 1 3 39 +690 1 3 38 +692 1 3 37 +694 1 3 36 +696 1 3 35 +698 1 3 34 +700 1 3 33 +702 1 3 32 +704 1 3 31 +706 1 3 30 +708 1 3 29 +710 1 3 28 +712 1 3 27 +714 1 3 26 +716 1 3 25 +718 1 3 24 +720 1 3 23 +722 1 3 22 +724 1 3 21 +726 1 3 20 +728 1 3 19 +730 1 3 18 +732 1 3 17 +734 1 3 16 +736 1 3 15 +738 1 3 14 +740 1 3 13 +742 1 3 12 +744 1 3 11 +746 1 3 10 +748 1 3 9 +750 1 3 8 +752 1 3 7 +754 1 3 6 +756 1 3 5 +758 1 3 4 +760 1 3 3 +762 1 3 2 +764 1 3 1 +766 1 3 0 +768 1 5 63 +770 1 5 62 +772 1 5 61 +774 1 5 60 +776 1 5 59 +778 1 5 58 +780 1 5 57 +782 1 5 56 +784 1 5 55 +786 1 5 54 +788 1 5 53 +790 1 5 52 +792 1 5 51 +794 1 5 50 +796 1 5 49 +798 1 5 48 +800 1 5 47 +802 1 5 46 +804 1 5 45 +806 1 5 44 +808 1 5 43 +810 1 5 42 +812 1 5 41 +814 1 5 40 +816 1 5 39 +818 1 5 38 +820 1 5 37 +822 1 5 36 +824 1 5 35 +826 1 5 34 +828 1 5 33 +830 1 5 32 +832 1 5 31 +834 1 5 30 +836 1 5 29 +838 1 5 28 +840 1 5 27 +842 1 5 26 +844 1 5 25 +846 1 5 24 +848 1 5 23 +850 1 5 22 +852 1 5 21 +854 1 5 20 +856 1 5 19 +858 1 5 18 +860 1 5 17 +862 1 5 16 +864 1 5 15 +866 1 5 14 +868 1 5 13 +870 1 5 12 +872 1 5 11 +874 1 5 10 +876 1 5 9 +878 1 5 8 +880 1 5 7 +882 1 5 6 +884 1 5 5 +886 1 5 4 +888 1 5 3 +890 1 5 2 +892 1 5 1 +894 1 5 0 +896 1 7 63 +898 1 7 62 +900 1 7 61 +902 1 7 60 +904 1 7 59 +906 1 7 58 +908 1 7 57 +910 1 7 56 +912 1 7 55 +914 1 7 54 +916 1 7 53 +918 1 7 52 +920 1 7 51 +922 1 7 50 +924 1 7 49 +926 1 7 48 +928 1 7 47 +930 1 7 46 +932 1 7 45 +934 1 7 44 +936 1 7 43 +938 1 7 42 +940 1 7 41 +942 1 7 40 +944 1 7 39 +946 1 7 38 +948 1 7 37 +950 1 7 36 +952 1 7 35 +954 1 7 34 +956 1 7 33 +958 1 7 32 +960 1 7 31 +962 1 7 30 +964 1 7 29 +966 1 7 28 +968 1 7 27 +970 1 7 26 +972 1 7 25 +974 1 7 24 +976 1 7 23 +978 1 7 22 +980 1 7 21 +982 1 7 20 +984 1 7 19 +986 1 7 18 +988 1 7 17 +990 1 7 16 +992 1 7 15 +994 1 7 14 +996 1 7 13 +998 1 7 12 +1000 1 7 11 +1002 1 7 10 +1004 1 7 9 +1006 1 7 8 +1008 1 7 7 +1010 1 7 6 +1012 1 7 5 +1014 1 7 4 +1016 1 7 3 +1018 1 7 2 +1020 1 7 1 +1022 1 7 0 diff --git a/CRVReco/fcl/prolog_v11.fcl b/CRVReco/fcl/prolog_v11.fcl index c6cfc11b1a..2741b9dc59 100644 --- a/CRVReco/fcl/prolog_v11.fcl +++ b/CRVReco/fcl/prolog_v11.fcl @@ -1,5 +1,18 @@ BEGIN_PROLOG + CrvPedestalFinder: + { + module_type : CrvPedestalFinder + crvDigiModuleLabel : "CrvDigi" + maxADCspread : 5 + } + + CrvCalibration: + { + module_type : CrvCalibration + crvRecoPulsesModuleLabel : "CrvRecoPulses" + } + CrvRecoPulses: { module_type : CrvRecoPulsesFinder diff --git a/CRVResponse/src/CrvCalibration_module.cc b/CRVReco/src/CrvCalibration_module.cc similarity index 78% rename from CRVResponse/src/CrvCalibration_module.cc rename to CRVReco/src/CrvCalibration_module.cc index bcae7a6cb3..7f52343fa4 100644 --- a/CRVResponse/src/CrvCalibration_module.cc +++ b/CRVReco/src/CrvCalibration_module.cc @@ -5,7 +5,9 @@ // Original Author: Ralf Ehrlich #include "Offline/CosmicRayShieldGeom/inc/CosmicRayShield.hh" +#include "Offline/CRVConditions/inc/CRVCalib.hh" #include "Offline/GeometryService/inc/GeomHandle.hh" +#include "Offline/ProditionsService/inc/ProditionsHandle.hh" #include "Offline/RecoDataProducts/inc/CrvRecoPulse.hh" #include "art_root_io/TFileDirectory.h" @@ -45,6 +47,8 @@ namespace mu2e private: std::string _crvRecoPulsesModuleLabel; std::vector _calibHists; + + ProditionsHandle _calib_h; }; @@ -79,6 +83,25 @@ namespace mu2e art::Handle crvRecoPulseCollection; if(!event.getByLabel(_crvRecoPulsesModuleLabel,"",crvRecoPulseCollection)) return; + //add pedestal to histogram title + static bool first=true; + if(first) + { + first=false; + auto const& calib = _calib_h.get(event.id()); + GeomHandle CRS; + const std::vector > &counters = CRS->getAllCRSScintillatorBars(); + for(size_t barIndex=0; barIndexSetTitle(Form("crvCalibrationHist_%lu_pedestal_%f",channelIndex,pedestal)); + } + } + } + for(auto iter=crvRecoPulseCollection->begin(); iter!=crvRecoPulseCollection->end(); ++iter) { if(!iter->GetRecoPulseFlags().none()) continue; diff --git a/CRVReco/src/CrvFPGArate_module.cc b/CRVReco/src/CrvFPGArate_module.cc new file mode 100644 index 0000000000..0e14c6a0ac --- /dev/null +++ b/CRVReco/src/CrvFPGArate_module.cc @@ -0,0 +1,206 @@ +// +// A module that finds the calibration constants for Crv channels +// +// +// Original Author: Ralf Ehrlich + +#include "Offline/CosmicRayShieldGeom/inc/CosmicRayShield.hh" +#include "Offline/GeometryService/inc/GeomHandle.hh" +#include "Offline/RecoDataProducts/inc/CrvDigi.hh" +#include "Offline/CRVConditions/inc/CRVOrdinal.hh" +#include "Offline/ProditionsService/inc/ProditionsHandle.hh" + +#include "art_root_io/TFileDirectory.h" +#include "art_root_io/TFileService.h" +#include "art/Framework/Services/Registry/ServiceHandle.h" + +#include "art/Framework/Core/ModuleMacros.h" +#include "art/Framework/Principal/Event.h" +#include "art/Framework/Principal/Handle.h" +#include "art/Framework/Core/EDAnalyzer.h" +#include "art/Framework/Core/ModuleMacros.h" +#include "fhiclcpp/types/Atom.h" +#include "fhiclcpp/types/Table.h" + +#include +#include + +namespace mu2e +{ + class CrvFPGArate : public art::EDAnalyzer + { + + public: + struct Config + { + using Name=fhicl::Name; + using Comment=fhicl::Comment; + fhicl::Atom crvDigiModuleLabel{Name("crvDigiModuleLabel"), Comment("module label for CrvDigis")}; + fhicl::Atom minTDC{Name("minTDC"), Comment("minimum TDC")}; + fhicl::Atom maxTDC{Name("maxTDC"), Comment("maximum TDC")}; + }; + + typedef art::EDAnalyzer::Table Parameters; + + explicit CrvFPGArate(const Parameters& config); + void analyze(const art::Event& e); + void beginRun(const art::Run&); + + private: + std::string _crvDigiModuleLabel; + int _minTDC; + int _maxTDC; + std::unique_ptr _tfdirFPGAhitRates; + std::unique_ptr _tfdirFPGAhitMultiplicities; + std::map _FPGArateHists; + std::map _FPGAmultiplicityHists; + mu2e::ProditionsHandle _channelMap_h; + }; + + + CrvFPGArate::CrvFPGArate(const Parameters& conf) : + art::EDAnalyzer(conf), + _crvDigiModuleLabel(conf().crvDigiModuleLabel()), + _minTDC(conf().minTDC()), + _maxTDC(conf().maxTDC()) + { + art::ServiceHandle tfs; + _tfdirFPGAhitRates = std::unique_ptr(new art::TFileDirectory(tfs->mkdir("FPGAhitRates"))); + _tfdirFPGAhitMultiplicities = std::unique_ptr(new art::TFileDirectory(tfs->mkdir("FPGAhitMultiplicities"))); + } + + void CrvFPGArate::beginRun(const art::Run&) + { + } + + void CrvFPGArate::analyze(const art::Event& event) + { + GeomHandle CRS; + art::ServiceHandle tfs; + + auto const& channelMap = _channelMap_h.get(event.id()); + + art::Handle crvDigiCollection; + if(!event.getByLabel(_crvDigiModuleLabel,"",crvDigiCollection)) return; + + //first create an FPGA map with entries for all FPGAs so that the 0-bin can be filled in the histogram for FPGAs without hits + std::map eventFPGAmap; + std::map> eventHitMultiplicityMap; + const std::vector > &counters = CRS->getAllCRSScintillatorBars(); + for(size_t barIndex=0; barIndexhasCMB(SiPM%2)) continue; //non-existing offline channel + + size_t offlineChannel = barIndex*4 + SiPM; + + CRVROC onlineChannel = channelMap.online(offlineChannel); + uint16_t rocID = onlineChannel.ROC(); + uint16_t rocPort = onlineChannel.FEB(); + uint16_t febChannel = onlineChannel.FEBchannel(); + uint16_t febFPGA = febChannel/16; + + uint16_t FPGAIndex = 24*4*(rocID-1) + 4*(rocPort-1) + febFPGA; + eventFPGAmap[FPGAIndex]=0; + eventHitMultiplicityMap[FPGAIndex].clear(); + } + } + + //now loop through all digis and update the FPGA map + //(use this loop to also check for pulses with more than one hits) + int previousBarIndex = -1; + int previousSiPM = -1; + int previousTDC = -1; + for(auto iter=crvDigiCollection->begin(); iter!=crvDigiCollection->end(); ++iter) + { + uint16_t TDC = iter->GetStartTDC(); + if(TDC<_minTDC || TDC>_maxTDC) continue; + + int barIndex = iter->GetScintillatorBarIndex().asInt(); + int SiPM = iter->GetSiPMNumber(); + uint16_t offlineChannel = barIndex*4 + SiPM; + + CRVROC onlineChannel = channelMap.online(offlineChannel); + uint16_t rocID = onlineChannel.ROC(); + uint16_t rocPort = onlineChannel.FEB(); + uint16_t febChannel = onlineChannel.FEBchannel(); + uint16_t febFPGA = febChannel/16; + + uint16_t FPGAIndex = 24*4*(rocID-1) + 4*(rocPort-1) + febFPGA; + eventFPGAmap[FPGAIndex]++; + + //check for pulses with multiple hits + if(previousBarIndex==barIndex && previousSiPM==SiPM && previousTDC+CrvDigi::NSamples==TDC) + eventHitMultiplicityMap[FPGAIndex].back()++; + else + eventHitMultiplicityMap[FPGAIndex].push_back(1); + + previousBarIndex = barIndex; + previousSiPM = SiPM; + previousTDC = TDC; + } + + //now collect the hit rates of all FPGAs + for(auto iter=eventFPGAmap.begin(); iter!=eventFPGAmap.end(); ++iter) + { + uint16_t FPGAIndex = iter->first; + auto FPGAiter = _FPGArateHists.find(FPGAIndex); + if(FPGAiter ==_FPGArateHists.end()) + { + uint16_t rocID = FPGAIndex/(24*4)+1; + uint16_t rocPort = (FPGAIndex%(24*4))/4+1; + uint16_t febFPGA = FPGAIndex%4; + uint16_t febChannel = febFPGA*16; //use the 1st channel of the FPGA + mu2e::CRVROC onlineChannel(rocID, rocPort, febChannel); + + uint16_t offlineChannel = channelMap.offline(onlineChannel); + int barIndex = offlineChannel/4; + const std::vector > &counters = CRS->getAllCRSScintillatorBars(); + const CRSScintillatorBarId &counterId = counters.at(barIndex)->id(); + const std::string §orName = CRS->getCRSScintillatorShield(counterId.getShieldId()).getName(); + const int moduleNumber = counterId.getModuleNumber(); + + const std::string histName=Form("%i_%i_%i__%s_%i",rocID,rocPort,febFPGA,sectorName.c_str(),moduleNumber); + + FPGAiter = _FPGArateHists.emplace(FPGAIndex,_tfdirFPGAhitRates->make(histName.c_str(),histName.c_str(),100,0,100)).first; //returns iterator to new element + } + + FPGAiter->second->Fill(iter->second); + } + + //now collect the hit mulitplicities of all FPGAs + for(auto iter=eventHitMultiplicityMap.begin(); iter!=eventHitMultiplicityMap.end(); ++iter) + { + uint16_t FPGAIndex = iter->first; + auto FPGAiter = _FPGAmultiplicityHists.find(FPGAIndex); + if(FPGAiter ==_FPGAmultiplicityHists.end()) + { + uint16_t rocID = FPGAIndex/(24*4)+1; + uint16_t rocPort = (FPGAIndex%(24*4))/4+1; + uint16_t febFPGA = FPGAIndex%4; + uint16_t febChannel = febFPGA*16; //use the 1st channel of the FPGA + mu2e::CRVROC onlineChannel(rocID, rocPort, febChannel); + + uint16_t offlineChannel = channelMap.offline(onlineChannel); + int barIndex = offlineChannel/4; + const std::vector > &counters = CRS->getAllCRSScintillatorBars(); + const CRSScintillatorBarId &counterId = counters.at(barIndex)->id(); + const std::string §orName = CRS->getCRSScintillatorShield(counterId.getShieldId()).getName(); + const int moduleNumber = counterId.getModuleNumber(); + + const std::string histName=Form("%i_%i_%i__%s_%i",rocID,rocPort,febFPGA,sectorName.c_str(),moduleNumber); + + FPGAiter = _FPGAmultiplicityHists.emplace(FPGAIndex,_tfdirFPGAhitMultiplicities->make(histName.c_str(),histName.c_str(),100,0,100)).first; //returns iterator to new element + } + + std::vector &multiplicities = iter->second; + for(size_t i=0; isecond->Fill(multiplicities.at(i)); + } + } + +} // end namespace mu2e + +using mu2e::CrvFPGArate; +DEFINE_ART_MODULE(CrvFPGArate) diff --git a/CRVResponse/src/CrvPedestalFinder_module.cc b/CRVReco/src/CrvPedestalFinder_module.cc similarity index 100% rename from CRVResponse/src/CrvPedestalFinder_module.cc rename to CRVReco/src/CrvPedestalFinder_module.cc diff --git a/CRVReco/src/CrvRecoPulsesFinder_module.cc b/CRVReco/src/CrvRecoPulsesFinder_module.cc index 444481ee28..d52bc8018f 100644 --- a/CRVReco/src/CrvRecoPulsesFinder_module.cc +++ b/CRVReco/src/CrvRecoPulsesFinder_module.cc @@ -119,9 +119,10 @@ namespace mu2e { std::unique_ptr crvRecoPulseCollection(new CrvRecoPulseCollection); + double TDC0time = 0; art::Handle protonBunchTime; event.getByLabel(_protonBunchTimeTag, protonBunchTime); - double TDC0time = -protonBunchTime->pbtime_; + if(protonBunchTime.isValid()) TDC0time = -protonBunchTime->pbtime_; art::Handle crvDigiCollection; event.getByLabel(_crvDigiModuleLabel,"",crvDigiCollection); @@ -188,6 +189,10 @@ namespace mu2e double pulseStart = _makeCrvRecoPulses->GetPulseStarts().at(j) + TDC0time + timeOffset; double pulseEnd = _makeCrvRecoPulses->GetPulseEnds().at(j) + TDC0time + timeOffset; + if(calibPulseArea<=0) PEs=0; + if(calibPulseArea<=0) PEsNoFit=0; + if(calibPulseHeight<=0) PEsPulseHeight=0; + crvRecoPulseCollection->emplace_back(PEs, PEsPulseHeight, pulseTime, pulseHeight, pulseBeta, pulseFitChi2, LEtime, flags, PEsNoFit, pulseTimeNoFit, pulseStart, pulseEnd, waveformIndices, barIndex, SiPM); diff --git a/CRVResponse/test/calibration.C b/CRVReco/test/calibration.C similarity index 52% rename from CRVResponse/test/calibration.C rename to CRVReco/test/calibration.C index 9d25a72930..0d1fbd6c7c 100644 --- a/CRVResponse/test/calibration.C +++ b/CRVReco/test/calibration.C @@ -1,4 +1,9 @@ -void calibration(std::string filename, int nPEpeaksToFit=1) +void output(std::ofstream &outputFile, int channel, double pedestal, double calibPulseHeight, double calibPulseArea) +{ + outputFile<cd("CrvCalibration")) @@ -7,7 +12,19 @@ void calibration(std::string filename, int nPEpeaksToFit=1) return; } + std::filesystem::path path(filename); + path.replace_extension("txt"); + std::ofstream outputFile; + outputFile.open(path); + + /***************************************************************************/ + + //CRVSiPM table - fill pedestals from pedestal file and calculate calibration constants + outputFile<<"TABLE CRVSiPM"<GetListOfKeys()) @@ -15,8 +32,14 @@ void calibration(std::string filename, int nPEpeaksToFit=1) TH1 *hist = dynamic_cast(gDirectory->Get(key->GetName())); if(hist==NULL) continue; //doesn't seem to be a histogram const std::string histName=hist->GetName(); - if(histName.compare(0,baseName.length(),baseName)!=0) continue; //doesn't seem to be a pedestal histogram - if(hist->GetEntries()<200) continue; //not enough entries + if(histName.compare(0,baseName.length(),baseName)!=0) continue; //doesn't seem to be a calibration histogram + const std::string channelName=histName.substr(baseName.length()); + int channel=atoi(channelName.c_str()); + + const std::string histTitle=hist->GetTitle(); + double pedestal=atof(histTitle.substr(histName.length()+pedestalTitle.length()).c_str()); //FIXME: add checks for wrongly formated hist titles + + if(hist->GetEntries()<200) {output(outputFile,channel,pedestal,-1,-1); continue;} //not enough entries int maxbin = 0; double maxbinContent = 0; @@ -69,6 +92,28 @@ void calibration(std::string filename, int nPEpeaksToFit=1) for(size_t iPeak=0; iPeakSetPoint(iPeak+1,iPeak+1,peaks[iPeak]); funcCalib.SetRange(-0.5, peaks.size()+0.5); graph->Fit(&funcCalib, "NQR"); - std::cout<GetListOfKeys()) + { + TH1 *hist = dynamic_cast(gDirectory->Get(key->GetName())); + if(hist==NULL) continue; //doesn't seem to be a histogram + const std::string histName=hist->GetName(); + if(histName.compare(0,baseName.length(),baseName)!=0) continue; //doesn't seem to be a pedestal histogram + const std::string channelName=histName.substr(baseName.length()); + outputFile<Terminate(); } diff --git a/CRVReco/test/calibration_wideband1module.fcl b/CRVReco/test/calibration_wideband1module.fcl new file mode 100644 index 0000000000..b1eb69cba6 --- /dev/null +++ b/CRVReco/test/calibration_wideband1module.fcl @@ -0,0 +1,42 @@ +# +# calibrates CRV channels +# +#include "Offline/fcl/standardProducers.fcl" +#include "Offline/fcl/standardServices.fcl" +#include "Offline/CRVResponse/fcl/prolog.fcl" + +process_name : calibrateWideband + +source : +{ + module_type : RootInput +} +services : +{ + @table::Services.Reco +} + +physics: { + producers : + { + CrvRecoPulses: @local::CrvRecoPulses + } + analyzers: + { + CrvCalibration: @local::CrvCalibration + } + + TriggerPath : [ CrvRecoPulses ] + EndPath : [ CrvCalibration ] + trigger_paths : [ TriggerPath ] + end_paths : [ EndPath ] +} + +physics.producers.EWMProducer.SpillType : 0 +physics.producers.CrvRecoPulses.minADCdifference : 5 //minimum ADC difference above pedestal to be considered for reconstruction +services.TFileService.fileName : "calibWideband.root" +services.GeometryService.inputFile: "Offline/Mu2eG4/geom/geom_Wideband1module.txt" +services.ProditionsService.crvCalib.useDb: true +services.ProditionsService.crvCalib.verbose: 2 +services.DbService.textFile : ["pedestalWideband_run004.txt"] +services.DbService.verbose: 2 diff --git a/CRVReco/test/pedestal.C b/CRVReco/test/pedestal.C new file mode 100644 index 0000000000..f2fb31b76c --- /dev/null +++ b/CRVReco/test/pedestal.C @@ -0,0 +1,72 @@ +void output(std::ofstream &outputFile, int channel, double pedestal) +{ + outputFile<cd("CrvPedestalFinder")) + { + std::cout<<"CrvPedestalFinder directory not found in Root file."<GetListOfKeys()) + { + TH1 *hist = dynamic_cast(gDirectory->Get(key->GetName())); + if(hist==NULL) continue; //doesn't seem to be a histogram + const std::string histName=hist->GetName(); + if(histName.compare(0,baseName.length(),baseName)!=0) continue; //doesn't seem to be a pedestal histogram + const std::string channelName=histName.substr(baseName.length()); + int channel=atoi(channelName.c_str()); + + if(hist->GetEntries()<200) {output(outputFile,channel,0); continue;} //not enough entries + int n=hist->GetNbinsX(); + double overflow=hist->GetBinContent(0)+hist->GetBinContent(n+1); + if(overflow/((double)hist->GetEntries())>0.1) {output(outputFile,channel,0); continue;} //too much overflow. something may be wrong + + int maxbinPedestal = hist->GetMaximumBin(); + double peakPedestal = hist->GetBinCenter(maxbinPedestal); + funcPedestal.SetRange(peakPedestal-4,peakPedestal+4); + funcPedestal.SetParameter(1,peakPedestal); + hist->Fit(&funcPedestal, "NQR"); + output(outputFile,channel,funcPedestal.GetParameter(1)); + } + + outputFile<GetListOfKeys()) + { + TH1 *hist = dynamic_cast(gDirectory->Get(key->GetName())); + if(hist==NULL) continue; //doesn't seem to be a histogram + const std::string histName=hist->GetName(); + if(histName.compare(0,baseName.length(),baseName)!=0) continue; //doesn't seem to be a pedestal histogram + const std::string channelName=histName.substr(baseName.length()); + outputFile<Terminate(); +} diff --git a/CRVReco/test/pedestal_wideband1module.fcl b/CRVReco/test/pedestal_wideband1module.fcl new file mode 100644 index 0000000000..4568abfb9c --- /dev/null +++ b/CRVReco/test/pedestal_wideband1module.fcl @@ -0,0 +1,36 @@ +# +# finds the pedestal of CRV channels +# +#include "Offline/fcl/standardProducers.fcl" +#include "Offline/fcl/standardServices.fcl" +#include "Offline/CRVResponse/fcl/prolog.fcl" + +process_name : pedestalFinderWideband + +source : +{ + module_type : RootInput +} +services : +{ + @table::Services.Reco +} + +physics: { + producers : + { + } + analyzers: + { + CrvPedestalFinder: @local::CrvPedestalFinder + } + + TriggerPath : [ ] + EndPath : [ CrvPedestalFinder ] + trigger_paths : [ TriggerPath ] + end_paths : [ EndPath ] +} + +physics.producers.EWMProducer.SpillType : 0 +services.TFileService.fileName : "pedestalWideband.root" +services.GeometryService.inputFile: "Offline/Mu2eG4/geom/geom_Wideband1module.txt" diff --git a/CRVReco/test/reco_wideband1module.fcl b/CRVReco/test/reco_wideband1module.fcl new file mode 100644 index 0000000000..aa9a613fe2 --- /dev/null +++ b/CRVReco/test/reco_wideband1module.fcl @@ -0,0 +1,47 @@ +#reconstructs CRV pulses +# +#include "Offline/fcl/standardProducers.fcl" +#include "Offline/fcl/standardServices.fcl" +#include "Offline/CRVResponse/fcl/prolog.fcl" + +process_name : CRVResponseReco + +source : +{ + module_type : RootInput +} + +services : +{ + @table::Services.Reco +} + +physics : +{ + producers: + { + CrvRecoPulses: @local::CrvRecoPulses + } + + an : [CrvRecoPulses] + out: [Output] + + trigger_paths: [an] + end_paths: [out] +} + +outputs: +{ + Output : + { + module_type : RootOutput + fileName : "recoWideband.art" + } +} + +services.TFileService.fileName : "recoWideband.root" +services.GeometryService.inputFile: "Offline/Mu2eG4/geom/geom_Wideband1module.txt" +services.ProditionsService.crvCalib.useDb: true +services.ProditionsService.crvCalib.verbose: 2 +services.DbService.textFile : ["calibWideband_run001.txt"] +services.DbService.verbose: 2 diff --git a/CRVResponse/fcl/prolog_v11.fcl b/CRVResponse/fcl/prolog_v11.fcl index f7a9887555..926e9400bd 100644 --- a/CRVResponse/fcl/prolog_v11.fcl +++ b/CRVResponse/fcl/prolog_v11.fcl @@ -147,17 +147,6 @@ BEGIN_PROLOG timeStart : 500 timeEnd : 1600 } - CrvPedestalFinder: - { - module_type : CrvPedestalFinder - crvDigiModuleLabel : "CrvDigi" - maxADCspread : 5 - } - CrvCalibration: - { - module_type : CrvCalibration - crvRecoPulsesModuleLabel : "CrvRecoPulses" - } # Makes one big Assns for mutiple CrvCoincidenceCluster collections CrvCoincidenceClusterMCAssns : { diff --git a/CRVResponse/src/CrvWidebandTest_module.cc b/CRVResponse/src/CrvWidebandTest_module.cc new file mode 100644 index 0000000000..4670cf22fb --- /dev/null +++ b/CRVResponse/src/CrvWidebandTest_module.cc @@ -0,0 +1,388 @@ +// +// A module to convert simulated CRV (Wideband) hits into a ROOT file +// with a structure similar to the one used for the Wideband standalone analysis. +// +// +// Original Author: Ralf Ehrlich + +#include "Offline/CosmicRayShieldGeom/inc/CosmicRayShield.hh" +#include "Offline/DataProducts/inc/CRSScintillatorBarIndex.hh" +#include "Offline/DataProducts/inc/CRVId.hh" +#include "Offline/ProditionsService/inc/ProditionsHandle.hh" +#include "Offline/CRVConditions/inc/CRVOrdinal.hh" + +#include "Offline/GeometryService/inc/DetectorSystem.hh" +#include "Offline/GeometryService/inc/GeomHandle.hh" +#include "Offline/GeometryService/inc/GeometryService.hh" +#include "Offline/MCDataProducts/inc/CrvStep.hh" +#include "Offline/MCDataProducts/inc/CrvCoincidenceClusterMC.hh" +#include "Offline/RecoDataProducts/inc/CrvRecoPulse.hh" +#include "Offline/RecoDataProducts/inc/CrvCoincidenceCluster.hh" +#include "Offline/RecoDataProducts/inc/ProtonBunchTime.hh" + +#include "canvas/Persistency/Common/Ptr.h" +#include "art/Framework/Principal/Event.h" +#include "art/Framework/Principal/Handle.h" +#include "art/Framework/Core/EDAnalyzer.h" +#include "art_root_io/TFileDirectory.h" +#include "art_root_io/TFileService.h" +#include "art/Framework/Services/Registry/ServiceHandle.h" +#include "fhiclcpp/ParameterSet.h" +#include "CLHEP/Units/GlobalSystemOfUnits.h" + +#include + +#include +#include +#include + +namespace mu2e +{ + class CrvWidebandTest : public art::EDAnalyzer + { + public: + using Name=fhicl::Name; + using Comment=fhicl::Comment; + struct Config + { + fhicl::Atom crvStepsModuleLabel{ Name("crvStepModuleLabel"), Comment("CrvStep label")}; + fhicl::Atom crvRecoPulsesModuleLabel{ Name("crvRecoPulseModuleLabel"), Comment("CrvRecoPulse Label")}; + fhicl::Atom crvCoincidenceClusterModuleLabel{ Name("crvCoincidenceClusterModuleLabel"), Comment("CrvCoincidenceCluster Label")}; + fhicl::Atom crvCoincidenceClusterMCModuleLabel{ Name("crvCoincidenceClusterMCModuleLabel"), Comment("CrvCoincidenceClusterMC Label")}; + fhicl::Atom minTrackFitPEs{ Name("minTrackFitPEs"), Comment("minimum number of PEs to be considered for track fit")}; + fhicl::Atom protonBunchTimeTag{ Name("protonBunchTimeTag"), Comment("ProtonBunchTime producer"),"EWMProducer" }; + }; + + using Parameters = art::EDAnalyzer::Table; + explicit CrvWidebandTest(const Parameters& conf); + ~CrvWidebandTest(); + void analyze(const art::Event& e); + void beginJob(); + void endJob(); + + private: + std::string _crvStepsModuleLabel; + std::string _crvRecoPulsesModuleLabel; + std::string _crvCoincidenceClusterModuleLabel; + std::string _crvCoincidenceClusterMCModuleLabel; + const float _minTrackFitPEs{5}; + art::InputTag _protonBunchTimeTag; + + int _nFEBs; + int _nSectorTypes; + + int _runNumber; + int _subrunNumber; + int _spillNumber{1}; //to have the same variables as in the Wideband files + int _spillIndex{1}; //to have the same variables as in the Wideband files + int _eventNumber; + + float *_recoPEs{NULL}; + float *_recoTime{NULL}; + int *_fitStatus{NULL}; + float *_depositedEnergy{NULL}; + int *_coincidencePDGid{NULL}; + float *_coincidenceTime{NULL}; + float *_coincidencePosX{NULL}; + float *_coincidencePosY{NULL}; + float *_coincidencePosZ{NULL}; + + float _trackSlope; //using slope=dx/dy to avoid inf for vertical tracks + float _trackIntercept; //x value, where y=0 + int _trackPoints; + float _trackPEs; + float _trackChi2; + + TTree *_tree; + + ProditionsHandle _crvChannelMap_h; + }; + + CrvWidebandTest::CrvWidebandTest(const Parameters& conf) : + art::EDAnalyzer{conf}, + _crvStepsModuleLabel(conf().crvStepsModuleLabel()), + _crvRecoPulsesModuleLabel(conf().crvRecoPulsesModuleLabel()), + _crvCoincidenceClusterModuleLabel(conf().crvCoincidenceClusterModuleLabel()), + _crvCoincidenceClusterMCModuleLabel(conf().crvCoincidenceClusterMCModuleLabel()), + _protonBunchTimeTag(conf().protonBunchTimeTag()) + { + art::ServiceHandle tfs; + _tree = tfs->make("WidebandTree", "WidebandTree"); + } + + CrvWidebandTest::~CrvWidebandTest() + { + delete[] _recoPEs; + delete[] _depositedEnergy; + delete[] _coincidencePDGid; + } + + void CrvWidebandTest::beginJob() + { + } + + void CrvWidebandTest::endJob() + { + } + + void CrvWidebandTest::analyze(const art::Event& event) + { + art::Handle crvStepsCollection; + if(!event.getByLabel(_crvStepsModuleLabel,"",crvStepsCollection)) return; + + art::Handle crvRecoPulseCollection; + if(!event.getByLabel(_crvRecoPulsesModuleLabel,"",crvRecoPulseCollection)) return; + + art::Handle crvCoincidenceClusterCollection; + if(!event.getByLabel(_crvCoincidenceClusterModuleLabel,"",crvCoincidenceClusterCollection)) return; + + art::Handle crvCoincidenceClusterMCCollection; + if(!event.getByLabel(_crvCoincidenceClusterMCModuleLabel,"",crvCoincidenceClusterMCCollection)) return; + + art::Handle protonBunchTime; + event.getByLabel(_protonBunchTimeTag, protonBunchTime); +// double TDC0time = -protonBunchTime->pbtime_; + + _runNumber = event.run(); + _subrunNumber = event.subRun(); + _eventNumber = event.event(); + + auto const& crvChannelMap = _crvChannelMap_h.get(event.id()); + + GeomHandle CRS; + const std::vector > &counters = CRS->getAllCRSScintillatorBars(); + std::vector >::const_iterator iter; + + //setup ROOT tree at the first event + if(_recoPEs==NULL) + { + //find out how many FEBs are present and what the top/bottom locations are + //find out how many sector types are present for which coincidences can be found + _nFEBs = 0; + _nSectorTypes = 0; + for(iter=counters.begin(); iter!=counters.end(); iter++) + { + //get counter properties + const CRSScintillatorBar &crvCounter = **iter; + const CRSScintillatorBarIndex &barIndex = crvCounter.index(); + int sectorNumber = crvCounter.id().getShieldNumber(); + int sectorType = CRS->getCRSScintillatorShields().at(sectorNumber).getSectorType(); + if(sectorType>=_nSectorTypes) _nSectorTypes=sectorType+1; + + for(int SiPM=0; SiPM<4; SiPM++) + { + if(!crvCounter.getBarDetail().hasCMB(SiPM%CRVId::nSidesPerBar)) continue; //don't check non-existing SiPMs + uint16_t offlineChannel = barIndex.asUint()*4 + SiPM; + CRVROC onlineChannel = crvChannelMap.online(offlineChannel); + uint16_t feb = onlineChannel.FEB(); + if(feb>=_nFEBs) _nFEBs=feb+1; + } + } + + _recoPEs = new float[_nFEBs*CRVId::nChanPerFEB]; + _recoTime = new float[_nFEBs*CRVId::nChanPerFEB]; + _fitStatus = new int[_nFEBs*CRVId::nChanPerFEB]; + _depositedEnergy = new float[_nFEBs*CRVId::nChanPerFEB]; + _coincidencePDGid = new int[_nSectorTypes]; + _coincidenceTime = new float[_nSectorTypes]; + _coincidencePosX = new float[_nSectorTypes]; + _coincidencePosY = new float[_nSectorTypes]; + _coincidencePosZ = new float[_nSectorTypes]; + + _tree->Branch("runNumber",&_runNumber,"runNumber/I"); + _tree->Branch("subrunNumber",&_subrunNumber,"subrunNumber/I"); + _tree->Branch("spillNumber",&_spillNumber,"spillNumber/I"); + _tree->Branch("spillIndex",&_spillNumber,"spillIndex/I"); + _tree->Branch("eventNumber",&_eventNumber,"eventNumber/I"); + _tree->Branch("PEs",_recoPEs,Form("PEs[%i][%i]/F",_nFEBs,(unsigned int)CRVId::nChanPerFEB)); + _tree->Branch("time",_recoTime,Form("time[%i][%i]/F",_nFEBs,(unsigned int)CRVId::nChanPerFEB)); + _tree->Branch("fitStatus",_fitStatus,Form("fitStatus[%i][%i]/I",_nFEBs,(unsigned int)CRVId::nChanPerFEB)); + _tree->Branch("depositedEnergy",_depositedEnergy,Form("depositedEnergy[%i][%i]/F",_nFEBs,(unsigned int)CRVId::nChanPerFEB)); + _tree->Branch("coincidencePDGid",_coincidencePDGid,Form("coincidencePDGid[%i]/I",_nSectorTypes)); + _tree->Branch("coincidenceTime",_coincidenceTime,Form("coincidenceTime[%i]/F",_nSectorTypes)); + _tree->Branch("coincidencePosX",_coincidencePosX,Form("coincidencePosX[%i]/F",_nSectorTypes)); + _tree->Branch("coincidencePosY",_coincidencePosY,Form("coincidencePosY[%i]/F",_nSectorTypes)); + _tree->Branch("coincidencePosZ",_coincidencePosZ,Form("coincidencePosZ[%i]/F",_nSectorTypes)); + _tree->Branch("trackSlope", &_trackSlope, "trackSlope/F"); + _tree->Branch("trackIntercept", &_trackIntercept, "trackIntercept/F"); + _tree->Branch("trackPoints", &_trackPoints, "trackPoints/I"); + _tree->Branch("trackPEs", &_trackPEs, "trackPEs/F"); + _tree->Branch("trackChi2", &_trackChi2, "trackChi2/F"); + } + + //initialize track variables + float sumX =0; + float sumY =0; + float sumXY =0; + float sumYY =0; + _trackSlope =0; + _trackIntercept=0; + _trackPEs =0; + _trackPoints =0; + _trackChi2 =-1; + + int widthDirection = counters.at(0)->getBarDetail().getWidthDirection(); //assumes that all counters are oriented in the same way + int thicknessDirection = counters.at(0)->getBarDetail().getThicknessDirection(); + + //loop through all counters + for(iter=counters.begin(); iter!=counters.end(); iter++) + { + //get counter properties + const CRSScintillatorBar &crvCounter = **iter; + const CRSScintillatorBarIndex &barIndex = crvCounter.index(); + + CLHEP::Hep3Vector crvCounterPos = crvCounter.getPosition(); + if(widthDirection!=crvCounter.getBarDetail().getWidthDirection() || + thicknessDirection!=crvCounter.getBarDetail().getThicknessDirection()) + throw std::logic_error("crv modules are oriented in different directions."); + + double x=crvCounterPos[widthDirection]; + double y=crvCounterPos[thicknessDirection]; + + //get visible deposited energy for each counter + double depositedEnergy=0; + if(crvStepsCollection.isValid()) + { + for(size_t istep=0; istepsize(); istep++) + { + CrvStep const& step(crvStepsCollection->at(istep)); + if(step.barIndex()==barIndex) depositedEnergy+=step.visibleEDep(); + } + } + + //get reco PEs of each SiPM of this counter + float counterPEs=0; + for(int SiPM=0; SiPM<4; SiPM++) + { + if(!(*iter)->getBarDetail().hasCMB(SiPM%CRVId::nSidesPerBar)) continue; //don't check non-existing SiPMs + + float recoPEs=0; + float recoTime=-1; + int fitStatus=0; + for(size_t recoPulseIndex=0; recoPulseIndexsize(); recoPulseIndex++) + { + const CrvRecoPulse &crvRecoPulse = crvRecoPulseCollection->at(recoPulseIndex); + if(crvRecoPulse.GetScintillatorBarIndex()==barIndex && crvRecoPulse.GetSiPMNumber()==SiPM) + { + if(recoPEs=2*_minTrackFitPEs && _trackPoints>1) + { + if(_trackPEs*sumYY-sumY*sumY!=0) + { + _trackSlope=(_trackPEs*sumXY-sumX*sumY)/(_trackPEs*sumYY-sumY*sumY); + _trackIntercept=(sumX-_trackSlope*sumY)/_trackPEs; + } + } + + //calculate chi2 + for(iter=counters.begin(); iter!=counters.end(); iter++) + { + //get counter properties + const CRSScintillatorBar &crvCounter = **iter; + const CRSScintillatorBarIndex &barIndex = crvCounter.index(); + + CLHEP::Hep3Vector crvCounterPos = crvCounter.getPosition(); + if(widthDirection!=crvCounter.getBarDetail().getWidthDirection() || + thicknessDirection!=crvCounter.getBarDetail().getThicknessDirection()) + throw std::logic_error("crv modules are oriented in different directions."); + + double x=crvCounterPos[widthDirection]; + double y=crvCounterPos[thicknessDirection]; + + //get reco PEs of each SiPM of this counter + float counterPEs=0; + for(int SiPM=0; SiPM<4; SiPM++) + { + if(!(*iter)->getBarDetail().hasCMB(SiPM%CRVId::nSidesPerBar)) continue; //don't check non-existing SiPMs + + float recoPEs=0; + for(size_t recoPulseIndex=0; recoPulseIndexsize(); recoPulseIndex++) + { + const CrvRecoPulse &crvRecoPulse = crvRecoPulseCollection->at(recoPulseIndex); + if(crvRecoPulse.GetScintillatorBarIndex()==barIndex && crvRecoPulse.GetSiPMNumber()==SiPM) + { + if(recoPEs totalEnergyDeposited(_nSectorTypes,0); + for(int i=0; i<_nSectorTypes; ++i) + { + _coincidencePDGid[i]=0; + _coincidenceTime[i]=0; + _coincidencePosX[i]=0; + _coincidencePosY[i]=0; + _coincidencePosZ[i]=0; + } + for(size_t iCluster=0; iClustersize(); ++iCluster) + { + const CrvCoincidenceCluster &cluster = crvCoincidenceClusterCollection->at(iCluster); + const CrvCoincidenceClusterMC &clusterMC = crvCoincidenceClusterMCCollection->at(iCluster); + int sectorType = cluster.GetCrvSectorType(); + + if(totalEnergyDeposited[sectorType]pdgId(); + _coincidenceTime[sectorType] =clusterMC.GetAvgHitTime(); + _coincidencePosX[sectorType] =clusterMC.GetAvgHitPos().x(); + _coincidencePosY[sectorType] =clusterMC.GetAvgHitPos().y(); + _coincidencePosZ[sectorType] =clusterMC.GetAvgHitPos().z(); + } + + } + + _tree->Fill(); + + } // end analyze + +} // end namespace mu2e + +using mu2e::CrvWidebandTest; +DEFINE_ART_MODULE(CrvWidebandTest) diff --git a/CRVResponse/test/CrvFPGArates.fcl b/CRVResponse/test/CrvFPGArates.fcl new file mode 100644 index 0000000000..3f5beca37a --- /dev/null +++ b/CRVResponse/test/CrvFPGArates.fcl @@ -0,0 +1,40 @@ +#include "Offline/fcl/minimalMessageService.fcl" +#include "Offline/fcl/standardProducers.fcl" +#include "Offline/fcl/standardServices.fcl" +#include "Offline/CRVResponse/fcl/prolog.fcl" + +process_name : CRVrates + +source : +{ + module_type : RootInput +} + +services : +{ + @table::Services.SimAndReco +} + +physics : +{ + analyzers: + { + CrvRates : + { + module_type : CrvFPGArate + crvDigiModuleLabel : "CrvDigi" + minTDC : 0 + maxTDC : 1000 + } + } + + an : [CrvRates] + + trigger_paths: [] + end_paths: [an] +} + +services.TFileService.fileName : "FPGAratesNew.root" +services.GeometryService.simulatedDetector.tool_type : "Mu2e" +services.SeedService.baseSeed : 773651 +services.SeedService.maxUniqueEngines : 20 diff --git a/CRVResponse/test/CrvFPGArates.py b/CRVResponse/test/CrvFPGArates.py new file mode 100644 index 0000000000..38b4088c82 --- /dev/null +++ b/CRVResponse/test/CrvFPGArates.py @@ -0,0 +1,92 @@ +import sys +import os +import ROOT +import numpy as np +import matplotlib.pyplot as plt + +rootFile = ROOT.TFile.Open("FPGAratesNew.root","READ") +rootFile.cd("CrvRates/FPGAhitRates") +nFPGAs=ROOT.gDirectory.GetListOfKeys().GetEntries() +nEvents=ROOT.gDirectory.FindObjectAny(ROOT.gDirectory.GetListOfKeys().At(0).GetName()).GetEntries() +print(f"{nFPGAs} {nEvents}") + +#create csv file of all FPGAs for hit thresholds up to 60 +for iFPGA in range(nFPGAs): + FPGAname=ROOT.gDirectory.GetListOfKeys().At(iFPGA).GetName() + print(FPGAname, end='') + for threshold in range(1,61): + eventsAboveThreshold=ROOT.gDirectory.FindObjectAny(FPGAname).Integral(threshold,100) + eventsLost=eventsAboveThreshold/nEvents + print(f",{eventsLost}", end='') + print("") #for new line + +#create plot for fraction of events above threshold for selected FPGAs +plt.figure(figsize=(12,6)) +plt.title("Fraction of on-spill events above FPGA hit threshold (at individual FPGAs)") +plt.xlabel("Maximum number of hits per FPGA and microbunch") +plt.ylabel("Fraction of on-spill events above hit threshold") +plt.xlim(0,60) +plt.ylim(0,1) + +selectedFPGAindices=[(809,"-g","Worst CRV-T FPGA"),(751,"-b","Worst CRV-TS FPGA"),(1105,"--c","Worst CRV-TS-Ext FPGA"),(1232,"--k","Worst CRV-U FPGA"),(15,"-m","Worst CRV-R FPGA"),(455,"-y","Worst CRV-L FPGA")] +thresholds = [i for i in range(1,61)] +for iFPGA in selectedFPGAindices: + FPGAname=ROOT.gDirectory.GetListOfKeys().At(iFPGA[0]).GetName() + eventsLost = [] + for threshold in range(1,61): + eventsAboveThreshold=ROOT.gDirectory.FindObjectAny(FPGAname).Integral(threshold,100) + eventsLost.append(eventsAboveThreshold/nEvents) + plt.plot(thresholds, eventsLost, iFPGA[1], label=iFPGA[2]) + +plt.legend(loc="upper right", frameon=False) +plt.text(20,0.7,"uses only 4 channels per FPGA for CRV-U and CRV-TS-Ext") +#plt.show() + +#plot FPGA hit rates of selected FPGAs +canvas = ROOT.TCanvas("FPGA hit rates","FPGA hit rates",1200,600) +canvas.Divide(3,2) +for i in range(len(selectedFPGAindices)): + canvas.cd(i+1) + ROOT.gPad.SetLogy() + iFPGA=selectedFPGAindices[i] + FPGAname=ROOT.gDirectory.GetListOfKeys().At(iFPGA[0]).GetName() + hist=ROOT.gDirectory.FindObjectAny(FPGAname) + print(hist.GetTitle()) + hist.SetTitle(iFPGA[2]) + hist.GetXaxis().SetRangeUser(0,60) + hist.GetXaxis().SetTitle("number of hits per FPGA and microbunch") + hist.GetYaxis().SetTitle("number of on-spill events") + hist.Draw() + ROOT.gPad.Modified() + ROOT.gPad.Update() + FPGA4channels=["CRV-TS-Ext","CRV-U"] + if any(s in iFPGA[2] for s in FPGA4channels): + t=ROOT.TText(0.3,0.7,"uses only 4 channels of the FPGA") + t.SetNDC() + t.SetTextFont(42) + t.DrawClone() + else: + t=ROOT.TText(0.3,0.7,"uses all 16 channels of the FPGA") + t.SetNDC() + t.SetTextFont(42) + t.DrawClone() + +#plot FPGA hit multiplicities of selected FPGAs +rootFile.cd("CrvRates/FPGAhitMultiplicities") +canvas2 = ROOT.TCanvas("FPGA hit multiplicities","FPGA hit multiplicities",1200,600) +canvas2.Divide(3,2) +for i in range(len(selectedFPGAindices)): + canvas2.cd(i+1) + ROOT.gPad.SetLogy() + iFPGA=selectedFPGAindices[i] + FPGAname=ROOT.gDirectory.GetListOfKeys().At(iFPGA[0]).GetName() + hist=ROOT.gDirectory.FindObjectAny(FPGAname) + print(hist.GetTitle()) + hist.SetTitle(iFPGA[2]) + hist.GetXaxis().SetRangeUser(0,20) + hist.GetXaxis().SetTitle("number of subsequent \"hits\" within a pulse") + hist.Draw() + ROOT.gPad.Modified() + ROOT.gPad.Update() + +plt.show() diff --git a/CRVResponse/test/pedestal.C b/CRVResponse/test/pedestal.C deleted file mode 100644 index 7ca449a0af..0000000000 --- a/CRVResponse/test/pedestal.C +++ /dev/null @@ -1,31 +0,0 @@ -void pedestal(std::string filename) -{ - TFile *file = new TFile(filename.c_str()); - if(!file->cd("CrvPedestalFinder")) - { - std::cout<<"CrvPedestalFinder directory not found in Root file."<GetListOfKeys()) - { - TH1 *hist = dynamic_cast(gDirectory->Get(key->GetName())); - if(hist==NULL) continue; //doesn't seem to be a histogram - const std::string histName=hist->GetName(); - if(histName.compare(0,baseName.length(),baseName)!=0) continue; //doesn't seem to be a pedestal histogram - if(hist->GetEntries()<200) continue; //not enough entries - - int n=hist->GetNbinsX(); - double overflow=hist->GetBinContent(0)+hist->GetBinContent(n+1); - if(overflow/((double)hist->GetEntries())>0.1) continue; //too much overflow. something may be wrong - - int maxbinPedestal = hist->GetMaximumBin(); - double peakPedestal = hist->GetBinCenter(maxbinPedestal); - funcPedestal.SetRange(peakPedestal-4,peakPedestal+4); - funcPedestal.SetParameter(1,peakPedestal); - hist->Fit(&funcPedestal, "NQR"); - std::cout< adc = {0}; - for(int j = i; j < i + 8 && j < crvHitInfo.NumSamples; ++j) + std::array adc = {0}; + for(size_t j = i; j < i + mu2e::CrvDigi::NSamples && j < crvHitInfo.NumSamples; ++j) adc[j] = decompressCrvDigi(waveform.at(j).ADC); // CrvDigis use a constant array size of 8 samples diff --git a/DAQ/test/generateCrvDigiFromFragment_wideband1module.fcl b/DAQ/test/generateCrvDigiFromFragment_wideband1module.fcl new file mode 100644 index 0000000000..be77bbdc89 --- /dev/null +++ b/DAQ/test/generateCrvDigiFromFragment_wideband1module.fcl @@ -0,0 +1,66 @@ +# Run CrvDigisFromFragments module to convert artdaq::Fragment collections +# into CRV collections. +# Usage: mu2e -c DAQ/test/CrvDigisFromFragmentsTest.fcl -s -n '-1' +# +# +# Contact person G. Pezzullo, R. Ehrlich + +#include "Offline/DAQ/fcl/prolog_trigger.fcl" +#include "Offline/fcl/standardServices.fcl" + +process_name : FragmentToDigi + +services : +{ + @table::Services.Core +} + +source : +{ + module_type : RootInput + fileNames : @nil + maxEvents : -1 +} + +physics : +{ + producers : + { + genFrags : + { + module_type : ArtFragmentsFromDTCEvents + diagLevel : 10 + makeCaloFrag : 0 + makeTrkFrag : 0 + makeCRVFrag : 1 + makeSTMFrag : 0 + + } + CrvDigi : + { + @table::DAQ.producers.CrvDigi + diagLevel : 2 + } + } + + t1 : [ genFrags, CrvDigi] + e1 : [ outfile ] + + trigger_paths : [t1] + end_paths : [e1] + +} + +outputs: +{ + outfile : + { + module_type : RootOutput + fileName : "digis_from_frags_crv.art" + } +} + +services.GeometryService.inputFile: "Offline/Mu2eG4/geom/geom_Wideband1module.txt" +#services.message.destinations.log.categories.ArtReport.reportEvery : 1 +#services.message.destinations.log.categories.ArtReport.limit : 1 +#services.message.destinations.log.categories.ArtReport.timespan : 300 diff --git a/EventDisplay/fcl/EventDisplayWideband.fcl b/EventDisplay/fcl/EventDisplayWideband.fcl index 1e6b13827f..9613ac8e4c 100644 --- a/EventDisplay/fcl/EventDisplayWideband.fcl +++ b/EventDisplay/fcl/EventDisplayWideband.fcl @@ -35,5 +35,9 @@ physics : } services.GeometryService.simulatedDetector.tool_type : "Mu2e" -services.GeometryService.inputFile: "Offline/Mu2eG4/geom/geom_Wideband_1CrvModule.txt" +services.GeometryService.inputFile: "Offline/Mu2eG4/geom/geom_Wideband4modules.txt" +#services.GeometryService.inputFile: "Offline/Mu2eG4/geom/geom_Wideband1module.txt" +#services.ProditionsService.crvCalib.pedestal : 0.0 #for special cases (100.0 is default pedestal for simulations) +#services.ProditionsService.crvCalib.useDb: true #for data +#services.DbService.textFile : ["calibWideband_run001.txt"] #for data #source.readParameterSets : false diff --git a/EventDisplay/src/DataInterface.cc b/EventDisplay/src/DataInterface.cc index ad46f7ff8e..5b99b66358 100644 --- a/EventDisplay/src/DataInterface.cc +++ b/EventDisplay/src/DataInterface.cc @@ -747,12 +747,15 @@ void DataInterface::resetBoundaryP(spaceminmax &m) m.maxz=NAN; } -DataInterface::spaceminmax DataInterface::getSpaceBoundary(bool useTarget, bool useCalorimeter, bool useTracks, bool useCRV) +DataInterface::spaceminmax DataInterface::getSpaceBoundary(bool useTracker, bool useTarget, bool useCalorimeter, bool useTracks, bool useCRV) { spaceminmax m; resetBoundaryP(m); - findBoundaryP(m, _trackerMinmax.minx, _trackerMinmax.miny, _trackerMinmax.minz); - findBoundaryP(m, _trackerMinmax.maxx, _trackerMinmax.maxy, _trackerMinmax.maxz); + if(useTracker) + { + findBoundaryP(m, _trackerMinmax.minx, _trackerMinmax.miny, _trackerMinmax.minz); + findBoundaryP(m, _trackerMinmax.maxx, _trackerMinmax.maxy, _trackerMinmax.maxz); + } if(useTarget) { findBoundaryP(m, _targetMinmax.minx, _targetMinmax.miny, _targetMinmax.minz); diff --git a/EventDisplay/src/DataInterface.h b/EventDisplay/src/DataInterface.h index deca0c7c53..af7f288e86 100644 --- a/EventDisplay/src/DataInterface.h +++ b/EventDisplay/src/DataInterface.h @@ -153,7 +153,7 @@ class DataInterface spaceminmax getCalorimeterBoundary() {return _calorimeterMinmax;} spaceminmax getTracksBoundary() {return _tracksMinmax;} spaceminmax getCrvBoundary() {return _crvMinmax;} - spaceminmax getSpaceBoundary(bool useTarget, bool useCalorimeter, bool useTracks, bool useCRV); + spaceminmax getSpaceBoundary(bool useTracker, bool useTarget, bool useCalorimeter, bool useTracks, bool useCRV); const mu2e::CRVCalib *_calib; }; diff --git a/EventDisplay/src/EventDisplayFrame.cc b/EventDisplay/src/EventDisplayFrame.cc index 3d0b8e95db..bc6aaba48b 100644 --- a/EventDisplay/src/EventDisplayFrame.cc +++ b/EventDisplay/src/EventDisplayFrame.cc @@ -596,9 +596,9 @@ void EventDisplayFrame::fillGeometry() { _mainPad->cd(); _dataInterface->fillGeometry(); - DataInterface::spaceminmax m=_dataInterface->getSpaceBoundary(true, true, false, _showCRV); - if(_wideband) m=_dataInterface->getSpaceBoundary(false, false, false, true); - if(_extracted) m=_dataInterface->getSpaceBoundary(false, true, false, true); + DataInterface::spaceminmax m=_dataInterface->getSpaceBoundary(true, true, true, false, _showCRV); + if(_wideband) m=_dataInterface->getSpaceBoundary(false, false, false, false, true); + if(_extracted) m=_dataInterface->getSpaceBoundary(true, false, true, false, true); _mainPad->GetView()->SetRange(m.minx,m.miny,m.minz,m.maxx,m.maxy,m.maxz); if(_wideband || _extracted) { @@ -884,9 +884,9 @@ Bool_t EventDisplayFrame::ProcessMessage(Long_t msg, Long_t param1, Long_t param if(param1>=70 && param1<=74) { _mainPad->cd(); - DataInterface::spaceminmax m=_dataInterface->getSpaceBoundary(true, true, param1==73, _showCRV); - if(_wideband) m=_dataInterface->getSpaceBoundary(false, false, false, true); - if(_extracted) m=_dataInterface->getSpaceBoundary(false, true, false, true); + DataInterface::spaceminmax m=_dataInterface->getSpaceBoundary(true, true, true, param1==73, _showCRV); + if(_wideband) m=_dataInterface->getSpaceBoundary(false, false, false, false, true); + if(_extracted) m=_dataInterface->getSpaceBoundary(true, false, true, false, true); _mainPad->GetView()->SetRange(m.minx,m.miny,m.minz,m.maxx,m.maxy,m.maxz); if(param1<73) { diff --git a/EventGenerator/inc/CosmicCRY.hh b/EventGenerator/inc/CosmicCRY.hh index 910403c0d0..b908fc390f 100644 --- a/EventGenerator/inc/CosmicCRY.hh +++ b/EventGenerator/inc/CosmicCRY.hh @@ -62,7 +62,7 @@ namespace mu2e { CRYSetup * _crySetup; std::shared_ptr _cryGen; - double _refY0; + double _refX0, _refY0, _refZ0; std::string _refPointChoice; std::string _directionChoice; CLHEP::Hep3Vector _cosmicReferencePointInMu2e; diff --git a/EventGenerator/src/CosmicCRY.cc b/EventGenerator/src/CosmicCRY.cc index e468d416a9..763e1575a9 100644 --- a/EventGenerator/src/CosmicCRY.cc +++ b/EventGenerator/src/CosmicCRY.cc @@ -78,7 +78,9 @@ CosmicCRY::CosmicCRY(art::Run& run, const SimpleConfig& config, CLHEP::HepRandom _subboxLength(config.getDouble("cosmicCRY.subboxLength", 100.)), _maxShowerEn(config.getDouble("cosmicCRY.maxShowerEn", 1E6)), _minShowerEn(config.getDouble("cosmicCRY.minShowerEn", 50)), _setupString(""), + _refX0(config.getDouble("cosmicCRY.refX0", 0.)), _refY0(config.getDouble("cosmicCRY.refY0", 20000.)), + _refZ0(config.getDouble("cosmicCRY.refZ0", 0.)), _refPointChoice(config.getString("cosmicCRY.refPoint", "UNDEFINED")), _directionChoice(config.getString("cosmicCRY.directionChoice", "ALL")), _cosmicReferencePointInMu2e(), _vertical(false), @@ -152,7 +154,7 @@ void CosmicCRY::generate(GenParticleCollection& genParts) { _cosmicReferencePointInMu2e = Hep3Vector(detsys->getOrigin().x(), _refY0, calorimeter->disk(0).geomInfo().origin().z()); } else if (_refPointChoice == "UNDEFINED") - _cosmicReferencePointInMu2e = Hep3Vector(0., _refY0, 0.); + _cosmicReferencePointInMu2e = Hep3Vector(_refX0, _refY0, _refZ0); mf::LogInfo("CosmicCRY") << "Ref. point: " << _cosmicReferencePointInMu2e << std::endl; mf::LogInfo("CosmicCRY") << "Target box: " << _targetBoxXmin << ", " << _targetBoxXmax << ", " diff --git a/Mu2eG4/geom/geom_Wideband1module.txt b/Mu2eG4/geom/geom_Wideband1module.txt new file mode 100644 index 0000000000..3c652200d8 --- /dev/null +++ b/Mu2eG4/geom/geom_Wideband1module.txt @@ -0,0 +1,52 @@ +#include "Offline/Mu2eG4/geom/geom_common.txt" + +bool hasSTM = false; //to prevent errors from the Offline environment + +string crs.name = "wideband1module"; // same as channelMap name + +int crs.nSectors = 1; +int crs.nLayers = 4; + +vector crs.sectorNames = {"W1"}; + + +double crs.scintillatorBarThickness = 19.78; //mm +double crs.scintillatorBarWidth = 51.34; //mm +double crs.layerOffset = 42.0; //mm +double crs.gapLarge = 0.5; //mm +double crs.gapSmall = 0.0875; //mm +double crs.gapBetweenModules = 3.0; //mm +vector crs.gapBetweenLayers = {9.525, 9.525, 9.525}; //mm +double crs.aluminumSheetThickness = 3.175; //mm +double crs.strongBackThickness = 12.7; //mm + +double crs.scintillatorBarLengthW1 = 4550; + +int crs.nModulesW1 = 1; + +int crs.nCountersPerModuleW1 = 16; //per layer + +vector crs.firstCounterW1 = {-3904.0, 0.0, 20000.0}; + +vector crs.layerDirectionW1 = {0, 1, 0}; + +vector crs.offsetDirectionW1 = {0, 0, 1}; + +vector crs.gapDirectionW1 = {0, 0, 1}; + +int crs.precedingSectorForW1 = -1; //no preceding sector + +int crs.sectorTypeW1 = 1; + +bool crs.sipmsAtSide0W1 = true; + +bool crs.sipmsAtSide1W1 = false; + +int crs.FEBBoxesAtSide0W1 = 0; + +int crs.FEBBoxesAtSide1W1 = 0; + +//bool g4.doSurfaceCheck = true; +int g4.nSurfaceCheckPointsPercmsq = 1; +int g4.minSurfaceCheckPoints = 100; // per volume +int g4.maxSurfaceCheckPoints = 10000000; // per volume diff --git a/Mu2eG4/geom/geom_Wideband4modules.txt b/Mu2eG4/geom/geom_Wideband4modules.txt new file mode 100644 index 0000000000..0d648e1925 --- /dev/null +++ b/Mu2eG4/geom/geom_Wideband4modules.txt @@ -0,0 +1,91 @@ +#include "Offline/Mu2eG4/geom/geom_common.txt" + +bool hasSTM = false; //to prevent errors from the Offline environment + +string crs.name = "wideband4modules"; // same as channelMap name + +int crs.nSectors = 4; +int crs.nLayers = 4; + +vector crs.sectorNames = {"W1","W2","W3","W4"}; + + +double crs.scintillatorBarThickness = 19.78; //mm +double crs.scintillatorBarWidth = 51.34; //mm +double crs.layerOffset = 42.0; //mm +double crs.gapLarge = 0.0; //mm //0.366 according to crv_parameters.xlsx //previously 0.5 +double crs.gapSmall = 0.0; //mm //previously 0.0875 +double crs.gapBetweenModules = 3.0; //mm +vector crs.gapBetweenLayers = {9.525, 9.525, 9.525}; //mm +double crs.aluminumSheetThickness = 3.175; //mm +double crs.strongBackThickness = 12.7; //mm + +double crs.scintillatorBarLengthW1 = 6000; +double crs.scintillatorBarLengthW2 = 6000; +double crs.scintillatorBarLengthW3 = 6000; +double crs.scintillatorBarLengthW4 = 6000; + +int crs.nModulesW1 = 1; +int crs.nModulesW2 = 1; +int crs.nModulesW3 = 1; +int crs.nModulesW4 = 1; + +int crs.nCountersPerModuleW1 = 16; //per layer +int crs.nCountersPerModuleW2 = 16; +int crs.nCountersPerModuleW3 = 16; +int crs.nCountersPerModuleW4 = 16; + +vector crs.firstCounterW1 = {-3904.0, 0.0, 20000.0}; +vector crs.firstCounterW2 = {-3904.0, -225.25, 20000.0}; +vector crs.firstCounterW3 = {-3904.0, -450.50, 20000.0}; +vector crs.firstCounterW4 = {-3904.0, -675.75, 20000.0}; + +vector crs.layerDirectionW1 = {0, 1, 0}; +vector crs.layerDirectionW2 = {0, 1, 0}; +vector crs.layerDirectionW3 = {0, 1, 0}; +vector crs.layerDirectionW4 = {0, 1, 0}; + +vector crs.offsetDirectionW1 = {0, 0, 1}; +vector crs.offsetDirectionW2 = {0, 0, 1}; +vector crs.offsetDirectionW3 = {0, 0, 1}; +vector crs.offsetDirectionW4 = {0, 0, 1}; + +vector crs.gapDirectionW1 = {0, 0, 1}; +vector crs.gapDirectionW2 = {0, 0, 1}; +vector crs.gapDirectionW3 = {0, 0, 1}; +vector crs.gapDirectionW4 = {0, 0, 1}; + +int crs.precedingSectorForW1 = -1; //no preceding sector +int crs.precedingSectorForW2 = -1; +int crs.precedingSectorForW3 = -1; +int crs.precedingSectorForW4 = -1; + +int crs.sectorTypeW1 = 1; +int crs.sectorTypeW2 = 2; +int crs.sectorTypeW3 = 3; +int crs.sectorTypeW4 = 4; + +bool crs.sipmsAtSide0W1 = true; +bool crs.sipmsAtSide0W2 = true; +bool crs.sipmsAtSide0W3 = true; +bool crs.sipmsAtSide0W4 = true; + +bool crs.sipmsAtSide1W1 = false; +bool crs.sipmsAtSide1W2 = false; +bool crs.sipmsAtSide1W3 = false; +bool crs.sipmsAtSide1W4 = false; + +int crs.FEBBoxesAtSide0W1 = 0; +int crs.FEBBoxesAtSide0W2 = 0; +int crs.FEBBoxesAtSide0W3 = 0; +int crs.FEBBoxesAtSide0W4 = 0; + +int crs.FEBBoxesAtSide1W1 = 0; +int crs.FEBBoxesAtSide1W2 = 0; +int crs.FEBBoxesAtSide1W3 = 0; +int crs.FEBBoxesAtSide1W4 = 0; + +//bool g4.doSurfaceCheck = true; +int g4.nSurfaceCheckPointsPercmsq = 1; +int g4.minSurfaceCheckPoints = 100; // per volume +int g4.maxSurfaceCheckPoints = 10000000; // per volume diff --git a/Mu2eG4/geom/geom_Wideband_1CrvModule.txt b/Mu2eG4/geom/geom_Wideband_1CrvModule.txt deleted file mode 100644 index 6baad75c09..0000000000 --- a/Mu2eG4/geom/geom_Wideband_1CrvModule.txt +++ /dev/null @@ -1,137 +0,0 @@ -string detector.name = "g4geom_v00"; - -bool hasHall = false; -bool hasTarget = false; -bool hasProtonAbsorber = false; -bool hasTSdA = false; -bool hasExternalShielding = false; -bool hasDiskCalorimeter = false; -bool hasBeamline = false; -bool hasVirtualDetector = false; -bool hasCosmicRayShield = true; -bool hasSTM = false; -bool hasMBS = false; -bool hasPTM = false; - - -//------------------------------------------ -// Which of the things below can be removed? -//------------------------------------------ - - -#include "Offline/Mu2eG4/geom/g4_visOptions.txt" - -// X-offset of the PS(+x) and DS(-x) from the Mu2e origin. -// The origin of the detector coordinate system is on the DS axis at the specified z. -double mu2e.solenoidOffset = 3904.; // mm -double mu2e.detectorSystemZ0 = 10171.; // mm G4BL: (17730-7292=9801 mm) - -#include "Offline/Mu2eG4/geom/mu2eWorld.txt" -#include "Offline/Mu2eG4/geom/mu2eHall_v04.txt" -#include "Offline/Mu2eG4/geom/DetectorSolenoid_v05.txt" -#include "Offline/Mu2eG4/geom/DSShielding_v03.txt" -#include "Offline/Mu2eG4/geom/ProductionSolenoid_v02.txt" -#include "Offline/Mu2eG4/geom/psEnclosure_v05.txt" -#include "Offline/Mu2eG4/geom/PSShield_v06.txt" -#include "Offline/Mu2eG4/geom/PSExternalShielding_v01.txt" -#include "Offline/Mu2eG4/geom/TransportSolenoid_v08.txt" -#include "Offline/Mu2eG4/geom/stoppingTargetHoles_v02.txt" // 37 foil muon stopping target with holes and thicker foils (0.1 mm -> 0.1056 mm) -#include "Offline/Mu2eG4/geom/ProductionTarget_Hayman_v2_1.txt" -#include "Offline/Mu2eG4/geom/protonBeamDump_v03.txt" -#include "Offline/Mu2eG4/geom/extmon_fnal_v02.txt" - -double vd.halfLength = 0.01; //mm -int vd.verbosityLevel = 0; -bool vd.visible = true; -bool vd.solid = false; - -//--------------------------------------- -// CRV modules -//--------------------------------------- - - -string crs.name = "Wideband_1module"; -double crs.scintillatorBarThickness = 19.8; //mm -double crs.scintillatorBarWidth = 51.3; //mm -double crs.layerOffset = 42; //mm -double crs.gapLarge = 0.5; //mm -double crs.gapSmall = 0.0875; //mm -double crs.gapBetweenModules = 3.0; //mm -vector crs.gapBetweenLayers = {9.525, 9.525, 9.525}; //mm -double crs.aluminumSheetThickness = 3.175; //mm -double crs.strongBackThickness = 12.7; //mm -string crs.scintillatorBarMaterialName = "G4_POLYSTYRENE"; -string crs.absorberMaterialName = "G4_Al"; -string crs.aluminumSheetMaterialName = "G4_Al"; - -bool crs.veto.visible = true; -bool crs.veto.solid = true; -int crs.verbosityLevel = 0; - - -int crs.nSectors = 1; -int crs.nLayers = 4; - -vector crs.sectorNames = - { - "L1" //0 - }; - -double crs.scintillatorBarLengthL1 = 4550; //0 - -int crs.nModulesL1 = 1; //0 - -int crs.nCountersPerModuleL1 = 16; //0 //per layer - -//distance between two modules (incl. gaps): 828mm -vector crs.firstCounterL1 = {-3904.0, 0.0, 10000.0}; //0 //in mu2e coordinates - -vector crs.layerDirectionL1 = {0, 1, 0}; //0 - -vector crs.offsetDirectionL1 = {0, 0, -1}; //0 - -vector crs.gapDirectionL1 = {0, 0, 1}; //0 - -// counter mother boards -double crs.CMBOffset = 15.0; -double crs.CMBHalfThickness = 5.0; -string crs.CMBMaterialName = "ElectronicsCMB"; - -// information about the SiPMs -double crs.fiberSeparation = 26.0; //mm - -// side 0 is the negative side of the counter, i.e. the -x side of a CRV-T counter, or the -y side of a CRV-R counter -bool crs.sipmsAtSide0L1 = true; //0 - -// side 1 is the positive side of the counter, i.e. the +x side of a CRV-T counter, or the +y side of a CRV-R counter -bool crs.sipmsAtSide1L1 = true; //0 - -// information about the coincidence groups -int crs.precedingSectorForL1 = -1; //0 //no preceding sector - -int crs.sectorTypeL1 = 1; //0 - -//information about the FEBs -int crs.FEBBoxesAtSide0L1 = 1; //0 - -int crs.FEBBoxesAtSide1L1 = 2; //0 - -string crs.FEBMaterialName = "ElectronicsFEB"; -double crs.FEBDistanceToModule = 50; //between surface of 4th scintillator layer and center of 1st FEB -double crs.FEBDistanceToEdge = 240.0; -double crs.FEBDistanceBetween2FEBsW = 397.9; //between two FEBs sitting next to each other -double crs.FEBDistanceBetween2FEBsT = 47.7; //between two FEBs sitting on top of each other -vector crs.FEBHalfLengths = {5.0, 150.0, 92.5}; //thickness, width, lengths w.r.t. counter orientation - -// virtual detectors -bool vd.crv.build = false; - -//simplified version of the top support structure -int crs.nSupportStructures = 0; -vector crs.supportStructureNames = {}; -string crs.supportStructureMaterialName = "G4_Fe"; - -// This tells emacs to view this file in c++ mode. -// Local Variables: -// mode:c++ -// End: From 682169ef5912f8d167b85f91c46c000921ab6bcb Mon Sep 17 00:00:00 2001 From: ehrlich-uva Date: Tue, 12 Dec 2023 21:26:00 -0600 Subject: [PATCH 029/213] added calibration for pulse heights --- CRVReco/src/CrvCalibration_module.cc | 19 +++++++---- CRVReco/test/calibration.C | 49 ++++++++++++++++++---------- 2 files changed, 45 insertions(+), 23 deletions(-) diff --git a/CRVReco/src/CrvCalibration_module.cc b/CRVReco/src/CrvCalibration_module.cc index 7f52343fa4..79d57cac77 100644 --- a/CRVReco/src/CrvCalibration_module.cc +++ b/CRVReco/src/CrvCalibration_module.cc @@ -46,7 +46,8 @@ namespace mu2e private: std::string _crvRecoPulsesModuleLabel; - std::vector _calibHists; + std::vector _calibHistsPulseArea; + std::vector _calibHistsPulseHeight; ProditionsHandle _calib_h; }; @@ -62,7 +63,8 @@ namespace mu2e { GeomHandle CRS; const std::vector > &counters = CRS->getAllCRSScintillatorBars(); - _calibHists.reserve(counters.size()*4); + _calibHistsPulseArea.reserve(counters.size()*4); + _calibHistsPulseHeight.reserve(counters.size()*4); art::ServiceHandle tfs; for(size_t barIndex=0; barIndexmake(Form("crvCalibrationHist_%lu",channelIndex), - Form("crvCalibrationHist_%lu",channelIndex), + _calibHistsPulseArea.emplace_back(tfs->make(Form("crvCalibrationHistPulseArea_%lu",channelIndex), + Form("crvCalibrationHistPulseArea_%lu",channelIndex), 150,0,3000)); + _calibHistsPulseHeight.emplace_back(tfs->make(Form("crvCalibrationHistPulseHeight_%lu",channelIndex), + Form("crvCalibrationHistPulseHeight_%lu",channelIndex), + 150,0,75)); } } } @@ -97,7 +102,8 @@ namespace mu2e { size_t channelIndex=barIndex*4 + SiPM; float pedestal = calib.pedestal(channelIndex); - _calibHists.at(channelIndex)->SetTitle(Form("crvCalibrationHist_%lu_pedestal_%f",channelIndex,pedestal)); + _calibHistsPulseArea.at(channelIndex)->SetTitle(Form("crvCalibrationHistPulseArea_%lu_pedestal_%f",channelIndex,pedestal)); + _calibHistsPulseHeight.at(channelIndex)->SetTitle(Form("crvCalibrationHistPulseHeight_%lu_pedestal_%f",channelIndex,pedestal)); } } } @@ -109,7 +115,8 @@ namespace mu2e int barIndex = iter->GetScintillatorBarIndex().asInt(); int SiPM = iter->GetSiPMNumber(); int channelIndex=barIndex*4+SiPM; - _calibHists.at(channelIndex)->Fill(iter->GetPulseBeta()*iter->GetPulseHeight()*TMath::E()); + _calibHistsPulseArea.at(channelIndex)->Fill(iter->GetPulseBeta()*iter->GetPulseHeight()*TMath::E()); + _calibHistsPulseHeight.at(channelIndex)->Fill(iter->GetPulseHeight()); } } diff --git a/CRVReco/test/calibration.C b/CRVReco/test/calibration.C index 0d1fbd6c7c..d7d5b3f381 100644 --- a/CRVReco/test/calibration.C +++ b/CRVReco/test/calibration.C @@ -1,3 +1,11 @@ +struct DatabaseEntry +{ + double _pedestal; + double _calibPulseHeight; + double _calibPulseArea; + DatabaseEntry() : _pedestal(0), _calibPulseArea(-1), _calibPulseHeight(-1) {}; +}; + void output(std::ofstream &outputFile, int channel, double pedestal, double calibPulseHeight, double calibPulseArea) { outputFile< databaseEntries; TF1 funcCalibPeaks("f1", "gaus"); TF1 funcCalib("f2","[0]*x"); for(const auto&& key: *gDirectory->GetListOfKeys()) @@ -32,18 +42,24 @@ void calibration(const std::string &filename, int nPEpeaksToFit=1) TH1 *hist = dynamic_cast(gDirectory->Get(key->GetName())); if(hist==NULL) continue; //doesn't seem to be a histogram const std::string histName=hist->GetName(); - if(histName.compare(0,baseName.length(),baseName)!=0) continue; //doesn't seem to be a calibration histogram - const std::string channelName=histName.substr(baseName.length()); + int histType=0; + if(histName.compare(0,baseNamePulseArea.length(),baseNamePulseArea)==0) histType=1; + else if(histName.compare(0,baseNamePulseHeight.length(),baseNamePulseHeight)==0) histType=2; + else continue; //doesn't seem to be a calibration histogram + + const std::string channelName=histName.substr(histType==1?baseNamePulseArea.length():baseNamePulseHeight.length()); int channel=atoi(channelName.c_str()); const std::string histTitle=hist->GetTitle(); double pedestal=atof(histTitle.substr(histName.length()+pedestalTitle.length()).c_str()); //FIXME: add checks for wrongly formated hist titles + //create database entry for this channel and store pedestal + databaseEntries[channel]._pedestal=pedestal; - if(hist->GetEntries()<200) {output(outputFile,channel,pedestal,-1,-1); continue;} //not enough entries + if(hist->GetEntries()<200) continue; //not enough entries int maxbin = 0; double maxbinContent = 0; - int startBin=hist->FindBin(250); //start at 250 + int startBin=hist->FindBin(histType==1?250:7); for(int bin=startBin; binGetNbinsX(); bin++) { double binContent = hist->GetBinContent(bin); @@ -63,7 +79,7 @@ void calibration(const std::string &filename, int nPEpeaksToFit=1) //find other PE peaks std::vector peaks; - if(peak1PE>250.0 && peak1PE<750.0) + if(peak1PE>(histType==1?250.0:7) && peak1PE<(histType==1?750.0:21)) { peaks.push_back(peak1PE); for(int iPeak=2; iPeak<=nPEpeaksToFit; ++iPeak) @@ -92,25 +108,24 @@ void calibration(const std::string &filename, int nPEpeaksToFit=1) for(size_t iPeak=0; iPeakSetPoint(iPeak+1,iPeak+1,peaks[iPeak]); funcCalib.SetRange(-0.5, peaks.size()+0.5); graph->Fit(&funcCalib, "NQR"); - output(outputFile,channel,pedestal,-1,funcCalib.GetParameter(0)); //FIXME: do the same for the pulse height calibration + + //store caibration constants for this channel + if(histType==1) databaseEntries[channel]._calibPulseArea=funcCalib.GetParameter(0); + if(histType==2) databaseEntries[channel]._calibPulseHeight=funcCalib.GetParameter(0); } + for(auto iter=databaseEntries.begin(); iter!=databaseEntries.end(); ++iter) + output(outputFile,iter->first,iter->second._pedestal,iter->second._calibPulseHeight,iter->second._calibPulseArea); + outputFile<GetListOfKeys()) - { - TH1 *hist = dynamic_cast(gDirectory->Get(key->GetName())); - if(hist==NULL) continue; //doesn't seem to be a histogram - const std::string histName=hist->GetName(); - if(histName.compare(0,baseName.length(),baseName)!=0) continue; //doesn't seem to be a pedestal histogram - const std::string channelName=histName.substr(baseName.length()); - outputFile<first<<",0"< Date: Wed, 13 Dec 2023 22:38:32 -0600 Subject: [PATCH 030/213] added flag for no Crv calib constants --- CRVReco/src/CrvRecoPulsesFinder_module.cc | 5 ++--- RecoDataProducts/inc/CrvRecoPulseFlags.hh | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/CRVReco/src/CrvRecoPulsesFinder_module.cc b/CRVReco/src/CrvRecoPulsesFinder_module.cc index d52bc8018f..911971f9ce 100644 --- a/CRVReco/src/CrvRecoPulsesFinder_module.cc +++ b/CRVReco/src/CrvRecoPulsesFinder_module.cc @@ -189,9 +189,8 @@ namespace mu2e double pulseStart = _makeCrvRecoPulses->GetPulseStarts().at(j) + TDC0time + timeOffset; double pulseEnd = _makeCrvRecoPulses->GetPulseEnds().at(j) + TDC0time + timeOffset; - if(calibPulseArea<=0) PEs=0; - if(calibPulseArea<=0) PEsNoFit=0; - if(calibPulseHeight<=0) PEsPulseHeight=0; + if(calibPulseArea<=0) {PEs=0; PEsNoFit=0; flags.set(CrvRecoPulseFlagEnums::noCalibConstPulseArea);} + if(calibPulseHeight<=0) {PEsPulseHeight=0; flags.set(CrvRecoPulseFlagEnums::noCalibConstPulseHeight);} crvRecoPulseCollection->emplace_back(PEs, PEsPulseHeight, pulseTime, pulseHeight, pulseBeta, pulseFitChi2, LEtime, flags, PEsNoFit, pulseTimeNoFit, pulseStart, pulseEnd, diff --git a/RecoDataProducts/inc/CrvRecoPulseFlags.hh b/RecoDataProducts/inc/CrvRecoPulseFlags.hh index 454cef46db..9e150c7049 100644 --- a/RecoDataProducts/inc/CrvRecoPulseFlags.hh +++ b/RecoDataProducts/inc/CrvRecoPulseFlags.hh @@ -5,7 +5,7 @@ namespace mu2e { - enum CrvRecoPulseFlagEnums{failedFit=0, duplicateNoFitPulse=1, separatedDoublePulse=2, zeroNdf=3}; + enum CrvRecoPulseFlagEnums{failedFit=0, duplicateNoFitPulse=1, separatedDoublePulse=2, zeroNdf=3, noCalibConstPulseArea=4, noCalibConstPulseHeight=5}; typedef std::bitset<8> CrvRecoPulseFlags; } From 8371c4155c52ed3d27cf64ce3874094b672de2f4 Mon Sep 17 00:00:00 2001 From: ehrlich-uva Date: Tue, 19 Dec 2023 19:39:35 -0600 Subject: [PATCH 031/213] small bug fixes --- CRVConditions/data/wideband1module.txt | 176 +++++------------- CRVReco/inc/MakeCrvRecoPulses.hh | 10 +- CRVReco/src/CrvCalibration_module.cc | 6 +- CRVReco/src/CrvRecoPulsesFinder_module.cc | 4 +- CRVReco/src/MakeCrvRecoPulses.cc | 12 +- CRVReco/test/calibration.C | 4 +- CRVReco/test/calibration_wideband1module.fcl | 2 +- CRVReco/test/coincidence_wideband1module.fcl | 65 +++++++ CRVReco/test/reco_wideband1module.fcl | 2 +- .../test/wideband/wideband4modules.fcl | 6 +- .../test/wideband/widebandCRYconfig.txt | 4 +- .../fcl/EventDisplayWideband1module.fcl | 43 +++++ ...d.fcl => EventDisplayWideband4modules.fcl} | 2 +- Mu2eG4/geom/geom_Wideband1module.txt | 4 +- 14 files changed, 186 insertions(+), 154 deletions(-) create mode 100644 CRVReco/test/coincidence_wideband1module.fcl create mode 100644 EventDisplay/fcl/EventDisplayWideband1module.fcl rename EventDisplay/fcl/{EventDisplayWideband.fcl => EventDisplayWideband4modules.fcl} (94%) diff --git a/CRVConditions/data/wideband1module.txt b/CRVConditions/data/wideband1module.txt index 1efaeede37..267347fb83 100644 --- a/CRVConditions/data/wideband1module.txt +++ b/CRVConditions/data/wideband1module.txt @@ -1,129 +1,49 @@ Channel ROC FEB FEBchannel -0 1 2 63 -2 1 2 62 -4 1 2 61 -6 1 2 60 -8 1 2 59 -10 1 2 58 -12 1 2 57 -14 1 2 56 -16 1 2 55 -18 1 2 54 -20 1 2 53 -22 1 2 52 -24 1 2 51 -26 1 2 50 -28 1 2 49 -30 1 2 48 -32 1 2 47 -34 1 2 46 -36 1 2 45 -38 1 2 44 -40 1 2 43 -42 1 2 42 -44 1 2 41 -46 1 2 40 -48 1 2 39 -50 1 2 38 -52 1 2 37 -54 1 2 36 -56 1 2 35 -58 1 2 34 -60 1 2 33 -62 1 2 32 -64 1 2 31 -66 1 2 30 -68 1 2 29 -70 1 2 28 -72 1 2 27 -74 1 2 26 -76 1 2 25 -78 1 2 24 -80 1 2 23 -82 1 2 22 -84 1 2 21 -86 1 2 20 -88 1 2 19 -90 1 2 18 -92 1 2 17 -94 1 2 16 -96 1 2 15 -98 1 2 14 -100 1 2 13 -102 1 2 12 -104 1 2 11 -106 1 2 10 -108 1 2 9 -110 1 2 8 -112 1 2 7 -114 1 2 6 -116 1 2 5 -118 1 2 4 -120 1 2 3 -122 1 2 2 -124 1 2 1 -126 1 2 0 -128 1 1 63 -130 1 1 62 -132 1 1 61 -134 1 1 60 -136 1 1 59 -138 1 1 58 -140 1 1 57 -142 1 1 56 -144 1 1 55 -146 1 1 54 -148 1 1 53 -150 1 1 52 -152 1 1 51 -154 1 1 50 -156 1 1 49 -158 1 1 48 -160 1 1 47 -162 1 1 46 -164 1 1 45 -166 1 1 44 -168 1 1 43 -170 1 1 42 -172 1 1 41 -174 1 1 40 -176 1 1 39 -178 1 1 38 -180 1 1 37 -182 1 1 36 -184 1 1 35 -186 1 1 34 -188 1 1 33 -190 1 1 32 -192 1 1 31 -194 1 1 30 -196 1 1 29 -198 1 1 28 -200 1 1 27 -202 1 1 26 -204 1 1 25 -206 1 1 24 -208 1 1 23 -210 1 1 22 -212 1 1 21 -214 1 1 20 -216 1 1 19 -218 1 1 18 -220 1 1 17 -222 1 1 16 -224 1 1 15 -226 1 1 14 -228 1 1 13 -230 1 1 12 -232 1 1 11 -234 1 1 10 -236 1 1 9 -238 1 1 8 -240 1 1 7 -242 1 1 6 -244 1 1 5 -246 1 1 4 -248 1 1 3 -250 1 1 2 -252 1 1 1 -254 1 1 0 +41 1 1 47 +43 1 1 46 +45 1 1 45 +47 1 1 44 +49 1 1 43 +51 1 1 42 +53 1 1 41 +55 1 1 40 +57 1 1 39 +59 1 1 38 +61 1 1 37 +63 1 1 36 +105 1 1 35 +107 1 1 34 +109 1 1 33 +111 1 1 32 +113 1 1 31 +115 1 1 30 +117 1 1 29 +119 1 1 28 +121 1 1 27 +123 1 1 26 +125 1 1 25 +127 1 1 24 +169 1 1 23 +171 1 1 22 +173 1 1 21 +175 1 1 20 +177 1 1 19 +179 1 1 18 +181 1 1 17 +183 1 1 16 +185 1 1 15 +187 1 1 14 +189 1 1 13 +191 1 1 12 +233 1 1 11 +235 1 1 10 +237 1 1 9 +239 1 1 8 +241 1 1 7 +243 1 1 6 +245 1 1 5 +247 1 1 4 +249 1 1 3 +251 1 1 2 +253 1 1 1 +255 1 1 0 diff --git a/CRVReco/inc/MakeCrvRecoPulses.hh b/CRVReco/inc/MakeCrvRecoPulses.hh index b1d41d6e9c..547bb813fe 100644 --- a/CRVReco/inc/MakeCrvRecoPulses.hh +++ b/CRVReco/inc/MakeCrvRecoPulses.hh @@ -14,7 +14,7 @@ class MakeCrvRecoPulses MakeCrvRecoPulses(float minADCdifference, float defaultBeta, float minBeta, float maxBeta, float maxTimeDifference, float minPulseHeightRatio, float maxPulseHeightRatio, float LEtimeFactor, float pulseThreshold, float pulseAreaThreshold, float doublePulseSeparation); - void SetWaveform(const std::vector &waveform, unsigned int startTDC, + void SetWaveform(const std::vector &waveform, uint16_t startTDC, float digitizationPeriod, float pedestal, float calibrationFactor, float calibrationFactorPulseHeight); @@ -30,10 +30,10 @@ class MakeCrvRecoPulses private: MakeCrvRecoPulses(); - void FillGraphAndFindPeaks(const std::vector &waveform, unsigned int startTDC, + void FillGraphAndFindPeaks(const std::vector &waveform, uint16_t startTDC, float digitizationPeriod, float pedestal, TGraph &g, std::vector > &peaks); - void RangeFinder(const std::vector &waveform, const size_t peakStart, const size_t peakEnd, size_t &start, size_t &end); + void RangeFinder(const std::vector &waveform, const size_t peakStart, const size_t peakEnd, size_t &start, size_t &end); bool FailedFit(TFitResultPtr fr); TF1 _f1; @@ -61,8 +61,8 @@ class MakeCrvRecoPulses const std::vector &GetSeparatedDoublePulses() const {return _separatedDoublePulses;} private: - void NoFitOption(const std::vector &waveform, const std::vector > &peaks, - unsigned int startTDC, float digitizationPeriod, float pedestal, float calibrationFactor); + void NoFitOption(const std::vector &waveform, const std::vector > &peaks, + uint16_t startTDC, float digitizationPeriod, float pedestal, float calibrationFactor); std::vector _PEsNoFit; std::vector _pulseTimesNoFit; std::vector _pulseStart; diff --git a/CRVReco/src/CrvCalibration_module.cc b/CRVReco/src/CrvCalibration_module.cc index 79d57cac77..2da64689d8 100644 --- a/CRVReco/src/CrvCalibration_module.cc +++ b/CRVReco/src/CrvCalibration_module.cc @@ -110,7 +110,11 @@ namespace mu2e for(auto iter=crvRecoPulseCollection->begin(); iter!=crvRecoPulseCollection->end(); ++iter) { - if(!iter->GetRecoPulseFlags().none()) continue; + if(!iter->GetRecoPulseFlags().none()) + { + if(!iter->GetRecoPulseFlags().test(CrvRecoPulseFlagEnums::noCalibConstPulseArea) && + !iter->GetRecoPulseFlags().test(CrvRecoPulseFlagEnums::noCalibConstPulseHeight)) continue; + } int barIndex = iter->GetScintillatorBarIndex().asInt(); int SiPM = iter->GetSiPMNumber(); diff --git a/CRVReco/src/CrvRecoPulsesFinder_module.cc b/CRVReco/src/CrvRecoPulsesFinder_module.cc index 911971f9ce..0a938dc791 100644 --- a/CRVReco/src/CrvRecoPulsesFinder_module.cc +++ b/CRVReco/src/CrvRecoPulsesFinder_module.cc @@ -135,8 +135,8 @@ namespace mu2e const CrvDigi &digi = crvDigiCollection->at(waveformIndex); const CRSScintillatorBarIndex &barIndex = digi.GetScintillatorBarIndex(); int SiPM = digi.GetSiPMNumber(); - unsigned int startTDC = digi.GetStartTDC(); - std::vector ADCs; //FIXME + uint16_t startTDC = digi.GetStartTDC(); + std::vector ADCs; std::vector waveformIndices; for(size_t i=0; i &waveform, unsigned int startTDC, +void MakeCrvRecoPulses::FillGraphAndFindPeaks(const std::vector &waveform, uint16_t startTDC, float digitizationPeriod, float pedestal, TGraph &g, std::vector > &peaks) { @@ -66,7 +66,7 @@ void MakeCrvRecoPulses::FillGraphAndFindPeaks(const std::vector &w } } -void MakeCrvRecoPulses::RangeFinder(const std::vector &waveform, const size_t peakStart, const size_t peakEnd, size_t &start, size_t &end) +void MakeCrvRecoPulses::RangeFinder(const std::vector &waveform, const size_t peakStart, const size_t peakEnd, size_t &start, size_t &end) { #ifndef CRVStandalone if(peakStart<1) throw cet::exception("RECO")<<"MakeCrvRecoPulse::RangeFinder: peakStart<1"< &waveform, const std::vector > &peaks, - unsigned int startTDC, float digitizationPeriod, float pedestal, float calibrationFactor) +void MakeCrvRecoPulses::NoFitOption(const std::vector &waveform, const std::vector > &peaks, + uint16_t startTDC, float digitizationPeriod, float pedestal, float calibrationFactor) { //find troughs between peaks, that may be used to separate double pusles std::vector troughs; @@ -219,8 +219,8 @@ void MakeCrvRecoPulses::NoFitOption(const std::vector &waveform, c } } -void MakeCrvRecoPulses::SetWaveform(const std::vector &waveform, - unsigned int startTDC, float digitizationPeriod, float pedestal, +void MakeCrvRecoPulses::SetWaveform(const std::vector &waveform, + uint16_t startTDC, float digitizationPeriod, float pedestal, float calibrationFactor, float calibrationFactorPulseHeight) { _pulseTimes.clear(); diff --git a/CRVReco/test/calibration.C b/CRVReco/test/calibration.C index d7d5b3f381..df166c5c54 100644 --- a/CRVReco/test/calibration.C +++ b/CRVReco/test/calibration.C @@ -55,7 +55,7 @@ void calibration(const std::string &filename, int nPEpeaksToFit=1) //create database entry for this channel and store pedestal databaseEntries[channel]._pedestal=pedestal; - if(hist->GetEntries()<200) continue; //not enough entries + if(hist->GetEntries()<150) continue; //not enough entries int maxbin = 0; double maxbinContent = 0; @@ -79,7 +79,7 @@ void calibration(const std::string &filename, int nPEpeaksToFit=1) //find other PE peaks std::vector peaks; - if(peak1PE>(histType==1?250.0:7) && peak1PE<(histType==1?750.0:21)) + if(peak1PE>(histType==1?250.0:7) && peak1PE<(histType==1?750.0:25)) { peaks.push_back(peak1PE); for(int iPeak=2; iPeak<=nPEpeaksToFit; ++iPeak) diff --git a/CRVReco/test/calibration_wideband1module.fcl b/CRVReco/test/calibration_wideband1module.fcl index b1eb69cba6..201f36ea4f 100644 --- a/CRVReco/test/calibration_wideband1module.fcl +++ b/CRVReco/test/calibration_wideband1module.fcl @@ -38,5 +38,5 @@ services.TFileService.fileName : "calibWideband.root" services.GeometryService.inputFile: "Offline/Mu2eG4/geom/geom_Wideband1module.txt" services.ProditionsService.crvCalib.useDb: true services.ProditionsService.crvCalib.verbose: 2 -services.DbService.textFile : ["pedestalWideband_run004.txt"] +services.DbService.textFile : ["pedestalWideband_test.txt"] services.DbService.verbose: 2 diff --git a/CRVReco/test/coincidence_wideband1module.fcl b/CRVReco/test/coincidence_wideband1module.fcl new file mode 100644 index 0000000000..aca6770d7d --- /dev/null +++ b/CRVReco/test/coincidence_wideband1module.fcl @@ -0,0 +1,65 @@ +#reconstructs CRV pulses +# +#include "Offline/fcl/standardProducers.fcl" +#include "Offline/fcl/standardServices.fcl" +#include "Offline/CRVResponse/fcl/prolog.fcl" + +process_name : CRVResponseReco + +source : +{ + module_type : RootInput +} + +services : +{ + @table::Services.Reco +} + +physics : +{ + producers: + { + CrvRecoPulses: @local::CrvRecoPulses + CrvCoincidenceClusterFinder: @local::CrvCoincidenceClusterFinder + } + + an : [CrvRecoPulses, CrvCoincidenceClusterFinder] + out: [Output] + + trigger_paths: [an] + end_paths: [out] +} + +outputs: +{ + Output : + { + module_type : RootOutput + fileName : "recoWideband.art" + } +} + +services.TFileService.fileName : "recoWideband.root" +services.GeometryService.inputFile: "Offline/Mu2eG4/geom/geom_Wideband1module.txt" +services.ProditionsService.crvCalib.useDb: true +services.ProditionsService.crvCalib.verbose: 2 +services.DbService.textFile : ["calibWideband_test.txt"] +services.DbService.verbose: 2 +physics.producers.CrvCoincidenceClusterFinder.verboseLevel: 1 +physics.producers.CrvCoincidenceClusterFinder.sectorConfig: + [ + { + CRVSector : "W1" + PEthreshold : 8 + maxTimeDifferenceAdjacentPulses : 10 + maxTimeDifference : 10 + minOverlapTimeAdjacentPulses : 30 + minOverlapTime : 30 + minSlope :-11 + maxSlope : 11 + maxSlopeDifference : 4 + coincidenceLayers : 2 //3 + minClusterPEs : 0 + } + ] diff --git a/CRVReco/test/reco_wideband1module.fcl b/CRVReco/test/reco_wideband1module.fcl index aa9a613fe2..671c42517b 100644 --- a/CRVReco/test/reco_wideband1module.fcl +++ b/CRVReco/test/reco_wideband1module.fcl @@ -43,5 +43,5 @@ services.TFileService.fileName : "recoWideband.root" services.GeometryService.inputFile: "Offline/Mu2eG4/geom/geom_Wideband1module.txt" services.ProditionsService.crvCalib.useDb: true services.ProditionsService.crvCalib.verbose: 2 -services.DbService.textFile : ["calibWideband_run001.txt"] +services.DbService.textFile : ["calibWideband_test.txt"] services.DbService.verbose: 2 diff --git a/CRVResponse/test/wideband/wideband4modules.fcl b/CRVResponse/test/wideband/wideband4modules.fcl index eb33f36da3..57e5f53711 100644 --- a/CRVResponse/test/wideband/wideband4modules.fcl +++ b/CRVResponse/test/wideband/wideband4modules.fcl @@ -105,11 +105,11 @@ physics.producers.g4run.Mu2eG4CommonCut: physics.producers.EWMProducer.SpillType : 0 physics.producers.CrvSteps.stepPointsModuleLabels : ["g4run"] physics.producers.CrvPhotons.crvStepModuleLabels : ["CrvSteps"] -physics.producers.CrvPhotons.crvStepProcessNames : ["CrvEfficiencyWideband"] +physics.producers.CrvPhotons.crvStepProcessNames : ["CrvWideband4ModulesSim"] physics.producers.CrvPhotons.scintillationYieldVariation : 0.054 //gaussian distribution with sigma equal to 5.4% of the mean //from source scan of module 169 physics.producers.CrvPhotons.scintillationYieldVariationCutoffLow : 0.8 //the scintillation yield variation is cut off at 70% below the mean physics.producers.CrvPhotons.scintillationYieldVariationCutoffHigh : 1.2 //the scintillation yield variation is cut off at 120% above the mean -physics.producers.CrvPhotons.scintillationYieldScaleFactor: 1.0 +physics.producers.CrvPhotons.scintillationYieldScaleFactor: 1.05 //1.0 works with cross talk of 0.05 physics.producers.CrvPhotons.CRVSectors : [ "W1", "W2", "W3", "W4"] physics.producers.CrvPhotons.reflectors : [ 0, 0, 0, 0] physics.producers.CrvPhotons.scintillationYields : [39400,39400,39400,39400] @@ -118,7 +118,7 @@ physics.producers.CrvPhotons.lookupTableFileNames : ["CRVConditions/v6_0 "CRVConditions/v6_0/LookupTable_6000_0", "CRVConditions/v6_0/LookupTable_6000_0"] physics.producers.CrvSiPMCharges.deadSiPMProbability : 0.0 -#physics.producers.CrvSiPMCharges.CrossTalkProb : 0.09 +physics.producers.CrvSiPMCharges.CrossTalkProb : 0.04 physics.producers.CrvSiPMCharges.ThermalRate : 0.0 #to speed up things physics.producers.CrvWaveforms.FEBtimeSpread : 0.0 physics.producers.CrvCoincidenceClusterFinder.verboseLevel: 0 diff --git a/CRVResponse/test/wideband/widebandCRYconfig.txt b/CRVResponse/test/wideband/widebandCRYconfig.txt index 029cf6e99c..68b3026acc 100644 --- a/CRVResponse/test/wideband/widebandCRYconfig.txt +++ b/CRVResponse/test/wideband/widebandCRYconfig.txt @@ -10,8 +10,8 @@ bool cosmicCRY.projectToTargetBox = true; double cosmicCRY.targetBoxXmin = -5654; //~1.3m away from readout at negative x-side, 4cm wide double cosmicCRY.targetBoxXmax = -5554; -double cosmicCRY.targetBoxYmin = 130; //just the scintillator above the top module -double cosmicCRY.targetBoxYmax = 150; +double cosmicCRY.targetBoxYmin = 110; //just the scintillator above the top module +double cosmicCRY.targetBoxYmax = 130; double cosmicCRY.targetBoxZmin = 19900; //~width of the module double cosmicCRY.targetBoxZmax = 21000; diff --git a/EventDisplay/fcl/EventDisplayWideband1module.fcl b/EventDisplay/fcl/EventDisplayWideband1module.fcl new file mode 100644 index 0000000000..5a85a95c77 --- /dev/null +++ b/EventDisplay/fcl/EventDisplayWideband1module.fcl @@ -0,0 +1,43 @@ +#include "Offline/fcl/minimalMessageService.fcl" +#include "Offline/fcl/standardProducers.fcl" +#include "Offline/fcl/standardServices.fcl" +#include "Offline/CommonMC/fcl/prolog.fcl" + +process_name : EventDisplay + +source : +{ + module_type : RootInput +} + +services : +{ + @table::Services.Core +} + +physics : +{ + analyzers: + { + eventdisplay: + { + module_type : EventDisplay +# g4ModuleLabel : "compressRecoMCs" + kalSeedStepSize : 0.1 + timeOffsets : { inputs : [ ] } #if the art file has no time maps + wideband : true + } + } + + e1 : [eventdisplay] + + end_paths : [e1] +} + +services.GeometryService.simulatedDetector.tool_type : "Mu2e" +#services.GeometryService.inputFile: "Offline/Mu2eG4/geom/geom_Wideband4modules.txt" +services.GeometryService.inputFile: "Offline/Mu2eG4/geom/geom_Wideband1module.txt" +#services.ProditionsService.crvCalib.pedestal : 0.0 #for special cases (100.0 is default pedestal for simulations) +services.ProditionsService.crvCalib.useDb: true #for data +services.DbService.textFile : ["calibWideband_test.txt"] #for data +#source.readParameterSets : false diff --git a/EventDisplay/fcl/EventDisplayWideband.fcl b/EventDisplay/fcl/EventDisplayWideband4modules.fcl similarity index 94% rename from EventDisplay/fcl/EventDisplayWideband.fcl rename to EventDisplay/fcl/EventDisplayWideband4modules.fcl index 9613ac8e4c..32853c2d19 100644 --- a/EventDisplay/fcl/EventDisplayWideband.fcl +++ b/EventDisplay/fcl/EventDisplayWideband4modules.fcl @@ -39,5 +39,5 @@ services.GeometryService.inputFile: "Offline/Mu2eG4/geom/geom_Wideband4modules.t #services.GeometryService.inputFile: "Offline/Mu2eG4/geom/geom_Wideband1module.txt" #services.ProditionsService.crvCalib.pedestal : 0.0 #for special cases (100.0 is default pedestal for simulations) #services.ProditionsService.crvCalib.useDb: true #for data -#services.DbService.textFile : ["calibWideband_run001.txt"] #for data +#services.DbService.textFile : ["calibWideband_test.txt"] #for data #source.readParameterSets : false diff --git a/Mu2eG4/geom/geom_Wideband1module.txt b/Mu2eG4/geom/geom_Wideband1module.txt index 3c652200d8..d7a4c02543 100644 --- a/Mu2eG4/geom/geom_Wideband1module.txt +++ b/Mu2eG4/geom/geom_Wideband1module.txt @@ -38,9 +38,9 @@ int crs.precedingSectorForW1 = -1; //no preceding sector int crs.sectorTypeW1 = 1; -bool crs.sipmsAtSide0W1 = true; +bool crs.sipmsAtSide0W1 = false; -bool crs.sipmsAtSide1W1 = false; +bool crs.sipmsAtSide1W1 = true; int crs.FEBBoxesAtSide0W1 = 0; From f7952655c496eab10f3c3966953d1698fb02b768 Mon Sep 17 00:00:00 2001 From: ehrlich-uva Date: Thu, 21 Dec 2023 14:18:07 -0600 Subject: [PATCH 032/213] added CRV calibration file for a setup at Wideband with 1 CRV module --- CRVConditions/data/calib_wideband1module.txt | 517 ++++++++++++++++++ CRVReco/test/coincidence_wideband1module.fcl | 4 +- CRVReco/test/reco_wideband1module.fcl | 4 +- CRVResponse/src/CrvWidebandTest_module.cc | 2 + .../test/wideband/wideband4modules.fcl | 4 +- .../fcl/EventDisplayWideband1module.fcl | 6 +- .../fcl/EventDisplayWideband4modules.fcl | 3 - Mu2eG4/geom/geom_Wideband4modules.txt | 2 +- 8 files changed, 526 insertions(+), 16 deletions(-) create mode 100644 CRVConditions/data/calib_wideband1module.txt diff --git a/CRVConditions/data/calib_wideband1module.txt b/CRVConditions/data/calib_wideband1module.txt new file mode 100644 index 0000000000..c6a13a8a3c --- /dev/null +++ b/CRVConditions/data/calib_wideband1module.txt @@ -0,0 +1,517 @@ +TABLE CRVSiPM +#channel, pedestal, calibPulseHeight, calibPulseArea +0,0,-1,-1 +1,0,-1,-1 +2,0,-1,-1 +3,0,-1,-1 +4,0,-1,-1 +5,0,-1,-1 +6,0,-1,-1 +7,0,-1,-1 +8,0,-1,-1 +9,0,-1,-1 +10,0,-1,-1 +11,0,-1,-1 +12,0,-1,-1 +13,0,-1,-1 +14,0,-1,-1 +15,0,-1,-1 +16,0,-1,-1 +17,0,-1,-1 +18,0,-1,-1 +19,0,-1,-1 +20,0,-1,-1 +21,0,-1,-1 +22,0,-1,-1 +23,0,-1,-1 +24,0,-1,-1 +25,0,-1,-1 +26,0,-1,-1 +27,0,-1,-1 +28,0,-1,-1 +29,0,-1,-1 +30,0,-1,-1 +31,0,-1,-1 +32,0,-1,-1 +33,0,-1,-1 +34,0,-1,-1 +35,0,-1,-1 +36,0,-1,-1 +37,0,-1,-1 +38,0,-1,-1 +39,0,-1,-1 +40,0,-1,-1 +41,-3,18.9954,514.717 +42,0,-1,-1 +43,-7,19.7449,531.432 +44,0,-1,-1 +45,5,18.2497,465.947 +46,0,-1,-1 +47,-4,17.2635,399.511 +48,0,-1,-1 +49,-5,20.0229,514.862 +50,0,-1,-1 +51,-7,19.0683,506.698 +52,0,-1,-1 +53,-5,20.0704,495.8 +54,0,-1,-1 +55,-1,19.312,537.936 +56,0,-1,-1 +57,-22,15.0783,393.533 +58,0,-1,-1 +59,1,14.8834,402.066 +60,0,-1,-1 +61,-2,16.2166,447.739 +62,0,-1,-1 +63,9,15.6371,425.853 +64,0,-1,-1 +65,0,-1,-1 +66,0,-1,-1 +67,0,-1,-1 +68,0,-1,-1 +69,0,-1,-1 +70,0,-1,-1 +71,0,-1,-1 +72,0,-1,-1 +73,0,-1,-1 +74,0,-1,-1 +75,0,-1,-1 +76,0,-1,-1 +77,0,-1,-1 +78,0,-1,-1 +79,0,-1,-1 +80,0,-1,-1 +81,0,-1,-1 +82,0,-1,-1 +83,0,-1,-1 +84,0,-1,-1 +85,0,-1,-1 +86,0,-1,-1 +87,0,-1,-1 +88,0,-1,-1 +89,0,-1,-1 +90,0,-1,-1 +91,0,-1,-1 +92,0,-1,-1 +93,0,-1,-1 +94,0,-1,-1 +95,0,-1,-1 +96,0,-1,-1 +97,0,-1,-1 +98,0,-1,-1 +99,0,-1,-1 +100,0,-1,-1 +101,0,-1,-1 +102,0,-1,-1 +103,0,-1,-1 +104,0,-1,-1 +105,-5,17.8202,434.198 +106,0,-1,-1 +107,5,16.23,408.47 +108,0,-1,-1 +109,4,17.0653,388.407 +110,0,-1,-1 +111,-1,17.8872,435.083 +112,0,-1,-1 +113,9,17.2954,448.531 +114,0,-1,-1 +115,-10,17.8662,497.097 +116,0,-1,-1 +117,-9,17.0648,418.247 +118,0,-1,-1 +119,5,17.9783,541.43 +120,0,-1,-1 +121,3,18.1458,480.536 +122,0,-1,-1 +123,-1,16.343,372.345 +124,0,-1,-1 +125,-1,11.8685,330 +126,0,-1,-1 +127,-4,12.2962,329 +128,0,-1,-1 +129,0,-1,-1 +130,0,-1,-1 +131,0,-1,-1 +132,0,-1,-1 +133,0,-1,-1 +134,0,-1,-1 +135,0,-1,-1 +136,0,-1,-1 +137,0,-1,-1 +138,0,-1,-1 +139,0,-1,-1 +140,0,-1,-1 +141,0,-1,-1 +142,0,-1,-1 +143,0,-1,-1 +144,0,-1,-1 +145,0,-1,-1 +146,0,-1,-1 +147,0,-1,-1 +148,0,-1,-1 +149,0,-1,-1 +150,0,-1,-1 +151,0,-1,-1 +152,0,-1,-1 +153,0,-1,-1 +154,0,-1,-1 +155,0,-1,-1 +156,0,-1,-1 +157,0,-1,-1 +158,0,-1,-1 +159,0,-1,-1 +160,0,-1,-1 +161,0,-1,-1 +162,0,-1,-1 +163,0,-1,-1 +164,0,-1,-1 +165,0,-1,-1 +166,0,-1,-1 +167,0,-1,-1 +168,0,-1,-1 +169,-9,16.5431,432.891 +170,0,-1,-1 +171,4,18.0475,573.099 +172,0,-1,-1 +173,6,12.4647,355.261 +174,0,-1,-1 +175,-14,18.1008,505.997 +176,0,-1,-1 +177,9,16.8669,455.359 +178,0,-1,-1 +179,-4,17.1729,466.346 +180,0,-1,-1 +181,-5,16.9224,469.063 +182,0,-1,-1 +183,-11,17.665,468.463 +184,0,-1,-1 +185,19,19.5834,488.825 +186,0,-1,-1 +187,6,20.2431,535.166 +188,0,-1,-1 +189,-10,20.8716,581.67 +190,0,-1,-1 +191,9,20.3783,546.739 +192,0,-1,-1 +193,0,-1,-1 +194,0,-1,-1 +195,0,-1,-1 +196,0,-1,-1 +197,0,-1,-1 +198,0,-1,-1 +199,0,-1,-1 +200,0,-1,-1 +201,0,-1,-1 +202,0,-1,-1 +203,0,-1,-1 +204,0,-1,-1 +205,0,-1,-1 +206,0,-1,-1 +207,0,-1,-1 +208,0,-1,-1 +209,0,-1,-1 +210,0,-1,-1 +211,0,-1,-1 +212,0,-1,-1 +213,0,-1,-1 +214,0,-1,-1 +215,0,-1,-1 +216,0,-1,-1 +217,0,-1,-1 +218,0,-1,-1 +219,0,-1,-1 +220,0,-1,-1 +221,0,-1,-1 +222,0,-1,-1 +223,0,-1,-1 +224,0,-1,-1 +225,0,-1,-1 +226,0,-1,-1 +227,0,-1,-1 +228,0,-1,-1 +229,0,-1,-1 +230,0,-1,-1 +231,0,-1,-1 +232,0,-1,-1 +233,11,20.3016,493.468 +234,0,-1,-1 +235,9,18.3365,490.432 +236,0,-1,-1 +237,-24,18.7161,493.558 +238,0,-1,-1 +239,-7,18.9029,489.108 +240,0,-1,-1 +241,12.9125,20.5373,605.244 +242,0,-1,-1 +243,2.89708,19.3574,588.127 +244,0,-1,-1 +245,9.29655,20.4283,576.405 +246,0,-1,-1 +247,-13.7806,21.6992,591.044 +248,0,-1,-1 +249,11.8209,21.0147,579.943 +250,0,-1,-1 +251,0.51446,20.3741,587.403 +252,0,-1,-1 +253,-11.2247,19.9441,581.184 +254,0,-1,-1 +255,3.41771,20.8575,588.077 + +TABLE CRVTime +#channel, timeOffset +0,0 +1,0 +2,0 +3,0 +4,0 +5,0 +6,0 +7,0 +8,0 +9,0 +10,0 +11,0 +12,0 +13,0 +14,0 +15,0 +16,0 +17,0 +18,0 +19,0 +20,0 +21,0 +22,0 +23,0 +24,0 +25,0 +26,0 +27,0 +28,0 +29,0 +30,0 +31,0 +32,0 +33,0 +34,0 +35,0 +36,0 +37,0 +38,0 +39,0 +40,0 +41,0 +42,0 +43,0 +44,0 +45,0 +46,0 +47,0 +48,0 +49,0 +50,0 +51,0 +52,0 +53,0 +54,0 +55,0 +56,0 +57,0 +58,0 +59,0 +60,0 +61,0 +62,0 +63,0 +64,0 +65,0 +66,0 +67,0 +68,0 +69,0 +70,0 +71,0 +72,0 +73,0 +74,0 +75,0 +76,0 +77,0 +78,0 +79,0 +80,0 +81,0 +82,0 +83,0 +84,0 +85,0 +86,0 +87,0 +88,0 +89,0 +90,0 +91,0 +92,0 +93,0 +94,0 +95,0 +96,0 +97,0 +98,0 +99,0 +100,0 +101,0 +102,0 +103,0 +104,0 +105,0 +106,0 +107,0 +108,0 +109,0 +110,0 +111,0 +112,0 +113,0 +114,0 +115,0 +116,0 +117,0 +118,0 +119,0 +120,0 +121,0 +122,0 +123,0 +124,0 +125,0 +126,0 +127,0 +128,0 +129,0 +130,0 +131,0 +132,0 +133,0 +134,0 +135,0 +136,0 +137,0 +138,0 +139,0 +140,0 +141,0 +142,0 +143,0 +144,0 +145,0 +146,0 +147,0 +148,0 +149,0 +150,0 +151,0 +152,0 +153,0 +154,0 +155,0 +156,0 +157,0 +158,0 +159,0 +160,0 +161,0 +162,0 +163,0 +164,0 +165,0 +166,0 +167,0 +168,0 +169,0 +170,0 +171,0 +172,0 +173,0 +174,0 +175,0 +176,0 +177,0 +178,0 +179,0 +180,0 +181,0 +182,0 +183,0 +184,0 +185,0 +186,0 +187,0 +188,0 +189,0 +190,0 +191,0 +192,0 +193,0 +194,0 +195,0 +196,0 +197,0 +198,0 +199,0 +200,0 +201,0 +202,0 +203,0 +204,0 +205,0 +206,0 +207,0 +208,0 +209,0 +210,0 +211,0 +212,0 +213,0 +214,0 +215,0 +216,0 +217,0 +218,0 +219,0 +220,0 +221,0 +222,0 +223,0 +224,0 +225,0 +226,0 +227,0 +228,0 +229,0 +230,0 +231,0 +232,0 +233,0 +234,0 +235,0 +236,0 +237,0 +238,0 +239,0 +240,0 +241,0 +242,0 +243,0 +244,0 +245,0 +246,0 +247,0 +248,0 +249,0 +250,0 +251,0 +252,0 +253,0 +254,0 +255,0 diff --git a/CRVReco/test/coincidence_wideband1module.fcl b/CRVReco/test/coincidence_wideband1module.fcl index aca6770d7d..855408e607 100644 --- a/CRVReco/test/coincidence_wideband1module.fcl +++ b/CRVReco/test/coincidence_wideband1module.fcl @@ -43,9 +43,7 @@ outputs: services.TFileService.fileName : "recoWideband.root" services.GeometryService.inputFile: "Offline/Mu2eG4/geom/geom_Wideband1module.txt" services.ProditionsService.crvCalib.useDb: true -services.ProditionsService.crvCalib.verbose: 2 -services.DbService.textFile : ["calibWideband_test.txt"] -services.DbService.verbose: 2 +services.DbService.textFile : ["Offline/CRVConditions/data/calib_wideband1module.txt"] physics.producers.CrvCoincidenceClusterFinder.verboseLevel: 1 physics.producers.CrvCoincidenceClusterFinder.sectorConfig: [ diff --git a/CRVReco/test/reco_wideband1module.fcl b/CRVReco/test/reco_wideband1module.fcl index 671c42517b..0468f4874b 100644 --- a/CRVReco/test/reco_wideband1module.fcl +++ b/CRVReco/test/reco_wideband1module.fcl @@ -42,6 +42,4 @@ outputs: services.TFileService.fileName : "recoWideband.root" services.GeometryService.inputFile: "Offline/Mu2eG4/geom/geom_Wideband1module.txt" services.ProditionsService.crvCalib.useDb: true -services.ProditionsService.crvCalib.verbose: 2 -services.DbService.textFile : ["calibWideband_test.txt"] -services.DbService.verbose: 2 +services.DbService.textFile : ["Offline/CRVConditions/data/calib_wideband1module.txt"] diff --git a/CRVResponse/src/CrvWidebandTest_module.cc b/CRVResponse/src/CrvWidebandTest_module.cc index 4670cf22fb..6f88a53760 100644 --- a/CRVResponse/src/CrvWidebandTest_module.cc +++ b/CRVResponse/src/CrvWidebandTest_module.cc @@ -279,6 +279,8 @@ namespace mu2e uint16_t feb = onlineChannel.FEB(); uint16_t febChannel = onlineChannel.FEBchannel(); + //FIXME: check the bad channel map for channels that need to be ignored + _recoPEs[feb*CRVId::nChanPerFEB+febChannel] = recoPEs; _recoTime[feb*CRVId::nChanPerFEB+febChannel] = recoTime; _fitStatus[feb*CRVId::nChanPerFEB+febChannel] = fitStatus; diff --git a/CRVResponse/test/wideband/wideband4modules.fcl b/CRVResponse/test/wideband/wideband4modules.fcl index 57e5f53711..3b2322b7f8 100644 --- a/CRVResponse/test/wideband/wideband4modules.fcl +++ b/CRVResponse/test/wideband/wideband4modules.fcl @@ -106,10 +106,10 @@ physics.producers.EWMProducer.SpillType : 0 physics.producers.CrvSteps.stepPointsModuleLabels : ["g4run"] physics.producers.CrvPhotons.crvStepModuleLabels : ["CrvSteps"] physics.producers.CrvPhotons.crvStepProcessNames : ["CrvWideband4ModulesSim"] -physics.producers.CrvPhotons.scintillationYieldVariation : 0.054 //gaussian distribution with sigma equal to 5.4% of the mean //from source scan of module 169 +physics.producers.CrvPhotons.scintillationYieldVariation : 0.03 //gaussian distribution with sigma equal to 3.0% of the mean physics.producers.CrvPhotons.scintillationYieldVariationCutoffLow : 0.8 //the scintillation yield variation is cut off at 70% below the mean physics.producers.CrvPhotons.scintillationYieldVariationCutoffHigh : 1.2 //the scintillation yield variation is cut off at 120% above the mean -physics.producers.CrvPhotons.scintillationYieldScaleFactor: 1.05 //1.0 works with cross talk of 0.05 +physics.producers.CrvPhotons.scintillationYieldScaleFactor: 1.01 //1.0 works with cross talk of 0.05 physics.producers.CrvPhotons.CRVSectors : [ "W1", "W2", "W3", "W4"] physics.producers.CrvPhotons.reflectors : [ 0, 0, 0, 0] physics.producers.CrvPhotons.scintillationYields : [39400,39400,39400,39400] diff --git a/EventDisplay/fcl/EventDisplayWideband1module.fcl b/EventDisplay/fcl/EventDisplayWideband1module.fcl index 5a85a95c77..29687c5b39 100644 --- a/EventDisplay/fcl/EventDisplayWideband1module.fcl +++ b/EventDisplay/fcl/EventDisplayWideband1module.fcl @@ -35,9 +35,7 @@ physics : } services.GeometryService.simulatedDetector.tool_type : "Mu2e" -#services.GeometryService.inputFile: "Offline/Mu2eG4/geom/geom_Wideband4modules.txt" services.GeometryService.inputFile: "Offline/Mu2eG4/geom/geom_Wideband1module.txt" -#services.ProditionsService.crvCalib.pedestal : 0.0 #for special cases (100.0 is default pedestal for simulations) -services.ProditionsService.crvCalib.useDb: true #for data -services.DbService.textFile : ["calibWideband_test.txt"] #for data +services.ProditionsService.crvCalib.useDb: true +services.DbService.textFile : ["Offline/CRVConditions/data/calib_wideband1module.txt"] #source.readParameterSets : false diff --git a/EventDisplay/fcl/EventDisplayWideband4modules.fcl b/EventDisplay/fcl/EventDisplayWideband4modules.fcl index 32853c2d19..af052a314f 100644 --- a/EventDisplay/fcl/EventDisplayWideband4modules.fcl +++ b/EventDisplay/fcl/EventDisplayWideband4modules.fcl @@ -36,8 +36,5 @@ physics : services.GeometryService.simulatedDetector.tool_type : "Mu2e" services.GeometryService.inputFile: "Offline/Mu2eG4/geom/geom_Wideband4modules.txt" -#services.GeometryService.inputFile: "Offline/Mu2eG4/geom/geom_Wideband1module.txt" #services.ProditionsService.crvCalib.pedestal : 0.0 #for special cases (100.0 is default pedestal for simulations) -#services.ProditionsService.crvCalib.useDb: true #for data -#services.DbService.textFile : ["calibWideband_test.txt"] #for data #source.readParameterSets : false diff --git a/Mu2eG4/geom/geom_Wideband4modules.txt b/Mu2eG4/geom/geom_Wideband4modules.txt index 0d648e1925..a24924e67a 100644 --- a/Mu2eG4/geom/geom_Wideband4modules.txt +++ b/Mu2eG4/geom/geom_Wideband4modules.txt @@ -13,7 +13,7 @@ vector crs.sectorNames = {"W1","W2","W3","W4"}; double crs.scintillatorBarThickness = 19.78; //mm double crs.scintillatorBarWidth = 51.34; //mm double crs.layerOffset = 42.0; //mm -double crs.gapLarge = 0.0; //mm //0.366 according to crv_parameters.xlsx //previously 0.5 +double crs.gapLarge = 0.1; //mm //0.366 according to crv_parameters.xlsx //previously 0.5 double crs.gapSmall = 0.0; //mm //previously 0.0875 double crs.gapBetweenModules = 3.0; //mm vector crs.gapBetweenLayers = {9.525, 9.525, 9.525}; //mm From 84b0a2fa36cd69c95410fed7b98b3680cfb8ceb8 Mon Sep 17 00:00:00 2001 From: Ray Culbertson Date: Thu, 21 Dec 2023 15:10:52 -0600 Subject: [PATCH 033/213] art v3_14_03 s128 --- .muse | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.muse b/.muse index 68a6267a82..11108d9bf8 100644 --- a/.muse +++ b/.muse @@ -1,5 +1,5 @@ # prefer to build with this environment -ENVSET p051 +ENVSET p055 # add these to python path PYTHONPATH Trigger/python # add Offline/bin to path From e048e909a237507c860e18854132aef2677e6050 Mon Sep 17 00:00:00 2001 From: ehrlich-uva Date: Thu, 21 Dec 2023 15:33:54 -0600 Subject: [PATCH 034/213] filename change --- DAQ/test/generateCrvDigiFromFragment_wideband1module.fcl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DAQ/test/generateCrvDigiFromFragment_wideband1module.fcl b/DAQ/test/generateCrvDigiFromFragment_wideband1module.fcl index be77bbdc89..59276690cf 100644 --- a/DAQ/test/generateCrvDigiFromFragment_wideband1module.fcl +++ b/DAQ/test/generateCrvDigiFromFragment_wideband1module.fcl @@ -56,7 +56,7 @@ outputs: outfile : { module_type : RootOutput - fileName : "digis_from_frags_crv.art" + fileName : "crvDigis.art" } } From 2d3d4a7aa5275ea525c9082ef0237707ea3acdc2 Mon Sep 17 00:00:00 2001 From: GIANANTONIO PEZZULLO Date: Wed, 27 Dec 2023 09:45:30 -0600 Subject: [PATCH 035/213] fixed G4 version --- ups/product_deps | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ups/product_deps b/ups/product_deps index 8efeea406c..62fb02bce0 100644 --- a/ups/product_deps +++ b/ups/product_deps @@ -245,7 +245,7 @@ art_root_io v1_13_01 s126 art_root_io v1_12_04 s124 gallery v1_22_01 s126 gallery v1_21_03 s124 -geant4 v4_11_1_p02b s126 +geant4 v4_11_1_p02d s126 geant4 v4_11_1_p02a s124 xerces_c v3_2_3e artdaq_core_mu2e v2_01_02 From 326a68171f117462c6bb76d85c3dd286b9ee7fd8 Mon Sep 17 00:00:00 2001 From: GIANANTONIO PEZZULLO Date: Wed, 27 Dec 2023 09:45:53 -0600 Subject: [PATCH 036/213] fixed missing libs and C++ issue --- Mu2eUtilities/inc/TriggerResultsNavigator.hh | 2 +- Mu2eUtilities/src/TriggerResultsNavigator.cc | 2 +- ProditionsService/CMakeLists.txt | 5 ++++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/Mu2eUtilities/inc/TriggerResultsNavigator.hh b/Mu2eUtilities/inc/TriggerResultsNavigator.hh index b6fc35265e..c2c2c291d1 100644 --- a/Mu2eUtilities/inc/TriggerResultsNavigator.hh +++ b/Mu2eUtilities/inc/TriggerResultsNavigator.hh @@ -27,7 +27,7 @@ namespace mu2e { std::vector const& getTrigPaths () const { return _trigPathsNames; } std::string const& getTrigPath (unsigned int const i) const { return _trigPathsNames.at(i); } std::string const getTrigPathName(unsigned int const i) const; - size_t const getTrigBit (unsigned int const pathID) const; + size_t getTrigBit (unsigned int const pathID) const; size_t findTrigPath(std::string const& name) const; size_t find(std::map const& posmap, std::string const& name) const; size_t findTrigPathID(std::string const& name) const; diff --git a/Mu2eUtilities/src/TriggerResultsNavigator.cc b/Mu2eUtilities/src/TriggerResultsNavigator.cc index 2d5e5f2455..2312b66dd5 100644 --- a/Mu2eUtilities/src/TriggerResultsNavigator.cc +++ b/Mu2eUtilities/src/TriggerResultsNavigator.cc @@ -61,7 +61,7 @@ namespace mu2e { return _trigPathsNames[i].substr(pos+1, _trigPathsNames[i].length()); } - size_t const + size_t TriggerResultsNavigator::getTrigBit(unsigned int const i) const { if (i>_trigPathsNames.size()) { diff --git a/ProditionsService/CMakeLists.txt b/ProditionsService/CMakeLists.txt index 9888c658ca..07dd66ad6f 100644 --- a/ProditionsService/CMakeLists.txt +++ b/ProditionsService/CMakeLists.txt @@ -3,12 +3,15 @@ cet_make_library(INTERFACE INSTALLED_PATH_BASE Offline inc/ProditionsHandle.hh inc/ProditionsService.hh LIBRARIES INTERFACE - + BTrk_MatEnv + BTrk_difAlgebra + Offline::AnalysisConfig Offline::CaloConfig Offline::CRVConfig Offline::DAQConfig Offline::DbTables + Offline::Mu2eBTrk Offline::Mu2eInterfaces Offline::SimulationConfig Offline::STMConfig From 8798f2d50aba0ae0e46eaa1fff286f9122c821d3 Mon Sep 17 00:00:00 2001 From: Krzysztof L Genser Date: Wed, 27 Dec 2023 11:28:38 -0600 Subject: [PATCH 037/213] enabling geant4 v11.1.p03 --- MCDataProducts/inc/ProcessCode.hh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/MCDataProducts/inc/ProcessCode.hh b/MCDataProducts/inc/ProcessCode.hh index aa73eb1192..c24b5d17ee 100644 --- a/MCDataProducts/inc/ProcessCode.hh +++ b/MCDataProducts/inc/ProcessCode.hh @@ -88,7 +88,7 @@ namespace mu2e { mu2eCePlusLeadingLog, mu2ePionCaptureAtRest, mu2eExternalRPC, mu2eInternalRPC, mu2eCaloCalib, mu2eunused6, mu2eunused7, mu2eunused8, uninitialized, NoProcess, GammaGeneralProc, - mu2eGammaConversion, + mu2eGammaConversion, Radioactivation, lastEnum, // An alias for backward compatibility mu2eHallAir = mu2eKillerVolume @@ -145,7 +145,7 @@ namespace mu2e { "mu2eCePlusLeadingLog", "mu2ePionCaptureAtRest", "mu2eExternalRPC", "mu2eInternalRPC", \ "mu2eCaloCalib", "mu2eunused6", "mu2eunused7", "mu2eunused8", \ "uninitialized", "NoProcess", "GammaGeneralProc", \ - "mu2eGammaConversion" + "mu2eGammaConversion","Radioactivation" #endif public: From f795201d34a1c4e8b12db3bf62c1200e82abf1b1 Mon Sep 17 00:00:00 2001 From: Krzysztof L Genser Date: Wed, 27 Dec 2023 11:29:11 -0600 Subject: [PATCH 038/213] enabling geant4 v11.2 --- Mu2eG4/src/SConscript | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Mu2eG4/src/SConscript b/Mu2eG4/src/SConscript index ac8b21ccf1..9674446f62 100644 --- a/Mu2eG4/src/SConscript +++ b/Mu2eG4/src/SConscript @@ -191,6 +191,12 @@ if g4vg != 'off': if g4_version > '4106': G4GLOBALIBS.append('libG4ptl') +if g4_version > '4111': + G4GLOBALIBS.remove('libG4persistency') + G4GLOBALIBS.append('libG4gdml') + G4GLOBALIBS.append('libG4geomtext') + G4GLOBALIBS.append('libG4mctruth') + if g4_version < '4095': G4LIBS = G4GRANULARLIBS else: From 36806f42cbd8e04b87f144a64e959037e0fd1563 Mon Sep 17 00:00:00 2001 From: ehrlich-uva Date: Thu, 28 Dec 2023 07:55:24 -0600 Subject: [PATCH 039/213] added/updated database for CRV scintillation yield and channel status --- CRVConditions/fcl/prolog.fcl | 6 ++ CRVConditions/inc/CRVScintYield.hh | 44 +++++++++ CRVConditions/inc/CRVScintYieldCache.hh | 43 +++++++++ CRVConditions/inc/CRVScintYieldMaker.hh | 29 ++++++ CRVConditions/inc/CRVStatus.hh | 2 +- CRVConditions/src/CRVScintYieldMaker.cc | 95 +++++++++++++++++++ CRVConfig/inc/CRVScintYieldConfig.hh | 25 +++++ CRVResponse/fcl/prolog_v11.fcl | 8 +- CRVResponse/src/CrvPhotonGenerator_module.cc | 38 ++++---- .../src/CrvSiPMChargeGenerator_module.cc | 17 ++-- .../test/wideband/wideband4modules.fcl | 8 +- Mu2eG4/geom/geom_Wideband4modules.txt | 2 +- ProditionsService/fcl/prolog.fcl | 1 + ProditionsService/inc/ProditionsService.hh | 4 + .../src/ProditionsService_service.cc | 3 + 15 files changed, 286 insertions(+), 39 deletions(-) create mode 100644 CRVConditions/inc/CRVScintYield.hh create mode 100644 CRVConditions/inc/CRVScintYieldCache.hh create mode 100644 CRVConditions/inc/CRVScintYieldMaker.hh create mode 100644 CRVConditions/src/CRVScintYieldMaker.cc create mode 100644 CRVConfig/inc/CRVScintYieldConfig.hh diff --git a/CRVConditions/fcl/prolog.fcl b/CRVConditions/fcl/prolog.fcl index bd1c4214e8..13a2b3e8c9 100644 --- a/CRVConditions/fcl/prolog.fcl +++ b/CRVConditions/fcl/prolog.fcl @@ -6,6 +6,12 @@ CRVOrdinal : { filePath : "Offline/CRVConditions/data" } +CRVScintYield : { + useDb : false + verbose : 0 + fileName : "Offline/CRVConditions/data/scintyield_nominal.txt" +} + CRVStatus : { useDb : false verbose : 0 diff --git a/CRVConditions/inc/CRVScintYield.hh b/CRVConditions/inc/CRVScintYield.hh new file mode 100644 index 0000000000..ec32d52eb4 --- /dev/null +++ b/CRVConditions/inc/CRVScintYield.hh @@ -0,0 +1,44 @@ +#ifndef CRVConditions_CRVScintYield_hh +#define CRVConditions_CRVScintYield_hh + +// +// Holds scintillation yield spread of CRV counters +// + +#include "Offline/DataProducts/inc/CRSScintillatorBarIndex.hh" +#include "Offline/Mu2eInterfaces/inc/ProditionsEntity.hh" +#include "cetlib_except/exception.h" +#include +#include +#include + +namespace mu2e { + +class CRVScintYield : virtual public ProditionsEntity { + public: + typedef std::shared_ptr ptr_t; + typedef std::shared_ptr cptr_t; + constexpr static const char* cxname = {"CRVScintYield"}; + + typedef std::vector ScintYieldMap; + + CRVScintYield(ScintYieldMap const& scintYieldMap) : + ProditionsEntity(cxname), _scintYieldMap(scintYieldMap) {} + + // scintillation yield deviation (from nominal value) for a scintillator bar index + float scintYieldDeviation(size_t barIndex) const { + if (barIndex >= _scintYieldMap.size()) { + throw cet::exception("CRVSCINTYIELD_BAD_SCINTILLATOR BAR INDEX") + << "CRVScintYield::scinYieldDeviation bad barIndex requested: " + << " barIndex=" << barIndex << "\n"; + } + return _scintYieldMap.at(barIndex); + } + + private: + ScintYieldMap _scintYieldMap; +}; + +} // namespace mu2e + +#endif diff --git a/CRVConditions/inc/CRVScintYieldCache.hh b/CRVConditions/inc/CRVScintYieldCache.hh new file mode 100644 index 0000000000..fd89df78fe --- /dev/null +++ b/CRVConditions/inc/CRVScintYieldCache.hh @@ -0,0 +1,43 @@ +#ifndef CRVConditions_CRVScintYieldCache_hh +#define CRVConditions_CRVScintYieldCache_hh + +#include "Offline/CRVConditions/inc/CRVScintYieldMaker.hh" +#include "Offline/Mu2eInterfaces/inc/ProditionsCache.hh" + +namespace mu2e { + +class CRVScintYieldCache : public ProditionsCache { + public: + CRVScintYieldCache(CRVScintYieldConfig const& config) : + ProditionsCache(CRVScintYield::cxname, config.verbose()), + _useDb(config.useDb()), _maker(config) {} + + void initialize() {} + + set_t makeSet(art::EventID const& eid) { + ProditionsEntity::set_t cids; + return cids; + } + + DbIoV makeIov(art::EventID const& eid) { + DbIoV iov; + iov.setMax(); + return iov; + } + + ProditionsEntity::ptr makeEntity(art::EventID const& eid) { + if (_useDb) { + return _maker.fromDb(); + } else { + return _maker.fromFcl(); + } + } + + private: + bool _useDb; + CRVScintYieldMaker _maker; +}; + +} // namespace mu2e + +#endif diff --git a/CRVConditions/inc/CRVScintYieldMaker.hh b/CRVConditions/inc/CRVScintYieldMaker.hh new file mode 100644 index 0000000000..767c371ccd --- /dev/null +++ b/CRVConditions/inc/CRVScintYieldMaker.hh @@ -0,0 +1,29 @@ +#ifndef CRVConditions_CRVScintYieldMaker_hh +#define CRVConditions_CRVScintYieldMaker_hh + +// +// construct a CRVScintYield proditions entity +// (scintillation yield spread of CRV counters) +// from fcl or database +// + +#include "Offline/CRVConditions/inc/CRVScintYield.hh" +#include "Offline/CRVConfig/inc/CRVScintYieldConfig.hh" + +namespace mu2e { + +class CRVScintYieldMaker { + public: + CRVScintYieldMaker(CRVScintYieldConfig const& config) : _config(config) {} + + CRVScintYield::ptr_t fromFcl(); + CRVScintYield::ptr_t fromDb(); + + private: + // this object needs to be thread safe, + // _config should only be initialized once + const CRVScintYieldConfig _config; +}; +} // namespace mu2e + +#endif diff --git a/CRVConditions/inc/CRVStatus.hh b/CRVConditions/inc/CRVStatus.hh index 14d6cd7b94..a39c7b1341 100644 --- a/CRVConditions/inc/CRVStatus.hh +++ b/CRVConditions/inc/CRVStatus.hh @@ -23,7 +23,7 @@ class CRVStatus : virtual public ProditionsEntity { CRVStatus(const StatusMap& smap) : ProditionsEntity(cxname), _smap(smap) {} // return status flag word for an offline channel - int status(std::uint16_t channel) { + int status(std::uint16_t channel) const { auto it = _smap.find(channel); if (it == _smap.end()) { return 0; diff --git a/CRVConditions/src/CRVScintYieldMaker.cc b/CRVConditions/src/CRVScintYieldMaker.cc new file mode 100644 index 0000000000..e80f5d1678 --- /dev/null +++ b/CRVConditions/src/CRVScintYieldMaker.cc @@ -0,0 +1,95 @@ +#include "Offline/CRVConditions/inc/CRVScintYieldMaker.hh" +#include "Offline/ConfigTools/inc/ConfigFileLookupPolicy.hh" +#include "Offline/CosmicRayShieldGeom/inc/CosmicRayShield.hh" +#include "Offline/GeometryService/inc/GeomHandle.hh" +#include "Offline/GeometryService/inc/GeometryService.hh" +#include "cetlib_except/exception.h" +#include +#include +#include +#include +#include +#include +#include + +using namespace std; + +namespace mu2e { + +//*************************************************** + +CRVScintYield::ptr_t CRVScintYieldMaker::fromFcl() { + if (_config.verbose()) { + cout << "CRVScintYieldMaker::fromFcl making nominal CRVScintYield\n"; + } + + size_t nBarIndices = + GeomHandle()->getAllCRSScintillatorBars().size(); + + CRVScintYield::ScintYieldMap scintYieldMap(nBarIndices,0); // initialized to 0 (no deviation from the nominal scintillation yield) + + // load the scintillation spread + std::string fileStub = _config.fileName(); + + ConfigFileLookupPolicy configFile; + std::string fileSpec = configFile(fileStub); + if (_config.verbose()) { + cout << "CRVScintYieldMaker::fromFcl reading from " << fileSpec << "\n"; + } + + std::ifstream scintYieldFile; + scintYieldFile.open(fileSpec); + if (!scintYieldFile.is_open()) { + throw cet::exception("CRVSCINTYIELD_OPEN_FAILED") + << " failed to open file " << fileSpec << "\n"; + } + + std::string line; + + // read the header line + std::getline(scintYieldFile, line); + + size_t nRead = 0, maxBars = 0; + std::vector words; + while (std::getline(scintYieldFile, line)) { + boost::split(words, line, boost::is_any_of(" \t"), + boost::token_compress_on); + if (words.size() != 2) { + throw cet::exception("CRVSCINTYIELD_BAD_FILE") + << " failed to read line " << line << "\n"; + } + std::uint16_t barIndex = std::stoul(words[0]); + if (barIndex >= scintYieldMap.size()) { + throw cet::exception("CRVSCINTYIELD_BAD_SCINTILLATOR BAR INDEX") + << "CRVScintYieldMaker::fromFcl read barIndex in file that doesn't exist in geometry: " + << " barIndex=" << barIndex << "\n"; + } + float scintYieldDeviation = std::stof(words[1]); + scintYieldMap.at(barIndex) = scintYieldDeviation; + nRead++; + if (barIndex > maxBars) maxBars = barIndex; + } + + if (_config.verbose()) { + cout << "CRVScintYieldMaker::fromFcl bar indices read: " << nRead + << " max: " << maxBars << " geom: " << nBarIndices << "\n"; + } + + auto ptr = make_shared(scintYieldMap); + return ptr; + +} // end fromFcl + +//*************************************************** + +CRVScintYield::ptr_t CRVScintYieldMaker::fromDb() { + if (_config.verbose()) { + cout << "CRVScintyieldMaker::fromDb making CRVScintYield\n"; + } + + // no database dependence yet, so just return nominal + return fromFcl(); + +} // end fromDb + +} // namespace mu2e diff --git a/CRVConfig/inc/CRVScintYieldConfig.hh b/CRVConfig/inc/CRVScintYieldConfig.hh new file mode 100644 index 0000000000..100fdad379 --- /dev/null +++ b/CRVConfig/inc/CRVScintYieldConfig.hh @@ -0,0 +1,25 @@ +#ifndef STMConfig_CRVScintYieldConfig_hh +#define STMConfig_CRVScintYieldConfig_hh +// +// Fcl stanza for CRV ScintYield (scintillation yield spread of CRV counters) prodition +// +#include "fhiclcpp/types/Atom.h" +#include "fhiclcpp/types/Sequence.h" +#include "fhiclcpp/types/Tuple.h" +#include + +namespace mu2e { + +struct CRVScintYieldConfig { + using Name = fhicl::Name; + using Comment = fhicl::Comment; + + fhicl::Atom verbose{Name("verbose"), Comment("verbosity: 0 or 1")}; + fhicl::Atom useDb{Name("useDb"), Comment("use database or fcl")}; + fhicl::Atom fileName{Name("fileName"), Comment("file name containing scint yield spread")}; + +}; + +} // namespace mu2e + +#endif diff --git a/CRVResponse/fcl/prolog_v11.fcl b/CRVResponse/fcl/prolog_v11.fcl index 926e9400bd..7c02559de4 100644 --- a/CRVResponse/fcl/prolog_v11.fcl +++ b/CRVResponse/fcl/prolog_v11.fcl @@ -65,10 +65,9 @@ BEGIN_PROLOG scintillationYieldScaleFactor : 0.42 //scale factor applied to scintillation yields to mimic aging //0.42 results in 28.6 PE/SiPM @ 1 m away from SiPM (expected in 2025) //used in SU2020 - scintillationYieldVariation : 0.1 //gaussian distribution with sigma equal to 10% of the mean - //previously used 0.2 without upper limit - scintillationYieldVariationCutoffLow : 0.7 //the scintillation yield variation is cut off at 70% below the mean - scintillationYieldVariationCutoffHigh : 1.2 //the scintillation yield variation is cut off at 120% above the mean + scintillationYieldVariation : 0.05 //gaussian distribution with sigma equal to 5% of the mean + scintillationYieldVariationCutoffLow :-0.2 //the scintillation yield variation is cut off at 20% below the mean + scintillationYieldVariationCutoffHigh : 0.2 //the scintillation yield variation is cut off at 20% above the mean digitizationStart : 400.0 //400ns digitizationEnd : 1750.0 //1750ns digitizationStartMargin : 50.0 //50ns @@ -81,7 +80,6 @@ BEGIN_PROLOG digitizationEnd : 1750.0 //1750ns digitizationStartMargin : 50.0 //50ns - deadSiPMProbability : 0.01 nPixelsX : 40 nPixelsY : 40 inactivePixels : [ [18,18], [18,19], [18,20], [18,21], diff --git a/CRVResponse/src/CrvPhotonGenerator_module.cc b/CRVResponse/src/CrvPhotonGenerator_module.cc index 9c90287de7..a414044b32 100644 --- a/CRVResponse/src/CrvPhotonGenerator_module.cc +++ b/CRVResponse/src/CrvPhotonGenerator_module.cc @@ -4,6 +4,7 @@ // // Original Author: Ralf Ehrlich +#include "Offline/CRVConditions/inc/CRVScintYield.hh" #include "Offline/CRVResponse/inc/MakeCrvPhotons.hh" #include "Offline/CosmicRayShieldGeom/inc/CosmicRayShield.hh" #include "Offline/DataProducts/inc/CRSScintillatorBarIndex.hh" @@ -99,10 +100,11 @@ namespace mu2e std::vector _scintillationYields; std::vector > _makeCrvPhotons; - double _scintillationYieldScaleFactor; - double _scintillationYieldVariation; - double _scintillationYieldVariationCutoffLow; - double _scintillationYieldVariationCutoffHigh; + mu2e::ProditionsHandle _scintillationYieldMap; + double _scintillationYieldScaleFactor; + double _scintillationYieldVariation; + double _scintillationYieldVariationCutoffLow; + double _scintillationYieldVariationCutoffHigh; //On-spill //-Digitization window @@ -147,8 +149,6 @@ namespace mu2e CLHEP::RandFlat _randFlat; CLHEP::RandGaussQ _randGaussQ; CLHEP::RandPoissonQ _randPoissonQ; - - std::map _scintillationYieldsAdjusted; }; CrvPhotonGenerator::CrvPhotonGenerator(const Parameters& conf) : @@ -252,13 +252,12 @@ namespace mu2e void CrvPhotonGenerator::produce(art::Event& event) { - - _scintillationYieldsAdjusted.clear(); - std::unique_ptr crvPhotonsCollection(new CrvPhotonsCollection); std::map,std::vector > photonMap; + auto const& scintillationYieldMap = _scintillationYieldMap.get(event.id()); + GeomHandle CRS; GlobalConstantsHandle particleDataList; @@ -326,22 +325,17 @@ namespace mu2e const CRSScintillatorBarId &barId = CRSbar.id(); int CRVSectorNumber=barId.getShieldNumber(); - if(_scintillationYieldsAdjusted.find(step.barIndex())==_scintillationYieldsAdjusted.end()) - { - double sectorScintillationYield=_scintillationYields[CRVSectorNumber]; - double adjustedYield=0; - do - { - adjustedYield=_randGaussQ.fire(sectorScintillationYield, sectorScintillationYield*_scintillationYieldVariation); - } while(adjustedYieldsectorScintillationYield*_scintillationYieldVariationCutoffHigh); - _scintillationYieldsAdjusted[step.barIndex()] = adjustedYield; - } - double currentAdjustedYield = _scintillationYieldsAdjusted[step.barIndex()]; + //get the deviation of the scintillation yield from the nominal scintillation yield for each counter + float sectorScintillationYield = _scintillationYields[CRVSectorNumber]; + float scintillationYieldDeviation = scintillationYieldMap.scintYieldDeviation(step.barIndex().asUint()); + scintillationYieldDeviation *= _scintillationYieldVariation; + if(scintillationYieldDeviation<_scintillationYieldVariationCutoffLow) scintillationYieldDeviation=_scintillationYieldVariationCutoffLow; + if(scintillationYieldDeviation>_scintillationYieldVariationCutoffHigh) scintillationYieldDeviation=_scintillationYieldVariationCutoffHigh; + float adjustedScintillationYield = sectorScintillationYield + scintillationYieldDeviation*sectorScintillationYield; boost::shared_ptr &photonMaker=_makeCrvPhotons.at(CRVSectorNumber); - photonMaker->SetScintillationYield(currentAdjustedYield); + photonMaker->SetScintillationYield(adjustedScintillationYield); photonMaker->MakePhotons(pos1Local, pos2Local, t1, t2, avgBeta, charge, step.visibleEDep(), diff --git a/CRVResponse/src/CrvSiPMChargeGenerator_module.cc b/CRVResponse/src/CrvSiPMChargeGenerator_module.cc index ab7040af30..d96fa4c292 100644 --- a/CRVResponse/src/CrvSiPMChargeGenerator_module.cc +++ b/CRVResponse/src/CrvSiPMChargeGenerator_module.cc @@ -4,6 +4,7 @@ // // Original Author: Ralf Ehrlich +#include "Offline/CRVConditions/inc/CRVStatus.hh" #include "Offline/CRVResponse/inc/MakeCrvSiPMCharges.hh" #include "Offline/CosmicRayShieldGeom/inc/CosmicRayShield.hh" #include "Offline/DataProducts/inc/CRSScintillatorBarIndex.hh" @@ -46,7 +47,6 @@ namespace mu2e private: std::string _crvPhotonsModuleLabel; - double _deadSiPMProbability; int _nPixelsX; int _nPixelsY; double _overvoltage; @@ -56,6 +56,8 @@ namespace mu2e std::string _eventWindowMarkerLabel; std::string _protonBunchTimeMCLabel; + mu2e::ProditionsHandle _sipmStatus; + mu2eCrv::MakeCrvSiPMCharges::ProbabilitiesStruct _probabilities; std::vector > _inactivePixels; @@ -72,7 +74,6 @@ namespace mu2e CrvSiPMChargeGenerator::CrvSiPMChargeGenerator(fhicl::ParameterSet const& pset) : EDProducer{pset}, _crvPhotonsModuleLabel(pset.get("crvPhotonsModuleLabel")), - _deadSiPMProbability(pset.get("deadSiPMProbability")), //0.01 _nPixelsX(pset.get("nPixelsX")), //40 _nPixelsY(pset.get("nPixelsY")), //40 _overvoltage(pset.get("overvoltage")), //3.0V @@ -137,6 +138,8 @@ namespace mu2e } startTime -= _digitizationStartMargin; + auto const& sipmStatus = _sipmStatus.get(event.id()); + GeomHandle CRS; const std::vector > &counters = CRS->getAllCRSScintillatorBars(); std::vector >::const_iterator iter; @@ -144,21 +147,23 @@ namespace mu2e { const CRSScintillatorBarIndex &barIndex = (*iter)->index(); - for(int SiPM=0; SiPM<4; SiPM++) + for(size_t SiPM=0; SiPMgetBarDetail().hasCMB(SiPM%2)) continue; //no SiPM charges at non-existing SiPMs + if(!(*iter)->getBarDetail().hasCMB(SiPM%CRVId::nSidesPerBar)) continue; //no SiPM charges at non-existing SiPMs //SiPM%2 returns the side of the CRV counter //0 ... negative side //1 ... positive side - if(_randFlat.fire() < _deadSiPMProbability) continue; //assume that this random SiPM is dead + size_t channel = barIndex.asUint()*CRVId::nChanPerBar + SiPM; + int status = sipmStatus.status(channel); + if(status==1 || status==2) continue; //SiPM not connected or dead //time wrapping happened in the photon generator std::vector > photonTimesNew; //pair of photon time and index in the original photon vector CrvPhotonsCollection::const_iterator crvPhotons; for(crvPhotons=crvPhotonsCollection->begin(); crvPhotons!=crvPhotonsCollection->end(); crvPhotons++) { - if(crvPhotons->GetScintillatorBarIndex()==barIndex && crvPhotons->GetSiPMNumber()==SiPM) + if(crvPhotons->GetScintillatorBarIndex()==barIndex && crvPhotons->GetSiPMNumber()==(int)SiPM) { const std::vector &photonTimes = crvPhotons->GetPhotons(); for(size_t iphoton=0; iphoton crs.sectorNames = {"W1","W2","W3","W4"}; double crs.scintillatorBarThickness = 19.78; //mm double crs.scintillatorBarWidth = 51.34; //mm double crs.layerOffset = 42.0; //mm -double crs.gapLarge = 0.1; //mm //0.366 according to crv_parameters.xlsx //previously 0.5 +double crs.gapLarge = 0.2; //mm //0.366 according to crv_parameters.xlsx //previously 0.5 double crs.gapSmall = 0.0; //mm //previously 0.0875 double crs.gapBetweenModules = 3.0; //mm vector crs.gapBetweenLayers = {9.525, 9.525, 9.525}; //mm diff --git a/ProditionsService/fcl/prolog.fcl b/ProditionsService/fcl/prolog.fcl index 2dbf3a7eaf..51c3c91473 100644 --- a/ProditionsService/fcl/prolog.fcl +++ b/ProditionsService/fcl/prolog.fcl @@ -23,6 +23,7 @@ Proditions : { caloDAQConditions : @local::CaloDAQConditions trkQualCatalog : @local::TrkQualCatalog crvOrdinal : @local::CRVOrdinal + crvScintYield : @local::CRVScintYield crvStatus : @local::CRVStatus crvCalib : @local::CRVCalib simbookkeeper : @local::SimBookkeeper diff --git a/ProditionsService/inc/ProditionsService.hh b/ProditionsService/inc/ProditionsService.hh index 14632ef721..bd782629fc 100644 --- a/ProditionsService/inc/ProditionsService.hh +++ b/ProditionsService/inc/ProditionsService.hh @@ -9,6 +9,7 @@ #include "Offline/AnalysisConfig/inc/MVACatalogConfig.hh" #include "Offline/CRVConfig/inc/CRVCalibConfig.hh" #include "Offline/CRVConfig/inc/CRVOrdinalConfig.hh" +#include "Offline/CRVConfig/inc/CRVScintYieldConfig.hh" #include "Offline/CRVConfig/inc/CRVStatusConfig.hh" #include "Offline/CaloConfig/inc/CaloDAQMapConfig.hh" #include "Offline/DAQConfig/inc/EventTimingConfig.hh" @@ -53,6 +54,9 @@ class ProditionsService { fhicl::Table crvOrdinal{ Name("crvOrdinal"), Comment("CRV online-offline numbering configuration")}; + fhicl::Table crvScintYield{ + Name("crvScintYield"), + Comment("CRV scintillation yield deviation map for each counter")}; fhicl::Table crvStatus{ Name("crvStatus"), Comment("CRV bad channels configuration")}; fhicl::Table crvCalib{ diff --git a/ProditionsService/src/ProditionsService_service.cc b/ProditionsService/src/ProditionsService_service.cc index defc7cbd44..37c4fabcf2 100644 --- a/ProditionsService/src/ProditionsService_service.cc +++ b/ProditionsService/src/ProditionsService_service.cc @@ -5,6 +5,7 @@ #include "Offline/DbService/inc/DbHandle.hh" #include "Offline/CRVConditions/inc/CRVCalibCache.hh" #include "Offline/CRVConditions/inc/CRVOrdinalCache.hh" +#include "Offline/CRVConditions/inc/CRVScintYieldCache.hh" #include "Offline/CRVConditions/inc/CRVStatusCache.hh" #include "Offline/CaloConditions/inc/CaloDAQMapCache.hh" #include "Offline/DAQConditions/inc/EventTimingCache.hh" @@ -50,6 +51,8 @@ ProditionsService::ProditionsService(Parameters const& sTable, auto cor = std::make_shared(_config.crvOrdinal()); _caches[cor->name()] = cor; + auto csy = std::make_shared(_config.crvScintYield()); + _caches[csy->name()] = csy; auto cst = std::make_shared(_config.crvStatus()); _caches[cst->name()] = cst; auto cca = std::make_shared(_config.crvCalib()); From fdcc77dbdc447a46886eedef5bf5072b0292bd8a Mon Sep 17 00:00:00 2001 From: ehrlich-uva Date: Thu, 28 Dec 2023 07:58:57 -0600 Subject: [PATCH 040/213] added/updated database for CRV scintillation yield and channel status --- CRVConditions/data/scintyield_nominal.txt | 5504 +++++++++++++++++ .../data/scintyield_wideband4modules.txt | 256 + CRVConditions/data/status_nominal.txt | 228 + .../data/status_wideband4modules.txt | 32 + 4 files changed, 6020 insertions(+) create mode 100644 CRVConditions/data/scintyield_nominal.txt create mode 100644 CRVConditions/data/scintyield_wideband4modules.txt create mode 100644 CRVConditions/data/status_nominal.txt create mode 100644 CRVConditions/data/status_wideband4modules.txt diff --git a/CRVConditions/data/scintyield_nominal.txt b/CRVConditions/data/scintyield_nominal.txt new file mode 100644 index 0000000000..60dbd9137b --- /dev/null +++ b/CRVConditions/data/scintyield_nominal.txt @@ -0,0 +1,5504 @@ +0 -0.40817829 +1 0.478392983 +2 -1.742534815 +3 -1.083696214 +4 -0.232897289 +5 -1.133704616 +6 0.708299822 +7 -0.255976244 +8 0.454536537 +9 0.34589287 +10 -0.914151313 +11 -0.219176211 +12 1.540090237 +13 -0.06729041 +14 0.750185173 +15 -1.252525599 +16 1.881276793 +17 1.08307137 +18 0.403799169 +19 -0.66013052 +20 0.996921357 +21 -0.466640679 +22 -0.147430802 +23 0.465758366 +24 1.472209636 +25 -0.089248445 +26 0.077041903 +27 0.812045767 +28 0.116082738 +29 2.444925959 +30 -0.643804806 +31 0.197596893 +32 0.496921984 +33 1.855947974 +34 0.073004041 +35 -0.766896413 +36 -1.120294518 +37 -1.285900187 +38 1.462787967 +39 -0.175869471 +40 0.576923821 +41 -0.241021451 +42 -1.135892295 +43 0.006762617 +44 -1.656346974 +45 -1.072041249 +46 0.179748625 +47 0.272906454 +48 0.014156971 +49 -0.046374193 +50 0.006439565 +51 -0.644237792 +52 -0.007830788 +53 0.293738714 +54 0.918094334 +55 0.723697415 +56 0.06599502 +57 0.843457846 +58 -0.156088783 +59 0.768268835 +60 -1.049871276 +61 -0.053859518 +62 -0.472876414 +63 -0.657052687 +64 -0.670193813 +65 -0.056785721 +66 -0.437127642 +67 1.138593278 +68 0.367129055 +69 -0.681090652 +70 0.320863282 +71 -1.284949167 +72 -0.512218056 +73 1.001620998 +74 0.381645129 +75 1.462008713 +76 -0.639059588 +77 0.871553559 +78 0.161576853 +79 0.165354377 +80 -0.803663752 +81 -0.114701532 +82 0.491418645 +83 1.292607075 +84 -0.979921489 +85 0.973688432 +86 1.594841866 +87 0.371110412 +88 -0.27214148 +89 -1.915335772 +90 -0.041963719 +91 0.262880908 +92 -0.689180237 +93 0.246577909 +94 1.19357776 +95 0.542303852 +96 -0.654314151 +97 0.786000959 +98 -0.704262875 +99 -0.072265143 +100 0.208576412 +101 1.296570941 +102 -0.063855034 +103 0.159200191 +104 0.925960111 +105 -2.042826473 +106 2.075169182 +107 -0.222235 +108 1.35332452 +109 -0.002027946 +110 0.397365683 +111 0.354055184 +112 0.511771393 +113 -0.457738167 +114 1.155370009 +115 -0.115781727 +116 -0.840449092 +117 0.321826222 +118 -0.461556427 +119 -1.19008102 +120 0.401419897 +121 0.560289182 +122 -0.162565747 +123 0.331663265 +124 -0.313720184 +125 -1.389663479 +126 0.617972175 +127 -0.610932716 +128 0.15998996 +129 1.471532457 +130 -0.166092867 +131 -0.507920517 +132 0.338036954 +133 -1.40898172 +134 1.270972215 +135 -0.144821609 +136 -1.965002639 +137 -0.765306087 +138 0.577112948 +139 -0.714690883 +140 1.673938548 +141 1.283248438 +142 0.111830082 +143 0.393560045 +144 -0.704160562 +145 -0.892621182 +146 -0.288656835 +147 1.833763681 +148 -0.089292317 +149 0.916267188 +150 -0.780835161 +151 0.097099476 +152 1.386262532 +153 -0.094783916 +154 -1.715879581 +155 0.053034023 +156 -2.41327277 +157 1.000076796 +158 -0.67093874 +159 0.239788482 +160 0.465575947 +161 -0.897566218 +162 0.285623216 +163 -0.760963944 +164 -1.023673817 +165 -1.391641336 +166 -0.242148271 +167 0.590555063 +168 0.464393322 +169 -1.486813908 +170 0.394357776 +171 0.902535297 +172 -1.452469922 +173 0.178071392 +174 -0.371711772 +175 1.204077962 +176 -0.80514245 +177 -0.07796681 +178 -0.39354941 +179 -2.089904828 +180 -0.816150506 +181 -1.129655392 +182 -0.03139441 +183 0.8896484 +184 -0.652208727 +185 -0.397336115 +186 1.971118498 +187 1.701910592 +188 0.285792663 +189 -1.738091689 +190 -0.789743994 +191 -0.691520263 +192 -1.313018844 +193 -0.319232912 +194 0.83927878 +195 1.306147453 +196 1.98204058 +197 0.047865666 +198 -0.359924628 +199 0.696814511 +200 -0.005355014 +201 0.69741095 +202 0.146527025 +203 -1.380544453 +204 -1.429810506 +205 -0.407681799 +206 -1.528747625 +207 -0.166433636 +208 1.29328001 +209 2.034089345 +210 -0.16133237 +211 -1.333930035 +212 0.791834757 +213 -0.632238067 +214 -0.130231195 +215 0.349612982 +216 1.609446664 +217 -0.327849039 +218 -0.492717167 +219 1.299194 +220 -0.718527533 +221 -0.671708083 +222 1.60457056 +223 -0.867398704 +224 -1.109376665 +225 -1.145681704 +226 -0.679705033 +227 0.175969876 +228 -0.362956639 +229 1.135676944 +230 -0.685920146 +231 2.015346083 +232 0.207859477 +233 -0.200225515 +234 1.477822045 +235 0.22662747 +236 -1.270463891 +237 0.791715611 +238 0.344362716 +239 0.162729038 +240 0.372231898 +241 0.896106612 +242 -0.218775195 +243 -1.020718808 +244 0.965974581 +245 -0.76316394 +246 0.989352797 +247 1.718669209 +248 0.714001118 +249 -0.631049114 +250 0.735906505 +251 -0.249884282 +252 -0.969527779 +253 -0.439858992 +254 0.549916092 +255 -0.80050398 +256 -0.007173449 +257 0.337081613 +258 -0.824920031 +259 -0.816768181 +260 0.750262061 +261 -0.235735143 +262 -0.22671651 +263 -3.598685709 +264 -0.603896547 +265 -0.918996661 +266 0.083725271 +267 -0.374561747 +268 0.128729223 +269 0.987346053 +270 0.463799907 +271 -0.189384207 +272 0.985258405 +273 -1.880686458 +274 1.044747837 +275 1.29596539 +276 0.402672632 +277 1.492778169 +278 -0.803917017 +279 -1.034641198 +280 0.981203806 +281 -0.660412132 +282 1.093230086 +283 1.966852642 +284 0.623320561 +285 -1.297070085 +286 -1.513156965 +287 -1.506313331 +288 0.782545524 +289 0.42223614 +290 0.491447819 +291 -0.281510694 +292 1.277226115 +293 2.430401532 +294 0.446400491 +295 0.540262692 +296 -1.075688065 +297 -0.235786505 +298 -0.478864332 +299 -0.903800053 +300 0.201118785 +301 1.569425999 +302 0.052632657 +303 0.0737852 +304 1.574754064 +305 1.708556757 +306 -0.945417094 +307 -0.919766343 +308 0.367834016 +309 -1.41656582 +310 -0.942703944 +311 -1.597649742 +312 -1.221793136 +313 -0.091048807 +314 -0.159959852 +315 -0.0945729 +316 -0.506960088 +317 -0.506600418 +318 -0.042309861 +319 0.108956613 +320 -0.740256487 +321 0.71892811 +322 0.639832891 +323 0.231096989 +324 -1.448288062 +325 -0.232538077 +326 0.451084331 +327 -1.129972612 +328 -0.925244464 +329 0.671033429 +330 -0.013699547 +331 0.37986812 +332 1.876547013 +333 -0.706833619 +334 -1.069362693 +335 -1.640067097 +336 1.398416277 +337 -0.135849532 +338 -1.346438346 +339 -1.123148453 +340 1.686222942 +341 1.088895858 +342 -2.252108515 +343 -0.50804387 +344 -0.868431963 +345 1.639235192 +346 -1.420850609 +347 0.208936207 +348 -1.224200566 +349 -1.198681876 +350 -0.169580381 +351 0.361655672 +352 0.355273744 +353 -0.891657883 +354 -0.8431633 +355 -1.354371215 +356 -0.695650114 +357 1.061889469 +358 2.663483452 +359 0.349782459 +360 -1.209229394 +361 0.857416615 +362 -2.018092274 +363 1.249161024 +364 -0.126798794 +365 0.591033873 +366 -1.383067924 +367 -0.766158209 +368 -2.434720992 +369 -0.256693854 +370 -0.513582614 +371 -1.132831948 +372 -1.626955527 +373 -0.586142211 +374 -0.627314412 +375 0.583642122 +376 -1.912341781 +377 0.531838994 +378 0.095109225 +379 0.825036959 +380 0.305629479 +381 0.901661477 +382 0.930229399 +383 -1.451734065 +384 -0.019167851 +385 -0.857555306 +386 0.62476235 +387 -0.108405838 +388 0.847971532 +389 0.150492485 +390 -1.499164749 +391 -1.252682326 +392 0.322090398 +393 -1.791399574 +394 0.36534036 +395 0.168156081 +396 2.187935725 +397 0.493622527 +398 -2.164658004 +399 0.429179819 +400 1.128738376 +401 0.57112014 +402 0.751289368 +403 0.237764392 +404 0.156336249 +405 -1.172503726 +406 0.124471277 +407 0.240969704 +408 0.340211275 +409 -0.688639062 +410 -0.525581499 +411 0.181308277 +412 -0.152190427 +413 0.234399096 +414 -0.356869582 +415 0.171580914 +416 0.007592873 +417 -0.222287777 +418 0.167471356 +419 -0.462522062 +420 1.410863253 +421 0.722440127 +422 0.113289924 +423 -0.600614512 +424 -0.451435579 +425 -1.017313286 +426 -1.935903983 +427 -1.546858607 +428 -0.873229479 +429 -0.376859264 +430 0.649852145 +431 0.80894471 +432 -0.327801591 +433 0.304385153 +434 -0.304533303 +435 1.276705627 +436 -0.027770761 +437 -1.235226816 +438 1.061579542 +439 -0.94525643 +440 -0.76941479 +441 -0.128521269 +442 -0.433950796 +443 0.522838545 +444 1.205259074 +445 -0.219641106 +446 0.203870662 +447 0.178030848 +448 0.209347925 +449 -0.30159478 +450 -0.043044237 +451 -0.533813332 +452 -1.810757436 +453 -0.441292798 +454 1.163546923 +455 1.299749945 +456 -1.434587089 +457 0.451181103 +458 0.438376104 +459 -1.374459478 +460 0.11327561 +461 -1.239754095 +462 1.546861783 +463 -0.637626567 +464 -0.114131288 +465 0.979243329 +466 -0.157315999 +467 -0.442128219 +468 -0.025893066 +469 -0.433617986 +470 1.671640906 +471 -1.622366828 +472 1.404832042 +473 -1.063861096 +474 2.161709457 +475 0.049639699 +476 1.51225222 +477 -0.550773322 +478 -0.257415964 +479 -0.682554441 +480 -0.468611624 +481 1.554563487 +482 -0.170478644 +483 0.264716362 +484 -0.893563766 +485 1.159447915 +486 -0.253864548 +487 -1.117871833 +488 -2.185740376 +489 0.954521305 +490 0.59686098 +491 -0.793813165 +492 1.030006636 +493 1.461714818 +494 0.132094129 +495 0.865087306 +496 -1.472636144 +497 -0.539615336 +498 -1.469294956 +499 0.912733252 +500 -0.391309858 +501 -1.168845754 +502 -0.806736797 +503 -0.404089799 +504 -1.540185184 +505 -1.767002434 +506 0.663998772 +507 -1.454712691 +508 1.425962241 +509 0.782423134 +510 -0.740757154 +511 0.595286257 +512 0.134637496 +513 2.578358839 +514 0.09152125 +515 -0.053789907 +516 -0.370613331 +517 -1.110013413 +518 -2.403927782 +519 -0.098904264 +520 0.828388134 +521 -0.825051385 +522 -1.230015752 +523 -0.645880054 +524 -2.541147657 +525 1.027155794 +526 -1.667358644 +527 -1.489350918 +528 0.543879625 +529 -0.250101217 +530 -0.112506545 +531 -0.209420648 +532 -0.978524575 +533 0.755472556 +534 0.341013971 +535 -1.497376768 +536 0.080087475 +537 -0.749711372 +538 -1.64000224 +539 -0.167107535 +540 0.004185846 +541 -0.155373135 +542 -1.365282024 +543 1.361840672 +544 0.767380681 +545 0.493340231 +546 0.190095848 +547 -0.337414847 +548 -2.123060698 +549 0.955275299 +550 1.292901768 +551 -0.892889521 +552 1.733825488 +553 -0.87948169 +554 1.629570594 +555 -0.218710121 +556 -0.795968474 +557 0.530006508 +558 0.704284118 +559 0.664833628 +560 0.162944275 +561 -0.284845639 +562 0.308158758 +563 -0.288345332 +564 0.655204196 +565 -1.181856987 +566 -0.074884278 +567 -0.398693821 +568 -0.222166949 +569 0.527886889 +570 0.083287081 +571 -0.246896772 +572 -0.170832777 +573 1.154731064 +574 0.591964162 +575 1.392098058 +576 0.218055687 +577 0.636735352 +578 1.541503302 +579 0.999613871 +580 0.202605363 +581 0.939956723 +582 1.000186593 +583 -0.240155865 +584 0.295551159 +585 0.74048749 +586 -1.439617809 +587 0.118706766 +588 0.594744012 +589 1.722054042 +590 0.489825424 +591 -0.092664198 +592 -0.680533742 +593 -0.469737581 +594 -0.067692992 +595 1.167395322 +596 0.201747 +597 0.616967618 +598 0.998306676 +599 -1.048928338 +600 -0.347045525 +601 -0.233624793 +602 1.123764665 +603 0.397226241 +604 -0.909629124 +605 -0.234925804 +606 -1.788441902 +607 1.279679247 +608 -1.109477821 +609 -0.018903912 +610 -0.68746781 +611 -0.671901556 +612 -0.052222561 +613 -0.869001512 +614 -0.337248664 +615 1.632154158 +616 -0.295247325 +617 -0.258880892 +618 -1.72130832 +619 -0.68778214 +620 0.036159231 +621 0.05256995 +622 0.940174893 +623 -1.193094796 +624 1.663449246 +625 0.258785087 +626 0.581005652 +627 0.762503521 +628 0.356692957 +629 -1.080818544 +630 -0.07031834 +631 0.595463915 +632 0.455518127 +633 1.96603051 +634 0.073907432 +635 -0.289688525 +636 -1.840958407 +637 0.893614709 +638 0.550093903 +639 0.755860038 +640 0.018454385 +641 0.933447213 +642 -0.567725712 +643 1.197038265 +644 0.602571488 +645 0.195618355 +646 0.719440491 +647 -0.659338014 +648 -1.076215359 +649 0.091023268 +650 0.46921017 +651 -0.755383047 +652 -0.1230986 +653 1.588710283 +654 -1.389073456 +655 -0.11151737 +656 0.192231755 +657 -2.043651215 +658 -0.111809254 +659 0.230804304 +660 1.007710776 +661 -0.555359258 +662 -0.441639334 +663 -0.633874035 +664 -0.821842231 +665 0.09165612 +666 -0.660005061 +667 1.055079926 +668 -0.166575857 +669 0.272196461 +670 -0.061539148 +671 -0.727852311 +672 1.100451237 +673 -1.577325611 +674 1.045756062 +675 -0.254034436 +676 -1.105164769 +677 -0.269249796 +678 1.015424679 +679 0.613318548 +680 0.846277458 +681 0.010022539 +682 0.176280886 +683 -0.517314589 +684 0.992052652 +685 -1.232270627 +686 1.299484472 +687 -0.333518509 +688 0.305436466 +689 0.085244298 +690 0.016435911 +691 1.197102966 +692 -0.015089566 +693 -0.250898876 +694 -0.302505612 +695 -1.100841257 +696 0.48287465 +697 -1.289820991 +698 0.241767276 +699 -0.119440054 +700 1.636230338 +701 1.152146097 +702 0.738968908 +703 0.692557456 +704 -2.232255027 +705 0.296724487 +706 0.840617841 +707 0.745429364 +708 1.33412023 +709 -0.005944921 +710 -0.129184773 +711 -0.234458954 +712 0.217480124 +713 1.267159028 +714 2.175116992 +715 -2.201152258 +716 -0.33942274 +717 0.096710859 +718 -0.633170941 +719 -0.636234471 +720 0.892496671 +721 1.59868153 +722 0.065696794 +723 0.282764337 +724 -0.271991956 +725 0.593142464 +726 0.100120025 +727 -0.370996664 +728 0.883862334 +729 1.485580957 +730 -0.59616712 +731 -0.568912718 +732 0.524385698 +733 0.451609845 +734 -0.606268461 +735 0.864337844 +736 1.020480535 +737 -2.357786698 +738 -0.202855646 +739 -0.849218475 +740 1.996351215 +741 -1.002299113 +742 1.516448329 +743 -1.452860765 +744 -0.254657958 +745 0.737933316 +746 -0.589838214 +747 0.7409136 +748 -1.296411485 +749 -0.739207171 +750 1.138745393 +751 0.123214344 +752 0.951328888 +753 -0.177091543 +754 -0.720588245 +755 -0.19962583 +756 -1.874827648 +757 -0.655913352 +758 1.024948508 +759 0.469592199 +760 0.200475613 +761 0.82728868 +762 -0.16783238 +763 1.251092866 +764 0.212660434 +765 1.163521737 +766 -0.40153073 +767 -0.057714041 +768 -1.896381051 +769 0.177032416 +770 1.236664107 +771 -0.668385154 +772 -0.770261634 +773 -1.16976461 +774 0.266803696 +775 0.440262378 +776 -0.121910544 +777 0.136322053 +778 1.089066083 +779 0.407867876 +780 -1.45196584 +781 -0.278712815 +782 -0.509610234 +783 0.796739865 +784 0.539129462 +785 0.05746158 +786 -0.216251817 +787 -1.814003009 +788 -0.365340871 +789 2.214868148 +790 0.566108846 +791 0.936565245 +792 -1.189589254 +793 -0.986350374 +794 0.155470474 +795 -1.554888019 +796 -0.273918213 +797 -0.307934556 +798 -0.457824476 +799 0.202462726 +800 -3.175025979 +801 0.548640432 +802 0.116826298 +803 1.180811134 +804 0.451055487 +805 -1.266309149 +806 1.723407882 +807 -0.042608481 +808 1.229444465 +809 -0.643137922 +810 0.964370281 +811 0.710242436 +812 -1.220085161 +813 -2.166899516 +814 0.264803761 +815 0.327529541 +816 -0.169957863 +817 1.315324053 +818 -0.453293354 +819 0.416298175 +820 -0.990935085 +821 -0.402273032 +822 -0.829099869 +823 0.32478979 +824 0.131468938 +825 -0.379226882 +826 -2.148095208 +827 1.035119613 +828 0.754191621 +829 0.676846841 +830 0.85845341 +831 -0.879590795 +832 -1.951119491 +833 -0.110559706 +834 -1.110239586 +835 -0.190721178 +836 -0.83027826 +837 -0.752211541 +838 2.034310157 +839 0.402540729 +840 -0.208695415 +841 -0.950694547 +842 0.256601111 +843 -0.455376298 +844 -0.60310613 +845 -1.793646022 +846 0.829557646 +847 -0.791057837 +848 -1.899389653 +849 -1.099887394 +850 0.026796951 +851 -1.514549482 +852 -0.586713481 +853 0.99705945 +854 0.959315757 +855 1.25034976 +856 -1.16878592 +857 -0.667069606 +858 -1.579041371 +859 0.040176692 +860 0.60487061 +861 -0.940286835 +862 -0.538320001 +863 -1.193365671 +864 -0.455553912 +865 0.910838393 +866 -0.251964964 +867 0.448587078 +868 0.135504416 +869 0.687892069 +870 0.638019132 +871 -0.018456708 +872 0.274689724 +873 0.40887214 +874 -1.179969433 +875 0.283026883 +876 3.087218729 +877 -0.451392778 +878 0.423858692 +879 -0.540938796 +880 -1.749824515 +881 0.077586406 +882 2.023628921 +883 -0.581871436 +884 0.200526641 +885 -1.189717647 +886 -1.799677244 +887 0.533139951 +888 0.107560763 +889 -0.640006975 +890 -0.737604847 +891 0.219374116 +892 -1.470183266 +893 0.063090485 +894 0.3914926 +895 -1.388051647 +896 -0.384079169 +897 -0.468936587 +898 0.462593719 +899 -1.924058459 +900 -0.661081588 +901 -1.162045364 +902 0.09952754 +903 0.768493746 +904 -1.384360789 +905 -1.0138134 +906 -1.158703776 +907 -1.09925696 +908 -1.107000694 +909 0.499786447 +910 0.980860924 +911 1.185146646 +912 -1.619800103 +913 -0.535515967 +914 -0.858969246 +915 0.433054164 +916 1.863839658 +917 -0.685876169 +918 -0.230871159 +919 -1.041282449 +920 -0.13618303 +921 -1.509019783 +922 -0.7717079 +923 -0.914726305 +924 1.043613471 +925 -1.155323778 +926 1.130107495 +927 -0.760193584 +928 -1.527621444 +929 -1.492480158 +930 -1.060350786 +931 1.225162106 +932 0.788020282 +933 -1.51445339 +934 -0.569732944 +935 1.269920886 +936 0.90172626 +937 -0.454543515 +938 1.968361845 +939 -0.83088489 +940 1.231898389 +941 0.115089214 +942 0.98054965 +943 -0.08497517 +944 0.172532076 +945 -0.586410712 +946 0.488030929 +947 -0.354560333 +948 -0.524640337 +949 0.875235713 +950 -1.80066288 +951 -0.5433488 +952 -0.042017393 +953 0.010123254 +954 0.665051144 +955 -0.346399864 +956 1.014648131 +957 -1.309139529 +958 0.945424576 +959 -2.274990431 +960 0.857203277 +961 -1.734511036 +962 -0.214231882 +963 0.069040172 +964 0.499696463 +965 1.751805468 +966 -1.934838999 +967 0.868537001 +968 1.993929646 +969 1.289449949 +970 -1.346159819 +971 -0.119857301 +972 -1.392234599 +973 -1.847802164 +974 0.132086576 +975 -0.544655756 +976 -1.544663227 +977 -0.978524974 +978 0.853515988 +979 -0.76411176 +980 0.922356277 +981 -0.691962126 +982 -0.505797514 +983 -1.253027945 +984 0.653974757 +985 -0.006938417 +986 0.583247767 +987 0.875126182 +988 -0.593246275 +989 -1.079829845 +990 0.632460724 +991 0.292908205 +992 1.138572513 +993 0.128196834 +994 0.451834506 +995 -0.289878141 +996 -0.286428037 +997 0.981708857 +998 0.330752265 +999 0.242769886 +1000 -0.046242412 +1001 -1.667095837 +1002 1.109577126 +1003 0.428346419 +1004 1.252683943 +1005 -0.519526528 +1006 1.224797559 +1007 -0.452932113 +1008 -1.046709043 +1009 0.259965391 +1010 -0.180581981 +1011 0.353443118 +1012 -0.035358412 +1013 -0.475674329 +1014 0.623160639 +1015 0.949165294 +1016 0.73871055 +1017 -0.115008363 +1018 -2.458177145 +1019 -0.710933855 +1020 -1.486111657 +1021 0.435511517 +1022 1.329449326 +1023 -0.501262987 +1024 0.533116789 +1025 2.381095032 +1026 0.115332848 +1027 0.973568788 +1028 -0.990546519 +1029 -0.247974338 +1030 0.842200348 +1031 0.178305568 +1032 -0.314906385 +1033 -0.365744661 +1034 -1.07586073 +1035 1.715035276 +1036 -0.60791999 +1037 -0.998417203 +1038 -0.551783364 +1039 -0.409248905 +1040 1.250273822 +1041 -0.03074491 +1042 0.13130747 +1043 -0.081369789 +1044 0.369134878 +1045 -0.71544035 +1046 1.244631371 +1047 -2.221847734 +1048 1.239702984 +1049 0.124467318 +1050 -0.212782307 +1051 -0.784561886 +1052 0.273051474 +1053 2.624219146 +1054 -1.599611716 +1055 0.847414958 +1056 1.004690093 +1057 -1.627508396 +1058 -1.627715576 +1059 -0.675471817 +1060 0.719215303 +1061 -0.302387992 +1062 -0.354503346 +1063 -0.798509939 +1064 0.605321883 +1065 -1.151204487 +1066 -0.395348361 +1067 -0.337198082 +1068 0.442261016 +1069 0.806729101 +1070 0.566165461 +1071 -0.964650991 +1072 0.097885979 +1073 -0.383678739 +1074 -0.203305827 +1075 2.399086941 +1076 0.46802039 +1077 -0.368524292 +1078 -0.00123323 +1079 -2.081473443 +1080 -0.831735787 +1081 0.598808941 +1082 -0.914394328 +1083 1.331837553 +1084 -1.775535867 +1085 1.569073099 +1086 0.217903061 +1087 0.24253345 +1088 1.192479096 +1089 -1.291163631 +1090 0.990729396 +1091 1.11204799 +1092 -0.229879811 +1093 1.075350718 +1094 0.279536145 +1095 -0.260321907 +1096 -1.089290051 +1097 0.157330229 +1098 0.009980245 +1099 -0.083448858 +1100 0.402603278 +1101 -0.539672316 +1102 -0.533767979 +1103 1.05877514 +1104 -0.925822074 +1105 0.768700115 +1106 -0.35953064 +1107 -1.189120444 +1108 0.257771941 +1109 -1.009946645 +1110 -0.524662014 +1111 0.420524896 +1112 0.192894438 +1113 -1.870173502 +1114 0.570067204 +1115 -0.070077086 +1116 0.659360217 +1117 -1.026177747 +1118 -0.236328394 +1119 1.477863367 +1120 0.193574107 +1121 0.772045519 +1122 -0.177649883 +1123 0.870319409 +1124 -0.017479783 +1125 -0.279022644 +1126 0.382275018 +1127 1.170667539 +1128 -0.681747014 +1129 1.10589659 +1130 0.841060309 +1131 1.591777309 +1132 0.818406551 +1133 -1.666236147 +1134 -0.961683822 +1135 -0.051205459 +1136 -0.389347296 +1137 0.563939745 +1138 0.354430876 +1139 -0.572624045 +1140 0.147987887 +1141 -0.412815136 +1142 -1.06582087 +1143 1.836254736 +1144 0.463943038 +1145 1.13771502 +1146 -0.153029104 +1147 -0.959472032 +1148 -2.068088862 +1149 0.048530295 +1150 -1.728815368 +1151 0.372674982 +1152 -0.290707981 +1153 -0.945096374 +1154 -0.061804855 +1155 -0.116466267 +1156 -1.085773245 +1157 -0.262111809 +1158 0.060013621 +1159 2.899127783 +1160 -0.421866764 +1161 -0.152853994 +1162 -1.638545701 +1163 -0.965774522 +1164 -0.92247946 +1165 0.585327482 +1166 0.624676644 +1167 2.635646603 +1168 0.25656422 +1169 -0.950483428 +1170 0.249221233 +1171 -0.045452541 +1172 0.655135529 +1173 -0.966235162 +1174 -0.032343467 +1175 -1.168263955 +1176 0.798316045 +1177 1.778180435 +1178 -0.289597257 +1179 -1.184519876 +1180 -0.254802016 +1181 0.650184902 +1182 0.863137128 +1183 -0.373119283 +1184 -0.215473475 +1185 -1.158731067 +1186 -1.217574457 +1187 -0.756352277 +1188 -0.987318361 +1189 -0.05542385 +1190 1.945141258 +1191 0.126766327 +1192 0.484086392 +1193 0.247341272 +1194 1.256927478 +1195 0.120934422 +1196 1.251137178 +1197 0.11213065 +1198 -0.255394376 +1199 -0.704343711 +1200 0.309073939 +1201 0.969789266 +1202 0.560553671 +1203 -1.73167449 +1204 -0.88986668 +1205 -0.763761249 +1206 0.247837819 +1207 1.147544858 +1208 1.022735779 +1209 2.175788884 +1210 -0.372259146 +1211 0.467029106 +1212 1.271231585 +1213 -0.816182111 +1214 -0.217278052 +1215 1.749764562 +1216 0.784116353 +1217 1.00895146 +1218 -1.338294345 +1219 1.425240323 +1220 -0.094086206 +1221 1.228116101 +1222 -0.203301588 +1223 -1.654327906 +1224 0.050594562 +1225 0.196886195 +1226 1.683803824 +1227 1.825861623 +1228 0.711670122 +1229 -0.479574173 +1230 0.770407785 +1231 -0.127681681 +1232 0.417720184 +1233 0.989241049 +1234 -0.122745028 +1235 0.903104017 +1236 -0.04707973 +1237 -1.013600178 +1238 0.455859814 +1239 -0.328809768 +1240 -0.091027427 +1241 -0.562765727 +1242 -1.085281734 +1243 -1.308772229 +1244 -1.692134802 +1245 1.696933244 +1246 0.335855147 +1247 0.346514477 +1248 -0.317943433 +1249 0.084826325 +1250 0.550157165 +1251 1.529921972 +1252 -1.28412388 +1253 -0.401184408 +1254 1.214237498 +1255 0.126700221 +1256 0.245813798 +1257 0.670866613 +1258 1.128559982 +1259 0.380725762 +1260 0.112818265 +1261 -0.400405036 +1262 0.148326937 +1263 1.072023975 +1264 -0.474005936 +1265 -0.163670086 +1266 -0.585253233 +1267 -0.069401838 +1268 -0.102382726 +1269 0.082869514 +1270 -0.575252273 +1271 0.654560029 +1272 0.710048041 +1273 1.586952121 +1274 0.605934737 +1275 -0.976830985 +1276 -0.48497013 +1277 -1.279069462 +1278 0.678004442 +1279 -1.058694588 +1280 -0.378410689 +1281 -1.728059162 +1282 0.810285572 +1283 1.919715918 +1284 2.143843723 +1285 -0.880485338 +1286 -0.103939713 +1287 0.275933167 +1288 0.464716865 +1289 -0.743282636 +1290 0.078033888 +1291 0.623058776 +1292 -0.001004085 +1293 -0.458480028 +1294 0.594367206 +1295 0.441931522 +1296 1.324411665 +1297 -0.625429866 +1298 -0.528168714 +1299 -0.210256748 +1300 -3.07073383 +1301 0.306124992 +1302 -0.494857131 +1303 0.474057076 +1304 -2.202207526 +1305 0.290801763 +1306 -1.021201349 +1307 -0.554601655 +1308 0.179147148 +1309 0.957304052 +1310 -0.453517023 +1311 -0.591682664 +1312 -1.484474809 +1313 -2.595124427 +1314 -1.573641162 +1315 -0.067215536 +1316 0.676020392 +1317 -1.12888597 +1318 -0.547476447 +1319 0.454197935 +1320 0.689533258 +1321 -1.246461134 +1322 0.061263565 +1323 -1.036040358 +1324 -0.544417389 +1325 -0.960688598 +1326 -0.97919833 +1327 -1.368226674 +1328 0.607293951 +1329 -0.959312259 +1330 -0.401011668 +1331 -2.204550211 +1332 0.238270632 +1333 1.615338392 +1334 -0.16915305 +1335 -0.352846904 +1336 -1.346774835 +1337 -1.384385829 +1338 -0.339069044 +1339 0.233529978 +1340 -0.51258402 +1341 0.204337616 +1342 1.275979011 +1343 1.267159312 +1344 -0.376169226 +1345 0.320972559 +1346 0.831597277 +1347 -0.757943379 +1348 0.109901613 +1349 0.102133439 +1350 0.451237321 +1351 2.052758997 +1352 0.493403821 +1353 0.25310576 +1354 -0.645334744 +1355 2.697425219 +1356 0.425614822 +1357 -0.653118788 +1358 -0.52403994 +1359 -1.299451072 +1360 -1.440935626 +1361 0.688313531 +1362 2.117469304 +1363 0.258614024 +1364 1.325593234 +1365 0.206956521 +1366 -0.30619084 +1367 0.816710942 +1368 -1.047296308 +1369 -0.432358546 +1370 -0.3751806 +1371 -0.200321853 +1372 0.322079053 +1373 1.236091182 +1374 0.832670871 +1375 -0.274438859 +1376 0.002915741 +1377 0.936905737 +1378 -0.139925039 +1379 -1.223665231 +1380 -0.344035731 +1381 0.541830143 +1382 0.089550894 +1383 -0.399373201 +1384 -0.638971758 +1385 -0.42829274 +1386 0.066232207 +1387 0.172407444 +1388 -1.323501735 +1389 0.38213983 +1390 0.087665437 +1391 1.144264232 +1392 0.040586983 +1393 -0.646331893 +1394 -0.723917657 +1395 1.507763791 +1396 -0.627054227 +1397 -0.9371208 +1398 2.406349533 +1399 -0.093765111 +1400 0.516593832 +1401 0.272142965 +1402 2.462509816 +1403 -0.264848659 +1404 1.412332659 +1405 -0.354292211 +1406 0.11448595 +1407 -0.256964107 +1408 0.324339735 +1409 2.13272175 +1410 1.092728614 +1411 -1.91914295 +1412 -1.660628282 +1413 -0.358849657 +1414 0.168993835 +1415 -0.6352745 +1416 -0.80700903 +1417 -0.632799736 +1418 1.187958056 +1419 0.961249843 +1420 -0.170612173 +1421 1.551243121 +1422 1.362319567 +1423 -1.193773097 +1424 0.875966912 +1425 -0.301807687 +1426 1.087694951 +1427 0.638511876 +1428 -0.623304654 +1429 1.014578475 +1430 0.913151992 +1431 -1.413942561 +1432 -0.926906491 +1433 1.076826789 +1434 0.161473801 +1435 1.343436819 +1436 -0.239858673 +1437 0.419993321 +1438 -0.694705002 +1439 -0.839949363 +1440 0.046718338 +1441 0.020594471 +1442 0.02047847 +1443 -0.784002496 +1444 -0.849342873 +1445 1.424219963 +1446 -0.428727842 +1447 -1.076114332 +1448 0.245701561 +1449 0.795284639 +1450 -0.973539635 +1451 0.68104775 +1452 0.839216441 +1453 -1.52268479 +1454 0.195724793 +1455 -1.042926393 +1456 -1.129095651 +1457 0.764965186 +1458 0.478977433 +1459 -0.899265097 +1460 -0.949318827 +1461 1.614949018 +1462 -0.032344549 +1463 3.360742147 +1464 -0.396105414 +1465 -1.638622894 +1466 0.225093528 +1467 1.066021618 +1468 -0.008648247 +1469 -0.98582826 +1470 1.346256924 +1471 1.069673059 +1472 -0.065328933 +1473 -0.328719295 +1474 -0.987566838 +1475 -1.321288981 +1476 0.721593751 +1477 -0.041482784 +1478 1.826603053 +1479 -0.216176364 +1480 2.863000908 +1481 -1.490517904 +1482 2.377364868 +1483 -0.243495591 +1484 -0.911774065 +1485 -0.716668349 +1486 -0.458943849 +1487 -0.104759866 +1488 0.605636337 +1489 0.065383726 +1490 -0.017498077 +1491 -0.044832297 +1492 -0.738418872 +1493 -1.413405161 +1494 -2.739505592 +1495 -1.841888126 +1496 1.042864628 +1497 2.161190966 +1498 1.342689067 +1499 -0.214030949 +1500 1.042022067 +1501 -0.309085657 +1502 0.277460722 +1503 1.107321205 +1504 -0.585070535 +1505 0.156611861 +1506 -0.351925395 +1507 -0.775565552 +1508 0.114316536 +1509 -1.613789939 +1510 0.217823012 +1511 -1.191785627 +1512 0.593475868 +1513 1.533722175 +1514 -0.323433577 +1515 -0.806779254 +1516 -1.604844659 +1517 0.102191798 +1518 1.322960171 +1519 -0.361678357 +1520 -0.888166285 +1521 0.225253553 +1522 0.962730982 +1523 -0.168650299 +1524 1.778898795 +1525 -1.091458088 +1526 0.284315938 +1527 0.555151951 +1528 0.500225097 +1529 -0.218339028 +1530 0.911711179 +1531 -0.122564715 +1532 0.51501612 +1533 0.774050326 +1534 -0.549177499 +1535 2.174960386 +1536 1.062305575 +1537 -0.139650429 +1538 1.118406979 +1539 1.3584474 +1540 -0.788873132 +1541 0.381642474 +1542 1.439085857 +1543 -1.121210976 +1544 0.150952927 +1545 -1.790852942 +1546 2.013183813 +1547 0.210408816 +1548 -0.671184985 +1549 -1.860633407 +1550 1.09075947 +1551 2.881170535 +1552 -0.123701428 +1553 0.737024616 +1554 1.637156571 +1555 0.570382232 +1556 0.066575419 +1557 -1.362949123 +1558 -0.872602578 +1559 -0.191219854 +1560 -0.108035104 +1561 0.928527111 +1562 -0.015967741 +1563 0.560778368 +1564 0.887724002 +1565 0.056689206 +1566 -0.282033062 +1567 -0.029326086 +1568 -0.052530885 +1569 1.367972968 +1570 -1.79237768 +1571 1.116314751 +1572 -0.196780429 +1573 -0.055235898 +1574 0.916819527 +1575 0.085709656 +1576 0.535777802 +1577 1.089405707 +1578 -0.819426047 +1579 0.177940704 +1580 -0.982378265 +1581 -0.338772763 +1582 -1.231196175 +1583 0.824217401 +1584 -0.794775943 +1585 -0.364367553 +1586 -0.181752727 +1587 0.850876764 +1588 0.694380233 +1589 -0.344790023 +1590 -0.789343958 +1591 0.555591209 +1592 1.8095993 +1593 0.018399509 +1594 -0.2907814 +1595 -1.311454024 +1596 -0.453737701 +1597 -0.713099278 +1598 -1.871217814 +1599 -1.855595008 +1600 -1.50335959 +1601 0.152104007 +1602 -0.349240956 +1603 -1.679758922 +1604 -0.813097069 +1605 -0.68458957 +1606 -1.421559125 +1607 1.254645446 +1608 -0.402991842 +1609 -0.361254808 +1610 -0.007997992 +1611 -0.145461463 +1612 -0.895017449 +1613 -0.905708472 +1614 0.854875838 +1615 0.78699051 +1616 -1.410831808 +1617 -0.764928534 +1618 0.141505386 +1619 -0.388825946 +1620 -3.70286215 +1621 -0.002344433 +1622 0.510266988 +1623 -0.626913417 +1624 0.262031237 +1625 0.470105833 +1626 1.032987175 +1627 0.717039441 +1628 -1.760394966 +1629 -0.068211196 +1630 0.492303386 +1631 0.339595004 +1632 -0.194246437 +1633 1.231180779 +1634 -0.50732565 +1635 0.87349122 +1636 0.207690755 +1637 -0.404986842 +1638 0.184515962 +1639 1.660614188 +1640 -0.120491395 +1641 -0.063217475 +1642 1.805415859 +1643 -0.556181162 +1644 0.351102366 +1645 -1.548318268 +1646 1.796355923 +1647 -1.311573365 +1648 0.661765077 +1649 0.798712499 +1650 -1.177506257 +1651 1.35100198 +1652 0.829813176 +1653 1.1781559 +1654 -3.055804227 +1655 1.339799015 +1656 1.072880261 +1657 -0.05236323 +1658 0.806639372 +1659 -0.630502298 +1660 -0.627638126 +1661 -2.450544613 +1662 -1.053766923 +1663 -0.550824734 +1664 -0.171231715 +1665 -0.385789661 +1666 -1.163382622 +1667 -0.194048389 +1668 1.14223055 +1669 0.393505504 +1670 1.618124654 +1671 0.462184153 +1672 -0.533581448 +1673 0.096926262 +1674 -0.294813712 +1675 -0.38002565 +1676 0.096927543 +1677 0.650988938 +1678 0.213954904 +1679 1.732896243 +1680 0.297904352 +1681 -0.557323155 +1682 -1.038760499 +1683 0.004037229 +1684 -1.257539053 +1685 -0.142588258 +1686 -0.127348537 +1687 -0.573785889 +1688 1.176439789 +1689 0.175882701 +1690 1.598899928 +1691 -0.818855796 +1692 -0.262768199 +1693 -0.328304085 +1694 0.169610773 +1695 -1.047791513 +1696 0.47106748 +1697 -2.265356992 +1698 -0.716463072 +1699 -0.889267603 +1700 -1.301960146 +1701 0.202494957 +1702 0.48782136 +1703 0.866728518 +1704 1.504958339 +1705 0.888348354 +1706 -0.938815863 +1707 -1.839141412 +1708 0.733286953 +1709 -0.213362574 +1710 -0.11796977 +1711 -1.168636502 +1712 0.558730854 +1713 1.060481177 +1714 -0.673135343 +1715 1.487687016 +1716 -1.275335325 +1717 0.878705219 +1718 0.398474049 +1719 -1.558192588 +1720 0.77921354 +1721 -0.892247045 +1722 0.357419561 +1723 0.494176721 +1724 -0.539440003 +1725 0.000386206 +1726 -0.769741029 +1727 0.313805128 +1728 -0.963234471 +1729 -0.368789437 +1730 -0.17670233 +1731 -1.775071713 +1732 -0.80359913 +1733 -2.28906398 +1734 1.160313261 +1735 1.11157293 +1736 -0.301166138 +1737 -0.552782222 +1738 -0.373617313 +1739 0.141000488 +1740 1.377735871 +1741 1.426330638 +1742 0.54543983 +1743 -0.263229746 +1744 0.273568675 +1745 1.419312432 +1746 0.610486579 +1747 1.159710755 +1748 -1.075953673 +1749 -0.122767356 +1750 0.456580432 +1751 -0.900892946 +1752 -0.994932181 +1753 -0.110523942 +1754 2.151103267 +1755 -0.531178235 +1756 -1.012228907 +1757 -0.245966726 +1758 0.684606715 +1759 -0.220290503 +1760 -1.460385504 +1761 2.010610352 +1762 -0.002192636 +1763 -0.52455839 +1764 1.454112457 +1765 0.679916714 +1766 1.012329962 +1767 0.507871078 +1768 0.811905765 +1769 -0.790424859 +1770 -1.395229234 +1771 0.439227749 +1772 1.195216523 +1773 -0.218852214 +1774 -0.284945873 +1775 0.707535982 +1776 1.673377868 +1777 -1.005581537 +1778 0.74725325 +1779 -0.835813552 +1780 1.212757394 +1781 -0.734298675 +1782 -0.879431521 +1783 0.391702188 +1784 0.696680581 +1785 0.789079136 +1786 0.456885959 +1787 -0.648540679 +1788 0.045670802 +1789 0.60428694 +1790 0.550244104 +1791 -0.212835011 +1792 -0.279870367 +1793 -0.160626314 +1794 -1.188668928 +1795 -1.052250258 +1796 -1.231730315 +1797 -1.346895253 +1798 0.516688482 +1799 0.781976093 +1800 -0.189426418 +1801 -0.028605629 +1802 0.627499346 +1803 1.325068377 +1804 0.704091115 +1805 -0.48621016 +1806 0.201925071 +1807 -1.046947297 +1808 -0.248062056 +1809 0.593734865 +1810 -1.522367644 +1811 -0.025457207 +1812 0.786568759 +1813 0.363289977 +1814 1.110924487 +1815 1.159454467 +1816 -0.189238232 +1817 0.730048341 +1818 0.307839648 +1819 -1.751157307 +1820 -0.645708345 +1821 1.008548108 +1822 -1.034890794 +1823 -1.661555554 +1824 0.900352757 +1825 -0.400587569 +1826 0.564609602 +1827 0.339832802 +1828 -0.298687221 +1829 0.347723744 +1830 3.693496942 +1831 -2.130912807 +1832 1.541289144 +1833 -0.47601284 +1834 0.068199826 +1835 0.46396916 +1836 -1.157275219 +1837 0.507581971 +1838 -0.904760773 +1839 -0.220049177 +1840 1.786574782 +1841 0.213579574 +1842 -0.140211417 +1843 1.975969667 +1844 0.503422001 +1845 -0.812042034 +1846 -0.469889291 +1847 -0.23491214 +1848 -0.718618781 +1849 -1.07323202 +1850 -1.441798008 +1851 0.362405705 +1852 0.909489056 +1853 0.202703906 +1854 2.27416428 +1855 0.327187237 +1856 0.399475261 +1857 0.628978616 +1858 -0.025183235 +1859 1.000032899 +1860 -0.590545587 +1861 -0.032818971 +1862 -0.028781065 +1863 -1.053534864 +1864 1.475014844 +1865 -0.176441762 +1866 0.711109536 +1867 -0.69641032 +1868 0.350594227 +1869 0.377475451 +1870 -0.307750745 +1871 0.146895309 +1872 -0.514662908 +1873 0.745472631 +1874 0.930378357 +1875 0.017325869 +1876 -0.709126782 +1877 0.417243936 +1878 -0.785765765 +1879 0.758391905 +1880 -1.789961747 +1881 0.379559958 +1882 -0.425807452 +1883 -0.192454062 +1884 -1.619778255 +1885 -0.424469288 +1886 0.361915921 +1887 0.171364308 +1888 0.935082864 +1889 0.45967675 +1890 0.08101763 +1891 1.132373805 +1892 0.430440028 +1893 -0.265048055 +1894 -0.105163029 +1895 -0.101210977 +1896 -2.399938658 +1897 1.333351711 +1898 -2.14929494 +1899 -0.622364177 +1900 1.986477333 +1901 0.802585133 +1902 -1.521264346 +1903 -0.488202233 +1904 -0.277810625 +1905 -0.947364857 +1906 0.764979056 +1907 0.187834884 +1908 0.711689166 +1909 0.805136447 +1910 -0.623804919 +1911 -0.075521904 +1912 -1.505320664 +1913 -0.178328137 +1914 -1.175337612 +1915 0.007532854 +1916 1.693634074 +1917 0.39934206 +1918 1.018951417 +1919 1.782097998 +1920 0.24529696 +1921 0.122960316 +1922 -0.793892853 +1923 -1.171828415 +1924 0.91049509 +1925 0.551441805 +1926 0.459084534 +1927 -0.57390591 +1928 -0.777301236 +1929 0.004011636 +1930 -0.369480587 +1931 0.223654824 +1932 -0.871965946 +1933 0.319746012 +1934 -1.549238278 +1935 -0.536418186 +1936 -0.705528532 +1937 1.822280916 +1938 0.855597502 +1939 0.053770226 +1940 1.34126332 +1941 1.969972875 +1942 -0.739476257 +1943 -1.995902412 +1944 0.489120768 +1945 0.034361053 +1946 1.27088528 +1947 0.621256256 +1948 -0.632795668 +1949 -0.032324313 +1950 0.491188622 +1951 -0.325390827 +1952 -2.567078797 +1953 2.485538093 +1954 -0.297773014 +1955 -0.986998229 +1956 0.090259859 +1957 0.0076611 +1958 0.075320278 +1959 0.081887592 +1960 0.32305532 +1961 -1.296812931 +1962 -0.421831307 +1963 1.470741903 +1964 -0.577041622 +1965 0.460724949 +1966 1.452478064 +1967 -1.2372402 +1968 0.828051611 +1969 -0.296193072 +1970 1.891450262 +1971 0.113635025 +1972 1.295932522 +1973 1.511888965 +1974 0.302816978 +1975 -0.243137504 +1976 -0.086644585 +1977 0.683219595 +1978 0.964393331 +1979 -1.59380957 +1980 0.38958432 +1981 0.226917645 +1982 -0.67253529 +1983 -1.753656316 +1984 1.127862857 +1985 1.778305888 +1986 -0.204339916 +1987 -1.480750614 +1988 0.375779388 +1989 -0.155068248 +1990 1.106471754 +1991 0.281549537 +1992 1.583650841 +1993 1.477241842 +1994 0.911504457 +1995 -0.487011131 +1996 -1.588134669 +1997 0.257341847 +1998 -1.763500082 +1999 -0.243472216 +2000 -0.413288616 +2001 -1.407345571 +2002 -0.267425131 +2003 1.303271337 +2004 -1.40221421 +2005 -2.257613398 +2006 -0.290858053 +2007 0.57134319 +2008 0.847593759 +2009 -0.024084492 +2010 -0.475229421 +2011 1.669445403 +2012 -2.566050707 +2013 0.827720273 +2014 0.502219467 +2015 -2.058021197 +2016 -0.475683215 +2017 0.003002099 +2018 -1.622559761 +2019 0.474371697 +2020 -0.126464519 +2021 -1.505041232 +2022 1.590771553 +2023 0.536179261 +2024 -0.102886985 +2025 0.481897113 +2026 -0.811425239 +2027 -0.363718507 +2028 0.317592392 +2029 0.819193771 +2030 0.332012422 +2031 0.776122417 +2032 0.998553923 +2033 0.557246096 +2034 1.260545383 +2035 1.97319538 +2036 -1.104521829 +2037 -0.310148206 +2038 0.257202435 +2039 2.423462946 +2040 0.026904419 +2041 -1.110942447 +2042 0.700536969 +2043 0.758977229 +2044 -1.715144579 +2045 -0.053627343 +2046 -0.052304333 +2047 1.628756739 +2048 -0.484883467 +2049 0.031121214 +2050 1.506492589 +2051 -1.630241224 +2052 0.077894652 +2053 0.341682552 +2054 -0.387412229 +2055 1.037806651 +2056 -0.530238351 +2057 1.032967902 +2058 -0.179055708 +2059 1.17127723 +2060 0.685684896 +2061 -0.062514999 +2062 -0.700865399 +2063 0.621416897 +2064 1.21811577 +2065 -1.768058056 +2066 -0.350537031 +2067 0.150335084 +2068 -0.956889919 +2069 -0.109594099 +2070 1.777820055 +2071 0.776000193 +2072 -0.82580888 +2073 -0.444958301 +2074 -0.121342949 +2075 0.147482867 +2076 -0.494562264 +2077 1.680806468 +2078 -1.254264005 +2079 -0.35414054 +2080 -0.366300537 +2081 0.413722815 +2082 -0.508879663 +2083 -0.937193372 +2084 1.271096589 +2085 0.43191345 +2086 -0.298006365 +2087 0.036522536 +2088 1.880245565 +2089 0.124123506 +2090 0.28512778 +2091 -0.988096897 +2092 -0.797605521 +2093 -1.349410418 +2094 -0.946749486 +2095 1.085810211 +2096 0.433038308 +2097 -1.160087058 +2098 -0.37783758 +2099 -0.739030196 +2100 -0.836511368 +2101 1.40854777 +2102 0.460433092 +2103 -1.973821221 +2104 -1.196357108 +2105 -2.756246145 +2106 1.520438292 +2107 1.590532187 +2108 -0.451985596 +2109 -0.092485896 +2110 1.365687502 +2111 -0.646662983 +2112 -1.498838161 +2113 -1.042875463 +2114 0.606459928 +2115 -1.358329389 +2116 1.332131675 +2117 -0.276305037 +2118 0.444087813 +2119 2.006317075 +2120 1.266914199 +2121 -0.690732334 +2122 0.873659725 +2123 -0.242604928 +2124 1.01845736 +2125 0.585856554 +2126 -1.651893232 +2127 -1.085750946 +2128 -0.43129556 +2129 1.7012254 +2130 -0.159662491 +2131 0.64384151 +2132 -1.175867673 +2133 1.392628744 +2134 0.0104397 +2135 -1.478786964 +2136 0.048254641 +2137 0.76289515 +2138 -0.276197529 +2139 0.194194111 +2140 0.611138596 +2141 -1.069526461 +2142 0.389635506 +2143 1.243676692 +2144 1.704719337 +2145 0.136055053 +2146 -0.065078488 +2147 -0.192773964 +2148 0.786450959 +2149 0.279487404 +2150 0.853147441 +2151 1.310045122 +2152 1.598013114 +2153 -0.21955259 +2154 1.703299079 +2155 0.321587739 +2156 -0.606683506 +2157 0.157015015 +2158 0.427213697 +2159 0.001083903 +2160 -1.61787735 +2161 0.017407245 +2162 0.630013987 +2163 0.646404305 +2164 -1.978152484 +2165 -0.700201194 +2166 -0.068701408 +2167 0.651626966 +2168 1.416573036 +2169 0.164570023 +2170 0.923802266 +2171 -0.90233767 +2172 0.276635223 +2173 -0.196144048 +2174 -0.227388078 +2175 0.301877162 +2176 0.416346067 +2177 0.142551997 +2178 -0.090819856 +2179 -0.808246979 +2180 2.454687816 +2181 1.550740856 +2182 0.978740371 +2183 0.306911381 +2184 -0.094855833 +2185 -0.705375411 +2186 1.448514739 +2187 0.599699099 +2188 -0.880880376 +2189 -0.612084473 +2190 0.662154749 +2191 0.994863898 +2192 -0.792857445 +2193 1.907065065 +2194 0.160969549 +2195 1.422068955 +2196 -0.376402222 +2197 0.935576627 +2198 -0.180087156 +2199 -0.28378605 +2200 0.476005028 +2201 1.223097221 +2202 -0.124309367 +2203 -2.233422478 +2204 -0.043021866 +2205 -1.143943158 +2206 -1.213151322 +2207 0.824792652 +2208 1.129144253 +2209 0.887757846 +2210 1.118684948 +2211 2.387292283 +2212 -0.788238904 +2213 1.905609787 +2214 0.051113696 +2215 1.37650912 +2216 -1.333656013 +2217 -0.663585841 +2218 0.280832865 +2219 0.325395727 +2220 0.591906178 +2221 -0.634643499 +2222 -0.475594828 +2223 0.560505822 +2224 -1.170702951 +2225 -1.372004118 +2226 0.0797799 +2227 -0.753056594 +2228 0.237009069 +2229 -0.858798086 +2230 1.57257751 +2231 -1.460494148 +2232 -0.883030278 +2233 -1.625196479 +2234 -0.069635948 +2235 -0.091076947 +2236 1.515211408 +2237 -0.357586946 +2238 1.178631611 +2239 -1.729206373 +2240 0.271323384 +2241 0.227359568 +2242 -0.907887846 +2243 0.52929309 +2244 1.913460489 +2245 1.109893894 +2246 -0.888620757 +2247 0.328531056 +2248 -0.584472611 +2249 -0.745936157 +2250 -0.526161959 +2251 0.918603284 +2252 1.168505073 +2253 -0.277047381 +2254 1.04041442 +2255 0.888725851 +2256 -0.678876082 +2257 1.399554229 +2258 0.123553058 +2259 0.274359524 +2260 0.842209302 +2261 -0.235220959 +2262 -0.401759713 +2263 -0.440669035 +2264 -0.210185516 +2265 -0.405906742 +2266 1.347599592 +2267 -0.353976027 +2268 -0.792524555 +2269 1.005305334 +2270 -0.964256748 +2271 0.42057614 +2272 0.783024696 +2273 -1.236697903 +2274 -0.64445077 +2275 0.328071009 +2276 1.218171276 +2277 -1.14206762 +2278 0.488747425 +2279 -0.388684963 +2280 -0.053460143 +2281 0.355683253 +2282 -1.388479723 +2283 -0.371905797 +2284 0.418272932 +2285 0.528791445 +2286 -1.046639636 +2287 -1.018167701 +2288 0.866767483 +2289 -0.42005925 +2290 1.263598934 +2291 -1.40028706 +2292 -1.345433383 +2293 0.945096893 +2294 1.185792027 +2295 0.482039967 +2296 -0.86313825 +2297 1.581956386 +2298 0.78397236 +2299 0.754152392 +2300 0.313728014 +2301 -0.214046923 +2302 -2.180557956 +2303 -0.348674554 +2304 0.179490863 +2305 0.531626446 +2306 0.968896365 +2307 -0.167432249 +2308 0.382751173 +2309 1.550295092 +2310 -0.769886057 +2311 0.663808591 +2312 0.725697283 +2313 0.175139105 +2314 -0.359565498 +2315 0.024955488 +2316 2.048454297 +2317 -0.820737701 +2318 -0.915638298 +2319 0.454415157 +2320 1.570825539 +2321 1.876836556 +2322 0.874119096 +2323 -1.278349953 +2324 0.187275736 +2325 -0.538362213 +2326 0.393347381 +2327 -1.980487093 +2328 0.118418941 +2329 -0.450526742 +2330 -1.394779638 +2331 -0.153905371 +2332 -1.208964557 +2333 0.432131743 +2334 1.107220819 +2335 0.979755713 +2336 -0.794979317 +2337 -0.822723112 +2338 -0.085047269 +2339 -0.484445864 +2340 -1.352848976 +2341 1.624698977 +2342 0.311191133 +2343 1.212634293 +2344 1.696793904 +2345 0.601048716 +2346 -0.679708875 +2347 -0.191597871 +2348 -0.019227569 +2349 1.868666291 +2350 0.737647953 +2351 -0.099420661 +2352 2.397360122 +2353 0.08468701 +2354 1.4317352 +2355 -1.76320045 +2356 -0.702050309 +2357 1.631285641 +2358 -0.41021459 +2359 1.562617527 +2360 1.598579425 +2361 1.423822957 +2362 -1.451486784 +2363 0.629809896 +2364 0.641880546 +2365 -0.593727666 +2366 1.51487648 +2367 0.888105352 +2368 0.207151635 +2369 -0.029580163 +2370 0.100153361 +2371 -1.821927185 +2372 1.323502948 +2373 0.396312074 +2374 -0.175159913 +2375 0.140153019 +2376 0.967214081 +2377 0.071344789 +2378 -1.604559033 +2379 0.922265004 +2380 0.387687101 +2381 -0.24383415 +2382 1.477924975 +2383 0.650757954 +2384 0.239010737 +2385 0.736348058 +2386 -1.01754089 +2387 -2.31211973 +2388 0.259657327 +2389 0.130983818 +2390 -0.663467699 +2391 -0.80309624 +2392 0.51011325 +2393 1.343358468 +2394 0.27303806 +2395 -0.924364163 +2396 -1.099878344 +2397 0.99317084 +2398 0.476853671 +2399 -2.646800062 +2400 1.110680413 +2401 -1.106582904 +2402 -0.852502117 +2403 1.239386176 +2404 1.021579378 +2405 -0.393316927 +2406 1.008445963 +2407 -0.12763867 +2408 0.855235269 +2409 -0.008414146 +2410 0.648632093 +2411 -1.186171142 +2412 0.062012452 +2413 -0.267219243 +2414 -0.551074561 +2415 0.978029314 +2416 0.817749562 +2417 -3.145471204 +2418 -0.825857113 +2419 -0.684082885 +2420 1.153410416 +2421 1.563619343 +2422 1.336850058 +2423 1.46221232 +2424 1.237528347 +2425 -0.075275247 +2426 -0.305412552 +2427 1.311582256 +2428 1.454658111 +2429 1.238491921 +2430 -0.044735295 +2431 0.035285872 +2432 1.312121409 +2433 0.317397884 +2434 0.080894009 +2435 -0.599749632 +2436 1.110587444 +2437 1.52608767 +2438 -1.294779354 +2439 -0.980474276 +2440 0.022590592 +2441 -0.474138037 +2442 -0.343036004 +2443 0.264353504 +2444 0.172239139 +2445 -0.441606675 +2446 0.192776955 +2447 0.650013702 +2448 1.969015796 +2449 0.549570375 +2450 0.367757514 +2451 0.034329048 +2452 1.261662615 +2453 0.345128954 +2454 1.034518116 +2455 1.280368986 +2456 0.125018165 +2457 1.414437695 +2458 -0.555813224 +2459 -0.321681573 +2460 0.362266949 +2461 1.1196206 +2462 0.759047427 +2463 0.507170714 +2464 -0.802388114 +2465 -1.32393098 +2466 1.046031991 +2467 2.011289695 +2468 -0.141721926 +2469 0.107973825 +2470 2.452432475 +2471 0.55341791 +2472 -1.152692486 +2473 0.023723839 +2474 -0.335590695 +2475 -0.198849277 +2476 -0.37050799 +2477 -0.768413225 +2478 1.296483428 +2479 -0.026540856 +2480 0.13432784 +2481 1.015755617 +2482 -0.582063812 +2483 -1.164371171 +2484 -0.762226619 +2485 0.142969931 +2486 -0.094148398 +2487 -0.423302974 +2488 -1.600306843 +2489 0.699210054 +2490 0.452073344 +2491 0.559676324 +2492 -0.926206712 +2493 -0.497097456 +2494 -0.96636324 +2495 1.65093277 +2496 1.347439666 +2497 0.304782927 +2498 1.287447638 +2499 -0.71434822 +2500 -0.637439574 +2501 -1.459344402 +2502 -0.811946113 +2503 -0.817028658 +2504 0.531376222 +2505 -0.430457195 +2506 -0.680809943 +2507 0.192602352 +2508 -1.031199644 +2509 -0.819917372 +2510 1.264678056 +2511 0.727648833 +2512 0.350522771 +2513 -0.526173377 +2514 -0.264656183 +2515 0.715121705 +2516 0.835069178 +2517 -0.679070797 +2518 -0.401083108 +2519 0.215991776 +2520 -0.589855671 +2521 -0.334430262 +2522 1.035280701 +2523 -1.493562335 +2524 -0.659110582 +2525 -1.305022496 +2526 -0.269789452 +2527 0.61633541 +2528 -3.320345987 +2529 -0.627102225 +2530 1.314138338 +2531 -0.181680264 +2532 -0.044461195 +2533 1.121287244 +2534 0.04914931 +2535 2.356615625 +2536 -0.155134718 +2537 1.181822245 +2538 -0.848955029 +2539 0.15424419 +2540 0.771480105 +2541 1.809940496 +2542 -0.175104177 +2543 -1.281307025 +2544 0.458440028 +2545 0.917748787 +2546 -1.863046269 +2547 -1.214484673 +2548 0.786825623 +2549 0.968819808 +2550 1.770231367 +2551 -0.861802662 +2552 -0.254553991 +2553 1.299947641 +2554 -0.244678162 +2555 -1.28835185 +2556 -1.137191114 +2557 0.647424736 +2558 0.997664068 +2559 0.463715168 +2560 0.977701521 +2561 1.71887517 +2562 -0.343555493 +2563 -1.383076279 +2564 0.316339013 +2565 1.647561053 +2566 -0.703353171 +2567 1.116676435 +2568 -0.606827925 +2569 1.818494714 +2570 -0.419281965 +2571 1.503274627 +2572 -0.724793208 +2573 1.622791457 +2574 0.657348678 +2575 1.490817966 +2576 -0.334546322 +2577 -2.307889732 +2578 1.870231716 +2579 0.512660823 +2580 -2.274861252 +2581 0.035952541 +2582 -0.116476244 +2583 0.705290856 +2584 0.97984403 +2585 0.272524888 +2586 0.189724 +2587 0.274381248 +2588 -0.488595648 +2589 0.132183279 +2590 1.617809223 +2591 -1.477798461 +2592 0.075025671 +2593 0.268697696 +2594 0.150552771 +2595 0.62877214 +2596 -1.27959667 +2597 0.536798925 +2598 0.510038822 +2599 0.039695033 +2600 -0.714147763 +2601 0.685795154 +2602 -0.250415555 +2603 1.247231179 +2604 -0.385499961 +2605 0.541441625 +2606 0.639017128 +2607 1.695194216 +2608 -0.934919302 +2609 -0.199878629 +2610 0.712247508 +2611 0.885191502 +2612 -0.507737589 +2613 -0.375985073 +2614 1.392270785 +2615 -0.202666441 +2616 -0.421186277 +2617 -0.191823346 +2618 -0.344653463 +2619 -0.70220867 +2620 1.70006197 +2621 1.28958189 +2622 1.956643921 +2623 -1.145112623 +2624 -0.901634676 +2625 0.586532709 +2626 -0.618566608 +2627 -1.052508012 +2628 -0.095473032 +2629 1.782356528 +2630 -0.651516517 +2631 0.125092052 +2632 -0.511438927 +2633 0.234374754 +2634 -1.671313417 +2635 1.512021928 +2636 0.391572278 +2637 0.626189518 +2638 0.659898529 +2639 -2.349100404 +2640 0.962111436 +2641 -0.979867734 +2642 -1.571751621 +2643 0.48994048 +2644 0.411895515 +2645 0.845056611 +2646 -0.165488861 +2647 0.923195377 +2648 0.376408589 +2649 -1.257372937 +2650 -0.557810679 +2651 -0.679541202 +2652 1.104665336 +2653 -0.275996478 +2654 -2.443402569 +2655 0.995760186 +2656 0.024892946 +2657 0.903741756 +2658 1.581896753 +2659 0.738615416 +2660 1.216169833 +2661 -0.099273397 +2662 1.848092733 +2663 -0.550545202 +2664 -1.016918153 +2665 0.578486457 +2666 -0.563129503 +2667 -0.452668671 +2668 0.465774549 +2669 2.480073635 +2670 0.003276613 +2671 1.171181272 +2672 1.073425939 +2673 0.262435283 +2674 -2.014383335 +2675 -0.463797672 +2676 -1.311797665 +2677 0.24447936 +2678 0.068490148 +2679 -0.753855974 +2680 -0.71320943 +2681 -0.2510368 +2682 -1.443750448 +2683 0.455653929 +2684 -0.035262481 +2685 1.675833502 +2686 1.038679549 +2687 -0.2554965 +2688 2.187275454 +2689 -0.015704504 +2690 0.208690166 +2691 -2.124421277 +2692 -0.508964104 +2693 -1.100136238 +2694 0.514896446 +2695 -0.239575713 +2696 -1.755623385 +2697 0.481260886 +2698 1.231513415 +2699 0.210734851 +2700 -1.174642978 +2701 1.099842093 +2702 -0.76617303 +2703 1.277049558 +2704 -1.505816713 +2705 -0.522223567 +2706 0.995390203 +2707 0.901572938 +2708 -0.452235183 +2709 -0.452363562 +2710 -0.870976793 +2711 -0.616122133 +2712 0.819232185 +2713 1.181548131 +2714 0.37340504 +2715 1.130659389 +2716 -0.279887629 +2717 -0.447592003 +2718 -0.51045004 +2719 -0.430663907 +2720 1.721613722 +2721 0.487701572 +2722 -0.033625274 +2723 1.346207984 +2724 -0.251970666 +2725 2.280001758 +2726 0.05428262 +2727 -1.260819104 +2728 -0.020849488 +2729 -0.283322065 +2730 0.370445992 +2731 0.417730993 +2732 0.72827579 +2733 1.531353771 +2734 -1.043318379 +2735 -0.160787192 +2736 -1.172108493 +2737 -1.52997937 +2738 -0.194507046 +2739 -1.348387451 +2740 1.523553268 +2741 -0.798631603 +2742 -0.950967936 +2743 -0.063765964 +2744 0.912214748 +2745 -0.808583994 +2746 -0.127436697 +2747 -0.031285801 +2748 1.270955514 +2749 -0.913712235 +2750 0.728903499 +2751 0.616953305 +2752 0.081942413 +2753 -1.604980449 +2754 -0.459442109 +2755 0.053902534 +2756 -2.03637142 +2757 -0.916128208 +2758 -0.587695654 +2759 -1.740122798 +2760 -0.388623062 +2761 0.242722477 +2762 -0.01009862 +2763 -2.123808184 +2764 -0.478025013 +2765 -0.170926793 +2766 0.153835496 +2767 -1.172302386 +2768 -0.236246325 +2769 1.421604009 +2770 0.628511751 +2771 0.028271346 +2772 -0.358109951 +2773 0.894023987 +2774 -0.079119757 +2775 0.736656559 +2776 -0.720989472 +2777 -1.622008535 +2778 0.330785094 +2779 -0.491407592 +2780 0.802859808 +2781 0.691993959 +2782 -0.191235929 +2783 -2.102719503 +2784 0.958605562 +2785 0.66614115 +2786 1.303585192 +2787 0.32029201 +2788 -0.068754722 +2789 -0.263636396 +2790 1.457265151 +2791 1.089906797 +2792 -0.006774601 +2793 -0.511933694 +2794 -0.340126825 +2795 -1.097075286 +2796 0.578117129 +2797 2.848814673 +2798 -0.198624397 +2799 -0.410395101 +2800 2.146871621 +2801 -1.1994984 +2802 -0.519395208 +2803 -1.240952421 +2804 0.231784407 +2805 -0.912421405 +2806 -0.131773515 +2807 2.280690352 +2808 -0.890544139 +2809 1.092778068 +2810 0.638016978 +2811 -0.231677723 +2812 0.027208565 +2813 -2.098453634 +2814 0.636090931 +2815 0.246885386 +2816 -1.26468875 +2817 0.678963475 +2818 -0.241175943 +2819 -0.851064537 +2820 1.770176629 +2821 -1.111575472 +2822 0.562177316 +2823 0.825759922 +2824 0.388514125 +2825 0.942357646 +2826 -0.354391878 +2827 0.402683801 +2828 -0.424582346 +2829 0.325748073 +2830 -0.029396406 +2831 -0.343070458 +2832 -0.00060984 +2833 -1.538816602 +2834 -0.579142186 +2835 3.364613058 +2836 -2.502253307 +2837 -0.399942188 +2838 -0.121524991 +2839 0.338289019 +2840 0.790006111 +2841 -0.050358789 +2842 0.331673497 +2843 0.676197855 +2844 0.402412776 +2845 1.69929648 +2846 -0.321283648 +2847 0.911835475 +2848 1.34551371 +2849 -0.673599261 +2850 0.957952061 +2851 0.279436957 +2852 0.422236089 +2853 0.458370917 +2854 -0.765985977 +2855 0.349436699 +2856 0.125981401 +2857 0.386740884 +2858 0.401460085 +2859 -0.459206276 +2860 -0.648448175 +2861 0.521478929 +2862 0.979527739 +2863 -1.773169051 +2864 0.307778859 +2865 -0.229626145 +2866 0.966344135 +2867 1.808718565 +2868 0.908038156 +2869 0.239742892 +2870 0.850411416 +2871 -0.577051279 +2872 -1.015874495 +2873 0.015306899 +2874 2.518345321 +2875 -0.88997627 +2876 0.902777054 +2877 -0.908612424 +2878 -1.053882227 +2879 -1.692165242 +2880 0.220785496 +2881 -1.095204945 +2882 -0.512735155 +2883 -0.222208417 +2884 0.378252197 +2885 -1.163637624 +2886 1.970955497 +2887 1.288300231 +2888 -1.62460471 +2889 1.98439724 +2890 -0.087417277 +2891 0.768644838 +2892 -1.03772779 +2893 -0.886343078 +2894 -0.12096099 +2895 -1.858493855 +2896 0.277156655 +2897 0.293325178 +2898 -0.321532817 +2899 -0.363432686 +2900 -0.746364218 +2901 0.421318223 +2902 -0.915134879 +2903 0.117173179 +2904 -1.741210432 +2905 -0.829060941 +2906 -0.981268311 +2907 -0.727913629 +2908 0.711145751 +2909 0.130478905 +2910 0.508952656 +2911 -0.29931167 +2912 -0.643821291 +2913 -1.115098125 +2914 0.168520128 +2915 -1.417263089 +2916 -1.505678417 +2917 1.162097171 +2918 0.153752463 +2919 0.894783478 +2920 -1.232900735 +2921 0.845040507 +2922 -0.366436341 +2923 1.956492478 +2924 1.135428421 +2925 -0.739531055 +2926 -0.940029566 +2927 -0.038718983 +2928 -1.275790215 +2929 -0.844733673 +2930 -1.61244535 +2931 0.002323482 +2932 -0.442630049 +2933 0.010854755 +2934 -0.694756016 +2935 0.16643555 +2936 1.203909657 +2937 0.786817827 +2938 0.735789812 +2939 0.097959795 +2940 0.393615772 +2941 -0.962365816 +2942 1.986438046 +2943 -0.78176768 +2944 -0.793931837 +2945 1.631780681 +2946 0.908607873 +2947 -0.096316981 +2948 -0.058674386 +2949 0.584030752 +2950 1.875856313 +2951 0.634282737 +2952 -1.38688777 +2953 -0.866018337 +2954 -1.071973506 +2955 -0.2463436 +2956 1.198641784 +2957 1.708768378 +2958 -1.415594636 +2959 -2.042710124 +2960 -1.380182221 +2961 0.636045474 +2962 -1.78596722 +2963 0.600266974 +2964 -1.889194301 +2965 0.174030021 +2966 -0.540405742 +2967 0.731819172 +2968 -0.232657389 +2969 0.676537531 +2970 1.488500926 +2971 -0.333912502 +2972 -0.905962502 +2973 -1.342055705 +2974 -0.718918795 +2975 1.862074468 +2976 1.977506085 +2977 -0.681720962 +2978 0.491886571 +2979 -1.115712197 +2980 -1.271522509 +2981 -0.493574629 +2982 -0.72202798 +2983 -0.543522434 +2984 0.316236052 +2985 -0.882736413 +2986 -0.747241711 +2987 -0.015802181 +2988 1.270140519 +2989 0.196841741 +2990 0.203512496 +2991 0.591362338 +2992 -1.127234667 +2993 -0.37232219 +2994 1.998359078 +2995 0.094157446 +2996 -0.964802754 +2997 -1.918825234 +2998 -0.689153701 +2999 0.213447233 +3000 -0.950996458 +3001 0.743677593 +3002 0.796120481 +3003 -0.411710752 +3004 -0.704037348 +3005 0.594379906 +3006 0.692072172 +3007 -2.016264484 +3008 -1.212942309 +3009 -0.505997659 +3010 -0.409591591 +3011 0.619166697 +3012 -0.039625859 +3013 0.899353283 +3014 -0.581736165 +3015 -1.617016983 +3016 0.10881189 +3017 -0.398343687 +3018 -1.038820924 +3019 -0.805553842 +3020 0.059831635 +3021 -0.47681932 +3022 -0.482066857 +3023 -0.451901505 +3024 -0.951810286 +3025 -0.282919459 +3026 -1.054046885 +3027 0.680544667 +3028 2.305432365 +3029 0.814222744 +3030 -0.75062428 +3031 0.307324218 +3032 2.090380473 +3033 -0.337565099 +3034 0.332547364 +3035 0.656575369 +3036 -0.104010075 +3037 0.234898912 +3038 -1.2339208 +3039 -0.267204165 +3040 -0.539314624 +3041 1.249965281 +3042 1.014578026 +3043 1.912586853 +3044 -1.884429372 +3045 -0.060941536 +3046 -0.254263458 +3047 -0.351569283 +3048 0.855649018 +3049 1.181216322 +3050 2.454512893 +3051 0.87899496 +3052 2.025137047 +3053 0.136449274 +3054 -0.844987056 +3055 -0.572327419 +3056 1.384363629 +3057 -1.43634002 +3058 0.935482162 +3059 0.316533371 +3060 -0.040314419 +3061 -1.017569219 +3062 -0.09452286 +3063 0.001868817 +3064 -1.299048565 +3065 0.404137833 +3066 1.8638741 +3067 -1.399927264 +3068 -0.336036127 +3069 1.279541258 +3070 -0.887900753 +3071 -0.583338335 +3072 0.836306685 +3073 0.271334729 +3074 0.650660326 +3075 -1.072725962 +3076 0.684874739 +3077 -2.17317185 +3078 1.477109817 +3079 -1.077373748 +3080 -1.95146906 +3081 1.042385598 +3082 0.18683356 +3083 1.872054856 +3084 -0.110892045 +3085 -1.350223241 +3086 -1.163194418 +3087 -0.009518952 +3088 -1.131693163 +3089 -0.679007938 +3090 1.314531691 +3091 -0.398738653 +3092 1.273271753 +3093 1.299015707 +3094 2.297906885 +3095 -0.494159368 +3096 -0.000474041 +3097 1.10458045 +3098 -0.173240281 +3099 -0.07932719 +3100 -0.963275212 +3101 0.215510434 +3102 -0.466957928 +3103 0.312505555 +3104 1.481984685 +3105 -0.040566929 +3106 1.016657668 +3107 1.154163063 +3108 0.397763505 +3109 -1.662017583 +3110 -0.341456601 +3111 -0.496518616 +3112 0.538861026 +3113 -0.056660618 +3114 -0.170741765 +3115 -0.332559745 +3116 0.354804521 +3117 -0.711620086 +3118 -0.444001426 +3119 0.421308488 +3120 -0.717493815 +3121 0.407602713 +3122 -1.322178355 +3123 0.576121279 +3124 -1.062658482 +3125 0.931684722 +3126 0.218573453 +3127 0.894550892 +3128 0.368405171 +3129 0.528062526 +3130 -0.373710317 +3131 -2.121610534 +3132 -0.987524295 +3133 0.55980073 +3134 -0.073761445 +3135 0.065480847 +3136 -0.341632662 +3137 0.09152681 +3138 1.28522935 +3139 0.842115006 +3140 -1.746373374 +3141 -0.801790004 +3142 1.192914612 +3143 0.439794845 +3144 -0.268123717 +3145 -1.774361423 +3146 0.258935166 +3147 0.351301207 +3148 -0.715434221 +3149 -0.205856524 +3150 0.443869931 +3151 0.020367964 +3152 -0.68396282 +3153 0.118329291 +3154 -1.679168415 +3155 -0.043760816 +3156 0.103186003 +3157 0.425986747 +3158 -1.160382771 +3159 -0.740137362 +3160 0.211706998 +3161 0.474028496 +3162 0.529934802 +3163 0.566156732 +3164 -0.533691075 +3165 -0.940053174 +3166 -0.422494867 +3167 1.001946876 +3168 1.262467531 +3169 -0.458774143 +3170 -0.425917021 +3171 -0.8511515 +3172 0.910417837 +3173 1.225462159 +3174 0.630062534 +3175 -1.094564588 +3176 -1.319667023 +3177 -1.019097828 +3178 -1.494771835 +3179 2.042046822 +3180 0.558746333 +3181 -0.86372764 +3182 -0.855933502 +3183 -0.7965938 +3184 0.326472515 +3185 -0.715010838 +3186 -0.176815621 +3187 0.04554198 +3188 -0.109359873 +3189 1.163253467 +3190 0.47773967 +3191 -1.515947586 +3192 -0.130403542 +3193 2.128643561 +3194 0.295353465 +3195 -1.144970071 +3196 2.267687037 +3197 -0.12825442 +3198 1.153413164 +3199 -2.871145904 +3200 -0.54895895 +3201 -0.762037887 +3202 0.912818345 +3203 -0.481265906 +3204 0.01315407 +3205 1.655777093 +3206 -0.278293897 +3207 0.209215575 +3208 1.780231998 +3209 0.398465532 +3210 -0.443851507 +3211 -0.093667589 +3212 -0.430860889 +3213 1.451448308 +3214 -0.473623071 +3215 0.277089431 +3216 -0.026798673 +3217 -0.74404487 +3218 0.150332828 +3219 -0.444602092 +3220 -0.438062059 +3221 0.066799108 +3222 -0.954891989 +3223 0.006209369 +3224 0.133847196 +3225 1.386216938 +3226 -0.118681154 +3227 -0.163418478 +3228 1.297283275 +3229 -0.76625098 +3230 0.067876717 +3231 -1.753220035 +3232 -0.92804515 +3233 -1.433915694 +3234 -0.94397522 +3235 0.110668898 +3236 -0.402241853 +3237 0.377929855 +3238 0.521116084 +3239 -0.709826224 +3240 0.851147968 +3241 1.52432934 +3242 -1.606365076 +3243 -0.228389314 +3244 -0.757926883 +3245 0.524293182 +3246 -0.182860064 +3247 -1.252972973 +3248 0.275883362 +3249 0.156988392 +3250 0.192384531 +3251 0.437543001 +3252 0.206654178 +3253 1.471859591 +3254 -0.868803346 +3255 -0.077447062 +3256 -1.203781581 +3257 -0.202675822 +3258 0.477512088 +3259 -1.014784007 +3260 -1.274694733 +3261 0.838114737 +3262 -0.135399494 +3263 -0.255242737 +3264 1.307066194 +3265 1.328424105 +3266 -1.015527785 +3267 -1.026741883 +3268 -0.894337532 +3269 -1.11538912 +3270 0.026486749 +3271 -0.207249041 +3272 2.714038847 +3273 -1.389011361 +3274 0.811966694 +3275 1.169582948 +3276 0.473861314 +3277 0.403395523 +3278 0.647451797 +3279 0.00983025 +3280 1.404699449 +3281 1.145131565 +3282 -1.00418689 +3283 0.565561224 +3284 0.091157245 +3285 1.637748262 +3286 0.692433066 +3287 -0.479478573 +3288 1.771126898 +3289 -0.184106094 +3290 1.184024486 +3291 0.374253934 +3292 -1.426998131 +3293 0.137416828 +3294 1.1218916 +3295 -0.878948659 +3296 1.070468109 +3297 -1.6957692 +3298 1.307825 +3299 1.249992208 +3300 -0.319345742 +3301 -1.291523851 +3302 0.730682598 +3303 0.537168562 +3304 1.307763576 +3305 0.892988142 +3306 -0.787098963 +3307 -1.067200084 +3308 0.185630092 +3309 0.592377829 +3310 0.250185568 +3311 -0.82204645 +3312 0.623316299 +3313 0.718097855 +3314 -0.902595011 +3315 1.516874286 +3316 -1.544522786 +3317 -0.307906205 +3318 -0.266486728 +3319 -0.582804723 +3320 -0.967249262 +3321 0.192031112 +3322 0.691815811 +3323 2.039955855 +3324 0.210919246 +3325 1.173417788 +3326 -1.128025116 +3327 1.67274211 +3328 0.49878017 +3329 0.803534029 +3330 -0.818355591 +3331 0.811380958 +3332 -0.036210112 +3333 -1.720620044 +3334 1.157485846 +3335 0.107799885 +3336 -1.350666198 +3337 -0.615029882 +3338 0.203938498 +3339 -1.549771472 +3340 0.371047638 +3341 0.227740766 +3342 -1.343365936 +3343 1.314269721 +3344 -1.153223627 +3345 1.54922686 +3346 0.779630131 +3347 -0.038422054 +3348 -0.145442316 +3349 1.303595436 +3350 0.469927932 +3351 1.090798521 +3352 -0.0673522 +3353 1.137173763 +3354 0.587948195 +3355 -0.118169897 +3356 -0.867730682 +3357 -0.444294307 +3358 -0.130640431 +3359 -0.226116695 +3360 -1.227298157 +3361 0.137162593 +3362 1.133639027 +3363 1.382919567 +3364 -1.04247994 +3365 0.992943794 +3366 0.957685511 +3367 0.623397219 +3368 0.4579835 +3369 -1.010810792 +3370 0.303925917 +3371 0.588581991 +3372 1.268494879 +3373 1.440565382 +3374 0.853772067 +3375 -1.256258394 +3376 -1.635020908 +3377 0.769929659 +3378 0.049686479 +3379 0.926343197 +3380 0.207747601 +3381 -0.479909425 +3382 -0.346488811 +3383 1.363418649 +3384 -0.856611786 +3385 0.208258783 +3386 0.153017911 +3387 -0.675791982 +3388 -0.656266269 +3389 -0.650254423 +3390 -0.694907271 +3391 0.453921184 +3392 0.051894876 +3393 1.358529662 +3394 -0.547435712 +3395 -1.584996157 +3396 1.384469437 +3397 -0.302543658 +3398 1.65504899 +3399 -0.71476593 +3400 0.2280074 +3401 -0.011615686 +3402 -0.263996263 +3403 -2.453069055 +3404 0.106491579 +3405 1.221499958 +3406 -0.287032498 +3407 -0.438386072 +3408 -0.678319009 +3409 -0.486439891 +3410 1.163361225 +3411 -0.242624671 +3412 -0.166798603 +3413 0.242737619 +3414 0.243953964 +3415 0.246613815 +3416 0.602788255 +3417 -0.395550705 +3418 2.454693117 +3419 1.785376156 +3420 1.076530721 +3421 0.222138732 +3422 1.013960165 +3423 1.325791804 +3424 0.136728059 +3425 -0.188133847 +3426 1.194365299 +3427 -1.561776189 +3428 -0.639822336 +3429 -0.006237423 +3430 -0.176893969 +3431 0.345245275 +3432 2.291454006 +3433 -0.797927487 +3434 -0.223119356 +3435 -0.53346876 +3436 -1.702929365 +3437 0.009748202 +3438 0.072539433 +3439 -1.42489478 +3440 0.250203815 +3441 -1.613573377 +3442 -1.714244618 +3443 0.52931129 +3444 0.949661446 +3445 0.728056272 +3446 -1.744591351 +3447 -0.091150686 +3448 -0.212973611 +3449 1.439060492 +3450 -0.025915286 +3451 0.533357628 +3452 -1.068597772 +3453 -0.129456934 +3454 -0.046362633 +3455 0.168527042 +3456 -0.529383912 +3457 -1.84081011 +3458 -1.516666007 +3459 -0.238618399 +3460 -1.338882886 +3461 -0.023145086 +3462 0.695503547 +3463 0.20570244 +3464 -0.551178993 +3465 -0.626753262 +3466 1.322232584 +3467 0.87782082 +3468 -0.215140739 +3469 1.363720101 +3470 -1.889896992 +3471 -2.862076562 +3472 -1.011255204 +3473 0.294254126 +3474 1.42546592 +3475 -0.748993264 +3476 0.107728156 +3477 1.610100555 +3478 0.811066017 +3479 0.188372436 +3480 -0.0156526 +3481 -1.252244591 +3482 -0.570630271 +3483 0.411902962 +3484 -0.53640423 +3485 0.303019382 +3486 0.340675225 +3487 2.000929288 +3488 -0.941714973 +3489 -0.472265563 +3490 1.281154513 +3491 -0.909443441 +3492 -0.393276479 +3493 0.667723728 +3494 -1.354269806 +3495 0.352584766 +3496 -2.225284056 +3497 0.074014313 +3498 0.102012024 +3499 -2.49347176 +3500 -0.489005804 +3501 -1.321086007 +3502 0.179418361 +3503 0.827651156 +3504 -0.654775811 +3505 -1.053178682 +3506 -0.360263259 +3507 -0.291301862 +3508 0.098041515 +3509 -0.380103377 +3510 -0.083422071 +3511 0.127867346 +3512 -1.135990595 +3513 -0.37052871 +3514 -0.613468948 +3515 0.315950532 +3516 -2.100403808 +3517 1.113287732 +3518 0.785557975 +3519 0.652473967 +3520 -2.507872716 +3521 -0.80410345 +3522 0.104954606 +3523 0.116647264 +3524 -1.650105019 +3525 -0.494158777 +3526 -1.271253037 +3527 0.206593962 +3528 0.160589153 +3529 -0.055154347 +3530 -0.51914123 +3531 -0.953284129 +3532 -0.450872115 +3533 -1.540825271 +3534 1.233062121 +3535 0.931289023 +3536 -0.246929565 +3537 1.16493305 +3538 0.072495147 +3539 0.065824666 +3540 -0.574105033 +3541 0.326784881 +3542 0.235494093 +3543 -1.661233505 +3544 0.237162131 +3545 0.130896303 +3546 0.975095989 +3547 0.31082144 +3548 -0.481325655 +3549 -0.476011655 +3550 0.144700704 +3551 0.369049034 +3552 0.700988852 +3553 -1.196280778 +3554 1.976995195 +3555 0.426181179 +3556 0.607264372 +3557 0.185429911 +3558 -0.774948404 +3559 -1.46561725 +3560 -0.276725746 +3561 -1.114819096 +3562 -0.543606441 +3563 -0.297038074 +3564 -0.401276781 +3565 0.629123448 +3566 0.857506572 +3567 -0.270581201 +3568 -0.374373171 +3569 -0.803082026 +3570 -1.220895979 +3571 0.009389999 +3572 0.501850729 +3573 0.859609652 +3574 0.603375464 +3575 0.438652259 +3576 0.197028247 +3577 -0.127800557 +3578 2.058992021 +3579 -0.101879339 +3580 1.168641648 +3581 -0.476932644 +3582 1.974223153 +3583 0.775848288 +3584 1.846385842 +3585 -0.707795945 +3586 -0.049412797 +3587 -0.211790435 +3588 -0.154290219 +3589 0.592975633 +3590 0.671516577 +3591 0.802665431 +3592 0.632465974 +3593 -0.181074814 +3594 1.860350755 +3595 -1.585117594 +3596 0.228128347 +3597 0.598268758 +3598 1.16014915 +3599 0.384168732 +3600 0.246067423 +3601 -1.398574576 +3602 0.528364621 +3603 0.028748628 +3604 1.507942718 +3605 -1.062469567 +3606 0.919349737 +3607 0.183255169 +3608 -0.150326179 +3609 -1.169321099 +3610 0.471789345 +3611 0.060518554 +3612 1.199414946 +3613 0.958418724 +3614 1.027650523 +3615 1.140057945 +3616 -0.907783494 +3617 -0.569416175 +3618 -1.432925933 +3619 0.943672655 +3620 -0.08188434 +3621 2.28046923 +3622 0.184030565 +3623 -0.316600581 +3624 0.288050226 +3625 -0.692567741 +3626 1.068565282 +3627 0.267317154 +3628 -0.224814729 +3629 -0.10806229 +3630 -0.765663768 +3631 0.279836979 +3632 0.284020864 +3633 0.862282006 +3634 0.931282317 +3635 -0.04299917 +3636 0.239372015 +3637 0.738876089 +3638 0.250573484 +3639 0.433762129 +3640 -1.609148649 +3641 0.081724324 +3642 0.215384769 +3643 -0.940713369 +3644 -0.559129462 +3645 -0.083504557 +3646 0.036199897 +3647 -0.206853296 +3648 0.41332639 +3649 -0.935604534 +3650 0.274784831 +3651 -1.576113759 +3652 -0.330248983 +3653 2.457568627 +3654 2.441733281 +3655 -1.039265755 +3656 -1.23662155 +3657 -1.43727201 +3658 0.768993885 +3659 -1.449648414 +3660 -0.65516761 +3661 -1.458938279 +3662 0.511341146 +3663 0.075293049 +3664 -0.435462873 +3665 1.565887971 +3666 1.304430327 +3667 -0.329604291 +3668 2.42003043 +3669 0.355628773 +3670 -0.711796824 +3671 -0.67638943 +3672 -1.33889754 +3673 -0.047464428 +3674 -0.861151011 +3675 -0.915100107 +3676 -1.241390761 +3677 2.107587825 +3678 1.272382446 +3679 -1.288769419 +3680 0.783281241 +3681 -0.287902397 +3682 0.402044264 +3683 -0.888716616 +3684 0.740510759 +3685 -0.739674722 +3686 0.681888397 +3687 -0.244133002 +3688 -1.327591726 +3689 -2.154089403 +3690 0.008793169 +3691 0.835131579 +3692 -0.889854782 +3693 0.167197893 +3694 -0.312903136 +3695 -2.46158028 +3696 -0.368678526 +3697 0.236017075 +3698 -0.463593508 +3699 0.196036489 +3700 -1.380928351 +3701 0.588330749 +3702 1.209242453 +3703 -0.699337785 +3704 0.902743642 +3705 3.120653726 +3706 0.492563937 +3707 0.250927929 +3708 1.592938785 +3709 -0.199029489 +3710 -0.388869744 +3711 0.328348417 +3712 -0.798938614 +3713 -1.753906566 +3714 -0.523305634 +3715 1.631953757 +3716 -0.256616902 +3717 1.495169338 +3718 -1.078197732 +3719 0.199215952 +3720 0.011682613 +3721 -1.422906636 +3722 0.663412423 +3723 0.304180617 +3724 -1.162328818 +3725 -0.440649953 +3726 -0.271511647 +3727 -0.634637601 +3728 -1.265723447 +3729 -0.923105652 +3730 0.744342402 +3731 0.59451026 +3732 0.822234089 +3733 1.424037441 +3734 0.596087367 +3735 -0.316411174 +3736 -0.486439319 +3737 -0.154706813 +3738 0.92586158 +3739 0.822566122 +3740 -0.135648741 +3741 -0.37001192 +3742 1.22278289 +3743 0.302844947 +3744 -1.036532558 +3745 1.653865904 +3746 1.15458381 +3747 0.243178986 +3748 -0.095979334 +3749 1.765969861 +3750 0.597541841 +3751 -1.838092516 +3752 0.060409977 +3753 -0.40013272 +3754 0.742596675 +3755 0.453623335 +3756 -0.483806639 +3757 0.958786261 +3758 -0.857157465 +3759 2.068893981 +3760 2.061594062 +3761 -0.599267072 +3762 -0.410301359 +3763 -0.272119819 +3764 -0.889743486 +3765 0.459313473 +3766 -2.13148346 +3767 -0.022686083 +3768 0.93091079 +3769 -0.592724897 +3770 1.150829142 +3771 1.89191259 +3772 -0.774547413 +3773 -0.020140653 +3774 -0.787116588 +3775 -0.876233978 +3776 -1.24308564 +3777 -1.524409116 +3778 0.798693607 +3779 -0.17359801 +3780 -0.803934233 +3781 -1.965221696 +3782 0.726954853 +3783 -0.404902699 +3784 1.125730936 +3785 -0.011416475 +3786 0.322537374 +3787 -0.774937051 +3788 0.645242074 +3789 -0.301381175 +3790 -0.710290395 +3791 1.215884786 +3792 -0.623977208 +3793 0.317395096 +3794 0.105408035 +3795 0.271056251 +3796 -1.298965691 +3797 0.88179649 +3798 -1.505267687 +3799 0.421336051 +3800 0.514645843 +3801 0.520166428 +3802 -0.344774684 +3803 -0.631384985 +3804 0.402485181 +3805 0.641591645 +3806 0.698494393 +3807 0.124502808 +3808 -1.19875465 +3809 -0.013195424 +3810 -0.598387824 +3811 0.820536589 +3812 2.103347783 +3813 -0.366694485 +3814 0.933660132 +3815 -1.762143293 +3816 1.969292725 +3817 1.208358649 +3818 -0.239673711 +3819 -0.670389155 +3820 1.822925916 +3821 -0.957935989 +3822 -0.642263417 +3823 0.47533235 +3824 0.094055838 +3825 -0.095121027 +3826 1.49839273 +3827 -0.055669777 +3828 1.177386652 +3829 -0.176577164 +3830 0.417799942 +3831 0.69829545 +3832 -0.500162946 +3833 0.748458028 +3834 0.754545762 +3835 0.631003039 +3836 0.171796967 +3837 0.958076871 +3838 -0.085109308 +3839 1.144285043 +3840 1.104098837 +3841 0.321835071 +3842 1.083802913 +3843 -0.175465094 +3844 -2.334344854 +3845 -2.756318035 +3846 1.171984271 +3847 -0.313458462 +3848 0.661587518 +3849 0.479921854 +3850 0.355815978 +3851 0.597210818 +3852 -0.671037052 +3853 -1.556347603 +3854 -2.567437926 +3855 -0.493561886 +3856 -1.417933999 +3857 -0.181740737 +3858 -2.265220459 +3859 -0.054214348 +3860 -0.521075147 +3861 1.119217969 +3862 0.793078864 +3863 -0.332638039 +3864 0.700916811 +3865 -1.520720636 +3866 0.591024964 +3867 1.113551362 +3868 0.600598779 +3869 0.653925559 +3870 -0.325778307 +3871 -1.189985323 +3872 -1.335746396 +3873 -0.152801952 +3874 -0.73873003 +3875 0.361143466 +3876 -1.145806458 +3877 0.506792293 +3878 -0.966727593 +3879 0.095903974 +3880 -0.589977932 +3881 0.244665777 +3882 -1.060802129 +3883 -1.632891786 +3884 0.129528408 +3885 0.566145159 +3886 0.521415033 +3887 2.230218968 +3888 0.070547442 +3889 0.378058167 +3890 0.492228212 +3891 -1.037520965 +3892 -1.563680176 +3893 0.470848221 +3894 -0.393231984 +3895 -1.011543043 +3896 -0.417994393 +3897 1.252572344 +3898 1.367396549 +3899 -0.076755654 +3900 -1.123165167 +3901 1.83863243 +3902 0.659468394 +3903 -1.613828876 +3904 2.137819863 +3905 -0.776158187 +3906 -0.767423147 +3907 -1.498205411 +3908 -1.193841763 +3909 1.055422761 +3910 0.715619377 +3911 0.336018258 +3912 1.468955783 +3913 1.177453251 +3914 1.669597699 +3915 0.372945562 +3916 -0.789194394 +3917 -0.931397853 +3918 0.177265386 +3919 -1.274918115 +3920 0.728533459 +3921 0.321053754 +3922 -1.586213007 +3923 -1.471617507 +3924 1.473065189 +3925 -0.643991045 +3926 -0.481139218 +3927 1.812295497 +3928 0.727209538 +3929 -0.135655458 +3930 0.168567384 +3931 2.877788229 +3932 -0.017972741 +3933 0.10611787 +3934 0.439672986 +3935 0.724280676 +3936 0.48213879 +3937 -1.625407731 +3938 2.340002306 +3939 -0.387257542 +3940 -0.60382151 +3941 0.588769635 +3942 1.662767608 +3943 -0.432388133 +3944 -0.264412437 +3945 2.679347137 +3946 -0.382326951 +3947 0.319439033 +3948 -0.548300992 +3949 0.724482041 +3950 0.414673288 +3951 0.432461939 +3952 -0.425660441 +3953 0.692132656 +3954 0.838413911 +3955 0.234153289 +3956 1.291395877 +3957 1.376295848 +3958 -2.191816939 +3959 0.365472954 +3960 0.671566779 +3961 -0.235506329 +3962 0.341898432 +3963 -0.984706255 +3964 0.071310853 +3965 -2.048392578 +3966 1.413534795 +3967 -0.500409532 +3968 0.825254002 +3969 -0.541807723 +3970 -1.255399156 +3971 0.663513088 +3972 -1.241530461 +3973 1.854033525 +3974 0.891054612 +3975 0.161575011 +3976 -0.635948854 +3977 0.851963715 +3978 0.653977345 +3979 2.301705943 +3980 1.444164351 +3981 0.555059879 +3982 -0.560070896 +3983 0.229496186 +3984 0.508866201 +3985 -1.747275152 +3986 -0.780695959 +3987 0.026163975 +3988 0.366686131 +3989 -2.045712527 +3990 -0.9361885 +3991 1.018094155 +3992 1.06423587 +3993 1.110719002 +3994 -0.371580793 +3995 -0.485542867 +3996 -0.11428997 +3997 1.181367915 +3998 -2.817977316 +3999 0.056737841 +4000 0.519987304 +4001 -0.860772205 +4002 1.064446407 +4003 -0.40218067 +4004 1.573180424 +4005 0.247821946 +4006 -1.451715264 +4007 0.4401337 +4008 0.159914903 +4009 2.494324317 +4010 -0.559078526 +4011 -1.117399721 +4012 -0.915103724 +4013 -0.384731654 +4014 0.791827827 +4015 -0.413873576 +4016 -1.066826482 +4017 -0.214558252 +4018 1.042970595 +4019 1.795867785 +4020 -0.73792781 +4021 0.44047038 +4022 0.831546566 +4023 1.545196321 +4024 1.806567004 +4025 -1.34731355 +4026 -0.270667087 +4027 0.98408258 +4028 0.815271681 +4029 -1.252399628 +4030 0.438140898 +4031 1.505331476 +4032 0.699657968 +4033 -0.389681184 +4034 0.001881974 +4035 0.542718043 +4036 -0.216050421 +4037 -0.135226732 +4038 0.623788659 +4039 -1.790495385 +4040 -2.158656275 +4041 -1.181198869 +4042 2.230796863 +4043 -1.246520072 +4044 0.342547345 +4045 0.004400658 +4046 1.729575789 +4047 -1.251814537 +4048 0.268383504 +4049 1.61733866 +4050 0.863110849 +4051 1.828190845 +4052 -0.120716595 +4053 0.123163563 +4054 0.864383974 +4055 0.680849844 +4056 -1.757330292 +4057 -0.304328753 +4058 1.173193331 +4059 -1.002919674 +4060 -1.547134109 +4061 -0.588217199 +4062 0.609730249 +4063 -0.849206463 +4064 -0.166595413 +4065 0.506645328 +4066 0.728892442 +4067 -2.728664593 +4068 -0.236086599 +4069 -0.997030896 +4070 0.000933148 +4071 -0.461089011 +4072 1.877012661 +4073 -0.289952383 +4074 -1.153174556 +4075 -0.192766605 +4076 -0.083381931 +4077 -0.919351653 +4078 -1.119398458 +4079 1.88257933 +4080 1.904154805 +4081 -0.492495175 +4082 -1.558736306 +4083 -0.112543163 +4084 2.074896692 +4085 0.693537224 +4086 -0.065863797 +4087 1.408790573 +4088 1.456918574 +4089 1.218513847 +4090 0.516711899 +4091 0.540817255 +4092 0.587580151 +4093 -1.44973339 +4094 -0.632415845 +4095 -0.696928618 +4096 0.738742193 +4097 -0.361456933 +4098 -0.611036848 +4099 -1.354584857 +4100 0.834172336 +4101 1.308046486 +4102 0.453864641 +4103 0.422034968 +4104 -1.216792096 +4105 -4.000263287 +4106 -0.85983795 +4107 -0.130052337 +4108 -1.447103582 +4109 -0.267868163 +4110 -0.012492859 +4111 0.074635317 +4112 -0.323071859 +4113 1.660677116 +4114 -1.199667702 +4115 1.561810788 +4116 -1.833599014 +4117 -0.343860722 +4118 0.230359303 +4119 0.725676106 +4120 0.38638206 +4121 -0.044798771 +4122 0.745467252 +4123 1.580356543 +4124 0.357097159 +4125 -0.806176798 +4126 -0.123135415 +4127 -2.113611683 +4128 -0.006357575 +4129 0.8340264 +4130 0.910656973 +4131 -0.07264445 +4132 -0.608277831 +4133 0.325080852 +4134 0.80411108 +4135 1.837007748 +4136 1.552420112 +4137 0.297980114 +4138 0.018726399 +4139 0.574737088 +4140 -0.382239796 +4141 -0.580729197 +4142 -1.16058727 +4143 -0.670732268 +4144 0.18067945 +4145 0.421799628 +4146 0.21804044 +4147 0.247558429 +4148 0.753045162 +4149 1.767829983 +4150 0.349291379 +4151 -1.225530788 +4152 0.207052605 +4153 0.429712593 +4154 0.060213325 +4155 0.291020003 +4156 0.068444521 +4157 0.366074313 +4158 0.56909319 +4159 1.101906771 +4160 -1.096500239 +4161 0.566519746 +4162 0.61108549 +4163 -0.228699901 +4164 -0.843354728 +4165 -1.07205514 +4166 -2.910164511 +4167 1.050809065 +4168 0.940164058 +4169 -1.978124033 +4170 0.540188153 +4171 0.34383292 +4172 0.302345186 +4173 -1.466482415 +4174 1.229026054 +4175 -0.010065523 +4176 1.687786341 +4177 -0.941611186 +4178 -0.793947314 +4179 0.796541462 +4180 0.377252647 +4181 0.105856776 +4182 0.924991875 +4183 0.537564827 +4184 -2.086254677 +4185 1.159667891 +4186 0.732669319 +4187 -1.912835239 +4188 0.201765978 +4189 -0.737874625 +4190 0.056725222 +4191 0.328896974 +4192 -0.116508481 +4193 -0.179283177 +4194 -0.858791784 +4195 0.707318558 +4196 -0.352071017 +4197 0.106606792 +4198 1.124296545 +4199 -1.225984992 +4200 -0.747831775 +4201 -2.219784288 +4202 1.751757833 +4203 0.452283054 +4204 0.870319193 +4205 0.036988402 +4206 0.096318995 +4207 -0.58284027 +4208 -0.043375196 +4209 0.146744732 +4210 -0.402611362 +4211 -0.031862158 +4212 0.481401604 +4213 -0.048397118 +4214 -0.661390953 +4215 -0.597546798 +4216 0.126347547 +4217 3.772044958 +4218 1.244020958 +4219 1.86802006 +4220 0.038003154 +4221 -1.194223992 +4222 0.327126958 +4223 -0.803408353 +4224 1.997144432 +4225 0.448986825 +4226 -0.569160382 +4227 0.385177381 +4228 1.099949183 +4229 0.048450799 +4230 -1.173381649 +4231 1.768271811 +4232 -0.126846282 +4233 -0.610673747 +4234 1.574743844 +4235 -0.847238041 +4236 -0.347748493 +4237 1.331658009 +4238 -0.836086274 +4239 0.07422453 +4240 -2.152157303 +4241 -1.038478566 +4242 -0.190756925 +4243 -1.414360184 +4244 -0.981393425 +4245 2.615128325 +4246 1.007904523 +4247 0.56155192 +4248 -0.616849853 +4249 -1.447046789 +4250 0.138784163 +4251 -2.024928479 +4252 -0.690765708 +4253 0.731744479 +4254 0.426734255 +4255 -0.133569108 +4256 -0.046201988 +4257 -0.776879138 +4258 -0.589345271 +4259 -1.008726557 +4260 -2.991653335 +4261 -0.09265099 +4262 -0.147611769 +4263 0.904436055 +4264 1.147672865 +4265 -1.326494913 +4266 -0.757619424 +4267 0.166375984 +4268 -0.321384102 +4269 -0.193280118 +4270 -1.34894192 +4271 -1.911835873 +4272 -1.321526341 +4273 -1.320148384 +4274 1.516536911 +4275 -0.344457438 +4276 0.474309409 +4277 -0.201356145 +4278 -0.099605938 +4279 1.329257497 +4280 0.79438175 +4281 -0.75611226 +4282 0.394039341 +4283 0.754883021 +4284 -0.705527364 +4285 -0.003634629 +4286 -0.150393852 +4287 0.469485572 +4288 0.879297642 +4289 1.293565263 +4290 -1.65981301 +4291 0.192666979 +4292 -0.707457819 +4293 -0.237714372 +4294 -0.583779981 +4295 1.539832764 +4296 -0.535849965 +4297 1.438418385 +4298 0.939904811 +4299 -1.351156887 +4300 0.430264371 +4301 -0.776787683 +4302 0.195879654 +4303 0.481642477 +4304 0.168412983 +4305 0.225455338 +4306 1.71497683 +4307 -1.439061579 +4308 0.705993251 +4309 -0.398038172 +4310 2.088671737 +4311 -0.57170232 +4312 0.327315159 +4313 1.939379529 +4314 0.857258672 +4315 0.790738285 +4316 -1.976685252 +4317 -0.295419255 +4318 -0.084616786 +4319 0.186754853 +4320 -1.212238319 +4321 -0.580554849 +4322 -0.569767463 +4323 -0.683453724 +4324 -0.521981545 +4325 -1.283362991 +4326 -0.444248875 +4327 0.721415628 +4328 -0.402902657 +4329 -0.585991355 +4330 0.010916888 +4331 0.293698832 +4332 0.936145243 +4333 -1.794982879 +4334 0.434351309 +4335 1.94600273 +4336 0.104999294 +4337 -0.769814387 +4338 -0.201967924 +4339 0.989077071 +4340 -1.376273747 +4341 -0.827621211 +4342 -0.145935581 +4343 -0.84107668 +4344 -1.733515711 +4345 -0.532355108 +4346 -1.776001017 +4347 -0.744035213 +4348 -1.444394705 +4349 1.451040618 +4350 -0.295310801 +4351 0.445154216 +4352 0.046416413 +4353 -1.282954729 +4354 -0.248326907 +4355 0.516028638 +4356 -0.602572487 +4357 -0.244424377 +4358 -0.545556435 +4359 0.730077672 +4360 -2.500958155 +4361 -1.569035773 +4362 0.279212478 +4363 0.915123564 +4364 -0.579093417 +4365 -0.426643464 +4366 1.877803416 +4367 -0.47413369 +4368 -0.373006307 +4369 -0.412973838 +4370 1.559799196 +4371 0.392011137 +4372 -0.867967407 +4373 0.162108997 +4374 -0.167354019 +4375 1.155405756 +4376 -0.162520828 +4377 -0.188444495 +4378 -0.495731158 +4379 -0.356549881 +4380 -0.657780215 +4381 1.069234577 +4382 1.022454793 +4383 1.105333933 +4384 -0.78024183 +4385 -0.094236608 +4386 -1.6431153 +4387 0.697919856 +4388 -1.146320962 +4389 0.102595526 +4390 0.401177902 +4391 2.204006175 +4392 1.458648637 +4393 0.727744593 +4394 0.121085886 +4395 2.818306076 +4396 0.096743629 +4397 -0.625712401 +4398 -0.230617683 +4399 -0.28941292 +4400 -1.314697098 +4401 -1.267031513 +4402 0.328700667 +4403 0.53346196 +4404 0.094957124 +4405 -0.755935751 +4406 1.885460268 +4407 0.223282025 +4408 -0.424319707 +4409 -0.354216853 +4410 1.455914313 +4411 -1.259461678 +4412 1.460268115 +4413 1.620042619 +4414 0.147427311 +4415 -0.275690551 +4416 1.93187167 +4417 0.593019155 +4418 -0.091873094 +4419 0.041033009 +4420 -1.38862848 +4421 -0.464961378 +4422 -0.636679673 +4423 -0.189673944 +4424 -0.902206141 +4425 1.884901494 +4426 -0.980954424 +4427 0.18151574 +4428 -1.221160557 +4429 -0.152339237 +4430 -0.438623018 +4431 -1.083926677 +4432 -1.54667844 +4433 -0.753025169 +4434 -1.45111007 +4435 2.181929869 +4436 -0.88915552 +4437 -0.340660248 +4438 -0.015007512 +4439 1.442692811 +4440 0.474468408 +4441 0.939656858 +4442 0.801852308 +4443 -1.358361542 +4444 -0.903292607 +4445 0.740760517 +4446 0.879422929 +4447 -0.758865828 +4448 0.375083256 +4449 -0.094255766 +4450 -1.327555106 +4451 0.405914297 +4452 0.600894215 +4453 0.075363307 +4454 -0.388545282 +4455 0.718095489 +4456 0.325433147 +4457 -0.263692057 +4458 -2.383337942 +4459 0.039583741 +4460 0.976464449 +4461 -0.794863694 +4462 -1.150564045 +4463 0.231705544 +4464 -1.275915797 +4465 1.244454504 +4466 0.207208758 +4467 -2.159896229 +4468 1.368936143 +4469 -0.016905458 +4470 1.117863386 +4471 -1.663211243 +4472 1.865761641 +4473 1.328106306 +4474 0.251483295 +4475 -0.695850286 +4476 0.774718383 +4477 -0.732216863 +4478 0.513056678 +4479 0.892828663 +4480 -2.28536014 +4481 -1.874426657 +4482 -1.664323561 +4483 -1.748602947 +4484 2.092263276 +4485 -0.283981393 +4486 -1.014428223 +4487 -1.514111553 +4488 -0.519070711 +4489 2.499691587 +4490 0.386937675 +4491 0.831520949 +4492 -2.250232975 +4493 -0.608405967 +4494 0.792331551 +4495 0.861482229 +4496 1.452911558 +4497 0.686237381 +4498 0.078723328 +4499 -0.149609421 +4500 0.348140474 +4501 0.945176947 +4502 -1.196684107 +4503 0.540603975 +4504 1.888521371 +4505 0.450497508 +4506 0.186993845 +4507 -1.001665493 +4508 0.404682677 +4509 0.3422847 +4510 0.19792159 +4511 -1.353025186 +4512 -1.192965778 +4513 -0.03434994 +4514 -0.473705097 +4515 -0.775596988 +4516 1.081800051 +4517 0.449274741 +4518 0.123333965 +4519 -2.679369365 +4520 -0.650252164 +4521 0.367189854 +4522 0.512288185 +4523 -0.835290029 +4524 0.526306585 +4525 -0.083369904 +4526 0.652427399 +4527 1.511889104 +4528 -0.639102244 +4529 -0.8372011 +4530 -0.458210305 +4531 0.17850486 +4532 0.519577539 +4533 -0.693080826 +4534 2.230617807 +4535 0.750747531 +4536 1.425335576 +4537 1.335085027 +4538 -0.039384819 +4539 -0.522587506 +4540 -0.266787202 +4541 1.497568957 +4542 -1.080552165 +4543 1.94581472 +4544 0.799702542 +4545 0.734252271 +4546 0.891437376 +4547 -1.053982721 +4548 -0.943228459 +4549 2.446102674 +4550 -1.03842509 +4551 -0.259794116 +4552 0.268556632 +4553 0.491630541 +4554 -0.564547081 +4555 1.131251661 +4556 -0.578473883 +4557 -0.12011552 +4558 -1.012423496 +4559 -1.287495199 +4560 1.772567102 +4561 2.392627803 +4562 0.196504379 +4563 0.457791383 +4564 0.314873994 +4565 -0.504231137 +4566 0.712799217 +4567 2.695489907 +4568 -0.206382794 +4569 -0.144212464 +4570 0.547054531 +4571 -0.440960713 +4572 0.356219445 +4573 -0.642407654 +4574 1.673561283 +4575 0.382348541 +4576 1.982263775 +4577 0.6452742 +4578 -0.262958584 +4579 0.247435641 +4580 -0.528821639 +4581 -0.484106577 +4582 1.03460603 +4583 0.274286305 +4584 -0.695644202 +4585 -1.644565325 +4586 0.654754529 +4587 -0.799053346 +4588 0.523094354 +4589 -0.675352679 +4590 0.708392964 +4591 0.118114181 +4592 0.306405573 +4593 0.212302581 +4594 0.959542286 +4595 0.64127794 +4596 0.088336818 +4597 0.679904336 +4598 -0.775081705 +4599 -0.171586495 +4600 0.75060229 +4601 -0.460925761 +4602 2.2576706 +4603 0.439591664 +4604 -0.479399599 +4605 0.807672327 +4606 -2.650096632 +4607 0.573237352 +4608 0.493360962 +4609 1.498499983 +4610 0.871263385 +4611 0.875508178 +4612 0.219942954 +4613 -0.439556825 +4614 -0.18090777 +4615 -1.01615646 +4616 1.328784276 +4617 0.143497667 +4618 0.029567528 +4619 0.079387817 +4620 0.815925801 +4621 2.547350965 +4622 -0.31211668 +4623 0.712722951 +4624 0.190696983 +4625 0.934896809 +4626 -0.968833964 +4627 -0.481059743 +4628 0.935553296 +4629 -0.859586615 +4630 -0.133213508 +4631 0.846494679 +4632 -1.230525673 +4633 -0.175338337 +4634 0.536562588 +4635 0.562665243 +4636 2.536101102 +4637 -1.790827276 +4638 -0.660118763 +4639 1.851931268 +4640 0.786147797 +4641 1.034338101 +4642 0.45014959 +4643 -0.683011 +4644 -0.086861242 +4645 -0.316962818 +4646 -0.258909339 +4647 -0.843320784 +4648 0.574079356 +4649 0.424887154 +4650 0.59359596 +4651 0.204081177 +4652 -1.004480564 +4653 -0.038173584 +4654 1.514390531 +4655 0.447668374 +4656 0.665693031 +4657 1.096725389 +4658 -0.53132251 +4659 0.190228787 +4660 0.068187654 +4661 -0.769890938 +4662 0.454511917 +4663 -0.221013735 +4664 -1.316300133 +4665 -1.61875535 +4666 0.804151669 +4667 1.099987767 +4668 -1.484283662 +4669 1.110025176 +4670 0.058340254 +4671 -0.977410147 +4672 1.791397957 +4673 -0.391403491 +4674 0.48547575 +4675 -0.863026858 +4676 0.586080466 +4677 1.943787868 +4678 -0.235947822 +4679 -0.604755307 +4680 -2.717401512 +4681 -0.791118204 +4682 -0.265294567 +4683 -0.57639986 +4684 0.290050611 +4685 -0.354913487 +4686 -1.978084067 +4687 0.810688484 +4688 0.869273026 +4689 -0.443997124 +4690 -2.284316649 +4691 0.317816565 +4692 1.271577797 +4693 -0.562210234 +4694 -0.834224845 +4695 -0.229258038 +4696 1.937589908 +4697 -0.61021538 +4698 0.083770601 +4699 -0.627158307 +4700 -1.586615945 +4701 -0.064501877 +4702 -0.706858888 +4703 -0.522706848 +4704 1.708300205 +4705 -1.269340065 +4706 -0.283883391 +4707 -0.512414768 +4708 1.879029753 +4709 -1.422291227 +4710 -0.963228144 +4711 0.053777604 +4712 -0.731107196 +4713 -1.233489619 +4714 1.921351851 +4715 -0.15692672 +4716 0.067937741 +4717 -0.17676985 +4718 -1.90323524 +4719 -1.183038301 +4720 0.327732584 +4721 -1.553469397 +4722 -1.059830235 +4723 0.129612396 +4724 0.317038256 +4725 -0.636076203 +4726 1.381767544 +4727 0.304720718 +4728 -1.464481574 +4729 0.435629035 +4730 -0.59276313 +4731 -1.186579377 +4732 -2.65984733 +4733 1.47146543 +4734 0.181709565 +4735 -0.973926368 +4736 0.129366276 +4737 1.161054186 +4738 -0.098808255 +4739 0.009552781 +4740 -0.219986657 +4741 0.538710295 +4742 0.531078191 +4743 -0.219601527 +4744 -1.238876162 +4745 0.09167279 +4746 -0.646262273 +4747 2.106051992 +4748 0.220917554 +4749 -0.075490444 +4750 1.322588036 +4751 -0.574603662 +4752 1.948116472 +4753 2.458962646 +4754 0.74134174 +4755 0.141558728 +4756 -0.635600062 +4757 1.099576039 +4758 -0.495086261 +4759 0.936364942 +4760 0.509192287 +4761 0.355692576 +4762 0.107551392 +4763 -2.06195429 +4764 -1.561466873 +4765 -0.594623437 +4766 0.122600381 +4767 -0.035194297 +4768 -0.474291919 +4769 -0.464652274 +4770 0.514882548 +4771 -0.911489229 +4772 -0.103556225 +4773 0.135935508 +4774 -0.560801939 +4775 -0.534995535 +4776 -1.263575722 +4777 0.986404016 +4778 1.38685767 +4779 -0.385151068 +4780 -1.37997992 +4781 -0.356466138 +4782 -0.737252471 +4783 1.580975883 +4784 -0.09758729 +4785 -0.121770271 +4786 0.825004011 +4787 0.738166062 +4788 -1.218130896 +4789 -0.402958489 +4790 -2.132847491 +4791 0.993825836 +4792 1.193778206 +4793 0.686637769 +4794 0.609850342 +4795 0.550128027 +4796 1.784632934 +4797 1.371150277 +4798 -0.947127019 +4799 -0.020018948 +4800 0.77225844 +4801 -0.061649207 +4802 -2.068989832 +4803 -0.256441584 +4804 1.422410483 +4805 -0.608050604 +4806 0.240519073 +4807 -0.351949932 +4808 0.197221525 +4809 -0.108854334 +4810 0.115840243 +4811 0.295110178 +4812 0.613876975 +4813 0.454041425 +4814 0.355883537 +4815 1.650472457 +4816 -0.214247302 +4817 -0.541016778 +4818 -0.494342213 +4819 0.623633105 +4820 0.48775803 +4821 -1.548306462 +4822 -1.354596452 +4823 1.050083687 +4824 0.319355087 +4825 0.169298726 +4826 -0.061333359 +4827 0.783072998 +4828 -0.20325749 +4829 -0.445050918 +4830 0.115757126 +4831 -0.294046432 +4832 0.342774869 +4833 1.174864882 +4834 -0.308483499 +4835 0.8386003 +4836 0.209708896 +4837 1.86825829 +4838 0.414798604 +4839 0.093867133 +4840 0.154598572 +4841 -0.587651233 +4842 0.328937899 +4843 -0.786673423 +4844 0.360589687 +4845 -0.790966365 +4846 1.140999338 +4847 0.703618455 +4848 1.624023998 +4849 -0.867044664 +4850 -0.053043026 +4851 -0.240018745 +4852 -0.854183293 +4853 -0.103447001 +4854 -1.156529432 +4855 -1.507806498 +4856 0.690548192 +4857 0.255605152 +4858 -2.573491806 +4859 2.257459237 +4860 -0.150025276 +4861 0.44614994 +4862 -0.809864149 +4863 -1.317431611 +4864 0.806137537 +4865 -1.300525667 +4866 -0.813206414 +4867 -1.219292695 +4868 -0.246625207 +4869 -0.119286396 +4870 -0.727601921 +4871 -1.024897591 +4872 -0.135793664 +4873 2.112369907 +4874 -0.491009603 +4875 0.602783052 +4876 0.692435226 +4877 0.306366277 +4878 -0.003850173 +4879 -0.549710804 +4880 0.167732733 +4881 -0.279159717 +4882 0.784074853 +4883 0.496654499 +4884 0.163171214 +4885 1.46993281 +4886 -1.344972044 +4887 -0.495697987 +4888 -1.374394188 +4889 0.525565207 +4890 -1.718033856 +4891 -1.274326157 +4892 -1.179341205 +4893 -1.080621449 +4894 0.542869554 +4895 0.081431318 +4896 -1.293594394 +4897 -0.319153592 +4898 0.609450834 +4899 -0.155944382 +4900 2.03956856 +4901 -1.392672904 +4902 -1.520662743 +4903 0.144841104 +4904 0.988736587 +4905 1.348447129 +4906 -2.556887314 +4907 0.404222687 +4908 -0.843334102 +4909 0.004677711 +4910 -1.110580222 +4911 -0.221459826 +4912 -0.001553207 +4913 0.840011507 +4914 -0.053301234 +4915 -1.252316471 +4916 -0.371274302 +4917 0.201060967 +4918 1.739561447 +4919 0.509900878 +4920 0.370069993 +4921 0.997370398 +4922 -1.676558655 +4923 -0.347653587 +4924 0.467927918 +4925 0.632424357 +4926 -1.247304878 +4927 -0.049387837 +4928 -0.196787901 +4929 -0.403675738 +4930 -0.208750085 +4931 0.623074753 +4932 -0.60900144 +4933 -0.279758295 +4934 0.032838023 +4935 -0.395234053 +4936 0.116930293 +4937 1.293149386 +4938 -1.156537764 +4939 0.654238088 +4940 0.470188074 +4941 0.626961153 +4942 -1.934336007 +4943 -0.948983699 +4944 -1.39081792 +4945 -0.685466271 +4946 -1.493673372 +4947 -2.159878394 +4948 1.144794834 +4949 1.480103636 +4950 1.571313351 +4951 -0.182462914 +4952 -0.127183878 +4953 1.267335027 +4954 0.798584376 +4955 0.382585536 +4956 0.395788727 +4957 1.661184443 +4958 1.451687712 +4959 0.606047852 +4960 0.779630953 +4961 -0.588774334 +4962 -1.882189047 +4963 -1.628209131 +4964 0.151367682 +4965 0.741744293 +4966 -1.04471943 +4967 -0.333154264 +4968 -0.645599467 +4969 -0.293837108 +4970 1.746841687 +4971 0.395692452 +4972 -2.142521218 +4973 -0.88480443 +4974 0.091396467 +4975 2.697334106 +4976 -2.392649254 +4977 -0.85732911 +4978 1.619608228 +4979 -0.148679982 +4980 0.035143834 +4981 0.349454275 +4982 0.011357834 +4983 1.248925789 +4984 -0.138895465 +4985 0.26011409 +4986 -1.401690459 +4987 -1.483107607 +4988 -0.97495844 +4989 -0.319840691 +4990 2.174492207 +4991 0.05086246 +4992 1.962835317 +4993 -0.403347861 +4994 0.542689796 +4995 0.947824383 +4996 0.473323056 +4997 0.679063293 +4998 -0.791764976 +4999 0.899501581 +5000 0.806412343 +5001 -0.655375543 +5002 -0.558761225 +5003 -1.242051244 +5004 -0.497642105 +5005 -1.355308711 +5006 -0.156574933 +5007 -0.266460361 +5008 -0.1148038 +5009 -1.289032837 +5010 0.538273002 +5011 0.544589964 +5012 -0.018884616 +5013 -0.243527754 +5014 2.72942441 +5015 -0.696912424 +5016 0.424690001 +5017 -0.762378758 +5018 0.118170087 +5019 -0.099152858 +5020 -0.561578091 +5021 0.728417128 +5022 0.201099263 +5023 -0.903212361 +5024 0.737415432 +5025 1.734177645 +5026 -1.401785813 +5027 1.648168925 +5028 -1.596523371 +5029 1.059377493 +5030 0.945206942 +5031 0.359768037 +5032 -0.016137309 +5033 0.721174934 +5034 -1.505512422 +5035 0.229368442 +5036 -0.266618392 +5037 0.685996487 +5038 -1.510645 +5039 -0.153105977 +5040 -0.100227766 +5041 0.77583097 +5042 -1.019493165 +5043 -0.196914874 +5044 -0.437845362 +5045 1.141312798 +5046 1.038182694 +5047 1.373413467 +5048 0.73428031 +5049 -1.221400405 +5050 -0.723123256 +5051 -1.895392235 +5052 -1.396400824 +5053 -0.771969169 +5054 0.462478196 +5055 -0.369909217 +5056 -0.251198997 +5057 -1.526095453 +5058 0.680572658 +5059 0.002702591 +5060 -0.367112265 +5061 0.534149581 +5062 1.111505325 +5063 -0.114700186 +5064 0.242306947 +5065 -0.433046524 +5066 1.274786988 +5067 0.316632557 +5068 0.445379736 +5069 1.496753132 +5070 0.385128154 +5071 1.398525186 +5072 0.780739872 +5073 0.142213881 +5074 -0.474921489 +5075 1.126335427 +5076 0.8252843 +5077 -0.313268634 +5078 0.683971844 +5079 0.541819922 +5080 0.1679243 +5081 0.323339973 +5082 -0.995641553 +5083 -2.307314296 +5084 0.379483568 +5085 0.206253542 +5086 -0.088374455 +5087 -1.995023133 +5088 2.54436503 +5089 -0.223762899 +5090 -2.007209956 +5091 -0.199810259 +5092 1.188583287 +5093 -0.023713129 +5094 -2.556764789 +5095 0.696531805 +5096 0.491433717 +5097 -1.454234369 +5098 -0.227310273 +5099 0.530798319 +5100 0.613453015 +5101 -0.659154725 +5102 -0.405118522 +5103 0.903500206 +5104 1.771935792 +5105 0.970412111 +5106 -0.575894094 +5107 -0.189393781 +5108 -2.178283683 +5109 0.800919036 +5110 0.642382044 +5111 1.170804784 +5112 -0.361519143 +5113 0.411311542 +5114 -0.522444316 +5115 -2.682638412 +5116 0.969042421 +5117 1.164812056 +5118 0.5247565 +5119 0.003848097 +5120 -0.116657542 +5121 -0.405394935 +5122 0.992966288 +5123 0.760419536 +5124 -0.283180592 +5125 1.120307342 +5126 -0.00159208 +5127 -0.986318988 +5128 -0.185882187 +5129 0.748596569 +5130 1.040748805 +5131 2.02415306 +5132 -0.766313119 +5133 0.852737956 +5134 -0.019301796 +5135 1.948077822 +5136 -0.706983253 +5137 -1.437753167 +5138 -2.195893437 +5139 -0.903145255 +5140 1.340285659 +5141 -0.774264123 +5142 -0.932755201 +5143 0.083519974 +5144 -1.002807308 +5145 -0.51139473 +5146 0.429813983 +5147 1.502551065 +5148 -1.761268016 +5149 -0.15274682 +5150 -0.471837127 +5151 -0.915566642 +5152 -0.45820331 +5153 -0.689587603 +5154 -0.311197682 +5155 -0.741133978 +5156 1.090439585 +5157 -0.137032213 +5158 -0.860079066 +5159 0.057729263 +5160 0.428870417 +5161 -0.466101588 +5162 -1.017785301 +5163 1.160750963 +5164 0.244730807 +5165 -0.26404409 +5166 -1.376650118 +5167 -1.728539627 +5168 0.925316911 +5169 0.407220883 +5170 -0.859160159 +5171 -1.851891582 +5172 0.945320251 +5173 1.259945007 +5174 -0.498018376 +5175 0.641972152 +5176 -0.238192806 +5177 0.28739518 +5178 -0.684368548 +5179 1.623261326 +5180 1.539102216 +5181 0.626051511 +5182 -0.336663704 +5183 -0.134463628 +5184 -1.221334854 +5185 0.312024348 +5186 0.785135638 +5187 -0.17780996 +5188 0.716304096 +5189 -0.370044817 +5190 -1.475689436 +5191 0.355580687 +5192 -1.0192203 +5193 -1.753951578 +5194 -0.02385321 +5195 -0.999285813 +5196 2.548017684 +5197 -0.268825032 +5198 0.040495422 +5199 -0.424582108 +5200 0.26670514 +5201 0.425222716 +5202 0.171664128 +5203 1.125565912 +5204 -0.993640218 +5205 0.767340465 +5206 0.34706682 +5207 1.011395174 +5208 -1.09091662 +5209 -0.813155661 +5210 -1.613758877 +5211 1.199509463 +5212 -0.364612891 +5213 -0.5980292 +5214 0.188791818 +5215 -0.103150673 +5216 -1.138113055 +5217 -0.971544958 +5218 1.650336711 +5219 -1.237995397 +5220 -1.54940093 +5221 -0.786640605 +5222 1.310542803 +5223 -0.878056012 +5224 -0.739267972 +5225 1.920261625 +5226 0.607674875 +5227 -0.595259581 +5228 -1.422154792 +5229 0.113151861 +5230 -0.860829626 +5231 0.922911375 +5232 0.197826822 +5233 0.179286168 +5234 -1.934511015 +5235 0.85344884 +5236 -0.364359343 +5237 0.314214513 +5238 0.051497113 +5239 -0.256946736 +5240 0.33045435 +5241 -0.419666704 +5242 1.505649185 +5243 -0.133232865 +5244 2.239060189 +5245 1.314828473 +5246 0.537645012 +5247 -0.975042041 +5248 0.528378403 +5249 1.540139322 +5250 -0.687361426 +5251 0.308126254 +5252 0.53995158 +5253 -0.63968911 +5254 0.217616921 +5255 0.384149095 +5256 0.870898292 +5257 -0.822838343 +5258 -0.344885544 +5259 0.927078196 +5260 -0.057024966 +5261 -0.875697365 +5262 1.406329433 +5263 2.371139775 +5264 0.185072646 +5265 -0.26297869 +5266 -1.065602254 +5267 -1.274726353 +5268 -1.282870941 +5269 -0.11104239 +5270 -1.021014444 +5271 -0.700140789 +5272 -0.788503663 +5273 -0.748875298 +5274 1.960717443 +5275 0.235263974 +5276 -0.168451414 +5277 -0.816878623 +5278 1.017962531 +5279 1.638109353 +5280 -1.075729123 +5281 0.598030239 +5282 -0.802563599 +5283 -0.026428899 +5284 -0.068244442 +5285 -0.444586051 +5286 0.601750301 +5287 -1.123378818 +5288 0.274091938 +5289 0.761081534 +5290 1.030767572 +5291 -0.403629349 +5292 -0.749655548 +5293 -0.606828921 +5294 -0.476735142 +5295 0.402903726 +5296 -0.712640236 +5297 1.41049964 +5298 1.029431273 +5299 -1.373676421 +5300 1.007358718 +5301 0.775953078 +5302 -0.659062703 +5303 -1.050094763 +5304 -0.525167905 +5305 -1.54158595 +5306 -0.945188587 +5307 -0.563198127 +5308 -1.217490431 +5309 -1.038940711 +5310 -0.534052935 +5311 0.57473354 +5312 -0.31697503 +5313 -1.982733537 +5314 -0.461750231 +5315 0.511171208 +5316 1.006993352 +5317 2.430151212 +5318 0.508244089 +5319 -0.462998322 +5320 2.609571746 +5321 0.106903768 +5322 -0.103138702 +5323 0.533195466 +5324 -1.250378291 +5325 -1.918480544 +5326 -1.942992566 +5327 1.10889245 +5328 -2.065275162 +5329 1.871041731 +5330 -0.176960566 +5331 -1.587150811 +5332 -0.21958475 +5333 -0.775919868 +5334 1.297157476 +5335 1.115883722 +5336 0.575973094 +5337 -1.092007565 +5338 -0.481294904 +5339 -1.414632559 +5340 -1.688575847 +5341 -0.492199693 +5342 0.429881233 +5343 0.669588501 +5344 1.078735468 +5345 1.632645876 +5346 0.071368523 +5347 1.849657841 +5348 0.884698001 +5349 0.074910809 +5350 0.200092881 +5351 -1.157850173 +5352 -0.949423982 +5353 0.580385224 +5354 -0.590240728 +5355 1.633778604 +5356 -0.754754424 +5357 -0.790502947 +5358 0.281043415 +5359 -2.246096191 +5360 0.863086153 +5361 -0.753147742 +5362 0.452422015 +5363 1.49195447 +5364 -1.508429454 +5365 -0.107176775 +5366 1.032806943 +5367 -0.26556557 +5368 -1.831187649 +5369 0.940456161 +5370 0.053941087 +5371 -0.299670963 +5372 -0.21959414 +5373 0.330176038 +5374 1.211499472 +5375 -0.298372176 +5376 0.06147773 +5377 -0.353311932 +5378 -0.517449759 +5379 0.676143634 +5380 1.467891161 +5381 0.679937327 +5382 1.316953477 +5383 -0.081740234 +5384 0.238917888 +5385 -0.483790879 +5386 0.197572373 +5387 0.359783896 +5388 -0.158274688 +5389 0.091530013 +5390 0.131032175 +5391 1.270664052 +5392 1.621074145 +5393 0.023003032 +5394 -1.366261598 +5395 -0.619596985 +5396 -0.802054676 +5397 -1.046532993 +5398 -1.668116231 +5399 0.851237786 +5400 2.866516648 +5401 -0.368249748 +5402 -0.008930262 +5403 -1.156184357 +5404 -0.20415471 +5405 -0.778174203 +5406 -0.446289354 +5407 -0.738809132 +5408 -0.451401352 +5409 -0.412394425 +5410 0.356922869 +5411 -1.564307192 +5412 -3.126519418 +5413 1.301366319 +5414 0.843540504 +5415 -2.045818343 +5416 1.496724989 +5417 0.283268889 +5418 -1.528425949 +5419 -0.447089285 +5420 -1.085789656 +5421 0.549989121 +5422 -1.062393332 +5423 0.54687141 +5424 0.307210195 +5425 -1.261489635 +5426 -0.606916912 +5427 0.872593428 +5428 1.396489304 +5429 -1.937165574 +5430 -0.678574158 +5431 -1.14433013 +5432 -0.555463062 +5433 -0.398137249 +5434 -2.58764335 +5435 1.71375784 +5436 -0.275743547 +5437 1.589492444 +5438 -1.609012158 +5439 0.083542678 +5440 -1.684738452 +5441 0.791647134 +5442 -0.504596071 +5443 0.375961858 +5444 0.290946275 +5445 0.348984444 +5446 -0.061245946 +5447 1.116640553 +5448 0.166530834 +5449 -0.052998741 +5450 -2.416360628 +5451 -0.475295905 +5452 0.844764206 +5453 -0.33314666 +5454 -0.421301807 +5455 -1.224573308 +5456 -1.459516138 +5457 -1.305538873 +5458 0.27712917 +5459 -0.733593666 +5460 0.383140537 +5461 -0.250302712 +5462 -0.616218953 +5463 1.34277686 +5464 -1.306529459 +5465 -1.003230698 +5466 -0.013881591 +5467 0.74738569 +5468 0.391166037 +5469 1.543855067 +5470 -0.849332091 +5471 -0.051699839 +5472 1.137261531 +5473 1.278023686 +5474 -0.995877837 +5475 1.309880932 +5476 1.975951621 +5477 -0.775859878 +5478 -0.668642408 +5479 0.055295168 +5480 0.506298797 +5481 -0.178425133 +5482 -1.145816282 +5483 2.045091661 +5484 -1.417747981 +5485 -0.121700478 +5486 -0.018165416 +5487 0.980639538 +5488 0.035796824 +5489 0.171501686 +5490 0.710607329 +5491 -0.436402486 +5492 -0.400297755 +5493 0.920903561 +5494 0.147767246 +5495 0.628955798 +5496 0.281707995 +5497 -0.814365217 +5498 0.996775909 +5499 -1.14386914 +5500 -0.273903686 +5501 0.058758921 +5502 1.677001334 +5503 -1.819639225 diff --git a/CRVConditions/data/scintyield_wideband4modules.txt b/CRVConditions/data/scintyield_wideband4modules.txt new file mode 100644 index 0000000000..8910c7d371 --- /dev/null +++ b/CRVConditions/data/scintyield_wideband4modules.txt @@ -0,0 +1,256 @@ +0 -0.40817829 +1 0.478392983 +2 -1.742534815 +3 -1.083696214 +4 -0.232897289 +5 -1.133704616 +6 0.708299822 +7 -0.255976244 +8 0.454536537 +9 0.34589287 +10 -0.914151313 +11 -0.219176211 +12 1.540090237 +13 -0.06729041 +14 0.750185173 +15 -1.252525599 +16 1.881276793 +17 1.08307137 +18 0.403799169 +19 -0.66013052 +20 0.996921357 +21 -0.466640679 +22 -0.147430802 +23 0.465758366 +24 1.472209636 +25 -0.089248445 +26 0.077041903 +27 0.812045767 +28 0.116082738 +29 2.444925959 +30 -0.643804806 +31 0.197596893 +32 0.496921984 +33 1.855947974 +34 0.073004041 +35 -0.766896413 +36 -1.120294518 +37 -1.285900187 +38 1.462787967 +39 -0.175869471 +40 0.576923821 +41 -0.241021451 +42 -1.135892295 +43 0.006762617 +44 -1.656346974 +45 -1.072041249 +46 0.179748625 +47 0.272906454 +48 0.014156971 +49 -0.046374193 +50 0.006439565 +51 -0.644237792 +52 -0.007830788 +53 0.293738714 +54 0.918094334 +55 0.723697415 +56 0.06599502 +57 0.843457846 +58 -0.156088783 +59 0.768268835 +60 -1.049871276 +61 -0.053859518 +62 -0.472876414 +63 -0.657052687 +64 -0.670193813 +65 -0.056785721 +66 -0.437127642 +67 1.138593278 +68 0.367129055 +69 -0.681090652 +70 0.320863282 +71 -1.284949167 +72 -0.512218056 +73 1.001620998 +74 0.381645129 +75 1.462008713 +76 -0.639059588 +77 0.871553559 +78 0.161576853 +79 0.165354377 +80 -0.803663752 +81 -0.114701532 +82 0.491418645 +83 1.292607075 +84 -0.979921489 +85 0.973688432 +86 1.594841866 +87 0.371110412 +88 -0.27214148 +89 -1.915335772 +90 -0.041963719 +91 0.262880908 +92 -0.689180237 +93 0.246577909 +94 1.19357776 +95 0.542303852 +96 -0.654314151 +97 0.786000959 +98 -0.704262875 +99 -0.072265143 +100 0.208576412 +101 1.296570941 +102 -0.063855034 +103 0.159200191 +104 0.925960111 +105 -2.042826473 +106 2.075169182 +107 -0.222235 +108 1.35332452 +109 -0.002027946 +110 0.397365683 +111 0.354055184 +112 0.511771393 +113 -0.457738167 +114 1.155370009 +115 -0.115781727 +116 -0.840449092 +117 0.321826222 +118 -0.461556427 +119 -1.19008102 +120 0.401419897 +121 0.560289182 +122 -0.162565747 +123 0.331663265 +124 -0.313720184 +125 -1.389663479 +126 0.617972175 +127 -0.610932716 +128 0.15998996 +129 1.471532457 +130 -0.166092867 +131 -0.507920517 +132 0.338036954 +133 -1.40898172 +134 1.270972215 +135 -0.144821609 +136 -1.965002639 +137 -0.765306087 +138 0.577112948 +139 -0.714690883 +140 1.673938548 +141 1.283248438 +142 0.111830082 +143 0.393560045 +144 -0.704160562 +145 -0.892621182 +146 -0.288656835 +147 1.833763681 +148 -0.089292317 +149 0.916267188 +150 -0.780835161 +151 0.097099476 +152 1.386262532 +153 -0.094783916 +154 -1.715879581 +155 0.053034023 +156 -2.41327277 +157 1.000076796 +158 -0.67093874 +159 0.239788482 +160 0.465575947 +161 -0.897566218 +162 0.285623216 +163 -0.760963944 +164 -1.023673817 +165 -1.391641336 +166 -0.242148271 +167 0.590555063 +168 0.464393322 +169 -1.486813908 +170 0.394357776 +171 0.902535297 +172 -1.452469922 +173 0.178071392 +174 -0.371711772 +175 1.204077962 +176 -0.80514245 +177 -0.07796681 +178 -0.39354941 +179 -2.089904828 +180 -0.816150506 +181 -1.129655392 +182 -0.03139441 +183 0.8896484 +184 -0.652208727 +185 -0.397336115 +186 1.971118498 +187 1.701910592 +188 0.285792663 +189 -1.738091689 +190 -0.789743994 +191 -0.691520263 +192 -1.313018844 +193 -0.319232912 +194 0.83927878 +195 1.306147453 +196 1.98204058 +197 0.047865666 +198 -0.359924628 +199 0.696814511 +200 -0.005355014 +201 0.69741095 +202 0.146527025 +203 -1.380544453 +204 -1.429810506 +205 -0.407681799 +206 -1.528747625 +207 -0.166433636 +208 1.29328001 +209 2.034089345 +210 -0.16133237 +211 -1.333930035 +212 0.791834757 +213 -0.632238067 +214 -0.130231195 +215 0.349612982 +216 1.609446664 +217 -0.327849039 +218 -0.492717167 +219 1.299194 +220 -0.718527533 +221 -0.671708083 +222 1.60457056 +223 -0.867398704 +224 -1.109376665 +225 -1.145681704 +226 -0.679705033 +227 0.175969876 +228 -0.362956639 +229 1.135676944 +230 -0.685920146 +231 2.015346083 +232 0.207859477 +233 -0.200225515 +234 1.477822045 +235 0.22662747 +236 -1.270463891 +237 0.791715611 +238 0.344362716 +239 0.162729038 +240 0.372231898 +241 0.896106612 +242 -0.218775195 +243 -1.020718808 +244 0.965974581 +245 -0.76316394 +246 0.989352797 +247 1.718669209 +248 0.714001118 +249 -0.631049114 +250 0.735906505 +251 -0.249884282 +252 -0.969527779 +253 -0.439858992 +254 0.549916092 +255 -0.80050398 diff --git a/CRVConditions/data/status_nominal.txt b/CRVConditions/data/status_nominal.txt new file mode 100644 index 0000000000..4a89d4f953 --- /dev/null +++ b/CRVConditions/data/status_nominal.txt @@ -0,0 +1,228 @@ +TABLE CRVBadChan +#status 1: not connected +#status 2: dead +#status 3: no data +#status 4: no pedestal +#status 5: no calibration constant +#status 6: noisy +#channel, status +21626,2 +8693,2 +9285,2 +12654,2 +1458,2 +1878,2 +8527,2 +9615,2 +16899,2 +7381,2 +511,2 +12055,2 +4452,2 +329,2 +14819,2 +16966,2 +19927,2 +4477,2 +3759,2 +5065,2 +11990,2 +8598,2 +15031,2 +15815,2 +21866,2 +7264,2 +14191,2 +14253,2 +19720,2 +615,2 +8850,2 +4606,2 +1954,2 +16177,2 +7290,2 +10400,2 +14652,2 +17931,2 +17809,2 +10782,2 +9843,2 +14527,2 +21450,2 +20997,2 +594,2 +18664,2 +20255,2 +19249,2 +11044,2 +3918,2 +3522,2 +12594,2 +2430,2 +2623,2 +14457,2 +7031,2 +6859,2 +17606,2 +8097,2 +18783,2 +7264,2 +10653,2 +3024,2 +19563,2 +11790,2 +3162,2 +8316,2 +14368,2 +10812,2 +17096,2 +3662,2 +3288,2 +21100,2 +7208,2 +2797,2 +1016,2 +12935,2 +19377,2 +15522,2 +3664,2 +8512,2 +9782,2 +17053,2 +16192,2 +17926,2 +16212,2 +18098,2 +9077,2 +21553,2 +7253,2 +11988,2 +15020,2 +11724,2 +15693,2 +14748,2 +14468,2 +19167,2 +16928,2 +15726,2 +20956,2 +9595,2 +3079,2 +12073,2 +16163,2 +9171,2 +1357,2 +17262,2 +16576,2 +15987,2 +17196,2 +16484,2 +11857,2 +18115,2 +16464,2 +19370,2 +7187,2 +20902,2 +2518,2 +10339,2 +9303,2 +21202,2 +15294,2 +16533,2 +17997,2 +19326,2 +5426,2 +11701,2 +15019,2 +20516,2 +5409,2 +16290,2 +15738,2 +14791,2 +10844,2 +19761,2 +15758,2 +8978,2 +15421,2 +1999,2 +8460,2 +2374,2 +12760,2 +8222,2 +13778,2 +8077,2 +13340,2 +1833,2 +6280,2 +21803,2 +17944,2 +8983,2 +12419,2 +14525,2 +21894,2 +19711,2 +4012,2 +11454,2 +10701,2 +13557,2 +21460,2 +14966,2 +4902,2 +4803,2 +9675,2 +15213,2 +20758,2 +18729,2 +15053,2 +11296,2 +3043,2 +19718,2 +21403,2 +20806,2 +14080,2 +8695,2 +11277,2 +4992,2 +17081,2 +17316,2 +4199,2 +10362,2 +7175,2 +11063,2 +15140,2 +21772,2 +6456,2 +9693,2 +406,2 +6703,2 +18222,2 +15274,2 +4396,2 +21718,2 +3040,2 +13304,2 +10238,2 +4239,2 +13589,2 +8735,2 +9922,2 +8021,2 +6411,2 +8792,2 +18227,2 +3932,2 +8711,2 +21870,2 +5594,2 +3024,2 +13900,2 +4676,2 +13710,2 +2293,2 +17066,2 +10092,2 +16687,2 +16215,2 +8039,2 +1502,2 +12100,2 diff --git a/CRVConditions/data/status_wideband4modules.txt b/CRVConditions/data/status_wideband4modules.txt new file mode 100644 index 0000000000..cb121e6479 --- /dev/null +++ b/CRVConditions/data/status_wideband4modules.txt @@ -0,0 +1,32 @@ +TABLE CRVBadChan +#status 1: not connected +#status 2: dead +#status 3: no data +#status 4: no pedestal +#status 5: no calibration constant +#status 6: noisy +#channel, status +240,1 +242,1 +244,1 +246,1 +248,1 +250,1 +252,1 +254,1 +752,1 +754,1 +756,1 +758,1 +760,1 +762,1 +764,1 +766,1 +1008,1 +1010,1 +1012,1 +1014,1 +1016,1 +1018,1 +1020,1 +1022,1 From 9e1bfe9c1a4b1ae5aad6af7def061184841b37ac Mon Sep 17 00:00:00 2001 From: ehrlich-uva Date: Sun, 31 Dec 2023 08:31:29 -0600 Subject: [PATCH 041/213] added runSummary to CRV wideband test --- CRVResponse/src/CrvWidebandTest_module.cc | 175 +++++++++++++++++++++- 1 file changed, 168 insertions(+), 7 deletions(-) diff --git a/CRVResponse/src/CrvWidebandTest_module.cc b/CRVResponse/src/CrvWidebandTest_module.cc index 6f88a53760..20767f2d2e 100644 --- a/CRVResponse/src/CrvWidebandTest_module.cc +++ b/CRVResponse/src/CrvWidebandTest_module.cc @@ -35,6 +35,118 @@ #include #include #include +#include +#include + +namespace +{ +double LandauGaussFunction(double *x, double *par) +{ + //From $ROOTSYS/tutorials/fit/langaus.C + //Fit parameters: + //par[0]=Width (scale) parameter of Landau density + //par[1]=Most Probable (MP, location) parameter of Landau density + //par[2]=Total area (integral -inf to inf, normalization constant) + //par[3]=Width (sigma) of convoluted Gaussian function + // + //In the Landau distribution (represented by the CERNLIB approximation), + //the maximum is located at x=-0.22278298 with the location parameter=0. + //This shift is corrected within this function, so that the actual + //maximum is identical to the MP parameter. + + // Numeric constants + Double_t invsq2pi = 0.3989422804014; // (2 pi)^(-1/2) + Double_t mpshift = -0.22278298; // Landau maximum location + + // Control constants + Double_t np = 100.0; // number of convolution steps + Double_t sc = 5.0; // convolution extends to +-sc Gaussian sigmas + + // Variables + Double_t xx; + Double_t mpc; + Double_t fland; + Double_t sum = 0.0; + Double_t xlow,xupp; + Double_t step; + Double_t i; + + // MP shift correction + mpc = par[1] - mpshift * par[0]; + + // Range of convolution integral + xlow = x[0] - sc * par[3]; + xupp = x[0] + sc * par[3]; + step = (xupp-xlow) / np; + + // Convolution integral of Landau and Gaussian by sum + for(i=1.0; i<=np/2; i++) + { + xx = xlow + (i-.5) * step; + fland = TMath::Landau(xx,mpc,par[0]) / par[0]; + sum += fland * TMath::Gaus(x[0],xx,par[3]); + + xx = xupp - (i-.5) * step; + fland = TMath::Landau(xx,mpc,par[0]) / par[0]; + sum += fland * TMath::Gaus(x[0],xx,par[3]); + } + + return (par[2] * step * sum * invsq2pi / par[3]); +} +void LandauGauss(TH1F &h, float &mpv, float &fwhm, float &signals, float &chi2) +{ + std::multimap bins; //binContent,binCenter + for(int i=8; i<=h.GetNbinsX(); i++) bins.emplace(h.GetBinContent(i),h.GetBinCenter(i)); //ordered from smallest to largest bin entries + if(bins.size()<4) return; + if(bins.rbegin()->first<20) return; //low statistics + int nBins=0; + float binSum=0; + for(auto bin=bins.rbegin(); bin!=bins.rend(); ++bin) + { + nBins++; + binSum+=bin->second; + if(nBins==4) break; + } + float maxX=binSum/4; + float fitRangeStart=0.7*maxX; //0.6 @ 24 + float fitRangeEnd =2.0*maxX; + if(fitRangeStart<15.0) fitRangeStart=15.0; + + //Parameters + Double_t startValues[4], parLimitsLow[4], parLimitsHigh[4]; + //Most probable value + startValues[1]=maxX; + parLimitsLow[1]=fitRangeStart; + parLimitsHigh[1]=fitRangeEnd; + //Area + startValues[2]=h.Integral(h.FindBin(fitRangeStart),h.FindBin(fitRangeEnd)); + parLimitsLow[2]=0.01*startValues[2]; + parLimitsHigh[2]=100*startValues[2]; + //Other parameters + startValues[0]=5.0; startValues[3]=10.0; + parLimitsLow[0]=2.0; parLimitsLow[3]=2.0; + parLimitsHigh[0]=15.0; parLimitsHigh[3]=20.0; //7 and 15 @ 21 //6 and 13 @ 23 + + TF1 fit("LandauGauss",LandauGaussFunction,fitRangeStart,fitRangeEnd,4); + fit.SetParameters(startValues); + fit.SetLineColor(kRed); + fit.SetParNames("Width","MP","Area","GSigma"); + for(int i=0; i<4; i++) fit.SetParLimits(i, parLimitsLow[i], parLimitsHigh[i]); + TFitResultPtr fr = h.Fit(&fit,"LQRS"); + fit.Draw("same"); + + mpv = fit.GetMaximumX(); + chi2 = (fr->Ndf()>0?fr->Chi2()/fr->Ndf():NAN); + if(mpv==fitRangeStart) {mpv=0; return;} + float halfMaximum = fit.Eval(mpv)/2.0; + float leftX = fit.GetX(halfMaximum,0.0,mpv); + float rightX = fit.GetX(halfMaximum,mpv,10.0*mpv); + fwhm = rightX-leftX; + signals = fit.Integral(0,150); +} + +} //end anonymous namespace for LandauGauss function + namespace mu2e { @@ -93,7 +205,16 @@ namespace mu2e float _trackPEs; float _trackChi2; + int _eventsRecorded{0}; + float *_summaryPEs{NULL}; + float *_summaryFWHMs{NULL}; + float *_summarySignals{NULL}; + float *_summaryChi2s{NULL}; + + std::vector _histPEs; + TTree *_tree; + TTree *_treeSummary; ProditionsHandle _crvChannelMap_h; }; @@ -107,7 +228,8 @@ namespace mu2e _protonBunchTimeTag(conf().protonBunchTimeTag()) { art::ServiceHandle tfs; - _tree = tfs->make("WidebandTree", "WidebandTree"); + _tree = tfs->make("run", "run"); + _treeSummary = tfs->make("runSummary", "runSummary"); } CrvWidebandTest::~CrvWidebandTest() @@ -123,6 +245,31 @@ namespace mu2e void CrvWidebandTest::endJob() { + _summaryPEs = new float[_nFEBs*CRVId::nChanPerFEB]; + _summaryFWHMs = new float[_nFEBs*CRVId::nChanPerFEB]; + _summarySignals = new float[_nFEBs*CRVId::nChanPerFEB]; + _summaryChi2s = new float[_nFEBs*CRVId::nChanPerFEB]; + + _treeSummary->Branch("runNumber",&_runNumber,"runNumber/I"); + _treeSummary->Branch("subrunNumber",&_subrunNumber,"subrunNumber/I"); + _treeSummary->Branch("eventsRecorded",&_eventsRecorded,"eventsRecorded/I"); + _treeSummary->Branch("PEs",_summaryPEs,Form("PEs[%i][%i]/F",_nFEBs,(unsigned int)CRVId::nChanPerFEB)); + _treeSummary->Branch("FWHWs",_summaryFWHMs,Form("FWHMs[%i][%i]/F",_nFEBs,(unsigned int)CRVId::nChanPerFEB)); + _treeSummary->Branch("signals",_summarySignals,Form("signals[%i][%i]/F",_nFEBs,(unsigned int)CRVId::nChanPerFEB)); + _treeSummary->Branch("chi2s",_summaryChi2s,Form("chi2s[%i][%i]/F",_nFEBs,(unsigned int)CRVId::nChanPerFEB)); + + for(int iFEB=0; iFEB<_nFEBs; ++iFEB) + for(int iChannel=0; iChannel<(int)CRVId::nChanPerFEB; ++iChannel) + { + int index=iFEB*CRVId::nChanPerFEB+iChannel; + _summaryPEs[index]=0; + _summaryFWHMs[index]=0; + _summarySignals[index]=0; + _summaryChi2s[index]=0; + LandauGauss(*_histPEs[index], _summaryPEs[index], _summaryFWHMs[index], _summarySignals[index], _summaryChi2s[index]); + } + + _treeSummary->Fill(); } void CrvWidebandTest::analyze(const art::Event& event) @@ -146,6 +293,7 @@ namespace mu2e _runNumber = event.run(); _subrunNumber = event.subRun(); _eventNumber = event.event(); + ++_eventsRecorded; auto const& crvChannelMap = _crvChannelMap_h.get(event.id()); @@ -208,6 +356,19 @@ namespace mu2e _tree->Branch("trackPoints", &_trackPoints, "trackPoints/I"); _tree->Branch("trackPEs", &_trackPEs, "trackPEs/F"); _tree->Branch("trackChi2", &_trackChi2, "trackChi2/F"); + + art::ServiceHandle tfs; + art::TFileDirectory tfdir = tfs->mkdir("plots"); + + _histPEs.resize(_nFEBs*CRVId::nChanPerFEB); + for(int iFEB=0; iFEB<_nFEBs; ++iFEB) + for(int iChannel=0; iChannel<(int)CRVId::nChanPerFEB; ++iChannel) + { + int index=iFEB*CRVId::nChanPerFEB+iChannel; + _histPEs[index] = tfdir.make(Form("PEs_%i_%i",iFEB,iChannel), + Form("PE Distribution FEB %i Channel %i;PE;Counts",iFEB,iChannel), + 75,0,150); + } } //initialize track variables @@ -279,12 +440,12 @@ namespace mu2e uint16_t feb = onlineChannel.FEB(); uint16_t febChannel = onlineChannel.FEBchannel(); - //FIXME: check the bad channel map for channels that need to be ignored - - _recoPEs[feb*CRVId::nChanPerFEB+febChannel] = recoPEs; - _recoTime[feb*CRVId::nChanPerFEB+febChannel] = recoTime; - _fitStatus[feb*CRVId::nChanPerFEB+febChannel] = fitStatus; - _depositedEnergy[feb*CRVId::nChanPerFEB+febChannel] = depositedEnergy; + int index=feb*CRVId::nChanPerFEB+febChannel; + _recoPEs[index] = recoPEs; + _recoTime[index] = recoTime; + _fitStatus[index] = fitStatus; + _depositedEnergy[index] = depositedEnergy; + _histPEs[index]->Fill(recoPEs); counterPEs+=recoPEs; } From 979248cc1236de7897735bebd07c15c288f875bc Mon Sep 17 00:00:00 2001 From: ehrlich-uva Date: Tue, 2 Jan 2024 04:58:37 -0600 Subject: [PATCH 042/213] updated CRV databases --- CRVConditions/data/scintyield_nominal.txt | 11010 ++++++++-------- .../data/scintyield_wideband4modules.txt | 514 +- CRVConditions/fcl/prolog.fcl | 3 +- CRVConditions/inc/CRVScintYield.hh | 11 +- CRVConditions/inc/CRVScintYieldCache.hh | 20 +- CRVConditions/inc/CRVScintYieldMaker.hh | 3 +- CRVConditions/src/CRVScintYieldMaker.cc | 90 +- CRVConfig/inc/CRVScintYieldConfig.hh | 2 - CRVResponse/src/CrvPhotonGenerator_module.cc | 6 +- .../src/CrvWaveformsGenerator_module.cc | 19 +- CRVResponse/test/CRVResponse.fcl | 6 + .../test/wideband/wideband4modules.fcl | 4 +- DbTables/inc/CRVScint.hh | 74 + DbTables/src/DbTableFactory.cc | 3 + 14 files changed, 5917 insertions(+), 5848 deletions(-) create mode 100644 DbTables/inc/CRVScint.hh diff --git a/CRVConditions/data/scintyield_nominal.txt b/CRVConditions/data/scintyield_nominal.txt index 60dbd9137b..6a6725c204 100644 --- a/CRVConditions/data/scintyield_nominal.txt +++ b/CRVConditions/data/scintyield_nominal.txt @@ -1,5504 +1,5506 @@ -0 -0.40817829 -1 0.478392983 -2 -1.742534815 -3 -1.083696214 -4 -0.232897289 -5 -1.133704616 -6 0.708299822 -7 -0.255976244 -8 0.454536537 -9 0.34589287 -10 -0.914151313 -11 -0.219176211 -12 1.540090237 -13 -0.06729041 -14 0.750185173 -15 -1.252525599 -16 1.881276793 -17 1.08307137 -18 0.403799169 -19 -0.66013052 -20 0.996921357 -21 -0.466640679 -22 -0.147430802 -23 0.465758366 -24 1.472209636 -25 -0.089248445 -26 0.077041903 -27 0.812045767 -28 0.116082738 -29 2.444925959 -30 -0.643804806 -31 0.197596893 -32 0.496921984 -33 1.855947974 -34 0.073004041 -35 -0.766896413 -36 -1.120294518 -37 -1.285900187 -38 1.462787967 -39 -0.175869471 -40 0.576923821 -41 -0.241021451 -42 -1.135892295 -43 0.006762617 -44 -1.656346974 -45 -1.072041249 -46 0.179748625 -47 0.272906454 -48 0.014156971 -49 -0.046374193 -50 0.006439565 -51 -0.644237792 -52 -0.007830788 -53 0.293738714 -54 0.918094334 -55 0.723697415 -56 0.06599502 -57 0.843457846 -58 -0.156088783 -59 0.768268835 -60 -1.049871276 -61 -0.053859518 -62 -0.472876414 -63 -0.657052687 -64 -0.670193813 -65 -0.056785721 -66 -0.437127642 -67 1.138593278 -68 0.367129055 -69 -0.681090652 -70 0.320863282 -71 -1.284949167 -72 -0.512218056 -73 1.001620998 -74 0.381645129 -75 1.462008713 -76 -0.639059588 -77 0.871553559 -78 0.161576853 -79 0.165354377 -80 -0.803663752 -81 -0.114701532 -82 0.491418645 -83 1.292607075 -84 -0.979921489 -85 0.973688432 -86 1.594841866 -87 0.371110412 -88 -0.27214148 -89 -1.915335772 -90 -0.041963719 -91 0.262880908 -92 -0.689180237 -93 0.246577909 -94 1.19357776 -95 0.542303852 -96 -0.654314151 -97 0.786000959 -98 -0.704262875 -99 -0.072265143 -100 0.208576412 -101 1.296570941 -102 -0.063855034 -103 0.159200191 -104 0.925960111 -105 -2.042826473 -106 2.075169182 -107 -0.222235 -108 1.35332452 -109 -0.002027946 -110 0.397365683 -111 0.354055184 -112 0.511771393 -113 -0.457738167 -114 1.155370009 -115 -0.115781727 -116 -0.840449092 -117 0.321826222 -118 -0.461556427 -119 -1.19008102 -120 0.401419897 -121 0.560289182 -122 -0.162565747 -123 0.331663265 -124 -0.313720184 -125 -1.389663479 -126 0.617972175 -127 -0.610932716 -128 0.15998996 -129 1.471532457 -130 -0.166092867 -131 -0.507920517 -132 0.338036954 -133 -1.40898172 -134 1.270972215 -135 -0.144821609 -136 -1.965002639 -137 -0.765306087 -138 0.577112948 -139 -0.714690883 -140 1.673938548 -141 1.283248438 -142 0.111830082 -143 0.393560045 -144 -0.704160562 -145 -0.892621182 -146 -0.288656835 -147 1.833763681 -148 -0.089292317 -149 0.916267188 -150 -0.780835161 -151 0.097099476 -152 1.386262532 -153 -0.094783916 -154 -1.715879581 -155 0.053034023 -156 -2.41327277 -157 1.000076796 -158 -0.67093874 -159 0.239788482 -160 0.465575947 -161 -0.897566218 -162 0.285623216 -163 -0.760963944 -164 -1.023673817 -165 -1.391641336 -166 -0.242148271 -167 0.590555063 -168 0.464393322 -169 -1.486813908 -170 0.394357776 -171 0.902535297 -172 -1.452469922 -173 0.178071392 -174 -0.371711772 -175 1.204077962 -176 -0.80514245 -177 -0.07796681 -178 -0.39354941 -179 -2.089904828 -180 -0.816150506 -181 -1.129655392 -182 -0.03139441 -183 0.8896484 -184 -0.652208727 -185 -0.397336115 -186 1.971118498 -187 1.701910592 -188 0.285792663 -189 -1.738091689 -190 -0.789743994 -191 -0.691520263 -192 -1.313018844 -193 -0.319232912 -194 0.83927878 -195 1.306147453 -196 1.98204058 -197 0.047865666 -198 -0.359924628 -199 0.696814511 -200 -0.005355014 -201 0.69741095 -202 0.146527025 -203 -1.380544453 -204 -1.429810506 -205 -0.407681799 -206 -1.528747625 -207 -0.166433636 -208 1.29328001 -209 2.034089345 -210 -0.16133237 -211 -1.333930035 -212 0.791834757 -213 -0.632238067 -214 -0.130231195 -215 0.349612982 -216 1.609446664 -217 -0.327849039 -218 -0.492717167 -219 1.299194 -220 -0.718527533 -221 -0.671708083 -222 1.60457056 -223 -0.867398704 -224 -1.109376665 -225 -1.145681704 -226 -0.679705033 -227 0.175969876 -228 -0.362956639 -229 1.135676944 -230 -0.685920146 -231 2.015346083 -232 0.207859477 -233 -0.200225515 -234 1.477822045 -235 0.22662747 -236 -1.270463891 -237 0.791715611 -238 0.344362716 -239 0.162729038 -240 0.372231898 -241 0.896106612 -242 -0.218775195 -243 -1.020718808 -244 0.965974581 -245 -0.76316394 -246 0.989352797 -247 1.718669209 -248 0.714001118 -249 -0.631049114 -250 0.735906505 -251 -0.249884282 -252 -0.969527779 -253 -0.439858992 -254 0.549916092 -255 -0.80050398 -256 -0.007173449 -257 0.337081613 -258 -0.824920031 -259 -0.816768181 -260 0.750262061 -261 -0.235735143 -262 -0.22671651 -263 -3.598685709 -264 -0.603896547 -265 -0.918996661 -266 0.083725271 -267 -0.374561747 -268 0.128729223 -269 0.987346053 -270 0.463799907 -271 -0.189384207 -272 0.985258405 -273 -1.880686458 -274 1.044747837 -275 1.29596539 -276 0.402672632 -277 1.492778169 -278 -0.803917017 -279 -1.034641198 -280 0.981203806 -281 -0.660412132 -282 1.093230086 -283 1.966852642 -284 0.623320561 -285 -1.297070085 -286 -1.513156965 -287 -1.506313331 -288 0.782545524 -289 0.42223614 -290 0.491447819 -291 -0.281510694 -292 1.277226115 -293 2.430401532 -294 0.446400491 -295 0.540262692 -296 -1.075688065 -297 -0.235786505 -298 -0.478864332 -299 -0.903800053 -300 0.201118785 -301 1.569425999 -302 0.052632657 -303 0.0737852 -304 1.574754064 -305 1.708556757 -306 -0.945417094 -307 -0.919766343 -308 0.367834016 -309 -1.41656582 -310 -0.942703944 -311 -1.597649742 -312 -1.221793136 -313 -0.091048807 -314 -0.159959852 -315 -0.0945729 -316 -0.506960088 -317 -0.506600418 -318 -0.042309861 -319 0.108956613 -320 -0.740256487 -321 0.71892811 -322 0.639832891 -323 0.231096989 -324 -1.448288062 -325 -0.232538077 -326 0.451084331 -327 -1.129972612 -328 -0.925244464 -329 0.671033429 -330 -0.013699547 -331 0.37986812 -332 1.876547013 -333 -0.706833619 -334 -1.069362693 -335 -1.640067097 -336 1.398416277 -337 -0.135849532 -338 -1.346438346 -339 -1.123148453 -340 1.686222942 -341 1.088895858 -342 -2.252108515 -343 -0.50804387 -344 -0.868431963 -345 1.639235192 -346 -1.420850609 -347 0.208936207 -348 -1.224200566 -349 -1.198681876 -350 -0.169580381 -351 0.361655672 -352 0.355273744 -353 -0.891657883 -354 -0.8431633 -355 -1.354371215 -356 -0.695650114 -357 1.061889469 -358 2.663483452 -359 0.349782459 -360 -1.209229394 -361 0.857416615 -362 -2.018092274 -363 1.249161024 -364 -0.126798794 -365 0.591033873 -366 -1.383067924 -367 -0.766158209 -368 -2.434720992 -369 -0.256693854 -370 -0.513582614 -371 -1.132831948 -372 -1.626955527 -373 -0.586142211 -374 -0.627314412 -375 0.583642122 -376 -1.912341781 -377 0.531838994 -378 0.095109225 -379 0.825036959 -380 0.305629479 -381 0.901661477 -382 0.930229399 -383 -1.451734065 -384 -0.019167851 -385 -0.857555306 -386 0.62476235 -387 -0.108405838 -388 0.847971532 -389 0.150492485 -390 -1.499164749 -391 -1.252682326 -392 0.322090398 -393 -1.791399574 -394 0.36534036 -395 0.168156081 -396 2.187935725 -397 0.493622527 -398 -2.164658004 -399 0.429179819 -400 1.128738376 -401 0.57112014 -402 0.751289368 -403 0.237764392 -404 0.156336249 -405 -1.172503726 -406 0.124471277 -407 0.240969704 -408 0.340211275 -409 -0.688639062 -410 -0.525581499 -411 0.181308277 -412 -0.152190427 -413 0.234399096 -414 -0.356869582 -415 0.171580914 -416 0.007592873 -417 -0.222287777 -418 0.167471356 -419 -0.462522062 -420 1.410863253 -421 0.722440127 -422 0.113289924 -423 -0.600614512 -424 -0.451435579 -425 -1.017313286 -426 -1.935903983 -427 -1.546858607 -428 -0.873229479 -429 -0.376859264 -430 0.649852145 -431 0.80894471 -432 -0.327801591 -433 0.304385153 -434 -0.304533303 -435 1.276705627 -436 -0.027770761 -437 -1.235226816 -438 1.061579542 -439 -0.94525643 -440 -0.76941479 -441 -0.128521269 -442 -0.433950796 -443 0.522838545 -444 1.205259074 -445 -0.219641106 -446 0.203870662 -447 0.178030848 -448 0.209347925 -449 -0.30159478 -450 -0.043044237 -451 -0.533813332 -452 -1.810757436 -453 -0.441292798 -454 1.163546923 -455 1.299749945 -456 -1.434587089 -457 0.451181103 -458 0.438376104 -459 -1.374459478 -460 0.11327561 -461 -1.239754095 -462 1.546861783 -463 -0.637626567 -464 -0.114131288 -465 0.979243329 -466 -0.157315999 -467 -0.442128219 -468 -0.025893066 -469 -0.433617986 -470 1.671640906 -471 -1.622366828 -472 1.404832042 -473 -1.063861096 -474 2.161709457 -475 0.049639699 -476 1.51225222 -477 -0.550773322 -478 -0.257415964 -479 -0.682554441 -480 -0.468611624 -481 1.554563487 -482 -0.170478644 -483 0.264716362 -484 -0.893563766 -485 1.159447915 -486 -0.253864548 -487 -1.117871833 -488 -2.185740376 -489 0.954521305 -490 0.59686098 -491 -0.793813165 -492 1.030006636 -493 1.461714818 -494 0.132094129 -495 0.865087306 -496 -1.472636144 -497 -0.539615336 -498 -1.469294956 -499 0.912733252 -500 -0.391309858 -501 -1.168845754 -502 -0.806736797 -503 -0.404089799 -504 -1.540185184 -505 -1.767002434 -506 0.663998772 -507 -1.454712691 -508 1.425962241 -509 0.782423134 -510 -0.740757154 -511 0.595286257 -512 0.134637496 -513 2.578358839 -514 0.09152125 -515 -0.053789907 -516 -0.370613331 -517 -1.110013413 -518 -2.403927782 -519 -0.098904264 -520 0.828388134 -521 -0.825051385 -522 -1.230015752 -523 -0.645880054 -524 -2.541147657 -525 1.027155794 -526 -1.667358644 -527 -1.489350918 -528 0.543879625 -529 -0.250101217 -530 -0.112506545 -531 -0.209420648 -532 -0.978524575 -533 0.755472556 -534 0.341013971 -535 -1.497376768 -536 0.080087475 -537 -0.749711372 -538 -1.64000224 -539 -0.167107535 -540 0.004185846 -541 -0.155373135 -542 -1.365282024 -543 1.361840672 -544 0.767380681 -545 0.493340231 -546 0.190095848 -547 -0.337414847 -548 -2.123060698 -549 0.955275299 -550 1.292901768 -551 -0.892889521 -552 1.733825488 -553 -0.87948169 -554 1.629570594 -555 -0.218710121 -556 -0.795968474 -557 0.530006508 -558 0.704284118 -559 0.664833628 -560 0.162944275 -561 -0.284845639 -562 0.308158758 -563 -0.288345332 -564 0.655204196 -565 -1.181856987 -566 -0.074884278 -567 -0.398693821 -568 -0.222166949 -569 0.527886889 -570 0.083287081 -571 -0.246896772 -572 -0.170832777 -573 1.154731064 -574 0.591964162 -575 1.392098058 -576 0.218055687 -577 0.636735352 -578 1.541503302 -579 0.999613871 -580 0.202605363 -581 0.939956723 -582 1.000186593 -583 -0.240155865 -584 0.295551159 -585 0.74048749 -586 -1.439617809 -587 0.118706766 -588 0.594744012 -589 1.722054042 -590 0.489825424 -591 -0.092664198 -592 -0.680533742 -593 -0.469737581 -594 -0.067692992 -595 1.167395322 -596 0.201747 -597 0.616967618 -598 0.998306676 -599 -1.048928338 -600 -0.347045525 -601 -0.233624793 -602 1.123764665 -603 0.397226241 -604 -0.909629124 -605 -0.234925804 -606 -1.788441902 -607 1.279679247 -608 -1.109477821 -609 -0.018903912 -610 -0.68746781 -611 -0.671901556 -612 -0.052222561 -613 -0.869001512 -614 -0.337248664 -615 1.632154158 -616 -0.295247325 -617 -0.258880892 -618 -1.72130832 -619 -0.68778214 -620 0.036159231 -621 0.05256995 -622 0.940174893 -623 -1.193094796 -624 1.663449246 -625 0.258785087 -626 0.581005652 -627 0.762503521 -628 0.356692957 -629 -1.080818544 -630 -0.07031834 -631 0.595463915 -632 0.455518127 -633 1.96603051 -634 0.073907432 -635 -0.289688525 -636 -1.840958407 -637 0.893614709 -638 0.550093903 -639 0.755860038 -640 0.018454385 -641 0.933447213 -642 -0.567725712 -643 1.197038265 -644 0.602571488 -645 0.195618355 -646 0.719440491 -647 -0.659338014 -648 -1.076215359 -649 0.091023268 -650 0.46921017 -651 -0.755383047 -652 -0.1230986 -653 1.588710283 -654 -1.389073456 -655 -0.11151737 -656 0.192231755 -657 -2.043651215 -658 -0.111809254 -659 0.230804304 -660 1.007710776 -661 -0.555359258 -662 -0.441639334 -663 -0.633874035 -664 -0.821842231 -665 0.09165612 -666 -0.660005061 -667 1.055079926 -668 -0.166575857 -669 0.272196461 -670 -0.061539148 -671 -0.727852311 -672 1.100451237 -673 -1.577325611 -674 1.045756062 -675 -0.254034436 -676 -1.105164769 -677 -0.269249796 -678 1.015424679 -679 0.613318548 -680 0.846277458 -681 0.010022539 -682 0.176280886 -683 -0.517314589 -684 0.992052652 -685 -1.232270627 -686 1.299484472 -687 -0.333518509 -688 0.305436466 -689 0.085244298 -690 0.016435911 -691 1.197102966 -692 -0.015089566 -693 -0.250898876 -694 -0.302505612 -695 -1.100841257 -696 0.48287465 -697 -1.289820991 -698 0.241767276 -699 -0.119440054 -700 1.636230338 -701 1.152146097 -702 0.738968908 -703 0.692557456 -704 -2.232255027 -705 0.296724487 -706 0.840617841 -707 0.745429364 -708 1.33412023 -709 -0.005944921 -710 -0.129184773 -711 -0.234458954 -712 0.217480124 -713 1.267159028 -714 2.175116992 -715 -2.201152258 -716 -0.33942274 -717 0.096710859 -718 -0.633170941 -719 -0.636234471 -720 0.892496671 -721 1.59868153 -722 0.065696794 -723 0.282764337 -724 -0.271991956 -725 0.593142464 -726 0.100120025 -727 -0.370996664 -728 0.883862334 -729 1.485580957 -730 -0.59616712 -731 -0.568912718 -732 0.524385698 -733 0.451609845 -734 -0.606268461 -735 0.864337844 -736 1.020480535 -737 -2.357786698 -738 -0.202855646 -739 -0.849218475 -740 1.996351215 -741 -1.002299113 -742 1.516448329 -743 -1.452860765 -744 -0.254657958 -745 0.737933316 -746 -0.589838214 -747 0.7409136 -748 -1.296411485 -749 -0.739207171 -750 1.138745393 -751 0.123214344 -752 0.951328888 -753 -0.177091543 -754 -0.720588245 -755 -0.19962583 -756 -1.874827648 -757 -0.655913352 -758 1.024948508 -759 0.469592199 -760 0.200475613 -761 0.82728868 -762 -0.16783238 -763 1.251092866 -764 0.212660434 -765 1.163521737 -766 -0.40153073 -767 -0.057714041 -768 -1.896381051 -769 0.177032416 -770 1.236664107 -771 -0.668385154 -772 -0.770261634 -773 -1.16976461 -774 0.266803696 -775 0.440262378 -776 -0.121910544 -777 0.136322053 -778 1.089066083 -779 0.407867876 -780 -1.45196584 -781 -0.278712815 -782 -0.509610234 -783 0.796739865 -784 0.539129462 -785 0.05746158 -786 -0.216251817 -787 -1.814003009 -788 -0.365340871 -789 2.214868148 -790 0.566108846 -791 0.936565245 -792 -1.189589254 -793 -0.986350374 -794 0.155470474 -795 -1.554888019 -796 -0.273918213 -797 -0.307934556 -798 -0.457824476 -799 0.202462726 -800 -3.175025979 -801 0.548640432 -802 0.116826298 -803 1.180811134 -804 0.451055487 -805 -1.266309149 -806 1.723407882 -807 -0.042608481 -808 1.229444465 -809 -0.643137922 -810 0.964370281 -811 0.710242436 -812 -1.220085161 -813 -2.166899516 -814 0.264803761 -815 0.327529541 -816 -0.169957863 -817 1.315324053 -818 -0.453293354 -819 0.416298175 -820 -0.990935085 -821 -0.402273032 -822 -0.829099869 -823 0.32478979 -824 0.131468938 -825 -0.379226882 -826 -2.148095208 -827 1.035119613 -828 0.754191621 -829 0.676846841 -830 0.85845341 -831 -0.879590795 -832 -1.951119491 -833 -0.110559706 -834 -1.110239586 -835 -0.190721178 -836 -0.83027826 -837 -0.752211541 -838 2.034310157 -839 0.402540729 -840 -0.208695415 -841 -0.950694547 -842 0.256601111 -843 -0.455376298 -844 -0.60310613 -845 -1.793646022 -846 0.829557646 -847 -0.791057837 -848 -1.899389653 -849 -1.099887394 -850 0.026796951 -851 -1.514549482 -852 -0.586713481 -853 0.99705945 -854 0.959315757 -855 1.25034976 -856 -1.16878592 -857 -0.667069606 -858 -1.579041371 -859 0.040176692 -860 0.60487061 -861 -0.940286835 -862 -0.538320001 -863 -1.193365671 -864 -0.455553912 -865 0.910838393 -866 -0.251964964 -867 0.448587078 -868 0.135504416 -869 0.687892069 -870 0.638019132 -871 -0.018456708 -872 0.274689724 -873 0.40887214 -874 -1.179969433 -875 0.283026883 -876 3.087218729 -877 -0.451392778 -878 0.423858692 -879 -0.540938796 -880 -1.749824515 -881 0.077586406 -882 2.023628921 -883 -0.581871436 -884 0.200526641 -885 -1.189717647 -886 -1.799677244 -887 0.533139951 -888 0.107560763 -889 -0.640006975 -890 -0.737604847 -891 0.219374116 -892 -1.470183266 -893 0.063090485 -894 0.3914926 -895 -1.388051647 -896 -0.384079169 -897 -0.468936587 -898 0.462593719 -899 -1.924058459 -900 -0.661081588 -901 -1.162045364 -902 0.09952754 -903 0.768493746 -904 -1.384360789 -905 -1.0138134 -906 -1.158703776 -907 -1.09925696 -908 -1.107000694 -909 0.499786447 -910 0.980860924 -911 1.185146646 -912 -1.619800103 -913 -0.535515967 -914 -0.858969246 -915 0.433054164 -916 1.863839658 -917 -0.685876169 -918 -0.230871159 -919 -1.041282449 -920 -0.13618303 -921 -1.509019783 -922 -0.7717079 -923 -0.914726305 -924 1.043613471 -925 -1.155323778 -926 1.130107495 -927 -0.760193584 -928 -1.527621444 -929 -1.492480158 -930 -1.060350786 -931 1.225162106 -932 0.788020282 -933 -1.51445339 -934 -0.569732944 -935 1.269920886 -936 0.90172626 -937 -0.454543515 -938 1.968361845 -939 -0.83088489 -940 1.231898389 -941 0.115089214 -942 0.98054965 -943 -0.08497517 -944 0.172532076 -945 -0.586410712 -946 0.488030929 -947 -0.354560333 -948 -0.524640337 -949 0.875235713 -950 -1.80066288 -951 -0.5433488 -952 -0.042017393 -953 0.010123254 -954 0.665051144 -955 -0.346399864 -956 1.014648131 -957 -1.309139529 -958 0.945424576 -959 -2.274990431 -960 0.857203277 -961 -1.734511036 -962 -0.214231882 -963 0.069040172 -964 0.499696463 -965 1.751805468 -966 -1.934838999 -967 0.868537001 -968 1.993929646 -969 1.289449949 -970 -1.346159819 -971 -0.119857301 -972 -1.392234599 -973 -1.847802164 -974 0.132086576 -975 -0.544655756 -976 -1.544663227 -977 -0.978524974 -978 0.853515988 -979 -0.76411176 -980 0.922356277 -981 -0.691962126 -982 -0.505797514 -983 -1.253027945 -984 0.653974757 -985 -0.006938417 -986 0.583247767 -987 0.875126182 -988 -0.593246275 -989 -1.079829845 -990 0.632460724 -991 0.292908205 -992 1.138572513 -993 0.128196834 -994 0.451834506 -995 -0.289878141 -996 -0.286428037 -997 0.981708857 -998 0.330752265 -999 0.242769886 -1000 -0.046242412 -1001 -1.667095837 -1002 1.109577126 -1003 0.428346419 -1004 1.252683943 -1005 -0.519526528 -1006 1.224797559 -1007 -0.452932113 -1008 -1.046709043 -1009 0.259965391 -1010 -0.180581981 -1011 0.353443118 -1012 -0.035358412 -1013 -0.475674329 -1014 0.623160639 -1015 0.949165294 -1016 0.73871055 -1017 -0.115008363 -1018 -2.458177145 -1019 -0.710933855 -1020 -1.486111657 -1021 0.435511517 -1022 1.329449326 -1023 -0.501262987 -1024 0.533116789 -1025 2.381095032 -1026 0.115332848 -1027 0.973568788 -1028 -0.990546519 -1029 -0.247974338 -1030 0.842200348 -1031 0.178305568 -1032 -0.314906385 -1033 -0.365744661 -1034 -1.07586073 -1035 1.715035276 -1036 -0.60791999 -1037 -0.998417203 -1038 -0.551783364 -1039 -0.409248905 -1040 1.250273822 -1041 -0.03074491 -1042 0.13130747 -1043 -0.081369789 -1044 0.369134878 -1045 -0.71544035 -1046 1.244631371 -1047 -2.221847734 -1048 1.239702984 -1049 0.124467318 -1050 -0.212782307 -1051 -0.784561886 -1052 0.273051474 -1053 2.624219146 -1054 -1.599611716 -1055 0.847414958 -1056 1.004690093 -1057 -1.627508396 -1058 -1.627715576 -1059 -0.675471817 -1060 0.719215303 -1061 -0.302387992 -1062 -0.354503346 -1063 -0.798509939 -1064 0.605321883 -1065 -1.151204487 -1066 -0.395348361 -1067 -0.337198082 -1068 0.442261016 -1069 0.806729101 -1070 0.566165461 -1071 -0.964650991 -1072 0.097885979 -1073 -0.383678739 -1074 -0.203305827 -1075 2.399086941 -1076 0.46802039 -1077 -0.368524292 -1078 -0.00123323 -1079 -2.081473443 -1080 -0.831735787 -1081 0.598808941 -1082 -0.914394328 -1083 1.331837553 -1084 -1.775535867 -1085 1.569073099 -1086 0.217903061 -1087 0.24253345 -1088 1.192479096 -1089 -1.291163631 -1090 0.990729396 -1091 1.11204799 -1092 -0.229879811 -1093 1.075350718 -1094 0.279536145 -1095 -0.260321907 -1096 -1.089290051 -1097 0.157330229 -1098 0.009980245 -1099 -0.083448858 -1100 0.402603278 -1101 -0.539672316 -1102 -0.533767979 -1103 1.05877514 -1104 -0.925822074 -1105 0.768700115 -1106 -0.35953064 -1107 -1.189120444 -1108 0.257771941 -1109 -1.009946645 -1110 -0.524662014 -1111 0.420524896 -1112 0.192894438 -1113 -1.870173502 -1114 0.570067204 -1115 -0.070077086 -1116 0.659360217 -1117 -1.026177747 -1118 -0.236328394 -1119 1.477863367 -1120 0.193574107 -1121 0.772045519 -1122 -0.177649883 -1123 0.870319409 -1124 -0.017479783 -1125 -0.279022644 -1126 0.382275018 -1127 1.170667539 -1128 -0.681747014 -1129 1.10589659 -1130 0.841060309 -1131 1.591777309 -1132 0.818406551 -1133 -1.666236147 -1134 -0.961683822 -1135 -0.051205459 -1136 -0.389347296 -1137 0.563939745 -1138 0.354430876 -1139 -0.572624045 -1140 0.147987887 -1141 -0.412815136 -1142 -1.06582087 -1143 1.836254736 -1144 0.463943038 -1145 1.13771502 -1146 -0.153029104 -1147 -0.959472032 -1148 -2.068088862 -1149 0.048530295 -1150 -1.728815368 -1151 0.372674982 -1152 -0.290707981 -1153 -0.945096374 -1154 -0.061804855 -1155 -0.116466267 -1156 -1.085773245 -1157 -0.262111809 -1158 0.060013621 -1159 2.899127783 -1160 -0.421866764 -1161 -0.152853994 -1162 -1.638545701 -1163 -0.965774522 -1164 -0.92247946 -1165 0.585327482 -1166 0.624676644 -1167 2.635646603 -1168 0.25656422 -1169 -0.950483428 -1170 0.249221233 -1171 -0.045452541 -1172 0.655135529 -1173 -0.966235162 -1174 -0.032343467 -1175 -1.168263955 -1176 0.798316045 -1177 1.778180435 -1178 -0.289597257 -1179 -1.184519876 -1180 -0.254802016 -1181 0.650184902 -1182 0.863137128 -1183 -0.373119283 -1184 -0.215473475 -1185 -1.158731067 -1186 -1.217574457 -1187 -0.756352277 -1188 -0.987318361 -1189 -0.05542385 -1190 1.945141258 -1191 0.126766327 -1192 0.484086392 -1193 0.247341272 -1194 1.256927478 -1195 0.120934422 -1196 1.251137178 -1197 0.11213065 -1198 -0.255394376 -1199 -0.704343711 -1200 0.309073939 -1201 0.969789266 -1202 0.560553671 -1203 -1.73167449 -1204 -0.88986668 -1205 -0.763761249 -1206 0.247837819 -1207 1.147544858 -1208 1.022735779 -1209 2.175788884 -1210 -0.372259146 -1211 0.467029106 -1212 1.271231585 -1213 -0.816182111 -1214 -0.217278052 -1215 1.749764562 -1216 0.784116353 -1217 1.00895146 -1218 -1.338294345 -1219 1.425240323 -1220 -0.094086206 -1221 1.228116101 -1222 -0.203301588 -1223 -1.654327906 -1224 0.050594562 -1225 0.196886195 -1226 1.683803824 -1227 1.825861623 -1228 0.711670122 -1229 -0.479574173 -1230 0.770407785 -1231 -0.127681681 -1232 0.417720184 -1233 0.989241049 -1234 -0.122745028 -1235 0.903104017 -1236 -0.04707973 -1237 -1.013600178 -1238 0.455859814 -1239 -0.328809768 -1240 -0.091027427 -1241 -0.562765727 -1242 -1.085281734 -1243 -1.308772229 -1244 -1.692134802 -1245 1.696933244 -1246 0.335855147 -1247 0.346514477 -1248 -0.317943433 -1249 0.084826325 -1250 0.550157165 -1251 1.529921972 -1252 -1.28412388 -1253 -0.401184408 -1254 1.214237498 -1255 0.126700221 -1256 0.245813798 -1257 0.670866613 -1258 1.128559982 -1259 0.380725762 -1260 0.112818265 -1261 -0.400405036 -1262 0.148326937 -1263 1.072023975 -1264 -0.474005936 -1265 -0.163670086 -1266 -0.585253233 -1267 -0.069401838 -1268 -0.102382726 -1269 0.082869514 -1270 -0.575252273 -1271 0.654560029 -1272 0.710048041 -1273 1.586952121 -1274 0.605934737 -1275 -0.976830985 -1276 -0.48497013 -1277 -1.279069462 -1278 0.678004442 -1279 -1.058694588 -1280 -0.378410689 -1281 -1.728059162 -1282 0.810285572 -1283 1.919715918 -1284 2.143843723 -1285 -0.880485338 -1286 -0.103939713 -1287 0.275933167 -1288 0.464716865 -1289 -0.743282636 -1290 0.078033888 -1291 0.623058776 -1292 -0.001004085 -1293 -0.458480028 -1294 0.594367206 -1295 0.441931522 -1296 1.324411665 -1297 -0.625429866 -1298 -0.528168714 -1299 -0.210256748 -1300 -3.07073383 -1301 0.306124992 -1302 -0.494857131 -1303 0.474057076 -1304 -2.202207526 -1305 0.290801763 -1306 -1.021201349 -1307 -0.554601655 -1308 0.179147148 -1309 0.957304052 -1310 -0.453517023 -1311 -0.591682664 -1312 -1.484474809 -1313 -2.595124427 -1314 -1.573641162 -1315 -0.067215536 -1316 0.676020392 -1317 -1.12888597 -1318 -0.547476447 -1319 0.454197935 -1320 0.689533258 -1321 -1.246461134 -1322 0.061263565 -1323 -1.036040358 -1324 -0.544417389 -1325 -0.960688598 -1326 -0.97919833 -1327 -1.368226674 -1328 0.607293951 -1329 -0.959312259 -1330 -0.401011668 -1331 -2.204550211 -1332 0.238270632 -1333 1.615338392 -1334 -0.16915305 -1335 -0.352846904 -1336 -1.346774835 -1337 -1.384385829 -1338 -0.339069044 -1339 0.233529978 -1340 -0.51258402 -1341 0.204337616 -1342 1.275979011 -1343 1.267159312 -1344 -0.376169226 -1345 0.320972559 -1346 0.831597277 -1347 -0.757943379 -1348 0.109901613 -1349 0.102133439 -1350 0.451237321 -1351 2.052758997 -1352 0.493403821 -1353 0.25310576 -1354 -0.645334744 -1355 2.697425219 -1356 0.425614822 -1357 -0.653118788 -1358 -0.52403994 -1359 -1.299451072 -1360 -1.440935626 -1361 0.688313531 -1362 2.117469304 -1363 0.258614024 -1364 1.325593234 -1365 0.206956521 -1366 -0.30619084 -1367 0.816710942 -1368 -1.047296308 -1369 -0.432358546 -1370 -0.3751806 -1371 -0.200321853 -1372 0.322079053 -1373 1.236091182 -1374 0.832670871 -1375 -0.274438859 -1376 0.002915741 -1377 0.936905737 -1378 -0.139925039 -1379 -1.223665231 -1380 -0.344035731 -1381 0.541830143 -1382 0.089550894 -1383 -0.399373201 -1384 -0.638971758 -1385 -0.42829274 -1386 0.066232207 -1387 0.172407444 -1388 -1.323501735 -1389 0.38213983 -1390 0.087665437 -1391 1.144264232 -1392 0.040586983 -1393 -0.646331893 -1394 -0.723917657 -1395 1.507763791 -1396 -0.627054227 -1397 -0.9371208 -1398 2.406349533 -1399 -0.093765111 -1400 0.516593832 -1401 0.272142965 -1402 2.462509816 -1403 -0.264848659 -1404 1.412332659 -1405 -0.354292211 -1406 0.11448595 -1407 -0.256964107 -1408 0.324339735 -1409 2.13272175 -1410 1.092728614 -1411 -1.91914295 -1412 -1.660628282 -1413 -0.358849657 -1414 0.168993835 -1415 -0.6352745 -1416 -0.80700903 -1417 -0.632799736 -1418 1.187958056 -1419 0.961249843 -1420 -0.170612173 -1421 1.551243121 -1422 1.362319567 -1423 -1.193773097 -1424 0.875966912 -1425 -0.301807687 -1426 1.087694951 -1427 0.638511876 -1428 -0.623304654 -1429 1.014578475 -1430 0.913151992 -1431 -1.413942561 -1432 -0.926906491 -1433 1.076826789 -1434 0.161473801 -1435 1.343436819 -1436 -0.239858673 -1437 0.419993321 -1438 -0.694705002 -1439 -0.839949363 -1440 0.046718338 -1441 0.020594471 -1442 0.02047847 -1443 -0.784002496 -1444 -0.849342873 -1445 1.424219963 -1446 -0.428727842 -1447 -1.076114332 -1448 0.245701561 -1449 0.795284639 -1450 -0.973539635 -1451 0.68104775 -1452 0.839216441 -1453 -1.52268479 -1454 0.195724793 -1455 -1.042926393 -1456 -1.129095651 -1457 0.764965186 -1458 0.478977433 -1459 -0.899265097 -1460 -0.949318827 -1461 1.614949018 -1462 -0.032344549 -1463 3.360742147 -1464 -0.396105414 -1465 -1.638622894 -1466 0.225093528 -1467 1.066021618 -1468 -0.008648247 -1469 -0.98582826 -1470 1.346256924 -1471 1.069673059 -1472 -0.065328933 -1473 -0.328719295 -1474 -0.987566838 -1475 -1.321288981 -1476 0.721593751 -1477 -0.041482784 -1478 1.826603053 -1479 -0.216176364 -1480 2.863000908 -1481 -1.490517904 -1482 2.377364868 -1483 -0.243495591 -1484 -0.911774065 -1485 -0.716668349 -1486 -0.458943849 -1487 -0.104759866 -1488 0.605636337 -1489 0.065383726 -1490 -0.017498077 -1491 -0.044832297 -1492 -0.738418872 -1493 -1.413405161 -1494 -2.739505592 -1495 -1.841888126 -1496 1.042864628 -1497 2.161190966 -1498 1.342689067 -1499 -0.214030949 -1500 1.042022067 -1501 -0.309085657 -1502 0.277460722 -1503 1.107321205 -1504 -0.585070535 -1505 0.156611861 -1506 -0.351925395 -1507 -0.775565552 -1508 0.114316536 -1509 -1.613789939 -1510 0.217823012 -1511 -1.191785627 -1512 0.593475868 -1513 1.533722175 -1514 -0.323433577 -1515 -0.806779254 -1516 -1.604844659 -1517 0.102191798 -1518 1.322960171 -1519 -0.361678357 -1520 -0.888166285 -1521 0.225253553 -1522 0.962730982 -1523 -0.168650299 -1524 1.778898795 -1525 -1.091458088 -1526 0.284315938 -1527 0.555151951 -1528 0.500225097 -1529 -0.218339028 -1530 0.911711179 -1531 -0.122564715 -1532 0.51501612 -1533 0.774050326 -1534 -0.549177499 -1535 2.174960386 -1536 1.062305575 -1537 -0.139650429 -1538 1.118406979 -1539 1.3584474 -1540 -0.788873132 -1541 0.381642474 -1542 1.439085857 -1543 -1.121210976 -1544 0.150952927 -1545 -1.790852942 -1546 2.013183813 -1547 0.210408816 -1548 -0.671184985 -1549 -1.860633407 -1550 1.09075947 -1551 2.881170535 -1552 -0.123701428 -1553 0.737024616 -1554 1.637156571 -1555 0.570382232 -1556 0.066575419 -1557 -1.362949123 -1558 -0.872602578 -1559 -0.191219854 -1560 -0.108035104 -1561 0.928527111 -1562 -0.015967741 -1563 0.560778368 -1564 0.887724002 -1565 0.056689206 -1566 -0.282033062 -1567 -0.029326086 -1568 -0.052530885 -1569 1.367972968 -1570 -1.79237768 -1571 1.116314751 -1572 -0.196780429 -1573 -0.055235898 -1574 0.916819527 -1575 0.085709656 -1576 0.535777802 -1577 1.089405707 -1578 -0.819426047 -1579 0.177940704 -1580 -0.982378265 -1581 -0.338772763 -1582 -1.231196175 -1583 0.824217401 -1584 -0.794775943 -1585 -0.364367553 -1586 -0.181752727 -1587 0.850876764 -1588 0.694380233 -1589 -0.344790023 -1590 -0.789343958 -1591 0.555591209 -1592 1.8095993 -1593 0.018399509 -1594 -0.2907814 -1595 -1.311454024 -1596 -0.453737701 -1597 -0.713099278 -1598 -1.871217814 -1599 -1.855595008 -1600 -1.50335959 -1601 0.152104007 -1602 -0.349240956 -1603 -1.679758922 -1604 -0.813097069 -1605 -0.68458957 -1606 -1.421559125 -1607 1.254645446 -1608 -0.402991842 -1609 -0.361254808 -1610 -0.007997992 -1611 -0.145461463 -1612 -0.895017449 -1613 -0.905708472 -1614 0.854875838 -1615 0.78699051 -1616 -1.410831808 -1617 -0.764928534 -1618 0.141505386 -1619 -0.388825946 -1620 -3.70286215 -1621 -0.002344433 -1622 0.510266988 -1623 -0.626913417 -1624 0.262031237 -1625 0.470105833 -1626 1.032987175 -1627 0.717039441 -1628 -1.760394966 -1629 -0.068211196 -1630 0.492303386 -1631 0.339595004 -1632 -0.194246437 -1633 1.231180779 -1634 -0.50732565 -1635 0.87349122 -1636 0.207690755 -1637 -0.404986842 -1638 0.184515962 -1639 1.660614188 -1640 -0.120491395 -1641 -0.063217475 -1642 1.805415859 -1643 -0.556181162 -1644 0.351102366 -1645 -1.548318268 -1646 1.796355923 -1647 -1.311573365 -1648 0.661765077 -1649 0.798712499 -1650 -1.177506257 -1651 1.35100198 -1652 0.829813176 -1653 1.1781559 -1654 -3.055804227 -1655 1.339799015 -1656 1.072880261 -1657 -0.05236323 -1658 0.806639372 -1659 -0.630502298 -1660 -0.627638126 -1661 -2.450544613 -1662 -1.053766923 -1663 -0.550824734 -1664 -0.171231715 -1665 -0.385789661 -1666 -1.163382622 -1667 -0.194048389 -1668 1.14223055 -1669 0.393505504 -1670 1.618124654 -1671 0.462184153 -1672 -0.533581448 -1673 0.096926262 -1674 -0.294813712 -1675 -0.38002565 -1676 0.096927543 -1677 0.650988938 -1678 0.213954904 -1679 1.732896243 -1680 0.297904352 -1681 -0.557323155 -1682 -1.038760499 -1683 0.004037229 -1684 -1.257539053 -1685 -0.142588258 -1686 -0.127348537 -1687 -0.573785889 -1688 1.176439789 -1689 0.175882701 -1690 1.598899928 -1691 -0.818855796 -1692 -0.262768199 -1693 -0.328304085 -1694 0.169610773 -1695 -1.047791513 -1696 0.47106748 -1697 -2.265356992 -1698 -0.716463072 -1699 -0.889267603 -1700 -1.301960146 -1701 0.202494957 -1702 0.48782136 -1703 0.866728518 -1704 1.504958339 -1705 0.888348354 -1706 -0.938815863 -1707 -1.839141412 -1708 0.733286953 -1709 -0.213362574 -1710 -0.11796977 -1711 -1.168636502 -1712 0.558730854 -1713 1.060481177 -1714 -0.673135343 -1715 1.487687016 -1716 -1.275335325 -1717 0.878705219 -1718 0.398474049 -1719 -1.558192588 -1720 0.77921354 -1721 -0.892247045 -1722 0.357419561 -1723 0.494176721 -1724 -0.539440003 -1725 0.000386206 -1726 -0.769741029 -1727 0.313805128 -1728 -0.963234471 -1729 -0.368789437 -1730 -0.17670233 -1731 -1.775071713 -1732 -0.80359913 -1733 -2.28906398 -1734 1.160313261 -1735 1.11157293 -1736 -0.301166138 -1737 -0.552782222 -1738 -0.373617313 -1739 0.141000488 -1740 1.377735871 -1741 1.426330638 -1742 0.54543983 -1743 -0.263229746 -1744 0.273568675 -1745 1.419312432 -1746 0.610486579 -1747 1.159710755 -1748 -1.075953673 -1749 -0.122767356 -1750 0.456580432 -1751 -0.900892946 -1752 -0.994932181 -1753 -0.110523942 -1754 2.151103267 -1755 -0.531178235 -1756 -1.012228907 -1757 -0.245966726 -1758 0.684606715 -1759 -0.220290503 -1760 -1.460385504 -1761 2.010610352 -1762 -0.002192636 -1763 -0.52455839 -1764 1.454112457 -1765 0.679916714 -1766 1.012329962 -1767 0.507871078 -1768 0.811905765 -1769 -0.790424859 -1770 -1.395229234 -1771 0.439227749 -1772 1.195216523 -1773 -0.218852214 -1774 -0.284945873 -1775 0.707535982 -1776 1.673377868 -1777 -1.005581537 -1778 0.74725325 -1779 -0.835813552 -1780 1.212757394 -1781 -0.734298675 -1782 -0.879431521 -1783 0.391702188 -1784 0.696680581 -1785 0.789079136 -1786 0.456885959 -1787 -0.648540679 -1788 0.045670802 -1789 0.60428694 -1790 0.550244104 -1791 -0.212835011 -1792 -0.279870367 -1793 -0.160626314 -1794 -1.188668928 -1795 -1.052250258 -1796 -1.231730315 -1797 -1.346895253 -1798 0.516688482 -1799 0.781976093 -1800 -0.189426418 -1801 -0.028605629 -1802 0.627499346 -1803 1.325068377 -1804 0.704091115 -1805 -0.48621016 -1806 0.201925071 -1807 -1.046947297 -1808 -0.248062056 -1809 0.593734865 -1810 -1.522367644 -1811 -0.025457207 -1812 0.786568759 -1813 0.363289977 -1814 1.110924487 -1815 1.159454467 -1816 -0.189238232 -1817 0.730048341 -1818 0.307839648 -1819 -1.751157307 -1820 -0.645708345 -1821 1.008548108 -1822 -1.034890794 -1823 -1.661555554 -1824 0.900352757 -1825 -0.400587569 -1826 0.564609602 -1827 0.339832802 -1828 -0.298687221 -1829 0.347723744 -1830 3.693496942 -1831 -2.130912807 -1832 1.541289144 -1833 -0.47601284 -1834 0.068199826 -1835 0.46396916 -1836 -1.157275219 -1837 0.507581971 -1838 -0.904760773 -1839 -0.220049177 -1840 1.786574782 -1841 0.213579574 -1842 -0.140211417 -1843 1.975969667 -1844 0.503422001 -1845 -0.812042034 -1846 -0.469889291 -1847 -0.23491214 -1848 -0.718618781 -1849 -1.07323202 -1850 -1.441798008 -1851 0.362405705 -1852 0.909489056 -1853 0.202703906 -1854 2.27416428 -1855 0.327187237 -1856 0.399475261 -1857 0.628978616 -1858 -0.025183235 -1859 1.000032899 -1860 -0.590545587 -1861 -0.032818971 -1862 -0.028781065 -1863 -1.053534864 -1864 1.475014844 -1865 -0.176441762 -1866 0.711109536 -1867 -0.69641032 -1868 0.350594227 -1869 0.377475451 -1870 -0.307750745 -1871 0.146895309 -1872 -0.514662908 -1873 0.745472631 -1874 0.930378357 -1875 0.017325869 -1876 -0.709126782 -1877 0.417243936 -1878 -0.785765765 -1879 0.758391905 -1880 -1.789961747 -1881 0.379559958 -1882 -0.425807452 -1883 -0.192454062 -1884 -1.619778255 -1885 -0.424469288 -1886 0.361915921 -1887 0.171364308 -1888 0.935082864 -1889 0.45967675 -1890 0.08101763 -1891 1.132373805 -1892 0.430440028 -1893 -0.265048055 -1894 -0.105163029 -1895 -0.101210977 -1896 -2.399938658 -1897 1.333351711 -1898 -2.14929494 -1899 -0.622364177 -1900 1.986477333 -1901 0.802585133 -1902 -1.521264346 -1903 -0.488202233 -1904 -0.277810625 -1905 -0.947364857 -1906 0.764979056 -1907 0.187834884 -1908 0.711689166 -1909 0.805136447 -1910 -0.623804919 -1911 -0.075521904 -1912 -1.505320664 -1913 -0.178328137 -1914 -1.175337612 -1915 0.007532854 -1916 1.693634074 -1917 0.39934206 -1918 1.018951417 -1919 1.782097998 -1920 0.24529696 -1921 0.122960316 -1922 -0.793892853 -1923 -1.171828415 -1924 0.91049509 -1925 0.551441805 -1926 0.459084534 -1927 -0.57390591 -1928 -0.777301236 -1929 0.004011636 -1930 -0.369480587 -1931 0.223654824 -1932 -0.871965946 -1933 0.319746012 -1934 -1.549238278 -1935 -0.536418186 -1936 -0.705528532 -1937 1.822280916 -1938 0.855597502 -1939 0.053770226 -1940 1.34126332 -1941 1.969972875 -1942 -0.739476257 -1943 -1.995902412 -1944 0.489120768 -1945 0.034361053 -1946 1.27088528 -1947 0.621256256 -1948 -0.632795668 -1949 -0.032324313 -1950 0.491188622 -1951 -0.325390827 -1952 -2.567078797 -1953 2.485538093 -1954 -0.297773014 -1955 -0.986998229 -1956 0.090259859 -1957 0.0076611 -1958 0.075320278 -1959 0.081887592 -1960 0.32305532 -1961 -1.296812931 -1962 -0.421831307 -1963 1.470741903 -1964 -0.577041622 -1965 0.460724949 -1966 1.452478064 -1967 -1.2372402 -1968 0.828051611 -1969 -0.296193072 -1970 1.891450262 -1971 0.113635025 -1972 1.295932522 -1973 1.511888965 -1974 0.302816978 -1975 -0.243137504 -1976 -0.086644585 -1977 0.683219595 -1978 0.964393331 -1979 -1.59380957 -1980 0.38958432 -1981 0.226917645 -1982 -0.67253529 -1983 -1.753656316 -1984 1.127862857 -1985 1.778305888 -1986 -0.204339916 -1987 -1.480750614 -1988 0.375779388 -1989 -0.155068248 -1990 1.106471754 -1991 0.281549537 -1992 1.583650841 -1993 1.477241842 -1994 0.911504457 -1995 -0.487011131 -1996 -1.588134669 -1997 0.257341847 -1998 -1.763500082 -1999 -0.243472216 -2000 -0.413288616 -2001 -1.407345571 -2002 -0.267425131 -2003 1.303271337 -2004 -1.40221421 -2005 -2.257613398 -2006 -0.290858053 -2007 0.57134319 -2008 0.847593759 -2009 -0.024084492 -2010 -0.475229421 -2011 1.669445403 -2012 -2.566050707 -2013 0.827720273 -2014 0.502219467 -2015 -2.058021197 -2016 -0.475683215 -2017 0.003002099 -2018 -1.622559761 -2019 0.474371697 -2020 -0.126464519 -2021 -1.505041232 -2022 1.590771553 -2023 0.536179261 -2024 -0.102886985 -2025 0.481897113 -2026 -0.811425239 -2027 -0.363718507 -2028 0.317592392 -2029 0.819193771 -2030 0.332012422 -2031 0.776122417 -2032 0.998553923 -2033 0.557246096 -2034 1.260545383 -2035 1.97319538 -2036 -1.104521829 -2037 -0.310148206 -2038 0.257202435 -2039 2.423462946 -2040 0.026904419 -2041 -1.110942447 -2042 0.700536969 -2043 0.758977229 -2044 -1.715144579 -2045 -0.053627343 -2046 -0.052304333 -2047 1.628756739 -2048 -0.484883467 -2049 0.031121214 -2050 1.506492589 -2051 -1.630241224 -2052 0.077894652 -2053 0.341682552 -2054 -0.387412229 -2055 1.037806651 -2056 -0.530238351 -2057 1.032967902 -2058 -0.179055708 -2059 1.17127723 -2060 0.685684896 -2061 -0.062514999 -2062 -0.700865399 -2063 0.621416897 -2064 1.21811577 -2065 -1.768058056 -2066 -0.350537031 -2067 0.150335084 -2068 -0.956889919 -2069 -0.109594099 -2070 1.777820055 -2071 0.776000193 -2072 -0.82580888 -2073 -0.444958301 -2074 -0.121342949 -2075 0.147482867 -2076 -0.494562264 -2077 1.680806468 -2078 -1.254264005 -2079 -0.35414054 -2080 -0.366300537 -2081 0.413722815 -2082 -0.508879663 -2083 -0.937193372 -2084 1.271096589 -2085 0.43191345 -2086 -0.298006365 -2087 0.036522536 -2088 1.880245565 -2089 0.124123506 -2090 0.28512778 -2091 -0.988096897 -2092 -0.797605521 -2093 -1.349410418 -2094 -0.946749486 -2095 1.085810211 -2096 0.433038308 -2097 -1.160087058 -2098 -0.37783758 -2099 -0.739030196 -2100 -0.836511368 -2101 1.40854777 -2102 0.460433092 -2103 -1.973821221 -2104 -1.196357108 -2105 -2.756246145 -2106 1.520438292 -2107 1.590532187 -2108 -0.451985596 -2109 -0.092485896 -2110 1.365687502 -2111 -0.646662983 -2112 -1.498838161 -2113 -1.042875463 -2114 0.606459928 -2115 -1.358329389 -2116 1.332131675 -2117 -0.276305037 -2118 0.444087813 -2119 2.006317075 -2120 1.266914199 -2121 -0.690732334 -2122 0.873659725 -2123 -0.242604928 -2124 1.01845736 -2125 0.585856554 -2126 -1.651893232 -2127 -1.085750946 -2128 -0.43129556 -2129 1.7012254 -2130 -0.159662491 -2131 0.64384151 -2132 -1.175867673 -2133 1.392628744 -2134 0.0104397 -2135 -1.478786964 -2136 0.048254641 -2137 0.76289515 -2138 -0.276197529 -2139 0.194194111 -2140 0.611138596 -2141 -1.069526461 -2142 0.389635506 -2143 1.243676692 -2144 1.704719337 -2145 0.136055053 -2146 -0.065078488 -2147 -0.192773964 -2148 0.786450959 -2149 0.279487404 -2150 0.853147441 -2151 1.310045122 -2152 1.598013114 -2153 -0.21955259 -2154 1.703299079 -2155 0.321587739 -2156 -0.606683506 -2157 0.157015015 -2158 0.427213697 -2159 0.001083903 -2160 -1.61787735 -2161 0.017407245 -2162 0.630013987 -2163 0.646404305 -2164 -1.978152484 -2165 -0.700201194 -2166 -0.068701408 -2167 0.651626966 -2168 1.416573036 -2169 0.164570023 -2170 0.923802266 -2171 -0.90233767 -2172 0.276635223 -2173 -0.196144048 -2174 -0.227388078 -2175 0.301877162 -2176 0.416346067 -2177 0.142551997 -2178 -0.090819856 -2179 -0.808246979 -2180 2.454687816 -2181 1.550740856 -2182 0.978740371 -2183 0.306911381 -2184 -0.094855833 -2185 -0.705375411 -2186 1.448514739 -2187 0.599699099 -2188 -0.880880376 -2189 -0.612084473 -2190 0.662154749 -2191 0.994863898 -2192 -0.792857445 -2193 1.907065065 -2194 0.160969549 -2195 1.422068955 -2196 -0.376402222 -2197 0.935576627 -2198 -0.180087156 -2199 -0.28378605 -2200 0.476005028 -2201 1.223097221 -2202 -0.124309367 -2203 -2.233422478 -2204 -0.043021866 -2205 -1.143943158 -2206 -1.213151322 -2207 0.824792652 -2208 1.129144253 -2209 0.887757846 -2210 1.118684948 -2211 2.387292283 -2212 -0.788238904 -2213 1.905609787 -2214 0.051113696 -2215 1.37650912 -2216 -1.333656013 -2217 -0.663585841 -2218 0.280832865 -2219 0.325395727 -2220 0.591906178 -2221 -0.634643499 -2222 -0.475594828 -2223 0.560505822 -2224 -1.170702951 -2225 -1.372004118 -2226 0.0797799 -2227 -0.753056594 -2228 0.237009069 -2229 -0.858798086 -2230 1.57257751 -2231 -1.460494148 -2232 -0.883030278 -2233 -1.625196479 -2234 -0.069635948 -2235 -0.091076947 -2236 1.515211408 -2237 -0.357586946 -2238 1.178631611 -2239 -1.729206373 -2240 0.271323384 -2241 0.227359568 -2242 -0.907887846 -2243 0.52929309 -2244 1.913460489 -2245 1.109893894 -2246 -0.888620757 -2247 0.328531056 -2248 -0.584472611 -2249 -0.745936157 -2250 -0.526161959 -2251 0.918603284 -2252 1.168505073 -2253 -0.277047381 -2254 1.04041442 -2255 0.888725851 -2256 -0.678876082 -2257 1.399554229 -2258 0.123553058 -2259 0.274359524 -2260 0.842209302 -2261 -0.235220959 -2262 -0.401759713 -2263 -0.440669035 -2264 -0.210185516 -2265 -0.405906742 -2266 1.347599592 -2267 -0.353976027 -2268 -0.792524555 -2269 1.005305334 -2270 -0.964256748 -2271 0.42057614 -2272 0.783024696 -2273 -1.236697903 -2274 -0.64445077 -2275 0.328071009 -2276 1.218171276 -2277 -1.14206762 -2278 0.488747425 -2279 -0.388684963 -2280 -0.053460143 -2281 0.355683253 -2282 -1.388479723 -2283 -0.371905797 -2284 0.418272932 -2285 0.528791445 -2286 -1.046639636 -2287 -1.018167701 -2288 0.866767483 -2289 -0.42005925 -2290 1.263598934 -2291 -1.40028706 -2292 -1.345433383 -2293 0.945096893 -2294 1.185792027 -2295 0.482039967 -2296 -0.86313825 -2297 1.581956386 -2298 0.78397236 -2299 0.754152392 -2300 0.313728014 -2301 -0.214046923 -2302 -2.180557956 -2303 -0.348674554 -2304 0.179490863 -2305 0.531626446 -2306 0.968896365 -2307 -0.167432249 -2308 0.382751173 -2309 1.550295092 -2310 -0.769886057 -2311 0.663808591 -2312 0.725697283 -2313 0.175139105 -2314 -0.359565498 -2315 0.024955488 -2316 2.048454297 -2317 -0.820737701 -2318 -0.915638298 -2319 0.454415157 -2320 1.570825539 -2321 1.876836556 -2322 0.874119096 -2323 -1.278349953 -2324 0.187275736 -2325 -0.538362213 -2326 0.393347381 -2327 -1.980487093 -2328 0.118418941 -2329 -0.450526742 -2330 -1.394779638 -2331 -0.153905371 -2332 -1.208964557 -2333 0.432131743 -2334 1.107220819 -2335 0.979755713 -2336 -0.794979317 -2337 -0.822723112 -2338 -0.085047269 -2339 -0.484445864 -2340 -1.352848976 -2341 1.624698977 -2342 0.311191133 -2343 1.212634293 -2344 1.696793904 -2345 0.601048716 -2346 -0.679708875 -2347 -0.191597871 -2348 -0.019227569 -2349 1.868666291 -2350 0.737647953 -2351 -0.099420661 -2352 2.397360122 -2353 0.08468701 -2354 1.4317352 -2355 -1.76320045 -2356 -0.702050309 -2357 1.631285641 -2358 -0.41021459 -2359 1.562617527 -2360 1.598579425 -2361 1.423822957 -2362 -1.451486784 -2363 0.629809896 -2364 0.641880546 -2365 -0.593727666 -2366 1.51487648 -2367 0.888105352 -2368 0.207151635 -2369 -0.029580163 -2370 0.100153361 -2371 -1.821927185 -2372 1.323502948 -2373 0.396312074 -2374 -0.175159913 -2375 0.140153019 -2376 0.967214081 -2377 0.071344789 -2378 -1.604559033 -2379 0.922265004 -2380 0.387687101 -2381 -0.24383415 -2382 1.477924975 -2383 0.650757954 -2384 0.239010737 -2385 0.736348058 -2386 -1.01754089 -2387 -2.31211973 -2388 0.259657327 -2389 0.130983818 -2390 -0.663467699 -2391 -0.80309624 -2392 0.51011325 -2393 1.343358468 -2394 0.27303806 -2395 -0.924364163 -2396 -1.099878344 -2397 0.99317084 -2398 0.476853671 -2399 -2.646800062 -2400 1.110680413 -2401 -1.106582904 -2402 -0.852502117 -2403 1.239386176 -2404 1.021579378 -2405 -0.393316927 -2406 1.008445963 -2407 -0.12763867 -2408 0.855235269 -2409 -0.008414146 -2410 0.648632093 -2411 -1.186171142 -2412 0.062012452 -2413 -0.267219243 -2414 -0.551074561 -2415 0.978029314 -2416 0.817749562 -2417 -3.145471204 -2418 -0.825857113 -2419 -0.684082885 -2420 1.153410416 -2421 1.563619343 -2422 1.336850058 -2423 1.46221232 -2424 1.237528347 -2425 -0.075275247 -2426 -0.305412552 -2427 1.311582256 -2428 1.454658111 -2429 1.238491921 -2430 -0.044735295 -2431 0.035285872 -2432 1.312121409 -2433 0.317397884 -2434 0.080894009 -2435 -0.599749632 -2436 1.110587444 -2437 1.52608767 -2438 -1.294779354 -2439 -0.980474276 -2440 0.022590592 -2441 -0.474138037 -2442 -0.343036004 -2443 0.264353504 -2444 0.172239139 -2445 -0.441606675 -2446 0.192776955 -2447 0.650013702 -2448 1.969015796 -2449 0.549570375 -2450 0.367757514 -2451 0.034329048 -2452 1.261662615 -2453 0.345128954 -2454 1.034518116 -2455 1.280368986 -2456 0.125018165 -2457 1.414437695 -2458 -0.555813224 -2459 -0.321681573 -2460 0.362266949 -2461 1.1196206 -2462 0.759047427 -2463 0.507170714 -2464 -0.802388114 -2465 -1.32393098 -2466 1.046031991 -2467 2.011289695 -2468 -0.141721926 -2469 0.107973825 -2470 2.452432475 -2471 0.55341791 -2472 -1.152692486 -2473 0.023723839 -2474 -0.335590695 -2475 -0.198849277 -2476 -0.37050799 -2477 -0.768413225 -2478 1.296483428 -2479 -0.026540856 -2480 0.13432784 -2481 1.015755617 -2482 -0.582063812 -2483 -1.164371171 -2484 -0.762226619 -2485 0.142969931 -2486 -0.094148398 -2487 -0.423302974 -2488 -1.600306843 -2489 0.699210054 -2490 0.452073344 -2491 0.559676324 -2492 -0.926206712 -2493 -0.497097456 -2494 -0.96636324 -2495 1.65093277 -2496 1.347439666 -2497 0.304782927 -2498 1.287447638 -2499 -0.71434822 -2500 -0.637439574 -2501 -1.459344402 -2502 -0.811946113 -2503 -0.817028658 -2504 0.531376222 -2505 -0.430457195 -2506 -0.680809943 -2507 0.192602352 -2508 -1.031199644 -2509 -0.819917372 -2510 1.264678056 -2511 0.727648833 -2512 0.350522771 -2513 -0.526173377 -2514 -0.264656183 -2515 0.715121705 -2516 0.835069178 -2517 -0.679070797 -2518 -0.401083108 -2519 0.215991776 -2520 -0.589855671 -2521 -0.334430262 -2522 1.035280701 -2523 -1.493562335 -2524 -0.659110582 -2525 -1.305022496 -2526 -0.269789452 -2527 0.61633541 -2528 -3.320345987 -2529 -0.627102225 -2530 1.314138338 -2531 -0.181680264 -2532 -0.044461195 -2533 1.121287244 -2534 0.04914931 -2535 2.356615625 -2536 -0.155134718 -2537 1.181822245 -2538 -0.848955029 -2539 0.15424419 -2540 0.771480105 -2541 1.809940496 -2542 -0.175104177 -2543 -1.281307025 -2544 0.458440028 -2545 0.917748787 -2546 -1.863046269 -2547 -1.214484673 -2548 0.786825623 -2549 0.968819808 -2550 1.770231367 -2551 -0.861802662 -2552 -0.254553991 -2553 1.299947641 -2554 -0.244678162 -2555 -1.28835185 -2556 -1.137191114 -2557 0.647424736 -2558 0.997664068 -2559 0.463715168 -2560 0.977701521 -2561 1.71887517 -2562 -0.343555493 -2563 -1.383076279 -2564 0.316339013 -2565 1.647561053 -2566 -0.703353171 -2567 1.116676435 -2568 -0.606827925 -2569 1.818494714 -2570 -0.419281965 -2571 1.503274627 -2572 -0.724793208 -2573 1.622791457 -2574 0.657348678 -2575 1.490817966 -2576 -0.334546322 -2577 -2.307889732 -2578 1.870231716 -2579 0.512660823 -2580 -2.274861252 -2581 0.035952541 -2582 -0.116476244 -2583 0.705290856 -2584 0.97984403 -2585 0.272524888 -2586 0.189724 -2587 0.274381248 -2588 -0.488595648 -2589 0.132183279 -2590 1.617809223 -2591 -1.477798461 -2592 0.075025671 -2593 0.268697696 -2594 0.150552771 -2595 0.62877214 -2596 -1.27959667 -2597 0.536798925 -2598 0.510038822 -2599 0.039695033 -2600 -0.714147763 -2601 0.685795154 -2602 -0.250415555 -2603 1.247231179 -2604 -0.385499961 -2605 0.541441625 -2606 0.639017128 -2607 1.695194216 -2608 -0.934919302 -2609 -0.199878629 -2610 0.712247508 -2611 0.885191502 -2612 -0.507737589 -2613 -0.375985073 -2614 1.392270785 -2615 -0.202666441 -2616 -0.421186277 -2617 -0.191823346 -2618 -0.344653463 -2619 -0.70220867 -2620 1.70006197 -2621 1.28958189 -2622 1.956643921 -2623 -1.145112623 -2624 -0.901634676 -2625 0.586532709 -2626 -0.618566608 -2627 -1.052508012 -2628 -0.095473032 -2629 1.782356528 -2630 -0.651516517 -2631 0.125092052 -2632 -0.511438927 -2633 0.234374754 -2634 -1.671313417 -2635 1.512021928 -2636 0.391572278 -2637 0.626189518 -2638 0.659898529 -2639 -2.349100404 -2640 0.962111436 -2641 -0.979867734 -2642 -1.571751621 -2643 0.48994048 -2644 0.411895515 -2645 0.845056611 -2646 -0.165488861 -2647 0.923195377 -2648 0.376408589 -2649 -1.257372937 -2650 -0.557810679 -2651 -0.679541202 -2652 1.104665336 -2653 -0.275996478 -2654 -2.443402569 -2655 0.995760186 -2656 0.024892946 -2657 0.903741756 -2658 1.581896753 -2659 0.738615416 -2660 1.216169833 -2661 -0.099273397 -2662 1.848092733 -2663 -0.550545202 -2664 -1.016918153 -2665 0.578486457 -2666 -0.563129503 -2667 -0.452668671 -2668 0.465774549 -2669 2.480073635 -2670 0.003276613 -2671 1.171181272 -2672 1.073425939 -2673 0.262435283 -2674 -2.014383335 -2675 -0.463797672 -2676 -1.311797665 -2677 0.24447936 -2678 0.068490148 -2679 -0.753855974 -2680 -0.71320943 -2681 -0.2510368 -2682 -1.443750448 -2683 0.455653929 -2684 -0.035262481 -2685 1.675833502 -2686 1.038679549 -2687 -0.2554965 -2688 2.187275454 -2689 -0.015704504 -2690 0.208690166 -2691 -2.124421277 -2692 -0.508964104 -2693 -1.100136238 -2694 0.514896446 -2695 -0.239575713 -2696 -1.755623385 -2697 0.481260886 -2698 1.231513415 -2699 0.210734851 -2700 -1.174642978 -2701 1.099842093 -2702 -0.76617303 -2703 1.277049558 -2704 -1.505816713 -2705 -0.522223567 -2706 0.995390203 -2707 0.901572938 -2708 -0.452235183 -2709 -0.452363562 -2710 -0.870976793 -2711 -0.616122133 -2712 0.819232185 -2713 1.181548131 -2714 0.37340504 -2715 1.130659389 -2716 -0.279887629 -2717 -0.447592003 -2718 -0.51045004 -2719 -0.430663907 -2720 1.721613722 -2721 0.487701572 -2722 -0.033625274 -2723 1.346207984 -2724 -0.251970666 -2725 2.280001758 -2726 0.05428262 -2727 -1.260819104 -2728 -0.020849488 -2729 -0.283322065 -2730 0.370445992 -2731 0.417730993 -2732 0.72827579 -2733 1.531353771 -2734 -1.043318379 -2735 -0.160787192 -2736 -1.172108493 -2737 -1.52997937 -2738 -0.194507046 -2739 -1.348387451 -2740 1.523553268 -2741 -0.798631603 -2742 -0.950967936 -2743 -0.063765964 -2744 0.912214748 -2745 -0.808583994 -2746 -0.127436697 -2747 -0.031285801 -2748 1.270955514 -2749 -0.913712235 -2750 0.728903499 -2751 0.616953305 -2752 0.081942413 -2753 -1.604980449 -2754 -0.459442109 -2755 0.053902534 -2756 -2.03637142 -2757 -0.916128208 -2758 -0.587695654 -2759 -1.740122798 -2760 -0.388623062 -2761 0.242722477 -2762 -0.01009862 -2763 -2.123808184 -2764 -0.478025013 -2765 -0.170926793 -2766 0.153835496 -2767 -1.172302386 -2768 -0.236246325 -2769 1.421604009 -2770 0.628511751 -2771 0.028271346 -2772 -0.358109951 -2773 0.894023987 -2774 -0.079119757 -2775 0.736656559 -2776 -0.720989472 -2777 -1.622008535 -2778 0.330785094 -2779 -0.491407592 -2780 0.802859808 -2781 0.691993959 -2782 -0.191235929 -2783 -2.102719503 -2784 0.958605562 -2785 0.66614115 -2786 1.303585192 -2787 0.32029201 -2788 -0.068754722 -2789 -0.263636396 -2790 1.457265151 -2791 1.089906797 -2792 -0.006774601 -2793 -0.511933694 -2794 -0.340126825 -2795 -1.097075286 -2796 0.578117129 -2797 2.848814673 -2798 -0.198624397 -2799 -0.410395101 -2800 2.146871621 -2801 -1.1994984 -2802 -0.519395208 -2803 -1.240952421 -2804 0.231784407 -2805 -0.912421405 -2806 -0.131773515 -2807 2.280690352 -2808 -0.890544139 -2809 1.092778068 -2810 0.638016978 -2811 -0.231677723 -2812 0.027208565 -2813 -2.098453634 -2814 0.636090931 -2815 0.246885386 -2816 -1.26468875 -2817 0.678963475 -2818 -0.241175943 -2819 -0.851064537 -2820 1.770176629 -2821 -1.111575472 -2822 0.562177316 -2823 0.825759922 -2824 0.388514125 -2825 0.942357646 -2826 -0.354391878 -2827 0.402683801 -2828 -0.424582346 -2829 0.325748073 -2830 -0.029396406 -2831 -0.343070458 -2832 -0.00060984 -2833 -1.538816602 -2834 -0.579142186 -2835 3.364613058 -2836 -2.502253307 -2837 -0.399942188 -2838 -0.121524991 -2839 0.338289019 -2840 0.790006111 -2841 -0.050358789 -2842 0.331673497 -2843 0.676197855 -2844 0.402412776 -2845 1.69929648 -2846 -0.321283648 -2847 0.911835475 -2848 1.34551371 -2849 -0.673599261 -2850 0.957952061 -2851 0.279436957 -2852 0.422236089 -2853 0.458370917 -2854 -0.765985977 -2855 0.349436699 -2856 0.125981401 -2857 0.386740884 -2858 0.401460085 -2859 -0.459206276 -2860 -0.648448175 -2861 0.521478929 -2862 0.979527739 -2863 -1.773169051 -2864 0.307778859 -2865 -0.229626145 -2866 0.966344135 -2867 1.808718565 -2868 0.908038156 -2869 0.239742892 -2870 0.850411416 -2871 -0.577051279 -2872 -1.015874495 -2873 0.015306899 -2874 2.518345321 -2875 -0.88997627 -2876 0.902777054 -2877 -0.908612424 -2878 -1.053882227 -2879 -1.692165242 -2880 0.220785496 -2881 -1.095204945 -2882 -0.512735155 -2883 -0.222208417 -2884 0.378252197 -2885 -1.163637624 -2886 1.970955497 -2887 1.288300231 -2888 -1.62460471 -2889 1.98439724 -2890 -0.087417277 -2891 0.768644838 -2892 -1.03772779 -2893 -0.886343078 -2894 -0.12096099 -2895 -1.858493855 -2896 0.277156655 -2897 0.293325178 -2898 -0.321532817 -2899 -0.363432686 -2900 -0.746364218 -2901 0.421318223 -2902 -0.915134879 -2903 0.117173179 -2904 -1.741210432 -2905 -0.829060941 -2906 -0.981268311 -2907 -0.727913629 -2908 0.711145751 -2909 0.130478905 -2910 0.508952656 -2911 -0.29931167 -2912 -0.643821291 -2913 -1.115098125 -2914 0.168520128 -2915 -1.417263089 -2916 -1.505678417 -2917 1.162097171 -2918 0.153752463 -2919 0.894783478 -2920 -1.232900735 -2921 0.845040507 -2922 -0.366436341 -2923 1.956492478 -2924 1.135428421 -2925 -0.739531055 -2926 -0.940029566 -2927 -0.038718983 -2928 -1.275790215 -2929 -0.844733673 -2930 -1.61244535 -2931 0.002323482 -2932 -0.442630049 -2933 0.010854755 -2934 -0.694756016 -2935 0.16643555 -2936 1.203909657 -2937 0.786817827 -2938 0.735789812 -2939 0.097959795 -2940 0.393615772 -2941 -0.962365816 -2942 1.986438046 -2943 -0.78176768 -2944 -0.793931837 -2945 1.631780681 -2946 0.908607873 -2947 -0.096316981 -2948 -0.058674386 -2949 0.584030752 -2950 1.875856313 -2951 0.634282737 -2952 -1.38688777 -2953 -0.866018337 -2954 -1.071973506 -2955 -0.2463436 -2956 1.198641784 -2957 1.708768378 -2958 -1.415594636 -2959 -2.042710124 -2960 -1.380182221 -2961 0.636045474 -2962 -1.78596722 -2963 0.600266974 -2964 -1.889194301 -2965 0.174030021 -2966 -0.540405742 -2967 0.731819172 -2968 -0.232657389 -2969 0.676537531 -2970 1.488500926 -2971 -0.333912502 -2972 -0.905962502 -2973 -1.342055705 -2974 -0.718918795 -2975 1.862074468 -2976 1.977506085 -2977 -0.681720962 -2978 0.491886571 -2979 -1.115712197 -2980 -1.271522509 -2981 -0.493574629 -2982 -0.72202798 -2983 -0.543522434 -2984 0.316236052 -2985 -0.882736413 -2986 -0.747241711 -2987 -0.015802181 -2988 1.270140519 -2989 0.196841741 -2990 0.203512496 -2991 0.591362338 -2992 -1.127234667 -2993 -0.37232219 -2994 1.998359078 -2995 0.094157446 -2996 -0.964802754 -2997 -1.918825234 -2998 -0.689153701 -2999 0.213447233 -3000 -0.950996458 -3001 0.743677593 -3002 0.796120481 -3003 -0.411710752 -3004 -0.704037348 -3005 0.594379906 -3006 0.692072172 -3007 -2.016264484 -3008 -1.212942309 -3009 -0.505997659 -3010 -0.409591591 -3011 0.619166697 -3012 -0.039625859 -3013 0.899353283 -3014 -0.581736165 -3015 -1.617016983 -3016 0.10881189 -3017 -0.398343687 -3018 -1.038820924 -3019 -0.805553842 -3020 0.059831635 -3021 -0.47681932 -3022 -0.482066857 -3023 -0.451901505 -3024 -0.951810286 -3025 -0.282919459 -3026 -1.054046885 -3027 0.680544667 -3028 2.305432365 -3029 0.814222744 -3030 -0.75062428 -3031 0.307324218 -3032 2.090380473 -3033 -0.337565099 -3034 0.332547364 -3035 0.656575369 -3036 -0.104010075 -3037 0.234898912 -3038 -1.2339208 -3039 -0.267204165 -3040 -0.539314624 -3041 1.249965281 -3042 1.014578026 -3043 1.912586853 -3044 -1.884429372 -3045 -0.060941536 -3046 -0.254263458 -3047 -0.351569283 -3048 0.855649018 -3049 1.181216322 -3050 2.454512893 -3051 0.87899496 -3052 2.025137047 -3053 0.136449274 -3054 -0.844987056 -3055 -0.572327419 -3056 1.384363629 -3057 -1.43634002 -3058 0.935482162 -3059 0.316533371 -3060 -0.040314419 -3061 -1.017569219 -3062 -0.09452286 -3063 0.001868817 -3064 -1.299048565 -3065 0.404137833 -3066 1.8638741 -3067 -1.399927264 -3068 -0.336036127 -3069 1.279541258 -3070 -0.887900753 -3071 -0.583338335 -3072 0.836306685 -3073 0.271334729 -3074 0.650660326 -3075 -1.072725962 -3076 0.684874739 -3077 -2.17317185 -3078 1.477109817 -3079 -1.077373748 -3080 -1.95146906 -3081 1.042385598 -3082 0.18683356 -3083 1.872054856 -3084 -0.110892045 -3085 -1.350223241 -3086 -1.163194418 -3087 -0.009518952 -3088 -1.131693163 -3089 -0.679007938 -3090 1.314531691 -3091 -0.398738653 -3092 1.273271753 -3093 1.299015707 -3094 2.297906885 -3095 -0.494159368 -3096 -0.000474041 -3097 1.10458045 -3098 -0.173240281 -3099 -0.07932719 -3100 -0.963275212 -3101 0.215510434 -3102 -0.466957928 -3103 0.312505555 -3104 1.481984685 -3105 -0.040566929 -3106 1.016657668 -3107 1.154163063 -3108 0.397763505 -3109 -1.662017583 -3110 -0.341456601 -3111 -0.496518616 -3112 0.538861026 -3113 -0.056660618 -3114 -0.170741765 -3115 -0.332559745 -3116 0.354804521 -3117 -0.711620086 -3118 -0.444001426 -3119 0.421308488 -3120 -0.717493815 -3121 0.407602713 -3122 -1.322178355 -3123 0.576121279 -3124 -1.062658482 -3125 0.931684722 -3126 0.218573453 -3127 0.894550892 -3128 0.368405171 -3129 0.528062526 -3130 -0.373710317 -3131 -2.121610534 -3132 -0.987524295 -3133 0.55980073 -3134 -0.073761445 -3135 0.065480847 -3136 -0.341632662 -3137 0.09152681 -3138 1.28522935 -3139 0.842115006 -3140 -1.746373374 -3141 -0.801790004 -3142 1.192914612 -3143 0.439794845 -3144 -0.268123717 -3145 -1.774361423 -3146 0.258935166 -3147 0.351301207 -3148 -0.715434221 -3149 -0.205856524 -3150 0.443869931 -3151 0.020367964 -3152 -0.68396282 -3153 0.118329291 -3154 -1.679168415 -3155 -0.043760816 -3156 0.103186003 -3157 0.425986747 -3158 -1.160382771 -3159 -0.740137362 -3160 0.211706998 -3161 0.474028496 -3162 0.529934802 -3163 0.566156732 -3164 -0.533691075 -3165 -0.940053174 -3166 -0.422494867 -3167 1.001946876 -3168 1.262467531 -3169 -0.458774143 -3170 -0.425917021 -3171 -0.8511515 -3172 0.910417837 -3173 1.225462159 -3174 0.630062534 -3175 -1.094564588 -3176 -1.319667023 -3177 -1.019097828 -3178 -1.494771835 -3179 2.042046822 -3180 0.558746333 -3181 -0.86372764 -3182 -0.855933502 -3183 -0.7965938 -3184 0.326472515 -3185 -0.715010838 -3186 -0.176815621 -3187 0.04554198 -3188 -0.109359873 -3189 1.163253467 -3190 0.47773967 -3191 -1.515947586 -3192 -0.130403542 -3193 2.128643561 -3194 0.295353465 -3195 -1.144970071 -3196 2.267687037 -3197 -0.12825442 -3198 1.153413164 -3199 -2.871145904 -3200 -0.54895895 -3201 -0.762037887 -3202 0.912818345 -3203 -0.481265906 -3204 0.01315407 -3205 1.655777093 -3206 -0.278293897 -3207 0.209215575 -3208 1.780231998 -3209 0.398465532 -3210 -0.443851507 -3211 -0.093667589 -3212 -0.430860889 -3213 1.451448308 -3214 -0.473623071 -3215 0.277089431 -3216 -0.026798673 -3217 -0.74404487 -3218 0.150332828 -3219 -0.444602092 -3220 -0.438062059 -3221 0.066799108 -3222 -0.954891989 -3223 0.006209369 -3224 0.133847196 -3225 1.386216938 -3226 -0.118681154 -3227 -0.163418478 -3228 1.297283275 -3229 -0.76625098 -3230 0.067876717 -3231 -1.753220035 -3232 -0.92804515 -3233 -1.433915694 -3234 -0.94397522 -3235 0.110668898 -3236 -0.402241853 -3237 0.377929855 -3238 0.521116084 -3239 -0.709826224 -3240 0.851147968 -3241 1.52432934 -3242 -1.606365076 -3243 -0.228389314 -3244 -0.757926883 -3245 0.524293182 -3246 -0.182860064 -3247 -1.252972973 -3248 0.275883362 -3249 0.156988392 -3250 0.192384531 -3251 0.437543001 -3252 0.206654178 -3253 1.471859591 -3254 -0.868803346 -3255 -0.077447062 -3256 -1.203781581 -3257 -0.202675822 -3258 0.477512088 -3259 -1.014784007 -3260 -1.274694733 -3261 0.838114737 -3262 -0.135399494 -3263 -0.255242737 -3264 1.307066194 -3265 1.328424105 -3266 -1.015527785 -3267 -1.026741883 -3268 -0.894337532 -3269 -1.11538912 -3270 0.026486749 -3271 -0.207249041 -3272 2.714038847 -3273 -1.389011361 -3274 0.811966694 -3275 1.169582948 -3276 0.473861314 -3277 0.403395523 -3278 0.647451797 -3279 0.00983025 -3280 1.404699449 -3281 1.145131565 -3282 -1.00418689 -3283 0.565561224 -3284 0.091157245 -3285 1.637748262 -3286 0.692433066 -3287 -0.479478573 -3288 1.771126898 -3289 -0.184106094 -3290 1.184024486 -3291 0.374253934 -3292 -1.426998131 -3293 0.137416828 -3294 1.1218916 -3295 -0.878948659 -3296 1.070468109 -3297 -1.6957692 -3298 1.307825 -3299 1.249992208 -3300 -0.319345742 -3301 -1.291523851 -3302 0.730682598 -3303 0.537168562 -3304 1.307763576 -3305 0.892988142 -3306 -0.787098963 -3307 -1.067200084 -3308 0.185630092 -3309 0.592377829 -3310 0.250185568 -3311 -0.82204645 -3312 0.623316299 -3313 0.718097855 -3314 -0.902595011 -3315 1.516874286 -3316 -1.544522786 -3317 -0.307906205 -3318 -0.266486728 -3319 -0.582804723 -3320 -0.967249262 -3321 0.192031112 -3322 0.691815811 -3323 2.039955855 -3324 0.210919246 -3325 1.173417788 -3326 -1.128025116 -3327 1.67274211 -3328 0.49878017 -3329 0.803534029 -3330 -0.818355591 -3331 0.811380958 -3332 -0.036210112 -3333 -1.720620044 -3334 1.157485846 -3335 0.107799885 -3336 -1.350666198 -3337 -0.615029882 -3338 0.203938498 -3339 -1.549771472 -3340 0.371047638 -3341 0.227740766 -3342 -1.343365936 -3343 1.314269721 -3344 -1.153223627 -3345 1.54922686 -3346 0.779630131 -3347 -0.038422054 -3348 -0.145442316 -3349 1.303595436 -3350 0.469927932 -3351 1.090798521 -3352 -0.0673522 -3353 1.137173763 -3354 0.587948195 -3355 -0.118169897 -3356 -0.867730682 -3357 -0.444294307 -3358 -0.130640431 -3359 -0.226116695 -3360 -1.227298157 -3361 0.137162593 -3362 1.133639027 -3363 1.382919567 -3364 -1.04247994 -3365 0.992943794 -3366 0.957685511 -3367 0.623397219 -3368 0.4579835 -3369 -1.010810792 -3370 0.303925917 -3371 0.588581991 -3372 1.268494879 -3373 1.440565382 -3374 0.853772067 -3375 -1.256258394 -3376 -1.635020908 -3377 0.769929659 -3378 0.049686479 -3379 0.926343197 -3380 0.207747601 -3381 -0.479909425 -3382 -0.346488811 -3383 1.363418649 -3384 -0.856611786 -3385 0.208258783 -3386 0.153017911 -3387 -0.675791982 -3388 -0.656266269 -3389 -0.650254423 -3390 -0.694907271 -3391 0.453921184 -3392 0.051894876 -3393 1.358529662 -3394 -0.547435712 -3395 -1.584996157 -3396 1.384469437 -3397 -0.302543658 -3398 1.65504899 -3399 -0.71476593 -3400 0.2280074 -3401 -0.011615686 -3402 -0.263996263 -3403 -2.453069055 -3404 0.106491579 -3405 1.221499958 -3406 -0.287032498 -3407 -0.438386072 -3408 -0.678319009 -3409 -0.486439891 -3410 1.163361225 -3411 -0.242624671 -3412 -0.166798603 -3413 0.242737619 -3414 0.243953964 -3415 0.246613815 -3416 0.602788255 -3417 -0.395550705 -3418 2.454693117 -3419 1.785376156 -3420 1.076530721 -3421 0.222138732 -3422 1.013960165 -3423 1.325791804 -3424 0.136728059 -3425 -0.188133847 -3426 1.194365299 -3427 -1.561776189 -3428 -0.639822336 -3429 -0.006237423 -3430 -0.176893969 -3431 0.345245275 -3432 2.291454006 -3433 -0.797927487 -3434 -0.223119356 -3435 -0.53346876 -3436 -1.702929365 -3437 0.009748202 -3438 0.072539433 -3439 -1.42489478 -3440 0.250203815 -3441 -1.613573377 -3442 -1.714244618 -3443 0.52931129 -3444 0.949661446 -3445 0.728056272 -3446 -1.744591351 -3447 -0.091150686 -3448 -0.212973611 -3449 1.439060492 -3450 -0.025915286 -3451 0.533357628 -3452 -1.068597772 -3453 -0.129456934 -3454 -0.046362633 -3455 0.168527042 -3456 -0.529383912 -3457 -1.84081011 -3458 -1.516666007 -3459 -0.238618399 -3460 -1.338882886 -3461 -0.023145086 -3462 0.695503547 -3463 0.20570244 -3464 -0.551178993 -3465 -0.626753262 -3466 1.322232584 -3467 0.87782082 -3468 -0.215140739 -3469 1.363720101 -3470 -1.889896992 -3471 -2.862076562 -3472 -1.011255204 -3473 0.294254126 -3474 1.42546592 -3475 -0.748993264 -3476 0.107728156 -3477 1.610100555 -3478 0.811066017 -3479 0.188372436 -3480 -0.0156526 -3481 -1.252244591 -3482 -0.570630271 -3483 0.411902962 -3484 -0.53640423 -3485 0.303019382 -3486 0.340675225 -3487 2.000929288 -3488 -0.941714973 -3489 -0.472265563 -3490 1.281154513 -3491 -0.909443441 -3492 -0.393276479 -3493 0.667723728 -3494 -1.354269806 -3495 0.352584766 -3496 -2.225284056 -3497 0.074014313 -3498 0.102012024 -3499 -2.49347176 -3500 -0.489005804 -3501 -1.321086007 -3502 0.179418361 -3503 0.827651156 -3504 -0.654775811 -3505 -1.053178682 -3506 -0.360263259 -3507 -0.291301862 -3508 0.098041515 -3509 -0.380103377 -3510 -0.083422071 -3511 0.127867346 -3512 -1.135990595 -3513 -0.37052871 -3514 -0.613468948 -3515 0.315950532 -3516 -2.100403808 -3517 1.113287732 -3518 0.785557975 -3519 0.652473967 -3520 -2.507872716 -3521 -0.80410345 -3522 0.104954606 -3523 0.116647264 -3524 -1.650105019 -3525 -0.494158777 -3526 -1.271253037 -3527 0.206593962 -3528 0.160589153 -3529 -0.055154347 -3530 -0.51914123 -3531 -0.953284129 -3532 -0.450872115 -3533 -1.540825271 -3534 1.233062121 -3535 0.931289023 -3536 -0.246929565 -3537 1.16493305 -3538 0.072495147 -3539 0.065824666 -3540 -0.574105033 -3541 0.326784881 -3542 0.235494093 -3543 -1.661233505 -3544 0.237162131 -3545 0.130896303 -3546 0.975095989 -3547 0.31082144 -3548 -0.481325655 -3549 -0.476011655 -3550 0.144700704 -3551 0.369049034 -3552 0.700988852 -3553 -1.196280778 -3554 1.976995195 -3555 0.426181179 -3556 0.607264372 -3557 0.185429911 -3558 -0.774948404 -3559 -1.46561725 -3560 -0.276725746 -3561 -1.114819096 -3562 -0.543606441 -3563 -0.297038074 -3564 -0.401276781 -3565 0.629123448 -3566 0.857506572 -3567 -0.270581201 -3568 -0.374373171 -3569 -0.803082026 -3570 -1.220895979 -3571 0.009389999 -3572 0.501850729 -3573 0.859609652 -3574 0.603375464 -3575 0.438652259 -3576 0.197028247 -3577 -0.127800557 -3578 2.058992021 -3579 -0.101879339 -3580 1.168641648 -3581 -0.476932644 -3582 1.974223153 -3583 0.775848288 -3584 1.846385842 -3585 -0.707795945 -3586 -0.049412797 -3587 -0.211790435 -3588 -0.154290219 -3589 0.592975633 -3590 0.671516577 -3591 0.802665431 -3592 0.632465974 -3593 -0.181074814 -3594 1.860350755 -3595 -1.585117594 -3596 0.228128347 -3597 0.598268758 -3598 1.16014915 -3599 0.384168732 -3600 0.246067423 -3601 -1.398574576 -3602 0.528364621 -3603 0.028748628 -3604 1.507942718 -3605 -1.062469567 -3606 0.919349737 -3607 0.183255169 -3608 -0.150326179 -3609 -1.169321099 -3610 0.471789345 -3611 0.060518554 -3612 1.199414946 -3613 0.958418724 -3614 1.027650523 -3615 1.140057945 -3616 -0.907783494 -3617 -0.569416175 -3618 -1.432925933 -3619 0.943672655 -3620 -0.08188434 -3621 2.28046923 -3622 0.184030565 -3623 -0.316600581 -3624 0.288050226 -3625 -0.692567741 -3626 1.068565282 -3627 0.267317154 -3628 -0.224814729 -3629 -0.10806229 -3630 -0.765663768 -3631 0.279836979 -3632 0.284020864 -3633 0.862282006 -3634 0.931282317 -3635 -0.04299917 -3636 0.239372015 -3637 0.738876089 -3638 0.250573484 -3639 0.433762129 -3640 -1.609148649 -3641 0.081724324 -3642 0.215384769 -3643 -0.940713369 -3644 -0.559129462 -3645 -0.083504557 -3646 0.036199897 -3647 -0.206853296 -3648 0.41332639 -3649 -0.935604534 -3650 0.274784831 -3651 -1.576113759 -3652 -0.330248983 -3653 2.457568627 -3654 2.441733281 -3655 -1.039265755 -3656 -1.23662155 -3657 -1.43727201 -3658 0.768993885 -3659 -1.449648414 -3660 -0.65516761 -3661 -1.458938279 -3662 0.511341146 -3663 0.075293049 -3664 -0.435462873 -3665 1.565887971 -3666 1.304430327 -3667 -0.329604291 -3668 2.42003043 -3669 0.355628773 -3670 -0.711796824 -3671 -0.67638943 -3672 -1.33889754 -3673 -0.047464428 -3674 -0.861151011 -3675 -0.915100107 -3676 -1.241390761 -3677 2.107587825 -3678 1.272382446 -3679 -1.288769419 -3680 0.783281241 -3681 -0.287902397 -3682 0.402044264 -3683 -0.888716616 -3684 0.740510759 -3685 -0.739674722 -3686 0.681888397 -3687 -0.244133002 -3688 -1.327591726 -3689 -2.154089403 -3690 0.008793169 -3691 0.835131579 -3692 -0.889854782 -3693 0.167197893 -3694 -0.312903136 -3695 -2.46158028 -3696 -0.368678526 -3697 0.236017075 -3698 -0.463593508 -3699 0.196036489 -3700 -1.380928351 -3701 0.588330749 -3702 1.209242453 -3703 -0.699337785 -3704 0.902743642 -3705 3.120653726 -3706 0.492563937 -3707 0.250927929 -3708 1.592938785 -3709 -0.199029489 -3710 -0.388869744 -3711 0.328348417 -3712 -0.798938614 -3713 -1.753906566 -3714 -0.523305634 -3715 1.631953757 -3716 -0.256616902 -3717 1.495169338 -3718 -1.078197732 -3719 0.199215952 -3720 0.011682613 -3721 -1.422906636 -3722 0.663412423 -3723 0.304180617 -3724 -1.162328818 -3725 -0.440649953 -3726 -0.271511647 -3727 -0.634637601 -3728 -1.265723447 -3729 -0.923105652 -3730 0.744342402 -3731 0.59451026 -3732 0.822234089 -3733 1.424037441 -3734 0.596087367 -3735 -0.316411174 -3736 -0.486439319 -3737 -0.154706813 -3738 0.92586158 -3739 0.822566122 -3740 -0.135648741 -3741 -0.37001192 -3742 1.22278289 -3743 0.302844947 -3744 -1.036532558 -3745 1.653865904 -3746 1.15458381 -3747 0.243178986 -3748 -0.095979334 -3749 1.765969861 -3750 0.597541841 -3751 -1.838092516 -3752 0.060409977 -3753 -0.40013272 -3754 0.742596675 -3755 0.453623335 -3756 -0.483806639 -3757 0.958786261 -3758 -0.857157465 -3759 2.068893981 -3760 2.061594062 -3761 -0.599267072 -3762 -0.410301359 -3763 -0.272119819 -3764 -0.889743486 -3765 0.459313473 -3766 -2.13148346 -3767 -0.022686083 -3768 0.93091079 -3769 -0.592724897 -3770 1.150829142 -3771 1.89191259 -3772 -0.774547413 -3773 -0.020140653 -3774 -0.787116588 -3775 -0.876233978 -3776 -1.24308564 -3777 -1.524409116 -3778 0.798693607 -3779 -0.17359801 -3780 -0.803934233 -3781 -1.965221696 -3782 0.726954853 -3783 -0.404902699 -3784 1.125730936 -3785 -0.011416475 -3786 0.322537374 -3787 -0.774937051 -3788 0.645242074 -3789 -0.301381175 -3790 -0.710290395 -3791 1.215884786 -3792 -0.623977208 -3793 0.317395096 -3794 0.105408035 -3795 0.271056251 -3796 -1.298965691 -3797 0.88179649 -3798 -1.505267687 -3799 0.421336051 -3800 0.514645843 -3801 0.520166428 -3802 -0.344774684 -3803 -0.631384985 -3804 0.402485181 -3805 0.641591645 -3806 0.698494393 -3807 0.124502808 -3808 -1.19875465 -3809 -0.013195424 -3810 -0.598387824 -3811 0.820536589 -3812 2.103347783 -3813 -0.366694485 -3814 0.933660132 -3815 -1.762143293 -3816 1.969292725 -3817 1.208358649 -3818 -0.239673711 -3819 -0.670389155 -3820 1.822925916 -3821 -0.957935989 -3822 -0.642263417 -3823 0.47533235 -3824 0.094055838 -3825 -0.095121027 -3826 1.49839273 -3827 -0.055669777 -3828 1.177386652 -3829 -0.176577164 -3830 0.417799942 -3831 0.69829545 -3832 -0.500162946 -3833 0.748458028 -3834 0.754545762 -3835 0.631003039 -3836 0.171796967 -3837 0.958076871 -3838 -0.085109308 -3839 1.144285043 -3840 1.104098837 -3841 0.321835071 -3842 1.083802913 -3843 -0.175465094 -3844 -2.334344854 -3845 -2.756318035 -3846 1.171984271 -3847 -0.313458462 -3848 0.661587518 -3849 0.479921854 -3850 0.355815978 -3851 0.597210818 -3852 -0.671037052 -3853 -1.556347603 -3854 -2.567437926 -3855 -0.493561886 -3856 -1.417933999 -3857 -0.181740737 -3858 -2.265220459 -3859 -0.054214348 -3860 -0.521075147 -3861 1.119217969 -3862 0.793078864 -3863 -0.332638039 -3864 0.700916811 -3865 -1.520720636 -3866 0.591024964 -3867 1.113551362 -3868 0.600598779 -3869 0.653925559 -3870 -0.325778307 -3871 -1.189985323 -3872 -1.335746396 -3873 -0.152801952 -3874 -0.73873003 -3875 0.361143466 -3876 -1.145806458 -3877 0.506792293 -3878 -0.966727593 -3879 0.095903974 -3880 -0.589977932 -3881 0.244665777 -3882 -1.060802129 -3883 -1.632891786 -3884 0.129528408 -3885 0.566145159 -3886 0.521415033 -3887 2.230218968 -3888 0.070547442 -3889 0.378058167 -3890 0.492228212 -3891 -1.037520965 -3892 -1.563680176 -3893 0.470848221 -3894 -0.393231984 -3895 -1.011543043 -3896 -0.417994393 -3897 1.252572344 -3898 1.367396549 -3899 -0.076755654 -3900 -1.123165167 -3901 1.83863243 -3902 0.659468394 -3903 -1.613828876 -3904 2.137819863 -3905 -0.776158187 -3906 -0.767423147 -3907 -1.498205411 -3908 -1.193841763 -3909 1.055422761 -3910 0.715619377 -3911 0.336018258 -3912 1.468955783 -3913 1.177453251 -3914 1.669597699 -3915 0.372945562 -3916 -0.789194394 -3917 -0.931397853 -3918 0.177265386 -3919 -1.274918115 -3920 0.728533459 -3921 0.321053754 -3922 -1.586213007 -3923 -1.471617507 -3924 1.473065189 -3925 -0.643991045 -3926 -0.481139218 -3927 1.812295497 -3928 0.727209538 -3929 -0.135655458 -3930 0.168567384 -3931 2.877788229 -3932 -0.017972741 -3933 0.10611787 -3934 0.439672986 -3935 0.724280676 -3936 0.48213879 -3937 -1.625407731 -3938 2.340002306 -3939 -0.387257542 -3940 -0.60382151 -3941 0.588769635 -3942 1.662767608 -3943 -0.432388133 -3944 -0.264412437 -3945 2.679347137 -3946 -0.382326951 -3947 0.319439033 -3948 -0.548300992 -3949 0.724482041 -3950 0.414673288 -3951 0.432461939 -3952 -0.425660441 -3953 0.692132656 -3954 0.838413911 -3955 0.234153289 -3956 1.291395877 -3957 1.376295848 -3958 -2.191816939 -3959 0.365472954 -3960 0.671566779 -3961 -0.235506329 -3962 0.341898432 -3963 -0.984706255 -3964 0.071310853 -3965 -2.048392578 -3966 1.413534795 -3967 -0.500409532 -3968 0.825254002 -3969 -0.541807723 -3970 -1.255399156 -3971 0.663513088 -3972 -1.241530461 -3973 1.854033525 -3974 0.891054612 -3975 0.161575011 -3976 -0.635948854 -3977 0.851963715 -3978 0.653977345 -3979 2.301705943 -3980 1.444164351 -3981 0.555059879 -3982 -0.560070896 -3983 0.229496186 -3984 0.508866201 -3985 -1.747275152 -3986 -0.780695959 -3987 0.026163975 -3988 0.366686131 -3989 -2.045712527 -3990 -0.9361885 -3991 1.018094155 -3992 1.06423587 -3993 1.110719002 -3994 -0.371580793 -3995 -0.485542867 -3996 -0.11428997 -3997 1.181367915 -3998 -2.817977316 -3999 0.056737841 -4000 0.519987304 -4001 -0.860772205 -4002 1.064446407 -4003 -0.40218067 -4004 1.573180424 -4005 0.247821946 -4006 -1.451715264 -4007 0.4401337 -4008 0.159914903 -4009 2.494324317 -4010 -0.559078526 -4011 -1.117399721 -4012 -0.915103724 -4013 -0.384731654 -4014 0.791827827 -4015 -0.413873576 -4016 -1.066826482 -4017 -0.214558252 -4018 1.042970595 -4019 1.795867785 -4020 -0.73792781 -4021 0.44047038 -4022 0.831546566 -4023 1.545196321 -4024 1.806567004 -4025 -1.34731355 -4026 -0.270667087 -4027 0.98408258 -4028 0.815271681 -4029 -1.252399628 -4030 0.438140898 -4031 1.505331476 -4032 0.699657968 -4033 -0.389681184 -4034 0.001881974 -4035 0.542718043 -4036 -0.216050421 -4037 -0.135226732 -4038 0.623788659 -4039 -1.790495385 -4040 -2.158656275 -4041 -1.181198869 -4042 2.230796863 -4043 -1.246520072 -4044 0.342547345 -4045 0.004400658 -4046 1.729575789 -4047 -1.251814537 -4048 0.268383504 -4049 1.61733866 -4050 0.863110849 -4051 1.828190845 -4052 -0.120716595 -4053 0.123163563 -4054 0.864383974 -4055 0.680849844 -4056 -1.757330292 -4057 -0.304328753 -4058 1.173193331 -4059 -1.002919674 -4060 -1.547134109 -4061 -0.588217199 -4062 0.609730249 -4063 -0.849206463 -4064 -0.166595413 -4065 0.506645328 -4066 0.728892442 -4067 -2.728664593 -4068 -0.236086599 -4069 -0.997030896 -4070 0.000933148 -4071 -0.461089011 -4072 1.877012661 -4073 -0.289952383 -4074 -1.153174556 -4075 -0.192766605 -4076 -0.083381931 -4077 -0.919351653 -4078 -1.119398458 -4079 1.88257933 -4080 1.904154805 -4081 -0.492495175 -4082 -1.558736306 -4083 -0.112543163 -4084 2.074896692 -4085 0.693537224 -4086 -0.065863797 -4087 1.408790573 -4088 1.456918574 -4089 1.218513847 -4090 0.516711899 -4091 0.540817255 -4092 0.587580151 -4093 -1.44973339 -4094 -0.632415845 -4095 -0.696928618 -4096 0.738742193 -4097 -0.361456933 -4098 -0.611036848 -4099 -1.354584857 -4100 0.834172336 -4101 1.308046486 -4102 0.453864641 -4103 0.422034968 -4104 -1.216792096 -4105 -4.000263287 -4106 -0.85983795 -4107 -0.130052337 -4108 -1.447103582 -4109 -0.267868163 -4110 -0.012492859 -4111 0.074635317 -4112 -0.323071859 -4113 1.660677116 -4114 -1.199667702 -4115 1.561810788 -4116 -1.833599014 -4117 -0.343860722 -4118 0.230359303 -4119 0.725676106 -4120 0.38638206 -4121 -0.044798771 -4122 0.745467252 -4123 1.580356543 -4124 0.357097159 -4125 -0.806176798 -4126 -0.123135415 -4127 -2.113611683 -4128 -0.006357575 -4129 0.8340264 -4130 0.910656973 -4131 -0.07264445 -4132 -0.608277831 -4133 0.325080852 -4134 0.80411108 -4135 1.837007748 -4136 1.552420112 -4137 0.297980114 -4138 0.018726399 -4139 0.574737088 -4140 -0.382239796 -4141 -0.580729197 -4142 -1.16058727 -4143 -0.670732268 -4144 0.18067945 -4145 0.421799628 -4146 0.21804044 -4147 0.247558429 -4148 0.753045162 -4149 1.767829983 -4150 0.349291379 -4151 -1.225530788 -4152 0.207052605 -4153 0.429712593 -4154 0.060213325 -4155 0.291020003 -4156 0.068444521 -4157 0.366074313 -4158 0.56909319 -4159 1.101906771 -4160 -1.096500239 -4161 0.566519746 -4162 0.61108549 -4163 -0.228699901 -4164 -0.843354728 -4165 -1.07205514 -4166 -2.910164511 -4167 1.050809065 -4168 0.940164058 -4169 -1.978124033 -4170 0.540188153 -4171 0.34383292 -4172 0.302345186 -4173 -1.466482415 -4174 1.229026054 -4175 -0.010065523 -4176 1.687786341 -4177 -0.941611186 -4178 -0.793947314 -4179 0.796541462 -4180 0.377252647 -4181 0.105856776 -4182 0.924991875 -4183 0.537564827 -4184 -2.086254677 -4185 1.159667891 -4186 0.732669319 -4187 -1.912835239 -4188 0.201765978 -4189 -0.737874625 -4190 0.056725222 -4191 0.328896974 -4192 -0.116508481 -4193 -0.179283177 -4194 -0.858791784 -4195 0.707318558 -4196 -0.352071017 -4197 0.106606792 -4198 1.124296545 -4199 -1.225984992 -4200 -0.747831775 -4201 -2.219784288 -4202 1.751757833 -4203 0.452283054 -4204 0.870319193 -4205 0.036988402 -4206 0.096318995 -4207 -0.58284027 -4208 -0.043375196 -4209 0.146744732 -4210 -0.402611362 -4211 -0.031862158 -4212 0.481401604 -4213 -0.048397118 -4214 -0.661390953 -4215 -0.597546798 -4216 0.126347547 -4217 3.772044958 -4218 1.244020958 -4219 1.86802006 -4220 0.038003154 -4221 -1.194223992 -4222 0.327126958 -4223 -0.803408353 -4224 1.997144432 -4225 0.448986825 -4226 -0.569160382 -4227 0.385177381 -4228 1.099949183 -4229 0.048450799 -4230 -1.173381649 -4231 1.768271811 -4232 -0.126846282 -4233 -0.610673747 -4234 1.574743844 -4235 -0.847238041 -4236 -0.347748493 -4237 1.331658009 -4238 -0.836086274 -4239 0.07422453 -4240 -2.152157303 -4241 -1.038478566 -4242 -0.190756925 -4243 -1.414360184 -4244 -0.981393425 -4245 2.615128325 -4246 1.007904523 -4247 0.56155192 -4248 -0.616849853 -4249 -1.447046789 -4250 0.138784163 -4251 -2.024928479 -4252 -0.690765708 -4253 0.731744479 -4254 0.426734255 -4255 -0.133569108 -4256 -0.046201988 -4257 -0.776879138 -4258 -0.589345271 -4259 -1.008726557 -4260 -2.991653335 -4261 -0.09265099 -4262 -0.147611769 -4263 0.904436055 -4264 1.147672865 -4265 -1.326494913 -4266 -0.757619424 -4267 0.166375984 -4268 -0.321384102 -4269 -0.193280118 -4270 -1.34894192 -4271 -1.911835873 -4272 -1.321526341 -4273 -1.320148384 -4274 1.516536911 -4275 -0.344457438 -4276 0.474309409 -4277 -0.201356145 -4278 -0.099605938 -4279 1.329257497 -4280 0.79438175 -4281 -0.75611226 -4282 0.394039341 -4283 0.754883021 -4284 -0.705527364 -4285 -0.003634629 -4286 -0.150393852 -4287 0.469485572 -4288 0.879297642 -4289 1.293565263 -4290 -1.65981301 -4291 0.192666979 -4292 -0.707457819 -4293 -0.237714372 -4294 -0.583779981 -4295 1.539832764 -4296 -0.535849965 -4297 1.438418385 -4298 0.939904811 -4299 -1.351156887 -4300 0.430264371 -4301 -0.776787683 -4302 0.195879654 -4303 0.481642477 -4304 0.168412983 -4305 0.225455338 -4306 1.71497683 -4307 -1.439061579 -4308 0.705993251 -4309 -0.398038172 -4310 2.088671737 -4311 -0.57170232 -4312 0.327315159 -4313 1.939379529 -4314 0.857258672 -4315 0.790738285 -4316 -1.976685252 -4317 -0.295419255 -4318 -0.084616786 -4319 0.186754853 -4320 -1.212238319 -4321 -0.580554849 -4322 -0.569767463 -4323 -0.683453724 -4324 -0.521981545 -4325 -1.283362991 -4326 -0.444248875 -4327 0.721415628 -4328 -0.402902657 -4329 -0.585991355 -4330 0.010916888 -4331 0.293698832 -4332 0.936145243 -4333 -1.794982879 -4334 0.434351309 -4335 1.94600273 -4336 0.104999294 -4337 -0.769814387 -4338 -0.201967924 -4339 0.989077071 -4340 -1.376273747 -4341 -0.827621211 -4342 -0.145935581 -4343 -0.84107668 -4344 -1.733515711 -4345 -0.532355108 -4346 -1.776001017 -4347 -0.744035213 -4348 -1.444394705 -4349 1.451040618 -4350 -0.295310801 -4351 0.445154216 -4352 0.046416413 -4353 -1.282954729 -4354 -0.248326907 -4355 0.516028638 -4356 -0.602572487 -4357 -0.244424377 -4358 -0.545556435 -4359 0.730077672 -4360 -2.500958155 -4361 -1.569035773 -4362 0.279212478 -4363 0.915123564 -4364 -0.579093417 -4365 -0.426643464 -4366 1.877803416 -4367 -0.47413369 -4368 -0.373006307 -4369 -0.412973838 -4370 1.559799196 -4371 0.392011137 -4372 -0.867967407 -4373 0.162108997 -4374 -0.167354019 -4375 1.155405756 -4376 -0.162520828 -4377 -0.188444495 -4378 -0.495731158 -4379 -0.356549881 -4380 -0.657780215 -4381 1.069234577 -4382 1.022454793 -4383 1.105333933 -4384 -0.78024183 -4385 -0.094236608 -4386 -1.6431153 -4387 0.697919856 -4388 -1.146320962 -4389 0.102595526 -4390 0.401177902 -4391 2.204006175 -4392 1.458648637 -4393 0.727744593 -4394 0.121085886 -4395 2.818306076 -4396 0.096743629 -4397 -0.625712401 -4398 -0.230617683 -4399 -0.28941292 -4400 -1.314697098 -4401 -1.267031513 -4402 0.328700667 -4403 0.53346196 -4404 0.094957124 -4405 -0.755935751 -4406 1.885460268 -4407 0.223282025 -4408 -0.424319707 -4409 -0.354216853 -4410 1.455914313 -4411 -1.259461678 -4412 1.460268115 -4413 1.620042619 -4414 0.147427311 -4415 -0.275690551 -4416 1.93187167 -4417 0.593019155 -4418 -0.091873094 -4419 0.041033009 -4420 -1.38862848 -4421 -0.464961378 -4422 -0.636679673 -4423 -0.189673944 -4424 -0.902206141 -4425 1.884901494 -4426 -0.980954424 -4427 0.18151574 -4428 -1.221160557 -4429 -0.152339237 -4430 -0.438623018 -4431 -1.083926677 -4432 -1.54667844 -4433 -0.753025169 -4434 -1.45111007 -4435 2.181929869 -4436 -0.88915552 -4437 -0.340660248 -4438 -0.015007512 -4439 1.442692811 -4440 0.474468408 -4441 0.939656858 -4442 0.801852308 -4443 -1.358361542 -4444 -0.903292607 -4445 0.740760517 -4446 0.879422929 -4447 -0.758865828 -4448 0.375083256 -4449 -0.094255766 -4450 -1.327555106 -4451 0.405914297 -4452 0.600894215 -4453 0.075363307 -4454 -0.388545282 -4455 0.718095489 -4456 0.325433147 -4457 -0.263692057 -4458 -2.383337942 -4459 0.039583741 -4460 0.976464449 -4461 -0.794863694 -4462 -1.150564045 -4463 0.231705544 -4464 -1.275915797 -4465 1.244454504 -4466 0.207208758 -4467 -2.159896229 -4468 1.368936143 -4469 -0.016905458 -4470 1.117863386 -4471 -1.663211243 -4472 1.865761641 -4473 1.328106306 -4474 0.251483295 -4475 -0.695850286 -4476 0.774718383 -4477 -0.732216863 -4478 0.513056678 -4479 0.892828663 -4480 -2.28536014 -4481 -1.874426657 -4482 -1.664323561 -4483 -1.748602947 -4484 2.092263276 -4485 -0.283981393 -4486 -1.014428223 -4487 -1.514111553 -4488 -0.519070711 -4489 2.499691587 -4490 0.386937675 -4491 0.831520949 -4492 -2.250232975 -4493 -0.608405967 -4494 0.792331551 -4495 0.861482229 -4496 1.452911558 -4497 0.686237381 -4498 0.078723328 -4499 -0.149609421 -4500 0.348140474 -4501 0.945176947 -4502 -1.196684107 -4503 0.540603975 -4504 1.888521371 -4505 0.450497508 -4506 0.186993845 -4507 -1.001665493 -4508 0.404682677 -4509 0.3422847 -4510 0.19792159 -4511 -1.353025186 -4512 -1.192965778 -4513 -0.03434994 -4514 -0.473705097 -4515 -0.775596988 -4516 1.081800051 -4517 0.449274741 -4518 0.123333965 -4519 -2.679369365 -4520 -0.650252164 -4521 0.367189854 -4522 0.512288185 -4523 -0.835290029 -4524 0.526306585 -4525 -0.083369904 -4526 0.652427399 -4527 1.511889104 -4528 -0.639102244 -4529 -0.8372011 -4530 -0.458210305 -4531 0.17850486 -4532 0.519577539 -4533 -0.693080826 -4534 2.230617807 -4535 0.750747531 -4536 1.425335576 -4537 1.335085027 -4538 -0.039384819 -4539 -0.522587506 -4540 -0.266787202 -4541 1.497568957 -4542 -1.080552165 -4543 1.94581472 -4544 0.799702542 -4545 0.734252271 -4546 0.891437376 -4547 -1.053982721 -4548 -0.943228459 -4549 2.446102674 -4550 -1.03842509 -4551 -0.259794116 -4552 0.268556632 -4553 0.491630541 -4554 -0.564547081 -4555 1.131251661 -4556 -0.578473883 -4557 -0.12011552 -4558 -1.012423496 -4559 -1.287495199 -4560 1.772567102 -4561 2.392627803 -4562 0.196504379 -4563 0.457791383 -4564 0.314873994 -4565 -0.504231137 -4566 0.712799217 -4567 2.695489907 -4568 -0.206382794 -4569 -0.144212464 -4570 0.547054531 -4571 -0.440960713 -4572 0.356219445 -4573 -0.642407654 -4574 1.673561283 -4575 0.382348541 -4576 1.982263775 -4577 0.6452742 -4578 -0.262958584 -4579 0.247435641 -4580 -0.528821639 -4581 -0.484106577 -4582 1.03460603 -4583 0.274286305 -4584 -0.695644202 -4585 -1.644565325 -4586 0.654754529 -4587 -0.799053346 -4588 0.523094354 -4589 -0.675352679 -4590 0.708392964 -4591 0.118114181 -4592 0.306405573 -4593 0.212302581 -4594 0.959542286 -4595 0.64127794 -4596 0.088336818 -4597 0.679904336 -4598 -0.775081705 -4599 -0.171586495 -4600 0.75060229 -4601 -0.460925761 -4602 2.2576706 -4603 0.439591664 -4604 -0.479399599 -4605 0.807672327 -4606 -2.650096632 -4607 0.573237352 -4608 0.493360962 -4609 1.498499983 -4610 0.871263385 -4611 0.875508178 -4612 0.219942954 -4613 -0.439556825 -4614 -0.18090777 -4615 -1.01615646 -4616 1.328784276 -4617 0.143497667 -4618 0.029567528 -4619 0.079387817 -4620 0.815925801 -4621 2.547350965 -4622 -0.31211668 -4623 0.712722951 -4624 0.190696983 -4625 0.934896809 -4626 -0.968833964 -4627 -0.481059743 -4628 0.935553296 -4629 -0.859586615 -4630 -0.133213508 -4631 0.846494679 -4632 -1.230525673 -4633 -0.175338337 -4634 0.536562588 -4635 0.562665243 -4636 2.536101102 -4637 -1.790827276 -4638 -0.660118763 -4639 1.851931268 -4640 0.786147797 -4641 1.034338101 -4642 0.45014959 -4643 -0.683011 -4644 -0.086861242 -4645 -0.316962818 -4646 -0.258909339 -4647 -0.843320784 -4648 0.574079356 -4649 0.424887154 -4650 0.59359596 -4651 0.204081177 -4652 -1.004480564 -4653 -0.038173584 -4654 1.514390531 -4655 0.447668374 -4656 0.665693031 -4657 1.096725389 -4658 -0.53132251 -4659 0.190228787 -4660 0.068187654 -4661 -0.769890938 -4662 0.454511917 -4663 -0.221013735 -4664 -1.316300133 -4665 -1.61875535 -4666 0.804151669 -4667 1.099987767 -4668 -1.484283662 -4669 1.110025176 -4670 0.058340254 -4671 -0.977410147 -4672 1.791397957 -4673 -0.391403491 -4674 0.48547575 -4675 -0.863026858 -4676 0.586080466 -4677 1.943787868 -4678 -0.235947822 -4679 -0.604755307 -4680 -2.717401512 -4681 -0.791118204 -4682 -0.265294567 -4683 -0.57639986 -4684 0.290050611 -4685 -0.354913487 -4686 -1.978084067 -4687 0.810688484 -4688 0.869273026 -4689 -0.443997124 -4690 -2.284316649 -4691 0.317816565 -4692 1.271577797 -4693 -0.562210234 -4694 -0.834224845 -4695 -0.229258038 -4696 1.937589908 -4697 -0.61021538 -4698 0.083770601 -4699 -0.627158307 -4700 -1.586615945 -4701 -0.064501877 -4702 -0.706858888 -4703 -0.522706848 -4704 1.708300205 -4705 -1.269340065 -4706 -0.283883391 -4707 -0.512414768 -4708 1.879029753 -4709 -1.422291227 -4710 -0.963228144 -4711 0.053777604 -4712 -0.731107196 -4713 -1.233489619 -4714 1.921351851 -4715 -0.15692672 -4716 0.067937741 -4717 -0.17676985 -4718 -1.90323524 -4719 -1.183038301 -4720 0.327732584 -4721 -1.553469397 -4722 -1.059830235 -4723 0.129612396 -4724 0.317038256 -4725 -0.636076203 -4726 1.381767544 -4727 0.304720718 -4728 -1.464481574 -4729 0.435629035 -4730 -0.59276313 -4731 -1.186579377 -4732 -2.65984733 -4733 1.47146543 -4734 0.181709565 -4735 -0.973926368 -4736 0.129366276 -4737 1.161054186 -4738 -0.098808255 -4739 0.009552781 -4740 -0.219986657 -4741 0.538710295 -4742 0.531078191 -4743 -0.219601527 -4744 -1.238876162 -4745 0.09167279 -4746 -0.646262273 -4747 2.106051992 -4748 0.220917554 -4749 -0.075490444 -4750 1.322588036 -4751 -0.574603662 -4752 1.948116472 -4753 2.458962646 -4754 0.74134174 -4755 0.141558728 -4756 -0.635600062 -4757 1.099576039 -4758 -0.495086261 -4759 0.936364942 -4760 0.509192287 -4761 0.355692576 -4762 0.107551392 -4763 -2.06195429 -4764 -1.561466873 -4765 -0.594623437 -4766 0.122600381 -4767 -0.035194297 -4768 -0.474291919 -4769 -0.464652274 -4770 0.514882548 -4771 -0.911489229 -4772 -0.103556225 -4773 0.135935508 -4774 -0.560801939 -4775 -0.534995535 -4776 -1.263575722 -4777 0.986404016 -4778 1.38685767 -4779 -0.385151068 -4780 -1.37997992 -4781 -0.356466138 -4782 -0.737252471 -4783 1.580975883 -4784 -0.09758729 -4785 -0.121770271 -4786 0.825004011 -4787 0.738166062 -4788 -1.218130896 -4789 -0.402958489 -4790 -2.132847491 -4791 0.993825836 -4792 1.193778206 -4793 0.686637769 -4794 0.609850342 -4795 0.550128027 -4796 1.784632934 -4797 1.371150277 -4798 -0.947127019 -4799 -0.020018948 -4800 0.77225844 -4801 -0.061649207 -4802 -2.068989832 -4803 -0.256441584 -4804 1.422410483 -4805 -0.608050604 -4806 0.240519073 -4807 -0.351949932 -4808 0.197221525 -4809 -0.108854334 -4810 0.115840243 -4811 0.295110178 -4812 0.613876975 -4813 0.454041425 -4814 0.355883537 -4815 1.650472457 -4816 -0.214247302 -4817 -0.541016778 -4818 -0.494342213 -4819 0.623633105 -4820 0.48775803 -4821 -1.548306462 -4822 -1.354596452 -4823 1.050083687 -4824 0.319355087 -4825 0.169298726 -4826 -0.061333359 -4827 0.783072998 -4828 -0.20325749 -4829 -0.445050918 -4830 0.115757126 -4831 -0.294046432 -4832 0.342774869 -4833 1.174864882 -4834 -0.308483499 -4835 0.8386003 -4836 0.209708896 -4837 1.86825829 -4838 0.414798604 -4839 0.093867133 -4840 0.154598572 -4841 -0.587651233 -4842 0.328937899 -4843 -0.786673423 -4844 0.360589687 -4845 -0.790966365 -4846 1.140999338 -4847 0.703618455 -4848 1.624023998 -4849 -0.867044664 -4850 -0.053043026 -4851 -0.240018745 -4852 -0.854183293 -4853 -0.103447001 -4854 -1.156529432 -4855 -1.507806498 -4856 0.690548192 -4857 0.255605152 -4858 -2.573491806 -4859 2.257459237 -4860 -0.150025276 -4861 0.44614994 -4862 -0.809864149 -4863 -1.317431611 -4864 0.806137537 -4865 -1.300525667 -4866 -0.813206414 -4867 -1.219292695 -4868 -0.246625207 -4869 -0.119286396 -4870 -0.727601921 -4871 -1.024897591 -4872 -0.135793664 -4873 2.112369907 -4874 -0.491009603 -4875 0.602783052 -4876 0.692435226 -4877 0.306366277 -4878 -0.003850173 -4879 -0.549710804 -4880 0.167732733 -4881 -0.279159717 -4882 0.784074853 -4883 0.496654499 -4884 0.163171214 -4885 1.46993281 -4886 -1.344972044 -4887 -0.495697987 -4888 -1.374394188 -4889 0.525565207 -4890 -1.718033856 -4891 -1.274326157 -4892 -1.179341205 -4893 -1.080621449 -4894 0.542869554 -4895 0.081431318 -4896 -1.293594394 -4897 -0.319153592 -4898 0.609450834 -4899 -0.155944382 -4900 2.03956856 -4901 -1.392672904 -4902 -1.520662743 -4903 0.144841104 -4904 0.988736587 -4905 1.348447129 -4906 -2.556887314 -4907 0.404222687 -4908 -0.843334102 -4909 0.004677711 -4910 -1.110580222 -4911 -0.221459826 -4912 -0.001553207 -4913 0.840011507 -4914 -0.053301234 -4915 -1.252316471 -4916 -0.371274302 -4917 0.201060967 -4918 1.739561447 -4919 0.509900878 -4920 0.370069993 -4921 0.997370398 -4922 -1.676558655 -4923 -0.347653587 -4924 0.467927918 -4925 0.632424357 -4926 -1.247304878 -4927 -0.049387837 -4928 -0.196787901 -4929 -0.403675738 -4930 -0.208750085 -4931 0.623074753 -4932 -0.60900144 -4933 -0.279758295 -4934 0.032838023 -4935 -0.395234053 -4936 0.116930293 -4937 1.293149386 -4938 -1.156537764 -4939 0.654238088 -4940 0.470188074 -4941 0.626961153 -4942 -1.934336007 -4943 -0.948983699 -4944 -1.39081792 -4945 -0.685466271 -4946 -1.493673372 -4947 -2.159878394 -4948 1.144794834 -4949 1.480103636 -4950 1.571313351 -4951 -0.182462914 -4952 -0.127183878 -4953 1.267335027 -4954 0.798584376 -4955 0.382585536 -4956 0.395788727 -4957 1.661184443 -4958 1.451687712 -4959 0.606047852 -4960 0.779630953 -4961 -0.588774334 -4962 -1.882189047 -4963 -1.628209131 -4964 0.151367682 -4965 0.741744293 -4966 -1.04471943 -4967 -0.333154264 -4968 -0.645599467 -4969 -0.293837108 -4970 1.746841687 -4971 0.395692452 -4972 -2.142521218 -4973 -0.88480443 -4974 0.091396467 -4975 2.697334106 -4976 -2.392649254 -4977 -0.85732911 -4978 1.619608228 -4979 -0.148679982 -4980 0.035143834 -4981 0.349454275 -4982 0.011357834 -4983 1.248925789 -4984 -0.138895465 -4985 0.26011409 -4986 -1.401690459 -4987 -1.483107607 -4988 -0.97495844 -4989 -0.319840691 -4990 2.174492207 -4991 0.05086246 -4992 1.962835317 -4993 -0.403347861 -4994 0.542689796 -4995 0.947824383 -4996 0.473323056 -4997 0.679063293 -4998 -0.791764976 -4999 0.899501581 -5000 0.806412343 -5001 -0.655375543 -5002 -0.558761225 -5003 -1.242051244 -5004 -0.497642105 -5005 -1.355308711 -5006 -0.156574933 -5007 -0.266460361 -5008 -0.1148038 -5009 -1.289032837 -5010 0.538273002 -5011 0.544589964 -5012 -0.018884616 -5013 -0.243527754 -5014 2.72942441 -5015 -0.696912424 -5016 0.424690001 -5017 -0.762378758 -5018 0.118170087 -5019 -0.099152858 -5020 -0.561578091 -5021 0.728417128 -5022 0.201099263 -5023 -0.903212361 -5024 0.737415432 -5025 1.734177645 -5026 -1.401785813 -5027 1.648168925 -5028 -1.596523371 -5029 1.059377493 -5030 0.945206942 -5031 0.359768037 -5032 -0.016137309 -5033 0.721174934 -5034 -1.505512422 -5035 0.229368442 -5036 -0.266618392 -5037 0.685996487 -5038 -1.510645 -5039 -0.153105977 -5040 -0.100227766 -5041 0.77583097 -5042 -1.019493165 -5043 -0.196914874 -5044 -0.437845362 -5045 1.141312798 -5046 1.038182694 -5047 1.373413467 -5048 0.73428031 -5049 -1.221400405 -5050 -0.723123256 -5051 -1.895392235 -5052 -1.396400824 -5053 -0.771969169 -5054 0.462478196 -5055 -0.369909217 -5056 -0.251198997 -5057 -1.526095453 -5058 0.680572658 -5059 0.002702591 -5060 -0.367112265 -5061 0.534149581 -5062 1.111505325 -5063 -0.114700186 -5064 0.242306947 -5065 -0.433046524 -5066 1.274786988 -5067 0.316632557 -5068 0.445379736 -5069 1.496753132 -5070 0.385128154 -5071 1.398525186 -5072 0.780739872 -5073 0.142213881 -5074 -0.474921489 -5075 1.126335427 -5076 0.8252843 -5077 -0.313268634 -5078 0.683971844 -5079 0.541819922 -5080 0.1679243 -5081 0.323339973 -5082 -0.995641553 -5083 -2.307314296 -5084 0.379483568 -5085 0.206253542 -5086 -0.088374455 -5087 -1.995023133 -5088 2.54436503 -5089 -0.223762899 -5090 -2.007209956 -5091 -0.199810259 -5092 1.188583287 -5093 -0.023713129 -5094 -2.556764789 -5095 0.696531805 -5096 0.491433717 -5097 -1.454234369 -5098 -0.227310273 -5099 0.530798319 -5100 0.613453015 -5101 -0.659154725 -5102 -0.405118522 -5103 0.903500206 -5104 1.771935792 -5105 0.970412111 -5106 -0.575894094 -5107 -0.189393781 -5108 -2.178283683 -5109 0.800919036 -5110 0.642382044 -5111 1.170804784 -5112 -0.361519143 -5113 0.411311542 -5114 -0.522444316 -5115 -2.682638412 -5116 0.969042421 -5117 1.164812056 -5118 0.5247565 -5119 0.003848097 -5120 -0.116657542 -5121 -0.405394935 -5122 0.992966288 -5123 0.760419536 -5124 -0.283180592 -5125 1.120307342 -5126 -0.00159208 -5127 -0.986318988 -5128 -0.185882187 -5129 0.748596569 -5130 1.040748805 -5131 2.02415306 -5132 -0.766313119 -5133 0.852737956 -5134 -0.019301796 -5135 1.948077822 -5136 -0.706983253 -5137 -1.437753167 -5138 -2.195893437 -5139 -0.903145255 -5140 1.340285659 -5141 -0.774264123 -5142 -0.932755201 -5143 0.083519974 -5144 -1.002807308 -5145 -0.51139473 -5146 0.429813983 -5147 1.502551065 -5148 -1.761268016 -5149 -0.15274682 -5150 -0.471837127 -5151 -0.915566642 -5152 -0.45820331 -5153 -0.689587603 -5154 -0.311197682 -5155 -0.741133978 -5156 1.090439585 -5157 -0.137032213 -5158 -0.860079066 -5159 0.057729263 -5160 0.428870417 -5161 -0.466101588 -5162 -1.017785301 -5163 1.160750963 -5164 0.244730807 -5165 -0.26404409 -5166 -1.376650118 -5167 -1.728539627 -5168 0.925316911 -5169 0.407220883 -5170 -0.859160159 -5171 -1.851891582 -5172 0.945320251 -5173 1.259945007 -5174 -0.498018376 -5175 0.641972152 -5176 -0.238192806 -5177 0.28739518 -5178 -0.684368548 -5179 1.623261326 -5180 1.539102216 -5181 0.626051511 -5182 -0.336663704 -5183 -0.134463628 -5184 -1.221334854 -5185 0.312024348 -5186 0.785135638 -5187 -0.17780996 -5188 0.716304096 -5189 -0.370044817 -5190 -1.475689436 -5191 0.355580687 -5192 -1.0192203 -5193 -1.753951578 -5194 -0.02385321 -5195 -0.999285813 -5196 2.548017684 -5197 -0.268825032 -5198 0.040495422 -5199 -0.424582108 -5200 0.26670514 -5201 0.425222716 -5202 0.171664128 -5203 1.125565912 -5204 -0.993640218 -5205 0.767340465 -5206 0.34706682 -5207 1.011395174 -5208 -1.09091662 -5209 -0.813155661 -5210 -1.613758877 -5211 1.199509463 -5212 -0.364612891 -5213 -0.5980292 -5214 0.188791818 -5215 -0.103150673 -5216 -1.138113055 -5217 -0.971544958 -5218 1.650336711 -5219 -1.237995397 -5220 -1.54940093 -5221 -0.786640605 -5222 1.310542803 -5223 -0.878056012 -5224 -0.739267972 -5225 1.920261625 -5226 0.607674875 -5227 -0.595259581 -5228 -1.422154792 -5229 0.113151861 -5230 -0.860829626 -5231 0.922911375 -5232 0.197826822 -5233 0.179286168 -5234 -1.934511015 -5235 0.85344884 -5236 -0.364359343 -5237 0.314214513 -5238 0.051497113 -5239 -0.256946736 -5240 0.33045435 -5241 -0.419666704 -5242 1.505649185 -5243 -0.133232865 -5244 2.239060189 -5245 1.314828473 -5246 0.537645012 -5247 -0.975042041 -5248 0.528378403 -5249 1.540139322 -5250 -0.687361426 -5251 0.308126254 -5252 0.53995158 -5253 -0.63968911 -5254 0.217616921 -5255 0.384149095 -5256 0.870898292 -5257 -0.822838343 -5258 -0.344885544 -5259 0.927078196 -5260 -0.057024966 -5261 -0.875697365 -5262 1.406329433 -5263 2.371139775 -5264 0.185072646 -5265 -0.26297869 -5266 -1.065602254 -5267 -1.274726353 -5268 -1.282870941 -5269 -0.11104239 -5270 -1.021014444 -5271 -0.700140789 -5272 -0.788503663 -5273 -0.748875298 -5274 1.960717443 -5275 0.235263974 -5276 -0.168451414 -5277 -0.816878623 -5278 1.017962531 -5279 1.638109353 -5280 -1.075729123 -5281 0.598030239 -5282 -0.802563599 -5283 -0.026428899 -5284 -0.068244442 -5285 -0.444586051 -5286 0.601750301 -5287 -1.123378818 -5288 0.274091938 -5289 0.761081534 -5290 1.030767572 -5291 -0.403629349 -5292 -0.749655548 -5293 -0.606828921 -5294 -0.476735142 -5295 0.402903726 -5296 -0.712640236 -5297 1.41049964 -5298 1.029431273 -5299 -1.373676421 -5300 1.007358718 -5301 0.775953078 -5302 -0.659062703 -5303 -1.050094763 -5304 -0.525167905 -5305 -1.54158595 -5306 -0.945188587 -5307 -0.563198127 -5308 -1.217490431 -5309 -1.038940711 -5310 -0.534052935 -5311 0.57473354 -5312 -0.31697503 -5313 -1.982733537 -5314 -0.461750231 -5315 0.511171208 -5316 1.006993352 -5317 2.430151212 -5318 0.508244089 -5319 -0.462998322 -5320 2.609571746 -5321 0.106903768 -5322 -0.103138702 -5323 0.533195466 -5324 -1.250378291 -5325 -1.918480544 -5326 -1.942992566 -5327 1.10889245 -5328 -2.065275162 -5329 1.871041731 -5330 -0.176960566 -5331 -1.587150811 -5332 -0.21958475 -5333 -0.775919868 -5334 1.297157476 -5335 1.115883722 -5336 0.575973094 -5337 -1.092007565 -5338 -0.481294904 -5339 -1.414632559 -5340 -1.688575847 -5341 -0.492199693 -5342 0.429881233 -5343 0.669588501 -5344 1.078735468 -5345 1.632645876 -5346 0.071368523 -5347 1.849657841 -5348 0.884698001 -5349 0.074910809 -5350 0.200092881 -5351 -1.157850173 -5352 -0.949423982 -5353 0.580385224 -5354 -0.590240728 -5355 1.633778604 -5356 -0.754754424 -5357 -0.790502947 -5358 0.281043415 -5359 -2.246096191 -5360 0.863086153 -5361 -0.753147742 -5362 0.452422015 -5363 1.49195447 -5364 -1.508429454 -5365 -0.107176775 -5366 1.032806943 -5367 -0.26556557 -5368 -1.831187649 -5369 0.940456161 -5370 0.053941087 -5371 -0.299670963 -5372 -0.21959414 -5373 0.330176038 -5374 1.211499472 -5375 -0.298372176 -5376 0.06147773 -5377 -0.353311932 -5378 -0.517449759 -5379 0.676143634 -5380 1.467891161 -5381 0.679937327 -5382 1.316953477 -5383 -0.081740234 -5384 0.238917888 -5385 -0.483790879 -5386 0.197572373 -5387 0.359783896 -5388 -0.158274688 -5389 0.091530013 -5390 0.131032175 -5391 1.270664052 -5392 1.621074145 -5393 0.023003032 -5394 -1.366261598 -5395 -0.619596985 -5396 -0.802054676 -5397 -1.046532993 -5398 -1.668116231 -5399 0.851237786 -5400 2.866516648 -5401 -0.368249748 -5402 -0.008930262 -5403 -1.156184357 -5404 -0.20415471 -5405 -0.778174203 -5406 -0.446289354 -5407 -0.738809132 -5408 -0.451401352 -5409 -0.412394425 -5410 0.356922869 -5411 -1.564307192 -5412 -3.126519418 -5413 1.301366319 -5414 0.843540504 -5415 -2.045818343 -5416 1.496724989 -5417 0.283268889 -5418 -1.528425949 -5419 -0.447089285 -5420 -1.085789656 -5421 0.549989121 -5422 -1.062393332 -5423 0.54687141 -5424 0.307210195 -5425 -1.261489635 -5426 -0.606916912 -5427 0.872593428 -5428 1.396489304 -5429 -1.937165574 -5430 -0.678574158 -5431 -1.14433013 -5432 -0.555463062 -5433 -0.398137249 -5434 -2.58764335 -5435 1.71375784 -5436 -0.275743547 -5437 1.589492444 -5438 -1.609012158 -5439 0.083542678 -5440 -1.684738452 -5441 0.791647134 -5442 -0.504596071 -5443 0.375961858 -5444 0.290946275 -5445 0.348984444 -5446 -0.061245946 -5447 1.116640553 -5448 0.166530834 -5449 -0.052998741 -5450 -2.416360628 -5451 -0.475295905 -5452 0.844764206 -5453 -0.33314666 -5454 -0.421301807 -5455 -1.224573308 -5456 -1.459516138 -5457 -1.305538873 -5458 0.27712917 -5459 -0.733593666 -5460 0.383140537 -5461 -0.250302712 -5462 -0.616218953 -5463 1.34277686 -5464 -1.306529459 -5465 -1.003230698 -5466 -0.013881591 -5467 0.74738569 -5468 0.391166037 -5469 1.543855067 -5470 -0.849332091 -5471 -0.051699839 -5472 1.137261531 -5473 1.278023686 -5474 -0.995877837 -5475 1.309880932 -5476 1.975951621 -5477 -0.775859878 -5478 -0.668642408 -5479 0.055295168 -5480 0.506298797 -5481 -0.178425133 -5482 -1.145816282 -5483 2.045091661 -5484 -1.417747981 -5485 -0.121700478 -5486 -0.018165416 -5487 0.980639538 -5488 0.035796824 -5489 0.171501686 -5490 0.710607329 -5491 -0.436402486 -5492 -0.400297755 -5493 0.920903561 -5494 0.147767246 -5495 0.628955798 -5496 0.281707995 -5497 -0.814365217 -5498 0.996775909 -5499 -1.14386914 -5500 -0.273903686 -5501 0.058758921 -5502 1.677001334 -5503 -1.819639225 +TABLE CRVScint +#counter,scintYieldDeviation +0,-0.40817829 +1,0.478392983 +2,-1.742534815 +3,-1.083696214 +4,-0.232897289 +5,-1.133704616 +6,0.708299822 +7,-0.255976244 +8,0.454536537 +9,0.34589287 +10,-0.914151313 +11,-0.219176211 +12,1.540090237 +13,-0.06729041 +14,0.750185173 +15,-1.252525599 +16,1.881276793 +17,1.08307137 +18,0.403799169 +19,-0.66013052 +20,0.996921357 +21,-0.466640679 +22,-0.147430802 +23,0.465758366 +24,1.472209636 +25,-0.089248445 +26,0.077041903 +27,0.812045767 +28,0.116082738 +29,2.444925959 +30,-0.643804806 +31,0.197596893 +32,0.496921984 +33,1.855947974 +34,0.073004041 +35,-0.766896413 +36,-1.120294518 +37,-1.285900187 +38,1.462787967 +39,-0.175869471 +40,0.576923821 +41,-0.241021451 +42,-1.135892295 +43,0.006762617 +44,-1.656346974 +45,-1.072041249 +46,0.179748625 +47,0.272906454 +48,0.014156971 +49,-0.046374193 +50,0.006439565 +51,-0.644237792 +52,-0.007830788 +53,0.293738714 +54,0.918094334 +55,0.723697415 +56,0.06599502 +57,0.843457846 +58,-0.156088783 +59,0.768268835 +60,-1.049871276 +61,-0.053859518 +62,-0.472876414 +63,-0.657052687 +64,-0.670193813 +65,-0.056785721 +66,-0.437127642 +67,1.138593278 +68,0.367129055 +69,-0.681090652 +70,0.320863282 +71,-1.284949167 +72,-0.512218056 +73,1.001620998 +74,0.381645129 +75,1.462008713 +76,-0.639059588 +77,0.871553559 +78,0.161576853 +79,0.165354377 +80,-0.803663752 +81,-0.114701532 +82,0.491418645 +83,1.292607075 +84,-0.979921489 +85,0.973688432 +86,1.594841866 +87,0.371110412 +88,-0.27214148 +89,-1.915335772 +90,-0.041963719 +91,0.262880908 +92,-0.689180237 +93,0.246577909 +94,1.19357776 +95,0.542303852 +96,-0.654314151 +97,0.786000959 +98,-0.704262875 +99,-0.072265143 +100,0.208576412 +101,1.296570941 +102,-0.063855034 +103,0.159200191 +104,0.925960111 +105,-2.042826473 +106,2.075169182 +107,-0.222235 +108,1.35332452 +109,-0.002027946 +110,0.397365683 +111,0.354055184 +112,0.511771393 +113,-0.457738167 +114,1.155370009 +115,-0.115781727 +116,-0.840449092 +117,0.321826222 +118,-0.461556427 +119,-1.19008102 +120,0.401419897 +121,0.560289182 +122,-0.162565747 +123,0.331663265 +124,-0.313720184 +125,-1.389663479 +126,0.617972175 +127,-0.610932716 +128,0.15998996 +129,1.471532457 +130,-0.166092867 +131,-0.507920517 +132,0.338036954 +133,-1.40898172 +134,1.270972215 +135,-0.144821609 +136,-1.965002639 +137,-0.765306087 +138,0.577112948 +139,-0.714690883 +140,1.673938548 +141,1.283248438 +142,0.111830082 +143,0.393560045 +144,-0.704160562 +145,-0.892621182 +146,-0.288656835 +147,1.833763681 +148,-0.089292317 +149,0.916267188 +150,-0.780835161 +151,0.097099476 +152,1.386262532 +153,-0.094783916 +154,-1.715879581 +155,0.053034023 +156,-2.41327277 +157,1.000076796 +158,-0.67093874 +159,0.239788482 +160,0.465575947 +161,-0.897566218 +162,0.285623216 +163,-0.760963944 +164,-1.023673817 +165,-1.391641336 +166,-0.242148271 +167,0.590555063 +168,0.464393322 +169,-1.486813908 +170,0.394357776 +171,0.902535297 +172,-1.452469922 +173,0.178071392 +174,-0.371711772 +175,1.204077962 +176,-0.80514245 +177,-0.07796681 +178,-0.39354941 +179,-2.089904828 +180,-0.816150506 +181,-1.129655392 +182,-0.03139441 +183,0.8896484 +184,-0.652208727 +185,-0.397336115 +186,1.971118498 +187,1.701910592 +188,0.285792663 +189,-1.738091689 +190,-0.789743994 +191,-0.691520263 +192,-1.313018844 +193,-0.319232912 +194,0.83927878 +195,1.306147453 +196,1.98204058 +197,0.047865666 +198,-0.359924628 +199,0.696814511 +200,-0.005355014 +201,0.69741095 +202,0.146527025 +203,-1.380544453 +204,-1.429810506 +205,-0.407681799 +206,-1.528747625 +207,-0.166433636 +208,1.29328001 +209,2.034089345 +210,-0.16133237 +211,-1.333930035 +212,0.791834757 +213,-0.632238067 +214,-0.130231195 +215,0.349612982 +216,1.609446664 +217,-0.327849039 +218,-0.492717167 +219,1.299194 +220,-0.718527533 +221,-0.671708083 +222,1.60457056 +223,-0.867398704 +224,-1.109376665 +225,-1.145681704 +226,-0.679705033 +227,0.175969876 +228,-0.362956639 +229,1.135676944 +230,-0.685920146 +231,2.015346083 +232,0.207859477 +233,-0.200225515 +234,1.477822045 +235,0.22662747 +236,-1.270463891 +237,0.791715611 +238,0.344362716 +239,0.162729038 +240,0.372231898 +241,0.896106612 +242,-0.218775195 +243,-1.020718808 +244,0.965974581 +245,-0.76316394 +246,0.989352797 +247,1.718669209 +248,0.714001118 +249,-0.631049114 +250,0.735906505 +251,-0.249884282 +252,-0.969527779 +253,-0.439858992 +254,0.549916092 +255,-0.80050398 +256,-0.007173449 +257,0.337081613 +258,-0.824920031 +259,-0.816768181 +260,0.750262061 +261,-0.235735143 +262,-0.22671651 +263,-3.598685709 +264,-0.603896547 +265,-0.918996661 +266,0.083725271 +267,-0.374561747 +268,0.128729223 +269,0.987346053 +270,0.463799907 +271,-0.189384207 +272,0.985258405 +273,-1.880686458 +274,1.044747837 +275,1.29596539 +276,0.402672632 +277,1.492778169 +278,-0.803917017 +279,-1.034641198 +280,0.981203806 +281,-0.660412132 +282,1.093230086 +283,1.966852642 +284,0.623320561 +285,-1.297070085 +286,-1.513156965 +287,-1.506313331 +288,0.782545524 +289,0.42223614 +290,0.491447819 +291,-0.281510694 +292,1.277226115 +293,2.430401532 +294,0.446400491 +295,0.540262692 +296,-1.075688065 +297,-0.235786505 +298,-0.478864332 +299,-0.903800053 +300,0.201118785 +301,1.569425999 +302,0.052632657 +303,0.0737852 +304,1.574754064 +305,1.708556757 +306,-0.945417094 +307,-0.919766343 +308,0.367834016 +309,-1.41656582 +310,-0.942703944 +311,-1.597649742 +312,-1.221793136 +313,-0.091048807 +314,-0.159959852 +315,-0.0945729 +316,-0.506960088 +317,-0.506600418 +318,-0.042309861 +319,0.108956613 +320,-0.740256487 +321,0.71892811 +322,0.639832891 +323,0.231096989 +324,-1.448288062 +325,-0.232538077 +326,0.451084331 +327,-1.129972612 +328,-0.925244464 +329,0.671033429 +330,-0.013699547 +331,0.37986812 +332,1.876547013 +333,-0.706833619 +334,-1.069362693 +335,-1.640067097 +336,1.398416277 +337,-0.135849532 +338,-1.346438346 +339,-1.123148453 +340,1.686222942 +341,1.088895858 +342,-2.252108515 +343,-0.50804387 +344,-0.868431963 +345,1.639235192 +346,-1.420850609 +347,0.208936207 +348,-1.224200566 +349,-1.198681876 +350,-0.169580381 +351,0.361655672 +352,0.355273744 +353,-0.891657883 +354,-0.8431633 +355,-1.354371215 +356,-0.695650114 +357,1.061889469 +358,2.663483452 +359,0.349782459 +360,-1.209229394 +361,0.857416615 +362,-2.018092274 +363,1.249161024 +364,-0.126798794 +365,0.591033873 +366,-1.383067924 +367,-0.766158209 +368,-2.434720992 +369,-0.256693854 +370,-0.513582614 +371,-1.132831948 +372,-1.626955527 +373,-0.586142211 +374,-0.627314412 +375,0.583642122 +376,-1.912341781 +377,0.531838994 +378,0.095109225 +379,0.825036959 +380,0.305629479 +381,0.901661477 +382,0.930229399 +383,-1.451734065 +384,-0.019167851 +385,-0.857555306 +386,0.62476235 +387,-0.108405838 +388,0.847971532 +389,0.150492485 +390,-1.499164749 +391,-1.252682326 +392,0.322090398 +393,-1.791399574 +394,0.36534036 +395,0.168156081 +396,2.187935725 +397,0.493622527 +398,-2.164658004 +399,0.429179819 +400,1.128738376 +401,0.57112014 +402,0.751289368 +403,0.237764392 +404,0.156336249 +405,-1.172503726 +406,0.124471277 +407,0.240969704 +408,0.340211275 +409,-0.688639062 +410,-0.525581499 +411,0.181308277 +412,-0.152190427 +413,0.234399096 +414,-0.356869582 +415,0.171580914 +416,0.007592873 +417,-0.222287777 +418,0.167471356 +419,-0.462522062 +420,1.410863253 +421,0.722440127 +422,0.113289924 +423,-0.600614512 +424,-0.451435579 +425,-1.017313286 +426,-1.935903983 +427,-1.546858607 +428,-0.873229479 +429,-0.376859264 +430,0.649852145 +431,0.80894471 +432,-0.327801591 +433,0.304385153 +434,-0.304533303 +435,1.276705627 +436,-0.027770761 +437,-1.235226816 +438,1.061579542 +439,-0.94525643 +440,-0.76941479 +441,-0.128521269 +442,-0.433950796 +443,0.522838545 +444,1.205259074 +445,-0.219641106 +446,0.203870662 +447,0.178030848 +448,0.209347925 +449,-0.30159478 +450,-0.043044237 +451,-0.533813332 +452,-1.810757436 +453,-0.441292798 +454,1.163546923 +455,1.299749945 +456,-1.434587089 +457,0.451181103 +458,0.438376104 +459,-1.374459478 +460,0.11327561 +461,-1.239754095 +462,1.546861783 +463,-0.637626567 +464,-0.114131288 +465,0.979243329 +466,-0.157315999 +467,-0.442128219 +468,-0.025893066 +469,-0.433617986 +470,1.671640906 +471,-1.622366828 +472,1.404832042 +473,-1.063861096 +474,2.161709457 +475,0.049639699 +476,1.51225222 +477,-0.550773322 +478,-0.257415964 +479,-0.682554441 +480,-0.468611624 +481,1.554563487 +482,-0.170478644 +483,0.264716362 +484,-0.893563766 +485,1.159447915 +486,-0.253864548 +487,-1.117871833 +488,-2.185740376 +489,0.954521305 +490,0.59686098 +491,-0.793813165 +492,1.030006636 +493,1.461714818 +494,0.132094129 +495,0.865087306 +496,-1.472636144 +497,-0.539615336 +498,-1.469294956 +499,0.912733252 +500,-0.391309858 +501,-1.168845754 +502,-0.806736797 +503,-0.404089799 +504,-1.540185184 +505,-1.767002434 +506,0.663998772 +507,-1.454712691 +508,1.425962241 +509,0.782423134 +510,-0.740757154 +511,0.595286257 +512,0.134637496 +513,2.578358839 +514,0.09152125 +515,-0.053789907 +516,-0.370613331 +517,-1.110013413 +518,-2.403927782 +519,-0.098904264 +520,0.828388134 +521,-0.825051385 +522,-1.230015752 +523,-0.645880054 +524,-2.541147657 +525,1.027155794 +526,-1.667358644 +527,-1.489350918 +528,0.543879625 +529,-0.250101217 +530,-0.112506545 +531,-0.209420648 +532,-0.978524575 +533,0.755472556 +534,0.341013971 +535,-1.497376768 +536,0.080087475 +537,-0.749711372 +538,-1.64000224 +539,-0.167107535 +540,0.004185846 +541,-0.155373135 +542,-1.365282024 +543,1.361840672 +544,0.767380681 +545,0.493340231 +546,0.190095848 +547,-0.337414847 +548,-2.123060698 +549,0.955275299 +550,1.292901768 +551,-0.892889521 +552,1.733825488 +553,-0.87948169 +554,1.629570594 +555,-0.218710121 +556,-0.795968474 +557,0.530006508 +558,0.704284118 +559,0.664833628 +560,0.162944275 +561,-0.284845639 +562,0.308158758 +563,-0.288345332 +564,0.655204196 +565,-1.181856987 +566,-0.074884278 +567,-0.398693821 +568,-0.222166949 +569,0.527886889 +570,0.083287081 +571,-0.246896772 +572,-0.170832777 +573,1.154731064 +574,0.591964162 +575,1.392098058 +576,0.218055687 +577,0.636735352 +578,1.541503302 +579,0.999613871 +580,0.202605363 +581,0.939956723 +582,1.000186593 +583,-0.240155865 +584,0.295551159 +585,0.74048749 +586,-1.439617809 +587,0.118706766 +588,0.594744012 +589,1.722054042 +590,0.489825424 +591,-0.092664198 +592,-0.680533742 +593,-0.469737581 +594,-0.067692992 +595,1.167395322 +596,0.201747 +597,0.616967618 +598,0.998306676 +599,-1.048928338 +600,-0.347045525 +601,-0.233624793 +602,1.123764665 +603,0.397226241 +604,-0.909629124 +605,-0.234925804 +606,-1.788441902 +607,1.279679247 +608,-1.109477821 +609,-0.018903912 +610,-0.68746781 +611,-0.671901556 +612,-0.052222561 +613,-0.869001512 +614,-0.337248664 +615,1.632154158 +616,-0.295247325 +617,-0.258880892 +618,-1.72130832 +619,-0.68778214 +620,0.036159231 +621,0.05256995 +622,0.940174893 +623,-1.193094796 +624,1.663449246 +625,0.258785087 +626,0.581005652 +627,0.762503521 +628,0.356692957 +629,-1.080818544 +630,-0.07031834 +631,0.595463915 +632,0.455518127 +633,1.96603051 +634,0.073907432 +635,-0.289688525 +636,-1.840958407 +637,0.893614709 +638,0.550093903 +639,0.755860038 +640,0.018454385 +641,0.933447213 +642,-0.567725712 +643,1.197038265 +644,0.602571488 +645,0.195618355 +646,0.719440491 +647,-0.659338014 +648,-1.076215359 +649,0.091023268 +650,0.46921017 +651,-0.755383047 +652,-0.1230986 +653,1.588710283 +654,-1.389073456 +655,-0.11151737 +656,0.192231755 +657,-2.043651215 +658,-0.111809254 +659,0.230804304 +660,1.007710776 +661,-0.555359258 +662,-0.441639334 +663,-0.633874035 +664,-0.821842231 +665,0.09165612 +666,-0.660005061 +667,1.055079926 +668,-0.166575857 +669,0.272196461 +670,-0.061539148 +671,-0.727852311 +672,1.100451237 +673,-1.577325611 +674,1.045756062 +675,-0.254034436 +676,-1.105164769 +677,-0.269249796 +678,1.015424679 +679,0.613318548 +680,0.846277458 +681,0.010022539 +682,0.176280886 +683,-0.517314589 +684,0.992052652 +685,-1.232270627 +686,1.299484472 +687,-0.333518509 +688,0.305436466 +689,0.085244298 +690,0.016435911 +691,1.197102966 +692,-0.015089566 +693,-0.250898876 +694,-0.302505612 +695,-1.100841257 +696,0.48287465 +697,-1.289820991 +698,0.241767276 +699,-0.119440054 +700,1.636230338 +701,1.152146097 +702,0.738968908 +703,0.692557456 +704,-2.232255027 +705,0.296724487 +706,0.840617841 +707,0.745429364 +708,1.33412023 +709,-0.005944921 +710,-0.129184773 +711,-0.234458954 +712,0.217480124 +713,1.267159028 +714,2.175116992 +715,-2.201152258 +716,-0.33942274 +717,0.096710859 +718,-0.633170941 +719,-0.636234471 +720,0.892496671 +721,1.59868153 +722,0.065696794 +723,0.282764337 +724,-0.271991956 +725,0.593142464 +726,0.100120025 +727,-0.370996664 +728,0.883862334 +729,1.485580957 +730,-0.59616712 +731,-0.568912718 +732,0.524385698 +733,0.451609845 +734,-0.606268461 +735,0.864337844 +736,1.020480535 +737,-2.357786698 +738,-0.202855646 +739,-0.849218475 +740,1.996351215 +741,-1.002299113 +742,1.516448329 +743,-1.452860765 +744,-0.254657958 +745,0.737933316 +746,-0.589838214 +747,0.7409136 +748,-1.296411485 +749,-0.739207171 +750,1.138745393 +751,0.123214344 +752,0.951328888 +753,-0.177091543 +754,-0.720588245 +755,-0.19962583 +756,-1.874827648 +757,-0.655913352 +758,1.024948508 +759,0.469592199 +760,0.200475613 +761,0.82728868 +762,-0.16783238 +763,1.251092866 +764,0.212660434 +765,1.163521737 +766,-0.40153073 +767,-0.057714041 +768,-1.896381051 +769,0.177032416 +770,1.236664107 +771,-0.668385154 +772,-0.770261634 +773,-1.16976461 +774,0.266803696 +775,0.440262378 +776,-0.121910544 +777,0.136322053 +778,1.089066083 +779,0.407867876 +780,-1.45196584 +781,-0.278712815 +782,-0.509610234 +783,0.796739865 +784,0.539129462 +785,0.05746158 +786,-0.216251817 +787,-1.814003009 +788,-0.365340871 +789,2.214868148 +790,0.566108846 +791,0.936565245 +792,-1.189589254 +793,-0.986350374 +794,0.155470474 +795,-1.554888019 +796,-0.273918213 +797,-0.307934556 +798,-0.457824476 +799,0.202462726 +800,-3.175025979 +801,0.548640432 +802,0.116826298 +803,1.180811134 +804,0.451055487 +805,-1.266309149 +806,1.723407882 +807,-0.042608481 +808,1.229444465 +809,-0.643137922 +810,0.964370281 +811,0.710242436 +812,-1.220085161 +813,-2.166899516 +814,0.264803761 +815,0.327529541 +816,-0.169957863 +817,1.315324053 +818,-0.453293354 +819,0.416298175 +820,-0.990935085 +821,-0.402273032 +822,-0.829099869 +823,0.32478979 +824,0.131468938 +825,-0.379226882 +826,-2.148095208 +827,1.035119613 +828,0.754191621 +829,0.676846841 +830,0.85845341 +831,-0.879590795 +832,-1.951119491 +833,-0.110559706 +834,-1.110239586 +835,-0.190721178 +836,-0.83027826 +837,-0.752211541 +838,2.034310157 +839,0.402540729 +840,-0.208695415 +841,-0.950694547 +842,0.256601111 +843,-0.455376298 +844,-0.60310613 +845,-1.793646022 +846,0.829557646 +847,-0.791057837 +848,-1.899389653 +849,-1.099887394 +850,0.026796951 +851,-1.514549482 +852,-0.586713481 +853,0.99705945 +854,0.959315757 +855,1.25034976 +856,-1.16878592 +857,-0.667069606 +858,-1.579041371 +859,0.040176692 +860,0.60487061 +861,-0.940286835 +862,-0.538320001 +863,-1.193365671 +864,-0.455553912 +865,0.910838393 +866,-0.251964964 +867,0.448587078 +868,0.135504416 +869,0.687892069 +870,0.638019132 +871,-0.018456708 +872,0.274689724 +873,0.40887214 +874,-1.179969433 +875,0.283026883 +876,3.087218729 +877,-0.451392778 +878,0.423858692 +879,-0.540938796 +880,-1.749824515 +881,0.077586406 +882,2.023628921 +883,-0.581871436 +884,0.200526641 +885,-1.189717647 +886,-1.799677244 +887,0.533139951 +888,0.107560763 +889,-0.640006975 +890,-0.737604847 +891,0.219374116 +892,-1.470183266 +893,0.063090485 +894,0.3914926 +895,-1.388051647 +896,-0.384079169 +897,-0.468936587 +898,0.462593719 +899,-1.924058459 +900,-0.661081588 +901,-1.162045364 +902,0.09952754 +903,0.768493746 +904,-1.384360789 +905,-1.0138134 +906,-1.158703776 +907,-1.09925696 +908,-1.107000694 +909,0.499786447 +910,0.980860924 +911,1.185146646 +912,-1.619800103 +913,-0.535515967 +914,-0.858969246 +915,0.433054164 +916,1.863839658 +917,-0.685876169 +918,-0.230871159 +919,-1.041282449 +920,-0.13618303 +921,-1.509019783 +922,-0.7717079 +923,-0.914726305 +924,1.043613471 +925,-1.155323778 +926,1.130107495 +927,-0.760193584 +928,-1.527621444 +929,-1.492480158 +930,-1.060350786 +931,1.225162106 +932,0.788020282 +933,-1.51445339 +934,-0.569732944 +935,1.269920886 +936,0.90172626 +937,-0.454543515 +938,1.968361845 +939,-0.83088489 +940,1.231898389 +941,0.115089214 +942,0.98054965 +943,-0.08497517 +944,0.172532076 +945,-0.586410712 +946,0.488030929 +947,-0.354560333 +948,-0.524640337 +949,0.875235713 +950,-1.80066288 +951,-0.5433488 +952,-0.042017393 +953,0.010123254 +954,0.665051144 +955,-0.346399864 +956,1.014648131 +957,-1.309139529 +958,0.945424576 +959,-2.274990431 +960,0.857203277 +961,-1.734511036 +962,-0.214231882 +963,0.069040172 +964,0.499696463 +965,1.751805468 +966,-1.934838999 +967,0.868537001 +968,1.993929646 +969,1.289449949 +970,-1.346159819 +971,-0.119857301 +972,-1.392234599 +973,-1.847802164 +974,0.132086576 +975,-0.544655756 +976,-1.544663227 +977,-0.978524974 +978,0.853515988 +979,-0.76411176 +980,0.922356277 +981,-0.691962126 +982,-0.505797514 +983,-1.253027945 +984,0.653974757 +985,-0.006938417 +986,0.583247767 +987,0.875126182 +988,-0.593246275 +989,-1.079829845 +990,0.632460724 +991,0.292908205 +992,1.138572513 +993,0.128196834 +994,0.451834506 +995,-0.289878141 +996,-0.286428037 +997,0.981708857 +998,0.330752265 +999,0.242769886 +1000,-0.046242412 +1001,-1.667095837 +1002,1.109577126 +1003,0.428346419 +1004,1.252683943 +1005,-0.519526528 +1006,1.224797559 +1007,-0.452932113 +1008,-1.046709043 +1009,0.259965391 +1010,-0.180581981 +1011,0.353443118 +1012,-0.035358412 +1013,-0.475674329 +1014,0.623160639 +1015,0.949165294 +1016,0.73871055 +1017,-0.115008363 +1018,-2.458177145 +1019,-0.710933855 +1020,-1.486111657 +1021,0.435511517 +1022,1.329449326 +1023,-0.501262987 +1024,0.533116789 +1025,2.381095032 +1026,0.115332848 +1027,0.973568788 +1028,-0.990546519 +1029,-0.247974338 +1030,0.842200348 +1031,0.178305568 +1032,-0.314906385 +1033,-0.365744661 +1034,-1.07586073 +1035,1.715035276 +1036,-0.60791999 +1037,-0.998417203 +1038,-0.551783364 +1039,-0.409248905 +1040,1.250273822 +1041,-0.03074491 +1042,0.13130747 +1043,-0.081369789 +1044,0.369134878 +1045,-0.71544035 +1046,1.244631371 +1047,-2.221847734 +1048,1.239702984 +1049,0.124467318 +1050,-0.212782307 +1051,-0.784561886 +1052,0.273051474 +1053,2.624219146 +1054,-1.599611716 +1055,0.847414958 +1056,1.004690093 +1057,-1.627508396 +1058,-1.627715576 +1059,-0.675471817 +1060,0.719215303 +1061,-0.302387992 +1062,-0.354503346 +1063,-0.798509939 +1064,0.605321883 +1065,-1.151204487 +1066,-0.395348361 +1067,-0.337198082 +1068,0.442261016 +1069,0.806729101 +1070,0.566165461 +1071,-0.964650991 +1072,0.097885979 +1073,-0.383678739 +1074,-0.203305827 +1075,2.399086941 +1076,0.46802039 +1077,-0.368524292 +1078,-0.00123323 +1079,-2.081473443 +1080,-0.831735787 +1081,0.598808941 +1082,-0.914394328 +1083,1.331837553 +1084,-1.775535867 +1085,1.569073099 +1086,0.217903061 +1087,0.24253345 +1088,1.192479096 +1089,-1.291163631 +1090,0.990729396 +1091,1.11204799 +1092,-0.229879811 +1093,1.075350718 +1094,0.279536145 +1095,-0.260321907 +1096,-1.089290051 +1097,0.157330229 +1098,0.009980245 +1099,-0.083448858 +1100,0.402603278 +1101,-0.539672316 +1102,-0.533767979 +1103,1.05877514 +1104,-0.925822074 +1105,0.768700115 +1106,-0.35953064 +1107,-1.189120444 +1108,0.257771941 +1109,-1.009946645 +1110,-0.524662014 +1111,0.420524896 +1112,0.192894438 +1113,-1.870173502 +1114,0.570067204 +1115,-0.070077086 +1116,0.659360217 +1117,-1.026177747 +1118,-0.236328394 +1119,1.477863367 +1120,0.193574107 +1121,0.772045519 +1122,-0.177649883 +1123,0.870319409 +1124,-0.017479783 +1125,-0.279022644 +1126,0.382275018 +1127,1.170667539 +1128,-0.681747014 +1129,1.10589659 +1130,0.841060309 +1131,1.591777309 +1132,0.818406551 +1133,-1.666236147 +1134,-0.961683822 +1135,-0.051205459 +1136,-0.389347296 +1137,0.563939745 +1138,0.354430876 +1139,-0.572624045 +1140,0.147987887 +1141,-0.412815136 +1142,-1.06582087 +1143,1.836254736 +1144,0.463943038 +1145,1.13771502 +1146,-0.153029104 +1147,-0.959472032 +1148,-2.068088862 +1149,0.048530295 +1150,-1.728815368 +1151,0.372674982 +1152,-0.290707981 +1153,-0.945096374 +1154,-0.061804855 +1155,-0.116466267 +1156,-1.085773245 +1157,-0.262111809 +1158,0.060013621 +1159,2.899127783 +1160,-0.421866764 +1161,-0.152853994 +1162,-1.638545701 +1163,-0.965774522 +1164,-0.92247946 +1165,0.585327482 +1166,0.624676644 +1167,2.635646603 +1168,0.25656422 +1169,-0.950483428 +1170,0.249221233 +1171,-0.045452541 +1172,0.655135529 +1173,-0.966235162 +1174,-0.032343467 +1175,-1.168263955 +1176,0.798316045 +1177,1.778180435 +1178,-0.289597257 +1179,-1.184519876 +1180,-0.254802016 +1181,0.650184902 +1182,0.863137128 +1183,-0.373119283 +1184,-0.215473475 +1185,-1.158731067 +1186,-1.217574457 +1187,-0.756352277 +1188,-0.987318361 +1189,-0.05542385 +1190,1.945141258 +1191,0.126766327 +1192,0.484086392 +1193,0.247341272 +1194,1.256927478 +1195,0.120934422 +1196,1.251137178 +1197,0.11213065 +1198,-0.255394376 +1199,-0.704343711 +1200,0.309073939 +1201,0.969789266 +1202,0.560553671 +1203,-1.73167449 +1204,-0.88986668 +1205,-0.763761249 +1206,0.247837819 +1207,1.147544858 +1208,1.022735779 +1209,2.175788884 +1210,-0.372259146 +1211,0.467029106 +1212,1.271231585 +1213,-0.816182111 +1214,-0.217278052 +1215,1.749764562 +1216,0.784116353 +1217,1.00895146 +1218,-1.338294345 +1219,1.425240323 +1220,-0.094086206 +1221,1.228116101 +1222,-0.203301588 +1223,-1.654327906 +1224,0.050594562 +1225,0.196886195 +1226,1.683803824 +1227,1.825861623 +1228,0.711670122 +1229,-0.479574173 +1230,0.770407785 +1231,-0.127681681 +1232,0.417720184 +1233,0.989241049 +1234,-0.122745028 +1235,0.903104017 +1236,-0.04707973 +1237,-1.013600178 +1238,0.455859814 +1239,-0.328809768 +1240,-0.091027427 +1241,-0.562765727 +1242,-1.085281734 +1243,-1.308772229 +1244,-1.692134802 +1245,1.696933244 +1246,0.335855147 +1247,0.346514477 +1248,-0.317943433 +1249,0.084826325 +1250,0.550157165 +1251,1.529921972 +1252,-1.28412388 +1253,-0.401184408 +1254,1.214237498 +1255,0.126700221 +1256,0.245813798 +1257,0.670866613 +1258,1.128559982 +1259,0.380725762 +1260,0.112818265 +1261,-0.400405036 +1262,0.148326937 +1263,1.072023975 +1264,-0.474005936 +1265,-0.163670086 +1266,-0.585253233 +1267,-0.069401838 +1268,-0.102382726 +1269,0.082869514 +1270,-0.575252273 +1271,0.654560029 +1272,0.710048041 +1273,1.586952121 +1274,0.605934737 +1275,-0.976830985 +1276,-0.48497013 +1277,-1.279069462 +1278,0.678004442 +1279,-1.058694588 +1280,-0.378410689 +1281,-1.728059162 +1282,0.810285572 +1283,1.919715918 +1284,2.143843723 +1285,-0.880485338 +1286,-0.103939713 +1287,0.275933167 +1288,0.464716865 +1289,-0.743282636 +1290,0.078033888 +1291,0.623058776 +1292,-0.001004085 +1293,-0.458480028 +1294,0.594367206 +1295,0.441931522 +1296,1.324411665 +1297,-0.625429866 +1298,-0.528168714 +1299,-0.210256748 +1300,-3.07073383 +1301,0.306124992 +1302,-0.494857131 +1303,0.474057076 +1304,-2.202207526 +1305,0.290801763 +1306,-1.021201349 +1307,-0.554601655 +1308,0.179147148 +1309,0.957304052 +1310,-0.453517023 +1311,-0.591682664 +1312,-1.484474809 +1313,-2.595124427 +1314,-1.573641162 +1315,-0.067215536 +1316,0.676020392 +1317,-1.12888597 +1318,-0.547476447 +1319,0.454197935 +1320,0.689533258 +1321,-1.246461134 +1322,0.061263565 +1323,-1.036040358 +1324,-0.544417389 +1325,-0.960688598 +1326,-0.97919833 +1327,-1.368226674 +1328,0.607293951 +1329,-0.959312259 +1330,-0.401011668 +1331,-2.204550211 +1332,0.238270632 +1333,1.615338392 +1334,-0.16915305 +1335,-0.352846904 +1336,-1.346774835 +1337,-1.384385829 +1338,-0.339069044 +1339,0.233529978 +1340,-0.51258402 +1341,0.204337616 +1342,1.275979011 +1343,1.267159312 +1344,-0.376169226 +1345,0.320972559 +1346,0.831597277 +1347,-0.757943379 +1348,0.109901613 +1349,0.102133439 +1350,0.451237321 +1351,2.052758997 +1352,0.493403821 +1353,0.25310576 +1354,-0.645334744 +1355,2.697425219 +1356,0.425614822 +1357,-0.653118788 +1358,-0.52403994 +1359,-1.299451072 +1360,-1.440935626 +1361,0.688313531 +1362,2.117469304 +1363,0.258614024 +1364,1.325593234 +1365,0.206956521 +1366,-0.30619084 +1367,0.816710942 +1368,-1.047296308 +1369,-0.432358546 +1370,-0.3751806 +1371,-0.200321853 +1372,0.322079053 +1373,1.236091182 +1374,0.832670871 +1375,-0.274438859 +1376,0.002915741 +1377,0.936905737 +1378,-0.139925039 +1379,-1.223665231 +1380,-0.344035731 +1381,0.541830143 +1382,0.089550894 +1383,-0.399373201 +1384,-0.638971758 +1385,-0.42829274 +1386,0.066232207 +1387,0.172407444 +1388,-1.323501735 +1389,0.38213983 +1390,0.087665437 +1391,1.144264232 +1392,0.040586983 +1393,-0.646331893 +1394,-0.723917657 +1395,1.507763791 +1396,-0.627054227 +1397,-0.9371208 +1398,2.406349533 +1399,-0.093765111 +1400,0.516593832 +1401,0.272142965 +1402,2.462509816 +1403,-0.264848659 +1404,1.412332659 +1405,-0.354292211 +1406,0.11448595 +1407,-0.256964107 +1408,0.324339735 +1409,2.13272175 +1410,1.092728614 +1411,-1.91914295 +1412,-1.660628282 +1413,-0.358849657 +1414,0.168993835 +1415,-0.6352745 +1416,-0.80700903 +1417,-0.632799736 +1418,1.187958056 +1419,0.961249843 +1420,-0.170612173 +1421,1.551243121 +1422,1.362319567 +1423,-1.193773097 +1424,0.875966912 +1425,-0.301807687 +1426,1.087694951 +1427,0.638511876 +1428,-0.623304654 +1429,1.014578475 +1430,0.913151992 +1431,-1.413942561 +1432,-0.926906491 +1433,1.076826789 +1434,0.161473801 +1435,1.343436819 +1436,-0.239858673 +1437,0.419993321 +1438,-0.694705002 +1439,-0.839949363 +1440,0.046718338 +1441,0.020594471 +1442,0.02047847 +1443,-0.784002496 +1444,-0.849342873 +1445,1.424219963 +1446,-0.428727842 +1447,-1.076114332 +1448,0.245701561 +1449,0.795284639 +1450,-0.973539635 +1451,0.68104775 +1452,0.839216441 +1453,-1.52268479 +1454,0.195724793 +1455,-1.042926393 +1456,-1.129095651 +1457,0.764965186 +1458,0.478977433 +1459,-0.899265097 +1460,-0.949318827 +1461,1.614949018 +1462,-0.032344549 +1463,3.360742147 +1464,-0.396105414 +1465,-1.638622894 +1466,0.225093528 +1467,1.066021618 +1468,-0.008648247 +1469,-0.98582826 +1470,1.346256924 +1471,1.069673059 +1472,-0.065328933 +1473,-0.328719295 +1474,-0.987566838 +1475,-1.321288981 +1476,0.721593751 +1477,-0.041482784 +1478,1.826603053 +1479,-0.216176364 +1480,2.863000908 +1481,-1.490517904 +1482,2.377364868 +1483,-0.243495591 +1484,-0.911774065 +1485,-0.716668349 +1486,-0.458943849 +1487,-0.104759866 +1488,0.605636337 +1489,0.065383726 +1490,-0.017498077 +1491,-0.044832297 +1492,-0.738418872 +1493,-1.413405161 +1494,-2.739505592 +1495,-1.841888126 +1496,1.042864628 +1497,2.161190966 +1498,1.342689067 +1499,-0.214030949 +1500,1.042022067 +1501,-0.309085657 +1502,0.277460722 +1503,1.107321205 +1504,-0.585070535 +1505,0.156611861 +1506,-0.351925395 +1507,-0.775565552 +1508,0.114316536 +1509,-1.613789939 +1510,0.217823012 +1511,-1.191785627 +1512,0.593475868 +1513,1.533722175 +1514,-0.323433577 +1515,-0.806779254 +1516,-1.604844659 +1517,0.102191798 +1518,1.322960171 +1519,-0.361678357 +1520,-0.888166285 +1521,0.225253553 +1522,0.962730982 +1523,-0.168650299 +1524,1.778898795 +1525,-1.091458088 +1526,0.284315938 +1527,0.555151951 +1528,0.500225097 +1529,-0.218339028 +1530,0.911711179 +1531,-0.122564715 +1532,0.51501612 +1533,0.774050326 +1534,-0.549177499 +1535,2.174960386 +1536,1.062305575 +1537,-0.139650429 +1538,1.118406979 +1539,1.3584474 +1540,-0.788873132 +1541,0.381642474 +1542,1.439085857 +1543,-1.121210976 +1544,0.150952927 +1545,-1.790852942 +1546,2.013183813 +1547,0.210408816 +1548,-0.671184985 +1549,-1.860633407 +1550,1.09075947 +1551,2.881170535 +1552,-0.123701428 +1553,0.737024616 +1554,1.637156571 +1555,0.570382232 +1556,0.066575419 +1557,-1.362949123 +1558,-0.872602578 +1559,-0.191219854 +1560,-0.108035104 +1561,0.928527111 +1562,-0.015967741 +1563,0.560778368 +1564,0.887724002 +1565,0.056689206 +1566,-0.282033062 +1567,-0.029326086 +1568,-0.052530885 +1569,1.367972968 +1570,-1.79237768 +1571,1.116314751 +1572,-0.196780429 +1573,-0.055235898 +1574,0.916819527 +1575,0.085709656 +1576,0.535777802 +1577,1.089405707 +1578,-0.819426047 +1579,0.177940704 +1580,-0.982378265 +1581,-0.338772763 +1582,-1.231196175 +1583,0.824217401 +1584,-0.794775943 +1585,-0.364367553 +1586,-0.181752727 +1587,0.850876764 +1588,0.694380233 +1589,-0.344790023 +1590,-0.789343958 +1591,0.555591209 +1592,1.8095993 +1593,0.018399509 +1594,-0.2907814 +1595,-1.311454024 +1596,-0.453737701 +1597,-0.713099278 +1598,-1.871217814 +1599,-1.855595008 +1600,-1.50335959 +1601,0.152104007 +1602,-0.349240956 +1603,-1.679758922 +1604,-0.813097069 +1605,-0.68458957 +1606,-1.421559125 +1607,1.254645446 +1608,-0.402991842 +1609,-0.361254808 +1610,-0.007997992 +1611,-0.145461463 +1612,-0.895017449 +1613,-0.905708472 +1614,0.854875838 +1615,0.78699051 +1616,-1.410831808 +1617,-0.764928534 +1618,0.141505386 +1619,-0.388825946 +1620,-3.70286215 +1621,-0.002344433 +1622,0.510266988 +1623,-0.626913417 +1624,0.262031237 +1625,0.470105833 +1626,1.032987175 +1627,0.717039441 +1628,-1.760394966 +1629,-0.068211196 +1630,0.492303386 +1631,0.339595004 +1632,-0.194246437 +1633,1.231180779 +1634,-0.50732565 +1635,0.87349122 +1636,0.207690755 +1637,-0.404986842 +1638,0.184515962 +1639,1.660614188 +1640,-0.120491395 +1641,-0.063217475 +1642,1.805415859 +1643,-0.556181162 +1644,0.351102366 +1645,-1.548318268 +1646,1.796355923 +1647,-1.311573365 +1648,0.661765077 +1649,0.798712499 +1650,-1.177506257 +1651,1.35100198 +1652,0.829813176 +1653,1.1781559 +1654,-3.055804227 +1655,1.339799015 +1656,1.072880261 +1657,-0.05236323 +1658,0.806639372 +1659,-0.630502298 +1660,-0.627638126 +1661,-2.450544613 +1662,-1.053766923 +1663,-0.550824734 +1664,-0.171231715 +1665,-0.385789661 +1666,-1.163382622 +1667,-0.194048389 +1668,1.14223055 +1669,0.393505504 +1670,1.618124654 +1671,0.462184153 +1672,-0.533581448 +1673,0.096926262 +1674,-0.294813712 +1675,-0.38002565 +1676,0.096927543 +1677,0.650988938 +1678,0.213954904 +1679,1.732896243 +1680,0.297904352 +1681,-0.557323155 +1682,-1.038760499 +1683,0.004037229 +1684,-1.257539053 +1685,-0.142588258 +1686,-0.127348537 +1687,-0.573785889 +1688,1.176439789 +1689,0.175882701 +1690,1.598899928 +1691,-0.818855796 +1692,-0.262768199 +1693,-0.328304085 +1694,0.169610773 +1695,-1.047791513 +1696,0.47106748 +1697,-2.265356992 +1698,-0.716463072 +1699,-0.889267603 +1700,-1.301960146 +1701,0.202494957 +1702,0.48782136 +1703,0.866728518 +1704,1.504958339 +1705,0.888348354 +1706,-0.938815863 +1707,-1.839141412 +1708,0.733286953 +1709,-0.213362574 +1710,-0.11796977 +1711,-1.168636502 +1712,0.558730854 +1713,1.060481177 +1714,-0.673135343 +1715,1.487687016 +1716,-1.275335325 +1717,0.878705219 +1718,0.398474049 +1719,-1.558192588 +1720,0.77921354 +1721,-0.892247045 +1722,0.357419561 +1723,0.494176721 +1724,-0.539440003 +1725,0.000386206 +1726,-0.769741029 +1727,0.313805128 +1728,-0.963234471 +1729,-0.368789437 +1730,-0.17670233 +1731,-1.775071713 +1732,-0.80359913 +1733,-2.28906398 +1734,1.160313261 +1735,1.11157293 +1736,-0.301166138 +1737,-0.552782222 +1738,-0.373617313 +1739,0.141000488 +1740,1.377735871 +1741,1.426330638 +1742,0.54543983 +1743,-0.263229746 +1744,0.273568675 +1745,1.419312432 +1746,0.610486579 +1747,1.159710755 +1748,-1.075953673 +1749,-0.122767356 +1750,0.456580432 +1751,-0.900892946 +1752,-0.994932181 +1753,-0.110523942 +1754,2.151103267 +1755,-0.531178235 +1756,-1.012228907 +1757,-0.245966726 +1758,0.684606715 +1759,-0.220290503 +1760,-1.460385504 +1761,2.010610352 +1762,-0.002192636 +1763,-0.52455839 +1764,1.454112457 +1765,0.679916714 +1766,1.012329962 +1767,0.507871078 +1768,0.811905765 +1769,-0.790424859 +1770,-1.395229234 +1771,0.439227749 +1772,1.195216523 +1773,-0.218852214 +1774,-0.284945873 +1775,0.707535982 +1776,1.673377868 +1777,-1.005581537 +1778,0.74725325 +1779,-0.835813552 +1780,1.212757394 +1781,-0.734298675 +1782,-0.879431521 +1783,0.391702188 +1784,0.696680581 +1785,0.789079136 +1786,0.456885959 +1787,-0.648540679 +1788,0.045670802 +1789,0.60428694 +1790,0.550244104 +1791,-0.212835011 +1792,-0.279870367 +1793,-0.160626314 +1794,-1.188668928 +1795,-1.052250258 +1796,-1.231730315 +1797,-1.346895253 +1798,0.516688482 +1799,0.781976093 +1800,-0.189426418 +1801,-0.028605629 +1802,0.627499346 +1803,1.325068377 +1804,0.704091115 +1805,-0.48621016 +1806,0.201925071 +1807,-1.046947297 +1808,-0.248062056 +1809,0.593734865 +1810,-1.522367644 +1811,-0.025457207 +1812,0.786568759 +1813,0.363289977 +1814,1.110924487 +1815,1.159454467 +1816,-0.189238232 +1817,0.730048341 +1818,0.307839648 +1819,-1.751157307 +1820,-0.645708345 +1821,1.008548108 +1822,-1.034890794 +1823,-1.661555554 +1824,0.900352757 +1825,-0.400587569 +1826,0.564609602 +1827,0.339832802 +1828,-0.298687221 +1829,0.347723744 +1830,3.693496942 +1831,-2.130912807 +1832,1.541289144 +1833,-0.47601284 +1834,0.068199826 +1835,0.46396916 +1836,-1.157275219 +1837,0.507581971 +1838,-0.904760773 +1839,-0.220049177 +1840,1.786574782 +1841,0.213579574 +1842,-0.140211417 +1843,1.975969667 +1844,0.503422001 +1845,-0.812042034 +1846,-0.469889291 +1847,-0.23491214 +1848,-0.718618781 +1849,-1.07323202 +1850,-1.441798008 +1851,0.362405705 +1852,0.909489056 +1853,0.202703906 +1854,2.27416428 +1855,0.327187237 +1856,0.399475261 +1857,0.628978616 +1858,-0.025183235 +1859,1.000032899 +1860,-0.590545587 +1861,-0.032818971 +1862,-0.028781065 +1863,-1.053534864 +1864,1.475014844 +1865,-0.176441762 +1866,0.711109536 +1867,-0.69641032 +1868,0.350594227 +1869,0.377475451 +1870,-0.307750745 +1871,0.146895309 +1872,-0.514662908 +1873,0.745472631 +1874,0.930378357 +1875,0.017325869 +1876,-0.709126782 +1877,0.417243936 +1878,-0.785765765 +1879,0.758391905 +1880,-1.789961747 +1881,0.379559958 +1882,-0.425807452 +1883,-0.192454062 +1884,-1.619778255 +1885,-0.424469288 +1886,0.361915921 +1887,0.171364308 +1888,0.935082864 +1889,0.45967675 +1890,0.08101763 +1891,1.132373805 +1892,0.430440028 +1893,-0.265048055 +1894,-0.105163029 +1895,-0.101210977 +1896,-2.399938658 +1897,1.333351711 +1898,-2.14929494 +1899,-0.622364177 +1900,1.986477333 +1901,0.802585133 +1902,-1.521264346 +1903,-0.488202233 +1904,-0.277810625 +1905,-0.947364857 +1906,0.764979056 +1907,0.187834884 +1908,0.711689166 +1909,0.805136447 +1910,-0.623804919 +1911,-0.075521904 +1912,-1.505320664 +1913,-0.178328137 +1914,-1.175337612 +1915,0.007532854 +1916,1.693634074 +1917,0.39934206 +1918,1.018951417 +1919,1.782097998 +1920,0.24529696 +1921,0.122960316 +1922,-0.793892853 +1923,-1.171828415 +1924,0.91049509 +1925,0.551441805 +1926,0.459084534 +1927,-0.57390591 +1928,-0.777301236 +1929,0.004011636 +1930,-0.369480587 +1931,0.223654824 +1932,-0.871965946 +1933,0.319746012 +1934,-1.549238278 +1935,-0.536418186 +1936,-0.705528532 +1937,1.822280916 +1938,0.855597502 +1939,0.053770226 +1940,1.34126332 +1941,1.969972875 +1942,-0.739476257 +1943,-1.995902412 +1944,0.489120768 +1945,0.034361053 +1946,1.27088528 +1947,0.621256256 +1948,-0.632795668 +1949,-0.032324313 +1950,0.491188622 +1951,-0.325390827 +1952,-2.567078797 +1953,2.485538093 +1954,-0.297773014 +1955,-0.986998229 +1956,0.090259859 +1957,0.0076611 +1958,0.075320278 +1959,0.081887592 +1960,0.32305532 +1961,-1.296812931 +1962,-0.421831307 +1963,1.470741903 +1964,-0.577041622 +1965,0.460724949 +1966,1.452478064 +1967,-1.2372402 +1968,0.828051611 +1969,-0.296193072 +1970,1.891450262 +1971,0.113635025 +1972,1.295932522 +1973,1.511888965 +1974,0.302816978 +1975,-0.243137504 +1976,-0.086644585 +1977,0.683219595 +1978,0.964393331 +1979,-1.59380957 +1980,0.38958432 +1981,0.226917645 +1982,-0.67253529 +1983,-1.753656316 +1984,1.127862857 +1985,1.778305888 +1986,-0.204339916 +1987,-1.480750614 +1988,0.375779388 +1989,-0.155068248 +1990,1.106471754 +1991,0.281549537 +1992,1.583650841 +1993,1.477241842 +1994,0.911504457 +1995,-0.487011131 +1996,-1.588134669 +1997,0.257341847 +1998,-1.763500082 +1999,-0.243472216 +2000,-0.413288616 +2001,-1.407345571 +2002,-0.267425131 +2003,1.303271337 +2004,-1.40221421 +2005,-2.257613398 +2006,-0.290858053 +2007,0.57134319 +2008,0.847593759 +2009,-0.024084492 +2010,-0.475229421 +2011,1.669445403 +2012,-2.566050707 +2013,0.827720273 +2014,0.502219467 +2015,-2.058021197 +2016,-0.475683215 +2017,0.003002099 +2018,-1.622559761 +2019,0.474371697 +2020,-0.126464519 +2021,-1.505041232 +2022,1.590771553 +2023,0.536179261 +2024,-0.102886985 +2025,0.481897113 +2026,-0.811425239 +2027,-0.363718507 +2028,0.317592392 +2029,0.819193771 +2030,0.332012422 +2031,0.776122417 +2032,0.998553923 +2033,0.557246096 +2034,1.260545383 +2035,1.97319538 +2036,-1.104521829 +2037,-0.310148206 +2038,0.257202435 +2039,2.423462946 +2040,0.026904419 +2041,-1.110942447 +2042,0.700536969 +2043,0.758977229 +2044,-1.715144579 +2045,-0.053627343 +2046,-0.052304333 +2047,1.628756739 +2048,-0.484883467 +2049,0.031121214 +2050,1.506492589 +2051,-1.630241224 +2052,0.077894652 +2053,0.341682552 +2054,-0.387412229 +2055,1.037806651 +2056,-0.530238351 +2057,1.032967902 +2058,-0.179055708 +2059,1.17127723 +2060,0.685684896 +2061,-0.062514999 +2062,-0.700865399 +2063,0.621416897 +2064,1.21811577 +2065,-1.768058056 +2066,-0.350537031 +2067,0.150335084 +2068,-0.956889919 +2069,-0.109594099 +2070,1.777820055 +2071,0.776000193 +2072,-0.82580888 +2073,-0.444958301 +2074,-0.121342949 +2075,0.147482867 +2076,-0.494562264 +2077,1.680806468 +2078,-1.254264005 +2079,-0.35414054 +2080,-0.366300537 +2081,0.413722815 +2082,-0.508879663 +2083,-0.937193372 +2084,1.271096589 +2085,0.43191345 +2086,-0.298006365 +2087,0.036522536 +2088,1.880245565 +2089,0.124123506 +2090,0.28512778 +2091,-0.988096897 +2092,-0.797605521 +2093,-1.349410418 +2094,-0.946749486 +2095,1.085810211 +2096,0.433038308 +2097,-1.160087058 +2098,-0.37783758 +2099,-0.739030196 +2100,-0.836511368 +2101,1.40854777 +2102,0.460433092 +2103,-1.973821221 +2104,-1.196357108 +2105,-2.756246145 +2106,1.520438292 +2107,1.590532187 +2108,-0.451985596 +2109,-0.092485896 +2110,1.365687502 +2111,-0.646662983 +2112,-1.498838161 +2113,-1.042875463 +2114,0.606459928 +2115,-1.358329389 +2116,1.332131675 +2117,-0.276305037 +2118,0.444087813 +2119,2.006317075 +2120,1.266914199 +2121,-0.690732334 +2122,0.873659725 +2123,-0.242604928 +2124,1.01845736 +2125,0.585856554 +2126,-1.651893232 +2127,-1.085750946 +2128,-0.43129556 +2129,1.7012254 +2130,-0.159662491 +2131,0.64384151 +2132,-1.175867673 +2133,1.392628744 +2134,0.0104397 +2135,-1.478786964 +2136,0.048254641 +2137,0.76289515 +2138,-0.276197529 +2139,0.194194111 +2140,0.611138596 +2141,-1.069526461 +2142,0.389635506 +2143,1.243676692 +2144,1.704719337 +2145,0.136055053 +2146,-0.065078488 +2147,-0.192773964 +2148,0.786450959 +2149,0.279487404 +2150,0.853147441 +2151,1.310045122 +2152,1.598013114 +2153,-0.21955259 +2154,1.703299079 +2155,0.321587739 +2156,-0.606683506 +2157,0.157015015 +2158,0.427213697 +2159,0.001083903 +2160,-1.61787735 +2161,0.017407245 +2162,0.630013987 +2163,0.646404305 +2164,-1.978152484 +2165,-0.700201194 +2166,-0.068701408 +2167,0.651626966 +2168,1.416573036 +2169,0.164570023 +2170,0.923802266 +2171,-0.90233767 +2172,0.276635223 +2173,-0.196144048 +2174,-0.227388078 +2175,0.301877162 +2176,0.416346067 +2177,0.142551997 +2178,-0.090819856 +2179,-0.808246979 +2180,2.454687816 +2181,1.550740856 +2182,0.978740371 +2183,0.306911381 +2184,-0.094855833 +2185,-0.705375411 +2186,1.448514739 +2187,0.599699099 +2188,-0.880880376 +2189,-0.612084473 +2190,0.662154749 +2191,0.994863898 +2192,-0.792857445 +2193,1.907065065 +2194,0.160969549 +2195,1.422068955 +2196,-0.376402222 +2197,0.935576627 +2198,-0.180087156 +2199,-0.28378605 +2200,0.476005028 +2201,1.223097221 +2202,-0.124309367 +2203,-2.233422478 +2204,-0.043021866 +2205,-1.143943158 +2206,-1.213151322 +2207,0.824792652 +2208,1.129144253 +2209,0.887757846 +2210,1.118684948 +2211,2.387292283 +2212,-0.788238904 +2213,1.905609787 +2214,0.051113696 +2215,1.37650912 +2216,-1.333656013 +2217,-0.663585841 +2218,0.280832865 +2219,0.325395727 +2220,0.591906178 +2221,-0.634643499 +2222,-0.475594828 +2223,0.560505822 +2224,-1.170702951 +2225,-1.372004118 +2226,0.0797799 +2227,-0.753056594 +2228,0.237009069 +2229,-0.858798086 +2230,1.57257751 +2231,-1.460494148 +2232,-0.883030278 +2233,-1.625196479 +2234,-0.069635948 +2235,-0.091076947 +2236,1.515211408 +2237,-0.357586946 +2238,1.178631611 +2239,-1.729206373 +2240,0.271323384 +2241,0.227359568 +2242,-0.907887846 +2243,0.52929309 +2244,1.913460489 +2245,1.109893894 +2246,-0.888620757 +2247,0.328531056 +2248,-0.584472611 +2249,-0.745936157 +2250,-0.526161959 +2251,0.918603284 +2252,1.168505073 +2253,-0.277047381 +2254,1.04041442 +2255,0.888725851 +2256,-0.678876082 +2257,1.399554229 +2258,0.123553058 +2259,0.274359524 +2260,0.842209302 +2261,-0.235220959 +2262,-0.401759713 +2263,-0.440669035 +2264,-0.210185516 +2265,-0.405906742 +2266,1.347599592 +2267,-0.353976027 +2268,-0.792524555 +2269,1.005305334 +2270,-0.964256748 +2271,0.42057614 +2272,0.783024696 +2273,-1.236697903 +2274,-0.64445077 +2275,0.328071009 +2276,1.218171276 +2277,-1.14206762 +2278,0.488747425 +2279,-0.388684963 +2280,-0.053460143 +2281,0.355683253 +2282,-1.388479723 +2283,-0.371905797 +2284,0.418272932 +2285,0.528791445 +2286,-1.046639636 +2287,-1.018167701 +2288,0.866767483 +2289,-0.42005925 +2290,1.263598934 +2291,-1.40028706 +2292,-1.345433383 +2293,0.945096893 +2294,1.185792027 +2295,0.482039967 +2296,-0.86313825 +2297,1.581956386 +2298,0.78397236 +2299,0.754152392 +2300,0.313728014 +2301,-0.214046923 +2302,-2.180557956 +2303,-0.348674554 +2304,0.179490863 +2305,0.531626446 +2306,0.968896365 +2307,-0.167432249 +2308,0.382751173 +2309,1.550295092 +2310,-0.769886057 +2311,0.663808591 +2312,0.725697283 +2313,0.175139105 +2314,-0.359565498 +2315,0.024955488 +2316,2.048454297 +2317,-0.820737701 +2318,-0.915638298 +2319,0.454415157 +2320,1.570825539 +2321,1.876836556 +2322,0.874119096 +2323,-1.278349953 +2324,0.187275736 +2325,-0.538362213 +2326,0.393347381 +2327,-1.980487093 +2328,0.118418941 +2329,-0.450526742 +2330,-1.394779638 +2331,-0.153905371 +2332,-1.208964557 +2333,0.432131743 +2334,1.107220819 +2335,0.979755713 +2336,-0.794979317 +2337,-0.822723112 +2338,-0.085047269 +2339,-0.484445864 +2340,-1.352848976 +2341,1.624698977 +2342,0.311191133 +2343,1.212634293 +2344,1.696793904 +2345,0.601048716 +2346,-0.679708875 +2347,-0.191597871 +2348,-0.019227569 +2349,1.868666291 +2350,0.737647953 +2351,-0.099420661 +2352,2.397360122 +2353,0.08468701 +2354,1.4317352 +2355,-1.76320045 +2356,-0.702050309 +2357,1.631285641 +2358,-0.41021459 +2359,1.562617527 +2360,1.598579425 +2361,1.423822957 +2362,-1.451486784 +2363,0.629809896 +2364,0.641880546 +2365,-0.593727666 +2366,1.51487648 +2367,0.888105352 +2368,0.207151635 +2369,-0.029580163 +2370,0.100153361 +2371,-1.821927185 +2372,1.323502948 +2373,0.396312074 +2374,-0.175159913 +2375,0.140153019 +2376,0.967214081 +2377,0.071344789 +2378,-1.604559033 +2379,0.922265004 +2380,0.387687101 +2381,-0.24383415 +2382,1.477924975 +2383,0.650757954 +2384,0.239010737 +2385,0.736348058 +2386,-1.01754089 +2387,-2.31211973 +2388,0.259657327 +2389,0.130983818 +2390,-0.663467699 +2391,-0.80309624 +2392,0.51011325 +2393,1.343358468 +2394,0.27303806 +2395,-0.924364163 +2396,-1.099878344 +2397,0.99317084 +2398,0.476853671 +2399,-2.646800062 +2400,1.110680413 +2401,-1.106582904 +2402,-0.852502117 +2403,1.239386176 +2404,1.021579378 +2405,-0.393316927 +2406,1.008445963 +2407,-0.12763867 +2408,0.855235269 +2409,-0.008414146 +2410,0.648632093 +2411,-1.186171142 +2412,0.062012452 +2413,-0.267219243 +2414,-0.551074561 +2415,0.978029314 +2416,0.817749562 +2417,-3.145471204 +2418,-0.825857113 +2419,-0.684082885 +2420,1.153410416 +2421,1.563619343 +2422,1.336850058 +2423,1.46221232 +2424,1.237528347 +2425,-0.075275247 +2426,-0.305412552 +2427,1.311582256 +2428,1.454658111 +2429,1.238491921 +2430,-0.044735295 +2431,0.035285872 +2432,1.312121409 +2433,0.317397884 +2434,0.080894009 +2435,-0.599749632 +2436,1.110587444 +2437,1.52608767 +2438,-1.294779354 +2439,-0.980474276 +2440,0.022590592 +2441,-0.474138037 +2442,-0.343036004 +2443,0.264353504 +2444,0.172239139 +2445,-0.441606675 +2446,0.192776955 +2447,0.650013702 +2448,1.969015796 +2449,0.549570375 +2450,0.367757514 +2451,0.034329048 +2452,1.261662615 +2453,0.345128954 +2454,1.034518116 +2455,1.280368986 +2456,0.125018165 +2457,1.414437695 +2458,-0.555813224 +2459,-0.321681573 +2460,0.362266949 +2461,1.1196206 +2462,0.759047427 +2463,0.507170714 +2464,-0.802388114 +2465,-1.32393098 +2466,1.046031991 +2467,2.011289695 +2468,-0.141721926 +2469,0.107973825 +2470,2.452432475 +2471,0.55341791 +2472,-1.152692486 +2473,0.023723839 +2474,-0.335590695 +2475,-0.198849277 +2476,-0.37050799 +2477,-0.768413225 +2478,1.296483428 +2479,-0.026540856 +2480,0.13432784 +2481,1.015755617 +2482,-0.582063812 +2483,-1.164371171 +2484,-0.762226619 +2485,0.142969931 +2486,-0.094148398 +2487,-0.423302974 +2488,-1.600306843 +2489,0.699210054 +2490,0.452073344 +2491,0.559676324 +2492,-0.926206712 +2493,-0.497097456 +2494,-0.96636324 +2495,1.65093277 +2496,1.347439666 +2497,0.304782927 +2498,1.287447638 +2499,-0.71434822 +2500,-0.637439574 +2501,-1.459344402 +2502,-0.811946113 +2503,-0.817028658 +2504,0.531376222 +2505,-0.430457195 +2506,-0.680809943 +2507,0.192602352 +2508,-1.031199644 +2509,-0.819917372 +2510,1.264678056 +2511,0.727648833 +2512,0.350522771 +2513,-0.526173377 +2514,-0.264656183 +2515,0.715121705 +2516,0.835069178 +2517,-0.679070797 +2518,-0.401083108 +2519,0.215991776 +2520,-0.589855671 +2521,-0.334430262 +2522,1.035280701 +2523,-1.493562335 +2524,-0.659110582 +2525,-1.305022496 +2526,-0.269789452 +2527,0.61633541 +2528,-3.320345987 +2529,-0.627102225 +2530,1.314138338 +2531,-0.181680264 +2532,-0.044461195 +2533,1.121287244 +2534,0.04914931 +2535,2.356615625 +2536,-0.155134718 +2537,1.181822245 +2538,-0.848955029 +2539,0.15424419 +2540,0.771480105 +2541,1.809940496 +2542,-0.175104177 +2543,-1.281307025 +2544,0.458440028 +2545,0.917748787 +2546,-1.863046269 +2547,-1.214484673 +2548,0.786825623 +2549,0.968819808 +2550,1.770231367 +2551,-0.861802662 +2552,-0.254553991 +2553,1.299947641 +2554,-0.244678162 +2555,-1.28835185 +2556,-1.137191114 +2557,0.647424736 +2558,0.997664068 +2559,0.463715168 +2560,0.977701521 +2561,1.71887517 +2562,-0.343555493 +2563,-1.383076279 +2564,0.316339013 +2565,1.647561053 +2566,-0.703353171 +2567,1.116676435 +2568,-0.606827925 +2569,1.818494714 +2570,-0.419281965 +2571,1.503274627 +2572,-0.724793208 +2573,1.622791457 +2574,0.657348678 +2575,1.490817966 +2576,-0.334546322 +2577,-2.307889732 +2578,1.870231716 +2579,0.512660823 +2580,-2.274861252 +2581,0.035952541 +2582,-0.116476244 +2583,0.705290856 +2584,0.97984403 +2585,0.272524888 +2586,0.189724 +2587,0.274381248 +2588,-0.488595648 +2589,0.132183279 +2590,1.617809223 +2591,-1.477798461 +2592,0.075025671 +2593,0.268697696 +2594,0.150552771 +2595,0.62877214 +2596,-1.27959667 +2597,0.536798925 +2598,0.510038822 +2599,0.039695033 +2600,-0.714147763 +2601,0.685795154 +2602,-0.250415555 +2603,1.247231179 +2604,-0.385499961 +2605,0.541441625 +2606,0.639017128 +2607,1.695194216 +2608,-0.934919302 +2609,-0.199878629 +2610,0.712247508 +2611,0.885191502 +2612,-0.507737589 +2613,-0.375985073 +2614,1.392270785 +2615,-0.202666441 +2616,-0.421186277 +2617,-0.191823346 +2618,-0.344653463 +2619,-0.70220867 +2620,1.70006197 +2621,1.28958189 +2622,1.956643921 +2623,-1.145112623 +2624,-0.901634676 +2625,0.586532709 +2626,-0.618566608 +2627,-1.052508012 +2628,-0.095473032 +2629,1.782356528 +2630,-0.651516517 +2631,0.125092052 +2632,-0.511438927 +2633,0.234374754 +2634,-1.671313417 +2635,1.512021928 +2636,0.391572278 +2637,0.626189518 +2638,0.659898529 +2639,-2.349100404 +2640,0.962111436 +2641,-0.979867734 +2642,-1.571751621 +2643,0.48994048 +2644,0.411895515 +2645,0.845056611 +2646,-0.165488861 +2647,0.923195377 +2648,0.376408589 +2649,-1.257372937 +2650,-0.557810679 +2651,-0.679541202 +2652,1.104665336 +2653,-0.275996478 +2654,-2.443402569 +2655,0.995760186 +2656,0.024892946 +2657,0.903741756 +2658,1.581896753 +2659,0.738615416 +2660,1.216169833 +2661,-0.099273397 +2662,1.848092733 +2663,-0.550545202 +2664,-1.016918153 +2665,0.578486457 +2666,-0.563129503 +2667,-0.452668671 +2668,0.465774549 +2669,2.480073635 +2670,0.003276613 +2671,1.171181272 +2672,1.073425939 +2673,0.262435283 +2674,-2.014383335 +2675,-0.463797672 +2676,-1.311797665 +2677,0.24447936 +2678,0.068490148 +2679,-0.753855974 +2680,-0.71320943 +2681,-0.2510368 +2682,-1.443750448 +2683,0.455653929 +2684,-0.035262481 +2685,1.675833502 +2686,1.038679549 +2687,-0.2554965 +2688,2.187275454 +2689,-0.015704504 +2690,0.208690166 +2691,-2.124421277 +2692,-0.508964104 +2693,-1.100136238 +2694,0.514896446 +2695,-0.239575713 +2696,-1.755623385 +2697,0.481260886 +2698,1.231513415 +2699,0.210734851 +2700,-1.174642978 +2701,1.099842093 +2702,-0.76617303 +2703,1.277049558 +2704,-1.505816713 +2705,-0.522223567 +2706,0.995390203 +2707,0.901572938 +2708,-0.452235183 +2709,-0.452363562 +2710,-0.870976793 +2711,-0.616122133 +2712,0.819232185 +2713,1.181548131 +2714,0.37340504 +2715,1.130659389 +2716,-0.279887629 +2717,-0.447592003 +2718,-0.51045004 +2719,-0.430663907 +2720,1.721613722 +2721,0.487701572 +2722,-0.033625274 +2723,1.346207984 +2724,-0.251970666 +2725,2.280001758 +2726,0.05428262 +2727,-1.260819104 +2728,-0.020849488 +2729,-0.283322065 +2730,0.370445992 +2731,0.417730993 +2732,0.72827579 +2733,1.531353771 +2734,-1.043318379 +2735,-0.160787192 +2736,-1.172108493 +2737,-1.52997937 +2738,-0.194507046 +2739,-1.348387451 +2740,1.523553268 +2741,-0.798631603 +2742,-0.950967936 +2743,-0.063765964 +2744,0.912214748 +2745,-0.808583994 +2746,-0.127436697 +2747,-0.031285801 +2748,1.270955514 +2749,-0.913712235 +2750,0.728903499 +2751,0.616953305 +2752,0.081942413 +2753,-1.604980449 +2754,-0.459442109 +2755,0.053902534 +2756,-2.03637142 +2757,-0.916128208 +2758,-0.587695654 +2759,-1.740122798 +2760,-0.388623062 +2761,0.242722477 +2762,-0.01009862 +2763,-2.123808184 +2764,-0.478025013 +2765,-0.170926793 +2766,0.153835496 +2767,-1.172302386 +2768,-0.236246325 +2769,1.421604009 +2770,0.628511751 +2771,0.028271346 +2772,-0.358109951 +2773,0.894023987 +2774,-0.079119757 +2775,0.736656559 +2776,-0.720989472 +2777,-1.622008535 +2778,0.330785094 +2779,-0.491407592 +2780,0.802859808 +2781,0.691993959 +2782,-0.191235929 +2783,-2.102719503 +2784,0.958605562 +2785,0.66614115 +2786,1.303585192 +2787,0.32029201 +2788,-0.068754722 +2789,-0.263636396 +2790,1.457265151 +2791,1.089906797 +2792,-0.006774601 +2793,-0.511933694 +2794,-0.340126825 +2795,-1.097075286 +2796,0.578117129 +2797,2.848814673 +2798,-0.198624397 +2799,-0.410395101 +2800,2.146871621 +2801,-1.1994984 +2802,-0.519395208 +2803,-1.240952421 +2804,0.231784407 +2805,-0.912421405 +2806,-0.131773515 +2807,2.280690352 +2808,-0.890544139 +2809,1.092778068 +2810,0.638016978 +2811,-0.231677723 +2812,0.027208565 +2813,-2.098453634 +2814,0.636090931 +2815,0.246885386 +2816,-1.26468875 +2817,0.678963475 +2818,-0.241175943 +2819,-0.851064537 +2820,1.770176629 +2821,-1.111575472 +2822,0.562177316 +2823,0.825759922 +2824,0.388514125 +2825,0.942357646 +2826,-0.354391878 +2827,0.402683801 +2828,-0.424582346 +2829,0.325748073 +2830,-0.029396406 +2831,-0.343070458 +2832,-0.00060984 +2833,-1.538816602 +2834,-0.579142186 +2835,3.364613058 +2836,-2.502253307 +2837,-0.399942188 +2838,-0.121524991 +2839,0.338289019 +2840,0.790006111 +2841,-0.050358789 +2842,0.331673497 +2843,0.676197855 +2844,0.402412776 +2845,1.69929648 +2846,-0.321283648 +2847,0.911835475 +2848,1.34551371 +2849,-0.673599261 +2850,0.957952061 +2851,0.279436957 +2852,0.422236089 +2853,0.458370917 +2854,-0.765985977 +2855,0.349436699 +2856,0.125981401 +2857,0.386740884 +2858,0.401460085 +2859,-0.459206276 +2860,-0.648448175 +2861,0.521478929 +2862,0.979527739 +2863,-1.773169051 +2864,0.307778859 +2865,-0.229626145 +2866,0.966344135 +2867,1.808718565 +2868,0.908038156 +2869,0.239742892 +2870,0.850411416 +2871,-0.577051279 +2872,-1.015874495 +2873,0.015306899 +2874,2.518345321 +2875,-0.88997627 +2876,0.902777054 +2877,-0.908612424 +2878,-1.053882227 +2879,-1.692165242 +2880,0.220785496 +2881,-1.095204945 +2882,-0.512735155 +2883,-0.222208417 +2884,0.378252197 +2885,-1.163637624 +2886,1.970955497 +2887,1.288300231 +2888,-1.62460471 +2889,1.98439724 +2890,-0.087417277 +2891,0.768644838 +2892,-1.03772779 +2893,-0.886343078 +2894,-0.12096099 +2895,-1.858493855 +2896,0.277156655 +2897,0.293325178 +2898,-0.321532817 +2899,-0.363432686 +2900,-0.746364218 +2901,0.421318223 +2902,-0.915134879 +2903,0.117173179 +2904,-1.741210432 +2905,-0.829060941 +2906,-0.981268311 +2907,-0.727913629 +2908,0.711145751 +2909,0.130478905 +2910,0.508952656 +2911,-0.29931167 +2912,-0.643821291 +2913,-1.115098125 +2914,0.168520128 +2915,-1.417263089 +2916,-1.505678417 +2917,1.162097171 +2918,0.153752463 +2919,0.894783478 +2920,-1.232900735 +2921,0.845040507 +2922,-0.366436341 +2923,1.956492478 +2924,1.135428421 +2925,-0.739531055 +2926,-0.940029566 +2927,-0.038718983 +2928,-1.275790215 +2929,-0.844733673 +2930,-1.61244535 +2931,0.002323482 +2932,-0.442630049 +2933,0.010854755 +2934,-0.694756016 +2935,0.16643555 +2936,1.203909657 +2937,0.786817827 +2938,0.735789812 +2939,0.097959795 +2940,0.393615772 +2941,-0.962365816 +2942,1.986438046 +2943,-0.78176768 +2944,-0.793931837 +2945,1.631780681 +2946,0.908607873 +2947,-0.096316981 +2948,-0.058674386 +2949,0.584030752 +2950,1.875856313 +2951,0.634282737 +2952,-1.38688777 +2953,-0.866018337 +2954,-1.071973506 +2955,-0.2463436 +2956,1.198641784 +2957,1.708768378 +2958,-1.415594636 +2959,-2.042710124 +2960,-1.380182221 +2961,0.636045474 +2962,-1.78596722 +2963,0.600266974 +2964,-1.889194301 +2965,0.174030021 +2966,-0.540405742 +2967,0.731819172 +2968,-0.232657389 +2969,0.676537531 +2970,1.488500926 +2971,-0.333912502 +2972,-0.905962502 +2973,-1.342055705 +2974,-0.718918795 +2975,1.862074468 +2976,1.977506085 +2977,-0.681720962 +2978,0.491886571 +2979,-1.115712197 +2980,-1.271522509 +2981,-0.493574629 +2982,-0.72202798 +2983,-0.543522434 +2984,0.316236052 +2985,-0.882736413 +2986,-0.747241711 +2987,-0.015802181 +2988,1.270140519 +2989,0.196841741 +2990,0.203512496 +2991,0.591362338 +2992,-1.127234667 +2993,-0.37232219 +2994,1.998359078 +2995,0.094157446 +2996,-0.964802754 +2997,-1.918825234 +2998,-0.689153701 +2999,0.213447233 +3000,-0.950996458 +3001,0.743677593 +3002,0.796120481 +3003,-0.411710752 +3004,-0.704037348 +3005,0.594379906 +3006,0.692072172 +3007,-2.016264484 +3008,-1.212942309 +3009,-0.505997659 +3010,-0.409591591 +3011,0.619166697 +3012,-0.039625859 +3013,0.899353283 +3014,-0.581736165 +3015,-1.617016983 +3016,0.10881189 +3017,-0.398343687 +3018,-1.038820924 +3019,-0.805553842 +3020,0.059831635 +3021,-0.47681932 +3022,-0.482066857 +3023,-0.451901505 +3024,-0.951810286 +3025,-0.282919459 +3026,-1.054046885 +3027,0.680544667 +3028,2.305432365 +3029,0.814222744 +3030,-0.75062428 +3031,0.307324218 +3032,2.090380473 +3033,-0.337565099 +3034,0.332547364 +3035,0.656575369 +3036,-0.104010075 +3037,0.234898912 +3038,-1.2339208 +3039,-0.267204165 +3040,-0.539314624 +3041,1.249965281 +3042,1.014578026 +3043,1.912586853 +3044,-1.884429372 +3045,-0.060941536 +3046,-0.254263458 +3047,-0.351569283 +3048,0.855649018 +3049,1.181216322 +3050,2.454512893 +3051,0.87899496 +3052,2.025137047 +3053,0.136449274 +3054,-0.844987056 +3055,-0.572327419 +3056,1.384363629 +3057,-1.43634002 +3058,0.935482162 +3059,0.316533371 +3060,-0.040314419 +3061,-1.017569219 +3062,-0.09452286 +3063,0.001868817 +3064,-1.299048565 +3065,0.404137833 +3066,1.8638741 +3067,-1.399927264 +3068,-0.336036127 +3069,1.279541258 +3070,-0.887900753 +3071,-0.583338335 +3072,0.836306685 +3073,0.271334729 +3074,0.650660326 +3075,-1.072725962 +3076,0.684874739 +3077,-2.17317185 +3078,1.477109817 +3079,-1.077373748 +3080,-1.95146906 +3081,1.042385598 +3082,0.18683356 +3083,1.872054856 +3084,-0.110892045 +3085,-1.350223241 +3086,-1.163194418 +3087,-0.009518952 +3088,-1.131693163 +3089,-0.679007938 +3090,1.314531691 +3091,-0.398738653 +3092,1.273271753 +3093,1.299015707 +3094,2.297906885 +3095,-0.494159368 +3096,-0.000474041 +3097,1.10458045 +3098,-0.173240281 +3099,-0.07932719 +3100,-0.963275212 +3101,0.215510434 +3102,-0.466957928 +3103,0.312505555 +3104,1.481984685 +3105,-0.040566929 +3106,1.016657668 +3107,1.154163063 +3108,0.397763505 +3109,-1.662017583 +3110,-0.341456601 +3111,-0.496518616 +3112,0.538861026 +3113,-0.056660618 +3114,-0.170741765 +3115,-0.332559745 +3116,0.354804521 +3117,-0.711620086 +3118,-0.444001426 +3119,0.421308488 +3120,-0.717493815 +3121,0.407602713 +3122,-1.322178355 +3123,0.576121279 +3124,-1.062658482 +3125,0.931684722 +3126,0.218573453 +3127,0.894550892 +3128,0.368405171 +3129,0.528062526 +3130,-0.373710317 +3131,-2.121610534 +3132,-0.987524295 +3133,0.55980073 +3134,-0.073761445 +3135,0.065480847 +3136,-0.341632662 +3137,0.09152681 +3138,1.28522935 +3139,0.842115006 +3140,-1.746373374 +3141,-0.801790004 +3142,1.192914612 +3143,0.439794845 +3144,-0.268123717 +3145,-1.774361423 +3146,0.258935166 +3147,0.351301207 +3148,-0.715434221 +3149,-0.205856524 +3150,0.443869931 +3151,0.020367964 +3152,-0.68396282 +3153,0.118329291 +3154,-1.679168415 +3155,-0.043760816 +3156,0.103186003 +3157,0.425986747 +3158,-1.160382771 +3159,-0.740137362 +3160,0.211706998 +3161,0.474028496 +3162,0.529934802 +3163,0.566156732 +3164,-0.533691075 +3165,-0.940053174 +3166,-0.422494867 +3167,1.001946876 +3168,1.262467531 +3169,-0.458774143 +3170,-0.425917021 +3171,-0.8511515 +3172,0.910417837 +3173,1.225462159 +3174,0.630062534 +3175,-1.094564588 +3176,-1.319667023 +3177,-1.019097828 +3178,-1.494771835 +3179,2.042046822 +3180,0.558746333 +3181,-0.86372764 +3182,-0.855933502 +3183,-0.7965938 +3184,0.326472515 +3185,-0.715010838 +3186,-0.176815621 +3187,0.04554198 +3188,-0.109359873 +3189,1.163253467 +3190,0.47773967 +3191,-1.515947586 +3192,-0.130403542 +3193,2.128643561 +3194,0.295353465 +3195,-1.144970071 +3196,2.267687037 +3197,-0.12825442 +3198,1.153413164 +3199,-2.871145904 +3200,-0.54895895 +3201,-0.762037887 +3202,0.912818345 +3203,-0.481265906 +3204,0.01315407 +3205,1.655777093 +3206,-0.278293897 +3207,0.209215575 +3208,1.780231998 +3209,0.398465532 +3210,-0.443851507 +3211,-0.093667589 +3212,-0.430860889 +3213,1.451448308 +3214,-0.473623071 +3215,0.277089431 +3216,-0.026798673 +3217,-0.74404487 +3218,0.150332828 +3219,-0.444602092 +3220,-0.438062059 +3221,0.066799108 +3222,-0.954891989 +3223,0.006209369 +3224,0.133847196 +3225,1.386216938 +3226,-0.118681154 +3227,-0.163418478 +3228,1.297283275 +3229,-0.76625098 +3230,0.067876717 +3231,-1.753220035 +3232,-0.92804515 +3233,-1.433915694 +3234,-0.94397522 +3235,0.110668898 +3236,-0.402241853 +3237,0.377929855 +3238,0.521116084 +3239,-0.709826224 +3240,0.851147968 +3241,1.52432934 +3242,-1.606365076 +3243,-0.228389314 +3244,-0.757926883 +3245,0.524293182 +3246,-0.182860064 +3247,-1.252972973 +3248,0.275883362 +3249,0.156988392 +3250,0.192384531 +3251,0.437543001 +3252,0.206654178 +3253,1.471859591 +3254,-0.868803346 +3255,-0.077447062 +3256,-1.203781581 +3257,-0.202675822 +3258,0.477512088 +3259,-1.014784007 +3260,-1.274694733 +3261,0.838114737 +3262,-0.135399494 +3263,-0.255242737 +3264,1.307066194 +3265,1.328424105 +3266,-1.015527785 +3267,-1.026741883 +3268,-0.894337532 +3269,-1.11538912 +3270,0.026486749 +3271,-0.207249041 +3272,2.714038847 +3273,-1.389011361 +3274,0.811966694 +3275,1.169582948 +3276,0.473861314 +3277,0.403395523 +3278,0.647451797 +3279,0.00983025 +3280,1.404699449 +3281,1.145131565 +3282,-1.00418689 +3283,0.565561224 +3284,0.091157245 +3285,1.637748262 +3286,0.692433066 +3287,-0.479478573 +3288,1.771126898 +3289,-0.184106094 +3290,1.184024486 +3291,0.374253934 +3292,-1.426998131 +3293,0.137416828 +3294,1.1218916 +3295,-0.878948659 +3296,1.070468109 +3297,-1.6957692 +3298,1.307825 +3299,1.249992208 +3300,-0.319345742 +3301,-1.291523851 +3302,0.730682598 +3303,0.537168562 +3304,1.307763576 +3305,0.892988142 +3306,-0.787098963 +3307,-1.067200084 +3308,0.185630092 +3309,0.592377829 +3310,0.250185568 +3311,-0.82204645 +3312,0.623316299 +3313,0.718097855 +3314,-0.902595011 +3315,1.516874286 +3316,-1.544522786 +3317,-0.307906205 +3318,-0.266486728 +3319,-0.582804723 +3320,-0.967249262 +3321,0.192031112 +3322,0.691815811 +3323,2.039955855 +3324,0.210919246 +3325,1.173417788 +3326,-1.128025116 +3327,1.67274211 +3328,0.49878017 +3329,0.803534029 +3330,-0.818355591 +3331,0.811380958 +3332,-0.036210112 +3333,-1.720620044 +3334,1.157485846 +3335,0.107799885 +3336,-1.350666198 +3337,-0.615029882 +3338,0.203938498 +3339,-1.549771472 +3340,0.371047638 +3341,0.227740766 +3342,-1.343365936 +3343,1.314269721 +3344,-1.153223627 +3345,1.54922686 +3346,0.779630131 +3347,-0.038422054 +3348,-0.145442316 +3349,1.303595436 +3350,0.469927932 +3351,1.090798521 +3352,-0.0673522 +3353,1.137173763 +3354,0.587948195 +3355,-0.118169897 +3356,-0.867730682 +3357,-0.444294307 +3358,-0.130640431 +3359,-0.226116695 +3360,-1.227298157 +3361,0.137162593 +3362,1.133639027 +3363,1.382919567 +3364,-1.04247994 +3365,0.992943794 +3366,0.957685511 +3367,0.623397219 +3368,0.4579835 +3369,-1.010810792 +3370,0.303925917 +3371,0.588581991 +3372,1.268494879 +3373,1.440565382 +3374,0.853772067 +3375,-1.256258394 +3376,-1.635020908 +3377,0.769929659 +3378,0.049686479 +3379,0.926343197 +3380,0.207747601 +3381,-0.479909425 +3382,-0.346488811 +3383,1.363418649 +3384,-0.856611786 +3385,0.208258783 +3386,0.153017911 +3387,-0.675791982 +3388,-0.656266269 +3389,-0.650254423 +3390,-0.694907271 +3391,0.453921184 +3392,0.051894876 +3393,1.358529662 +3394,-0.547435712 +3395,-1.584996157 +3396,1.384469437 +3397,-0.302543658 +3398,1.65504899 +3399,-0.71476593 +3400,0.2280074 +3401,-0.011615686 +3402,-0.263996263 +3403,-2.453069055 +3404,0.106491579 +3405,1.221499958 +3406,-0.287032498 +3407,-0.438386072 +3408,-0.678319009 +3409,-0.486439891 +3410,1.163361225 +3411,-0.242624671 +3412,-0.166798603 +3413,0.242737619 +3414,0.243953964 +3415,0.246613815 +3416,0.602788255 +3417,-0.395550705 +3418,2.454693117 +3419,1.785376156 +3420,1.076530721 +3421,0.222138732 +3422,1.013960165 +3423,1.325791804 +3424,0.136728059 +3425,-0.188133847 +3426,1.194365299 +3427,-1.561776189 +3428,-0.639822336 +3429,-0.006237423 +3430,-0.176893969 +3431,0.345245275 +3432,2.291454006 +3433,-0.797927487 +3434,-0.223119356 +3435,-0.53346876 +3436,-1.702929365 +3437,0.009748202 +3438,0.072539433 +3439,-1.42489478 +3440,0.250203815 +3441,-1.613573377 +3442,-1.714244618 +3443,0.52931129 +3444,0.949661446 +3445,0.728056272 +3446,-1.744591351 +3447,-0.091150686 +3448,-0.212973611 +3449,1.439060492 +3450,-0.025915286 +3451,0.533357628 +3452,-1.068597772 +3453,-0.129456934 +3454,-0.046362633 +3455,0.168527042 +3456,-0.529383912 +3457,-1.84081011 +3458,-1.516666007 +3459,-0.238618399 +3460,-1.338882886 +3461,-0.023145086 +3462,0.695503547 +3463,0.20570244 +3464,-0.551178993 +3465,-0.626753262 +3466,1.322232584 +3467,0.87782082 +3468,-0.215140739 +3469,1.363720101 +3470,-1.889896992 +3471,-2.862076562 +3472,-1.011255204 +3473,0.294254126 +3474,1.42546592 +3475,-0.748993264 +3476,0.107728156 +3477,1.610100555 +3478,0.811066017 +3479,0.188372436 +3480,-0.0156526 +3481,-1.252244591 +3482,-0.570630271 +3483,0.411902962 +3484,-0.53640423 +3485,0.303019382 +3486,0.340675225 +3487,2.000929288 +3488,-0.941714973 +3489,-0.472265563 +3490,1.281154513 +3491,-0.909443441 +3492,-0.393276479 +3493,0.667723728 +3494,-1.354269806 +3495,0.352584766 +3496,-2.225284056 +3497,0.074014313 +3498,0.102012024 +3499,-2.49347176 +3500,-0.489005804 +3501,-1.321086007 +3502,0.179418361 +3503,0.827651156 +3504,-0.654775811 +3505,-1.053178682 +3506,-0.360263259 +3507,-0.291301862 +3508,0.098041515 +3509,-0.380103377 +3510,-0.083422071 +3511,0.127867346 +3512,-1.135990595 +3513,-0.37052871 +3514,-0.613468948 +3515,0.315950532 +3516,-2.100403808 +3517,1.113287732 +3518,0.785557975 +3519,0.652473967 +3520,-2.507872716 +3521,-0.80410345 +3522,0.104954606 +3523,0.116647264 +3524,-1.650105019 +3525,-0.494158777 +3526,-1.271253037 +3527,0.206593962 +3528,0.160589153 +3529,-0.055154347 +3530,-0.51914123 +3531,-0.953284129 +3532,-0.450872115 +3533,-1.540825271 +3534,1.233062121 +3535,0.931289023 +3536,-0.246929565 +3537,1.16493305 +3538,0.072495147 +3539,0.065824666 +3540,-0.574105033 +3541,0.326784881 +3542,0.235494093 +3543,-1.661233505 +3544,0.237162131 +3545,0.130896303 +3546,0.975095989 +3547,0.31082144 +3548,-0.481325655 +3549,-0.476011655 +3550,0.144700704 +3551,0.369049034 +3552,0.700988852 +3553,-1.196280778 +3554,1.976995195 +3555,0.426181179 +3556,0.607264372 +3557,0.185429911 +3558,-0.774948404 +3559,-1.46561725 +3560,-0.276725746 +3561,-1.114819096 +3562,-0.543606441 +3563,-0.297038074 +3564,-0.401276781 +3565,0.629123448 +3566,0.857506572 +3567,-0.270581201 +3568,-0.374373171 +3569,-0.803082026 +3570,-1.220895979 +3571,0.009389999 +3572,0.501850729 +3573,0.859609652 +3574,0.603375464 +3575,0.438652259 +3576,0.197028247 +3577,-0.127800557 +3578,2.058992021 +3579,-0.101879339 +3580,1.168641648 +3581,-0.476932644 +3582,1.974223153 +3583,0.775848288 +3584,1.846385842 +3585,-0.707795945 +3586,-0.049412797 +3587,-0.211790435 +3588,-0.154290219 +3589,0.592975633 +3590,0.671516577 +3591,0.802665431 +3592,0.632465974 +3593,-0.181074814 +3594,1.860350755 +3595,-1.585117594 +3596,0.228128347 +3597,0.598268758 +3598,1.16014915 +3599,0.384168732 +3600,0.246067423 +3601,-1.398574576 +3602,0.528364621 +3603,0.028748628 +3604,1.507942718 +3605,-1.062469567 +3606,0.919349737 +3607,0.183255169 +3608,-0.150326179 +3609,-1.169321099 +3610,0.471789345 +3611,0.060518554 +3612,1.199414946 +3613,0.958418724 +3614,1.027650523 +3615,1.140057945 +3616,-0.907783494 +3617,-0.569416175 +3618,-1.432925933 +3619,0.943672655 +3620,-0.08188434 +3621,2.28046923 +3622,0.184030565 +3623,-0.316600581 +3624,0.288050226 +3625,-0.692567741 +3626,1.068565282 +3627,0.267317154 +3628,-0.224814729 +3629,-0.10806229 +3630,-0.765663768 +3631,0.279836979 +3632,0.284020864 +3633,0.862282006 +3634,0.931282317 +3635,-0.04299917 +3636,0.239372015 +3637,0.738876089 +3638,0.250573484 +3639,0.433762129 +3640,-1.609148649 +3641,0.081724324 +3642,0.215384769 +3643,-0.940713369 +3644,-0.559129462 +3645,-0.083504557 +3646,0.036199897 +3647,-0.206853296 +3648,0.41332639 +3649,-0.935604534 +3650,0.274784831 +3651,-1.576113759 +3652,-0.330248983 +3653,2.457568627 +3654,2.441733281 +3655,-1.039265755 +3656,-1.23662155 +3657,-1.43727201 +3658,0.768993885 +3659,-1.449648414 +3660,-0.65516761 +3661,-1.458938279 +3662,0.511341146 +3663,0.075293049 +3664,-0.435462873 +3665,1.565887971 +3666,1.304430327 +3667,-0.329604291 +3668,2.42003043 +3669,0.355628773 +3670,-0.711796824 +3671,-0.67638943 +3672,-1.33889754 +3673,-0.047464428 +3674,-0.861151011 +3675,-0.915100107 +3676,-1.241390761 +3677,2.107587825 +3678,1.272382446 +3679,-1.288769419 +3680,0.783281241 +3681,-0.287902397 +3682,0.402044264 +3683,-0.888716616 +3684,0.740510759 +3685,-0.739674722 +3686,0.681888397 +3687,-0.244133002 +3688,-1.327591726 +3689,-2.154089403 +3690,0.008793169 +3691,0.835131579 +3692,-0.889854782 +3693,0.167197893 +3694,-0.312903136 +3695,-2.46158028 +3696,-0.368678526 +3697,0.236017075 +3698,-0.463593508 +3699,0.196036489 +3700,-1.380928351 +3701,0.588330749 +3702,1.209242453 +3703,-0.699337785 +3704,0.902743642 +3705,3.120653726 +3706,0.492563937 +3707,0.250927929 +3708,1.592938785 +3709,-0.199029489 +3710,-0.388869744 +3711,0.328348417 +3712,-0.798938614 +3713,-1.753906566 +3714,-0.523305634 +3715,1.631953757 +3716,-0.256616902 +3717,1.495169338 +3718,-1.078197732 +3719,0.199215952 +3720,0.011682613 +3721,-1.422906636 +3722,0.663412423 +3723,0.304180617 +3724,-1.162328818 +3725,-0.440649953 +3726,-0.271511647 +3727,-0.634637601 +3728,-1.265723447 +3729,-0.923105652 +3730,0.744342402 +3731,0.59451026 +3732,0.822234089 +3733,1.424037441 +3734,0.596087367 +3735,-0.316411174 +3736,-0.486439319 +3737,-0.154706813 +3738,0.92586158 +3739,0.822566122 +3740,-0.135648741 +3741,-0.37001192 +3742,1.22278289 +3743,0.302844947 +3744,-1.036532558 +3745,1.653865904 +3746,1.15458381 +3747,0.243178986 +3748,-0.095979334 +3749,1.765969861 +3750,0.597541841 +3751,-1.838092516 +3752,0.060409977 +3753,-0.40013272 +3754,0.742596675 +3755,0.453623335 +3756,-0.483806639 +3757,0.958786261 +3758,-0.857157465 +3759,2.068893981 +3760,2.061594062 +3761,-0.599267072 +3762,-0.410301359 +3763,-0.272119819 +3764,-0.889743486 +3765,0.459313473 +3766,-2.13148346 +3767,-0.022686083 +3768,0.93091079 +3769,-0.592724897 +3770,1.150829142 +3771,1.89191259 +3772,-0.774547413 +3773,-0.020140653 +3774,-0.787116588 +3775,-0.876233978 +3776,-1.24308564 +3777,-1.524409116 +3778,0.798693607 +3779,-0.17359801 +3780,-0.803934233 +3781,-1.965221696 +3782,0.726954853 +3783,-0.404902699 +3784,1.125730936 +3785,-0.011416475 +3786,0.322537374 +3787,-0.774937051 +3788,0.645242074 +3789,-0.301381175 +3790,-0.710290395 +3791,1.215884786 +3792,-0.623977208 +3793,0.317395096 +3794,0.105408035 +3795,0.271056251 +3796,-1.298965691 +3797,0.88179649 +3798,-1.505267687 +3799,0.421336051 +3800,0.514645843 +3801,0.520166428 +3802,-0.344774684 +3803,-0.631384985 +3804,0.402485181 +3805,0.641591645 +3806,0.698494393 +3807,0.124502808 +3808,-1.19875465 +3809,-0.013195424 +3810,-0.598387824 +3811,0.820536589 +3812,2.103347783 +3813,-0.366694485 +3814,0.933660132 +3815,-1.762143293 +3816,1.969292725 +3817,1.208358649 +3818,-0.239673711 +3819,-0.670389155 +3820,1.822925916 +3821,-0.957935989 +3822,-0.642263417 +3823,0.47533235 +3824,0.094055838 +3825,-0.095121027 +3826,1.49839273 +3827,-0.055669777 +3828,1.177386652 +3829,-0.176577164 +3830,0.417799942 +3831,0.69829545 +3832,-0.500162946 +3833,0.748458028 +3834,0.754545762 +3835,0.631003039 +3836,0.171796967 +3837,0.958076871 +3838,-0.085109308 +3839,1.144285043 +3840,1.104098837 +3841,0.321835071 +3842,1.083802913 +3843,-0.175465094 +3844,-2.334344854 +3845,-2.756318035 +3846,1.171984271 +3847,-0.313458462 +3848,0.661587518 +3849,0.479921854 +3850,0.355815978 +3851,0.597210818 +3852,-0.671037052 +3853,-1.556347603 +3854,-2.567437926 +3855,-0.493561886 +3856,-1.417933999 +3857,-0.181740737 +3858,-2.265220459 +3859,-0.054214348 +3860,-0.521075147 +3861,1.119217969 +3862,0.793078864 +3863,-0.332638039 +3864,0.700916811 +3865,-1.520720636 +3866,0.591024964 +3867,1.113551362 +3868,0.600598779 +3869,0.653925559 +3870,-0.325778307 +3871,-1.189985323 +3872,-1.335746396 +3873,-0.152801952 +3874,-0.73873003 +3875,0.361143466 +3876,-1.145806458 +3877,0.506792293 +3878,-0.966727593 +3879,0.095903974 +3880,-0.589977932 +3881,0.244665777 +3882,-1.060802129 +3883,-1.632891786 +3884,0.129528408 +3885,0.566145159 +3886,0.521415033 +3887,2.230218968 +3888,0.070547442 +3889,0.378058167 +3890,0.492228212 +3891,-1.037520965 +3892,-1.563680176 +3893,0.470848221 +3894,-0.393231984 +3895,-1.011543043 +3896,-0.417994393 +3897,1.252572344 +3898,1.367396549 +3899,-0.076755654 +3900,-1.123165167 +3901,1.83863243 +3902,0.659468394 +3903,-1.613828876 +3904,2.137819863 +3905,-0.776158187 +3906,-0.767423147 +3907,-1.498205411 +3908,-1.193841763 +3909,1.055422761 +3910,0.715619377 +3911,0.336018258 +3912,1.468955783 +3913,1.177453251 +3914,1.669597699 +3915,0.372945562 +3916,-0.789194394 +3917,-0.931397853 +3918,0.177265386 +3919,-1.274918115 +3920,0.728533459 +3921,0.321053754 +3922,-1.586213007 +3923,-1.471617507 +3924,1.473065189 +3925,-0.643991045 +3926,-0.481139218 +3927,1.812295497 +3928,0.727209538 +3929,-0.135655458 +3930,0.168567384 +3931,2.877788229 +3932,-0.017972741 +3933,0.10611787 +3934,0.439672986 +3935,0.724280676 +3936,0.48213879 +3937,-1.625407731 +3938,2.340002306 +3939,-0.387257542 +3940,-0.60382151 +3941,0.588769635 +3942,1.662767608 +3943,-0.432388133 +3944,-0.264412437 +3945,2.679347137 +3946,-0.382326951 +3947,0.319439033 +3948,-0.548300992 +3949,0.724482041 +3950,0.414673288 +3951,0.432461939 +3952,-0.425660441 +3953,0.692132656 +3954,0.838413911 +3955,0.234153289 +3956,1.291395877 +3957,1.376295848 +3958,-2.191816939 +3959,0.365472954 +3960,0.671566779 +3961,-0.235506329 +3962,0.341898432 +3963,-0.984706255 +3964,0.071310853 +3965,-2.048392578 +3966,1.413534795 +3967,-0.500409532 +3968,0.825254002 +3969,-0.541807723 +3970,-1.255399156 +3971,0.663513088 +3972,-1.241530461 +3973,1.854033525 +3974,0.891054612 +3975,0.161575011 +3976,-0.635948854 +3977,0.851963715 +3978,0.653977345 +3979,2.301705943 +3980,1.444164351 +3981,0.555059879 +3982,-0.560070896 +3983,0.229496186 +3984,0.508866201 +3985,-1.747275152 +3986,-0.780695959 +3987,0.026163975 +3988,0.366686131 +3989,-2.045712527 +3990,-0.9361885 +3991,1.018094155 +3992,1.06423587 +3993,1.110719002 +3994,-0.371580793 +3995,-0.485542867 +3996,-0.11428997 +3997,1.181367915 +3998,-2.817977316 +3999,0.056737841 +4000,0.519987304 +4001,-0.860772205 +4002,1.064446407 +4003,-0.40218067 +4004,1.573180424 +4005,0.247821946 +4006,-1.451715264 +4007,0.4401337 +4008,0.159914903 +4009,2.494324317 +4010,-0.559078526 +4011,-1.117399721 +4012,-0.915103724 +4013,-0.384731654 +4014,0.791827827 +4015,-0.413873576 +4016,-1.066826482 +4017,-0.214558252 +4018,1.042970595 +4019,1.795867785 +4020,-0.73792781 +4021,0.44047038 +4022,0.831546566 +4023,1.545196321 +4024,1.806567004 +4025,-1.34731355 +4026,-0.270667087 +4027,0.98408258 +4028,0.815271681 +4029,-1.252399628 +4030,0.438140898 +4031,1.505331476 +4032,0.699657968 +4033,-0.389681184 +4034,0.001881974 +4035,0.542718043 +4036,-0.216050421 +4037,-0.135226732 +4038,0.623788659 +4039,-1.790495385 +4040,-2.158656275 +4041,-1.181198869 +4042,2.230796863 +4043,-1.246520072 +4044,0.342547345 +4045,0.004400658 +4046,1.729575789 +4047,-1.251814537 +4048,0.268383504 +4049,1.61733866 +4050,0.863110849 +4051,1.828190845 +4052,-0.120716595 +4053,0.123163563 +4054,0.864383974 +4055,0.680849844 +4056,-1.757330292 +4057,-0.304328753 +4058,1.173193331 +4059,-1.002919674 +4060,-1.547134109 +4061,-0.588217199 +4062,0.609730249 +4063,-0.849206463 +4064,-0.166595413 +4065,0.506645328 +4066,0.728892442 +4067,-2.728664593 +4068,-0.236086599 +4069,-0.997030896 +4070,0.000933148 +4071,-0.461089011 +4072,1.877012661 +4073,-0.289952383 +4074,-1.153174556 +4075,-0.192766605 +4076,-0.083381931 +4077,-0.919351653 +4078,-1.119398458 +4079,1.88257933 +4080,1.904154805 +4081,-0.492495175 +4082,-1.558736306 +4083,-0.112543163 +4084,2.074896692 +4085,0.693537224 +4086,-0.065863797 +4087,1.408790573 +4088,1.456918574 +4089,1.218513847 +4090,0.516711899 +4091,0.540817255 +4092,0.587580151 +4093,-1.44973339 +4094,-0.632415845 +4095,-0.696928618 +4096,0.738742193 +4097,-0.361456933 +4098,-0.611036848 +4099,-1.354584857 +4100,0.834172336 +4101,1.308046486 +4102,0.453864641 +4103,0.422034968 +4104,-1.216792096 +4105,-4.000263287 +4106,-0.85983795 +4107,-0.130052337 +4108,-1.447103582 +4109,-0.267868163 +4110,-0.012492859 +4111,0.074635317 +4112,-0.323071859 +4113,1.660677116 +4114,-1.199667702 +4115,1.561810788 +4116,-1.833599014 +4117,-0.343860722 +4118,0.230359303 +4119,0.725676106 +4120,0.38638206 +4121,-0.044798771 +4122,0.745467252 +4123,1.580356543 +4124,0.357097159 +4125,-0.806176798 +4126,-0.123135415 +4127,-2.113611683 +4128,-0.006357575 +4129,0.8340264 +4130,0.910656973 +4131,-0.07264445 +4132,-0.608277831 +4133,0.325080852 +4134,0.80411108 +4135,1.837007748 +4136,1.552420112 +4137,0.297980114 +4138,0.018726399 +4139,0.574737088 +4140,-0.382239796 +4141,-0.580729197 +4142,-1.16058727 +4143,-0.670732268 +4144,0.18067945 +4145,0.421799628 +4146,0.21804044 +4147,0.247558429 +4148,0.753045162 +4149,1.767829983 +4150,0.349291379 +4151,-1.225530788 +4152,0.207052605 +4153,0.429712593 +4154,0.060213325 +4155,0.291020003 +4156,0.068444521 +4157,0.366074313 +4158,0.56909319 +4159,1.101906771 +4160,-1.096500239 +4161,0.566519746 +4162,0.61108549 +4163,-0.228699901 +4164,-0.843354728 +4165,-1.07205514 +4166,-2.910164511 +4167,1.050809065 +4168,0.940164058 +4169,-1.978124033 +4170,0.540188153 +4171,0.34383292 +4172,0.302345186 +4173,-1.466482415 +4174,1.229026054 +4175,-0.010065523 +4176,1.687786341 +4177,-0.941611186 +4178,-0.793947314 +4179,0.796541462 +4180,0.377252647 +4181,0.105856776 +4182,0.924991875 +4183,0.537564827 +4184,-2.086254677 +4185,1.159667891 +4186,0.732669319 +4187,-1.912835239 +4188,0.201765978 +4189,-0.737874625 +4190,0.056725222 +4191,0.328896974 +4192,-0.116508481 +4193,-0.179283177 +4194,-0.858791784 +4195,0.707318558 +4196,-0.352071017 +4197,0.106606792 +4198,1.124296545 +4199,-1.225984992 +4200,-0.747831775 +4201,-2.219784288 +4202,1.751757833 +4203,0.452283054 +4204,0.870319193 +4205,0.036988402 +4206,0.096318995 +4207,-0.58284027 +4208,-0.043375196 +4209,0.146744732 +4210,-0.402611362 +4211,-0.031862158 +4212,0.481401604 +4213,-0.048397118 +4214,-0.661390953 +4215,-0.597546798 +4216,0.126347547 +4217,3.772044958 +4218,1.244020958 +4219,1.86802006 +4220,0.038003154 +4221,-1.194223992 +4222,0.327126958 +4223,-0.803408353 +4224,1.997144432 +4225,0.448986825 +4226,-0.569160382 +4227,0.385177381 +4228,1.099949183 +4229,0.048450799 +4230,-1.173381649 +4231,1.768271811 +4232,-0.126846282 +4233,-0.610673747 +4234,1.574743844 +4235,-0.847238041 +4236,-0.347748493 +4237,1.331658009 +4238,-0.836086274 +4239,0.07422453 +4240,-2.152157303 +4241,-1.038478566 +4242,-0.190756925 +4243,-1.414360184 +4244,-0.981393425 +4245,2.615128325 +4246,1.007904523 +4247,0.56155192 +4248,-0.616849853 +4249,-1.447046789 +4250,0.138784163 +4251,-2.024928479 +4252,-0.690765708 +4253,0.731744479 +4254,0.426734255 +4255,-0.133569108 +4256,-0.046201988 +4257,-0.776879138 +4258,-0.589345271 +4259,-1.008726557 +4260,-2.991653335 +4261,-0.09265099 +4262,-0.147611769 +4263,0.904436055 +4264,1.147672865 +4265,-1.326494913 +4266,-0.757619424 +4267,0.166375984 +4268,-0.321384102 +4269,-0.193280118 +4270,-1.34894192 +4271,-1.911835873 +4272,-1.321526341 +4273,-1.320148384 +4274,1.516536911 +4275,-0.344457438 +4276,0.474309409 +4277,-0.201356145 +4278,-0.099605938 +4279,1.329257497 +4280,0.79438175 +4281,-0.75611226 +4282,0.394039341 +4283,0.754883021 +4284,-0.705527364 +4285,-0.003634629 +4286,-0.150393852 +4287,0.469485572 +4288,0.879297642 +4289,1.293565263 +4290,-1.65981301 +4291,0.192666979 +4292,-0.707457819 +4293,-0.237714372 +4294,-0.583779981 +4295,1.539832764 +4296,-0.535849965 +4297,1.438418385 +4298,0.939904811 +4299,-1.351156887 +4300,0.430264371 +4301,-0.776787683 +4302,0.195879654 +4303,0.481642477 +4304,0.168412983 +4305,0.225455338 +4306,1.71497683 +4307,-1.439061579 +4308,0.705993251 +4309,-0.398038172 +4310,2.088671737 +4311,-0.57170232 +4312,0.327315159 +4313,1.939379529 +4314,0.857258672 +4315,0.790738285 +4316,-1.976685252 +4317,-0.295419255 +4318,-0.084616786 +4319,0.186754853 +4320,-1.212238319 +4321,-0.580554849 +4322,-0.569767463 +4323,-0.683453724 +4324,-0.521981545 +4325,-1.283362991 +4326,-0.444248875 +4327,0.721415628 +4328,-0.402902657 +4329,-0.585991355 +4330,0.010916888 +4331,0.293698832 +4332,0.936145243 +4333,-1.794982879 +4334,0.434351309 +4335,1.94600273 +4336,0.104999294 +4337,-0.769814387 +4338,-0.201967924 +4339,0.989077071 +4340,-1.376273747 +4341,-0.827621211 +4342,-0.145935581 +4343,-0.84107668 +4344,-1.733515711 +4345,-0.532355108 +4346,-1.776001017 +4347,-0.744035213 +4348,-1.444394705 +4349,1.451040618 +4350,-0.295310801 +4351,0.445154216 +4352,0.046416413 +4353,-1.282954729 +4354,-0.248326907 +4355,0.516028638 +4356,-0.602572487 +4357,-0.244424377 +4358,-0.545556435 +4359,0.730077672 +4360,-2.500958155 +4361,-1.569035773 +4362,0.279212478 +4363,0.915123564 +4364,-0.579093417 +4365,-0.426643464 +4366,1.877803416 +4367,-0.47413369 +4368,-0.373006307 +4369,-0.412973838 +4370,1.559799196 +4371,0.392011137 +4372,-0.867967407 +4373,0.162108997 +4374,-0.167354019 +4375,1.155405756 +4376,-0.162520828 +4377,-0.188444495 +4378,-0.495731158 +4379,-0.356549881 +4380,-0.657780215 +4381,1.069234577 +4382,1.022454793 +4383,1.105333933 +4384,-0.78024183 +4385,-0.094236608 +4386,-1.6431153 +4387,0.697919856 +4388,-1.146320962 +4389,0.102595526 +4390,0.401177902 +4391,2.204006175 +4392,1.458648637 +4393,0.727744593 +4394,0.121085886 +4395,2.818306076 +4396,0.096743629 +4397,-0.625712401 +4398,-0.230617683 +4399,-0.28941292 +4400,-1.314697098 +4401,-1.267031513 +4402,0.328700667 +4403,0.53346196 +4404,0.094957124 +4405,-0.755935751 +4406,1.885460268 +4407,0.223282025 +4408,-0.424319707 +4409,-0.354216853 +4410,1.455914313 +4411,-1.259461678 +4412,1.460268115 +4413,1.620042619 +4414,0.147427311 +4415,-0.275690551 +4416,1.93187167 +4417,0.593019155 +4418,-0.091873094 +4419,0.041033009 +4420,-1.38862848 +4421,-0.464961378 +4422,-0.636679673 +4423,-0.189673944 +4424,-0.902206141 +4425,1.884901494 +4426,-0.980954424 +4427,0.18151574 +4428,-1.221160557 +4429,-0.152339237 +4430,-0.438623018 +4431,-1.083926677 +4432,-1.54667844 +4433,-0.753025169 +4434,-1.45111007 +4435,2.181929869 +4436,-0.88915552 +4437,-0.340660248 +4438,-0.015007512 +4439,1.442692811 +4440,0.474468408 +4441,0.939656858 +4442,0.801852308 +4443,-1.358361542 +4444,-0.903292607 +4445,0.740760517 +4446,0.879422929 +4447,-0.758865828 +4448,0.375083256 +4449,-0.094255766 +4450,-1.327555106 +4451,0.405914297 +4452,0.600894215 +4453,0.075363307 +4454,-0.388545282 +4455,0.718095489 +4456,0.325433147 +4457,-0.263692057 +4458,-2.383337942 +4459,0.039583741 +4460,0.976464449 +4461,-0.794863694 +4462,-1.150564045 +4463,0.231705544 +4464,-1.275915797 +4465,1.244454504 +4466,0.207208758 +4467,-2.159896229 +4468,1.368936143 +4469,-0.016905458 +4470,1.117863386 +4471,-1.663211243 +4472,1.865761641 +4473,1.328106306 +4474,0.251483295 +4475,-0.695850286 +4476,0.774718383 +4477,-0.732216863 +4478,0.513056678 +4479,0.892828663 +4480,-2.28536014 +4481,-1.874426657 +4482,-1.664323561 +4483,-1.748602947 +4484,2.092263276 +4485,-0.283981393 +4486,-1.014428223 +4487,-1.514111553 +4488,-0.519070711 +4489,2.499691587 +4490,0.386937675 +4491,0.831520949 +4492,-2.250232975 +4493,-0.608405967 +4494,0.792331551 +4495,0.861482229 +4496,1.452911558 +4497,0.686237381 +4498,0.078723328 +4499,-0.149609421 +4500,0.348140474 +4501,0.945176947 +4502,-1.196684107 +4503,0.540603975 +4504,1.888521371 +4505,0.450497508 +4506,0.186993845 +4507,-1.001665493 +4508,0.404682677 +4509,0.3422847 +4510,0.19792159 +4511,-1.353025186 +4512,-1.192965778 +4513,-0.03434994 +4514,-0.473705097 +4515,-0.775596988 +4516,1.081800051 +4517,0.449274741 +4518,0.123333965 +4519,-2.679369365 +4520,-0.650252164 +4521,0.367189854 +4522,0.512288185 +4523,-0.835290029 +4524,0.526306585 +4525,-0.083369904 +4526,0.652427399 +4527,1.511889104 +4528,-0.639102244 +4529,-0.8372011 +4530,-0.458210305 +4531,0.17850486 +4532,0.519577539 +4533,-0.693080826 +4534,2.230617807 +4535,0.750747531 +4536,1.425335576 +4537,1.335085027 +4538,-0.039384819 +4539,-0.522587506 +4540,-0.266787202 +4541,1.497568957 +4542,-1.080552165 +4543,1.94581472 +4544,0.799702542 +4545,0.734252271 +4546,0.891437376 +4547,-1.053982721 +4548,-0.943228459 +4549,2.446102674 +4550,-1.03842509 +4551,-0.259794116 +4552,0.268556632 +4553,0.491630541 +4554,-0.564547081 +4555,1.131251661 +4556,-0.578473883 +4557,-0.12011552 +4558,-1.012423496 +4559,-1.287495199 +4560,1.772567102 +4561,2.392627803 +4562,0.196504379 +4563,0.457791383 +4564,0.314873994 +4565,-0.504231137 +4566,0.712799217 +4567,2.695489907 +4568,-0.206382794 +4569,-0.144212464 +4570,0.547054531 +4571,-0.440960713 +4572,0.356219445 +4573,-0.642407654 +4574,1.673561283 +4575,0.382348541 +4576,1.982263775 +4577,0.6452742 +4578,-0.262958584 +4579,0.247435641 +4580,-0.528821639 +4581,-0.484106577 +4582,1.03460603 +4583,0.274286305 +4584,-0.695644202 +4585,-1.644565325 +4586,0.654754529 +4587,-0.799053346 +4588,0.523094354 +4589,-0.675352679 +4590,0.708392964 +4591,0.118114181 +4592,0.306405573 +4593,0.212302581 +4594,0.959542286 +4595,0.64127794 +4596,0.088336818 +4597,0.679904336 +4598,-0.775081705 +4599,-0.171586495 +4600,0.75060229 +4601,-0.460925761 +4602,2.2576706 +4603,0.439591664 +4604,-0.479399599 +4605,0.807672327 +4606,-2.650096632 +4607,0.573237352 +4608,0.493360962 +4609,1.498499983 +4610,0.871263385 +4611,0.875508178 +4612,0.219942954 +4613,-0.439556825 +4614,-0.18090777 +4615,-1.01615646 +4616,1.328784276 +4617,0.143497667 +4618,0.029567528 +4619,0.079387817 +4620,0.815925801 +4621,2.547350965 +4622,-0.31211668 +4623,0.712722951 +4624,0.190696983 +4625,0.934896809 +4626,-0.968833964 +4627,-0.481059743 +4628,0.935553296 +4629,-0.859586615 +4630,-0.133213508 +4631,0.846494679 +4632,-1.230525673 +4633,-0.175338337 +4634,0.536562588 +4635,0.562665243 +4636,2.536101102 +4637,-1.790827276 +4638,-0.660118763 +4639,1.851931268 +4640,0.786147797 +4641,1.034338101 +4642,0.45014959 +4643,-0.683011 +4644,-0.086861242 +4645,-0.316962818 +4646,-0.258909339 +4647,-0.843320784 +4648,0.574079356 +4649,0.424887154 +4650,0.59359596 +4651,0.204081177 +4652,-1.004480564 +4653,-0.038173584 +4654,1.514390531 +4655,0.447668374 +4656,0.665693031 +4657,1.096725389 +4658,-0.53132251 +4659,0.190228787 +4660,0.068187654 +4661,-0.769890938 +4662,0.454511917 +4663,-0.221013735 +4664,-1.316300133 +4665,-1.61875535 +4666,0.804151669 +4667,1.099987767 +4668,-1.484283662 +4669,1.110025176 +4670,0.058340254 +4671,-0.977410147 +4672,1.791397957 +4673,-0.391403491 +4674,0.48547575 +4675,-0.863026858 +4676,0.586080466 +4677,1.943787868 +4678,-0.235947822 +4679,-0.604755307 +4680,-2.717401512 +4681,-0.791118204 +4682,-0.265294567 +4683,-0.57639986 +4684,0.290050611 +4685,-0.354913487 +4686,-1.978084067 +4687,0.810688484 +4688,0.869273026 +4689,-0.443997124 +4690,-2.284316649 +4691,0.317816565 +4692,1.271577797 +4693,-0.562210234 +4694,-0.834224845 +4695,-0.229258038 +4696,1.937589908 +4697,-0.61021538 +4698,0.083770601 +4699,-0.627158307 +4700,-1.586615945 +4701,-0.064501877 +4702,-0.706858888 +4703,-0.522706848 +4704,1.708300205 +4705,-1.269340065 +4706,-0.283883391 +4707,-0.512414768 +4708,1.879029753 +4709,-1.422291227 +4710,-0.963228144 +4711,0.053777604 +4712,-0.731107196 +4713,-1.233489619 +4714,1.921351851 +4715,-0.15692672 +4716,0.067937741 +4717,-0.17676985 +4718,-1.90323524 +4719,-1.183038301 +4720,0.327732584 +4721,-1.553469397 +4722,-1.059830235 +4723,0.129612396 +4724,0.317038256 +4725,-0.636076203 +4726,1.381767544 +4727,0.304720718 +4728,-1.464481574 +4729,0.435629035 +4730,-0.59276313 +4731,-1.186579377 +4732,-2.65984733 +4733,1.47146543 +4734,0.181709565 +4735,-0.973926368 +4736,0.129366276 +4737,1.161054186 +4738,-0.098808255 +4739,0.009552781 +4740,-0.219986657 +4741,0.538710295 +4742,0.531078191 +4743,-0.219601527 +4744,-1.238876162 +4745,0.09167279 +4746,-0.646262273 +4747,2.106051992 +4748,0.220917554 +4749,-0.075490444 +4750,1.322588036 +4751,-0.574603662 +4752,1.948116472 +4753,2.458962646 +4754,0.74134174 +4755,0.141558728 +4756,-0.635600062 +4757,1.099576039 +4758,-0.495086261 +4759,0.936364942 +4760,0.509192287 +4761,0.355692576 +4762,0.107551392 +4763,-2.06195429 +4764,-1.561466873 +4765,-0.594623437 +4766,0.122600381 +4767,-0.035194297 +4768,-0.474291919 +4769,-0.464652274 +4770,0.514882548 +4771,-0.911489229 +4772,-0.103556225 +4773,0.135935508 +4774,-0.560801939 +4775,-0.534995535 +4776,-1.263575722 +4777,0.986404016 +4778,1.38685767 +4779,-0.385151068 +4780,-1.37997992 +4781,-0.356466138 +4782,-0.737252471 +4783,1.580975883 +4784,-0.09758729 +4785,-0.121770271 +4786,0.825004011 +4787,0.738166062 +4788,-1.218130896 +4789,-0.402958489 +4790,-2.132847491 +4791,0.993825836 +4792,1.193778206 +4793,0.686637769 +4794,0.609850342 +4795,0.550128027 +4796,1.784632934 +4797,1.371150277 +4798,-0.947127019 +4799,-0.020018948 +4800,0.77225844 +4801,-0.061649207 +4802,-2.068989832 +4803,-0.256441584 +4804,1.422410483 +4805,-0.608050604 +4806,0.240519073 +4807,-0.351949932 +4808,0.197221525 +4809,-0.108854334 +4810,0.115840243 +4811,0.295110178 +4812,0.613876975 +4813,0.454041425 +4814,0.355883537 +4815,1.650472457 +4816,-0.214247302 +4817,-0.541016778 +4818,-0.494342213 +4819,0.623633105 +4820,0.48775803 +4821,-1.548306462 +4822,-1.354596452 +4823,1.050083687 +4824,0.319355087 +4825,0.169298726 +4826,-0.061333359 +4827,0.783072998 +4828,-0.20325749 +4829,-0.445050918 +4830,0.115757126 +4831,-0.294046432 +4832,0.342774869 +4833,1.174864882 +4834,-0.308483499 +4835,0.8386003 +4836,0.209708896 +4837,1.86825829 +4838,0.414798604 +4839,0.093867133 +4840,0.154598572 +4841,-0.587651233 +4842,0.328937899 +4843,-0.786673423 +4844,0.360589687 +4845,-0.790966365 +4846,1.140999338 +4847,0.703618455 +4848,1.624023998 +4849,-0.867044664 +4850,-0.053043026 +4851,-0.240018745 +4852,-0.854183293 +4853,-0.103447001 +4854,-1.156529432 +4855,-1.507806498 +4856,0.690548192 +4857,0.255605152 +4858,-2.573491806 +4859,2.257459237 +4860,-0.150025276 +4861,0.44614994 +4862,-0.809864149 +4863,-1.317431611 +4864,0.806137537 +4865,-1.300525667 +4866,-0.813206414 +4867,-1.219292695 +4868,-0.246625207 +4869,-0.119286396 +4870,-0.727601921 +4871,-1.024897591 +4872,-0.135793664 +4873,2.112369907 +4874,-0.491009603 +4875,0.602783052 +4876,0.692435226 +4877,0.306366277 +4878,-0.003850173 +4879,-0.549710804 +4880,0.167732733 +4881,-0.279159717 +4882,0.784074853 +4883,0.496654499 +4884,0.163171214 +4885,1.46993281 +4886,-1.344972044 +4887,-0.495697987 +4888,-1.374394188 +4889,0.525565207 +4890,-1.718033856 +4891,-1.274326157 +4892,-1.179341205 +4893,-1.080621449 +4894,0.542869554 +4895,0.081431318 +4896,-1.293594394 +4897,-0.319153592 +4898,0.609450834 +4899,-0.155944382 +4900,2.03956856 +4901,-1.392672904 +4902,-1.520662743 +4903,0.144841104 +4904,0.988736587 +4905,1.348447129 +4906,-2.556887314 +4907,0.404222687 +4908,-0.843334102 +4909,0.004677711 +4910,-1.110580222 +4911,-0.221459826 +4912,-0.001553207 +4913,0.840011507 +4914,-0.053301234 +4915,-1.252316471 +4916,-0.371274302 +4917,0.201060967 +4918,1.739561447 +4919,0.509900878 +4920,0.370069993 +4921,0.997370398 +4922,-1.676558655 +4923,-0.347653587 +4924,0.467927918 +4925,0.632424357 +4926,-1.247304878 +4927,-0.049387837 +4928,-0.196787901 +4929,-0.403675738 +4930,-0.208750085 +4931,0.623074753 +4932,-0.60900144 +4933,-0.279758295 +4934,0.032838023 +4935,-0.395234053 +4936,0.116930293 +4937,1.293149386 +4938,-1.156537764 +4939,0.654238088 +4940,0.470188074 +4941,0.626961153 +4942,-1.934336007 +4943,-0.948983699 +4944,-1.39081792 +4945,-0.685466271 +4946,-1.493673372 +4947,-2.159878394 +4948,1.144794834 +4949,1.480103636 +4950,1.571313351 +4951,-0.182462914 +4952,-0.127183878 +4953,1.267335027 +4954,0.798584376 +4955,0.382585536 +4956,0.395788727 +4957,1.661184443 +4958,1.451687712 +4959,0.606047852 +4960,0.779630953 +4961,-0.588774334 +4962,-1.882189047 +4963,-1.628209131 +4964,0.151367682 +4965,0.741744293 +4966,-1.04471943 +4967,-0.333154264 +4968,-0.645599467 +4969,-0.293837108 +4970,1.746841687 +4971,0.395692452 +4972,-2.142521218 +4973,-0.88480443 +4974,0.091396467 +4975,2.697334106 +4976,-2.392649254 +4977,-0.85732911 +4978,1.619608228 +4979,-0.148679982 +4980,0.035143834 +4981,0.349454275 +4982,0.011357834 +4983,1.248925789 +4984,-0.138895465 +4985,0.26011409 +4986,-1.401690459 +4987,-1.483107607 +4988,-0.97495844 +4989,-0.319840691 +4990,2.174492207 +4991,0.05086246 +4992,1.962835317 +4993,-0.403347861 +4994,0.542689796 +4995,0.947824383 +4996,0.473323056 +4997,0.679063293 +4998,-0.791764976 +4999,0.899501581 +5000,0.806412343 +5001,-0.655375543 +5002,-0.558761225 +5003,-1.242051244 +5004,-0.497642105 +5005,-1.355308711 +5006,-0.156574933 +5007,-0.266460361 +5008,-0.1148038 +5009,-1.289032837 +5010,0.538273002 +5011,0.544589964 +5012,-0.018884616 +5013,-0.243527754 +5014,2.72942441 +5015,-0.696912424 +5016,0.424690001 +5017,-0.762378758 +5018,0.118170087 +5019,-0.099152858 +5020,-0.561578091 +5021,0.728417128 +5022,0.201099263 +5023,-0.903212361 +5024,0.737415432 +5025,1.734177645 +5026,-1.401785813 +5027,1.648168925 +5028,-1.596523371 +5029,1.059377493 +5030,0.945206942 +5031,0.359768037 +5032,-0.016137309 +5033,0.721174934 +5034,-1.505512422 +5035,0.229368442 +5036,-0.266618392 +5037,0.685996487 +5038,-1.510645 +5039,-0.153105977 +5040,-0.100227766 +5041,0.77583097 +5042,-1.019493165 +5043,-0.196914874 +5044,-0.437845362 +5045,1.141312798 +5046,1.038182694 +5047,1.373413467 +5048,0.73428031 +5049,-1.221400405 +5050,-0.723123256 +5051,-1.895392235 +5052,-1.396400824 +5053,-0.771969169 +5054,0.462478196 +5055,-0.369909217 +5056,-0.251198997 +5057,-1.526095453 +5058,0.680572658 +5059,0.002702591 +5060,-0.367112265 +5061,0.534149581 +5062,1.111505325 +5063,-0.114700186 +5064,0.242306947 +5065,-0.433046524 +5066,1.274786988 +5067,0.316632557 +5068,0.445379736 +5069,1.496753132 +5070,0.385128154 +5071,1.398525186 +5072,0.780739872 +5073,0.142213881 +5074,-0.474921489 +5075,1.126335427 +5076,0.8252843 +5077,-0.313268634 +5078,0.683971844 +5079,0.541819922 +5080,0.1679243 +5081,0.323339973 +5082,-0.995641553 +5083,-2.307314296 +5084,0.379483568 +5085,0.206253542 +5086,-0.088374455 +5087,-1.995023133 +5088,2.54436503 +5089,-0.223762899 +5090,-2.007209956 +5091,-0.199810259 +5092,1.188583287 +5093,-0.023713129 +5094,-2.556764789 +5095,0.696531805 +5096,0.491433717 +5097,-1.454234369 +5098,-0.227310273 +5099,0.530798319 +5100,0.613453015 +5101,-0.659154725 +5102,-0.405118522 +5103,0.903500206 +5104,1.771935792 +5105,0.970412111 +5106,-0.575894094 +5107,-0.189393781 +5108,-2.178283683 +5109,0.800919036 +5110,0.642382044 +5111,1.170804784 +5112,-0.361519143 +5113,0.411311542 +5114,-0.522444316 +5115,-2.682638412 +5116,0.969042421 +5117,1.164812056 +5118,0.5247565 +5119,0.003848097 +5120,-0.116657542 +5121,-0.405394935 +5122,0.992966288 +5123,0.760419536 +5124,-0.283180592 +5125,1.120307342 +5126,-0.00159208 +5127,-0.986318988 +5128,-0.185882187 +5129,0.748596569 +5130,1.040748805 +5131,2.02415306 +5132,-0.766313119 +5133,0.852737956 +5134,-0.019301796 +5135,1.948077822 +5136,-0.706983253 +5137,-1.437753167 +5138,-2.195893437 +5139,-0.903145255 +5140,1.340285659 +5141,-0.774264123 +5142,-0.932755201 +5143,0.083519974 +5144,-1.002807308 +5145,-0.51139473 +5146,0.429813983 +5147,1.502551065 +5148,-1.761268016 +5149,-0.15274682 +5150,-0.471837127 +5151,-0.915566642 +5152,-0.45820331 +5153,-0.689587603 +5154,-0.311197682 +5155,-0.741133978 +5156,1.090439585 +5157,-0.137032213 +5158,-0.860079066 +5159,0.057729263 +5160,0.428870417 +5161,-0.466101588 +5162,-1.017785301 +5163,1.160750963 +5164,0.244730807 +5165,-0.26404409 +5166,-1.376650118 +5167,-1.728539627 +5168,0.925316911 +5169,0.407220883 +5170,-0.859160159 +5171,-1.851891582 +5172,0.945320251 +5173,1.259945007 +5174,-0.498018376 +5175,0.641972152 +5176,-0.238192806 +5177,0.28739518 +5178,-0.684368548 +5179,1.623261326 +5180,1.539102216 +5181,0.626051511 +5182,-0.336663704 +5183,-0.134463628 +5184,-1.221334854 +5185,0.312024348 +5186,0.785135638 +5187,-0.17780996 +5188,0.716304096 +5189,-0.370044817 +5190,-1.475689436 +5191,0.355580687 +5192,-1.0192203 +5193,-1.753951578 +5194,-0.02385321 +5195,-0.999285813 +5196,2.548017684 +5197,-0.268825032 +5198,0.040495422 +5199,-0.424582108 +5200,0.26670514 +5201,0.425222716 +5202,0.171664128 +5203,1.125565912 +5204,-0.993640218 +5205,0.767340465 +5206,0.34706682 +5207,1.011395174 +5208,-1.09091662 +5209,-0.813155661 +5210,-1.613758877 +5211,1.199509463 +5212,-0.364612891 +5213,-0.5980292 +5214,0.188791818 +5215,-0.103150673 +5216,-1.138113055 +5217,-0.971544958 +5218,1.650336711 +5219,-1.237995397 +5220,-1.54940093 +5221,-0.786640605 +5222,1.310542803 +5223,-0.878056012 +5224,-0.739267972 +5225,1.920261625 +5226,0.607674875 +5227,-0.595259581 +5228,-1.422154792 +5229,0.113151861 +5230,-0.860829626 +5231,0.922911375 +5232,0.197826822 +5233,0.179286168 +5234,-1.934511015 +5235,0.85344884 +5236,-0.364359343 +5237,0.314214513 +5238,0.051497113 +5239,-0.256946736 +5240,0.33045435 +5241,-0.419666704 +5242,1.505649185 +5243,-0.133232865 +5244,2.239060189 +5245,1.314828473 +5246,0.537645012 +5247,-0.975042041 +5248,0.528378403 +5249,1.540139322 +5250,-0.687361426 +5251,0.308126254 +5252,0.53995158 +5253,-0.63968911 +5254,0.217616921 +5255,0.384149095 +5256,0.870898292 +5257,-0.822838343 +5258,-0.344885544 +5259,0.927078196 +5260,-0.057024966 +5261,-0.875697365 +5262,1.406329433 +5263,2.371139775 +5264,0.185072646 +5265,-0.26297869 +5266,-1.065602254 +5267,-1.274726353 +5268,-1.282870941 +5269,-0.11104239 +5270,-1.021014444 +5271,-0.700140789 +5272,-0.788503663 +5273,-0.748875298 +5274,1.960717443 +5275,0.235263974 +5276,-0.168451414 +5277,-0.816878623 +5278,1.017962531 +5279,1.638109353 +5280,-1.075729123 +5281,0.598030239 +5282,-0.802563599 +5283,-0.026428899 +5284,-0.068244442 +5285,-0.444586051 +5286,0.601750301 +5287,-1.123378818 +5288,0.274091938 +5289,0.761081534 +5290,1.030767572 +5291,-0.403629349 +5292,-0.749655548 +5293,-0.606828921 +5294,-0.476735142 +5295,0.402903726 +5296,-0.712640236 +5297,1.41049964 +5298,1.029431273 +5299,-1.373676421 +5300,1.007358718 +5301,0.775953078 +5302,-0.659062703 +5303,-1.050094763 +5304,-0.525167905 +5305,-1.54158595 +5306,-0.945188587 +5307,-0.563198127 +5308,-1.217490431 +5309,-1.038940711 +5310,-0.534052935 +5311,0.57473354 +5312,-0.31697503 +5313,-1.982733537 +5314,-0.461750231 +5315,0.511171208 +5316,1.006993352 +5317,2.430151212 +5318,0.508244089 +5319,-0.462998322 +5320,2.609571746 +5321,0.106903768 +5322,-0.103138702 +5323,0.533195466 +5324,-1.250378291 +5325,-1.918480544 +5326,-1.942992566 +5327,1.10889245 +5328,-2.065275162 +5329,1.871041731 +5330,-0.176960566 +5331,-1.587150811 +5332,-0.21958475 +5333,-0.775919868 +5334,1.297157476 +5335,1.115883722 +5336,0.575973094 +5337,-1.092007565 +5338,-0.481294904 +5339,-1.414632559 +5340,-1.688575847 +5341,-0.492199693 +5342,0.429881233 +5343,0.669588501 +5344,1.078735468 +5345,1.632645876 +5346,0.071368523 +5347,1.849657841 +5348,0.884698001 +5349,0.074910809 +5350,0.200092881 +5351,-1.157850173 +5352,-0.949423982 +5353,0.580385224 +5354,-0.590240728 +5355,1.633778604 +5356,-0.754754424 +5357,-0.790502947 +5358,0.281043415 +5359,-2.246096191 +5360,0.863086153 +5361,-0.753147742 +5362,0.452422015 +5363,1.49195447 +5364,-1.508429454 +5365,-0.107176775 +5366,1.032806943 +5367,-0.26556557 +5368,-1.831187649 +5369,0.940456161 +5370,0.053941087 +5371,-0.299670963 +5372,-0.21959414 +5373,0.330176038 +5374,1.211499472 +5375,-0.298372176 +5376,0.06147773 +5377,-0.353311932 +5378,-0.517449759 +5379,0.676143634 +5380,1.467891161 +5381,0.679937327 +5382,1.316953477 +5383,-0.081740234 +5384,0.238917888 +5385,-0.483790879 +5386,0.197572373 +5387,0.359783896 +5388,-0.158274688 +5389,0.091530013 +5390,0.131032175 +5391,1.270664052 +5392,1.621074145 +5393,0.023003032 +5394,-1.366261598 +5395,-0.619596985 +5396,-0.802054676 +5397,-1.046532993 +5398,-1.668116231 +5399,0.851237786 +5400,2.866516648 +5401,-0.368249748 +5402,-0.008930262 +5403,-1.156184357 +5404,-0.20415471 +5405,-0.778174203 +5406,-0.446289354 +5407,-0.738809132 +5408,-0.451401352 +5409,-0.412394425 +5410,0.356922869 +5411,-1.564307192 +5412,-3.126519418 +5413,1.301366319 +5414,0.843540504 +5415,-2.045818343 +5416,1.496724989 +5417,0.283268889 +5418,-1.528425949 +5419,-0.447089285 +5420,-1.085789656 +5421,0.549989121 +5422,-1.062393332 +5423,0.54687141 +5424,0.307210195 +5425,-1.261489635 +5426,-0.606916912 +5427,0.872593428 +5428,1.396489304 +5429,-1.937165574 +5430,-0.678574158 +5431,-1.14433013 +5432,-0.555463062 +5433,-0.398137249 +5434,-2.58764335 +5435,1.71375784 +5436,-0.275743547 +5437,1.589492444 +5438,-1.609012158 +5439,0.083542678 +5440,-1.684738452 +5441,0.791647134 +5442,-0.504596071 +5443,0.375961858 +5444,0.290946275 +5445,0.348984444 +5446,-0.061245946 +5447,1.116640553 +5448,0.166530834 +5449,-0.052998741 +5450,-2.416360628 +5451,-0.475295905 +5452,0.844764206 +5453,-0.33314666 +5454,-0.421301807 +5455,-1.224573308 +5456,-1.459516138 +5457,-1.305538873 +5458,0.27712917 +5459,-0.733593666 +5460,0.383140537 +5461,-0.250302712 +5462,-0.616218953 +5463,1.34277686 +5464,-1.306529459 +5465,-1.003230698 +5466,-0.013881591 +5467,0.74738569 +5468,0.391166037 +5469,1.543855067 +5470,-0.849332091 +5471,-0.051699839 +5472,1.137261531 +5473,1.278023686 +5474,-0.995877837 +5475,1.309880932 +5476,1.975951621 +5477,-0.775859878 +5478,-0.668642408 +5479,0.055295168 +5480,0.506298797 +5481,-0.178425133 +5482,-1.145816282 +5483,2.045091661 +5484,-1.417747981 +5485,-0.121700478 +5486,-0.018165416 +5487,0.980639538 +5488,0.035796824 +5489,0.171501686 +5490,0.710607329 +5491,-0.436402486 +5492,-0.400297755 +5493,0.920903561 +5494,0.147767246 +5495,0.628955798 +5496,0.281707995 +5497,-0.814365217 +5498,0.996775909 +5499,-1.14386914 +5500,-0.273903686 +5501,0.058758921 +5502,1.677001334 +5503,-1.819639225 diff --git a/CRVConditions/data/scintyield_wideband4modules.txt b/CRVConditions/data/scintyield_wideband4modules.txt index 8910c7d371..543c1317b0 100644 --- a/CRVConditions/data/scintyield_wideband4modules.txt +++ b/CRVConditions/data/scintyield_wideband4modules.txt @@ -1,256 +1,258 @@ -0 -0.40817829 -1 0.478392983 -2 -1.742534815 -3 -1.083696214 -4 -0.232897289 -5 -1.133704616 -6 0.708299822 -7 -0.255976244 -8 0.454536537 -9 0.34589287 -10 -0.914151313 -11 -0.219176211 -12 1.540090237 -13 -0.06729041 -14 0.750185173 -15 -1.252525599 -16 1.881276793 -17 1.08307137 -18 0.403799169 -19 -0.66013052 -20 0.996921357 -21 -0.466640679 -22 -0.147430802 -23 0.465758366 -24 1.472209636 -25 -0.089248445 -26 0.077041903 -27 0.812045767 -28 0.116082738 -29 2.444925959 -30 -0.643804806 -31 0.197596893 -32 0.496921984 -33 1.855947974 -34 0.073004041 -35 -0.766896413 -36 -1.120294518 -37 -1.285900187 -38 1.462787967 -39 -0.175869471 -40 0.576923821 -41 -0.241021451 -42 -1.135892295 -43 0.006762617 -44 -1.656346974 -45 -1.072041249 -46 0.179748625 -47 0.272906454 -48 0.014156971 -49 -0.046374193 -50 0.006439565 -51 -0.644237792 -52 -0.007830788 -53 0.293738714 -54 0.918094334 -55 0.723697415 -56 0.06599502 -57 0.843457846 -58 -0.156088783 -59 0.768268835 -60 -1.049871276 -61 -0.053859518 -62 -0.472876414 -63 -0.657052687 -64 -0.670193813 -65 -0.056785721 -66 -0.437127642 -67 1.138593278 -68 0.367129055 -69 -0.681090652 -70 0.320863282 -71 -1.284949167 -72 -0.512218056 -73 1.001620998 -74 0.381645129 -75 1.462008713 -76 -0.639059588 -77 0.871553559 -78 0.161576853 -79 0.165354377 -80 -0.803663752 -81 -0.114701532 -82 0.491418645 -83 1.292607075 -84 -0.979921489 -85 0.973688432 -86 1.594841866 -87 0.371110412 -88 -0.27214148 -89 -1.915335772 -90 -0.041963719 -91 0.262880908 -92 -0.689180237 -93 0.246577909 -94 1.19357776 -95 0.542303852 -96 -0.654314151 -97 0.786000959 -98 -0.704262875 -99 -0.072265143 -100 0.208576412 -101 1.296570941 -102 -0.063855034 -103 0.159200191 -104 0.925960111 -105 -2.042826473 -106 2.075169182 -107 -0.222235 -108 1.35332452 -109 -0.002027946 -110 0.397365683 -111 0.354055184 -112 0.511771393 -113 -0.457738167 -114 1.155370009 -115 -0.115781727 -116 -0.840449092 -117 0.321826222 -118 -0.461556427 -119 -1.19008102 -120 0.401419897 -121 0.560289182 -122 -0.162565747 -123 0.331663265 -124 -0.313720184 -125 -1.389663479 -126 0.617972175 -127 -0.610932716 -128 0.15998996 -129 1.471532457 -130 -0.166092867 -131 -0.507920517 -132 0.338036954 -133 -1.40898172 -134 1.270972215 -135 -0.144821609 -136 -1.965002639 -137 -0.765306087 -138 0.577112948 -139 -0.714690883 -140 1.673938548 -141 1.283248438 -142 0.111830082 -143 0.393560045 -144 -0.704160562 -145 -0.892621182 -146 -0.288656835 -147 1.833763681 -148 -0.089292317 -149 0.916267188 -150 -0.780835161 -151 0.097099476 -152 1.386262532 -153 -0.094783916 -154 -1.715879581 -155 0.053034023 -156 -2.41327277 -157 1.000076796 -158 -0.67093874 -159 0.239788482 -160 0.465575947 -161 -0.897566218 -162 0.285623216 -163 -0.760963944 -164 -1.023673817 -165 -1.391641336 -166 -0.242148271 -167 0.590555063 -168 0.464393322 -169 -1.486813908 -170 0.394357776 -171 0.902535297 -172 -1.452469922 -173 0.178071392 -174 -0.371711772 -175 1.204077962 -176 -0.80514245 -177 -0.07796681 -178 -0.39354941 -179 -2.089904828 -180 -0.816150506 -181 -1.129655392 -182 -0.03139441 -183 0.8896484 -184 -0.652208727 -185 -0.397336115 -186 1.971118498 -187 1.701910592 -188 0.285792663 -189 -1.738091689 -190 -0.789743994 -191 -0.691520263 -192 -1.313018844 -193 -0.319232912 -194 0.83927878 -195 1.306147453 -196 1.98204058 -197 0.047865666 -198 -0.359924628 -199 0.696814511 -200 -0.005355014 -201 0.69741095 -202 0.146527025 -203 -1.380544453 -204 -1.429810506 -205 -0.407681799 -206 -1.528747625 -207 -0.166433636 -208 1.29328001 -209 2.034089345 -210 -0.16133237 -211 -1.333930035 -212 0.791834757 -213 -0.632238067 -214 -0.130231195 -215 0.349612982 -216 1.609446664 -217 -0.327849039 -218 -0.492717167 -219 1.299194 -220 -0.718527533 -221 -0.671708083 -222 1.60457056 -223 -0.867398704 -224 -1.109376665 -225 -1.145681704 -226 -0.679705033 -227 0.175969876 -228 -0.362956639 -229 1.135676944 -230 -0.685920146 -231 2.015346083 -232 0.207859477 -233 -0.200225515 -234 1.477822045 -235 0.22662747 -236 -1.270463891 -237 0.791715611 -238 0.344362716 -239 0.162729038 -240 0.372231898 -241 0.896106612 -242 -0.218775195 -243 -1.020718808 -244 0.965974581 -245 -0.76316394 -246 0.989352797 -247 1.718669209 -248 0.714001118 -249 -0.631049114 -250 0.735906505 -251 -0.249884282 -252 -0.969527779 -253 -0.439858992 -254 0.549916092 -255 -0.80050398 +TABLE CRVScint +#counter,scintYieldDeviation +0,-0.40817829 +1,0.478392983 +2,-1.742534815 +3,-1.083696214 +4,-0.232897289 +5,-1.133704616 +6,0.708299822 +7,-0.255976244 +8,0.454536537 +9,0.34589287 +10,-0.914151313 +11,-0.219176211 +12,1.540090237 +13,-0.06729041 +14,0.750185173 +15,-1.252525599 +16,1.881276793 +17,1.08307137 +18,0.403799169 +19,-0.66013052 +20,0.996921357 +21,-0.466640679 +22,-0.147430802 +23,0.465758366 +24,1.472209636 +25,-0.089248445 +26,0.077041903 +27,0.812045767 +28,0.116082738 +29,2.444925959 +30,-0.643804806 +31,0.197596893 +32,0.496921984 +33,1.855947974 +34,0.073004041 +35,-0.766896413 +36,-1.120294518 +37,-1.285900187 +38,1.462787967 +39,-0.175869471 +40,0.576923821 +41,-0.241021451 +42,-1.135892295 +43,0.006762617 +44,-1.656346974 +45,-1.072041249 +46,0.179748625 +47,0.272906454 +48,0.014156971 +49,-0.046374193 +50,0.006439565 +51,-0.644237792 +52,-0.007830788 +53,0.293738714 +54,0.918094334 +55,0.723697415 +56,0.06599502 +57,0.843457846 +58,-0.156088783 +59,0.768268835 +60,-1.049871276 +61,-0.053859518 +62,-0.472876414 +63,-0.657052687 +64,-0.670193813 +65,-0.056785721 +66,-0.437127642 +67,1.138593278 +68,0.367129055 +69,-0.681090652 +70,0.320863282 +71,-1.284949167 +72,-0.512218056 +73,1.001620998 +74,0.381645129 +75,1.462008713 +76,-0.639059588 +77,0.871553559 +78,0.161576853 +79,0.165354377 +80,-0.803663752 +81,-0.114701532 +82,0.491418645 +83,1.292607075 +84,-0.979921489 +85,0.973688432 +86,1.594841866 +87,0.371110412 +88,-0.27214148 +89,-1.915335772 +90,-0.041963719 +91,0.262880908 +92,-0.689180237 +93,0.246577909 +94,1.19357776 +95,0.542303852 +96,-0.654314151 +97,0.786000959 +98,-0.704262875 +99,-0.072265143 +100,0.208576412 +101,1.296570941 +102,-0.063855034 +103,0.159200191 +104,0.925960111 +105,-2.042826473 +106,2.075169182 +107,-0.222235 +108,1.35332452 +109,-0.002027946 +110,0.397365683 +111,0.354055184 +112,0.511771393 +113,-0.457738167 +114,1.155370009 +115,-0.115781727 +116,-0.840449092 +117,0.321826222 +118,-0.461556427 +119,-1.19008102 +120,0.401419897 +121,0.560289182 +122,-0.162565747 +123,0.331663265 +124,-0.313720184 +125,-1.389663479 +126,0.617972175 +127,-0.610932716 +128,0.15998996 +129,1.471532457 +130,-0.166092867 +131,-0.507920517 +132,0.338036954 +133,-1.40898172 +134,1.270972215 +135,-0.144821609 +136,-1.965002639 +137,-0.765306087 +138,0.577112948 +139,-0.714690883 +140,1.673938548 +141,1.283248438 +142,0.111830082 +143,0.393560045 +144,-0.704160562 +145,-0.892621182 +146,-0.288656835 +147,1.833763681 +148,-0.089292317 +149,0.916267188 +150,-0.780835161 +151,0.097099476 +152,1.386262532 +153,-0.094783916 +154,-1.715879581 +155,0.053034023 +156,-2.41327277 +157,1.000076796 +158,-0.67093874 +159,0.239788482 +160,0.465575947 +161,-0.897566218 +162,0.285623216 +163,-0.760963944 +164,-1.023673817 +165,-1.391641336 +166,-0.242148271 +167,0.590555063 +168,0.464393322 +169,-1.486813908 +170,0.394357776 +171,0.902535297 +172,-1.452469922 +173,0.178071392 +174,-0.371711772 +175,1.204077962 +176,-0.80514245 +177,-0.07796681 +178,-0.39354941 +179,-2.089904828 +180,-0.816150506 +181,-1.129655392 +182,-0.03139441 +183,0.8896484 +184,-0.652208727 +185,-0.397336115 +186,1.971118498 +187,1.701910592 +188,0.285792663 +189,-1.738091689 +190,-0.789743994 +191,-0.691520263 +192,-1.313018844 +193,-0.319232912 +194,0.83927878 +195,1.306147453 +196,1.98204058 +197,0.047865666 +198,-0.359924628 +199,0.696814511 +200,-0.005355014 +201,0.69741095 +202,0.146527025 +203,-1.380544453 +204,-1.429810506 +205,-0.407681799 +206,-1.528747625 +207,-0.166433636 +208,1.29328001 +209,2.034089345 +210,-0.16133237 +211,-1.333930035 +212,0.791834757 +213,-0.632238067 +214,-0.130231195 +215,0.349612982 +216,1.609446664 +217,-0.327849039 +218,-0.492717167 +219,1.299194 +220,-0.718527533 +221,-0.671708083 +222,1.60457056 +223,-0.867398704 +224,-1.109376665 +225,-1.145681704 +226,-0.679705033 +227,0.175969876 +228,-0.362956639 +229,1.135676944 +230,-0.685920146 +231,2.015346083 +232,0.207859477 +233,-0.200225515 +234,1.477822045 +235,0.22662747 +236,-1.270463891 +237,0.791715611 +238,0.344362716 +239,0.162729038 +240,0.372231898 +241,0.896106612 +242,-0.218775195 +243,-1.020718808 +244,0.965974581 +245,-0.76316394 +246,0.989352797 +247,1.718669209 +248,0.714001118 +249,-0.631049114 +250,0.735906505 +251,-0.249884282 +252,-0.969527779 +253,-0.439858992 +254,0.549916092 +255,-0.80050398 diff --git a/CRVConditions/fcl/prolog.fcl b/CRVConditions/fcl/prolog.fcl index 13a2b3e8c9..4bc7270dad 100644 --- a/CRVConditions/fcl/prolog.fcl +++ b/CRVConditions/fcl/prolog.fcl @@ -7,9 +7,8 @@ CRVOrdinal : { } CRVScintYield : { - useDb : false + useDb : false #false sets all scintillation yield deviations to 0 verbose : 0 - fileName : "Offline/CRVConditions/data/scintyield_nominal.txt" } CRVStatus : { diff --git a/CRVConditions/inc/CRVScintYield.hh b/CRVConditions/inc/CRVScintYield.hh index ec32d52eb4..6b0e3cccb1 100644 --- a/CRVConditions/inc/CRVScintYield.hh +++ b/CRVConditions/inc/CRVScintYield.hh @@ -20,23 +20,22 @@ class CRVScintYield : virtual public ProditionsEntity { typedef std::shared_ptr cptr_t; constexpr static const char* cxname = {"CRVScintYield"}; - typedef std::vector ScintYieldMap; + typedef std::vector ScintYieldVec; - CRVScintYield(ScintYieldMap const& scintYieldMap) : - ProditionsEntity(cxname), _scintYieldMap(scintYieldMap) {} + CRVScintYield(ScintYieldVec const& svec) : ProditionsEntity(cxname), _svec(svec) {} // scintillation yield deviation (from nominal value) for a scintillator bar index float scintYieldDeviation(size_t barIndex) const { - if (barIndex >= _scintYieldMap.size()) { + if (barIndex >= _svec.size()) { throw cet::exception("CRVSCINTYIELD_BAD_SCINTILLATOR BAR INDEX") << "CRVScintYield::scinYieldDeviation bad barIndex requested: " << " barIndex=" << barIndex << "\n"; } - return _scintYieldMap.at(barIndex); + return _svec.at(barIndex); } private: - ScintYieldMap _scintYieldMap; + ScintYieldVec _svec; }; } // namespace mu2e diff --git a/CRVConditions/inc/CRVScintYieldCache.hh b/CRVConditions/inc/CRVScintYieldCache.hh index fd89df78fe..722c778c26 100644 --- a/CRVConditions/inc/CRVScintYieldCache.hh +++ b/CRVConditions/inc/CRVScintYieldCache.hh @@ -12,22 +12,34 @@ class CRVScintYieldCache : public ProditionsCache { ProditionsCache(CRVScintYield::cxname, config.verbose()), _useDb(config.useDb()), _maker(config) {} - void initialize() {} + void initialize() { + if (_useDb) { + _sci_p = std::make_unique>(); + } + } set_t makeSet(art::EventID const& eid) { ProditionsEntity::set_t cids; + if (_useDb) { + _sci_p->get(eid); + cids.insert(_sci_p->cid()); + } return cids; } DbIoV makeIov(art::EventID const& eid) { DbIoV iov; iov.setMax(); + if (_useDb) { + _sci_p->get(eid); + iov.overlap(_sci_p->iov()); + } return iov; } ProditionsEntity::ptr makeEntity(art::EventID const& eid) { if (_useDb) { - return _maker.fromDb(); + return _maker.fromDb(_sci_p->getPtr(eid)); } else { return _maker.fromFcl(); } @@ -36,6 +48,10 @@ class CRVScintYieldCache : public ProditionsCache { private: bool _useDb; CRVScintYieldMaker _maker; + + // these handles are not default constructed + // so the db can be completely turned off + std::unique_ptr> _sci_p; }; } // namespace mu2e diff --git a/CRVConditions/inc/CRVScintYieldMaker.hh b/CRVConditions/inc/CRVScintYieldMaker.hh index 767c371ccd..dcb65e0a4b 100644 --- a/CRVConditions/inc/CRVScintYieldMaker.hh +++ b/CRVConditions/inc/CRVScintYieldMaker.hh @@ -9,6 +9,7 @@ #include "Offline/CRVConditions/inc/CRVScintYield.hh" #include "Offline/CRVConfig/inc/CRVScintYieldConfig.hh" +#include "Offline/DbTables/inc/CRVScint.hh" namespace mu2e { @@ -17,7 +18,7 @@ class CRVScintYieldMaker { CRVScintYieldMaker(CRVScintYieldConfig const& config) : _config(config) {} CRVScintYield::ptr_t fromFcl(); - CRVScintYield::ptr_t fromDb(); + CRVScintYield::ptr_t fromDb(CRVScint::cptr_t sci_p); private: // this object needs to be thread safe, diff --git a/CRVConditions/src/CRVScintYieldMaker.cc b/CRVConditions/src/CRVScintYieldMaker.cc index e80f5d1678..4c6e9ea8d7 100644 --- a/CRVConditions/src/CRVScintYieldMaker.cc +++ b/CRVConditions/src/CRVScintYieldMaker.cc @@ -1,14 +1,8 @@ #include "Offline/CRVConditions/inc/CRVScintYieldMaker.hh" -#include "Offline/ConfigTools/inc/ConfigFileLookupPolicy.hh" #include "Offline/CosmicRayShieldGeom/inc/CosmicRayShield.hh" #include "Offline/GeometryService/inc/GeomHandle.hh" #include "Offline/GeometryService/inc/GeometryService.hh" #include "cetlib_except/exception.h" -#include -#include -#include -#include -#include #include #include @@ -20,75 +14,53 @@ namespace mu2e { CRVScintYield::ptr_t CRVScintYieldMaker::fromFcl() { if (_config.verbose()) { - cout << "CRVScintYieldMaker::fromFcl making nominal CRVScintYield\n"; + cout << "scintillation yield spread set to 0 for all CRV counters, because database is not used.\n"; } - size_t nBarIndices = - GeomHandle()->getAllCRSScintillatorBars().size(); + size_t nCounters = GeomHandle()->getAllCRSScintillatorBars().size(); - CRVScintYield::ScintYieldMap scintYieldMap(nBarIndices,0); // initialized to 0 (no deviation from the nominal scintillation yield) + CRVScintYield::ScintYieldVec svec(nCounters, 0.0); - // load the scintillation spread - std::string fileStub = _config.fileName(); - - ConfigFileLookupPolicy configFile; - std::string fileSpec = configFile(fileStub); - if (_config.verbose()) { - cout << "CRVScintYieldMaker::fromFcl reading from " << fileSpec << "\n"; - } - - std::ifstream scintYieldFile; - scintYieldFile.open(fileSpec); - if (!scintYieldFile.is_open()) { - throw cet::exception("CRVSCINTYIELD_OPEN_FAILED") - << " failed to open file " << fileSpec << "\n"; - } + auto ptr = make_shared(svec); + return ptr; - std::string line; +} // end fromFcl - // read the header line - std::getline(scintYieldFile, line); +//*************************************************** - size_t nRead = 0, maxBars = 0; - std::vector words; - while (std::getline(scintYieldFile, line)) { - boost::split(words, line, boost::is_any_of(" \t"), - boost::token_compress_on); - if (words.size() != 2) { - throw cet::exception("CRVSCINTYIELD_BAD_FILE") - << " failed to read line " << line << "\n"; - } - std::uint16_t barIndex = std::stoul(words[0]); - if (barIndex >= scintYieldMap.size()) { - throw cet::exception("CRVSCINTYIELD_BAD_SCINTILLATOR BAR INDEX") - << "CRVScintYieldMaker::fromFcl read barIndex in file that doesn't exist in geometry: " - << " barIndex=" << barIndex << "\n"; - } - float scintYieldDeviation = std::stof(words[1]); - scintYieldMap.at(barIndex) = scintYieldDeviation; - nRead++; - if (barIndex > maxBars) maxBars = barIndex; +CRVScintYield::ptr_t CRVScintYieldMaker::fromDb(CRVScint::cptr_t sci_p) { + if (_config.verbose()) { + cout << "CRVScintYieldMaker::fromDb making CRVScintYield\n"; } + size_t nCounters = GeomHandle()->getAllCRSScintillatorBars().size(); + if (_config.verbose()) { - cout << "CRVScintYieldMaker::fromFcl bar indices read: " << nRead - << " max: " << maxBars << " geom: " << nBarIndices << "\n"; + cout << "CRVScintYieldMaker::fromDb checking for " << nCounters << " counters\n"; } - auto ptr = make_shared(scintYieldMap); - return ptr; - -} // end fromFcl + // require the db tables are the same length as geometry + if (sci_p->nrow() != nCounters) { + throw cet::exception("CRVSCINTYIELDMAKE_BAD_N_COUNTERS") + << "CRVScintYieldMaker::fromDb bad counter counts: " + << " geometry: " << nCounters << " CRVScint: " << sci_p->nrow() << "\n"; + } -//*************************************************** + CRVScintYield::ScintYieldVec svec(nCounters, 0.0); -CRVScintYield::ptr_t CRVScintYieldMaker::fromDb() { - if (_config.verbose()) { - cout << "CRVScintyieldMaker::fromDb making CRVScintYield\n"; + for (auto const& row : sci_p->rows()) { + svec[row.counter()] = row.scintYieldDeviation(); + if (_config.verbose()) { + if (_config.verbose() > 1 || row.counter() < 5 || + CRVId::nBars - row.counter() <= 5) { + cout << setw(10) << row.counter() << fixed << setprecision(3) + << setw(10) << row.scintYieldDeviation() << "\n"; + } + } } - // no database dependence yet, so just return nominal - return fromFcl(); + auto ptr = make_shared(svec); + return ptr; } // end fromDb diff --git a/CRVConfig/inc/CRVScintYieldConfig.hh b/CRVConfig/inc/CRVScintYieldConfig.hh index 100fdad379..2ec8f0f26d 100644 --- a/CRVConfig/inc/CRVScintYieldConfig.hh +++ b/CRVConfig/inc/CRVScintYieldConfig.hh @@ -16,8 +16,6 @@ struct CRVScintYieldConfig { fhicl::Atom verbose{Name("verbose"), Comment("verbosity: 0 or 1")}; fhicl::Atom useDb{Name("useDb"), Comment("use database or fcl")}; - fhicl::Atom fileName{Name("fileName"), Comment("file name containing scint yield spread")}; - }; } // namespace mu2e diff --git a/CRVResponse/src/CrvPhotonGenerator_module.cc b/CRVResponse/src/CrvPhotonGenerator_module.cc index a414044b32..82f33d0de3 100644 --- a/CRVResponse/src/CrvPhotonGenerator_module.cc +++ b/CRVResponse/src/CrvPhotonGenerator_module.cc @@ -100,7 +100,7 @@ namespace mu2e std::vector _scintillationYields; std::vector > _makeCrvPhotons; - mu2e::ProditionsHandle _scintillationYieldMap; + mu2e::ProditionsHandle _scintillationYieldVector; double _scintillationYieldScaleFactor; double _scintillationYieldVariation; double _scintillationYieldVariationCutoffLow; @@ -256,7 +256,7 @@ namespace mu2e std::map,std::vector > photonMap; - auto const& scintillationYieldMap = _scintillationYieldMap.get(event.id()); + auto const& scintillationYieldVector = _scintillationYieldVector.get(event.id()); GeomHandle CRS; GlobalConstantsHandle particleDataList; @@ -328,7 +328,7 @@ namespace mu2e //get the deviation of the scintillation yield from the nominal scintillation yield for each counter float sectorScintillationYield = _scintillationYields[CRVSectorNumber]; - float scintillationYieldDeviation = scintillationYieldMap.scintYieldDeviation(step.barIndex().asUint()); + float scintillationYieldDeviation = scintillationYieldVector.scintYieldDeviation(step.barIndex().asUint()); scintillationYieldDeviation *= _scintillationYieldVariation; if(scintillationYieldDeviation<_scintillationYieldVariationCutoffLow) scintillationYieldDeviation=_scintillationYieldVariationCutoffLow; if(scintillationYieldDeviation>_scintillationYieldVariationCutoffHigh) scintillationYieldDeviation=_scintillationYieldVariationCutoffHigh; diff --git a/CRVResponse/src/CrvWaveformsGenerator_module.cc b/CRVResponse/src/CrvWaveformsGenerator_module.cc index 05b3db2ef7..c14f1a7b50 100644 --- a/CRVResponse/src/CrvWaveformsGenerator_module.cc +++ b/CRVResponse/src/CrvWaveformsGenerator_module.cc @@ -4,9 +4,11 @@ // // Original Author: Ralf Ehrlich +#include "Offline/CRVConditions/inc/CRVCalib.hh" #include "Offline/CRVResponse/inc/MakeCrvWaveforms.hh" #include "Offline/CosmicRayShieldGeom/inc/CosmicRayShield.hh" #include "Offline/DataProducts/inc/CRSScintillatorBarIndex.hh" +#include "Offline/DataProducts/inc/CRVId.hh" #include "Offline/DataProducts/inc/EventWindowMarker.hh" #include "Offline/ConditionsService/inc/CrvParams.hh" @@ -64,9 +66,8 @@ namespace mu2e CLHEP::RandFlat _randFlat; CLHEP::RandGaussQ _randGaussQ; - + mu2e::ProditionsHandle _calib; std::vector _digitizationPointShiftFEBsSide0, _digitizationPointShiftFEBsSide1; - std::vector _timeShiftFEBsSide0, _timeShiftFEBsSide1; struct ChargeCluster { @@ -136,6 +137,8 @@ namespace mu2e digitizationEnd = digitizationStart + eventWindowLength; } + auto const& calib = _calib.get(event.id()); + std::unique_ptr crvDigiMCCollection(new CrvDigiMCCollection); art::Handle crvSiPMChargesCollection; @@ -144,8 +147,6 @@ namespace mu2e GeomHandle CRS; _digitizationPointShiftFEBsSide0.clear(); _digitizationPointShiftFEBsSide1.clear(); - _timeShiftFEBsSide0.clear(); - _timeShiftFEBsSide1.clear(); unsigned int nCounters = CRS->getAllCRSScintillatorBars().size(); unsigned int nFEBs = rint(ceil(nCounters/32.0)); for(unsigned int i=0; ibegin(); @@ -169,9 +166,9 @@ namespace mu2e unsigned int FEB=barIndex.asUint()/32.0; //assume that the counters are ordered in the correct way, //i.e. that all counters beloning to the same FEB are grouped together - double timeShiftFEB=0; - if(SiPM%2==0 && FEB<_timeShiftFEBsSide0.size()) timeShiftFEB=_timeShiftFEBsSide0[FEB]; - if(SiPM%2==1 && FEB<_timeShiftFEBsSide1.size()) timeShiftFEB=_timeShiftFEBsSide1[FEB]; + //the FEBs will be synchronized to account for cable length differences etc., + //but there may still be small time differences between the FEBs. + double timeShiftFEB = calib.timeOffset(barIndex.asUint()*CRVId::nChanPerBar + SiPM); const std::vector ×AndCharges = iter->GetCharges(); std::vector chargeClusters; diff --git a/CRVResponse/test/CRVResponse.fcl b/CRVResponse/test/CRVResponse.fcl index abebc0c760..ebbcdc1377 100644 --- a/CRVResponse/test/CRVResponse.fcl +++ b/CRVResponse/test/CRVResponse.fcl @@ -38,8 +38,14 @@ outputs: } } +physics.producers.EWMProducer.SpillType : 0 physics.producers.CrvPhotons.crvStepModuleLabels : ["CrvSteps"] physics.producers.CrvPhotons.crvStepProcessNames : ["CrvStepsConverter"] +#physics.producers.CrvPhotons.crvStepModuleLabels : ["compressRecoMCs"] +#physics.producers.CrvPhotons.crvStepProcessNames : ["Reconstruct"] +services.ProditionsService.crvScintYield.useDb : true +services.ProditionsService.crvStatus.useDb: true +services.DbService.textFile : ["Offline/CRVConditions/data/status_nominal.txt","Offline/CRVConditions/data/scintyield_nominal.txt"] services.GeometryService.simulatedDetector.tool_type : "Mu2e" services.SeedService.baseSeed : 773651 services.SeedService.maxUniqueEngines : 20 diff --git a/CRVResponse/test/wideband/wideband4modules.fcl b/CRVResponse/test/wideband/wideband4modules.fcl index f8fd7df886..6f7a4542ea 100644 --- a/CRVResponse/test/wideband/wideband4modules.fcl +++ b/CRVResponse/test/wideband/wideband4modules.fcl @@ -177,9 +177,9 @@ physics.producers.CrvCoincidenceClusterFinder.sectorConfig: services.GeometryService.inputFile: "Offline/Mu2eG4/geom/geom_Wideband4modules.txt" services.GeometryService.bFieldFile: "Offline/Mu2eG4/geom/bfgeom_no_field.txt" -services.ProditionsService.crvScintYield.fileName : "Offline/CRVConditions/data/scintyield_wideband4modules.txt" +services.ProditionsService.crvScintYield.useDb : true services.ProditionsService.crvStatus.useDb: true -services.DbService.textFile : ["Offline/CRVConditions/data/status_wideband4modules.txt"] +services.DbService.textFile : ["Offline/CRVConditions/data/status_wideband4modules.txt","Offline/CRVConditions/data/scintyield_wideband4modules.txt"] services.SeedService.baseSeed : @local::Common.BaseSeed services.TFileService.fileName : "nts.owner.CRV_wideband_cosmics-mc.configuration.sequencer.root" diff --git a/DbTables/inc/CRVScint.hh b/DbTables/inc/CRVScint.hh new file mode 100644 index 0000000000..4fc07f4d54 --- /dev/null +++ b/DbTables/inc/CRVScint.hh @@ -0,0 +1,74 @@ +#ifndef DbTables_CRVScint_hh +#define DbTables_CRVScint_hh + +#include "Offline/DataProducts/inc/CRVId.hh" +#include "Offline/DbTables/inc/DbTable.hh" +#include "cetlib_except/exception.h" +#include +#include +#include +#include +#include + +namespace mu2e { + +class CRVScint : public DbTable { + public: + typedef std::shared_ptr ptr_t; + typedef std::shared_ptr cptr_t; + + class Row { + public: + Row(std::uint16_t counter, float scintYieldDeviation) : + _counter(counter), + _scintYieldDeviation(scintYieldDeviation) {} + std::uint16_t counter() const { return _counter; } + float scintYieldDeviation() const { return _scintYieldDeviation; } + + private: + std::uint16_t _counter; + float _scintYieldDeviation; + }; + + constexpr static const char* cxname = "CRVScint"; + + CRVScint() : + DbTable(cxname, "crv.scint", "counter,scintYieldDeviation") {} + const Row& rowAt(const std::size_t index) const { return _rows.at(index); } + const Row& row(std::uint16_t counter) const { return _rows.at(counter); } + std::vector const& rows() const { return _rows; } + std::size_t nrow() const override { return _rows.size(); }; + std::size_t size() const override { + return baseSize() + nrow() * sizeof(Row); + }; + const std::string orderBy() const override { return std::string("counter"); } + + void addRow(const std::vector& columns) override { + std::uint16_t counter = std::stoul(columns[0]); + // enforce order, so counters can be looked up by index + if (counter >= CRVId::nBars || counter != _rows.size()) { + throw cet::exception("CRVSCINT_BAD_CHANNEL") + << "CRVScint::addRow bad counter, saw " << columns[0] << ", expected " + << _rows.size() << "\n"; + } + _rows.emplace_back(std::stoi(columns[0]), std::stof(columns[1])); + } + + void rowToCsv(std::ostringstream& sstream, std::size_t irow) const override { + Row const& r = _rows.at(irow); + sstream << r.counter() << ","; + sstream << std::fixed << std::setprecision(3); + sstream << r.scintYieldDeviation(); + } + + virtual void clear() override { + baseClear(); + _rows.clear(); + } + + private: + std::vector _rows; +}; + +} // namespace mu2e +#endif diff --git a/DbTables/src/DbTableFactory.cc b/DbTables/src/DbTableFactory.cc index e94f8d9c0c..44580cfc95 100644 --- a/DbTables/src/DbTableFactory.cc +++ b/DbTables/src/DbTableFactory.cc @@ -1,6 +1,7 @@ #include "Offline/DbTables/inc/DbTableFactory.hh" #include "Offline/DbTables/inc/AnaTrkQualDb.hh" #include "Offline/DbTables/inc/CRVBadChan.hh" +#include "Offline/DbTables/inc/CRVScint.hh" #include "Offline/DbTables/inc/CRVSiPM.hh" #include "Offline/DbTables/inc/CRVTime.hh" #include "Offline/DbTables/inc/STMEnergyPar.hh" @@ -70,6 +71,8 @@ mu2e::DbTable::ptr_t mu2e::DbTableFactory::newTable(std::string const& name) { return std::shared_ptr(new mu2e::STMPedestals()); } else if (name == "CRVBadChan") { return std::shared_ptr(new mu2e::CRVBadChan()); + } else if (name == "CRVScint") { + return std::shared_ptr(new mu2e::CRVScint()); } else if (name == "CRVSiPM") { return std::shared_ptr(new mu2e::CRVSiPM()); } else if (name == "CRVTime") { From 3f17afe6a2d65e703ca0bb29838389d13af2fb65 Mon Sep 17 00:00:00 2001 From: ehrlich-uva Date: Thu, 4 Jan 2024 10:55:21 -0600 Subject: [PATCH 043/213] updated Wideband geometry --- CRVResponse/test/wideband/widebandCRYconfig.txt | 14 +++++++++----- Mu2eG4/geom/geom_Wideband4modules.txt | 12 ++++++++---- 2 files changed, 17 insertions(+), 9 deletions(-) diff --git a/CRVResponse/test/wideband/widebandCRYconfig.txt b/CRVResponse/test/wideband/widebandCRYconfig.txt index 68b3026acc..cd259b1efa 100644 --- a/CRVResponse/test/wideband/widebandCRYconfig.txt +++ b/CRVResponse/test/wideband/widebandCRYconfig.txt @@ -10,11 +10,15 @@ bool cosmicCRY.projectToTargetBox = true; double cosmicCRY.targetBoxXmin = -5654; //~1.3m away from readout at negative x-side, 4cm wide double cosmicCRY.targetBoxXmax = -5554; -double cosmicCRY.targetBoxYmin = 110; //just the scintillator above the top module -double cosmicCRY.targetBoxYmax = 130; - -double cosmicCRY.targetBoxZmin = 19900; //~width of the module -double cosmicCRY.targetBoxZmax = 21000; +//double cosmicCRY.targetBoxYmin = 110; //just the scintillator above the top module +//double cosmicCRY.targetBoxYmax = 130; +double cosmicCRY.targetBoxYmin = -2230; //just the scintillator below the bottom module +double cosmicCRY.targetBoxYmax = -2250; + +//double cosmicCRY.targetBoxZmin = 19900; //~width of the module +//double cosmicCRY.targetBoxZmax = 21000; +double cosmicCRY.targetBoxZmin = 38950; //~width of the module +double cosmicCRY.targetBoxZmax = 39950; // Enable all particles by default bool cosmicCRY.returnMuons = true; diff --git a/Mu2eG4/geom/geom_Wideband4modules.txt b/Mu2eG4/geom/geom_Wideband4modules.txt index 27b40bf307..03edee78dd 100644 --- a/Mu2eG4/geom/geom_Wideband4modules.txt +++ b/Mu2eG4/geom/geom_Wideband4modules.txt @@ -35,10 +35,14 @@ int crs.nCountersPerModuleW2 = 16; int crs.nCountersPerModuleW3 = 16; int crs.nCountersPerModuleW4 = 16; -vector crs.firstCounterW1 = {-3904.0, 0.0, 20000.0}; -vector crs.firstCounterW2 = {-3904.0, -225.25, 20000.0}; -vector crs.firstCounterW3 = {-3904.0, -450.50, 20000.0}; -vector crs.firstCounterW4 = {-3904.0, -675.75, 20000.0}; +//vector crs.firstCounterW1 = {-3904.0, 0.0, 20000.0}; +//vector crs.firstCounterW2 = {-3904.0, -225.25, 20000.0}; +//vector crs.firstCounterW3 = {-3904.0, -450.50, 20000.0}; +//vector crs.firstCounterW4 = {-3904.0, -675.75, 20000.0}; +vector crs.firstCounterW1 = {-3904.0, -1500.00, 39000.0}; +vector crs.firstCounterW2 = {-3904.0, -1725.25, 39000.0}; +vector crs.firstCounterW3 = {-3904.0, -1950.50, 39000.0}; +vector crs.firstCounterW4 = {-3904.0, -2175.75, 39000.0}; vector crs.layerDirectionW1 = {0, 1, 0}; vector crs.layerDirectionW2 = {0, 1, 0}; From a9d2fdec614524694f9e8a234379cf4175e10c9c Mon Sep 17 00:00:00 2001 From: ehrlich-uva Date: Thu, 4 Jan 2024 15:03:14 -0600 Subject: [PATCH 044/213] bug fix Wideband script --- CRVResponse/test/wideband/wideband4modules.fcl | 12 +----------- CRVResponse/test/wideband/widebandCRYconfig.txt | 3 ++- 2 files changed, 3 insertions(+), 12 deletions(-) diff --git a/CRVResponse/test/wideband/wideband4modules.fcl b/CRVResponse/test/wideband/wideband4modules.fcl index 6f7a4542ea..30e0dd21f6 100644 --- a/CRVResponse/test/wideband/wideband4modules.fcl +++ b/CRVResponse/test/wideband/wideband4modules.fcl @@ -82,25 +82,15 @@ outputs: physics.producers.generate : @local::Cosmic.generateCRY physics.producers.generate.inputFile : "Offline/CRVResponse/test/wideband/widebandCRYconfig.txt" physics.producers.cosmicTimeOffset.intervalEnd : 99000 +physics.producers.cosmicTimeOffset.cosmicModuleLabel : "generate" physics.producers.g4run.TrajectoryControl: @local::mu2eg4DefaultTrajectories physics.producers.g4run.inputs.primaryTag : cosmicTimeOffset -physics.producers.g4run.TrajectoryControl: @local::mu2eg4DefaultTrajectories #physics.producers.g4run.Mu2eG4CommonCut: @local::Cosmic.Mu2eG4CommonCutCosmicNoField physics.producers.g4run.Mu2eG4CommonCut: - { - type: union - pars: [ - { - type : plane - normal: [ 0, -1, 0 ] - point : [ 0, -750, 0 ] - }, { type: inVolume pars: [ worldDirtBottom ] } - ] - } physics.producers.EWMProducer.SpillType : 0 physics.producers.CrvSteps.stepPointsModuleLabels : ["g4run"] diff --git a/CRVResponse/test/wideband/widebandCRYconfig.txt b/CRVResponse/test/wideband/widebandCRYconfig.txt index cd259b1efa..80f71adc92 100644 --- a/CRVResponse/test/wideband/widebandCRYconfig.txt +++ b/CRVResponse/test/wideband/widebandCRYconfig.txt @@ -3,7 +3,8 @@ int cosmicCRY.verbose = 0; string cosmicCRY.refPoint = "UNDEFINED"; double cosmicCRY.refX0 = -5604; double cosmicCRY.refY0 = 200; -double cosmicCRY.refZ0 = 20450; +//double cosmicCRY.refZ0 = 20450; +double cosmicCRY.refZ0 = 39450; bool cosmicCRY.projectToTargetBox = true; From 79a8e233cbfd6e1dc32c95564407125d4f400b46 Mon Sep 17 00:00:00 2001 From: David Nathan Brown Date: Thu, 4 Jan 2024 16:58:34 -0800 Subject: [PATCH 045/213] Follow KinKal changes to allow extrapolation --- Mu2eKinKal/inc/KKCaloHit.hh | 38 ++++++++++++++--------- Mu2eKinKal/inc/KKFit.hh | 26 ++++++++-------- Mu2eKinKal/inc/KKFitUtilities.hh | 6 ++-- Mu2eKinKal/inc/KKStrawHit.hh | 12 +++---- Mu2eKinKal/inc/KKStrawXing.hh | 9 +++--- Mu2eKinKal/src/CentralHelixFit_module.cc | 2 -- Mu2eKinKal/src/KKFitUtilities.cc | 4 +-- Mu2eKinKal/src/KinematicLineFit_module.cc | 1 - Mu2eKinKal/test/KKDrift.fcl | 6 ++-- 9 files changed, 55 insertions(+), 49 deletions(-) diff --git a/Mu2eKinKal/inc/KKCaloHit.hh b/Mu2eKinKal/inc/KKCaloHit.hh index 2667575d95..c05efdd2f4 100644 --- a/Mu2eKinKal/inc/KKCaloHit.hh +++ b/Mu2eKinKal/inc/KKCaloHit.hh @@ -1,10 +1,11 @@ #ifndef Mu2e_KKCaloHit_hh #define Mu2e_KKCaloHit_hh // -// hit representing a time measurement from a calorimeter cluster +// hit representing a time measurement from a calorimeter cluster. The geometric information is used to +// compute propagation time // #include "KinKal/Detector/ResidualHit.hh" -#include "KinKal/Trajectory/Line.hh" +#include "KinKal/Trajectory/SensorLine.hh" #include "KinKal/Trajectory/PiecewiseClosestApproach.hh" // mu2e includes #include "Offline/RecoDataProducts/inc/CaloCluster.hh" @@ -12,7 +13,7 @@ #include "canvas/Persistency/Common/Ptr.h" #include "cetlib_except/exception.h" namespace mu2e { - using KinKal::Line; + using KinKal::SensorLine; using KinKal::MetaIterConfig; using KinKal::Residual; using KinKal::CAHint; @@ -21,8 +22,8 @@ namespace mu2e { template class KKCaloHit : public KinKal::ResidualHit { public: using PKTRAJ = KinKal::ParticleTrajectory; - using PCA = KinKal::PiecewiseClosestApproach; - using CA = KinKal::ClosestApproach; + using PCA = KinKal::PiecewiseClosestApproach; + using CA = KinKal::ClosestApproach; using HIT = KinKal::Hit; using KTRAJPTR = std::shared_ptr; // Hit interface overrrides @@ -48,7 +49,7 @@ namespace mu2e { private: CCPtr caloCluster_; // associated calorimeter cluster - Line saxis_; // axis along the crystals, through the COG + SensorLine saxis_; // axis along the crystals, through the COG double tvar_; // variance in the time measurement: assumed independent of propagation distance/time double wvar_; // variance in transverse position of the sensor/measurement in mm. Assumes cylindrical error, could be more general CA tpca_; // reference time and distance of closest approach to the axis @@ -66,7 +67,7 @@ namespace mu2e { template void KKCaloHit::updateReference(std::shared_ptr const& ktrajptr) { // compute PCA - CAHint tphint( saxis_.t0(), saxis_.t0()); + CAHint tphint( saxis_.measurementTime(), saxis_.measurementTime()); // don't update the hint: initial T0 values can be very poor, which can push the CA calculation onto the wrong helix loop, // from which it's impossible to ever get back to the correct one. Active loop checking might be useful eventually too TODO // if(tpca_.usable()) tphint = CAHint(tpca_.particleToca(),tpca_.sensorToca()); @@ -79,8 +80,8 @@ namespace mu2e { // early in the fit when t0 has very large errors. // If it is inconsistent with the crystal position try to adjust it back using a better hint. auto ppos = tpca_.particlePoca().Vect(); - auto sstart = saxis_.startPosition(); - auto send = saxis_.endPosition(); + auto sstart = saxis_.start(); + auto send = saxis_.end(); // tolerance should come from the miconfig. Should also test relative to the error. TODO double tol = 1.0*saxis_.length(); double sdist = (ppos-sstart).Dot(saxis_.direction()); @@ -95,14 +96,21 @@ namespace mu2e { } if(tpca_.usable()){ // residual is just delta-T at CA. + double totvar = tvar_; // the variance includes the intrinsic measurement variance and the tranvserse position resolution (which couples to the relative direction) - double speed = saxis_.speed(tpca_.sensorToca()); + double speed = saxis_.speed(tpca_.sensorToca()); // signal propagation speed along the crystal double s2 = speed*speed; double cost = tpca_.dirDot(); // cosine of angle between track and crystal axis - double sint2 = std::max(1e-3,1.0-cost*cost);// protect against track co-linear with crystal - double ldt = saxis_.length()/speed; // time to go the full length of the crystal - double twvar = std::min(wvar_/(s2*sint2),ldt*ldt/12.0); // maximimum time uncertainty due to crystal size - double totvar = tvar_ + twvar; + double cost2 = cost*cost; + double sint2 = 1.0-cost2; + // protect against track co-linear with crystal + if(sint2 > 1e-2) { + totvar += cost2*wvar_/(s2*sint2); + } else { + double ldt = saxis_.length()/speed; // time to go the full length of the crystal + double invvar2 = std::max(s2*sint2/(cost2*wvar_), 12/(ldt*ldt)); + totvar += 1.0/invvar2; + } rresid_ = Residual(tpca_.deltaT(),totvar,0.0,true,tpca_.dTdP()); } else { rresid_ = Residual(rresid_.value(),rresid_.variance(),0.0,false,rresid_.dRdP()); @@ -111,7 +119,7 @@ namespace mu2e { this->updateWeight(miconfig); } - template KinKal::ClosestApproach KKCaloHit::unbiasedClosestApproach() const { + template KinKal::ClosestApproach KKCaloHit::unbiasedClosestApproach() const { // compute the unbiased closest approach; this is brute force, but works auto const& ca = this->closestApproach(); auto uparams = HIT::unbiasedParameters(); diff --git a/Mu2eKinKal/inc/KKFit.hh b/Mu2eKinKal/inc/KKFit.hh index dbdadf1708..76a8cb3e74 100644 --- a/Mu2eKinKal/inc/KKFit.hh +++ b/Mu2eKinKal/inc/KKFit.hh @@ -37,14 +37,14 @@ #include "KinKal/Fit/Config.hh" #include "KinKal/Trajectory/ParticleTrajectory.hh" #include "KinKal/Trajectory/PiecewiseClosestApproach.hh" -#include "KinKal/Trajectory/Line.hh" +#include "KinKal/Trajectory/SensorLine.hh" // Other #include "cetlib_except/exception.h" #include #include #include namespace mu2e { - using KinKal::Line; + using KinKal::SensorLine; using KinKal::TimeRange; using KinKal::Status; using KinKal::BFieldMap; @@ -58,8 +58,8 @@ namespace mu2e { using KKTRK = KKTrack; using KKTRKPTR = std::unique_ptr; using PKTRAJ = KinKal::ParticleTrajectory; - using PCA = KinKal::PiecewiseClosestApproach; - using TCA = KinKal::ClosestApproach; + using PCA = KinKal::PiecewiseClosestApproach; + using TCA = KinKal::ClosestApproach; using KKHIT = KinKal::Measurement; using KKMAT = KinKal::Material; using KKSTRAWHIT = KKStrawHit; @@ -88,7 +88,7 @@ namespace mu2e { void makeStrawHits(Tracker const& tracker,StrawResponse const& strawresponse, BFieldMap const& kkbf, KKStrawMaterial const& smat, PKTRAJ const& ptraj, ComboHitCollection const& chcol, StrawHitIndexCollection const& strawHitIdxs, KKSTRAWHITCOL& hits, KKSTRAWXINGCOL& exings) const; - Line caloAxis(CaloCluster const& cluster, Calorimeter const& calo) const; // should come from CaloCluster TODO + SensorLine caloAxis(CaloCluster const& cluster, Calorimeter const& calo) const; // should come from CaloCluster TODO bool makeCaloHit(CCPtr const& cluster, Calorimeter const& calo, PKTRAJ const& pktraj, KKCALOHITCOL& hits) const; // extend a track with a new configuration, optionally searching for and adding hits and straw material void extendTrack(Config const& config, BFieldMap const& kkbf, Tracker const& tracker, @@ -210,7 +210,7 @@ namespace mu2e { } } - template Line KKFit::caloAxis(CaloCluster const& cluster, Calorimeter const& calo) const { + template SensorLine KKFit::caloAxis(CaloCluster const& cluster, Calorimeter const& calo) const { // move cluster COG into the tracker frame. COG is at the front face of the disk CLHEP::Hep3Vector cog = calo.geomUtil().mu2eToTracker(calo.geomUtil().diskFFToMu2e( cluster.diskID(), cluster.cog3Vector())); // project this along the crystal axis to the SIPM, which is at the back. This is the point the time measurement corresponds to @@ -218,8 +218,8 @@ namespace mu2e { double lcrystal = calo.caloInfo().getDouble("crystalZLength"); // text-keyed lookup is very inefficient FIXME! VEC3 crystalF2B = VEC3(0.0,0.0,lcrystal); // this should come directly from the calogeometry, TODO VEC3 sipmcog = ffcog + crystalF2B; - // create the Line trajectory from this information: signal goes towards the sipm - return Line(sipmcog,ffcog,cluster.time()+caloDt_,caloPropSpeed_); + // create the SensorLine trajectory from this information: signal goes towards the sipm + return SensorLine(sipmcog,ffcog,cluster.time()+caloDt_,caloPropSpeed_); } @@ -229,12 +229,12 @@ namespace mu2e { // find the time the seed traj passes the middle of the crystal to form the hint auto pmid = caxis.position3(caxis.timeAtMidpoint()); double zt = Mu2eKinKal::zTime(pktraj,pmid.Z(),pktraj.range().end()); - CAHint hint( zt, caxis.t0()); + CAHint hint( zt, caxis.measurementTime()); // compute a preliminary PCA between the seed trajectory and the cluster axis auto pca = PCA(pktraj, caxis, hint, tprec_ ); if(pca.usable() && fabs(pca.doca()) < maxCaloDoca_ && fabs(pca.deltaT()) < maxCaloDt_){ // check that CA is within the active volume of the calorimeter - double dz = pca.sensorPoca().Z() - caxis.position3(caxis.t0()).Z(); + double dz = pca.sensorPoca().Z() - caxis.position3(caxis.measurementTime()).Z(); if( dz > -caxis.length() -maxCaloDoca_ && dz < maxCaloDoca_) { // double tvar = cluster->timeErr()*cluster->timeErr(); the returned value seems unphysically smalL, ~70 ps. double tvar = caloTimeRes_*caloTimeRes_; // temporary kludge, this number comes from MDC2020 sim studies. FIXME @@ -280,7 +280,7 @@ namespace mu2e { const Straw& straw = tracker.getStraw(strawhit.strawId()); auto wline = Mu2eKinKal::hitLine(strawhit,straw,strawresponse); double psign = wline.direction().Dot(straw.wireDirection()); // wire distance is WRT straw center, in the nominal wire direction - double htime = wline.t0() - (straw.halfLength()-psign*strawhit.wireDist())/wline.speed(wline.timeAtMidpoint()); + double htime = wline.measurementTime() - (straw.halfLength()-psign*strawhit.wireDist())/wline.speed(wline.timeAtMidpoint()); CAHint hint(zt,htime); // compute PCA between the trajectory and this straw PCA pca(ftraj, wline, hint, tprec_ ); @@ -349,7 +349,7 @@ namespace mu2e { KinKal::VEC3 vp1(straw.wireEnd(StrawEnd::hv)); KinKal::VEC3 smid = 0.5*(vp0+vp1); // eventually this trajectory should be a native member of Straw TODO - KinKal::Line wline(vp0,vp1,zt,CLHEP::c_light); // time is irrelevant: use speed of light as sprop + KinKal::SensorLine wline(vp0,vp1,zt,CLHEP::c_light); // time is irrelevant: use speed of light as sprop CAHint hint(zt,zt); // compute PCA between the trajectory and this straw PCA pca(ftraj, wline, hint, tprec_ ); @@ -406,7 +406,7 @@ namespace mu2e { auto pca = PCA(ftraj, caxis, hint, tprec_ ); if(pca.usable() && fabs(pca.doca()) < maxCaloDoca_ && fabs(pca.deltaT()) < maxCaloDt_){ // check that the position is within the active position of the crystal - double dz = pca.sensorPoca().Z() - caxis.position3(caxis.t0()).Z(); + double dz = pca.sensorPoca().Z() - caxis.position3(caxis.measurementTime()).Z(); if( dz > -caxis.length() -maxCaloDoca_ && dz < maxCaloDoca_) { art::Ptr ccPtr = art::Ptr(cchandle,icc); // double tvar = cc.timeErr()*cc.timeErr(); diff --git a/Mu2eKinKal/inc/KKFitUtilities.hh b/Mu2eKinKal/inc/KKFitUtilities.hh index 9f2f841a44..a745aa3a49 100644 --- a/Mu2eKinKal/inc/KKFitUtilities.hh +++ b/Mu2eKinKal/inc/KKFitUtilities.hh @@ -3,7 +3,7 @@ // // untemplated utiltity classes and functions // -#include "KinKal/Trajectory/Line.hh" +#include "KinKal/Trajectory/SensorLine.hh" #include "KinKal/General/Vectors.hh" #include "KinKal/General/TimeRange.hh" #include "KinKal/Trajectory/ClosestApproachData.hh" @@ -16,8 +16,8 @@ namespace mu2e { class StrawResponse; namespace Mu2eKinKal{ enum Dimension { dresid=0, tresid=1}; // residual dimensions - // function to turn a StrawHit into a Line object - KinKal::Line hitLine(ComboHit const& ch, Straw const& straw,StrawResponse const& strawresponse); + // function to turn a StrawHit into a SensorLine object + KinKal::SensorLine hitLine(ComboHit const& ch, Straw const& straw,StrawResponse const& strawresponse); // test whether a point is inside the detector bool inDetector(KinKal::VEC3 const& point); double LorentzAngle(KinKal::ClosestApproachData const& ptca, KinKal::VEC3 const& bdir); diff --git a/Mu2eKinKal/inc/KKStrawHit.hh b/Mu2eKinKal/inc/KKStrawHit.hh index 4b038d4518..9a24d70821 100644 --- a/Mu2eKinKal/inc/KKStrawHit.hh +++ b/Mu2eKinKal/inc/KKStrawHit.hh @@ -10,7 +10,7 @@ #include "KinKal/Detector/ResidualHit.hh" #include "Offline/Mu2eKinKal/inc/WireHitState.hh" #include "KinKal/Trajectory/ParticleTrajectory.hh" -#include "KinKal/Trajectory/Line.hh" +#include "KinKal/Trajectory/SensorLine.hh" #include "KinKal/Trajectory/PiecewiseClosestApproach.hh" #include "KinKal/Trajectory/ClosestApproach.hh" #include "KinKal/General/BFieldMap.hh" @@ -31,7 +31,7 @@ #include namespace mu2e { using KinKal::BFieldMap; - using KinKal::Line; + using KinKal::SensorLine; using KinKal::MetaIterConfig; using KinKal::POL2; using KinKal::Residual; @@ -45,8 +45,8 @@ namespace mu2e { using HIT = KinKal::Hit; using RESIDHIT = KinKal::ResidualHit; using KTRAJPTR = std::shared_ptr; - using PCA = KinKal::PiecewiseClosestApproach; - using CA = KinKal::ClosestApproach; + using PCA = KinKal::PiecewiseClosestApproach; + using CA = KinKal::ClosestApproach; KKStrawHit(BFieldMap const& bfield, PCA const& pca, ComboHit const& chit, Straw const& straw, StrawHitIndex const& shindex, StrawResponse const& sresponse); // Hit interface implementations @@ -82,7 +82,7 @@ namespace mu2e { WireHitState whstate_; // current state double dVar_; // drift distance variance value double dDdT_; // drift distance time derivative, crudely the drift velocity - Line wire_; // local linear approximation to the wire of this hit, encoding all (local) position and time information. + SensorLine wire_; // local linear approximation to the wire of this hit, encoding all (local) position and time information. // the start time is the measurement time, the direction is from // the physical source of the signal (particle) to the measurement recording location (electronics), the direction magnitude // is the effective signal propagation velocity along the wire, and the time range describes the active wire length @@ -116,7 +116,7 @@ namespace mu2e { throw cet::exception("RECO")<<"mu2e::KKStrawHit: ComboHit doesn't correspond to a unique straw"<< std::endl; } - template KinKal::ClosestApproach KKStrawHit::unbiasedClosestApproach() const { + template KinKal::ClosestApproach KKStrawHit::unbiasedClosestApproach() const { // compute the unbiased closest approach; this is brute force, but works auto const& ca = this->closestApproach(); auto uparams = HIT::unbiasedParameters(); diff --git a/Mu2eKinKal/inc/KKStrawXing.hh b/Mu2eKinKal/inc/KKStrawXing.hh index 8508855d1a..3a1a6e8106 100644 --- a/Mu2eKinKal/inc/KKStrawXing.hh +++ b/Mu2eKinKal/inc/KKStrawXing.hh @@ -8,6 +8,7 @@ #include "Offline/Mu2eKinKal/inc/StrawXingUpdater.hh" #include "Offline/Mu2eKinKal/inc/KKStrawMaterial.hh" #include "KinKal/Trajectory/ParticleTrajectory.hh" +#include "KinKal/Trajectory/SensorLine.hh" #include "KinKal/Trajectory/PiecewiseClosestApproach.hh" #include "Offline/DataProducts/inc/StrawId.hh" #include "cetlib_except/exception.h" @@ -19,14 +20,14 @@ namespace mu2e { using KinKal::DPDV; using KinKal::MomBasis; using KinKal::NParams; - using KinKal::Line; + using KinKal::SensorLine; template class KKStrawXing : public KinKal::ElementXing { public: using PTRAJ = KinKal::ParticleTrajectory; using KTRAJPTR = std::shared_ptr; using EXING = KinKal::ElementXing; - using PCA = KinKal::PiecewiseClosestApproach; - using CA = KinKal::ClosestApproach; + using PCA = KinKal::PiecewiseClosestApproach; + using CA = KinKal::ClosestApproach; using KKSTRAWHIT = KKStrawHit; using KKSTRAWHITPTR = std::shared_ptr; // construct without an associated StrawHit @@ -54,7 +55,7 @@ namespace mu2e { private: StrawId sid_; // StrawId KKSTRAWHITPTR shptr_; // reference to associated StrawHit - Line axis_; // straw axis, expressed as a timeline + SensorLine axis_; // straw axis, expressed as a timeline KKStrawMaterial const& smat_; CA ca_; // result of most recent TPOCA double toff_; // small time offset diff --git a/Mu2eKinKal/src/CentralHelixFit_module.cc b/Mu2eKinKal/src/CentralHelixFit_module.cc index 6993b7e6d9..cd7c889fc3 100644 --- a/Mu2eKinKal/src/CentralHelixFit_module.cc +++ b/Mu2eKinKal/src/CentralHelixFit_module.cc @@ -92,8 +92,6 @@ namespace mu2e { using CCPtr = art::Ptr; using CCHandle = art::ValidHandle; using StrawHitIndexCollection = std::vector; - using PCA = KinKal::PiecewiseClosestApproach; - using CA = KinKal::ClosestApproach; using KKConfig = Mu2eKinKal::KinKalConfig; using KKFitConfig = Mu2eKinKal::KKFitConfig; diff --git a/Mu2eKinKal/src/KKFitUtilities.cc b/Mu2eKinKal/src/KKFitUtilities.cc index 29a2126d6b..a9404e67b1 100644 --- a/Mu2eKinKal/src/KKFitUtilities.cc +++ b/Mu2eKinKal/src/KKFitUtilities.cc @@ -4,12 +4,12 @@ #include "Offline/TrackerGeom/inc/Straw.hh" namespace mu2e { namespace Mu2eKinKal { - KinKal::Line hitLine(ComboHit const& ch, Straw const& straw,StrawResponse const& strawresponse) { + KinKal::SensorLine hitLine(ComboHit const& ch, Straw const& straw,StrawResponse const& strawresponse) { double sprop = 2*strawresponse.halfPropV(ch.strawId(),1000.0*ch.energyDep()); // calibration uses EDep in KeV // construct a kinematic line trajectory from this straw. the measurement point is at the earlier signal KinKal::VEC3 vp0(straw.wireEnd(ch.earlyEnd())); KinKal::VEC3 vp1(straw.wireEnd(ch.lateEnd())); - return KinKal::Line(vp0,vp1,ch.time(),sprop); + return KinKal::SensorLine(vp0,vp1,ch.time(),sprop); } bool inDetector(KinKal::VEC3 const& point) { return point.Rho() < 900.0 && fabs(point.Z()) < 1800; // numbers should come from Tracker TODO diff --git a/Mu2eKinKal/src/KinematicLineFit_module.cc b/Mu2eKinKal/src/KinematicLineFit_module.cc index 9b53b5b08f..e8b105bb26 100644 --- a/Mu2eKinKal/src/KinematicLineFit_module.cc +++ b/Mu2eKinKal/src/KinematicLineFit_module.cc @@ -41,7 +41,6 @@ #include "KinKal/Trajectory/ParticleTrajectory.hh" #include "KinKal/Trajectory/PiecewiseClosestApproach.hh" #include "KinKal/General/Parameters.hh" -#include "KinKal/Trajectory/Line.hh" // Mu2eKinKal #include "Offline/Mu2eKinKal/inc/KKFit.hh" #include "Offline/Mu2eKinKal/inc/KKFitSettings.hh" diff --git a/Mu2eKinKal/test/KKDrift.fcl b/Mu2eKinKal/test/KKDrift.fcl index 606129c512..2b9c6e2315 100644 --- a/Mu2eKinKal/test/KKDrift.fcl +++ b/Mu2eKinKal/test/KKDrift.fcl @@ -84,21 +84,21 @@ physics.producers.KKDeM.ModuleSettings.HelixSeedCollections : [ "MHDeM" ] physics.producers.KKDeM.ModuleSettings.ComboHitCollection : "makeSH" physics.producers.KKDeM.ModuleSettings.CaloClusterCollection : "CaloClusterMaker" physics.producers.KKDeM.ModuleSettings.PrintLevel : 0 -physics.producers.KKDeM.ModuleSettings.SaveAllFits : true +physics.producers.KKDeM.ModuleSettings.SaveAllFits : false physics.producers.KKDeM.FitSettings.PrintLevel : 0 physics.producers.KKUeP.ModuleSettings.HelixSeedCollections : [ "MHDeM" ] physics.producers.KKUeP.ModuleSettings.ComboHitCollection : "makeSH" physics.producers.KKUeP.ModuleSettings.CaloClusterCollection : "CaloClusterMaker" physics.producers.KKUeP.ModuleSettings.PrintLevel : 0 -physics.producers.KKUeP.ModuleSettings.SaveAllFits : true +physics.producers.KKUeP.ModuleSettings.SaveAllFits : false physics.producers.KKUeP.FitSettings.PrintLevel : 0 physics.producers.KKDmuM.ModuleSettings.HelixSeedCollections : [ "MHDeM" ] physics.producers.KKDmuM.ModuleSettings.ComboHitCollection : "makeSH" physics.producers.KKDmuM.ModuleSettings.CaloClusterCollection : "CaloClusterMaker" physics.producers.KKDmuM.ModuleSettings.PrintLevel : 0 -physics.producers.KKDmuM.ModuleSettings.SaveAllFits : true +physics.producers.KKDmuM.ModuleSettings.SaveAllFits : false physics.producers.KKDmuM.FitSettings.PrintLevel : 0 physics.analyzers.TAKK.candidate.options : @local::AllOpt From e67b3433f5ec9e0e1df35089074c76b51a243a28 Mon Sep 17 00:00:00 2001 From: ehrlich-uva Date: Fri, 5 Jan 2024 11:52:09 -0600 Subject: [PATCH 046/213] small change to crv digi generator --- DAQ/test/generateCrvDigiFromFragment_wideband1module.fcl | 2 ++ 1 file changed, 2 insertions(+) diff --git a/DAQ/test/generateCrvDigiFromFragment_wideband1module.fcl b/DAQ/test/generateCrvDigiFromFragment_wideband1module.fcl index 59276690cf..80dacfd610 100644 --- a/DAQ/test/generateCrvDigiFromFragment_wideband1module.fcl +++ b/DAQ/test/generateCrvDigiFromFragment_wideband1module.fcl @@ -57,6 +57,8 @@ outputs: { module_type : RootOutput fileName : "crvDigis.art" + outputCommands : [ "keep *_*_*_*", + "drop mu2e::CRVDataDecoders_*_*_*" ] #dictionary doesn't exist } } From 71f2bf6d203d4484ab37e3fbe8905c2275f3705a Mon Sep 17 00:00:00 2001 From: David Nathan Brown Date: Fri, 5 Jan 2024 10:55:49 -0800 Subject: [PATCH 047/213] Terminate message --- Mu2eKinKal/inc/KKFit.hh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Mu2eKinKal/inc/KKFit.hh b/Mu2eKinKal/inc/KKFit.hh index 76a8cb3e74..fdb213f2e6 100644 --- a/Mu2eKinKal/inc/KKFit.hh +++ b/Mu2eKinKal/inc/KKFit.hh @@ -505,7 +505,7 @@ namespace mu2e { udres = strawhit->residual(Mu2eKinKal::dresid); utres = strawhit->residual(Mu2eKinKal::tresid); } catch (std::exception const& error) { - std::cout << "Unbiased residual calculation failure, nDOF = " << fstatus.chisq_.nDOF(); + std::cout << "Unbiased residual calculation failure, nDOF = " << fstatus.chisq_.nDOF() << std::endl; } } fseed._hits.emplace_back(strawhit->strawHitIndex(),strawhit->hit(), From 658e9c742003e95c5cea7c30dfe0ad4789abfd64 Mon Sep 17 00:00:00 2001 From: Rob Kutschke Date: Mon, 8 Jan 2024 22:02:09 -0600 Subject: [PATCH 048/213] Prototype of reseeder class. --- Mu2eUtilities/inc/ReSeedByEventID.hh | 32 +++++++++++++++++++++++++ Mu2eUtilities/src/ReSeedByEventID.cc | 35 ++++++++++++++++++++++++++++ 2 files changed, 67 insertions(+) create mode 100644 Mu2eUtilities/inc/ReSeedByEventID.hh create mode 100644 Mu2eUtilities/src/ReSeedByEventID.cc diff --git a/Mu2eUtilities/inc/ReSeedByEventID.hh b/Mu2eUtilities/inc/ReSeedByEventID.hh new file mode 100644 index 0000000000..5aabfe90a1 --- /dev/null +++ b/Mu2eUtilities/inc/ReSeedByEventID.hh @@ -0,0 +1,32 @@ +#ifndef Mu2eUtilities_ReSeedByEventID_hh +#define Mu2eUtilities_ReSeedByEventID_hh +// +// Reseed a random engine using the event id and a user supplied salt. +// + +#include "Offline/SeedService/inc/SeedService.hh" + +#include "canvas/Persistency/Provenance/EventID.h" +#include "art/Framework/Services/Optional/RandomNumberGenerator.h" +#include "CLHEP/Random/MixMaxRng.h" + +namespace mu2e { + + class ReSeedByEventID{ + + public: + ReSeedByEventID( CLHEP::HepRandomEngine& engine, SeedService::seed_t salt); + + void reseed ( art::EventID const& id ) const; + + private: + + CLHEP::MixMaxRng * _engine; // the engine to be reseeded + SeedService::seed_t _salt; // user supplied salt. + + }; + +} // namespace mu2e + + +#endif diff --git a/Mu2eUtilities/src/ReSeedByEventID.cc b/Mu2eUtilities/src/ReSeedByEventID.cc new file mode 100644 index 0000000000..9373f2503e --- /dev/null +++ b/Mu2eUtilities/src/ReSeedByEventID.cc @@ -0,0 +1,35 @@ +#include "Offline/Mu2eUtilities/inc/ReSeedByEventID.hh" +//#include "art/Framework/EventProcessor/Scheduler.h" + +#include "art/Framework/Services/Registry/ServiceHandle.h" + +#include "fhiclcpp/exception.h" + +#include +#include + +namespace mu2e { + ReSeedByEventID::ReSeedByEventID( CLHEP::HepRandomEngine& engine, SeedService::seed_t salt):_salt(salt){ + std::string engineType{art::ServiceHandle{}->defaultEngineKind()}; + std::cout << "Kind: " << engineType << std::endl; + if ( engineType != "MixMaxRng" ){ + throw cet::exception("BADCONFIG") + << "ReSeedByEventID requires that RandomNumberGenerator::defaultEngineKind be MixMaxRng. It is: " << engineType << "\n"; + } + // Ideally only do this when the number of schedules is >1. + // The next line is not working. + //std::cout << "Threads: " << art::ServiceHandle{}->num_threads() << std::endl; + _engine = static_cast(&engine); + } + + void ReSeedByEventID::reseed ( art::EventID const& id ) const{ + std::cout << "Reseed: " << id << " " << _salt << std::endl; + std::array seeds; + seeds[0] = id.run(); + seeds[1] = id.subRun(); + seeds[2] = id.event(); + seeds[3] = _salt; + _engine->setSeeds( seeds.data(), seeds.size() ); + } + +} // end namespace mu2e From cf3cf2de695935c69a91d38d343acc78d3cb2aad Mon Sep 17 00:00:00 2001 From: Rob Kutschke Date: Mon, 8 Jan 2024 22:02:32 -0600 Subject: [PATCH 049/213] Prototype of using re-seeder class. --- .../src/StoppedParticleReactionGun_module.cc | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/EventGenerator/src/StoppedParticleReactionGun_module.cc b/EventGenerator/src/StoppedParticleReactionGun_module.cc index c7ffc8ae01..371b5f2852 100644 --- a/EventGenerator/src/StoppedParticleReactionGun_module.cc +++ b/EventGenerator/src/StoppedParticleReactionGun_module.cc @@ -37,6 +37,7 @@ #include "Offline/Mu2eUtilities/inc/BinnedSpectrum.hh" #include "Offline/Mu2eUtilities/inc/Table.hh" #include "Offline/Mu2eUtilities/inc/RootTreeSampler.hh" +#include "Offline/Mu2eUtilities/inc/ReSeedByEventID.hh" #include "Offline/GeneralUtilities/inc/RSNTIO.hh" #include "TH1.h" @@ -57,6 +58,7 @@ namespace mu2e { GenId genId_; int verbosityLevel_; + SeedService::seed_t seed_; art::RandomNumberGenerator::base_engine_t& eng_; CLHEP::RandGeneral randSpectrum_; RandomUnitSphere randomUnitSphere_; @@ -72,6 +74,8 @@ namespace mu2e { TH1F* _hTime; TH1F* _hZ; + ReSeedByEventID reseeder_; + private: static SpectrumVar parseSpectrumVar(const std::string& name); double generateEnergy(); @@ -92,11 +96,13 @@ namespace mu2e { , spectrum_(BinnedSpectrum(psphys_)) , genId_(GenId::findByName(psphys_.get("genId"))) , verbosityLevel_(pset.get("verbosityLevel", 0)) - , eng_(createEngine(art::ServiceHandle()->getSeed())) + , seed_(art::ServiceHandle()->getSeed()) + , eng_(createEngine(seed_)) , randSpectrum_(eng_, spectrum_.getPDF(), spectrum_.getNbins()) , randomUnitSphere_(eng_) , stops_(eng_, pset.get("muonStops")) , doHistograms_ (pset.get("doHistograms",false ) ) + , reseeder_(eng_,seed_) { produces(); @@ -151,6 +157,8 @@ namespace mu2e { //================================================================ void StoppedParticleReactionGun::produce(art::Event& event) { + reseeder_.reseed(event.id()); + std::unique_ptr output(new GenParticleCollection); const auto& stop = stops_.fire(); From c70082ba058dac5e5dbe7003091425f8dd43214e Mon Sep 17 00:00:00 2001 From: Andrew Edmonds Date: Tue, 9 Jan 2024 18:42:18 -0600 Subject: [PATCH 050/213] Updated trkqual after updating notebook --- TrkDiag/data/trkqual.dat | 24 +++---- TrkDiag/inc/trkqual.hxx | 110 ++++++++++++++--------------- TrkDiag/src/TrackQuality_module.cc | 12 ++-- 3 files changed, 73 insertions(+), 73 deletions(-) diff --git a/TrkDiag/data/trkqual.dat b/TrkDiag/data/trkqual.dat index 63c55ccf22..997f231e85 100644 --- a/TrkDiag/data/trkqual.dat +++ b/TrkDiag/data/trkqual.dat @@ -1,16 +1,16 @@ +tensor_dense3bias0 1 +0.587221324 tensor_dense3kernel0 6 --2.32326317 -1.28914106 1.87569582 1.37539637 1.28820384 1.45947862 +-1.40627837 2.23227358 -1.00061452 -1.49567473 2.04384661 -1.38098133 tensor_dense2bias0 6 --0.105199143 -0.398535997 0.221802577 0.1211548 0.384487808 0.48019737 +-0.594108224 0.512368977 -0.727252364 -0.556245744 0.498881936 -0.539055884 +tensor_dense2kernel0 42 +0.7638852 -1.50310206 1.09058321 1.07911074 -0.578849375 0.300788283 1.181669 -0.589241266 1.33228993 1.08477175 -1.70363271 1.2537899 -1.37801969 1.92823339 -1.75989687 -1.66138411 1.62074387 -1.58146 1.48242605 -1.20689857 1.07226562 0.535363734 -1.3911401 0.895950615 0.213210642 -0.0132599706 0.411829829 0.6407004 -0.0642847568 0.761666 -1.97384024 1.22328043 -1.97858596 -1.98268294 1.75599766 -2.03176832 0.402680814 -0.4603526 0.752630591 1.00772011 -0.13332215 0.981812596 +tensor_dense1bias0 7 +-0.0202047937 -0.327160925 0.636472046 -0.428551614 -0.593366683 0.801567733 -0.851719916 +tensor_dense1kernel0 49 +-2.02546692 -1.63345146 1.74172997 -1.73552132 -0.609668553 1.43329179 -0.917290509 1.13824141 1.32516873 -1.24296522 0.541016459 0.797366738 -1.22736979 0.967306495 -0.983426273 -0.800588608 0.680314958 -0.769506872 -0.536953509 0.728172719 -0.541960061 -1.4391191 -1.69875264 0.829871714 -1.73984098 -1.04288161 1.36317575 -1.6682117 0.608907223 0.446370661 -0.606059253 1.03537273 0.182477683 -0.776726484 0.490121126 1.35274875 1.58658373 -0.948873043 1.42488265 1.37490714 -1.52933109 1.24217319 0.938002408 1.03232586 -1.39362621 1.00247037 0.507457972 -1.20266902 1.40047038 tensor_densebias0 7 -0.722284496 -0.529624403 0.764210701 -0.233725727 -0.359556615 -0.630548954 0.609221578 +-0.361304849 0.346294165 -0.263335586 -0.468054265 0.413890243 0.110662512 0.417303562 tensor_densekernel0 49 --0.0117151449 0.215292424 -0.0234739017 0.00105536217 0.0821127743 0.238448724 -0.0326735191 0.541053891 0.406676948 -0.104409121 0.978412688 0.349829167 -0.326305687 -0.323543102 -0.15426065 -0.651483655 -0.195591822 0.0372229479 -0.00857323688 -0.931888402 0.13227582 2.21336913 -1.43697155 1.93482685 -2.56313205 -0.80483675 -2.05880404 1.58560824 -1.35457683 0.665873885 -1.38273966 1.44111753 -1.70221281 0.0761312395 -0.932778478 2.55081105 -2.20607281 3.3390398 -3.3709774 -2.09288025 -2.10334516 3.26435852 0.229383811 -0.723667562 0.340755761 -0.141343623 -0.401876181 -0.393494844 0.892214894 -tensor_dense1kernel0 49 --0.991838694 1.20358372 1.53597522 1.15777254 -1.31489921 0.923312485 1.20099473 0.514366329 -0.530589104 -1.4272356 -1.44105768 0.500654638 -1.41453576 -1.31682372 -1.58864951 1.19073904 1.42839694 1.51448393 -1.20055389 1.01591957 1.32457709 1.03849721 -1.67175376 -1.26662505 -0.584386528 0.726290166 -0.878184378 -1.2526176 0.758100629 -0.306252301 -0.425617039 -0.73307091 0.227494672 0.204406887 0.155830532 1.18002975 -0.321701288 -0.485498995 -0.282102168 1.4067955 -1.21952736 -1.35681903 -1.6188513 0.706927598 1.63495719 1.00884712 -1.42083085 1.59898329 1.00649226 -tensor_dense3bias0 1 --0.385066271 -tensor_dense1bias0 7 -0.0608773492 -0.537909746 -0.39536196 -0.235204011 0.511781096 -0.235568658 -0.0105576282 -tensor_dense2kernel0 42 --1.4008733 -0.8848176 1.53826797 1.04104829 1.28910315 1.83825207 0.875014842 0.956438482 0.0641859621 -0.27782461 -0.225287825 -0.605817318 1.22979307 1.47419178 -0.758476496 -1.23763752 -1.21146119 -1.14878368 0.283652544 0.662472785 -1.10383689 -0.707927108 -1.44055927 -0.412708431 -1.45053887 -1.56932211 1.14952338 1.60565019 1.55148971 1.25131953 1.00861549 0.524758339 -1.32967794 -0.568487704 -1.58955598 -1.44846332 0.710721493 0.876535773 -1.38773823 -1.33408678 -0.570860624 -1.59157705 +0.0155180814 -0.336404949 0.207510427 0.0147298072 -0.0113955718 0.0188289993 -0.0244934019 0.344917029 0.141699627 -0.356320292 -0.217127264 0.355196327 -1.2297523 -0.147759229 -0.494986296 -0.198610842 0.311456352 -0.667917192 -0.312972933 -0.15098682 0.173432902 -2.36698198 2.05713868 -0.743156374 -2.75761318 1.89055014 2.89967942 2.56896305 0.886536777 -0.456248164 -0.708297551 0.872245014 -0.990960479 -0.721295536 -0.879552543 -3.53813672 2.66032934 -2.42037129 -3.16073012 2.80883861 2.52382708 3.08809662 -0.315910131 0.466234148 -0.746032357 -0.116098985 0.455625504 -0.21585533 0.677780628 diff --git a/TrkDiag/inc/trkqual.hxx b/TrkDiag/inc/trkqual.hxx index 90509f0b50..050ee3d27d 100644 --- a/TrkDiag/inc/trkqual.hxx +++ b/TrkDiag/inc/trkqual.hxx @@ -1,11 +1,11 @@ -//Code generated automatically by TMVA for Inference of Model file [trkqual.h5] at [Wed Sep 6 23:28:56 2023] +//Code generated automatically by TMVA for Inference of Model file [trkqual.h5] at [Tue Jan 9 22:41:10 2024] #ifndef TMVA_SOFIE_TRKQUAL #define TMVA_SOFIE_TRKQUAL #include -#include #include +#include #include "TMVA/SOFIE_common.hxx" #include @@ -18,46 +18,46 @@ namespace BLAS{ const float * beta, float * C, const int * ldc); }//BLAS struct Session { +std::vector fTensor_dense3bias0 = std::vector(1); +float * tensor_dense3bias0 = fTensor_dense3bias0.data(); std::vector fTensor_dense3kernel0 = std::vector(6); float * tensor_dense3kernel0 = fTensor_dense3kernel0.data(); std::vector fTensor_dense2bias0 = std::vector(6); float * tensor_dense2bias0 = fTensor_dense2bias0.data(); +std::vector fTensor_dense2kernel0 = std::vector(42); +float * tensor_dense2kernel0 = fTensor_dense2kernel0.data(); +std::vector fTensor_dense1bias0 = std::vector(7); +float * tensor_dense1bias0 = fTensor_dense1bias0.data(); +std::vector fTensor_dense1kernel0 = std::vector(49); +float * tensor_dense1kernel0 = fTensor_dense1kernel0.data(); std::vector fTensor_densebias0 = std::vector(7); float * tensor_densebias0 = fTensor_densebias0.data(); std::vector fTensor_densekernel0 = std::vector(49); float * tensor_densekernel0 = fTensor_densekernel0.data(); -std::vector fTensor_dense1kernel0 = std::vector(49); -float * tensor_dense1kernel0 = fTensor_dense1kernel0.data(); -std::vector fTensor_dense3bias0 = std::vector(1); -float * tensor_dense3bias0 = fTensor_dense3bias0.data(); -std::vector fTensor_dense1bias0 = std::vector(7); -float * tensor_dense1bias0 = fTensor_dense1bias0.data(); -std::vector fTensor_dense2kernel0 = std::vector(42); -float * tensor_dense2kernel0 = fTensor_dense2kernel0.data(); -std::vector fTensor_dense1Dense = std::vector(7); -float * tensor_dense1Dense = fTensor_dense1Dense.data(); -std::vector fTensor_denseSigmoid0 = std::vector(7); -float * tensor_denseSigmoid0 = fTensor_denseSigmoid0.data(); -std::vector fTensor_dense1Sigmoid0 = std::vector(7); -float * tensor_dense1Sigmoid0 = fTensor_dense1Sigmoid0.data(); std::vector fTensor_dense3Dense = std::vector(1); float * tensor_dense3Dense = fTensor_dense3Dense.data(); +std::vector fTensor_dense3bias0bcast = std::vector(1); +float * tensor_dense3bias0bcast = fTensor_dense3bias0bcast.data(); +std::vector fTensor_dense2Sigmoid0 = std::vector(6); +float * tensor_dense2Sigmoid0 = fTensor_dense2Sigmoid0.data(); +std::vector fTensor_dense2Dense = std::vector(6); +float * tensor_dense2Dense = fTensor_dense2Dense.data(); +std::vector fTensor_dense1Sigmoid0 = std::vector(7); +float * tensor_dense1Sigmoid0 = fTensor_dense1Sigmoid0.data(); +std::vector fTensor_dense3Sigmoid0 = std::vector(1); +float * tensor_dense3Sigmoid0 = fTensor_dense3Sigmoid0.data(); +std::vector fTensor_dense1Dense = std::vector(7); +float * tensor_dense1Dense = fTensor_dense1Dense.data(); std::vector fTensor_dense1bias0bcast = std::vector(7); float * tensor_dense1bias0bcast = fTensor_dense1bias0bcast.data(); -std::vector fTensor_densebias0bcast = std::vector(7); -float * tensor_densebias0bcast = fTensor_densebias0bcast.data(); +std::vector fTensor_denseSigmoid0 = std::vector(7); +float * tensor_denseSigmoid0 = fTensor_denseSigmoid0.data(); std::vector fTensor_denseDense = std::vector(7); float * tensor_denseDense = fTensor_denseDense.data(); std::vector fTensor_dense2bias0bcast = std::vector(6); float * tensor_dense2bias0bcast = fTensor_dense2bias0bcast.data(); -std::vector fTensor_dense2Dense = std::vector(6); -float * tensor_dense2Dense = fTensor_dense2Dense.data(); -std::vector fTensor_dense3Sigmoid0 = std::vector(1); -float * tensor_dense3Sigmoid0 = fTensor_dense3Sigmoid0.data(); -std::vector fTensor_dense2Sigmoid0 = std::vector(6); -float * tensor_dense2Sigmoid0 = fTensor_dense2Sigmoid0.data(); -std::vector fTensor_dense3bias0bcast = std::vector(1); -float * tensor_dense3bias0bcast = fTensor_dense3bias0bcast.data(); +std::vector fTensor_densebias0bcast = std::vector(7); +float * tensor_densebias0bcast = fTensor_densebias0bcast.data(); Session(std::string filename ="") { @@ -70,6 +70,17 @@ Session(std::string filename ="") { std::string tensor_name; int length; f >> tensor_name >> length; + if (tensor_name != "tensor_dense3bias0" ) { + std::string err_msg = "TMVA-SOFIE failed to read the correct tensor name; expected name is tensor_dense3bias0 , read " + tensor_name; + throw std::runtime_error(err_msg); + } + if (length != 1) { + std::string err_msg = "TMVA-SOFIE failed to read the correct tensor size; expected size is 1 , read " + std::to_string(length) ; + throw std::runtime_error(err_msg); + } + for (int i =0; i < length; ++i) + f >> tensor_dense3bias0[i]; + f >> tensor_name >> length; if (tensor_name != "tensor_dense3kernel0" ) { std::string err_msg = "TMVA-SOFIE failed to read the correct tensor name; expected name is tensor_dense3kernel0 , read " + tensor_name; throw std::runtime_error(err_msg); @@ -92,27 +103,27 @@ Session(std::string filename ="") { for (int i =0; i < length; ++i) f >> tensor_dense2bias0[i]; f >> tensor_name >> length; - if (tensor_name != "tensor_densebias0" ) { - std::string err_msg = "TMVA-SOFIE failed to read the correct tensor name; expected name is tensor_densebias0 , read " + tensor_name; + if (tensor_name != "tensor_dense2kernel0" ) { + std::string err_msg = "TMVA-SOFIE failed to read the correct tensor name; expected name is tensor_dense2kernel0 , read " + tensor_name; throw std::runtime_error(err_msg); } - if (length != 7) { - std::string err_msg = "TMVA-SOFIE failed to read the correct tensor size; expected size is 7 , read " + std::to_string(length) ; + if (length != 42) { + std::string err_msg = "TMVA-SOFIE failed to read the correct tensor size; expected size is 42 , read " + std::to_string(length) ; throw std::runtime_error(err_msg); } for (int i =0; i < length; ++i) - f >> tensor_densebias0[i]; + f >> tensor_dense2kernel0[i]; f >> tensor_name >> length; - if (tensor_name != "tensor_densekernel0" ) { - std::string err_msg = "TMVA-SOFIE failed to read the correct tensor name; expected name is tensor_densekernel0 , read " + tensor_name; + if (tensor_name != "tensor_dense1bias0" ) { + std::string err_msg = "TMVA-SOFIE failed to read the correct tensor name; expected name is tensor_dense1bias0 , read " + tensor_name; throw std::runtime_error(err_msg); } - if (length != 49) { - std::string err_msg = "TMVA-SOFIE failed to read the correct tensor size; expected size is 49 , read " + std::to_string(length) ; + if (length != 7) { + std::string err_msg = "TMVA-SOFIE failed to read the correct tensor size; expected size is 7 , read " + std::to_string(length) ; throw std::runtime_error(err_msg); } for (int i =0; i < length; ++i) - f >> tensor_densekernel0[i]; + f >> tensor_dense1bias0[i]; f >> tensor_name >> length; if (tensor_name != "tensor_dense1kernel0" ) { std::string err_msg = "TMVA-SOFIE failed to read the correct tensor name; expected name is tensor_dense1kernel0 , read " + tensor_name; @@ -125,19 +136,8 @@ Session(std::string filename ="") { for (int i =0; i < length; ++i) f >> tensor_dense1kernel0[i]; f >> tensor_name >> length; - if (tensor_name != "tensor_dense3bias0" ) { - std::string err_msg = "TMVA-SOFIE failed to read the correct tensor name; expected name is tensor_dense3bias0 , read " + tensor_name; - throw std::runtime_error(err_msg); - } - if (length != 1) { - std::string err_msg = "TMVA-SOFIE failed to read the correct tensor size; expected size is 1 , read " + std::to_string(length) ; - throw std::runtime_error(err_msg); - } - for (int i =0; i < length; ++i) - f >> tensor_dense3bias0[i]; - f >> tensor_name >> length; - if (tensor_name != "tensor_dense1bias0" ) { - std::string err_msg = "TMVA-SOFIE failed to read the correct tensor name; expected name is tensor_dense1bias0 , read " + tensor_name; + if (tensor_name != "tensor_densebias0" ) { + std::string err_msg = "TMVA-SOFIE failed to read the correct tensor name; expected name is tensor_densebias0 , read " + tensor_name; throw std::runtime_error(err_msg); } if (length != 7) { @@ -145,18 +145,18 @@ Session(std::string filename ="") { throw std::runtime_error(err_msg); } for (int i =0; i < length; ++i) - f >> tensor_dense1bias0[i]; + f >> tensor_densebias0[i]; f >> tensor_name >> length; - if (tensor_name != "tensor_dense2kernel0" ) { - std::string err_msg = "TMVA-SOFIE failed to read the correct tensor name; expected name is tensor_dense2kernel0 , read " + tensor_name; + if (tensor_name != "tensor_densekernel0" ) { + std::string err_msg = "TMVA-SOFIE failed to read the correct tensor name; expected name is tensor_densekernel0 , read " + tensor_name; throw std::runtime_error(err_msg); } - if (length != 42) { - std::string err_msg = "TMVA-SOFIE failed to read the correct tensor size; expected size is 42 , read " + std::to_string(length) ; + if (length != 49) { + std::string err_msg = "TMVA-SOFIE failed to read the correct tensor size; expected size is 49 , read " + std::to_string(length) ; throw std::runtime_error(err_msg); } for (int i =0; i < length; ++i) - f >> tensor_dense2kernel0[i]; + f >> tensor_densekernel0[i]; f.close(); { float * data = TMVA::Experimental::SOFIE::UTILITY::UnidirectionalBroadcast(tensor_densebias0,{ 7 }, { 1 , 7 }); diff --git a/TrkDiag/src/TrackQuality_module.cc b/TrkDiag/src/TrackQuality_module.cc index 0be44cd6cd..97d165fc4f 100644 --- a/TrkDiag/src/TrackQuality_module.cc +++ b/TrkDiag/src/TrackQuality_module.cc @@ -38,7 +38,7 @@ namespace TMVA_SOFIE_trkqual { namespace mu2e { - class TrackQualityV2 : public art::EDProducer + class TrackQuality : public art::EDProducer { public: struct Config { @@ -50,7 +50,7 @@ namespace mu2e }; using Parameters = art::EDProducer::Table; - TrackQualityV2(const Parameters& conf); + TrackQuality(const Parameters& conf); private: void produce(art::Event& event) override; @@ -63,7 +63,7 @@ namespace mu2e }; - TrackQualityV2::TrackQualityV2(const Parameters& conf) : + TrackQuality::TrackQuality(const Parameters& conf) : art::EDProducer{conf}, _kalSeedTag(conf().kalSeedTag()), _printMVA(conf().printMVA()) @@ -72,7 +72,7 @@ namespace mu2e mva_ = std::make_shared("Offline/TrkDiag/data/trkqual.dat"); } - void TrackQualityV2::produce(art::Event& event ) { + void TrackQuality::produce(art::Event& event ) { // create output unique_ptr mvacol(new MVAResultCollection()); @@ -140,7 +140,7 @@ namespace mu2e } if ( (mvacol->size() != kalSeeds.size()) ) { - throw cet::exception("TrackQualityV2") << "KalSeed and MVAResult sizes are inconsistent (" << kalSeeds.size() << ", " << mvacol->size(); + throw cet::exception("TrackQuality") << "KalSeed and MVAResult sizes are inconsistent (" << kalSeeds.size() << ", " << mvacol->size(); } @@ -149,4 +149,4 @@ namespace mu2e } }// mu2e -DEFINE_ART_MODULE(mu2e::TrackQualityV2) +DEFINE_ART_MODULE(mu2e::TrackQuality) From 52fa44f881c21ce48c94f9a161bc1825aef78d10 Mon Sep 17 00:00:00 2001 From: Andrew Edmonds Date: Tue, 9 Jan 2024 18:48:57 -0600 Subject: [PATCH 051/213] Remove old TrkQual --- RecoDataProducts/inc/TrkQual.hh | 34 ---------------------------- RecoDataProducts/src/classes.h | 1 - RecoDataProducts/src/classes_def.xml | 4 ---- 3 files changed, 39 deletions(-) delete mode 100644 RecoDataProducts/inc/TrkQual.hh diff --git a/RecoDataProducts/inc/TrkQual.hh b/RecoDataProducts/inc/TrkQual.hh deleted file mode 100644 index 9e6354a6aa..0000000000 --- a/RecoDataProducts/inc/TrkQual.hh +++ /dev/null @@ -1,34 +0,0 @@ -// Detail class used to implement the MVAStruct for TrkQual, the track quality -// measure -// D. Brown, LBNL 1/30/2017 -// -#ifndef RecoDataProducts_TrkQual_hh -#define RecoDataProducts_TrkQual_hh -// -// -// Original author David Brown -// -// Mu2e includes -#include "Offline/GeneralUtilities/inc/MVAStruct.hh" -#include -#include -#include -namespace mu2e { - struct TrkQualDetail { -// enumerate the input varibles used in TrkQual. The order should match that used in -// the MVA configuration (XML). The names may optionally be required to match exactly what's in the -// MVA configuration - enum MVA_varindex { nactive=0, factive, log10fitcon, momerr, t0err, d0, rmax, - fdouble, fnullambig, fstraws, n_vars}; - typedef std::map map_type; - static std::string const& typeName(); - static std::map const& varNames(); - static std::string varName(MVA_varindex vindex); - constexpr static const char* cxname = "TrkQualCatalog"; - }; - // define the types - typedef MVAStruct TrkQual; - typedef std::vector TrkQualCollection; - -} -#endif diff --git a/RecoDataProducts/src/classes.h b/RecoDataProducts/src/classes.h index 5e2b251e2f..448e0e911c 100644 --- a/RecoDataProducts/src/classes.h +++ b/RecoDataProducts/src/classes.h @@ -53,7 +53,6 @@ #include "Offline/RecoDataProducts/inc/KalSeed.hh" #include "Offline/RecoDataProducts/inc/KalSeedAssns.hh" #include "Offline/RecoDataProducts/inc/TrkCaloHitPID.hh" -#include "Offline/RecoDataProducts/inc/TrkQual.hh" #include "Offline/RecoDataProducts/inc/RecoQual.hh" #include "Offline/RecoDataProducts/inc/AlgorithmID.hh" #include "KinKal/General/ParticleState.hh" diff --git a/RecoDataProducts/src/classes_def.xml b/RecoDataProducts/src/classes_def.xml index 903b7d3435..8754fcfe64 100644 --- a/RecoDataProducts/src/classes_def.xml +++ b/RecoDataProducts/src/classes_def.xml @@ -240,10 +240,6 @@ - - - - From 080a46d72eb421925a9114f0585eb603232e8f2d Mon Sep 17 00:00:00 2001 From: Rob Kutschke Date: Tue, 9 Jan 2024 20:31:02 -0600 Subject: [PATCH 052/213] Updates motivated by the comments in the review (PR 1169) --- Mu2eUtilities/inc/ReSeedByEventID.hh | 13 +++--- Mu2eUtilities/src/ReSeedByEventID.cc | 63 +++++++++++++++++++--------- 2 files changed, 52 insertions(+), 24 deletions(-) diff --git a/Mu2eUtilities/inc/ReSeedByEventID.hh b/Mu2eUtilities/inc/ReSeedByEventID.hh index 5aabfe90a1..8c276a30d1 100644 --- a/Mu2eUtilities/inc/ReSeedByEventID.hh +++ b/Mu2eUtilities/inc/ReSeedByEventID.hh @@ -3,30 +3,33 @@ // // Reseed a random engine using the event id and a user supplied salt. // +// Does not work with all CLHEP::RandomEngine concrete types. +// - see description in .cc file +// #include "Offline/SeedService/inc/SeedService.hh" #include "canvas/Persistency/Provenance/EventID.h" #include "art/Framework/Services/Optional/RandomNumberGenerator.h" -#include "CLHEP/Random/MixMaxRng.h" +#include "CLHEP/Random/RandomEngine.h" namespace mu2e { class ReSeedByEventID{ public: - ReSeedByEventID( CLHEP::HepRandomEngine& engine, SeedService::seed_t salt); + ReSeedByEventID( CLHEP::HepRandomEngine& engine, SeedService::seed_t salt, int verbosity=0 ); void reseed ( art::EventID const& id ) const; private: - CLHEP::MixMaxRng * _engine; // the engine to be reseeded - SeedService::seed_t _salt; // user supplied salt. + CLHEP::HepRandomEngine& engine_; // The engine to be reseeded + SeedService::seed_t salt_; // User supplied salt. + int verbosity_; // Control amount of printout; 0=none. }; } // namespace mu2e - #endif diff --git a/Mu2eUtilities/src/ReSeedByEventID.cc b/Mu2eUtilities/src/ReSeedByEventID.cc index 9373f2503e..6c4cf01cef 100644 --- a/Mu2eUtilities/src/ReSeedByEventID.cc +++ b/Mu2eUtilities/src/ReSeedByEventID.cc @@ -1,35 +1,60 @@ -#include "Offline/Mu2eUtilities/inc/ReSeedByEventID.hh" -//#include "art/Framework/EventProcessor/Scheduler.h" - -#include "art/Framework/Services/Registry/ServiceHandle.h" +// +// Reseed a random engine using the art::EventID and a user supplied salt. +// +// Notes: +// 1) The current algorithm requires an engine that can accept 4 seeds. +// We could adapt the algorithm to fewer seeds but have chosen not to +// unless and until it is needed. We know that the MixMaxRng engine +// does support up to 4 seeds and, for the foreseeable future, it is +// the only engine we plan to use. +// +// 2) We have not checked all CLHEP engines but we know that the following +// do NOT support 4 seeds: +// - HepJamesRandom +// - Ranlux64Engine +// - MTwistEngine +// +// 3) Because of 1 and 2 the c'tor whitelists only MixMaxRng. +// +// Fixme: The code may require maintenance if we change to a different engine type. +// +#include "Offline/Mu2eUtilities/inc/ReSeedByEventID.hh" #include "fhiclcpp/exception.h" #include #include namespace mu2e { - ReSeedByEventID::ReSeedByEventID( CLHEP::HepRandomEngine& engine, SeedService::seed_t salt):_salt(salt){ - std::string engineType{art::ServiceHandle{}->defaultEngineKind()}; - std::cout << "Kind: " << engineType << std::endl; + ReSeedByEventID::ReSeedByEventID( CLHEP::HepRandomEngine& engine, SeedService::seed_t salt, int verbosity) + :engine_(engine) + ,salt_{salt} + ,verbosity_{verbosity} + { + const std::string engineType{engine.name()}; + + if ( verbosity_ > 0 ){ + std::cout << "ReSeedbyEventID. Engine name: " << engineType << std::endl; + std::cout << " salt: " << salt_ << std::endl; + } + + // Only accept whitelisted engines. See notes above. if ( engineType != "MixMaxRng" ){ throw cet::exception("BADCONFIG") - << "ReSeedByEventID requires that RandomNumberGenerator::defaultEngineKind be MixMaxRng. It is: " << engineType << "\n"; + << "ReSeedByEventID requires that engine::name() be MixMaxRng. It is: " << engineType << "\n"; } - // Ideally only do this when the number of schedules is >1. - // The next line is not working. - //std::cout << "Threads: " << art::ServiceHandle{}->num_threads() << std::endl; - _engine = static_cast(&engine); + } void ReSeedByEventID::reseed ( art::EventID const& id ) const{ - std::cout << "Reseed: " << id << " " << _salt << std::endl; - std::array seeds; - seeds[0] = id.run(); - seeds[1] = id.subRun(); - seeds[2] = id.event(); - seeds[3] = _salt; - _engine->setSeeds( seeds.data(), seeds.size() ); + + if ( verbosity_ > 1 ){ + std::cout << "ReseedByEventID: " << id << std::endl; + } + + const std::array seeds{ id.run(), id.subRun(), id.event(), salt_}; + engine_.setSeeds( seeds.data(), seeds.size() ); + } } // end namespace mu2e From 7fe0c7c9db384c2914909bcd4dc85ba9995a898e Mon Sep 17 00:00:00 2001 From: Rob Kutschke Date: Tue, 9 Jan 2024 20:31:33 -0600 Subject: [PATCH 053/213] Forward module verbosity setting to the reseeder. --- EventGenerator/src/StoppedParticleReactionGun_module.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/EventGenerator/src/StoppedParticleReactionGun_module.cc b/EventGenerator/src/StoppedParticleReactionGun_module.cc index 371b5f2852..b5ae6f5b3e 100644 --- a/EventGenerator/src/StoppedParticleReactionGun_module.cc +++ b/EventGenerator/src/StoppedParticleReactionGun_module.cc @@ -102,7 +102,7 @@ namespace mu2e { , randomUnitSphere_(eng_) , stops_(eng_, pset.get("muonStops")) , doHistograms_ (pset.get("doHistograms",false ) ) - , reseeder_(eng_,seed_) + , reseeder_(eng_,seed_,verbosityLevel_) { produces(); From 397e99d8f02cc360da332cf8eadf54aac581b09d Mon Sep 17 00:00:00 2001 From: David Nathan Brown Date: Wed, 10 Jan 2024 00:38:44 -0600 Subject: [PATCH 054/213] Fix config for trigger tests --- Mu2eKinKal/test/TTTA.fcl | 17 +++++-- Mu2eKinKal/test/TTTA_noMC.fcl | 83 +++++++++++++++++++++++++++++++++++ 2 files changed, 97 insertions(+), 3 deletions(-) create mode 100644 Mu2eKinKal/test/TTTA_noMC.fcl diff --git a/Mu2eKinKal/test/TTTA.fcl b/Mu2eKinKal/test/TTTA.fcl index 7047c083aa..0e90bd9bdf 100644 --- a/Mu2eKinKal/test/TTTA.fcl +++ b/Mu2eKinKal/test/TTTA.fcl @@ -62,7 +62,7 @@ physics : { EndPath : [TADeMtpr, TADeMcpr, TADePtpr, TADePcpr] } #include "Offline/gen/fcl/Trigger/OnSpillTrigMenu/OnSpillTrigMenu.fcl" -physics.producers.EWMProducer.SpillType : 1 +#physics.producers.EWMProducer.SpillType : 1 #include "Production/JobConfig/common/epilog.fcl" #include "Production/JobConfig/reco/drop_trigger.fcl" physics.end_paths : [ EndPath ] @@ -96,9 +96,20 @@ physics.analyzers.TADePcpr.KalSeedMCAssns: "SelectRecoMCDePcpr" # ComboHitCollection. This setting works, but will slow down the trigger: don't use this script for timing studies physics.producers.TTmakeSH.FilterHits : false physics.producers.TTmakePH.TestFlag : true -#physics.producers.TTmakePH.FilterHits : true physics.producers.TTmakePH.StrawHitSelectionBits : ["EnergySelection","TimeSelection","RadiusSelection"] -physics.producers.TTmakePH.StrawHitMask : ["Dead","Noisy"] +physics.producers.TTmakePH.StrawHitMask : ["Dead"] services.TimeTracker.printSummary: true services.TFileService.fileName: "nts.owner.TTKKSeed.version.sequence.root" +# Mimic digitization config +# minimal BField map +services.GeometryService.bFieldFile : "Offline/Mu2eG4/geom/bfgeom_reco_v01.txt" +# setup proditions; as new proditions are added to the database this file MUST be updated or reco won't see them +services.ProditionsService.alignedTracker.useDb: true +services.ProditionsService.alignedTracker.verbose: 0 +services.ProditionsService.trackerStatus.Settings.useDb: true +services.ProditionsService.trackerStatus.Settings.verbose: 0 +services.ProditionsService.strawElectronics.useDb: true +services.ProditionsService.strawElectronics.verbose: 0 +# don't use database time offsets in digitization +services.ProditionsService.strawElectronics.overrideDbTimeOffsets : true diff --git a/Mu2eKinKal/test/TTTA_noMC.fcl b/Mu2eKinKal/test/TTTA_noMC.fcl new file mode 100644 index 0000000000..1fc186a62d --- /dev/null +++ b/Mu2eKinKal/test/TTTA_noMC.fcl @@ -0,0 +1,83 @@ + +# Run trigger and write TrkAna tree output +# To create a functional job you must add database purpose and version; ie create a fcl stub that #includes this file and +# adds (for instance): +# services.DbService.purpose: MDC2020_perfect +# services.DbService.version: v1_0 +# +#include "Offline/fcl/standardServices.fcl" +#include "Offline/Trigger/fcl/prolog_trigger.fcl" +#include "TrkAna/fcl/prolog_trigger.fcl" +process_name : OnSpillTrigger +services : @local::Services.Reco +source : { + module_type : RootInput +} + +physics : { + producers : { + @table::Trigger.producers + } + filters : { @table::Trigger.filters } + analyzers : { + @table::Trigger.analyzers + TADeMtpr : { + @table::TrkAnaTrigger.TrkAnaDeMTT + FitType : LoopHelix + FillMCInfo : false + } + + TADeMcpr : { + @table::TrkAnaTrigger.TrkAnaDeMTT + FitType : LoopHelix + FillMCInfo : false + } + TADePtpr : { + @table::TrkAnaTrigger.TrkAnaDePTT + FitType : LoopHelix + FillMCInfo : false + } + TADePcpr : { + @table::TrkAnaTrigger.TrkAnaDePTT + FitType : LoopHelix + FillMCInfo : false + } + } + EndPath : [TADeMtpr, TADeMcpr, TADePtpr, TADePcpr] +} +#include "Offline/gen/fcl/Trigger/OnSpillTrigMenu/OnSpillTrigMenu.fcl" +physics.producers.EWMProducer.SpillType : 1 +#include "Production/JobConfig/common/epilog.fcl" +#include "Production/JobConfig/reco/drop_trigger.fcl" +physics.end_paths : [ EndPath ] + +physics.analyzers.TADeMtpr.SelectEvents : [ tprDeM_highP_stopTarg_trigger ] +physics.analyzers.TADeMtpr.candidate.input : "TTKSF" +physics.analyzers.TADeMtpr.candidate.suffix : "DeM" + +physics.analyzers.TADeMcpr.SelectEvents : [ cprDeM_highP_stopTarg_trigger ] +physics.analyzers.TADeMcpr.candidate.input : "TTCalSeedFit" +physics.analyzers.TADeMcpr.candidate.suffix : "Dem" + +physics.analyzers.TADePtpr.SelectEvents : [ tprDeP_highP_stopTarg_trigger ] +physics.analyzers.TADePtpr.candidate.input : "TTKSF" +physics.analyzers.TADePtpr.candidate.suffix : "DeP" + +physics.analyzers.TADePcpr.SelectEvents : [ cprDeP_highP_stopTarg_trigger ] +physics.analyzers.TADePcpr.candidate.input : "TTCalSeedFit" +physics.analyzers.TADePcpr.candidate.suffix : "Dep" + +services.TimeTracker.printSummary: true +services.TFileService.fileName: "nts.owner.TTKKSeed.version.sequence.root" + +# minimal BField map +services.GeometryService.bFieldFile : "Offline/Mu2eG4/geom/bfgeom_reco_v01.txt" +# setup proditions; as new proditions are added to the database this file MUST be updated or reco won't see them +services.ProditionsService.alignedTracker.useDb: true +services.ProditionsService.alignedTracker.verbose: 0 +services.ProditionsService.trackerStatus.Settings.useDb: true +services.ProditionsService.trackerStatus.Settings.verbose: 0 +services.ProditionsService.strawElectronics.useDb: true +services.ProditionsService.strawElectronics.verbose: 0 +# don't use database time offsets in digitization +services.ProditionsService.strawElectronics.overrideDbTimeOffsets : true From b8e6eadf30950555c1ef36b2999e9507461a076d Mon Sep 17 00:00:00 2001 From: Andrew Edmonds Date: Wed, 10 Jan 2024 15:23:23 -0600 Subject: [PATCH 055/213] Remove TrkQual.cc --- RecoDataProducts/src/TrkQual.cc | 35 --------------------------------- 1 file changed, 35 deletions(-) delete mode 100644 RecoDataProducts/src/TrkQual.cc diff --git a/RecoDataProducts/src/TrkQual.cc b/RecoDataProducts/src/TrkQual.cc deleted file mode 100644 index 1b97dbc677..0000000000 --- a/RecoDataProducts/src/TrkQual.cc +++ /dev/null @@ -1,35 +0,0 @@ -#include "Offline/RecoDataProducts/inc/TrkQual.hh" -namespace mu2e { - std::string const& TrkQualDetail::typeName() { - static std::string type("TrkQual"); - return type; - } - - std::map const& TrkQualDetail::varNames() { - static std::map varnames; - if(varnames.size()==0){ - varnames[std::string("NActiveHits")] = TrkQualDetail::nactive; - varnames[std::string("ActiveHitFraction")] = TrkQualDetail::factive; - varnames[std::string("Log10FitCon")] = TrkQualDetail::log10fitcon; - varnames[std::string("MomError")] = TrkQualDetail::momerr; - varnames[std::string("T0Error")] = TrkQualDetail::t0err; - varnames[std::string("d0")] = TrkQualDetail::d0; - varnames[std::string("MaxRadius")] = TrkQualDetail::rmax; - varnames[std::string("DoubleHitFraction")] = TrkQualDetail::fdouble; - varnames[std::string("NullAmbigHitFraction")]= TrkQualDetail::fnullambig; - varnames[std::string("StrawHitFraction")] = TrkQualDetail::fstraws; - } - return varnames; - } - - std::string TrkQualDetail::varName(MVA_varindex vindex) { - static std::string nullret("Unknown"); - std::map const& varnames = varNames(); - for(const auto& ivar : varnames) { - if(ivar.second == vindex){ - return ivar.first; - } - } - return nullret; - } -} From 00c937c5fcc0e3e81a9fd81934c8b2fbb7655e98 Mon Sep 17 00:00:00 2001 From: Andrew Edmonds Date: Wed, 10 Jan 2024 15:24:02 -0600 Subject: [PATCH 056/213] Remove TrkQualFilter module --- Filters/src/TrkQualFilter_module.cc | 101 ---------------------------- 1 file changed, 101 deletions(-) delete mode 100644 Filters/src/TrkQualFilter_module.cc diff --git a/Filters/src/TrkQualFilter_module.cc b/Filters/src/TrkQualFilter_module.cc deleted file mode 100644 index 5b164b4beb..0000000000 --- a/Filters/src/TrkQualFilter_module.cc +++ /dev/null @@ -1,101 +0,0 @@ - -// ====================================================================== -// -// TrkQualFilter_module: allows filtering on the TrkQual -// when given a cut efficiency -// -// ====================================================================== - -#include "art/Framework/Core/EDFilter.h" -#include "art/Framework/Principal/Event.h" -#include "art/Framework/Services/Registry/ServiceHandle.h" -#include "fhiclcpp/ParameterSet.h" - -#include "art/Framework/Principal/Handle.h" - -// Mu2e includes. -#include "Offline/RecoDataProducts/inc/TrkQual.hh" -#include "Offline/Mu2eUtilities/inc/MVATools.hh" -#include "Offline/ProditionsService/inc/ProditionsHandle.hh" -#include "Offline/AnalysisConditions/inc/TrkQualCatalog.hh" - -#include -#include - -using namespace std; -namespace mu2e { - - class TrkQualFilter : public art::EDFilter { - public: - struct Config { - using Name=fhicl::Name; - using Comment=fhicl::Comment; - - fhicl::Atom trainName{Name("trainName"), Comment("TrkQual algorithm name")}; - fhicl::Atom trkHypo{Name("trkHypo"), Comment("Track fit hypothesis (e.g. DeM)")}; - fhicl::Atom effRequest{Name("effRequest"), Comment("Cut efficiency requested")}; - }; - - using Parameters = art::EDFilter::Table; - explicit TrkQualFilter(const Parameters& conf); - - private: - bool beginRun(art::Run& run) override; - bool endRun(art::Run& run) override; - bool filter(art::Event& event) override; - - mu2e::ProditionsHandle _trkQualCatalogH; - - std::string _trainName; - std::string _trkHypo; - float _effRequest; - - art::InputTag _inputTag; - }; - - TrkQualFilter::TrkQualFilter(const Parameters& conf): - art::EDFilter{conf}, - _trainName(conf().trainName()), - _trkHypo(conf().trkHypo()), - _effRequest(conf().effRequest()) - { - _inputTag = _trainName + _trkHypo; - } - - bool TrkQualFilter::beginRun(art::Run& run) { - return true; - } - bool TrkQualFilter::endRun(art::Run& run) { - return true; - } - - bool TrkQualFilter::filter(art::Event& event) { - - // Get the training we want from the catalog - TrkQualCatalog const& trkQualCatalog = _trkQualCatalogH.get(event.id()); - TrkQualEntry const& trkQualEntry = trkQualCatalog.find(_trainName); - - // Get the cut we want - float trkQualCut = trkQualEntry.getCutVal(1 - _effRequest); - - auto trkQualCollsH = event.getValidHandle(_inputTag); - - bool pass = false; - for(const auto& i_trkQual : *trkQualCollsH) { - // std::cout << _trainName << " = " << i_trkQual.MVAOutput() << std::endl; - - if (i_trkQual.MVAOutput() >= trkQualCut) { - pass = true; - } - } - // std::cout << "Passed? " << pass << std::endl; - - if (pass) { - return true; - } - return false; - } -} - -using mu2e::TrkQualFilter; -DEFINE_ART_MODULE(TrkQualFilter) From 1a9c2b54874746c65b484761203a71127d957597 Mon Sep 17 00:00:00 2001 From: Andrew Edmonds Date: Wed, 10 Jan 2024 16:27:32 -0600 Subject: [PATCH 057/213] Revert "Remove TrkQualFilter module" This reverts commit 00c937c5fcc0e3e81a9fd81934c8b2fbb7655e98. --- Filters/src/TrkQualFilter_module.cc | 101 ++++++++++++++++++++++++++++ 1 file changed, 101 insertions(+) create mode 100644 Filters/src/TrkQualFilter_module.cc diff --git a/Filters/src/TrkQualFilter_module.cc b/Filters/src/TrkQualFilter_module.cc new file mode 100644 index 0000000000..5b164b4beb --- /dev/null +++ b/Filters/src/TrkQualFilter_module.cc @@ -0,0 +1,101 @@ + +// ====================================================================== +// +// TrkQualFilter_module: allows filtering on the TrkQual +// when given a cut efficiency +// +// ====================================================================== + +#include "art/Framework/Core/EDFilter.h" +#include "art/Framework/Principal/Event.h" +#include "art/Framework/Services/Registry/ServiceHandle.h" +#include "fhiclcpp/ParameterSet.h" + +#include "art/Framework/Principal/Handle.h" + +// Mu2e includes. +#include "Offline/RecoDataProducts/inc/TrkQual.hh" +#include "Offline/Mu2eUtilities/inc/MVATools.hh" +#include "Offline/ProditionsService/inc/ProditionsHandle.hh" +#include "Offline/AnalysisConditions/inc/TrkQualCatalog.hh" + +#include +#include + +using namespace std; +namespace mu2e { + + class TrkQualFilter : public art::EDFilter { + public: + struct Config { + using Name=fhicl::Name; + using Comment=fhicl::Comment; + + fhicl::Atom trainName{Name("trainName"), Comment("TrkQual algorithm name")}; + fhicl::Atom trkHypo{Name("trkHypo"), Comment("Track fit hypothesis (e.g. DeM)")}; + fhicl::Atom effRequest{Name("effRequest"), Comment("Cut efficiency requested")}; + }; + + using Parameters = art::EDFilter::Table; + explicit TrkQualFilter(const Parameters& conf); + + private: + bool beginRun(art::Run& run) override; + bool endRun(art::Run& run) override; + bool filter(art::Event& event) override; + + mu2e::ProditionsHandle _trkQualCatalogH; + + std::string _trainName; + std::string _trkHypo; + float _effRequest; + + art::InputTag _inputTag; + }; + + TrkQualFilter::TrkQualFilter(const Parameters& conf): + art::EDFilter{conf}, + _trainName(conf().trainName()), + _trkHypo(conf().trkHypo()), + _effRequest(conf().effRequest()) + { + _inputTag = _trainName + _trkHypo; + } + + bool TrkQualFilter::beginRun(art::Run& run) { + return true; + } + bool TrkQualFilter::endRun(art::Run& run) { + return true; + } + + bool TrkQualFilter::filter(art::Event& event) { + + // Get the training we want from the catalog + TrkQualCatalog const& trkQualCatalog = _trkQualCatalogH.get(event.id()); + TrkQualEntry const& trkQualEntry = trkQualCatalog.find(_trainName); + + // Get the cut we want + float trkQualCut = trkQualEntry.getCutVal(1 - _effRequest); + + auto trkQualCollsH = event.getValidHandle(_inputTag); + + bool pass = false; + for(const auto& i_trkQual : *trkQualCollsH) { + // std::cout << _trainName << " = " << i_trkQual.MVAOutput() << std::endl; + + if (i_trkQual.MVAOutput() >= trkQualCut) { + pass = true; + } + } + // std::cout << "Passed? " << pass << std::endl; + + if (pass) { + return true; + } + return false; + } +} + +using mu2e::TrkQualFilter; +DEFINE_ART_MODULE(TrkQualFilter) From c7eb4b19810542d02449afd87d3551e79293632b Mon Sep 17 00:00:00 2001 From: Andrew Edmonds Date: Wed, 10 Jan 2024 16:27:47 -0600 Subject: [PATCH 058/213] Revert "Remove TrkQual.cc" This reverts commit b8e6eadf30950555c1ef36b2999e9507461a076d. --- RecoDataProducts/src/TrkQual.cc | 35 +++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100644 RecoDataProducts/src/TrkQual.cc diff --git a/RecoDataProducts/src/TrkQual.cc b/RecoDataProducts/src/TrkQual.cc new file mode 100644 index 0000000000..1b97dbc677 --- /dev/null +++ b/RecoDataProducts/src/TrkQual.cc @@ -0,0 +1,35 @@ +#include "Offline/RecoDataProducts/inc/TrkQual.hh" +namespace mu2e { + std::string const& TrkQualDetail::typeName() { + static std::string type("TrkQual"); + return type; + } + + std::map const& TrkQualDetail::varNames() { + static std::map varnames; + if(varnames.size()==0){ + varnames[std::string("NActiveHits")] = TrkQualDetail::nactive; + varnames[std::string("ActiveHitFraction")] = TrkQualDetail::factive; + varnames[std::string("Log10FitCon")] = TrkQualDetail::log10fitcon; + varnames[std::string("MomError")] = TrkQualDetail::momerr; + varnames[std::string("T0Error")] = TrkQualDetail::t0err; + varnames[std::string("d0")] = TrkQualDetail::d0; + varnames[std::string("MaxRadius")] = TrkQualDetail::rmax; + varnames[std::string("DoubleHitFraction")] = TrkQualDetail::fdouble; + varnames[std::string("NullAmbigHitFraction")]= TrkQualDetail::fnullambig; + varnames[std::string("StrawHitFraction")] = TrkQualDetail::fstraws; + } + return varnames; + } + + std::string TrkQualDetail::varName(MVA_varindex vindex) { + static std::string nullret("Unknown"); + std::map const& varnames = varNames(); + for(const auto& ivar : varnames) { + if(ivar.second == vindex){ + return ivar.first; + } + } + return nullret; + } +} From a016c0d21d5dc7dd6bb3e4a31f62484f61e8d0ae Mon Sep 17 00:00:00 2001 From: Andrew Edmonds Date: Wed, 10 Jan 2024 16:27:57 -0600 Subject: [PATCH 059/213] Revert "Remove old TrkQual" This reverts commit 52fa44f881c21ce48c94f9a161bc1825aef78d10. --- RecoDataProducts/inc/TrkQual.hh | 34 ++++++++++++++++++++++++++++ RecoDataProducts/src/classes.h | 1 + RecoDataProducts/src/classes_def.xml | 4 ++++ 3 files changed, 39 insertions(+) create mode 100644 RecoDataProducts/inc/TrkQual.hh diff --git a/RecoDataProducts/inc/TrkQual.hh b/RecoDataProducts/inc/TrkQual.hh new file mode 100644 index 0000000000..9e6354a6aa --- /dev/null +++ b/RecoDataProducts/inc/TrkQual.hh @@ -0,0 +1,34 @@ +// Detail class used to implement the MVAStruct for TrkQual, the track quality +// measure +// D. Brown, LBNL 1/30/2017 +// +#ifndef RecoDataProducts_TrkQual_hh +#define RecoDataProducts_TrkQual_hh +// +// +// Original author David Brown +// +// Mu2e includes +#include "Offline/GeneralUtilities/inc/MVAStruct.hh" +#include +#include +#include +namespace mu2e { + struct TrkQualDetail { +// enumerate the input varibles used in TrkQual. The order should match that used in +// the MVA configuration (XML). The names may optionally be required to match exactly what's in the +// MVA configuration + enum MVA_varindex { nactive=0, factive, log10fitcon, momerr, t0err, d0, rmax, + fdouble, fnullambig, fstraws, n_vars}; + typedef std::map map_type; + static std::string const& typeName(); + static std::map const& varNames(); + static std::string varName(MVA_varindex vindex); + constexpr static const char* cxname = "TrkQualCatalog"; + }; + // define the types + typedef MVAStruct TrkQual; + typedef std::vector TrkQualCollection; + +} +#endif diff --git a/RecoDataProducts/src/classes.h b/RecoDataProducts/src/classes.h index 448e0e911c..5e2b251e2f 100644 --- a/RecoDataProducts/src/classes.h +++ b/RecoDataProducts/src/classes.h @@ -53,6 +53,7 @@ #include "Offline/RecoDataProducts/inc/KalSeed.hh" #include "Offline/RecoDataProducts/inc/KalSeedAssns.hh" #include "Offline/RecoDataProducts/inc/TrkCaloHitPID.hh" +#include "Offline/RecoDataProducts/inc/TrkQual.hh" #include "Offline/RecoDataProducts/inc/RecoQual.hh" #include "Offline/RecoDataProducts/inc/AlgorithmID.hh" #include "KinKal/General/ParticleState.hh" diff --git a/RecoDataProducts/src/classes_def.xml b/RecoDataProducts/src/classes_def.xml index 8754fcfe64..903b7d3435 100644 --- a/RecoDataProducts/src/classes_def.xml +++ b/RecoDataProducts/src/classes_def.xml @@ -240,6 +240,10 @@ + + + + From 87983abca314ec7112af06f491d4e2ee8902e252 Mon Sep 17 00:00:00 2001 From: Andrew Edmonds Date: Thu, 11 Jan 2024 07:50:42 -0600 Subject: [PATCH 060/213] Update classes.h and classes_def.xml for new MVAResult data product --- RecoDataProducts/src/classes.h | 1 + RecoDataProducts/src/classes_def.xml | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/RecoDataProducts/src/classes.h b/RecoDataProducts/src/classes.h index 5e2b251e2f..48dbb5c11e 100644 --- a/RecoDataProducts/src/classes.h +++ b/RecoDataProducts/src/classes.h @@ -57,6 +57,7 @@ #include "Offline/RecoDataProducts/inc/RecoQual.hh" #include "Offline/RecoDataProducts/inc/AlgorithmID.hh" #include "KinKal/General/ParticleState.hh" +#include "Offline/RecoDataProducts/inc/MVAResult.hh" // extrapolation and PID #include "Offline/RecoDataProducts/inc/TrkCaloIntersect.hh" diff --git a/RecoDataProducts/src/classes_def.xml b/RecoDataProducts/src/classes_def.xml index 903b7d3435..e356a90ea6 100644 --- a/RecoDataProducts/src/classes_def.xml +++ b/RecoDataProducts/src/classes_def.xml @@ -245,6 +245,10 @@ + + + + From 6db7e33e03cee906c0bb2e732aba61e370d472e7 Mon Sep 17 00:00:00 2001 From: Andrew Edmonds Date: Thu, 11 Jan 2024 08:03:53 -0600 Subject: [PATCH 061/213] Add reference to the TrkQual repo --- TrkDiag/inc/trkqual.hxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/TrkDiag/inc/trkqual.hxx b/TrkDiag/inc/trkqual.hxx index 050ee3d27d..9770694d24 100644 --- a/TrkDiag/inc/trkqual.hxx +++ b/TrkDiag/inc/trkqual.hxx @@ -1,5 +1,5 @@ //Code generated automatically by TMVA for Inference of Model file [trkqual.h5] at [Tue Jan 9 22:41:10 2024] - +//from TrkQual repository commit ee3082b #ifndef TMVA_SOFIE_TRKQUAL #define TMVA_SOFIE_TRKQUAL From 778a36b76c6a3e3f6d4bff7af24918d5ecdede19 Mon Sep 17 00:00:00 2001 From: Andrew Edmonds Date: Thu, 11 Jan 2024 08:05:10 -0600 Subject: [PATCH 062/213] Fix typo --- RecoDataProducts/inc/MVAResult.hh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/RecoDataProducts/inc/MVAResult.hh b/RecoDataProducts/inc/MVAResult.hh index 875033dac0..652c9607d8 100644 --- a/RecoDataProducts/inc/MVAResult.hh +++ b/RecoDataProducts/inc/MVAResult.hh @@ -1,5 +1,5 @@ // -// A datsa product that stores the result of any MVA/ML/AI algorithm +// A data product that stores the result of any MVA/ML/AI algorithm // #ifndef RecoDataProducts_MVAResult_hh #define RecoDataProducts_MVAResult_hh From 7be7b916816d2cdf3aef9f107ff026445bed17d7 Mon Sep 17 00:00:00 2001 From: Andrew Edmonds Date: Fri, 12 Jan 2024 08:11:26 -0600 Subject: [PATCH 063/213] Add .dat filename as a fhicl parameter for TrkQual --- TrkDiag/src/TrackQuality_module.cc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/TrkDiag/src/TrackQuality_module.cc b/TrkDiag/src/TrackQuality_module.cc index 97d165fc4f..1b57fc18f0 100644 --- a/TrkDiag/src/TrackQuality_module.cc +++ b/TrkDiag/src/TrackQuality_module.cc @@ -47,6 +47,7 @@ namespace mu2e fhicl::Atom kalSeedTag{Name("KalSeedCollection"), Comment("Input tag for KalSeedCollection")}; fhicl::Atom printMVA{Name("PrintMVA"), Comment("Print the MVA used"), false}; + fhicl::Atom datFilename{Name("datFilename"), Comment("Filename for the .dat file to use")}; }; using Parameters = art::EDProducer::Table; @@ -69,7 +70,7 @@ namespace mu2e _printMVA(conf().printMVA()) { produces(); - mva_ = std::make_shared("Offline/TrkDiag/data/trkqual.dat"); + mva_ = std::make_shared(conf().datFilename()); } void TrackQuality::produce(art::Event& event ) { From 949ee9a1dabde5114ad1083e35b7c2108ad0c77a Mon Sep 17 00:00:00 2001 From: Andrew Edmonds Date: Fri, 12 Jan 2024 14:23:32 -0600 Subject: [PATCH 064/213] New naming convention for TrkQual --- TrkDiag/data/TrkQual_ANN1_v1.dat | 16 ++++++++++++++++ TrkDiag/data/trkqual.dat | 16 ---------------- TrkDiag/inc/{trkqual.hxx => TrkQual_ANN1.hxx} | 16 ++++++++-------- TrkDiag/src/TrackQuality_module.cc | 8 ++++---- 4 files changed, 28 insertions(+), 28 deletions(-) create mode 100644 TrkDiag/data/TrkQual_ANN1_v1.dat delete mode 100644 TrkDiag/data/trkqual.dat rename TrkDiag/inc/{trkqual.hxx => TrkQual_ANN1.hxx} (97%) diff --git a/TrkDiag/data/TrkQual_ANN1_v1.dat b/TrkDiag/data/TrkQual_ANN1_v1.dat new file mode 100644 index 0000000000..3f237e5dd3 --- /dev/null +++ b/TrkDiag/data/TrkQual_ANN1_v1.dat @@ -0,0 +1,16 @@ +tensor_dense3bias0 1 +-0.424803168 +tensor_dense3kernel0 6 +-1.98095334 1.45180643 1.49335742 -2.25372267 1.99527287 1.14000666 +tensor_dense2bias0 6 +-0.0921958834 -0.285061151 -0.00404837774 0.136575237 0.164348036 -0.315189987 +tensor_dense2kernel0 42 +-0.687387109 1.18203032 0.863452911 -1.58470762 1.32770205 1.36319494 -1.47433138 0.852655113 1.2555759 -1.50712752 0.869478345 1.54452336 0.711414695 -0.673189163 -0.203240335 1.02384281 -1.01741076 -0.3898004 1.50701749 -0.685749888 -1.12794423 1.27402556 -0.956788361 -0.686280906 1.46994889 -0.707586467 -1.54622042 1.04188931 -1.43561339 -0.793891251 0.612892628 -1.44158125 -1.28485799 1.02058625 -0.924627602 -1.87253153 -1.25663829 1.56433475 1.44435573 -1.11196816 0.914256513 1.15154648 +tensor_dense1bias0 7 +0.416312307 0.314409077 -0.235093832 -0.135591686 -0.324452847 -0.20022136 0.31202805 +tensor_dense1kernel0 49 +-0.0146598723 0.888370931 -0.755939364 -0.561069846 -0.252060384 -0.749444962 0.117405936 1.73620772 0.633452594 -0.332557112 -1.52039349 -1.42090476 -1.21904039 0.882354021 0.746907532 1.58177781 -0.968557537 -0.421127915 -0.611237705 -0.54907012 1.17700016 1.58385122 0.930429637 -0.477171451 -1.01961577 -1.22647667 -1.23314524 1.42929935 -2.17276669 -2.2288146 1.17808247 1.9100703 1.72020841 2.04141903 -1.83160782 -0.463691205 -0.175126776 0.981729507 1.11601329 1.02592492 0.531932652 -0.663913786 -0.552701116 -1.30059052 1.29542708 0.701381683 1.25613642 1.31930149 -0.655066311 +tensor_densebias0 7 +-0.301657736 -0.400045246 0.428035617 -0.458279192 0.593620598 0.425152212 0.209052876 +tensor_densekernel0 49 +-0.00493748765 0.0103018489 -0.0561244227 -0.00230371486 -0.0345752798 -0.14342846 -0.364501029 0.837447703 0.542056501 1.38004231 0.617134809 -0.248045892 -0.083536081 -0.00106377422 0.312017083 0.314557523 0.0599239469 -0.357592314 0.710677683 0.0867987573 -0.466073185 -1.5648396 -2.2531631 -2.50073504 -2.3475244 3.30675173 1.36607146 1.65340233 -0.632683277 0.840957761 1.73297632 0.705030978 -1.11206055 0.920394301 -1.56178057 -2.82700706 -3.25727367 -2.12523413 -3.45275545 3.30469871 3.54369211 2.2784977 -0.341225892 -0.598022401 0.615682721 0.0924013183 0.797239602 0.330301166 0.674686849 diff --git a/TrkDiag/data/trkqual.dat b/TrkDiag/data/trkqual.dat deleted file mode 100644 index 997f231e85..0000000000 --- a/TrkDiag/data/trkqual.dat +++ /dev/null @@ -1,16 +0,0 @@ -tensor_dense3bias0 1 -0.587221324 -tensor_dense3kernel0 6 --1.40627837 2.23227358 -1.00061452 -1.49567473 2.04384661 -1.38098133 -tensor_dense2bias0 6 --0.594108224 0.512368977 -0.727252364 -0.556245744 0.498881936 -0.539055884 -tensor_dense2kernel0 42 -0.7638852 -1.50310206 1.09058321 1.07911074 -0.578849375 0.300788283 1.181669 -0.589241266 1.33228993 1.08477175 -1.70363271 1.2537899 -1.37801969 1.92823339 -1.75989687 -1.66138411 1.62074387 -1.58146 1.48242605 -1.20689857 1.07226562 0.535363734 -1.3911401 0.895950615 0.213210642 -0.0132599706 0.411829829 0.6407004 -0.0642847568 0.761666 -1.97384024 1.22328043 -1.97858596 -1.98268294 1.75599766 -2.03176832 0.402680814 -0.4603526 0.752630591 1.00772011 -0.13332215 0.981812596 -tensor_dense1bias0 7 --0.0202047937 -0.327160925 0.636472046 -0.428551614 -0.593366683 0.801567733 -0.851719916 -tensor_dense1kernel0 49 --2.02546692 -1.63345146 1.74172997 -1.73552132 -0.609668553 1.43329179 -0.917290509 1.13824141 1.32516873 -1.24296522 0.541016459 0.797366738 -1.22736979 0.967306495 -0.983426273 -0.800588608 0.680314958 -0.769506872 -0.536953509 0.728172719 -0.541960061 -1.4391191 -1.69875264 0.829871714 -1.73984098 -1.04288161 1.36317575 -1.6682117 0.608907223 0.446370661 -0.606059253 1.03537273 0.182477683 -0.776726484 0.490121126 1.35274875 1.58658373 -0.948873043 1.42488265 1.37490714 -1.52933109 1.24217319 0.938002408 1.03232586 -1.39362621 1.00247037 0.507457972 -1.20266902 1.40047038 -tensor_densebias0 7 --0.361304849 0.346294165 -0.263335586 -0.468054265 0.413890243 0.110662512 0.417303562 -tensor_densekernel0 49 -0.0155180814 -0.336404949 0.207510427 0.0147298072 -0.0113955718 0.0188289993 -0.0244934019 0.344917029 0.141699627 -0.356320292 -0.217127264 0.355196327 -1.2297523 -0.147759229 -0.494986296 -0.198610842 0.311456352 -0.667917192 -0.312972933 -0.15098682 0.173432902 -2.36698198 2.05713868 -0.743156374 -2.75761318 1.89055014 2.89967942 2.56896305 0.886536777 -0.456248164 -0.708297551 0.872245014 -0.990960479 -0.721295536 -0.879552543 -3.53813672 2.66032934 -2.42037129 -3.16073012 2.80883861 2.52382708 3.08809662 -0.315910131 0.466234148 -0.746032357 -0.116098985 0.455625504 -0.21585533 0.677780628 diff --git a/TrkDiag/inc/trkqual.hxx b/TrkDiag/inc/TrkQual_ANN1.hxx similarity index 97% rename from TrkDiag/inc/trkqual.hxx rename to TrkDiag/inc/TrkQual_ANN1.hxx index 9770694d24..b15b393231 100644 --- a/TrkDiag/inc/trkqual.hxx +++ b/TrkDiag/inc/TrkQual_ANN1.hxx @@ -1,7 +1,7 @@ -//Code generated automatically by TMVA for Inference of Model file [trkqual.h5] at [Tue Jan 9 22:41:10 2024] -//from TrkQual repository commit ee3082b -#ifndef TMVA_SOFIE_TRKQUAL -#define TMVA_SOFIE_TRKQUAL +//Code generated automatically by TMVA for Inference of Model file [TrkQual_ANN1.h5] at [Fri Jan 12 14:02:22 2024] + +#ifndef TMVA_SOFIE_TRKQUAL_ANN1 +#define TMVA_SOFIE_TRKQUAL_ANN1 #include #include @@ -9,7 +9,7 @@ #include "TMVA/SOFIE_common.hxx" #include -namespace TMVA_SOFIE_trkqual{ +namespace TMVA_SOFIE_TrkQual_ANN1{ namespace BLAS{ extern "C" void sgemv_(const char * trans, const int * m, const int * n, const float * alpha, const float * A, const int * lda, const float * X, const int * incx, const float * beta, const float * Y, const int * incy); @@ -61,7 +61,7 @@ float * tensor_densebias0bcast = fTensor_densebias0bcast.data(); Session(std::string filename ="") { - if (filename.empty()) filename = "trkqual.dat"; + if (filename.empty()) filename = "TrkQual_ANN1.dat"; std::ifstream f; f.open(filename); if (!f.is_open()){ @@ -249,6 +249,6 @@ std::vector infer(float* tensor_denseinput){ return ret; } }; -} //TMVA_SOFIE_trkqual +} //TMVA_SOFIE_TrkQual_ANN1 -#endif // TMVA_SOFIE_TRKQUAL +#endif // TMVA_SOFIE_TRKQUAL_ANN1 diff --git a/TrkDiag/src/TrackQuality_module.cc b/TrkDiag/src/TrackQuality_module.cc index 1b57fc18f0..adc399f7f8 100644 --- a/TrkDiag/src/TrackQuality_module.cc +++ b/TrkDiag/src/TrackQuality_module.cc @@ -20,7 +20,7 @@ // data #include "Offline/RecoDataProducts/inc/KalSeed.hh" #include "Offline/RecoDataProducts/inc/MVAResult.hh" -#include "Offline/TrkDiag/inc/trkqual.hxx" +#include "Offline/TrkDiag/inc/TrkQual_ANN1.hxx" // C++ #include #include @@ -32,7 +32,7 @@ using namespace std; using CLHEP::Hep3Vector; using CLHEP::HepVector; -namespace TMVA_SOFIE_trkqual { +namespace TMVA_SOFIE_TrkQual_ANN1 { class Session; } namespace mu2e @@ -60,7 +60,7 @@ namespace mu2e art::InputTag _kalSeedTag; bool _printMVA; - std::shared_ptr mva_; + std::shared_ptr mva_; }; @@ -70,7 +70,7 @@ namespace mu2e _printMVA(conf().printMVA()) { produces(); - mva_ = std::make_shared(conf().datFilename()); + mva_ = std::make_shared(conf().datFilename()); } void TrackQuality::produce(art::Event& event ) { From 957efa9a0fa546b84e5f82370d95cef4de7df4a6 Mon Sep 17 00:00:00 2001 From: ehrlich-uva Date: Sat, 13 Jan 2024 09:30:02 -0600 Subject: [PATCH 065/213] moved to a channel-by-channel CRV photon yield variation split Wideband geometries into two versions --- CRVConditions/data/scintyield_nominal.txt | 27522 ++++++++++++---- .../data/scintyield_wideband4modules.txt | 1282 +- CRVConditions/inc/CRVScintYield.hh | 2 +- CRVConditions/inc/CRVScintYieldMaker.hh | 2 +- CRVConditions/src/CRVScintYieldMaker.cc | 30 +- CRVConfig/inc/CRVScintYieldConfig.hh | 2 +- CRVResponse/fcl/prolog_v11.fcl | 8 +- CRVResponse/inc/MakeCrvPhotons.hh | 13 +- CRVResponse/src/CrvPhotonGenerator_module.cc | 59 +- CRVResponse/src/MakeCrvPhotons.cc | 11 +- CRVResponse/test/randomDeadChannels.py | 22 + CRVResponse/test/randomScintDeviation.py | 14 + .../test/wideband/wideband4modules.fcl | 6 +- DbTables/inc/CRVScint.hh | 24 +- .../fcl/EventDisplayWideband4modules.fcl | 2 +- Mu2eG4/geom/geom_Wideband4modules_v1.txt | 91 + ...dules.txt => geom_Wideband4modules_v2.txt} | 0 ProditionsService/inc/ProditionsService.hh | 2 +- 18 files changed, 23255 insertions(+), 5837 deletions(-) create mode 100644 CRVResponse/test/randomDeadChannels.py create mode 100644 CRVResponse/test/randomScintDeviation.py create mode 100644 Mu2eG4/geom/geom_Wideband4modules_v1.txt rename Mu2eG4/geom/{geom_Wideband4modules.txt => geom_Wideband4modules_v2.txt} (100%) diff --git a/CRVConditions/data/scintyield_nominal.txt b/CRVConditions/data/scintyield_nominal.txt index 6a6725c204..e108704bff 100644 --- a/CRVConditions/data/scintyield_nominal.txt +++ b/CRVConditions/data/scintyield_nominal.txt @@ -1,5506 +1,22018 @@ TABLE CRVScint -#counter,scintYieldDeviation -0,-0.40817829 -1,0.478392983 -2,-1.742534815 -3,-1.083696214 -4,-0.232897289 -5,-1.133704616 -6,0.708299822 -7,-0.255976244 -8,0.454536537 -9,0.34589287 -10,-0.914151313 -11,-0.219176211 -12,1.540090237 -13,-0.06729041 -14,0.750185173 -15,-1.252525599 -16,1.881276793 -17,1.08307137 -18,0.403799169 -19,-0.66013052 -20,0.996921357 -21,-0.466640679 -22,-0.147430802 -23,0.465758366 -24,1.472209636 -25,-0.089248445 -26,0.077041903 -27,0.812045767 -28,0.116082738 -29,2.444925959 -30,-0.643804806 -31,0.197596893 -32,0.496921984 -33,1.855947974 -34,0.073004041 -35,-0.766896413 -36,-1.120294518 -37,-1.285900187 -38,1.462787967 -39,-0.175869471 -40,0.576923821 -41,-0.241021451 -42,-1.135892295 -43,0.006762617 -44,-1.656346974 -45,-1.072041249 -46,0.179748625 -47,0.272906454 -48,0.014156971 -49,-0.046374193 -50,0.006439565 -51,-0.644237792 -52,-0.007830788 -53,0.293738714 -54,0.918094334 -55,0.723697415 -56,0.06599502 -57,0.843457846 -58,-0.156088783 -59,0.768268835 -60,-1.049871276 -61,-0.053859518 -62,-0.472876414 -63,-0.657052687 -64,-0.670193813 -65,-0.056785721 -66,-0.437127642 -67,1.138593278 -68,0.367129055 -69,-0.681090652 -70,0.320863282 -71,-1.284949167 -72,-0.512218056 -73,1.001620998 -74,0.381645129 -75,1.462008713 -76,-0.639059588 -77,0.871553559 -78,0.161576853 -79,0.165354377 -80,-0.803663752 -81,-0.114701532 -82,0.491418645 -83,1.292607075 -84,-0.979921489 -85,0.973688432 -86,1.594841866 -87,0.371110412 -88,-0.27214148 -89,-1.915335772 -90,-0.041963719 -91,0.262880908 -92,-0.689180237 -93,0.246577909 -94,1.19357776 -95,0.542303852 -96,-0.654314151 -97,0.786000959 -98,-0.704262875 -99,-0.072265143 -100,0.208576412 -101,1.296570941 -102,-0.063855034 -103,0.159200191 -104,0.925960111 -105,-2.042826473 -106,2.075169182 -107,-0.222235 -108,1.35332452 -109,-0.002027946 -110,0.397365683 -111,0.354055184 -112,0.511771393 -113,-0.457738167 -114,1.155370009 -115,-0.115781727 -116,-0.840449092 -117,0.321826222 -118,-0.461556427 -119,-1.19008102 -120,0.401419897 -121,0.560289182 -122,-0.162565747 -123,0.331663265 -124,-0.313720184 -125,-1.389663479 -126,0.617972175 -127,-0.610932716 -128,0.15998996 -129,1.471532457 -130,-0.166092867 -131,-0.507920517 -132,0.338036954 -133,-1.40898172 -134,1.270972215 -135,-0.144821609 -136,-1.965002639 -137,-0.765306087 -138,0.577112948 -139,-0.714690883 -140,1.673938548 -141,1.283248438 -142,0.111830082 -143,0.393560045 -144,-0.704160562 -145,-0.892621182 -146,-0.288656835 -147,1.833763681 -148,-0.089292317 -149,0.916267188 -150,-0.780835161 -151,0.097099476 -152,1.386262532 -153,-0.094783916 -154,-1.715879581 -155,0.053034023 -156,-2.41327277 -157,1.000076796 -158,-0.67093874 -159,0.239788482 -160,0.465575947 -161,-0.897566218 -162,0.285623216 -163,-0.760963944 -164,-1.023673817 -165,-1.391641336 -166,-0.242148271 -167,0.590555063 -168,0.464393322 -169,-1.486813908 -170,0.394357776 -171,0.902535297 -172,-1.452469922 -173,0.178071392 -174,-0.371711772 -175,1.204077962 -176,-0.80514245 -177,-0.07796681 -178,-0.39354941 -179,-2.089904828 -180,-0.816150506 -181,-1.129655392 -182,-0.03139441 -183,0.8896484 -184,-0.652208727 -185,-0.397336115 -186,1.971118498 -187,1.701910592 -188,0.285792663 -189,-1.738091689 -190,-0.789743994 -191,-0.691520263 -192,-1.313018844 -193,-0.319232912 -194,0.83927878 -195,1.306147453 -196,1.98204058 -197,0.047865666 -198,-0.359924628 -199,0.696814511 -200,-0.005355014 -201,0.69741095 -202,0.146527025 -203,-1.380544453 -204,-1.429810506 -205,-0.407681799 -206,-1.528747625 -207,-0.166433636 -208,1.29328001 -209,2.034089345 -210,-0.16133237 -211,-1.333930035 -212,0.791834757 -213,-0.632238067 -214,-0.130231195 -215,0.349612982 -216,1.609446664 -217,-0.327849039 -218,-0.492717167 -219,1.299194 -220,-0.718527533 -221,-0.671708083 -222,1.60457056 -223,-0.867398704 -224,-1.109376665 -225,-1.145681704 -226,-0.679705033 -227,0.175969876 -228,-0.362956639 -229,1.135676944 -230,-0.685920146 -231,2.015346083 -232,0.207859477 -233,-0.200225515 -234,1.477822045 -235,0.22662747 -236,-1.270463891 -237,0.791715611 -238,0.344362716 -239,0.162729038 -240,0.372231898 -241,0.896106612 -242,-0.218775195 -243,-1.020718808 -244,0.965974581 -245,-0.76316394 -246,0.989352797 -247,1.718669209 -248,0.714001118 -249,-0.631049114 -250,0.735906505 -251,-0.249884282 -252,-0.969527779 -253,-0.439858992 -254,0.549916092 -255,-0.80050398 -256,-0.007173449 -257,0.337081613 -258,-0.824920031 -259,-0.816768181 -260,0.750262061 -261,-0.235735143 -262,-0.22671651 -263,-3.598685709 -264,-0.603896547 -265,-0.918996661 -266,0.083725271 -267,-0.374561747 -268,0.128729223 -269,0.987346053 -270,0.463799907 -271,-0.189384207 -272,0.985258405 -273,-1.880686458 -274,1.044747837 -275,1.29596539 -276,0.402672632 -277,1.492778169 -278,-0.803917017 -279,-1.034641198 -280,0.981203806 -281,-0.660412132 -282,1.093230086 -283,1.966852642 -284,0.623320561 -285,-1.297070085 -286,-1.513156965 -287,-1.506313331 -288,0.782545524 -289,0.42223614 -290,0.491447819 -291,-0.281510694 -292,1.277226115 -293,2.430401532 -294,0.446400491 -295,0.540262692 -296,-1.075688065 -297,-0.235786505 -298,-0.478864332 -299,-0.903800053 -300,0.201118785 -301,1.569425999 -302,0.052632657 -303,0.0737852 -304,1.574754064 -305,1.708556757 -306,-0.945417094 -307,-0.919766343 -308,0.367834016 -309,-1.41656582 -310,-0.942703944 -311,-1.597649742 -312,-1.221793136 -313,-0.091048807 -314,-0.159959852 -315,-0.0945729 -316,-0.506960088 -317,-0.506600418 -318,-0.042309861 -319,0.108956613 -320,-0.740256487 -321,0.71892811 -322,0.639832891 -323,0.231096989 -324,-1.448288062 -325,-0.232538077 -326,0.451084331 -327,-1.129972612 -328,-0.925244464 -329,0.671033429 -330,-0.013699547 -331,0.37986812 -332,1.876547013 -333,-0.706833619 -334,-1.069362693 -335,-1.640067097 -336,1.398416277 -337,-0.135849532 -338,-1.346438346 -339,-1.123148453 -340,1.686222942 -341,1.088895858 -342,-2.252108515 -343,-0.50804387 -344,-0.868431963 -345,1.639235192 -346,-1.420850609 -347,0.208936207 -348,-1.224200566 -349,-1.198681876 -350,-0.169580381 -351,0.361655672 -352,0.355273744 -353,-0.891657883 -354,-0.8431633 -355,-1.354371215 -356,-0.695650114 -357,1.061889469 -358,2.663483452 -359,0.349782459 -360,-1.209229394 -361,0.857416615 -362,-2.018092274 -363,1.249161024 -364,-0.126798794 -365,0.591033873 -366,-1.383067924 -367,-0.766158209 -368,-2.434720992 -369,-0.256693854 -370,-0.513582614 -371,-1.132831948 -372,-1.626955527 -373,-0.586142211 -374,-0.627314412 -375,0.583642122 -376,-1.912341781 -377,0.531838994 -378,0.095109225 -379,0.825036959 -380,0.305629479 -381,0.901661477 -382,0.930229399 -383,-1.451734065 -384,-0.019167851 -385,-0.857555306 -386,0.62476235 -387,-0.108405838 -388,0.847971532 -389,0.150492485 -390,-1.499164749 -391,-1.252682326 -392,0.322090398 -393,-1.791399574 -394,0.36534036 -395,0.168156081 -396,2.187935725 -397,0.493622527 -398,-2.164658004 -399,0.429179819 -400,1.128738376 -401,0.57112014 -402,0.751289368 -403,0.237764392 -404,0.156336249 -405,-1.172503726 -406,0.124471277 -407,0.240969704 -408,0.340211275 -409,-0.688639062 -410,-0.525581499 -411,0.181308277 -412,-0.152190427 -413,0.234399096 -414,-0.356869582 -415,0.171580914 -416,0.007592873 -417,-0.222287777 -418,0.167471356 -419,-0.462522062 -420,1.410863253 -421,0.722440127 -422,0.113289924 -423,-0.600614512 -424,-0.451435579 -425,-1.017313286 -426,-1.935903983 -427,-1.546858607 -428,-0.873229479 -429,-0.376859264 -430,0.649852145 -431,0.80894471 -432,-0.327801591 -433,0.304385153 -434,-0.304533303 -435,1.276705627 -436,-0.027770761 -437,-1.235226816 -438,1.061579542 -439,-0.94525643 -440,-0.76941479 -441,-0.128521269 -442,-0.433950796 -443,0.522838545 -444,1.205259074 -445,-0.219641106 -446,0.203870662 -447,0.178030848 -448,0.209347925 -449,-0.30159478 -450,-0.043044237 -451,-0.533813332 -452,-1.810757436 -453,-0.441292798 -454,1.163546923 -455,1.299749945 -456,-1.434587089 -457,0.451181103 -458,0.438376104 -459,-1.374459478 -460,0.11327561 -461,-1.239754095 -462,1.546861783 -463,-0.637626567 -464,-0.114131288 -465,0.979243329 -466,-0.157315999 -467,-0.442128219 -468,-0.025893066 -469,-0.433617986 -470,1.671640906 -471,-1.622366828 -472,1.404832042 -473,-1.063861096 -474,2.161709457 -475,0.049639699 -476,1.51225222 -477,-0.550773322 -478,-0.257415964 -479,-0.682554441 -480,-0.468611624 -481,1.554563487 -482,-0.170478644 -483,0.264716362 -484,-0.893563766 -485,1.159447915 -486,-0.253864548 -487,-1.117871833 -488,-2.185740376 -489,0.954521305 -490,0.59686098 -491,-0.793813165 -492,1.030006636 -493,1.461714818 -494,0.132094129 -495,0.865087306 -496,-1.472636144 -497,-0.539615336 -498,-1.469294956 -499,0.912733252 -500,-0.391309858 -501,-1.168845754 -502,-0.806736797 -503,-0.404089799 -504,-1.540185184 -505,-1.767002434 -506,0.663998772 -507,-1.454712691 -508,1.425962241 -509,0.782423134 -510,-0.740757154 -511,0.595286257 -512,0.134637496 -513,2.578358839 -514,0.09152125 -515,-0.053789907 -516,-0.370613331 -517,-1.110013413 -518,-2.403927782 -519,-0.098904264 -520,0.828388134 -521,-0.825051385 -522,-1.230015752 -523,-0.645880054 -524,-2.541147657 -525,1.027155794 -526,-1.667358644 -527,-1.489350918 -528,0.543879625 -529,-0.250101217 -530,-0.112506545 -531,-0.209420648 -532,-0.978524575 -533,0.755472556 -534,0.341013971 -535,-1.497376768 -536,0.080087475 -537,-0.749711372 -538,-1.64000224 -539,-0.167107535 -540,0.004185846 -541,-0.155373135 -542,-1.365282024 -543,1.361840672 -544,0.767380681 -545,0.493340231 -546,0.190095848 -547,-0.337414847 -548,-2.123060698 -549,0.955275299 -550,1.292901768 -551,-0.892889521 -552,1.733825488 -553,-0.87948169 -554,1.629570594 -555,-0.218710121 -556,-0.795968474 -557,0.530006508 -558,0.704284118 -559,0.664833628 -560,0.162944275 -561,-0.284845639 -562,0.308158758 -563,-0.288345332 -564,0.655204196 -565,-1.181856987 -566,-0.074884278 -567,-0.398693821 -568,-0.222166949 -569,0.527886889 -570,0.083287081 -571,-0.246896772 -572,-0.170832777 -573,1.154731064 -574,0.591964162 -575,1.392098058 -576,0.218055687 -577,0.636735352 -578,1.541503302 -579,0.999613871 -580,0.202605363 -581,0.939956723 -582,1.000186593 -583,-0.240155865 -584,0.295551159 -585,0.74048749 -586,-1.439617809 -587,0.118706766 -588,0.594744012 -589,1.722054042 -590,0.489825424 -591,-0.092664198 -592,-0.680533742 -593,-0.469737581 -594,-0.067692992 -595,1.167395322 -596,0.201747 -597,0.616967618 -598,0.998306676 -599,-1.048928338 -600,-0.347045525 -601,-0.233624793 -602,1.123764665 -603,0.397226241 -604,-0.909629124 -605,-0.234925804 -606,-1.788441902 -607,1.279679247 -608,-1.109477821 -609,-0.018903912 -610,-0.68746781 -611,-0.671901556 -612,-0.052222561 -613,-0.869001512 -614,-0.337248664 -615,1.632154158 -616,-0.295247325 -617,-0.258880892 -618,-1.72130832 -619,-0.68778214 -620,0.036159231 -621,0.05256995 -622,0.940174893 -623,-1.193094796 -624,1.663449246 -625,0.258785087 -626,0.581005652 -627,0.762503521 -628,0.356692957 -629,-1.080818544 -630,-0.07031834 -631,0.595463915 -632,0.455518127 -633,1.96603051 -634,0.073907432 -635,-0.289688525 -636,-1.840958407 -637,0.893614709 -638,0.550093903 -639,0.755860038 -640,0.018454385 -641,0.933447213 -642,-0.567725712 -643,1.197038265 -644,0.602571488 -645,0.195618355 -646,0.719440491 -647,-0.659338014 -648,-1.076215359 -649,0.091023268 -650,0.46921017 -651,-0.755383047 -652,-0.1230986 -653,1.588710283 -654,-1.389073456 -655,-0.11151737 -656,0.192231755 -657,-2.043651215 -658,-0.111809254 -659,0.230804304 -660,1.007710776 -661,-0.555359258 -662,-0.441639334 -663,-0.633874035 -664,-0.821842231 -665,0.09165612 -666,-0.660005061 -667,1.055079926 -668,-0.166575857 -669,0.272196461 -670,-0.061539148 -671,-0.727852311 -672,1.100451237 -673,-1.577325611 -674,1.045756062 -675,-0.254034436 -676,-1.105164769 -677,-0.269249796 -678,1.015424679 -679,0.613318548 -680,0.846277458 -681,0.010022539 -682,0.176280886 -683,-0.517314589 -684,0.992052652 -685,-1.232270627 -686,1.299484472 -687,-0.333518509 -688,0.305436466 -689,0.085244298 -690,0.016435911 -691,1.197102966 -692,-0.015089566 -693,-0.250898876 -694,-0.302505612 -695,-1.100841257 -696,0.48287465 -697,-1.289820991 -698,0.241767276 -699,-0.119440054 -700,1.636230338 -701,1.152146097 -702,0.738968908 -703,0.692557456 -704,-2.232255027 -705,0.296724487 -706,0.840617841 -707,0.745429364 -708,1.33412023 -709,-0.005944921 -710,-0.129184773 -711,-0.234458954 -712,0.217480124 -713,1.267159028 -714,2.175116992 -715,-2.201152258 -716,-0.33942274 -717,0.096710859 -718,-0.633170941 -719,-0.636234471 -720,0.892496671 -721,1.59868153 -722,0.065696794 -723,0.282764337 -724,-0.271991956 -725,0.593142464 -726,0.100120025 -727,-0.370996664 -728,0.883862334 -729,1.485580957 -730,-0.59616712 -731,-0.568912718 -732,0.524385698 -733,0.451609845 -734,-0.606268461 -735,0.864337844 -736,1.020480535 -737,-2.357786698 -738,-0.202855646 -739,-0.849218475 -740,1.996351215 -741,-1.002299113 -742,1.516448329 -743,-1.452860765 -744,-0.254657958 -745,0.737933316 -746,-0.589838214 -747,0.7409136 -748,-1.296411485 -749,-0.739207171 -750,1.138745393 -751,0.123214344 -752,0.951328888 -753,-0.177091543 -754,-0.720588245 -755,-0.19962583 -756,-1.874827648 -757,-0.655913352 -758,1.024948508 -759,0.469592199 -760,0.200475613 -761,0.82728868 -762,-0.16783238 -763,1.251092866 -764,0.212660434 -765,1.163521737 -766,-0.40153073 -767,-0.057714041 -768,-1.896381051 -769,0.177032416 -770,1.236664107 -771,-0.668385154 -772,-0.770261634 -773,-1.16976461 -774,0.266803696 -775,0.440262378 -776,-0.121910544 -777,0.136322053 -778,1.089066083 -779,0.407867876 -780,-1.45196584 -781,-0.278712815 -782,-0.509610234 -783,0.796739865 -784,0.539129462 -785,0.05746158 -786,-0.216251817 -787,-1.814003009 -788,-0.365340871 -789,2.214868148 -790,0.566108846 -791,0.936565245 -792,-1.189589254 -793,-0.986350374 -794,0.155470474 -795,-1.554888019 -796,-0.273918213 -797,-0.307934556 -798,-0.457824476 -799,0.202462726 -800,-3.175025979 -801,0.548640432 -802,0.116826298 -803,1.180811134 -804,0.451055487 -805,-1.266309149 -806,1.723407882 -807,-0.042608481 -808,1.229444465 -809,-0.643137922 -810,0.964370281 -811,0.710242436 -812,-1.220085161 -813,-2.166899516 -814,0.264803761 -815,0.327529541 -816,-0.169957863 -817,1.315324053 -818,-0.453293354 -819,0.416298175 -820,-0.990935085 -821,-0.402273032 -822,-0.829099869 -823,0.32478979 -824,0.131468938 -825,-0.379226882 -826,-2.148095208 -827,1.035119613 -828,0.754191621 -829,0.676846841 -830,0.85845341 -831,-0.879590795 -832,-1.951119491 -833,-0.110559706 -834,-1.110239586 -835,-0.190721178 -836,-0.83027826 -837,-0.752211541 -838,2.034310157 -839,0.402540729 -840,-0.208695415 -841,-0.950694547 -842,0.256601111 -843,-0.455376298 -844,-0.60310613 -845,-1.793646022 -846,0.829557646 -847,-0.791057837 -848,-1.899389653 -849,-1.099887394 -850,0.026796951 -851,-1.514549482 -852,-0.586713481 -853,0.99705945 -854,0.959315757 -855,1.25034976 -856,-1.16878592 -857,-0.667069606 -858,-1.579041371 -859,0.040176692 -860,0.60487061 -861,-0.940286835 -862,-0.538320001 -863,-1.193365671 -864,-0.455553912 -865,0.910838393 -866,-0.251964964 -867,0.448587078 -868,0.135504416 -869,0.687892069 -870,0.638019132 -871,-0.018456708 -872,0.274689724 -873,0.40887214 -874,-1.179969433 -875,0.283026883 -876,3.087218729 -877,-0.451392778 -878,0.423858692 -879,-0.540938796 -880,-1.749824515 -881,0.077586406 -882,2.023628921 -883,-0.581871436 -884,0.200526641 -885,-1.189717647 -886,-1.799677244 -887,0.533139951 -888,0.107560763 -889,-0.640006975 -890,-0.737604847 -891,0.219374116 -892,-1.470183266 -893,0.063090485 -894,0.3914926 -895,-1.388051647 -896,-0.384079169 -897,-0.468936587 -898,0.462593719 -899,-1.924058459 -900,-0.661081588 -901,-1.162045364 -902,0.09952754 -903,0.768493746 -904,-1.384360789 -905,-1.0138134 -906,-1.158703776 -907,-1.09925696 -908,-1.107000694 -909,0.499786447 -910,0.980860924 -911,1.185146646 -912,-1.619800103 -913,-0.535515967 -914,-0.858969246 -915,0.433054164 -916,1.863839658 -917,-0.685876169 -918,-0.230871159 -919,-1.041282449 -920,-0.13618303 -921,-1.509019783 -922,-0.7717079 -923,-0.914726305 -924,1.043613471 -925,-1.155323778 -926,1.130107495 -927,-0.760193584 -928,-1.527621444 -929,-1.492480158 -930,-1.060350786 -931,1.225162106 -932,0.788020282 -933,-1.51445339 -934,-0.569732944 -935,1.269920886 -936,0.90172626 -937,-0.454543515 -938,1.968361845 -939,-0.83088489 -940,1.231898389 -941,0.115089214 -942,0.98054965 -943,-0.08497517 -944,0.172532076 -945,-0.586410712 -946,0.488030929 -947,-0.354560333 -948,-0.524640337 -949,0.875235713 -950,-1.80066288 -951,-0.5433488 -952,-0.042017393 -953,0.010123254 -954,0.665051144 -955,-0.346399864 -956,1.014648131 -957,-1.309139529 -958,0.945424576 -959,-2.274990431 -960,0.857203277 -961,-1.734511036 -962,-0.214231882 -963,0.069040172 -964,0.499696463 -965,1.751805468 -966,-1.934838999 -967,0.868537001 -968,1.993929646 -969,1.289449949 -970,-1.346159819 -971,-0.119857301 -972,-1.392234599 -973,-1.847802164 -974,0.132086576 -975,-0.544655756 -976,-1.544663227 -977,-0.978524974 -978,0.853515988 -979,-0.76411176 -980,0.922356277 -981,-0.691962126 -982,-0.505797514 -983,-1.253027945 -984,0.653974757 -985,-0.006938417 -986,0.583247767 -987,0.875126182 -988,-0.593246275 -989,-1.079829845 -990,0.632460724 -991,0.292908205 -992,1.138572513 -993,0.128196834 -994,0.451834506 -995,-0.289878141 -996,-0.286428037 -997,0.981708857 -998,0.330752265 -999,0.242769886 -1000,-0.046242412 -1001,-1.667095837 -1002,1.109577126 -1003,0.428346419 -1004,1.252683943 -1005,-0.519526528 -1006,1.224797559 -1007,-0.452932113 -1008,-1.046709043 -1009,0.259965391 -1010,-0.180581981 -1011,0.353443118 -1012,-0.035358412 -1013,-0.475674329 -1014,0.623160639 -1015,0.949165294 -1016,0.73871055 -1017,-0.115008363 -1018,-2.458177145 -1019,-0.710933855 -1020,-1.486111657 -1021,0.435511517 -1022,1.329449326 -1023,-0.501262987 -1024,0.533116789 -1025,2.381095032 -1026,0.115332848 -1027,0.973568788 -1028,-0.990546519 -1029,-0.247974338 -1030,0.842200348 -1031,0.178305568 -1032,-0.314906385 -1033,-0.365744661 -1034,-1.07586073 -1035,1.715035276 -1036,-0.60791999 -1037,-0.998417203 -1038,-0.551783364 -1039,-0.409248905 -1040,1.250273822 -1041,-0.03074491 -1042,0.13130747 -1043,-0.081369789 -1044,0.369134878 -1045,-0.71544035 -1046,1.244631371 -1047,-2.221847734 -1048,1.239702984 -1049,0.124467318 -1050,-0.212782307 -1051,-0.784561886 -1052,0.273051474 -1053,2.624219146 -1054,-1.599611716 -1055,0.847414958 -1056,1.004690093 -1057,-1.627508396 -1058,-1.627715576 -1059,-0.675471817 -1060,0.719215303 -1061,-0.302387992 -1062,-0.354503346 -1063,-0.798509939 -1064,0.605321883 -1065,-1.151204487 -1066,-0.395348361 -1067,-0.337198082 -1068,0.442261016 -1069,0.806729101 -1070,0.566165461 -1071,-0.964650991 -1072,0.097885979 -1073,-0.383678739 -1074,-0.203305827 -1075,2.399086941 -1076,0.46802039 -1077,-0.368524292 -1078,-0.00123323 -1079,-2.081473443 -1080,-0.831735787 -1081,0.598808941 -1082,-0.914394328 -1083,1.331837553 -1084,-1.775535867 -1085,1.569073099 -1086,0.217903061 -1087,0.24253345 -1088,1.192479096 -1089,-1.291163631 -1090,0.990729396 -1091,1.11204799 -1092,-0.229879811 -1093,1.075350718 -1094,0.279536145 -1095,-0.260321907 -1096,-1.089290051 -1097,0.157330229 -1098,0.009980245 -1099,-0.083448858 -1100,0.402603278 -1101,-0.539672316 -1102,-0.533767979 -1103,1.05877514 -1104,-0.925822074 -1105,0.768700115 -1106,-0.35953064 -1107,-1.189120444 -1108,0.257771941 -1109,-1.009946645 -1110,-0.524662014 -1111,0.420524896 -1112,0.192894438 -1113,-1.870173502 -1114,0.570067204 -1115,-0.070077086 -1116,0.659360217 -1117,-1.026177747 -1118,-0.236328394 -1119,1.477863367 -1120,0.193574107 -1121,0.772045519 -1122,-0.177649883 -1123,0.870319409 -1124,-0.017479783 -1125,-0.279022644 -1126,0.382275018 -1127,1.170667539 -1128,-0.681747014 -1129,1.10589659 -1130,0.841060309 -1131,1.591777309 -1132,0.818406551 -1133,-1.666236147 -1134,-0.961683822 -1135,-0.051205459 -1136,-0.389347296 -1137,0.563939745 -1138,0.354430876 -1139,-0.572624045 -1140,0.147987887 -1141,-0.412815136 -1142,-1.06582087 -1143,1.836254736 -1144,0.463943038 -1145,1.13771502 -1146,-0.153029104 -1147,-0.959472032 -1148,-2.068088862 -1149,0.048530295 -1150,-1.728815368 -1151,0.372674982 -1152,-0.290707981 -1153,-0.945096374 -1154,-0.061804855 -1155,-0.116466267 -1156,-1.085773245 -1157,-0.262111809 -1158,0.060013621 -1159,2.899127783 -1160,-0.421866764 -1161,-0.152853994 -1162,-1.638545701 -1163,-0.965774522 -1164,-0.92247946 -1165,0.585327482 -1166,0.624676644 -1167,2.635646603 -1168,0.25656422 -1169,-0.950483428 -1170,0.249221233 -1171,-0.045452541 -1172,0.655135529 -1173,-0.966235162 -1174,-0.032343467 -1175,-1.168263955 -1176,0.798316045 -1177,1.778180435 -1178,-0.289597257 -1179,-1.184519876 -1180,-0.254802016 -1181,0.650184902 -1182,0.863137128 -1183,-0.373119283 -1184,-0.215473475 -1185,-1.158731067 -1186,-1.217574457 -1187,-0.756352277 -1188,-0.987318361 -1189,-0.05542385 -1190,1.945141258 -1191,0.126766327 -1192,0.484086392 -1193,0.247341272 -1194,1.256927478 -1195,0.120934422 -1196,1.251137178 -1197,0.11213065 -1198,-0.255394376 -1199,-0.704343711 -1200,0.309073939 -1201,0.969789266 -1202,0.560553671 -1203,-1.73167449 -1204,-0.88986668 -1205,-0.763761249 -1206,0.247837819 -1207,1.147544858 -1208,1.022735779 -1209,2.175788884 -1210,-0.372259146 -1211,0.467029106 -1212,1.271231585 -1213,-0.816182111 -1214,-0.217278052 -1215,1.749764562 -1216,0.784116353 -1217,1.00895146 -1218,-1.338294345 -1219,1.425240323 -1220,-0.094086206 -1221,1.228116101 -1222,-0.203301588 -1223,-1.654327906 -1224,0.050594562 -1225,0.196886195 -1226,1.683803824 -1227,1.825861623 -1228,0.711670122 -1229,-0.479574173 -1230,0.770407785 -1231,-0.127681681 -1232,0.417720184 -1233,0.989241049 -1234,-0.122745028 -1235,0.903104017 -1236,-0.04707973 -1237,-1.013600178 -1238,0.455859814 -1239,-0.328809768 -1240,-0.091027427 -1241,-0.562765727 -1242,-1.085281734 -1243,-1.308772229 -1244,-1.692134802 -1245,1.696933244 -1246,0.335855147 -1247,0.346514477 -1248,-0.317943433 -1249,0.084826325 -1250,0.550157165 -1251,1.529921972 -1252,-1.28412388 -1253,-0.401184408 -1254,1.214237498 -1255,0.126700221 -1256,0.245813798 -1257,0.670866613 -1258,1.128559982 -1259,0.380725762 -1260,0.112818265 -1261,-0.400405036 -1262,0.148326937 -1263,1.072023975 -1264,-0.474005936 -1265,-0.163670086 -1266,-0.585253233 -1267,-0.069401838 -1268,-0.102382726 -1269,0.082869514 -1270,-0.575252273 -1271,0.654560029 -1272,0.710048041 -1273,1.586952121 -1274,0.605934737 -1275,-0.976830985 -1276,-0.48497013 -1277,-1.279069462 -1278,0.678004442 -1279,-1.058694588 -1280,-0.378410689 -1281,-1.728059162 -1282,0.810285572 -1283,1.919715918 -1284,2.143843723 -1285,-0.880485338 -1286,-0.103939713 -1287,0.275933167 -1288,0.464716865 -1289,-0.743282636 -1290,0.078033888 -1291,0.623058776 -1292,-0.001004085 -1293,-0.458480028 -1294,0.594367206 -1295,0.441931522 -1296,1.324411665 -1297,-0.625429866 -1298,-0.528168714 -1299,-0.210256748 -1300,-3.07073383 -1301,0.306124992 -1302,-0.494857131 -1303,0.474057076 -1304,-2.202207526 -1305,0.290801763 -1306,-1.021201349 -1307,-0.554601655 -1308,0.179147148 -1309,0.957304052 -1310,-0.453517023 -1311,-0.591682664 -1312,-1.484474809 -1313,-2.595124427 -1314,-1.573641162 -1315,-0.067215536 -1316,0.676020392 -1317,-1.12888597 -1318,-0.547476447 -1319,0.454197935 -1320,0.689533258 -1321,-1.246461134 -1322,0.061263565 -1323,-1.036040358 -1324,-0.544417389 -1325,-0.960688598 -1326,-0.97919833 -1327,-1.368226674 -1328,0.607293951 -1329,-0.959312259 -1330,-0.401011668 -1331,-2.204550211 -1332,0.238270632 -1333,1.615338392 -1334,-0.16915305 -1335,-0.352846904 -1336,-1.346774835 -1337,-1.384385829 -1338,-0.339069044 -1339,0.233529978 -1340,-0.51258402 -1341,0.204337616 -1342,1.275979011 -1343,1.267159312 -1344,-0.376169226 -1345,0.320972559 -1346,0.831597277 -1347,-0.757943379 -1348,0.109901613 -1349,0.102133439 -1350,0.451237321 -1351,2.052758997 -1352,0.493403821 -1353,0.25310576 -1354,-0.645334744 -1355,2.697425219 -1356,0.425614822 -1357,-0.653118788 -1358,-0.52403994 -1359,-1.299451072 -1360,-1.440935626 -1361,0.688313531 -1362,2.117469304 -1363,0.258614024 -1364,1.325593234 -1365,0.206956521 -1366,-0.30619084 -1367,0.816710942 -1368,-1.047296308 -1369,-0.432358546 -1370,-0.3751806 -1371,-0.200321853 -1372,0.322079053 -1373,1.236091182 -1374,0.832670871 -1375,-0.274438859 -1376,0.002915741 -1377,0.936905737 -1378,-0.139925039 -1379,-1.223665231 -1380,-0.344035731 -1381,0.541830143 -1382,0.089550894 -1383,-0.399373201 -1384,-0.638971758 -1385,-0.42829274 -1386,0.066232207 -1387,0.172407444 -1388,-1.323501735 -1389,0.38213983 -1390,0.087665437 -1391,1.144264232 -1392,0.040586983 -1393,-0.646331893 -1394,-0.723917657 -1395,1.507763791 -1396,-0.627054227 -1397,-0.9371208 -1398,2.406349533 -1399,-0.093765111 -1400,0.516593832 -1401,0.272142965 -1402,2.462509816 -1403,-0.264848659 -1404,1.412332659 -1405,-0.354292211 -1406,0.11448595 -1407,-0.256964107 -1408,0.324339735 -1409,2.13272175 -1410,1.092728614 -1411,-1.91914295 -1412,-1.660628282 -1413,-0.358849657 -1414,0.168993835 -1415,-0.6352745 -1416,-0.80700903 -1417,-0.632799736 -1418,1.187958056 -1419,0.961249843 -1420,-0.170612173 -1421,1.551243121 -1422,1.362319567 -1423,-1.193773097 -1424,0.875966912 -1425,-0.301807687 -1426,1.087694951 -1427,0.638511876 -1428,-0.623304654 -1429,1.014578475 -1430,0.913151992 -1431,-1.413942561 -1432,-0.926906491 -1433,1.076826789 -1434,0.161473801 -1435,1.343436819 -1436,-0.239858673 -1437,0.419993321 -1438,-0.694705002 -1439,-0.839949363 -1440,0.046718338 -1441,0.020594471 -1442,0.02047847 -1443,-0.784002496 -1444,-0.849342873 -1445,1.424219963 -1446,-0.428727842 -1447,-1.076114332 -1448,0.245701561 -1449,0.795284639 -1450,-0.973539635 -1451,0.68104775 -1452,0.839216441 -1453,-1.52268479 -1454,0.195724793 -1455,-1.042926393 -1456,-1.129095651 -1457,0.764965186 -1458,0.478977433 -1459,-0.899265097 -1460,-0.949318827 -1461,1.614949018 -1462,-0.032344549 -1463,3.360742147 -1464,-0.396105414 -1465,-1.638622894 -1466,0.225093528 -1467,1.066021618 -1468,-0.008648247 -1469,-0.98582826 -1470,1.346256924 -1471,1.069673059 -1472,-0.065328933 -1473,-0.328719295 -1474,-0.987566838 -1475,-1.321288981 -1476,0.721593751 -1477,-0.041482784 -1478,1.826603053 -1479,-0.216176364 -1480,2.863000908 -1481,-1.490517904 -1482,2.377364868 -1483,-0.243495591 -1484,-0.911774065 -1485,-0.716668349 -1486,-0.458943849 -1487,-0.104759866 -1488,0.605636337 -1489,0.065383726 -1490,-0.017498077 -1491,-0.044832297 -1492,-0.738418872 -1493,-1.413405161 -1494,-2.739505592 -1495,-1.841888126 -1496,1.042864628 -1497,2.161190966 -1498,1.342689067 -1499,-0.214030949 -1500,1.042022067 -1501,-0.309085657 -1502,0.277460722 -1503,1.107321205 -1504,-0.585070535 -1505,0.156611861 -1506,-0.351925395 -1507,-0.775565552 -1508,0.114316536 -1509,-1.613789939 -1510,0.217823012 -1511,-1.191785627 -1512,0.593475868 -1513,1.533722175 -1514,-0.323433577 -1515,-0.806779254 -1516,-1.604844659 -1517,0.102191798 -1518,1.322960171 -1519,-0.361678357 -1520,-0.888166285 -1521,0.225253553 -1522,0.962730982 -1523,-0.168650299 -1524,1.778898795 -1525,-1.091458088 -1526,0.284315938 -1527,0.555151951 -1528,0.500225097 -1529,-0.218339028 -1530,0.911711179 -1531,-0.122564715 -1532,0.51501612 -1533,0.774050326 -1534,-0.549177499 -1535,2.174960386 -1536,1.062305575 -1537,-0.139650429 -1538,1.118406979 -1539,1.3584474 -1540,-0.788873132 -1541,0.381642474 -1542,1.439085857 -1543,-1.121210976 -1544,0.150952927 -1545,-1.790852942 -1546,2.013183813 -1547,0.210408816 -1548,-0.671184985 -1549,-1.860633407 -1550,1.09075947 -1551,2.881170535 -1552,-0.123701428 -1553,0.737024616 -1554,1.637156571 -1555,0.570382232 -1556,0.066575419 -1557,-1.362949123 -1558,-0.872602578 -1559,-0.191219854 -1560,-0.108035104 -1561,0.928527111 -1562,-0.015967741 -1563,0.560778368 -1564,0.887724002 -1565,0.056689206 -1566,-0.282033062 -1567,-0.029326086 -1568,-0.052530885 -1569,1.367972968 -1570,-1.79237768 -1571,1.116314751 -1572,-0.196780429 -1573,-0.055235898 -1574,0.916819527 -1575,0.085709656 -1576,0.535777802 -1577,1.089405707 -1578,-0.819426047 -1579,0.177940704 -1580,-0.982378265 -1581,-0.338772763 -1582,-1.231196175 -1583,0.824217401 -1584,-0.794775943 -1585,-0.364367553 -1586,-0.181752727 -1587,0.850876764 -1588,0.694380233 -1589,-0.344790023 -1590,-0.789343958 -1591,0.555591209 -1592,1.8095993 -1593,0.018399509 -1594,-0.2907814 -1595,-1.311454024 -1596,-0.453737701 -1597,-0.713099278 -1598,-1.871217814 -1599,-1.855595008 -1600,-1.50335959 -1601,0.152104007 -1602,-0.349240956 -1603,-1.679758922 -1604,-0.813097069 -1605,-0.68458957 -1606,-1.421559125 -1607,1.254645446 -1608,-0.402991842 -1609,-0.361254808 -1610,-0.007997992 -1611,-0.145461463 -1612,-0.895017449 -1613,-0.905708472 -1614,0.854875838 -1615,0.78699051 -1616,-1.410831808 -1617,-0.764928534 -1618,0.141505386 -1619,-0.388825946 -1620,-3.70286215 -1621,-0.002344433 -1622,0.510266988 -1623,-0.626913417 -1624,0.262031237 -1625,0.470105833 -1626,1.032987175 -1627,0.717039441 -1628,-1.760394966 -1629,-0.068211196 -1630,0.492303386 -1631,0.339595004 -1632,-0.194246437 -1633,1.231180779 -1634,-0.50732565 -1635,0.87349122 -1636,0.207690755 -1637,-0.404986842 -1638,0.184515962 -1639,1.660614188 -1640,-0.120491395 -1641,-0.063217475 -1642,1.805415859 -1643,-0.556181162 -1644,0.351102366 -1645,-1.548318268 -1646,1.796355923 -1647,-1.311573365 -1648,0.661765077 -1649,0.798712499 -1650,-1.177506257 -1651,1.35100198 -1652,0.829813176 -1653,1.1781559 -1654,-3.055804227 -1655,1.339799015 -1656,1.072880261 -1657,-0.05236323 -1658,0.806639372 -1659,-0.630502298 -1660,-0.627638126 -1661,-2.450544613 -1662,-1.053766923 -1663,-0.550824734 -1664,-0.171231715 -1665,-0.385789661 -1666,-1.163382622 -1667,-0.194048389 -1668,1.14223055 -1669,0.393505504 -1670,1.618124654 -1671,0.462184153 -1672,-0.533581448 -1673,0.096926262 -1674,-0.294813712 -1675,-0.38002565 -1676,0.096927543 -1677,0.650988938 -1678,0.213954904 -1679,1.732896243 -1680,0.297904352 -1681,-0.557323155 -1682,-1.038760499 -1683,0.004037229 -1684,-1.257539053 -1685,-0.142588258 -1686,-0.127348537 -1687,-0.573785889 -1688,1.176439789 -1689,0.175882701 -1690,1.598899928 -1691,-0.818855796 -1692,-0.262768199 -1693,-0.328304085 -1694,0.169610773 -1695,-1.047791513 -1696,0.47106748 -1697,-2.265356992 -1698,-0.716463072 -1699,-0.889267603 -1700,-1.301960146 -1701,0.202494957 -1702,0.48782136 -1703,0.866728518 -1704,1.504958339 -1705,0.888348354 -1706,-0.938815863 -1707,-1.839141412 -1708,0.733286953 -1709,-0.213362574 -1710,-0.11796977 -1711,-1.168636502 -1712,0.558730854 -1713,1.060481177 -1714,-0.673135343 -1715,1.487687016 -1716,-1.275335325 -1717,0.878705219 -1718,0.398474049 -1719,-1.558192588 -1720,0.77921354 -1721,-0.892247045 -1722,0.357419561 -1723,0.494176721 -1724,-0.539440003 -1725,0.000386206 -1726,-0.769741029 -1727,0.313805128 -1728,-0.963234471 -1729,-0.368789437 -1730,-0.17670233 -1731,-1.775071713 -1732,-0.80359913 -1733,-2.28906398 -1734,1.160313261 -1735,1.11157293 -1736,-0.301166138 -1737,-0.552782222 -1738,-0.373617313 -1739,0.141000488 -1740,1.377735871 -1741,1.426330638 -1742,0.54543983 -1743,-0.263229746 -1744,0.273568675 -1745,1.419312432 -1746,0.610486579 -1747,1.159710755 -1748,-1.075953673 -1749,-0.122767356 -1750,0.456580432 -1751,-0.900892946 -1752,-0.994932181 -1753,-0.110523942 -1754,2.151103267 -1755,-0.531178235 -1756,-1.012228907 -1757,-0.245966726 -1758,0.684606715 -1759,-0.220290503 -1760,-1.460385504 -1761,2.010610352 -1762,-0.002192636 -1763,-0.52455839 -1764,1.454112457 -1765,0.679916714 -1766,1.012329962 -1767,0.507871078 -1768,0.811905765 -1769,-0.790424859 -1770,-1.395229234 -1771,0.439227749 -1772,1.195216523 -1773,-0.218852214 -1774,-0.284945873 -1775,0.707535982 -1776,1.673377868 -1777,-1.005581537 -1778,0.74725325 -1779,-0.835813552 -1780,1.212757394 -1781,-0.734298675 -1782,-0.879431521 -1783,0.391702188 -1784,0.696680581 -1785,0.789079136 -1786,0.456885959 -1787,-0.648540679 -1788,0.045670802 -1789,0.60428694 -1790,0.550244104 -1791,-0.212835011 -1792,-0.279870367 -1793,-0.160626314 -1794,-1.188668928 -1795,-1.052250258 -1796,-1.231730315 -1797,-1.346895253 -1798,0.516688482 -1799,0.781976093 -1800,-0.189426418 -1801,-0.028605629 -1802,0.627499346 -1803,1.325068377 -1804,0.704091115 -1805,-0.48621016 -1806,0.201925071 -1807,-1.046947297 -1808,-0.248062056 -1809,0.593734865 -1810,-1.522367644 -1811,-0.025457207 -1812,0.786568759 -1813,0.363289977 -1814,1.110924487 -1815,1.159454467 -1816,-0.189238232 -1817,0.730048341 -1818,0.307839648 -1819,-1.751157307 -1820,-0.645708345 -1821,1.008548108 -1822,-1.034890794 -1823,-1.661555554 -1824,0.900352757 -1825,-0.400587569 -1826,0.564609602 -1827,0.339832802 -1828,-0.298687221 -1829,0.347723744 -1830,3.693496942 -1831,-2.130912807 -1832,1.541289144 -1833,-0.47601284 -1834,0.068199826 -1835,0.46396916 -1836,-1.157275219 -1837,0.507581971 -1838,-0.904760773 -1839,-0.220049177 -1840,1.786574782 -1841,0.213579574 -1842,-0.140211417 -1843,1.975969667 -1844,0.503422001 -1845,-0.812042034 -1846,-0.469889291 -1847,-0.23491214 -1848,-0.718618781 -1849,-1.07323202 -1850,-1.441798008 -1851,0.362405705 -1852,0.909489056 -1853,0.202703906 -1854,2.27416428 -1855,0.327187237 -1856,0.399475261 -1857,0.628978616 -1858,-0.025183235 -1859,1.000032899 -1860,-0.590545587 -1861,-0.032818971 -1862,-0.028781065 -1863,-1.053534864 -1864,1.475014844 -1865,-0.176441762 -1866,0.711109536 -1867,-0.69641032 -1868,0.350594227 -1869,0.377475451 -1870,-0.307750745 -1871,0.146895309 -1872,-0.514662908 -1873,0.745472631 -1874,0.930378357 -1875,0.017325869 -1876,-0.709126782 -1877,0.417243936 -1878,-0.785765765 -1879,0.758391905 -1880,-1.789961747 -1881,0.379559958 -1882,-0.425807452 -1883,-0.192454062 -1884,-1.619778255 -1885,-0.424469288 -1886,0.361915921 -1887,0.171364308 -1888,0.935082864 -1889,0.45967675 -1890,0.08101763 -1891,1.132373805 -1892,0.430440028 -1893,-0.265048055 -1894,-0.105163029 -1895,-0.101210977 -1896,-2.399938658 -1897,1.333351711 -1898,-2.14929494 -1899,-0.622364177 -1900,1.986477333 -1901,0.802585133 -1902,-1.521264346 -1903,-0.488202233 -1904,-0.277810625 -1905,-0.947364857 -1906,0.764979056 -1907,0.187834884 -1908,0.711689166 -1909,0.805136447 -1910,-0.623804919 -1911,-0.075521904 -1912,-1.505320664 -1913,-0.178328137 -1914,-1.175337612 -1915,0.007532854 -1916,1.693634074 -1917,0.39934206 -1918,1.018951417 -1919,1.782097998 -1920,0.24529696 -1921,0.122960316 -1922,-0.793892853 -1923,-1.171828415 -1924,0.91049509 -1925,0.551441805 -1926,0.459084534 -1927,-0.57390591 -1928,-0.777301236 -1929,0.004011636 -1930,-0.369480587 -1931,0.223654824 -1932,-0.871965946 -1933,0.319746012 -1934,-1.549238278 -1935,-0.536418186 -1936,-0.705528532 -1937,1.822280916 -1938,0.855597502 -1939,0.053770226 -1940,1.34126332 -1941,1.969972875 -1942,-0.739476257 -1943,-1.995902412 -1944,0.489120768 -1945,0.034361053 -1946,1.27088528 -1947,0.621256256 -1948,-0.632795668 -1949,-0.032324313 -1950,0.491188622 -1951,-0.325390827 -1952,-2.567078797 -1953,2.485538093 -1954,-0.297773014 -1955,-0.986998229 -1956,0.090259859 -1957,0.0076611 -1958,0.075320278 -1959,0.081887592 -1960,0.32305532 -1961,-1.296812931 -1962,-0.421831307 -1963,1.470741903 -1964,-0.577041622 -1965,0.460724949 -1966,1.452478064 -1967,-1.2372402 -1968,0.828051611 -1969,-0.296193072 -1970,1.891450262 -1971,0.113635025 -1972,1.295932522 -1973,1.511888965 -1974,0.302816978 -1975,-0.243137504 -1976,-0.086644585 -1977,0.683219595 -1978,0.964393331 -1979,-1.59380957 -1980,0.38958432 -1981,0.226917645 -1982,-0.67253529 -1983,-1.753656316 -1984,1.127862857 -1985,1.778305888 -1986,-0.204339916 -1987,-1.480750614 -1988,0.375779388 -1989,-0.155068248 -1990,1.106471754 -1991,0.281549537 -1992,1.583650841 -1993,1.477241842 -1994,0.911504457 -1995,-0.487011131 -1996,-1.588134669 -1997,0.257341847 -1998,-1.763500082 -1999,-0.243472216 -2000,-0.413288616 -2001,-1.407345571 -2002,-0.267425131 -2003,1.303271337 -2004,-1.40221421 -2005,-2.257613398 -2006,-0.290858053 -2007,0.57134319 -2008,0.847593759 -2009,-0.024084492 -2010,-0.475229421 -2011,1.669445403 -2012,-2.566050707 -2013,0.827720273 -2014,0.502219467 -2015,-2.058021197 -2016,-0.475683215 -2017,0.003002099 -2018,-1.622559761 -2019,0.474371697 -2020,-0.126464519 -2021,-1.505041232 -2022,1.590771553 -2023,0.536179261 -2024,-0.102886985 -2025,0.481897113 -2026,-0.811425239 -2027,-0.363718507 -2028,0.317592392 -2029,0.819193771 -2030,0.332012422 -2031,0.776122417 -2032,0.998553923 -2033,0.557246096 -2034,1.260545383 -2035,1.97319538 -2036,-1.104521829 -2037,-0.310148206 -2038,0.257202435 -2039,2.423462946 -2040,0.026904419 -2041,-1.110942447 -2042,0.700536969 -2043,0.758977229 -2044,-1.715144579 -2045,-0.053627343 -2046,-0.052304333 -2047,1.628756739 -2048,-0.484883467 -2049,0.031121214 -2050,1.506492589 -2051,-1.630241224 -2052,0.077894652 -2053,0.341682552 -2054,-0.387412229 -2055,1.037806651 -2056,-0.530238351 -2057,1.032967902 -2058,-0.179055708 -2059,1.17127723 -2060,0.685684896 -2061,-0.062514999 -2062,-0.700865399 -2063,0.621416897 -2064,1.21811577 -2065,-1.768058056 -2066,-0.350537031 -2067,0.150335084 -2068,-0.956889919 -2069,-0.109594099 -2070,1.777820055 -2071,0.776000193 -2072,-0.82580888 -2073,-0.444958301 -2074,-0.121342949 -2075,0.147482867 -2076,-0.494562264 -2077,1.680806468 -2078,-1.254264005 -2079,-0.35414054 -2080,-0.366300537 -2081,0.413722815 -2082,-0.508879663 -2083,-0.937193372 -2084,1.271096589 -2085,0.43191345 -2086,-0.298006365 -2087,0.036522536 -2088,1.880245565 -2089,0.124123506 -2090,0.28512778 -2091,-0.988096897 -2092,-0.797605521 -2093,-1.349410418 -2094,-0.946749486 -2095,1.085810211 -2096,0.433038308 -2097,-1.160087058 -2098,-0.37783758 -2099,-0.739030196 -2100,-0.836511368 -2101,1.40854777 -2102,0.460433092 -2103,-1.973821221 -2104,-1.196357108 -2105,-2.756246145 -2106,1.520438292 -2107,1.590532187 -2108,-0.451985596 -2109,-0.092485896 -2110,1.365687502 -2111,-0.646662983 -2112,-1.498838161 -2113,-1.042875463 -2114,0.606459928 -2115,-1.358329389 -2116,1.332131675 -2117,-0.276305037 -2118,0.444087813 -2119,2.006317075 -2120,1.266914199 -2121,-0.690732334 -2122,0.873659725 -2123,-0.242604928 -2124,1.01845736 -2125,0.585856554 -2126,-1.651893232 -2127,-1.085750946 -2128,-0.43129556 -2129,1.7012254 -2130,-0.159662491 -2131,0.64384151 -2132,-1.175867673 -2133,1.392628744 -2134,0.0104397 -2135,-1.478786964 -2136,0.048254641 -2137,0.76289515 -2138,-0.276197529 -2139,0.194194111 -2140,0.611138596 -2141,-1.069526461 -2142,0.389635506 -2143,1.243676692 -2144,1.704719337 -2145,0.136055053 -2146,-0.065078488 -2147,-0.192773964 -2148,0.786450959 -2149,0.279487404 -2150,0.853147441 -2151,1.310045122 -2152,1.598013114 -2153,-0.21955259 -2154,1.703299079 -2155,0.321587739 -2156,-0.606683506 -2157,0.157015015 -2158,0.427213697 -2159,0.001083903 -2160,-1.61787735 -2161,0.017407245 -2162,0.630013987 -2163,0.646404305 -2164,-1.978152484 -2165,-0.700201194 -2166,-0.068701408 -2167,0.651626966 -2168,1.416573036 -2169,0.164570023 -2170,0.923802266 -2171,-0.90233767 -2172,0.276635223 -2173,-0.196144048 -2174,-0.227388078 -2175,0.301877162 -2176,0.416346067 -2177,0.142551997 -2178,-0.090819856 -2179,-0.808246979 -2180,2.454687816 -2181,1.550740856 -2182,0.978740371 -2183,0.306911381 -2184,-0.094855833 -2185,-0.705375411 -2186,1.448514739 -2187,0.599699099 -2188,-0.880880376 -2189,-0.612084473 -2190,0.662154749 -2191,0.994863898 -2192,-0.792857445 -2193,1.907065065 -2194,0.160969549 -2195,1.422068955 -2196,-0.376402222 -2197,0.935576627 -2198,-0.180087156 -2199,-0.28378605 -2200,0.476005028 -2201,1.223097221 -2202,-0.124309367 -2203,-2.233422478 -2204,-0.043021866 -2205,-1.143943158 -2206,-1.213151322 -2207,0.824792652 -2208,1.129144253 -2209,0.887757846 -2210,1.118684948 -2211,2.387292283 -2212,-0.788238904 -2213,1.905609787 -2214,0.051113696 -2215,1.37650912 -2216,-1.333656013 -2217,-0.663585841 -2218,0.280832865 -2219,0.325395727 -2220,0.591906178 -2221,-0.634643499 -2222,-0.475594828 -2223,0.560505822 -2224,-1.170702951 -2225,-1.372004118 -2226,0.0797799 -2227,-0.753056594 -2228,0.237009069 -2229,-0.858798086 -2230,1.57257751 -2231,-1.460494148 -2232,-0.883030278 -2233,-1.625196479 -2234,-0.069635948 -2235,-0.091076947 -2236,1.515211408 -2237,-0.357586946 -2238,1.178631611 -2239,-1.729206373 -2240,0.271323384 -2241,0.227359568 -2242,-0.907887846 -2243,0.52929309 -2244,1.913460489 -2245,1.109893894 -2246,-0.888620757 -2247,0.328531056 -2248,-0.584472611 -2249,-0.745936157 -2250,-0.526161959 -2251,0.918603284 -2252,1.168505073 -2253,-0.277047381 -2254,1.04041442 -2255,0.888725851 -2256,-0.678876082 -2257,1.399554229 -2258,0.123553058 -2259,0.274359524 -2260,0.842209302 -2261,-0.235220959 -2262,-0.401759713 -2263,-0.440669035 -2264,-0.210185516 -2265,-0.405906742 -2266,1.347599592 -2267,-0.353976027 -2268,-0.792524555 -2269,1.005305334 -2270,-0.964256748 -2271,0.42057614 -2272,0.783024696 -2273,-1.236697903 -2274,-0.64445077 -2275,0.328071009 -2276,1.218171276 -2277,-1.14206762 -2278,0.488747425 -2279,-0.388684963 -2280,-0.053460143 -2281,0.355683253 -2282,-1.388479723 -2283,-0.371905797 -2284,0.418272932 -2285,0.528791445 -2286,-1.046639636 -2287,-1.018167701 -2288,0.866767483 -2289,-0.42005925 -2290,1.263598934 -2291,-1.40028706 -2292,-1.345433383 -2293,0.945096893 -2294,1.185792027 -2295,0.482039967 -2296,-0.86313825 -2297,1.581956386 -2298,0.78397236 -2299,0.754152392 -2300,0.313728014 -2301,-0.214046923 -2302,-2.180557956 -2303,-0.348674554 -2304,0.179490863 -2305,0.531626446 -2306,0.968896365 -2307,-0.167432249 -2308,0.382751173 -2309,1.550295092 -2310,-0.769886057 -2311,0.663808591 -2312,0.725697283 -2313,0.175139105 -2314,-0.359565498 -2315,0.024955488 -2316,2.048454297 -2317,-0.820737701 -2318,-0.915638298 -2319,0.454415157 -2320,1.570825539 -2321,1.876836556 -2322,0.874119096 -2323,-1.278349953 -2324,0.187275736 -2325,-0.538362213 -2326,0.393347381 -2327,-1.980487093 -2328,0.118418941 -2329,-0.450526742 -2330,-1.394779638 -2331,-0.153905371 -2332,-1.208964557 -2333,0.432131743 -2334,1.107220819 -2335,0.979755713 -2336,-0.794979317 -2337,-0.822723112 -2338,-0.085047269 -2339,-0.484445864 -2340,-1.352848976 -2341,1.624698977 -2342,0.311191133 -2343,1.212634293 -2344,1.696793904 -2345,0.601048716 -2346,-0.679708875 -2347,-0.191597871 -2348,-0.019227569 -2349,1.868666291 -2350,0.737647953 -2351,-0.099420661 -2352,2.397360122 -2353,0.08468701 -2354,1.4317352 -2355,-1.76320045 -2356,-0.702050309 -2357,1.631285641 -2358,-0.41021459 -2359,1.562617527 -2360,1.598579425 -2361,1.423822957 -2362,-1.451486784 -2363,0.629809896 -2364,0.641880546 -2365,-0.593727666 -2366,1.51487648 -2367,0.888105352 -2368,0.207151635 -2369,-0.029580163 -2370,0.100153361 -2371,-1.821927185 -2372,1.323502948 -2373,0.396312074 -2374,-0.175159913 -2375,0.140153019 -2376,0.967214081 -2377,0.071344789 -2378,-1.604559033 -2379,0.922265004 -2380,0.387687101 -2381,-0.24383415 -2382,1.477924975 -2383,0.650757954 -2384,0.239010737 -2385,0.736348058 -2386,-1.01754089 -2387,-2.31211973 -2388,0.259657327 -2389,0.130983818 -2390,-0.663467699 -2391,-0.80309624 -2392,0.51011325 -2393,1.343358468 -2394,0.27303806 -2395,-0.924364163 -2396,-1.099878344 -2397,0.99317084 -2398,0.476853671 -2399,-2.646800062 -2400,1.110680413 -2401,-1.106582904 -2402,-0.852502117 -2403,1.239386176 -2404,1.021579378 -2405,-0.393316927 -2406,1.008445963 -2407,-0.12763867 -2408,0.855235269 -2409,-0.008414146 -2410,0.648632093 -2411,-1.186171142 -2412,0.062012452 -2413,-0.267219243 -2414,-0.551074561 -2415,0.978029314 -2416,0.817749562 -2417,-3.145471204 -2418,-0.825857113 -2419,-0.684082885 -2420,1.153410416 -2421,1.563619343 -2422,1.336850058 -2423,1.46221232 -2424,1.237528347 -2425,-0.075275247 -2426,-0.305412552 -2427,1.311582256 -2428,1.454658111 -2429,1.238491921 -2430,-0.044735295 -2431,0.035285872 -2432,1.312121409 -2433,0.317397884 -2434,0.080894009 -2435,-0.599749632 -2436,1.110587444 -2437,1.52608767 -2438,-1.294779354 -2439,-0.980474276 -2440,0.022590592 -2441,-0.474138037 -2442,-0.343036004 -2443,0.264353504 -2444,0.172239139 -2445,-0.441606675 -2446,0.192776955 -2447,0.650013702 -2448,1.969015796 -2449,0.549570375 -2450,0.367757514 -2451,0.034329048 -2452,1.261662615 -2453,0.345128954 -2454,1.034518116 -2455,1.280368986 -2456,0.125018165 -2457,1.414437695 -2458,-0.555813224 -2459,-0.321681573 -2460,0.362266949 -2461,1.1196206 -2462,0.759047427 -2463,0.507170714 -2464,-0.802388114 -2465,-1.32393098 -2466,1.046031991 -2467,2.011289695 -2468,-0.141721926 -2469,0.107973825 -2470,2.452432475 -2471,0.55341791 -2472,-1.152692486 -2473,0.023723839 -2474,-0.335590695 -2475,-0.198849277 -2476,-0.37050799 -2477,-0.768413225 -2478,1.296483428 -2479,-0.026540856 -2480,0.13432784 -2481,1.015755617 -2482,-0.582063812 -2483,-1.164371171 -2484,-0.762226619 -2485,0.142969931 -2486,-0.094148398 -2487,-0.423302974 -2488,-1.600306843 -2489,0.699210054 -2490,0.452073344 -2491,0.559676324 -2492,-0.926206712 -2493,-0.497097456 -2494,-0.96636324 -2495,1.65093277 -2496,1.347439666 -2497,0.304782927 -2498,1.287447638 -2499,-0.71434822 -2500,-0.637439574 -2501,-1.459344402 -2502,-0.811946113 -2503,-0.817028658 -2504,0.531376222 -2505,-0.430457195 -2506,-0.680809943 -2507,0.192602352 -2508,-1.031199644 -2509,-0.819917372 -2510,1.264678056 -2511,0.727648833 -2512,0.350522771 -2513,-0.526173377 -2514,-0.264656183 -2515,0.715121705 -2516,0.835069178 -2517,-0.679070797 -2518,-0.401083108 -2519,0.215991776 -2520,-0.589855671 -2521,-0.334430262 -2522,1.035280701 -2523,-1.493562335 -2524,-0.659110582 -2525,-1.305022496 -2526,-0.269789452 -2527,0.61633541 -2528,-3.320345987 -2529,-0.627102225 -2530,1.314138338 -2531,-0.181680264 -2532,-0.044461195 -2533,1.121287244 -2534,0.04914931 -2535,2.356615625 -2536,-0.155134718 -2537,1.181822245 -2538,-0.848955029 -2539,0.15424419 -2540,0.771480105 -2541,1.809940496 -2542,-0.175104177 -2543,-1.281307025 -2544,0.458440028 -2545,0.917748787 -2546,-1.863046269 -2547,-1.214484673 -2548,0.786825623 -2549,0.968819808 -2550,1.770231367 -2551,-0.861802662 -2552,-0.254553991 -2553,1.299947641 -2554,-0.244678162 -2555,-1.28835185 -2556,-1.137191114 -2557,0.647424736 -2558,0.997664068 -2559,0.463715168 -2560,0.977701521 -2561,1.71887517 -2562,-0.343555493 -2563,-1.383076279 -2564,0.316339013 -2565,1.647561053 -2566,-0.703353171 -2567,1.116676435 -2568,-0.606827925 -2569,1.818494714 -2570,-0.419281965 -2571,1.503274627 -2572,-0.724793208 -2573,1.622791457 -2574,0.657348678 -2575,1.490817966 -2576,-0.334546322 -2577,-2.307889732 -2578,1.870231716 -2579,0.512660823 -2580,-2.274861252 -2581,0.035952541 -2582,-0.116476244 -2583,0.705290856 -2584,0.97984403 -2585,0.272524888 -2586,0.189724 -2587,0.274381248 -2588,-0.488595648 -2589,0.132183279 -2590,1.617809223 -2591,-1.477798461 -2592,0.075025671 -2593,0.268697696 -2594,0.150552771 -2595,0.62877214 -2596,-1.27959667 -2597,0.536798925 -2598,0.510038822 -2599,0.039695033 -2600,-0.714147763 -2601,0.685795154 -2602,-0.250415555 -2603,1.247231179 -2604,-0.385499961 -2605,0.541441625 -2606,0.639017128 -2607,1.695194216 -2608,-0.934919302 -2609,-0.199878629 -2610,0.712247508 -2611,0.885191502 -2612,-0.507737589 -2613,-0.375985073 -2614,1.392270785 -2615,-0.202666441 -2616,-0.421186277 -2617,-0.191823346 -2618,-0.344653463 -2619,-0.70220867 -2620,1.70006197 -2621,1.28958189 -2622,1.956643921 -2623,-1.145112623 -2624,-0.901634676 -2625,0.586532709 -2626,-0.618566608 -2627,-1.052508012 -2628,-0.095473032 -2629,1.782356528 -2630,-0.651516517 -2631,0.125092052 -2632,-0.511438927 -2633,0.234374754 -2634,-1.671313417 -2635,1.512021928 -2636,0.391572278 -2637,0.626189518 -2638,0.659898529 -2639,-2.349100404 -2640,0.962111436 -2641,-0.979867734 -2642,-1.571751621 -2643,0.48994048 -2644,0.411895515 -2645,0.845056611 -2646,-0.165488861 -2647,0.923195377 -2648,0.376408589 -2649,-1.257372937 -2650,-0.557810679 -2651,-0.679541202 -2652,1.104665336 -2653,-0.275996478 -2654,-2.443402569 -2655,0.995760186 -2656,0.024892946 -2657,0.903741756 -2658,1.581896753 -2659,0.738615416 -2660,1.216169833 -2661,-0.099273397 -2662,1.848092733 -2663,-0.550545202 -2664,-1.016918153 -2665,0.578486457 -2666,-0.563129503 -2667,-0.452668671 -2668,0.465774549 -2669,2.480073635 -2670,0.003276613 -2671,1.171181272 -2672,1.073425939 -2673,0.262435283 -2674,-2.014383335 -2675,-0.463797672 -2676,-1.311797665 -2677,0.24447936 -2678,0.068490148 -2679,-0.753855974 -2680,-0.71320943 -2681,-0.2510368 -2682,-1.443750448 -2683,0.455653929 -2684,-0.035262481 -2685,1.675833502 -2686,1.038679549 -2687,-0.2554965 -2688,2.187275454 -2689,-0.015704504 -2690,0.208690166 -2691,-2.124421277 -2692,-0.508964104 -2693,-1.100136238 -2694,0.514896446 -2695,-0.239575713 -2696,-1.755623385 -2697,0.481260886 -2698,1.231513415 -2699,0.210734851 -2700,-1.174642978 -2701,1.099842093 -2702,-0.76617303 -2703,1.277049558 -2704,-1.505816713 -2705,-0.522223567 -2706,0.995390203 -2707,0.901572938 -2708,-0.452235183 -2709,-0.452363562 -2710,-0.870976793 -2711,-0.616122133 -2712,0.819232185 -2713,1.181548131 -2714,0.37340504 -2715,1.130659389 -2716,-0.279887629 -2717,-0.447592003 -2718,-0.51045004 -2719,-0.430663907 -2720,1.721613722 -2721,0.487701572 -2722,-0.033625274 -2723,1.346207984 -2724,-0.251970666 -2725,2.280001758 -2726,0.05428262 -2727,-1.260819104 -2728,-0.020849488 -2729,-0.283322065 -2730,0.370445992 -2731,0.417730993 -2732,0.72827579 -2733,1.531353771 -2734,-1.043318379 -2735,-0.160787192 -2736,-1.172108493 -2737,-1.52997937 -2738,-0.194507046 -2739,-1.348387451 -2740,1.523553268 -2741,-0.798631603 -2742,-0.950967936 -2743,-0.063765964 -2744,0.912214748 -2745,-0.808583994 -2746,-0.127436697 -2747,-0.031285801 -2748,1.270955514 -2749,-0.913712235 -2750,0.728903499 -2751,0.616953305 -2752,0.081942413 -2753,-1.604980449 -2754,-0.459442109 -2755,0.053902534 -2756,-2.03637142 -2757,-0.916128208 -2758,-0.587695654 -2759,-1.740122798 -2760,-0.388623062 -2761,0.242722477 -2762,-0.01009862 -2763,-2.123808184 -2764,-0.478025013 -2765,-0.170926793 -2766,0.153835496 -2767,-1.172302386 -2768,-0.236246325 -2769,1.421604009 -2770,0.628511751 -2771,0.028271346 -2772,-0.358109951 -2773,0.894023987 -2774,-0.079119757 -2775,0.736656559 -2776,-0.720989472 -2777,-1.622008535 -2778,0.330785094 -2779,-0.491407592 -2780,0.802859808 -2781,0.691993959 -2782,-0.191235929 -2783,-2.102719503 -2784,0.958605562 -2785,0.66614115 -2786,1.303585192 -2787,0.32029201 -2788,-0.068754722 -2789,-0.263636396 -2790,1.457265151 -2791,1.089906797 -2792,-0.006774601 -2793,-0.511933694 -2794,-0.340126825 -2795,-1.097075286 -2796,0.578117129 -2797,2.848814673 -2798,-0.198624397 -2799,-0.410395101 -2800,2.146871621 -2801,-1.1994984 -2802,-0.519395208 -2803,-1.240952421 -2804,0.231784407 -2805,-0.912421405 -2806,-0.131773515 -2807,2.280690352 -2808,-0.890544139 -2809,1.092778068 -2810,0.638016978 -2811,-0.231677723 -2812,0.027208565 -2813,-2.098453634 -2814,0.636090931 -2815,0.246885386 -2816,-1.26468875 -2817,0.678963475 -2818,-0.241175943 -2819,-0.851064537 -2820,1.770176629 -2821,-1.111575472 -2822,0.562177316 -2823,0.825759922 -2824,0.388514125 -2825,0.942357646 -2826,-0.354391878 -2827,0.402683801 -2828,-0.424582346 -2829,0.325748073 -2830,-0.029396406 -2831,-0.343070458 -2832,-0.00060984 -2833,-1.538816602 -2834,-0.579142186 -2835,3.364613058 -2836,-2.502253307 -2837,-0.399942188 -2838,-0.121524991 -2839,0.338289019 -2840,0.790006111 -2841,-0.050358789 -2842,0.331673497 -2843,0.676197855 -2844,0.402412776 -2845,1.69929648 -2846,-0.321283648 -2847,0.911835475 -2848,1.34551371 -2849,-0.673599261 -2850,0.957952061 -2851,0.279436957 -2852,0.422236089 -2853,0.458370917 -2854,-0.765985977 -2855,0.349436699 -2856,0.125981401 -2857,0.386740884 -2858,0.401460085 -2859,-0.459206276 -2860,-0.648448175 -2861,0.521478929 -2862,0.979527739 -2863,-1.773169051 -2864,0.307778859 -2865,-0.229626145 -2866,0.966344135 -2867,1.808718565 -2868,0.908038156 -2869,0.239742892 -2870,0.850411416 -2871,-0.577051279 -2872,-1.015874495 -2873,0.015306899 -2874,2.518345321 -2875,-0.88997627 -2876,0.902777054 -2877,-0.908612424 -2878,-1.053882227 -2879,-1.692165242 -2880,0.220785496 -2881,-1.095204945 -2882,-0.512735155 -2883,-0.222208417 -2884,0.378252197 -2885,-1.163637624 -2886,1.970955497 -2887,1.288300231 -2888,-1.62460471 -2889,1.98439724 -2890,-0.087417277 -2891,0.768644838 -2892,-1.03772779 -2893,-0.886343078 -2894,-0.12096099 -2895,-1.858493855 -2896,0.277156655 -2897,0.293325178 -2898,-0.321532817 -2899,-0.363432686 -2900,-0.746364218 -2901,0.421318223 -2902,-0.915134879 -2903,0.117173179 -2904,-1.741210432 -2905,-0.829060941 -2906,-0.981268311 -2907,-0.727913629 -2908,0.711145751 -2909,0.130478905 -2910,0.508952656 -2911,-0.29931167 -2912,-0.643821291 -2913,-1.115098125 -2914,0.168520128 -2915,-1.417263089 -2916,-1.505678417 -2917,1.162097171 -2918,0.153752463 -2919,0.894783478 -2920,-1.232900735 -2921,0.845040507 -2922,-0.366436341 -2923,1.956492478 -2924,1.135428421 -2925,-0.739531055 -2926,-0.940029566 -2927,-0.038718983 -2928,-1.275790215 -2929,-0.844733673 -2930,-1.61244535 -2931,0.002323482 -2932,-0.442630049 -2933,0.010854755 -2934,-0.694756016 -2935,0.16643555 -2936,1.203909657 -2937,0.786817827 -2938,0.735789812 -2939,0.097959795 -2940,0.393615772 -2941,-0.962365816 -2942,1.986438046 -2943,-0.78176768 -2944,-0.793931837 -2945,1.631780681 -2946,0.908607873 -2947,-0.096316981 -2948,-0.058674386 -2949,0.584030752 -2950,1.875856313 -2951,0.634282737 -2952,-1.38688777 -2953,-0.866018337 -2954,-1.071973506 -2955,-0.2463436 -2956,1.198641784 -2957,1.708768378 -2958,-1.415594636 -2959,-2.042710124 -2960,-1.380182221 -2961,0.636045474 -2962,-1.78596722 -2963,0.600266974 -2964,-1.889194301 -2965,0.174030021 -2966,-0.540405742 -2967,0.731819172 -2968,-0.232657389 -2969,0.676537531 -2970,1.488500926 -2971,-0.333912502 -2972,-0.905962502 -2973,-1.342055705 -2974,-0.718918795 -2975,1.862074468 -2976,1.977506085 -2977,-0.681720962 -2978,0.491886571 -2979,-1.115712197 -2980,-1.271522509 -2981,-0.493574629 -2982,-0.72202798 -2983,-0.543522434 -2984,0.316236052 -2985,-0.882736413 -2986,-0.747241711 -2987,-0.015802181 -2988,1.270140519 -2989,0.196841741 -2990,0.203512496 -2991,0.591362338 -2992,-1.127234667 -2993,-0.37232219 -2994,1.998359078 -2995,0.094157446 -2996,-0.964802754 -2997,-1.918825234 -2998,-0.689153701 -2999,0.213447233 -3000,-0.950996458 -3001,0.743677593 -3002,0.796120481 -3003,-0.411710752 -3004,-0.704037348 -3005,0.594379906 -3006,0.692072172 -3007,-2.016264484 -3008,-1.212942309 -3009,-0.505997659 -3010,-0.409591591 -3011,0.619166697 -3012,-0.039625859 -3013,0.899353283 -3014,-0.581736165 -3015,-1.617016983 -3016,0.10881189 -3017,-0.398343687 -3018,-1.038820924 -3019,-0.805553842 -3020,0.059831635 -3021,-0.47681932 -3022,-0.482066857 -3023,-0.451901505 -3024,-0.951810286 -3025,-0.282919459 -3026,-1.054046885 -3027,0.680544667 -3028,2.305432365 -3029,0.814222744 -3030,-0.75062428 -3031,0.307324218 -3032,2.090380473 -3033,-0.337565099 -3034,0.332547364 -3035,0.656575369 -3036,-0.104010075 -3037,0.234898912 -3038,-1.2339208 -3039,-0.267204165 -3040,-0.539314624 -3041,1.249965281 -3042,1.014578026 -3043,1.912586853 -3044,-1.884429372 -3045,-0.060941536 -3046,-0.254263458 -3047,-0.351569283 -3048,0.855649018 -3049,1.181216322 -3050,2.454512893 -3051,0.87899496 -3052,2.025137047 -3053,0.136449274 -3054,-0.844987056 -3055,-0.572327419 -3056,1.384363629 -3057,-1.43634002 -3058,0.935482162 -3059,0.316533371 -3060,-0.040314419 -3061,-1.017569219 -3062,-0.09452286 -3063,0.001868817 -3064,-1.299048565 -3065,0.404137833 -3066,1.8638741 -3067,-1.399927264 -3068,-0.336036127 -3069,1.279541258 -3070,-0.887900753 -3071,-0.583338335 -3072,0.836306685 -3073,0.271334729 -3074,0.650660326 -3075,-1.072725962 -3076,0.684874739 -3077,-2.17317185 -3078,1.477109817 -3079,-1.077373748 -3080,-1.95146906 -3081,1.042385598 -3082,0.18683356 -3083,1.872054856 -3084,-0.110892045 -3085,-1.350223241 -3086,-1.163194418 -3087,-0.009518952 -3088,-1.131693163 -3089,-0.679007938 -3090,1.314531691 -3091,-0.398738653 -3092,1.273271753 -3093,1.299015707 -3094,2.297906885 -3095,-0.494159368 -3096,-0.000474041 -3097,1.10458045 -3098,-0.173240281 -3099,-0.07932719 -3100,-0.963275212 -3101,0.215510434 -3102,-0.466957928 -3103,0.312505555 -3104,1.481984685 -3105,-0.040566929 -3106,1.016657668 -3107,1.154163063 -3108,0.397763505 -3109,-1.662017583 -3110,-0.341456601 -3111,-0.496518616 -3112,0.538861026 -3113,-0.056660618 -3114,-0.170741765 -3115,-0.332559745 -3116,0.354804521 -3117,-0.711620086 -3118,-0.444001426 -3119,0.421308488 -3120,-0.717493815 -3121,0.407602713 -3122,-1.322178355 -3123,0.576121279 -3124,-1.062658482 -3125,0.931684722 -3126,0.218573453 -3127,0.894550892 -3128,0.368405171 -3129,0.528062526 -3130,-0.373710317 -3131,-2.121610534 -3132,-0.987524295 -3133,0.55980073 -3134,-0.073761445 -3135,0.065480847 -3136,-0.341632662 -3137,0.09152681 -3138,1.28522935 -3139,0.842115006 -3140,-1.746373374 -3141,-0.801790004 -3142,1.192914612 -3143,0.439794845 -3144,-0.268123717 -3145,-1.774361423 -3146,0.258935166 -3147,0.351301207 -3148,-0.715434221 -3149,-0.205856524 -3150,0.443869931 -3151,0.020367964 -3152,-0.68396282 -3153,0.118329291 -3154,-1.679168415 -3155,-0.043760816 -3156,0.103186003 -3157,0.425986747 -3158,-1.160382771 -3159,-0.740137362 -3160,0.211706998 -3161,0.474028496 -3162,0.529934802 -3163,0.566156732 -3164,-0.533691075 -3165,-0.940053174 -3166,-0.422494867 -3167,1.001946876 -3168,1.262467531 -3169,-0.458774143 -3170,-0.425917021 -3171,-0.8511515 -3172,0.910417837 -3173,1.225462159 -3174,0.630062534 -3175,-1.094564588 -3176,-1.319667023 -3177,-1.019097828 -3178,-1.494771835 -3179,2.042046822 -3180,0.558746333 -3181,-0.86372764 -3182,-0.855933502 -3183,-0.7965938 -3184,0.326472515 -3185,-0.715010838 -3186,-0.176815621 -3187,0.04554198 -3188,-0.109359873 -3189,1.163253467 -3190,0.47773967 -3191,-1.515947586 -3192,-0.130403542 -3193,2.128643561 -3194,0.295353465 -3195,-1.144970071 -3196,2.267687037 -3197,-0.12825442 -3198,1.153413164 -3199,-2.871145904 -3200,-0.54895895 -3201,-0.762037887 -3202,0.912818345 -3203,-0.481265906 -3204,0.01315407 -3205,1.655777093 -3206,-0.278293897 -3207,0.209215575 -3208,1.780231998 -3209,0.398465532 -3210,-0.443851507 -3211,-0.093667589 -3212,-0.430860889 -3213,1.451448308 -3214,-0.473623071 -3215,0.277089431 -3216,-0.026798673 -3217,-0.74404487 -3218,0.150332828 -3219,-0.444602092 -3220,-0.438062059 -3221,0.066799108 -3222,-0.954891989 -3223,0.006209369 -3224,0.133847196 -3225,1.386216938 -3226,-0.118681154 -3227,-0.163418478 -3228,1.297283275 -3229,-0.76625098 -3230,0.067876717 -3231,-1.753220035 -3232,-0.92804515 -3233,-1.433915694 -3234,-0.94397522 -3235,0.110668898 -3236,-0.402241853 -3237,0.377929855 -3238,0.521116084 -3239,-0.709826224 -3240,0.851147968 -3241,1.52432934 -3242,-1.606365076 -3243,-0.228389314 -3244,-0.757926883 -3245,0.524293182 -3246,-0.182860064 -3247,-1.252972973 -3248,0.275883362 -3249,0.156988392 -3250,0.192384531 -3251,0.437543001 -3252,0.206654178 -3253,1.471859591 -3254,-0.868803346 -3255,-0.077447062 -3256,-1.203781581 -3257,-0.202675822 -3258,0.477512088 -3259,-1.014784007 -3260,-1.274694733 -3261,0.838114737 -3262,-0.135399494 -3263,-0.255242737 -3264,1.307066194 -3265,1.328424105 -3266,-1.015527785 -3267,-1.026741883 -3268,-0.894337532 -3269,-1.11538912 -3270,0.026486749 -3271,-0.207249041 -3272,2.714038847 -3273,-1.389011361 -3274,0.811966694 -3275,1.169582948 -3276,0.473861314 -3277,0.403395523 -3278,0.647451797 -3279,0.00983025 -3280,1.404699449 -3281,1.145131565 -3282,-1.00418689 -3283,0.565561224 -3284,0.091157245 -3285,1.637748262 -3286,0.692433066 -3287,-0.479478573 -3288,1.771126898 -3289,-0.184106094 -3290,1.184024486 -3291,0.374253934 -3292,-1.426998131 -3293,0.137416828 -3294,1.1218916 -3295,-0.878948659 -3296,1.070468109 -3297,-1.6957692 -3298,1.307825 -3299,1.249992208 -3300,-0.319345742 -3301,-1.291523851 -3302,0.730682598 -3303,0.537168562 -3304,1.307763576 -3305,0.892988142 -3306,-0.787098963 -3307,-1.067200084 -3308,0.185630092 -3309,0.592377829 -3310,0.250185568 -3311,-0.82204645 -3312,0.623316299 -3313,0.718097855 -3314,-0.902595011 -3315,1.516874286 -3316,-1.544522786 -3317,-0.307906205 -3318,-0.266486728 -3319,-0.582804723 -3320,-0.967249262 -3321,0.192031112 -3322,0.691815811 -3323,2.039955855 -3324,0.210919246 -3325,1.173417788 -3326,-1.128025116 -3327,1.67274211 -3328,0.49878017 -3329,0.803534029 -3330,-0.818355591 -3331,0.811380958 -3332,-0.036210112 -3333,-1.720620044 -3334,1.157485846 -3335,0.107799885 -3336,-1.350666198 -3337,-0.615029882 -3338,0.203938498 -3339,-1.549771472 -3340,0.371047638 -3341,0.227740766 -3342,-1.343365936 -3343,1.314269721 -3344,-1.153223627 -3345,1.54922686 -3346,0.779630131 -3347,-0.038422054 -3348,-0.145442316 -3349,1.303595436 -3350,0.469927932 -3351,1.090798521 -3352,-0.0673522 -3353,1.137173763 -3354,0.587948195 -3355,-0.118169897 -3356,-0.867730682 -3357,-0.444294307 -3358,-0.130640431 -3359,-0.226116695 -3360,-1.227298157 -3361,0.137162593 -3362,1.133639027 -3363,1.382919567 -3364,-1.04247994 -3365,0.992943794 -3366,0.957685511 -3367,0.623397219 -3368,0.4579835 -3369,-1.010810792 -3370,0.303925917 -3371,0.588581991 -3372,1.268494879 -3373,1.440565382 -3374,0.853772067 -3375,-1.256258394 -3376,-1.635020908 -3377,0.769929659 -3378,0.049686479 -3379,0.926343197 -3380,0.207747601 -3381,-0.479909425 -3382,-0.346488811 -3383,1.363418649 -3384,-0.856611786 -3385,0.208258783 -3386,0.153017911 -3387,-0.675791982 -3388,-0.656266269 -3389,-0.650254423 -3390,-0.694907271 -3391,0.453921184 -3392,0.051894876 -3393,1.358529662 -3394,-0.547435712 -3395,-1.584996157 -3396,1.384469437 -3397,-0.302543658 -3398,1.65504899 -3399,-0.71476593 -3400,0.2280074 -3401,-0.011615686 -3402,-0.263996263 -3403,-2.453069055 -3404,0.106491579 -3405,1.221499958 -3406,-0.287032498 -3407,-0.438386072 -3408,-0.678319009 -3409,-0.486439891 -3410,1.163361225 -3411,-0.242624671 -3412,-0.166798603 -3413,0.242737619 -3414,0.243953964 -3415,0.246613815 -3416,0.602788255 -3417,-0.395550705 -3418,2.454693117 -3419,1.785376156 -3420,1.076530721 -3421,0.222138732 -3422,1.013960165 -3423,1.325791804 -3424,0.136728059 -3425,-0.188133847 -3426,1.194365299 -3427,-1.561776189 -3428,-0.639822336 -3429,-0.006237423 -3430,-0.176893969 -3431,0.345245275 -3432,2.291454006 -3433,-0.797927487 -3434,-0.223119356 -3435,-0.53346876 -3436,-1.702929365 -3437,0.009748202 -3438,0.072539433 -3439,-1.42489478 -3440,0.250203815 -3441,-1.613573377 -3442,-1.714244618 -3443,0.52931129 -3444,0.949661446 -3445,0.728056272 -3446,-1.744591351 -3447,-0.091150686 -3448,-0.212973611 -3449,1.439060492 -3450,-0.025915286 -3451,0.533357628 -3452,-1.068597772 -3453,-0.129456934 -3454,-0.046362633 -3455,0.168527042 -3456,-0.529383912 -3457,-1.84081011 -3458,-1.516666007 -3459,-0.238618399 -3460,-1.338882886 -3461,-0.023145086 -3462,0.695503547 -3463,0.20570244 -3464,-0.551178993 -3465,-0.626753262 -3466,1.322232584 -3467,0.87782082 -3468,-0.215140739 -3469,1.363720101 -3470,-1.889896992 -3471,-2.862076562 -3472,-1.011255204 -3473,0.294254126 -3474,1.42546592 -3475,-0.748993264 -3476,0.107728156 -3477,1.610100555 -3478,0.811066017 -3479,0.188372436 -3480,-0.0156526 -3481,-1.252244591 -3482,-0.570630271 -3483,0.411902962 -3484,-0.53640423 -3485,0.303019382 -3486,0.340675225 -3487,2.000929288 -3488,-0.941714973 -3489,-0.472265563 -3490,1.281154513 -3491,-0.909443441 -3492,-0.393276479 -3493,0.667723728 -3494,-1.354269806 -3495,0.352584766 -3496,-2.225284056 -3497,0.074014313 -3498,0.102012024 -3499,-2.49347176 -3500,-0.489005804 -3501,-1.321086007 -3502,0.179418361 -3503,0.827651156 -3504,-0.654775811 -3505,-1.053178682 -3506,-0.360263259 -3507,-0.291301862 -3508,0.098041515 -3509,-0.380103377 -3510,-0.083422071 -3511,0.127867346 -3512,-1.135990595 -3513,-0.37052871 -3514,-0.613468948 -3515,0.315950532 -3516,-2.100403808 -3517,1.113287732 -3518,0.785557975 -3519,0.652473967 -3520,-2.507872716 -3521,-0.80410345 -3522,0.104954606 -3523,0.116647264 -3524,-1.650105019 -3525,-0.494158777 -3526,-1.271253037 -3527,0.206593962 -3528,0.160589153 -3529,-0.055154347 -3530,-0.51914123 -3531,-0.953284129 -3532,-0.450872115 -3533,-1.540825271 -3534,1.233062121 -3535,0.931289023 -3536,-0.246929565 -3537,1.16493305 -3538,0.072495147 -3539,0.065824666 -3540,-0.574105033 -3541,0.326784881 -3542,0.235494093 -3543,-1.661233505 -3544,0.237162131 -3545,0.130896303 -3546,0.975095989 -3547,0.31082144 -3548,-0.481325655 -3549,-0.476011655 -3550,0.144700704 -3551,0.369049034 -3552,0.700988852 -3553,-1.196280778 -3554,1.976995195 -3555,0.426181179 -3556,0.607264372 -3557,0.185429911 -3558,-0.774948404 -3559,-1.46561725 -3560,-0.276725746 -3561,-1.114819096 -3562,-0.543606441 -3563,-0.297038074 -3564,-0.401276781 -3565,0.629123448 -3566,0.857506572 -3567,-0.270581201 -3568,-0.374373171 -3569,-0.803082026 -3570,-1.220895979 -3571,0.009389999 -3572,0.501850729 -3573,0.859609652 -3574,0.603375464 -3575,0.438652259 -3576,0.197028247 -3577,-0.127800557 -3578,2.058992021 -3579,-0.101879339 -3580,1.168641648 -3581,-0.476932644 -3582,1.974223153 -3583,0.775848288 -3584,1.846385842 -3585,-0.707795945 -3586,-0.049412797 -3587,-0.211790435 -3588,-0.154290219 -3589,0.592975633 -3590,0.671516577 -3591,0.802665431 -3592,0.632465974 -3593,-0.181074814 -3594,1.860350755 -3595,-1.585117594 -3596,0.228128347 -3597,0.598268758 -3598,1.16014915 -3599,0.384168732 -3600,0.246067423 -3601,-1.398574576 -3602,0.528364621 -3603,0.028748628 -3604,1.507942718 -3605,-1.062469567 -3606,0.919349737 -3607,0.183255169 -3608,-0.150326179 -3609,-1.169321099 -3610,0.471789345 -3611,0.060518554 -3612,1.199414946 -3613,0.958418724 -3614,1.027650523 -3615,1.140057945 -3616,-0.907783494 -3617,-0.569416175 -3618,-1.432925933 -3619,0.943672655 -3620,-0.08188434 -3621,2.28046923 -3622,0.184030565 -3623,-0.316600581 -3624,0.288050226 -3625,-0.692567741 -3626,1.068565282 -3627,0.267317154 -3628,-0.224814729 -3629,-0.10806229 -3630,-0.765663768 -3631,0.279836979 -3632,0.284020864 -3633,0.862282006 -3634,0.931282317 -3635,-0.04299917 -3636,0.239372015 -3637,0.738876089 -3638,0.250573484 -3639,0.433762129 -3640,-1.609148649 -3641,0.081724324 -3642,0.215384769 -3643,-0.940713369 -3644,-0.559129462 -3645,-0.083504557 -3646,0.036199897 -3647,-0.206853296 -3648,0.41332639 -3649,-0.935604534 -3650,0.274784831 -3651,-1.576113759 -3652,-0.330248983 -3653,2.457568627 -3654,2.441733281 -3655,-1.039265755 -3656,-1.23662155 -3657,-1.43727201 -3658,0.768993885 -3659,-1.449648414 -3660,-0.65516761 -3661,-1.458938279 -3662,0.511341146 -3663,0.075293049 -3664,-0.435462873 -3665,1.565887971 -3666,1.304430327 -3667,-0.329604291 -3668,2.42003043 -3669,0.355628773 -3670,-0.711796824 -3671,-0.67638943 -3672,-1.33889754 -3673,-0.047464428 -3674,-0.861151011 -3675,-0.915100107 -3676,-1.241390761 -3677,2.107587825 -3678,1.272382446 -3679,-1.288769419 -3680,0.783281241 -3681,-0.287902397 -3682,0.402044264 -3683,-0.888716616 -3684,0.740510759 -3685,-0.739674722 -3686,0.681888397 -3687,-0.244133002 -3688,-1.327591726 -3689,-2.154089403 -3690,0.008793169 -3691,0.835131579 -3692,-0.889854782 -3693,0.167197893 -3694,-0.312903136 -3695,-2.46158028 -3696,-0.368678526 -3697,0.236017075 -3698,-0.463593508 -3699,0.196036489 -3700,-1.380928351 -3701,0.588330749 -3702,1.209242453 -3703,-0.699337785 -3704,0.902743642 -3705,3.120653726 -3706,0.492563937 -3707,0.250927929 -3708,1.592938785 -3709,-0.199029489 -3710,-0.388869744 -3711,0.328348417 -3712,-0.798938614 -3713,-1.753906566 -3714,-0.523305634 -3715,1.631953757 -3716,-0.256616902 -3717,1.495169338 -3718,-1.078197732 -3719,0.199215952 -3720,0.011682613 -3721,-1.422906636 -3722,0.663412423 -3723,0.304180617 -3724,-1.162328818 -3725,-0.440649953 -3726,-0.271511647 -3727,-0.634637601 -3728,-1.265723447 -3729,-0.923105652 -3730,0.744342402 -3731,0.59451026 -3732,0.822234089 -3733,1.424037441 -3734,0.596087367 -3735,-0.316411174 -3736,-0.486439319 -3737,-0.154706813 -3738,0.92586158 -3739,0.822566122 -3740,-0.135648741 -3741,-0.37001192 -3742,1.22278289 -3743,0.302844947 -3744,-1.036532558 -3745,1.653865904 -3746,1.15458381 -3747,0.243178986 -3748,-0.095979334 -3749,1.765969861 -3750,0.597541841 -3751,-1.838092516 -3752,0.060409977 -3753,-0.40013272 -3754,0.742596675 -3755,0.453623335 -3756,-0.483806639 -3757,0.958786261 -3758,-0.857157465 -3759,2.068893981 -3760,2.061594062 -3761,-0.599267072 -3762,-0.410301359 -3763,-0.272119819 -3764,-0.889743486 -3765,0.459313473 -3766,-2.13148346 -3767,-0.022686083 -3768,0.93091079 -3769,-0.592724897 -3770,1.150829142 -3771,1.89191259 -3772,-0.774547413 -3773,-0.020140653 -3774,-0.787116588 -3775,-0.876233978 -3776,-1.24308564 -3777,-1.524409116 -3778,0.798693607 -3779,-0.17359801 -3780,-0.803934233 -3781,-1.965221696 -3782,0.726954853 -3783,-0.404902699 -3784,1.125730936 -3785,-0.011416475 -3786,0.322537374 -3787,-0.774937051 -3788,0.645242074 -3789,-0.301381175 -3790,-0.710290395 -3791,1.215884786 -3792,-0.623977208 -3793,0.317395096 -3794,0.105408035 -3795,0.271056251 -3796,-1.298965691 -3797,0.88179649 -3798,-1.505267687 -3799,0.421336051 -3800,0.514645843 -3801,0.520166428 -3802,-0.344774684 -3803,-0.631384985 -3804,0.402485181 -3805,0.641591645 -3806,0.698494393 -3807,0.124502808 -3808,-1.19875465 -3809,-0.013195424 -3810,-0.598387824 -3811,0.820536589 -3812,2.103347783 -3813,-0.366694485 -3814,0.933660132 -3815,-1.762143293 -3816,1.969292725 -3817,1.208358649 -3818,-0.239673711 -3819,-0.670389155 -3820,1.822925916 -3821,-0.957935989 -3822,-0.642263417 -3823,0.47533235 -3824,0.094055838 -3825,-0.095121027 -3826,1.49839273 -3827,-0.055669777 -3828,1.177386652 -3829,-0.176577164 -3830,0.417799942 -3831,0.69829545 -3832,-0.500162946 -3833,0.748458028 -3834,0.754545762 -3835,0.631003039 -3836,0.171796967 -3837,0.958076871 -3838,-0.085109308 -3839,1.144285043 -3840,1.104098837 -3841,0.321835071 -3842,1.083802913 -3843,-0.175465094 -3844,-2.334344854 -3845,-2.756318035 -3846,1.171984271 -3847,-0.313458462 -3848,0.661587518 -3849,0.479921854 -3850,0.355815978 -3851,0.597210818 -3852,-0.671037052 -3853,-1.556347603 -3854,-2.567437926 -3855,-0.493561886 -3856,-1.417933999 -3857,-0.181740737 -3858,-2.265220459 -3859,-0.054214348 -3860,-0.521075147 -3861,1.119217969 -3862,0.793078864 -3863,-0.332638039 -3864,0.700916811 -3865,-1.520720636 -3866,0.591024964 -3867,1.113551362 -3868,0.600598779 -3869,0.653925559 -3870,-0.325778307 -3871,-1.189985323 -3872,-1.335746396 -3873,-0.152801952 -3874,-0.73873003 -3875,0.361143466 -3876,-1.145806458 -3877,0.506792293 -3878,-0.966727593 -3879,0.095903974 -3880,-0.589977932 -3881,0.244665777 -3882,-1.060802129 -3883,-1.632891786 -3884,0.129528408 -3885,0.566145159 -3886,0.521415033 -3887,2.230218968 -3888,0.070547442 -3889,0.378058167 -3890,0.492228212 -3891,-1.037520965 -3892,-1.563680176 -3893,0.470848221 -3894,-0.393231984 -3895,-1.011543043 -3896,-0.417994393 -3897,1.252572344 -3898,1.367396549 -3899,-0.076755654 -3900,-1.123165167 -3901,1.83863243 -3902,0.659468394 -3903,-1.613828876 -3904,2.137819863 -3905,-0.776158187 -3906,-0.767423147 -3907,-1.498205411 -3908,-1.193841763 -3909,1.055422761 -3910,0.715619377 -3911,0.336018258 -3912,1.468955783 -3913,1.177453251 -3914,1.669597699 -3915,0.372945562 -3916,-0.789194394 -3917,-0.931397853 -3918,0.177265386 -3919,-1.274918115 -3920,0.728533459 -3921,0.321053754 -3922,-1.586213007 -3923,-1.471617507 -3924,1.473065189 -3925,-0.643991045 -3926,-0.481139218 -3927,1.812295497 -3928,0.727209538 -3929,-0.135655458 -3930,0.168567384 -3931,2.877788229 -3932,-0.017972741 -3933,0.10611787 -3934,0.439672986 -3935,0.724280676 -3936,0.48213879 -3937,-1.625407731 -3938,2.340002306 -3939,-0.387257542 -3940,-0.60382151 -3941,0.588769635 -3942,1.662767608 -3943,-0.432388133 -3944,-0.264412437 -3945,2.679347137 -3946,-0.382326951 -3947,0.319439033 -3948,-0.548300992 -3949,0.724482041 -3950,0.414673288 -3951,0.432461939 -3952,-0.425660441 -3953,0.692132656 -3954,0.838413911 -3955,0.234153289 -3956,1.291395877 -3957,1.376295848 -3958,-2.191816939 -3959,0.365472954 -3960,0.671566779 -3961,-0.235506329 -3962,0.341898432 -3963,-0.984706255 -3964,0.071310853 -3965,-2.048392578 -3966,1.413534795 -3967,-0.500409532 -3968,0.825254002 -3969,-0.541807723 -3970,-1.255399156 -3971,0.663513088 -3972,-1.241530461 -3973,1.854033525 -3974,0.891054612 -3975,0.161575011 -3976,-0.635948854 -3977,0.851963715 -3978,0.653977345 -3979,2.301705943 -3980,1.444164351 -3981,0.555059879 -3982,-0.560070896 -3983,0.229496186 -3984,0.508866201 -3985,-1.747275152 -3986,-0.780695959 -3987,0.026163975 -3988,0.366686131 -3989,-2.045712527 -3990,-0.9361885 -3991,1.018094155 -3992,1.06423587 -3993,1.110719002 -3994,-0.371580793 -3995,-0.485542867 -3996,-0.11428997 -3997,1.181367915 -3998,-2.817977316 -3999,0.056737841 -4000,0.519987304 -4001,-0.860772205 -4002,1.064446407 -4003,-0.40218067 -4004,1.573180424 -4005,0.247821946 -4006,-1.451715264 -4007,0.4401337 -4008,0.159914903 -4009,2.494324317 -4010,-0.559078526 -4011,-1.117399721 -4012,-0.915103724 -4013,-0.384731654 -4014,0.791827827 -4015,-0.413873576 -4016,-1.066826482 -4017,-0.214558252 -4018,1.042970595 -4019,1.795867785 -4020,-0.73792781 -4021,0.44047038 -4022,0.831546566 -4023,1.545196321 -4024,1.806567004 -4025,-1.34731355 -4026,-0.270667087 -4027,0.98408258 -4028,0.815271681 -4029,-1.252399628 -4030,0.438140898 -4031,1.505331476 -4032,0.699657968 -4033,-0.389681184 -4034,0.001881974 -4035,0.542718043 -4036,-0.216050421 -4037,-0.135226732 -4038,0.623788659 -4039,-1.790495385 -4040,-2.158656275 -4041,-1.181198869 -4042,2.230796863 -4043,-1.246520072 -4044,0.342547345 -4045,0.004400658 -4046,1.729575789 -4047,-1.251814537 -4048,0.268383504 -4049,1.61733866 -4050,0.863110849 -4051,1.828190845 -4052,-0.120716595 -4053,0.123163563 -4054,0.864383974 -4055,0.680849844 -4056,-1.757330292 -4057,-0.304328753 -4058,1.173193331 -4059,-1.002919674 -4060,-1.547134109 -4061,-0.588217199 -4062,0.609730249 -4063,-0.849206463 -4064,-0.166595413 -4065,0.506645328 -4066,0.728892442 -4067,-2.728664593 -4068,-0.236086599 -4069,-0.997030896 -4070,0.000933148 -4071,-0.461089011 -4072,1.877012661 -4073,-0.289952383 -4074,-1.153174556 -4075,-0.192766605 -4076,-0.083381931 -4077,-0.919351653 -4078,-1.119398458 -4079,1.88257933 -4080,1.904154805 -4081,-0.492495175 -4082,-1.558736306 -4083,-0.112543163 -4084,2.074896692 -4085,0.693537224 -4086,-0.065863797 -4087,1.408790573 -4088,1.456918574 -4089,1.218513847 -4090,0.516711899 -4091,0.540817255 -4092,0.587580151 -4093,-1.44973339 -4094,-0.632415845 -4095,-0.696928618 -4096,0.738742193 -4097,-0.361456933 -4098,-0.611036848 -4099,-1.354584857 -4100,0.834172336 -4101,1.308046486 -4102,0.453864641 -4103,0.422034968 -4104,-1.216792096 -4105,-4.000263287 -4106,-0.85983795 -4107,-0.130052337 -4108,-1.447103582 -4109,-0.267868163 -4110,-0.012492859 -4111,0.074635317 -4112,-0.323071859 -4113,1.660677116 -4114,-1.199667702 -4115,1.561810788 -4116,-1.833599014 -4117,-0.343860722 -4118,0.230359303 -4119,0.725676106 -4120,0.38638206 -4121,-0.044798771 -4122,0.745467252 -4123,1.580356543 -4124,0.357097159 -4125,-0.806176798 -4126,-0.123135415 -4127,-2.113611683 -4128,-0.006357575 -4129,0.8340264 -4130,0.910656973 -4131,-0.07264445 -4132,-0.608277831 -4133,0.325080852 -4134,0.80411108 -4135,1.837007748 -4136,1.552420112 -4137,0.297980114 -4138,0.018726399 -4139,0.574737088 -4140,-0.382239796 -4141,-0.580729197 -4142,-1.16058727 -4143,-0.670732268 -4144,0.18067945 -4145,0.421799628 -4146,0.21804044 -4147,0.247558429 -4148,0.753045162 -4149,1.767829983 -4150,0.349291379 -4151,-1.225530788 -4152,0.207052605 -4153,0.429712593 -4154,0.060213325 -4155,0.291020003 -4156,0.068444521 -4157,0.366074313 -4158,0.56909319 -4159,1.101906771 -4160,-1.096500239 -4161,0.566519746 -4162,0.61108549 -4163,-0.228699901 -4164,-0.843354728 -4165,-1.07205514 -4166,-2.910164511 -4167,1.050809065 -4168,0.940164058 -4169,-1.978124033 -4170,0.540188153 -4171,0.34383292 -4172,0.302345186 -4173,-1.466482415 -4174,1.229026054 -4175,-0.010065523 -4176,1.687786341 -4177,-0.941611186 -4178,-0.793947314 -4179,0.796541462 -4180,0.377252647 -4181,0.105856776 -4182,0.924991875 -4183,0.537564827 -4184,-2.086254677 -4185,1.159667891 -4186,0.732669319 -4187,-1.912835239 -4188,0.201765978 -4189,-0.737874625 -4190,0.056725222 -4191,0.328896974 -4192,-0.116508481 -4193,-0.179283177 -4194,-0.858791784 -4195,0.707318558 -4196,-0.352071017 -4197,0.106606792 -4198,1.124296545 -4199,-1.225984992 -4200,-0.747831775 -4201,-2.219784288 -4202,1.751757833 -4203,0.452283054 -4204,0.870319193 -4205,0.036988402 -4206,0.096318995 -4207,-0.58284027 -4208,-0.043375196 -4209,0.146744732 -4210,-0.402611362 -4211,-0.031862158 -4212,0.481401604 -4213,-0.048397118 -4214,-0.661390953 -4215,-0.597546798 -4216,0.126347547 -4217,3.772044958 -4218,1.244020958 -4219,1.86802006 -4220,0.038003154 -4221,-1.194223992 -4222,0.327126958 -4223,-0.803408353 -4224,1.997144432 -4225,0.448986825 -4226,-0.569160382 -4227,0.385177381 -4228,1.099949183 -4229,0.048450799 -4230,-1.173381649 -4231,1.768271811 -4232,-0.126846282 -4233,-0.610673747 -4234,1.574743844 -4235,-0.847238041 -4236,-0.347748493 -4237,1.331658009 -4238,-0.836086274 -4239,0.07422453 -4240,-2.152157303 -4241,-1.038478566 -4242,-0.190756925 -4243,-1.414360184 -4244,-0.981393425 -4245,2.615128325 -4246,1.007904523 -4247,0.56155192 -4248,-0.616849853 -4249,-1.447046789 -4250,0.138784163 -4251,-2.024928479 -4252,-0.690765708 -4253,0.731744479 -4254,0.426734255 -4255,-0.133569108 -4256,-0.046201988 -4257,-0.776879138 -4258,-0.589345271 -4259,-1.008726557 -4260,-2.991653335 -4261,-0.09265099 -4262,-0.147611769 -4263,0.904436055 -4264,1.147672865 -4265,-1.326494913 -4266,-0.757619424 -4267,0.166375984 -4268,-0.321384102 -4269,-0.193280118 -4270,-1.34894192 -4271,-1.911835873 -4272,-1.321526341 -4273,-1.320148384 -4274,1.516536911 -4275,-0.344457438 -4276,0.474309409 -4277,-0.201356145 -4278,-0.099605938 -4279,1.329257497 -4280,0.79438175 -4281,-0.75611226 -4282,0.394039341 -4283,0.754883021 -4284,-0.705527364 -4285,-0.003634629 -4286,-0.150393852 -4287,0.469485572 -4288,0.879297642 -4289,1.293565263 -4290,-1.65981301 -4291,0.192666979 -4292,-0.707457819 -4293,-0.237714372 -4294,-0.583779981 -4295,1.539832764 -4296,-0.535849965 -4297,1.438418385 -4298,0.939904811 -4299,-1.351156887 -4300,0.430264371 -4301,-0.776787683 -4302,0.195879654 -4303,0.481642477 -4304,0.168412983 -4305,0.225455338 -4306,1.71497683 -4307,-1.439061579 -4308,0.705993251 -4309,-0.398038172 -4310,2.088671737 -4311,-0.57170232 -4312,0.327315159 -4313,1.939379529 -4314,0.857258672 -4315,0.790738285 -4316,-1.976685252 -4317,-0.295419255 -4318,-0.084616786 -4319,0.186754853 -4320,-1.212238319 -4321,-0.580554849 -4322,-0.569767463 -4323,-0.683453724 -4324,-0.521981545 -4325,-1.283362991 -4326,-0.444248875 -4327,0.721415628 -4328,-0.402902657 -4329,-0.585991355 -4330,0.010916888 -4331,0.293698832 -4332,0.936145243 -4333,-1.794982879 -4334,0.434351309 -4335,1.94600273 -4336,0.104999294 -4337,-0.769814387 -4338,-0.201967924 -4339,0.989077071 -4340,-1.376273747 -4341,-0.827621211 -4342,-0.145935581 -4343,-0.84107668 -4344,-1.733515711 -4345,-0.532355108 -4346,-1.776001017 -4347,-0.744035213 -4348,-1.444394705 -4349,1.451040618 -4350,-0.295310801 -4351,0.445154216 -4352,0.046416413 -4353,-1.282954729 -4354,-0.248326907 -4355,0.516028638 -4356,-0.602572487 -4357,-0.244424377 -4358,-0.545556435 -4359,0.730077672 -4360,-2.500958155 -4361,-1.569035773 -4362,0.279212478 -4363,0.915123564 -4364,-0.579093417 -4365,-0.426643464 -4366,1.877803416 -4367,-0.47413369 -4368,-0.373006307 -4369,-0.412973838 -4370,1.559799196 -4371,0.392011137 -4372,-0.867967407 -4373,0.162108997 -4374,-0.167354019 -4375,1.155405756 -4376,-0.162520828 -4377,-0.188444495 -4378,-0.495731158 -4379,-0.356549881 -4380,-0.657780215 -4381,1.069234577 -4382,1.022454793 -4383,1.105333933 -4384,-0.78024183 -4385,-0.094236608 -4386,-1.6431153 -4387,0.697919856 -4388,-1.146320962 -4389,0.102595526 -4390,0.401177902 -4391,2.204006175 -4392,1.458648637 -4393,0.727744593 -4394,0.121085886 -4395,2.818306076 -4396,0.096743629 -4397,-0.625712401 -4398,-0.230617683 -4399,-0.28941292 -4400,-1.314697098 -4401,-1.267031513 -4402,0.328700667 -4403,0.53346196 -4404,0.094957124 -4405,-0.755935751 -4406,1.885460268 -4407,0.223282025 -4408,-0.424319707 -4409,-0.354216853 -4410,1.455914313 -4411,-1.259461678 -4412,1.460268115 -4413,1.620042619 -4414,0.147427311 -4415,-0.275690551 -4416,1.93187167 -4417,0.593019155 -4418,-0.091873094 -4419,0.041033009 -4420,-1.38862848 -4421,-0.464961378 -4422,-0.636679673 -4423,-0.189673944 -4424,-0.902206141 -4425,1.884901494 -4426,-0.980954424 -4427,0.18151574 -4428,-1.221160557 -4429,-0.152339237 -4430,-0.438623018 -4431,-1.083926677 -4432,-1.54667844 -4433,-0.753025169 -4434,-1.45111007 -4435,2.181929869 -4436,-0.88915552 -4437,-0.340660248 -4438,-0.015007512 -4439,1.442692811 -4440,0.474468408 -4441,0.939656858 -4442,0.801852308 -4443,-1.358361542 -4444,-0.903292607 -4445,0.740760517 -4446,0.879422929 -4447,-0.758865828 -4448,0.375083256 -4449,-0.094255766 -4450,-1.327555106 -4451,0.405914297 -4452,0.600894215 -4453,0.075363307 -4454,-0.388545282 -4455,0.718095489 -4456,0.325433147 -4457,-0.263692057 -4458,-2.383337942 -4459,0.039583741 -4460,0.976464449 -4461,-0.794863694 -4462,-1.150564045 -4463,0.231705544 -4464,-1.275915797 -4465,1.244454504 -4466,0.207208758 -4467,-2.159896229 -4468,1.368936143 -4469,-0.016905458 -4470,1.117863386 -4471,-1.663211243 -4472,1.865761641 -4473,1.328106306 -4474,0.251483295 -4475,-0.695850286 -4476,0.774718383 -4477,-0.732216863 -4478,0.513056678 -4479,0.892828663 -4480,-2.28536014 -4481,-1.874426657 -4482,-1.664323561 -4483,-1.748602947 -4484,2.092263276 -4485,-0.283981393 -4486,-1.014428223 -4487,-1.514111553 -4488,-0.519070711 -4489,2.499691587 -4490,0.386937675 -4491,0.831520949 -4492,-2.250232975 -4493,-0.608405967 -4494,0.792331551 -4495,0.861482229 -4496,1.452911558 -4497,0.686237381 -4498,0.078723328 -4499,-0.149609421 -4500,0.348140474 -4501,0.945176947 -4502,-1.196684107 -4503,0.540603975 -4504,1.888521371 -4505,0.450497508 -4506,0.186993845 -4507,-1.001665493 -4508,0.404682677 -4509,0.3422847 -4510,0.19792159 -4511,-1.353025186 -4512,-1.192965778 -4513,-0.03434994 -4514,-0.473705097 -4515,-0.775596988 -4516,1.081800051 -4517,0.449274741 -4518,0.123333965 -4519,-2.679369365 -4520,-0.650252164 -4521,0.367189854 -4522,0.512288185 -4523,-0.835290029 -4524,0.526306585 -4525,-0.083369904 -4526,0.652427399 -4527,1.511889104 -4528,-0.639102244 -4529,-0.8372011 -4530,-0.458210305 -4531,0.17850486 -4532,0.519577539 -4533,-0.693080826 -4534,2.230617807 -4535,0.750747531 -4536,1.425335576 -4537,1.335085027 -4538,-0.039384819 -4539,-0.522587506 -4540,-0.266787202 -4541,1.497568957 -4542,-1.080552165 -4543,1.94581472 -4544,0.799702542 -4545,0.734252271 -4546,0.891437376 -4547,-1.053982721 -4548,-0.943228459 -4549,2.446102674 -4550,-1.03842509 -4551,-0.259794116 -4552,0.268556632 -4553,0.491630541 -4554,-0.564547081 -4555,1.131251661 -4556,-0.578473883 -4557,-0.12011552 -4558,-1.012423496 -4559,-1.287495199 -4560,1.772567102 -4561,2.392627803 -4562,0.196504379 -4563,0.457791383 -4564,0.314873994 -4565,-0.504231137 -4566,0.712799217 -4567,2.695489907 -4568,-0.206382794 -4569,-0.144212464 -4570,0.547054531 -4571,-0.440960713 -4572,0.356219445 -4573,-0.642407654 -4574,1.673561283 -4575,0.382348541 -4576,1.982263775 -4577,0.6452742 -4578,-0.262958584 -4579,0.247435641 -4580,-0.528821639 -4581,-0.484106577 -4582,1.03460603 -4583,0.274286305 -4584,-0.695644202 -4585,-1.644565325 -4586,0.654754529 -4587,-0.799053346 -4588,0.523094354 -4589,-0.675352679 -4590,0.708392964 -4591,0.118114181 -4592,0.306405573 -4593,0.212302581 -4594,0.959542286 -4595,0.64127794 -4596,0.088336818 -4597,0.679904336 -4598,-0.775081705 -4599,-0.171586495 -4600,0.75060229 -4601,-0.460925761 -4602,2.2576706 -4603,0.439591664 -4604,-0.479399599 -4605,0.807672327 -4606,-2.650096632 -4607,0.573237352 -4608,0.493360962 -4609,1.498499983 -4610,0.871263385 -4611,0.875508178 -4612,0.219942954 -4613,-0.439556825 -4614,-0.18090777 -4615,-1.01615646 -4616,1.328784276 -4617,0.143497667 -4618,0.029567528 -4619,0.079387817 -4620,0.815925801 -4621,2.547350965 -4622,-0.31211668 -4623,0.712722951 -4624,0.190696983 -4625,0.934896809 -4626,-0.968833964 -4627,-0.481059743 -4628,0.935553296 -4629,-0.859586615 -4630,-0.133213508 -4631,0.846494679 -4632,-1.230525673 -4633,-0.175338337 -4634,0.536562588 -4635,0.562665243 -4636,2.536101102 -4637,-1.790827276 -4638,-0.660118763 -4639,1.851931268 -4640,0.786147797 -4641,1.034338101 -4642,0.45014959 -4643,-0.683011 -4644,-0.086861242 -4645,-0.316962818 -4646,-0.258909339 -4647,-0.843320784 -4648,0.574079356 -4649,0.424887154 -4650,0.59359596 -4651,0.204081177 -4652,-1.004480564 -4653,-0.038173584 -4654,1.514390531 -4655,0.447668374 -4656,0.665693031 -4657,1.096725389 -4658,-0.53132251 -4659,0.190228787 -4660,0.068187654 -4661,-0.769890938 -4662,0.454511917 -4663,-0.221013735 -4664,-1.316300133 -4665,-1.61875535 -4666,0.804151669 -4667,1.099987767 -4668,-1.484283662 -4669,1.110025176 -4670,0.058340254 -4671,-0.977410147 -4672,1.791397957 -4673,-0.391403491 -4674,0.48547575 -4675,-0.863026858 -4676,0.586080466 -4677,1.943787868 -4678,-0.235947822 -4679,-0.604755307 -4680,-2.717401512 -4681,-0.791118204 -4682,-0.265294567 -4683,-0.57639986 -4684,0.290050611 -4685,-0.354913487 -4686,-1.978084067 -4687,0.810688484 -4688,0.869273026 -4689,-0.443997124 -4690,-2.284316649 -4691,0.317816565 -4692,1.271577797 -4693,-0.562210234 -4694,-0.834224845 -4695,-0.229258038 -4696,1.937589908 -4697,-0.61021538 -4698,0.083770601 -4699,-0.627158307 -4700,-1.586615945 -4701,-0.064501877 -4702,-0.706858888 -4703,-0.522706848 -4704,1.708300205 -4705,-1.269340065 -4706,-0.283883391 -4707,-0.512414768 -4708,1.879029753 -4709,-1.422291227 -4710,-0.963228144 -4711,0.053777604 -4712,-0.731107196 -4713,-1.233489619 -4714,1.921351851 -4715,-0.15692672 -4716,0.067937741 -4717,-0.17676985 -4718,-1.90323524 -4719,-1.183038301 -4720,0.327732584 -4721,-1.553469397 -4722,-1.059830235 -4723,0.129612396 -4724,0.317038256 -4725,-0.636076203 -4726,1.381767544 -4727,0.304720718 -4728,-1.464481574 -4729,0.435629035 -4730,-0.59276313 -4731,-1.186579377 -4732,-2.65984733 -4733,1.47146543 -4734,0.181709565 -4735,-0.973926368 -4736,0.129366276 -4737,1.161054186 -4738,-0.098808255 -4739,0.009552781 -4740,-0.219986657 -4741,0.538710295 -4742,0.531078191 -4743,-0.219601527 -4744,-1.238876162 -4745,0.09167279 -4746,-0.646262273 -4747,2.106051992 -4748,0.220917554 -4749,-0.075490444 -4750,1.322588036 -4751,-0.574603662 -4752,1.948116472 -4753,2.458962646 -4754,0.74134174 -4755,0.141558728 -4756,-0.635600062 -4757,1.099576039 -4758,-0.495086261 -4759,0.936364942 -4760,0.509192287 -4761,0.355692576 -4762,0.107551392 -4763,-2.06195429 -4764,-1.561466873 -4765,-0.594623437 -4766,0.122600381 -4767,-0.035194297 -4768,-0.474291919 -4769,-0.464652274 -4770,0.514882548 -4771,-0.911489229 -4772,-0.103556225 -4773,0.135935508 -4774,-0.560801939 -4775,-0.534995535 -4776,-1.263575722 -4777,0.986404016 -4778,1.38685767 -4779,-0.385151068 -4780,-1.37997992 -4781,-0.356466138 -4782,-0.737252471 -4783,1.580975883 -4784,-0.09758729 -4785,-0.121770271 -4786,0.825004011 -4787,0.738166062 -4788,-1.218130896 -4789,-0.402958489 -4790,-2.132847491 -4791,0.993825836 -4792,1.193778206 -4793,0.686637769 -4794,0.609850342 -4795,0.550128027 -4796,1.784632934 -4797,1.371150277 -4798,-0.947127019 -4799,-0.020018948 -4800,0.77225844 -4801,-0.061649207 -4802,-2.068989832 -4803,-0.256441584 -4804,1.422410483 -4805,-0.608050604 -4806,0.240519073 -4807,-0.351949932 -4808,0.197221525 -4809,-0.108854334 -4810,0.115840243 -4811,0.295110178 -4812,0.613876975 -4813,0.454041425 -4814,0.355883537 -4815,1.650472457 -4816,-0.214247302 -4817,-0.541016778 -4818,-0.494342213 -4819,0.623633105 -4820,0.48775803 -4821,-1.548306462 -4822,-1.354596452 -4823,1.050083687 -4824,0.319355087 -4825,0.169298726 -4826,-0.061333359 -4827,0.783072998 -4828,-0.20325749 -4829,-0.445050918 -4830,0.115757126 -4831,-0.294046432 -4832,0.342774869 -4833,1.174864882 -4834,-0.308483499 -4835,0.8386003 -4836,0.209708896 -4837,1.86825829 -4838,0.414798604 -4839,0.093867133 -4840,0.154598572 -4841,-0.587651233 -4842,0.328937899 -4843,-0.786673423 -4844,0.360589687 -4845,-0.790966365 -4846,1.140999338 -4847,0.703618455 -4848,1.624023998 -4849,-0.867044664 -4850,-0.053043026 -4851,-0.240018745 -4852,-0.854183293 -4853,-0.103447001 -4854,-1.156529432 -4855,-1.507806498 -4856,0.690548192 -4857,0.255605152 -4858,-2.573491806 -4859,2.257459237 -4860,-0.150025276 -4861,0.44614994 -4862,-0.809864149 -4863,-1.317431611 -4864,0.806137537 -4865,-1.300525667 -4866,-0.813206414 -4867,-1.219292695 -4868,-0.246625207 -4869,-0.119286396 -4870,-0.727601921 -4871,-1.024897591 -4872,-0.135793664 -4873,2.112369907 -4874,-0.491009603 -4875,0.602783052 -4876,0.692435226 -4877,0.306366277 -4878,-0.003850173 -4879,-0.549710804 -4880,0.167732733 -4881,-0.279159717 -4882,0.784074853 -4883,0.496654499 -4884,0.163171214 -4885,1.46993281 -4886,-1.344972044 -4887,-0.495697987 -4888,-1.374394188 -4889,0.525565207 -4890,-1.718033856 -4891,-1.274326157 -4892,-1.179341205 -4893,-1.080621449 -4894,0.542869554 -4895,0.081431318 -4896,-1.293594394 -4897,-0.319153592 -4898,0.609450834 -4899,-0.155944382 -4900,2.03956856 -4901,-1.392672904 -4902,-1.520662743 -4903,0.144841104 -4904,0.988736587 -4905,1.348447129 -4906,-2.556887314 -4907,0.404222687 -4908,-0.843334102 -4909,0.004677711 -4910,-1.110580222 -4911,-0.221459826 -4912,-0.001553207 -4913,0.840011507 -4914,-0.053301234 -4915,-1.252316471 -4916,-0.371274302 -4917,0.201060967 -4918,1.739561447 -4919,0.509900878 -4920,0.370069993 -4921,0.997370398 -4922,-1.676558655 -4923,-0.347653587 -4924,0.467927918 -4925,0.632424357 -4926,-1.247304878 -4927,-0.049387837 -4928,-0.196787901 -4929,-0.403675738 -4930,-0.208750085 -4931,0.623074753 -4932,-0.60900144 -4933,-0.279758295 -4934,0.032838023 -4935,-0.395234053 -4936,0.116930293 -4937,1.293149386 -4938,-1.156537764 -4939,0.654238088 -4940,0.470188074 -4941,0.626961153 -4942,-1.934336007 -4943,-0.948983699 -4944,-1.39081792 -4945,-0.685466271 -4946,-1.493673372 -4947,-2.159878394 -4948,1.144794834 -4949,1.480103636 -4950,1.571313351 -4951,-0.182462914 -4952,-0.127183878 -4953,1.267335027 -4954,0.798584376 -4955,0.382585536 -4956,0.395788727 -4957,1.661184443 -4958,1.451687712 -4959,0.606047852 -4960,0.779630953 -4961,-0.588774334 -4962,-1.882189047 -4963,-1.628209131 -4964,0.151367682 -4965,0.741744293 -4966,-1.04471943 -4967,-0.333154264 -4968,-0.645599467 -4969,-0.293837108 -4970,1.746841687 -4971,0.395692452 -4972,-2.142521218 -4973,-0.88480443 -4974,0.091396467 -4975,2.697334106 -4976,-2.392649254 -4977,-0.85732911 -4978,1.619608228 -4979,-0.148679982 -4980,0.035143834 -4981,0.349454275 -4982,0.011357834 -4983,1.248925789 -4984,-0.138895465 -4985,0.26011409 -4986,-1.401690459 -4987,-1.483107607 -4988,-0.97495844 -4989,-0.319840691 -4990,2.174492207 -4991,0.05086246 -4992,1.962835317 -4993,-0.403347861 -4994,0.542689796 -4995,0.947824383 -4996,0.473323056 -4997,0.679063293 -4998,-0.791764976 -4999,0.899501581 -5000,0.806412343 -5001,-0.655375543 -5002,-0.558761225 -5003,-1.242051244 -5004,-0.497642105 -5005,-1.355308711 -5006,-0.156574933 -5007,-0.266460361 -5008,-0.1148038 -5009,-1.289032837 -5010,0.538273002 -5011,0.544589964 -5012,-0.018884616 -5013,-0.243527754 -5014,2.72942441 -5015,-0.696912424 -5016,0.424690001 -5017,-0.762378758 -5018,0.118170087 -5019,-0.099152858 -5020,-0.561578091 -5021,0.728417128 -5022,0.201099263 -5023,-0.903212361 -5024,0.737415432 -5025,1.734177645 -5026,-1.401785813 -5027,1.648168925 -5028,-1.596523371 -5029,1.059377493 -5030,0.945206942 -5031,0.359768037 -5032,-0.016137309 -5033,0.721174934 -5034,-1.505512422 -5035,0.229368442 -5036,-0.266618392 -5037,0.685996487 -5038,-1.510645 -5039,-0.153105977 -5040,-0.100227766 -5041,0.77583097 -5042,-1.019493165 -5043,-0.196914874 -5044,-0.437845362 -5045,1.141312798 -5046,1.038182694 -5047,1.373413467 -5048,0.73428031 -5049,-1.221400405 -5050,-0.723123256 -5051,-1.895392235 -5052,-1.396400824 -5053,-0.771969169 -5054,0.462478196 -5055,-0.369909217 -5056,-0.251198997 -5057,-1.526095453 -5058,0.680572658 -5059,0.002702591 -5060,-0.367112265 -5061,0.534149581 -5062,1.111505325 -5063,-0.114700186 -5064,0.242306947 -5065,-0.433046524 -5066,1.274786988 -5067,0.316632557 -5068,0.445379736 -5069,1.496753132 -5070,0.385128154 -5071,1.398525186 -5072,0.780739872 -5073,0.142213881 -5074,-0.474921489 -5075,1.126335427 -5076,0.8252843 -5077,-0.313268634 -5078,0.683971844 -5079,0.541819922 -5080,0.1679243 -5081,0.323339973 -5082,-0.995641553 -5083,-2.307314296 -5084,0.379483568 -5085,0.206253542 -5086,-0.088374455 -5087,-1.995023133 -5088,2.54436503 -5089,-0.223762899 -5090,-2.007209956 -5091,-0.199810259 -5092,1.188583287 -5093,-0.023713129 -5094,-2.556764789 -5095,0.696531805 -5096,0.491433717 -5097,-1.454234369 -5098,-0.227310273 -5099,0.530798319 -5100,0.613453015 -5101,-0.659154725 -5102,-0.405118522 -5103,0.903500206 -5104,1.771935792 -5105,0.970412111 -5106,-0.575894094 -5107,-0.189393781 -5108,-2.178283683 -5109,0.800919036 -5110,0.642382044 -5111,1.170804784 -5112,-0.361519143 -5113,0.411311542 -5114,-0.522444316 -5115,-2.682638412 -5116,0.969042421 -5117,1.164812056 -5118,0.5247565 -5119,0.003848097 -5120,-0.116657542 -5121,-0.405394935 -5122,0.992966288 -5123,0.760419536 -5124,-0.283180592 -5125,1.120307342 -5126,-0.00159208 -5127,-0.986318988 -5128,-0.185882187 -5129,0.748596569 -5130,1.040748805 -5131,2.02415306 -5132,-0.766313119 -5133,0.852737956 -5134,-0.019301796 -5135,1.948077822 -5136,-0.706983253 -5137,-1.437753167 -5138,-2.195893437 -5139,-0.903145255 -5140,1.340285659 -5141,-0.774264123 -5142,-0.932755201 -5143,0.083519974 -5144,-1.002807308 -5145,-0.51139473 -5146,0.429813983 -5147,1.502551065 -5148,-1.761268016 -5149,-0.15274682 -5150,-0.471837127 -5151,-0.915566642 -5152,-0.45820331 -5153,-0.689587603 -5154,-0.311197682 -5155,-0.741133978 -5156,1.090439585 -5157,-0.137032213 -5158,-0.860079066 -5159,0.057729263 -5160,0.428870417 -5161,-0.466101588 -5162,-1.017785301 -5163,1.160750963 -5164,0.244730807 -5165,-0.26404409 -5166,-1.376650118 -5167,-1.728539627 -5168,0.925316911 -5169,0.407220883 -5170,-0.859160159 -5171,-1.851891582 -5172,0.945320251 -5173,1.259945007 -5174,-0.498018376 -5175,0.641972152 -5176,-0.238192806 -5177,0.28739518 -5178,-0.684368548 -5179,1.623261326 -5180,1.539102216 -5181,0.626051511 -5182,-0.336663704 -5183,-0.134463628 -5184,-1.221334854 -5185,0.312024348 -5186,0.785135638 -5187,-0.17780996 -5188,0.716304096 -5189,-0.370044817 -5190,-1.475689436 -5191,0.355580687 -5192,-1.0192203 -5193,-1.753951578 -5194,-0.02385321 -5195,-0.999285813 -5196,2.548017684 -5197,-0.268825032 -5198,0.040495422 -5199,-0.424582108 -5200,0.26670514 -5201,0.425222716 -5202,0.171664128 -5203,1.125565912 -5204,-0.993640218 -5205,0.767340465 -5206,0.34706682 -5207,1.011395174 -5208,-1.09091662 -5209,-0.813155661 -5210,-1.613758877 -5211,1.199509463 -5212,-0.364612891 -5213,-0.5980292 -5214,0.188791818 -5215,-0.103150673 -5216,-1.138113055 -5217,-0.971544958 -5218,1.650336711 -5219,-1.237995397 -5220,-1.54940093 -5221,-0.786640605 -5222,1.310542803 -5223,-0.878056012 -5224,-0.739267972 -5225,1.920261625 -5226,0.607674875 -5227,-0.595259581 -5228,-1.422154792 -5229,0.113151861 -5230,-0.860829626 -5231,0.922911375 -5232,0.197826822 -5233,0.179286168 -5234,-1.934511015 -5235,0.85344884 -5236,-0.364359343 -5237,0.314214513 -5238,0.051497113 -5239,-0.256946736 -5240,0.33045435 -5241,-0.419666704 -5242,1.505649185 -5243,-0.133232865 -5244,2.239060189 -5245,1.314828473 -5246,0.537645012 -5247,-0.975042041 -5248,0.528378403 -5249,1.540139322 -5250,-0.687361426 -5251,0.308126254 -5252,0.53995158 -5253,-0.63968911 -5254,0.217616921 -5255,0.384149095 -5256,0.870898292 -5257,-0.822838343 -5258,-0.344885544 -5259,0.927078196 -5260,-0.057024966 -5261,-0.875697365 -5262,1.406329433 -5263,2.371139775 -5264,0.185072646 -5265,-0.26297869 -5266,-1.065602254 -5267,-1.274726353 -5268,-1.282870941 -5269,-0.11104239 -5270,-1.021014444 -5271,-0.700140789 -5272,-0.788503663 -5273,-0.748875298 -5274,1.960717443 -5275,0.235263974 -5276,-0.168451414 -5277,-0.816878623 -5278,1.017962531 -5279,1.638109353 -5280,-1.075729123 -5281,0.598030239 -5282,-0.802563599 -5283,-0.026428899 -5284,-0.068244442 -5285,-0.444586051 -5286,0.601750301 -5287,-1.123378818 -5288,0.274091938 -5289,0.761081534 -5290,1.030767572 -5291,-0.403629349 -5292,-0.749655548 -5293,-0.606828921 -5294,-0.476735142 -5295,0.402903726 -5296,-0.712640236 -5297,1.41049964 -5298,1.029431273 -5299,-1.373676421 -5300,1.007358718 -5301,0.775953078 -5302,-0.659062703 -5303,-1.050094763 -5304,-0.525167905 -5305,-1.54158595 -5306,-0.945188587 -5307,-0.563198127 -5308,-1.217490431 -5309,-1.038940711 -5310,-0.534052935 -5311,0.57473354 -5312,-0.31697503 -5313,-1.982733537 -5314,-0.461750231 -5315,0.511171208 -5316,1.006993352 -5317,2.430151212 -5318,0.508244089 -5319,-0.462998322 -5320,2.609571746 -5321,0.106903768 -5322,-0.103138702 -5323,0.533195466 -5324,-1.250378291 -5325,-1.918480544 -5326,-1.942992566 -5327,1.10889245 -5328,-2.065275162 -5329,1.871041731 -5330,-0.176960566 -5331,-1.587150811 -5332,-0.21958475 -5333,-0.775919868 -5334,1.297157476 -5335,1.115883722 -5336,0.575973094 -5337,-1.092007565 -5338,-0.481294904 -5339,-1.414632559 -5340,-1.688575847 -5341,-0.492199693 -5342,0.429881233 -5343,0.669588501 -5344,1.078735468 -5345,1.632645876 -5346,0.071368523 -5347,1.849657841 -5348,0.884698001 -5349,0.074910809 -5350,0.200092881 -5351,-1.157850173 -5352,-0.949423982 -5353,0.580385224 -5354,-0.590240728 -5355,1.633778604 -5356,-0.754754424 -5357,-0.790502947 -5358,0.281043415 -5359,-2.246096191 -5360,0.863086153 -5361,-0.753147742 -5362,0.452422015 -5363,1.49195447 -5364,-1.508429454 -5365,-0.107176775 -5366,1.032806943 -5367,-0.26556557 -5368,-1.831187649 -5369,0.940456161 -5370,0.053941087 -5371,-0.299670963 -5372,-0.21959414 -5373,0.330176038 -5374,1.211499472 -5375,-0.298372176 -5376,0.06147773 -5377,-0.353311932 -5378,-0.517449759 -5379,0.676143634 -5380,1.467891161 -5381,0.679937327 -5382,1.316953477 -5383,-0.081740234 -5384,0.238917888 -5385,-0.483790879 -5386,0.197572373 -5387,0.359783896 -5388,-0.158274688 -5389,0.091530013 -5390,0.131032175 -5391,1.270664052 -5392,1.621074145 -5393,0.023003032 -5394,-1.366261598 -5395,-0.619596985 -5396,-0.802054676 -5397,-1.046532993 -5398,-1.668116231 -5399,0.851237786 -5400,2.866516648 -5401,-0.368249748 -5402,-0.008930262 -5403,-1.156184357 -5404,-0.20415471 -5405,-0.778174203 -5406,-0.446289354 -5407,-0.738809132 -5408,-0.451401352 -5409,-0.412394425 -5410,0.356922869 -5411,-1.564307192 -5412,-3.126519418 -5413,1.301366319 -5414,0.843540504 -5415,-2.045818343 -5416,1.496724989 -5417,0.283268889 -5418,-1.528425949 -5419,-0.447089285 -5420,-1.085789656 -5421,0.549989121 -5422,-1.062393332 -5423,0.54687141 -5424,0.307210195 -5425,-1.261489635 -5426,-0.606916912 -5427,0.872593428 -5428,1.396489304 -5429,-1.937165574 -5430,-0.678574158 -5431,-1.14433013 -5432,-0.555463062 -5433,-0.398137249 -5434,-2.58764335 -5435,1.71375784 -5436,-0.275743547 -5437,1.589492444 -5438,-1.609012158 -5439,0.083542678 -5440,-1.684738452 -5441,0.791647134 -5442,-0.504596071 -5443,0.375961858 -5444,0.290946275 -5445,0.348984444 -5446,-0.061245946 -5447,1.116640553 -5448,0.166530834 -5449,-0.052998741 -5450,-2.416360628 -5451,-0.475295905 -5452,0.844764206 -5453,-0.33314666 -5454,-0.421301807 -5455,-1.224573308 -5456,-1.459516138 -5457,-1.305538873 -5458,0.27712917 -5459,-0.733593666 -5460,0.383140537 -5461,-0.250302712 -5462,-0.616218953 -5463,1.34277686 -5464,-1.306529459 -5465,-1.003230698 -5466,-0.013881591 -5467,0.74738569 -5468,0.391166037 -5469,1.543855067 -5470,-0.849332091 -5471,-0.051699839 -5472,1.137261531 -5473,1.278023686 -5474,-0.995877837 -5475,1.309880932 -5476,1.975951621 -5477,-0.775859878 -5478,-0.668642408 -5479,0.055295168 -5480,0.506298797 -5481,-0.178425133 -5482,-1.145816282 -5483,2.045091661 -5484,-1.417747981 -5485,-0.121700478 -5486,-0.018165416 -5487,0.980639538 -5488,0.035796824 -5489,0.171501686 -5490,0.710607329 -5491,-0.436402486 -5492,-0.400297755 -5493,0.920903561 -5494,0.147767246 -5495,0.628955798 -5496,0.281707995 -5497,-0.814365217 -5498,0.996775909 -5499,-1.14386914 -5500,-0.273903686 -5501,0.058758921 -5502,1.677001334 -5503,-1.819639225 +#channel,scintYieldDeviation +0,1.303 +1,0.744 +2,-0.248 +3,0.632 +4,-0.121 +5,-0.458 +6,-1.668 +7,-0.466 +8,-0.180 +9,0.237 +10,-1.459 +11,0.962 +12,0.327 +13,-2.363 +14,-0.640 +15,-1.676 +16,-0.272 +17,0.307 +18,0.650 +19,0.556 +20,-1.288 +21,0.679 +22,0.703 +23,0.272 +24,0.373 +25,2.568 +26,-1.941 +27,-0.924 +28,-0.441 +29,1.688 +30,-0.806 +31,0.055 +32,0.566 +33,-0.385 +34,-1.176 +35,-0.268 +36,-0.679 +37,-0.731 +38,-1.712 +39,0.693 +40,-0.906 +41,-0.988 +42,0.965 +43,-0.248 +44,-0.439 +45,1.440 +46,-0.205 +47,-0.805 +48,-1.197 +49,0.536 +50,-0.732 +51,0.466 +52,0.442 +53,0.445 +54,1.713 +55,1.229 +56,-0.580 +57,0.064 +58,0.818 +59,-0.349 +60,-0.009 +61,0.291 +62,0.168 +63,-0.743 +64,0.662 +65,-1.789 +66,0.697 +67,-0.585 +68,-1.270 +69,1.471 +70,0.600 +71,-0.006 +72,-0.172 +73,-1.079 +74,-0.364 +75,0.075 +76,0.526 +77,-1.129 +78,0.642 +79,-0.920 +80,-0.869 +81,-1.556 +82,-0.162 +83,-0.748 +84,-0.375 +85,0.391 +86,1.123 +87,-0.188 +88,1.731 +89,0.535 +90,0.204 +91,-1.218 +92,-1.092 +93,-0.844 +94,1.227 +95,-1.009 +96,-0.488 +97,-1.046 +98,-1.061 +99,1.096 +100,0.822 +101,-0.808 +102,-1.223 +103,-0.466 +104,0.510 +105,0.139 +106,0.243 +107,-1.364 +108,-0.478 +109,0.407 +110,-0.246 +111,0.821 +112,-1.138 +113,-0.450 +114,1.031 +115,0.375 +116,0.692 +117,0.552 +118,1.591 +119,0.523 +120,-1.460 +121,0.907 +122,0.231 +123,0.139 +124,0.149 +125,0.373 +126,0.702 +127,-0.598 +128,-0.822 +129,-0.249 +130,0.406 +131,-0.849 +132,1.089 +133,1.037 +134,0.572 +135,-0.258 +136,0.724 +137,-0.220 +138,-0.655 +139,1.875 +140,1.017 +141,0.708 +142,0.373 +143,-0.429 +144,-0.091 +145,1.136 +146,-1.182 +147,0.005 +148,0.608 +149,-0.710 +150,1.015 +151,-0.657 +152,0.397 +153,0.130 +154,-0.561 +155,-0.113 +156,-1.026 +157,1.186 +158,-0.899 +159,-0.708 +160,0.142 +161,-0.463 +162,-0.038 +163,-0.062 +164,1.221 +165,-0.333 +166,-0.458 +167,-0.326 +168,-0.336 +169,2.216 +170,-1.282 +171,-0.669 +172,-1.073 +173,-1.071 +174,0.686 +175,-1.122 +176,0.698 +177,1.484 +178,-1.382 +179,-0.081 +180,-0.496 +181,-0.220 +182,-0.585 +183,-1.567 +184,1.059 +185,-0.915 +186,1.341 +187,1.323 +188,-1.751 +189,1.625 +190,0.286 +191,-1.401 +192,-0.135 +193,-2.044 +194,-1.214 +195,0.584 +196,-1.061 +197,0.122 +198,-0.160 +199,-1.065 +200,0.390 +201,-1.512 +202,-0.935 +203,-0.043 +204,-1.122 +205,-0.642 +206,0.068 +207,0.936 +208,0.165 +209,0.343 +210,-1.261 +211,-1.360 +212,0.046 +213,-1.342 +214,1.091 +215,0.028 +216,1.744 +217,-1.501 +218,-0.256 +219,-1.305 +220,-0.280 +221,0.546 +222,0.695 +223,-2.165 +224,1.710 +225,-0.999 +226,-0.615 +227,-0.361 +228,-0.199 +229,0.170 +230,0.180 +231,-0.218 +232,-1.266 +233,-0.628 +234,0.598 +235,-0.003 +236,1.116 +237,-1.006 +238,0.778 +239,2.681 +240,1.085 +241,0.908 +242,-0.130 +243,-0.674 +244,0.313 +245,0.844 +246,-2.428 +247,-0.232 +248,0.883 +249,-0.527 +250,1.895 +251,-1.033 +252,1.109 +253,1.928 +254,2.318 +255,0.210 +256,0.494 +257,-1.031 +258,-1.229 +259,-0.543 +260,2.264 +261,1.039 +262,-0.665 +263,0.007 +264,0.081 +265,0.775 +266,1.039 +267,0.283 +268,0.607 +269,-1.350 +270,-0.572 +271,1.323 +272,0.985 +273,0.173 +274,-0.204 +275,-0.692 +276,0.476 +277,0.837 +278,0.596 +279,1.294 +280,-2.599 +281,0.801 +282,0.183 +283,-1.183 +284,-0.537 +285,0.630 +286,-0.984 +287,0.186 +288,-2.383 +289,-1.370 +290,-0.151 +291,0.844 +292,-1.424 +293,0.426 +294,0.310 +295,0.028 +296,-0.882 +297,0.242 +298,1.021 +299,-0.418 +300,1.461 +301,-0.119 +302,-0.647 +303,0.619 +304,0.485 +305,-0.164 +306,1.260 +307,-0.373 +308,0.168 +309,0.021 +310,-1.754 +311,-1.733 +312,-0.992 +313,-0.511 +314,-1.834 +315,0.410 +316,-1.809 +317,0.476 +318,-0.399 +319,-1.130 +320,-1.155 +321,0.828 +322,0.844 +323,-0.979 +324,0.426 +325,0.092 +326,-0.706 +327,-0.448 +328,0.247 +329,2.104 +330,0.310 +331,-0.110 +332,-2.926 +333,-0.387 +334,-0.565 +335,-1.262 +336,0.259 +337,-0.257 +338,-0.043 +339,-0.665 +340,-0.235 +341,-0.335 +342,-1.295 +343,0.319 +344,-0.608 +345,0.937 +346,-0.116 +347,0.071 +348,-0.318 +349,1.324 +350,-0.820 +351,0.450 +352,0.887 +353,0.997 +354,0.030 +355,-0.146 +356,0.696 +357,-1.072 +358,-0.596 +359,0.334 +360,1.947 +361,-0.390 +362,0.346 +363,0.476 +364,0.785 +365,0.481 +366,-0.864 +367,0.366 +368,0.697 +369,-1.124 +370,-1.033 +371,1.191 +372,-0.976 +373,0.490 +374,-0.428 +375,0.594 +376,0.606 +377,1.916 +378,1.200 +379,-0.567 +380,0.200 +381,-0.557 +382,-1.663 +383,-0.355 +384,-1.454 +385,0.688 +386,-0.119 +387,0.438 +388,0.806 +389,1.172 +390,0.546 +391,-0.448 +392,-0.467 +393,-0.716 +394,0.685 +395,-0.047 +396,-0.085 +397,0.330 +398,-0.172 +399,-0.598 +400,-1.383 +401,-1.227 +402,0.344 +403,-0.135 +404,0.017 +405,0.587 +406,-1.195 +407,0.756 +408,0.395 +409,0.023 +410,0.480 +411,-1.004 +412,0.238 +413,0.414 +414,-1.215 +415,0.331 +416,-1.387 +417,-1.356 +418,-0.159 +419,1.265 +420,-0.224 +421,1.000 +422,-0.869 +423,-0.971 +424,0.656 +425,-0.272 +426,0.380 +427,0.053 +428,0.044 +429,-0.176 +430,0.150 +431,0.802 +432,-1.799 +433,1.808 +434,1.678 +435,0.805 +436,-0.378 +437,-0.551 +438,-1.023 +439,-0.824 +440,-2.110 +441,-0.221 +442,-2.363 +443,0.317 +444,0.531 +445,-1.687 +446,-0.308 +447,-0.031 +448,-0.444 +449,-0.944 +450,0.153 +451,-0.327 +452,-1.523 +453,-1.568 +454,0.262 +455,-0.230 +456,-1.252 +457,0.252 +458,-0.008 +459,-0.301 +460,-0.372 +461,0.509 +462,0.477 +463,-0.571 +464,0.578 +465,-0.938 +466,-2.011 +467,0.068 +468,-0.587 +469,-0.662 +470,1.199 +471,-0.245 +472,-0.260 +473,-1.469 +474,0.102 +475,1.426 +476,-1.068 +477,-0.210 +478,-1.622 +479,0.752 +480,0.395 +481,-0.500 +482,-0.046 +483,0.075 +484,0.793 +485,0.538 +486,-1.678 +487,1.397 +488,-0.843 +489,0.530 +490,-0.492 +491,-0.460 +492,-0.486 +493,-1.440 +494,-0.209 +495,0.146 +496,-0.084 +497,0.291 +498,1.286 +499,-1.213 +500,-1.041 +501,1.752 +502,1.022 +503,-0.583 +504,0.032 +505,-0.601 +506,0.131 +507,0.540 +508,0.648 +509,0.602 +510,0.805 +511,-0.007 +512,-1.345 +513,0.692 +514,-0.949 +515,-1.646 +516,-0.020 +517,0.884 +518,-0.175 +519,1.242 +520,0.279 +521,0.707 +522,0.990 +523,-0.535 +524,0.682 +525,0.510 +526,0.214 +527,-0.459 +528,0.916 +529,0.348 +530,-1.744 +531,0.767 +532,-0.742 +533,1.594 +534,-0.098 +535,1.165 +536,0.427 +537,-1.167 +538,0.943 +539,-0.417 +540,-0.574 +541,-0.605 +542,1.501 +543,-0.029 +544,-0.242 +545,1.081 +546,0.760 +547,0.745 +548,0.622 +549,-0.106 +550,-1.692 +551,0.048 +552,0.470 +553,1.926 +554,0.244 +555,1.807 +556,-1.742 +557,1.735 +558,-0.725 +559,-0.567 +560,0.529 +561,1.218 +562,-1.510 +563,-0.603 +564,1.196 +565,-0.284 +566,1.993 +567,-0.894 +568,1.566 +569,-0.410 +570,-0.315 +571,0.653 +572,0.151 +573,-0.136 +574,0.074 +575,0.973 +576,0.099 +577,0.394 +578,-0.925 +579,-0.982 +580,0.734 +581,-0.257 +582,-0.488 +583,0.355 +584,-0.455 +585,0.399 +586,-1.834 +587,-0.355 +588,-0.088 +589,-2.214 +590,-0.879 +591,0.346 +592,1.177 +593,-1.165 +594,-0.672 +595,0.972 +596,-1.213 +597,-0.790 +598,1.403 +599,1.553 +600,-1.074 +601,-0.261 +602,-0.989 +603,-1.104 +604,0.890 +605,-0.210 +606,0.067 +607,-0.483 +608,0.012 +609,-1.931 +610,-0.590 +611,0.303 +612,-0.132 +613,-0.963 +614,-0.794 +615,0.755 +616,0.976 +617,-0.181 +618,0.828 +619,1.400 +620,0.194 +621,0.278 +622,-2.571 +623,0.569 +624,0.381 +625,-0.819 +626,-1.139 +627,-0.443 +628,-0.655 +629,-0.087 +630,0.636 +631,-0.115 +632,-1.194 +633,-0.550 +634,0.493 +635,-0.753 +636,-0.693 +637,-0.303 +638,-0.200 +639,1.366 +640,-0.534 +641,0.339 +642,-0.030 +643,-0.451 +644,0.572 +645,-0.330 +646,2.090 +647,0.972 +648,-1.049 +649,0.637 +650,0.085 +651,-0.854 +652,-0.501 +653,0.025 +654,-0.966 +655,0.048 +656,1.993 +657,0.077 +658,-1.309 +659,-0.987 +660,-1.520 +661,0.623 +662,-0.087 +663,-0.514 +664,-0.653 +665,1.813 +666,0.371 +667,-0.612 +668,-1.789 +669,1.583 +670,-1.150 +671,1.221 +672,-0.286 +673,0.619 +674,-0.627 +675,-2.118 +676,0.230 +677,-1.117 +678,-0.110 +679,0.228 +680,1.277 +681,1.061 +682,-0.972 +683,-0.027 +684,-0.400 +685,1.486 +686,-0.630 +687,-0.903 +688,-1.461 +689,-0.580 +690,-0.403 +691,-0.514 +692,2.189 +693,0.655 +694,0.182 +695,1.749 +696,-0.623 +697,0.361 +698,0.155 +699,0.511 +700,1.859 +701,0.421 +702,0.929 +703,-0.605 +704,-0.513 +705,0.643 +706,-0.726 +707,1.053 +708,0.176 +709,0.592 +710,-0.604 +711,-0.774 +712,-0.017 +713,-0.565 +714,0.184 +715,1.043 +716,-0.579 +717,-0.574 +718,-1.144 +719,1.411 +720,0.464 +721,0.381 +722,0.215 +723,0.305 +724,1.969 +725,-0.536 +726,1.208 +727,-0.431 +728,-1.824 +729,1.824 +730,0.380 +731,-0.622 +732,-0.331 +733,0.061 +734,-0.665 +735,1.086 +736,1.174 +737,-0.196 +738,1.426 +739,-0.392 +740,-0.662 +741,1.870 +742,-1.111 +743,-0.328 +744,0.378 +745,1.152 +746,0.200 +747,-0.048 +748,0.624 +749,-0.409 +750,-1.105 +751,0.952 +752,-1.186 +753,-0.455 +754,0.074 +755,0.007 +756,-1.252 +757,-1.151 +758,1.398 +759,-0.917 +760,1.097 +761,-1.055 +762,0.925 +763,1.672 +764,0.854 +765,-1.634 +766,-0.398 +767,-2.059 +768,0.032 +769,-0.438 +770,1.259 +771,-2.669 +772,-1.638 +773,-0.158 +774,-0.055 +775,0.230 +776,-0.048 +777,0.069 +778,1.122 +779,-0.117 +780,0.953 +781,-0.206 +782,2.410 +783,0.028 +784,-0.846 +785,0.772 +786,1.041 +787,0.224 +788,0.085 +789,1.622 +790,-0.528 +791,-0.615 +792,-0.338 +793,-1.033 +794,-0.729 +795,0.461 +796,0.876 +797,-1.455 +798,1.831 +799,-0.469 +800,0.248 +801,0.129 +802,0.026 +803,-0.312 +804,-0.105 +805,-0.608 +806,0.370 +807,-2.581 +808,0.049 +809,-2.023 +810,0.865 +811,-1.123 +812,-0.295 +813,-0.338 +814,-0.549 +815,-0.012 +816,-1.230 +817,-0.464 +818,-0.472 +819,0.989 +820,-0.289 +821,-0.427 +822,0.032 +823,0.175 +824,-1.479 +825,-0.402 +826,-0.310 +827,-0.430 +828,-0.426 +829,-1.249 +830,-0.943 +831,2.504 +832,0.860 +833,1.080 +834,-0.993 +835,0.593 +836,0.659 +837,-0.489 +838,-0.587 +839,-0.753 +840,-1.422 +841,-0.695 +842,-0.894 +843,-0.384 +844,-0.798 +845,-0.994 +846,-0.678 +847,-1.191 +848,-0.060 +849,0.478 +850,0.275 +851,0.293 +852,1.450 +853,-0.327 +854,0.449 +855,0.248 +856,0.421 +857,-1.754 +858,-0.302 +859,-0.377 +860,0.203 +861,-0.263 +862,0.650 +863,-0.679 +864,2.663 +865,-0.389 +866,-2.074 +867,1.265 +868,-1.599 +869,0.378 +870,-0.986 +871,2.324 +872,1.592 +873,-0.922 +874,1.036 +875,1.069 +876,0.847 +877,-0.136 +878,-0.576 +879,0.433 +880,-0.107 +881,0.744 +882,0.652 +883,-1.443 +884,-1.838 +885,0.300 +886,0.024 +887,-1.326 +888,-1.960 +889,-1.586 +890,-0.840 +891,1.202 +892,0.019 +893,0.992 +894,-0.052 +895,0.949 +896,0.447 +897,0.553 +898,-1.753 +899,-1.251 +900,0.166 +901,-0.333 +902,0.929 +903,1.192 +904,0.545 +905,1.536 +906,1.095 +907,0.140 +908,-0.513 +909,0.362 +910,-0.647 +911,1.137 +912,0.788 +913,0.850 +914,0.392 +915,1.749 +916,1.939 +917,2.457 +918,-0.564 +919,-1.739 +920,-1.518 +921,0.385 +922,-2.708 +923,1.515 +924,1.098 +925,2.550 +926,-0.315 +927,-0.133 +928,0.428 +929,0.633 +930,-0.802 +931,0.862 +932,0.102 +933,1.006 +934,-1.291 +935,1.492 +936,0.720 +937,-0.821 +938,-0.455 +939,0.160 +940,0.031 +941,-0.236 +942,0.649 +943,0.556 +944,0.600 +945,-0.030 +946,-0.862 +947,0.715 +948,-0.683 +949,-1.053 +950,2.034 +951,-0.862 +952,-1.144 +953,-0.542 +954,1.137 +955,0.388 +956,0.406 +957,1.186 +958,-0.929 +959,1.146 +960,-0.527 +961,1.982 +962,0.964 +963,0.348 +964,-0.099 +965,-0.349 +966,0.320 +967,-0.299 +968,-2.284 +969,2.190 +970,-1.886 +971,-0.344 +972,0.362 +973,1.496 +974,0.040 +975,0.471 +976,-1.316 +977,1.271 +978,-1.348 +979,-0.517 +980,0.143 +981,0.064 +982,-1.835 +983,0.047 +984,1.097 +985,-0.604 +986,0.121 +987,-0.809 +988,-0.879 +989,-0.424 +990,-0.718 +991,-0.393 +992,0.275 +993,-0.420 +994,-0.621 +995,-1.459 +996,0.096 +997,-0.535 +998,0.497 +999,-1.616 +1000,-0.357 +1001,0.353 +1002,-1.381 +1003,-0.867 +1004,0.324 +1005,-0.399 +1006,1.893 +1007,1.551 +1008,0.934 +1009,-0.425 +1010,-1.273 +1011,-2.187 +1012,-1.340 +1013,0.345 +1014,-0.805 +1015,-0.739 +1016,0.956 +1017,-0.264 +1018,0.331 +1019,0.560 +1020,1.365 +1021,-0.025 +1022,-0.947 +1023,0.529 +1024,0.910 +1025,0.427 +1026,0.621 +1027,-1.140 +1028,-0.295 +1029,-0.284 +1030,1.177 +1031,-0.917 +1032,1.652 +1033,1.263 +1034,0.884 +1035,0.519 +1036,-0.062 +1037,-0.489 +1038,-0.736 +1039,1.455 +1040,-1.449 +1041,0.206 +1042,1.277 +1043,-0.682 +1044,1.155 +1045,0.499 +1046,0.722 +1047,-0.025 +1048,1.121 +1049,-0.308 +1050,-0.066 +1051,-0.097 +1052,0.248 +1053,-0.100 +1054,-2.416 +1055,-0.143 +1056,1.242 +1057,-0.325 +1058,-1.283 +1059,0.044 +1060,0.199 +1061,-0.546 +1062,1.609 +1063,0.335 +1064,-0.417 +1065,-0.812 +1066,-0.981 +1067,-0.663 +1068,-0.232 +1069,2.112 +1070,-1.072 +1071,-2.052 +1072,0.535 +1073,0.664 +1074,-2.226 +1075,-0.546 +1076,0.632 +1077,0.671 +1078,-0.666 +1079,-0.560 +1080,0.896 +1081,0.247 +1082,-0.716 +1083,-0.160 +1084,1.043 +1085,2.069 +1086,1.271 +1087,1.198 +1088,-0.032 +1089,-1.122 +1090,-0.008 +1091,-0.242 +1092,1.643 +1093,-1.058 +1094,-0.712 +1095,0.061 +1096,0.049 +1097,0.099 +1098,-1.941 +1099,-0.285 +1100,-0.841 +1101,0.558 +1102,-1.062 +1103,0.559 +1104,0.200 +1105,0.967 +1106,0.605 +1107,-0.155 +1108,-0.225 +1109,-0.382 +1110,0.626 +1111,-0.850 +1112,-0.125 +1113,-2.244 +1114,1.168 +1115,1.090 +1116,-0.182 +1117,-1.199 +1118,-0.077 +1119,-0.083 +1120,-2.197 +1121,0.440 +1122,-0.682 +1123,-0.762 +1124,-0.023 +1125,0.253 +1126,0.526 +1127,1.123 +1128,-1.844 +1129,0.496 +1130,1.060 +1131,-1.322 +1132,-0.334 +1133,-0.064 +1134,1.032 +1135,-0.452 +1136,-0.189 +1137,-0.354 +1138,-0.651 +1139,-1.825 +1140,0.903 +1141,0.999 +1142,0.353 +1143,-0.356 +1144,-0.259 +1145,0.904 +1146,0.283 +1147,0.669 +1148,0.095 +1149,-0.295 +1150,0.539 +1151,0.750 +1152,-1.000 +1153,0.331 +1154,1.197 +1155,0.036 +1156,-1.169 +1157,-0.942 +1158,2.408 +1159,0.462 +1160,-0.199 +1161,-0.610 +1162,-0.497 +1163,-0.350 +1164,0.638 +1165,-0.179 +1166,-0.205 +1167,-0.689 +1168,0.019 +1169,-1.253 +1170,0.096 +1171,0.328 +1172,-0.113 +1173,-0.883 +1174,1.180 +1175,-2.613 +1176,-1.463 +1177,-1.449 +1178,-1.550 +1179,1.092 +1180,-0.570 +1181,-0.294 +1182,0.827 +1183,-1.287 +1184,0.680 +1185,0.007 +1186,1.081 +1187,-0.436 +1188,1.199 +1189,0.692 +1190,0.864 +1191,1.399 +1192,-1.662 +1193,-0.282 +1194,-1.339 +1195,0.202 +1196,0.868 +1197,-0.221 +1198,0.364 +1199,0.073 +1200,0.078 +1201,0.164 +1202,-0.669 +1203,-1.358 +1204,-1.393 +1205,0.357 +1206,0.096 +1207,-0.353 +1208,1.245 +1209,-0.195 +1210,-1.020 +1211,0.110 +1212,0.105 +1213,-0.019 +1214,0.818 +1215,-0.259 +1216,2.395 +1217,-0.744 +1218,0.640 +1219,-0.607 +1220,0.386 +1221,-0.063 +1222,0.102 +1223,-1.601 +1224,2.160 +1225,-0.863 +1226,-0.471 +1227,-0.521 +1228,-0.184 +1229,-0.491 +1230,2.435 +1231,0.923 +1232,0.929 +1233,-0.236 +1234,1.639 +1235,-1.085 +1236,-0.806 +1237,1.063 +1238,-0.117 +1239,2.209 +1240,-1.745 +1241,-0.620 +1242,-0.609 +1243,-0.055 +1244,0.241 +1245,0.852 +1246,-0.912 +1247,1.040 +1248,-0.593 +1249,0.053 +1250,-1.118 +1251,-0.857 +1252,0.516 +1253,-0.813 +1254,1.434 +1255,0.948 +1256,-1.671 +1257,-1.156 +1258,0.785 +1259,0.594 +1260,-0.628 +1261,-1.240 +1262,-0.651 +1263,-1.281 +1264,-1.561 +1265,1.670 +1266,-0.728 +1267,0.032 +1268,1.343 +1269,1.539 +1270,-0.517 +1271,0.806 +1272,0.168 +1273,-0.233 +1274,0.413 +1275,-1.471 +1276,2.351 +1277,-0.304 +1278,0.362 +1279,0.383 +1280,0.569 +1281,0.717 +1282,0.400 +1283,-0.832 +1284,0.121 +1285,-1.695 +1286,-0.732 +1287,0.319 +1288,-0.648 +1289,-0.221 +1290,0.304 +1291,0.469 +1292,-0.462 +1293,-1.740 +1294,-0.509 +1295,-1.074 +1296,0.679 +1297,0.257 +1298,0.580 +1299,-0.442 +1300,-0.222 +1301,-0.294 +1302,-1.495 +1303,0.859 +1304,-2.000 +1305,1.714 +1306,-0.539 +1307,-0.934 +1308,0.360 +1309,-0.843 +1310,0.178 +1311,1.782 +1312,-0.953 +1313,-0.961 +1314,-0.795 +1315,0.311 +1316,-0.072 +1317,-0.277 +1318,0.476 +1319,-0.825 +1320,-1.499 +1321,-1.754 +1322,-0.537 +1323,0.966 +1324,-2.013 +1325,-2.823 +1326,0.589 +1327,0.338 +1328,-0.415 +1329,1.872 +1330,-0.951 +1331,-1.418 +1332,-0.363 +1333,0.797 +1334,-0.268 +1335,-1.016 +1336,2.021 +1337,-0.714 +1338,0.608 +1339,-0.256 +1340,-1.434 +1341,-0.031 +1342,0.058 +1343,-0.462 +1344,-0.550 +1345,0.788 +1346,-0.631 +1347,0.114 +1348,-0.507 +1349,-0.112 +1350,-1.172 +1351,0.175 +1352,0.475 +1353,-0.101 +1354,2.333 +1355,-2.681 +1356,-0.270 +1357,1.458 +1358,0.178 +1359,0.037 +1360,2.121 +1361,1.536 +1362,-0.802 +1363,0.425 +1364,2.709 +1365,0.748 +1366,0.253 +1367,1.178 +1368,1.119 +1369,-0.416 +1370,-0.734 +1371,0.742 +1372,-0.581 +1373,0.173 +1374,-0.673 +1375,0.098 +1376,0.297 +1377,-1.991 +1378,0.618 +1379,0.768 +1380,0.325 +1381,0.019 +1382,-0.560 +1383,0.130 +1384,-0.316 +1385,0.031 +1386,0.558 +1387,0.556 +1388,-0.578 +1389,-1.171 +1390,-1.613 +1391,1.852 +1392,-0.298 +1393,0.318 +1394,-1.220 +1395,-0.461 +1396,-2.162 +1397,-1.203 +1398,0.133 +1399,-0.329 +1400,-0.463 +1401,0.185 +1402,-0.317 +1403,-1.003 +1404,-0.227 +1405,0.423 +1406,0.040 +1407,0.924 +1408,-1.046 +1409,2.548 +1410,-0.440 +1411,0.649 +1412,1.686 +1413,0.132 +1414,0.966 +1415,-0.182 +1416,2.042 +1417,-0.573 +1418,0.776 +1419,0.514 +1420,-1.582 +1421,-2.091 +1422,-0.129 +1423,-1.348 +1424,0.398 +1425,0.726 +1426,-1.340 +1427,-1.566 +1428,0.666 +1429,-1.211 +1430,1.024 +1431,-0.141 +1432,-0.770 +1433,0.362 +1434,0.753 +1435,1.990 +1436,0.866 +1437,0.306 +1438,-0.103 +1439,-0.744 +1440,-0.510 +1441,-0.953 +1442,-0.369 +1443,-1.263 +1444,-0.152 +1445,0.302 +1446,1.865 +1447,2.055 +1448,1.775 +1449,-0.531 +1450,-1.383 +1451,-0.628 +1452,0.838 +1453,0.686 +1454,1.565 +1455,-0.773 +1456,-0.880 +1457,-1.030 +1458,-0.280 +1459,0.225 +1460,-0.283 +1461,-0.089 +1462,0.421 +1463,0.970 +1464,0.197 +1465,-0.137 +1466,-1.661 +1467,-0.418 +1468,-0.518 +1469,1.110 +1470,-0.257 +1471,-0.034 +1472,0.695 +1473,-0.441 +1474,-2.003 +1475,0.593 +1476,-1.631 +1477,0.325 +1478,0.619 +1479,0.431 +1480,0.214 +1481,-0.093 +1482,-1.378 +1483,0.535 +1484,-0.934 +1485,-0.321 +1486,0.426 +1487,-0.900 +1488,0.337 +1489,1.196 +1490,0.908 +1491,0.914 +1492,-0.536 +1493,0.962 +1494,0.823 +1495,-0.415 +1496,-1.566 +1497,1.049 +1498,-0.439 +1499,-0.795 +1500,-0.750 +1501,-1.293 +1502,0.261 +1503,-0.486 +1504,-0.442 +1505,0.537 +1506,0.808 +1507,0.477 +1508,0.167 +1509,2.002 +1510,0.690 +1511,-1.551 +1512,0.237 +1513,1.362 +1514,0.636 +1515,0.768 +1516,0.398 +1517,-1.624 +1518,-1.684 +1519,0.576 +1520,-0.307 +1521,-0.041 +1522,0.920 +1523,-0.419 +1524,0.648 +1525,-1.585 +1526,0.134 +1527,0.643 +1528,0.190 +1529,-1.067 +1530,0.540 +1531,-0.038 +1532,0.150 +1533,-0.713 +1534,0.965 +1535,0.603 +1536,-0.842 +1537,-1.102 +1538,-1.073 +1539,-0.960 +1540,-1.608 +1541,-1.035 +1542,0.202 +1543,0.455 +1544,-0.441 +1545,0.259 +1546,-0.187 +1547,-1.920 +1548,0.779 +1549,-1.035 +1550,0.462 +1551,-0.810 +1552,-0.036 +1553,-0.580 +1554,0.128 +1555,0.206 +1556,-0.384 +1557,-2.229 +1558,1.168 +1559,-0.065 +1560,-0.481 +1561,-1.131 +1562,-1.090 +1563,1.897 +1564,-0.582 +1565,0.479 +1566,0.371 +1567,0.144 +1568,-0.596 +1569,-0.610 +1570,-0.401 +1571,-1.306 +1572,-0.214 +1573,-0.500 +1574,1.690 +1575,-0.774 +1576,0.422 +1577,-0.199 +1578,-0.261 +1579,-1.306 +1580,-0.043 +1581,0.213 +1582,-1.440 +1583,1.498 +1584,1.929 +1585,-0.683 +1586,-2.197 +1587,-0.004 +1588,-0.252 +1589,-0.828 +1590,-1.780 +1591,0.462 +1592,0.140 +1593,0.564 +1594,0.447 +1595,0.233 +1596,1.961 +1597,0.212 +1598,-0.018 +1599,0.673 +1600,-0.765 +1601,-0.677 +1602,0.613 +1603,2.285 +1604,-0.172 +1605,0.183 +1606,0.264 +1607,0.867 +1608,1.484 +1609,1.417 +1610,0.758 +1611,-0.255 +1612,0.376 +1613,0.288 +1614,-0.148 +1615,0.147 +1616,-2.081 +1617,1.390 +1618,0.975 +1619,0.321 +1620,2.051 +1621,-1.018 +1622,-0.319 +1623,-0.079 +1624,-0.607 +1625,1.400 +1626,-0.534 +1627,-0.700 +1628,1.569 +1629,-1.070 +1630,1.417 +1631,0.310 +1632,-0.644 +1633,-1.490 +1634,1.239 +1635,1.067 +1636,1.863 +1637,-1.110 +1638,-1.280 +1639,-1.404 +1640,-0.568 +1641,1.825 +1642,1.477 +1643,-1.261 +1644,-0.357 +1645,-0.670 +1646,-0.664 +1647,0.931 +1648,0.722 +1649,-0.776 +1650,-0.654 +1651,-1.585 +1652,0.015 +1653,0.506 +1654,0.150 +1655,0.717 +1656,0.085 +1657,-0.131 +1658,2.322 +1659,-0.445 +1660,0.348 +1661,0.180 +1662,0.550 +1663,0.472 +1664,2.136 +1665,-0.069 +1666,-0.740 +1667,-0.011 +1668,0.540 +1669,1.317 +1670,-0.875 +1671,0.040 +1672,1.888 +1673,-1.366 +1674,-0.761 +1675,-0.854 +1676,-0.818 +1677,0.601 +1678,0.605 +1679,-1.258 +1680,0.632 +1681,-0.392 +1682,1.438 +1683,-0.089 +1684,0.041 +1685,-0.640 +1686,-0.365 +1687,0.043 +1688,0.167 +1689,0.922 +1690,-0.102 +1691,0.393 +1692,-0.726 +1693,-0.459 +1694,-0.315 +1695,-0.581 +1696,-0.123 +1697,-1.502 +1698,-0.555 +1699,-0.830 +1700,-0.676 +1701,-0.649 +1702,-0.514 +1703,1.659 +1704,-0.203 +1705,0.212 +1706,-0.330 +1707,-1.554 +1708,-0.152 +1709,-0.105 +1710,0.297 +1711,2.785 +1712,0.259 +1713,0.115 +1714,-0.348 +1715,0.823 +1716,-0.092 +1717,-1.523 +1718,0.204 +1719,0.490 +1720,0.318 +1721,-1.379 +1722,0.375 +1723,0.133 +1724,1.637 +1725,0.515 +1726,1.063 +1727,0.339 +1728,0.932 +1729,1.339 +1730,-0.583 +1731,-0.528 +1732,1.751 +1733,-1.718 +1734,0.475 +1735,0.786 +1736,-0.376 +1737,-0.108 +1738,1.532 +1739,-2.142 +1740,-0.150 +1741,-1.314 +1742,0.919 +1743,1.106 +1744,1.184 +1745,-0.615 +1746,1.329 +1747,0.649 +1748,0.859 +1749,-0.950 +1750,-0.162 +1751,-0.218 +1752,2.167 +1753,1.117 +1754,-2.154 +1755,-1.622 +1756,1.085 +1757,1.914 +1758,1.977 +1759,-1.670 +1760,1.484 +1761,0.863 +1762,0.626 +1763,0.430 +1764,-1.962 +1765,-0.908 +1766,-0.716 +1767,-0.257 +1768,0.688 +1769,-0.119 +1770,-0.822 +1771,-1.352 +1772,-0.286 +1773,-0.999 +1774,0.535 +1775,-1.512 +1776,0.961 +1777,0.369 +1778,-0.769 +1779,-0.128 +1780,0.478 +1781,-0.440 +1782,1.484 +1783,-0.329 +1784,-1.278 +1785,-0.531 +1786,-0.830 +1787,-1.771 +1788,0.048 +1789,-0.407 +1790,0.640 +1791,0.221 +1792,-1.854 +1793,0.835 +1794,0.777 +1795,0.056 +1796,-1.613 +1797,1.105 +1798,1.079 +1799,-0.840 +1800,-0.650 +1801,1.060 +1802,0.421 +1803,0.409 +1804,-1.025 +1805,0.281 +1806,-0.047 +1807,-0.752 +1808,1.011 +1809,-0.393 +1810,-0.951 +1811,0.713 +1812,0.885 +1813,-0.742 +1814,-0.430 +1815,0.428 +1816,-0.297 +1817,-0.552 +1818,-0.254 +1819,-1.373 +1820,1.306 +1821,3.226 +1822,0.140 +1823,-1.707 +1824,0.848 +1825,-0.661 +1826,0.024 +1827,-0.359 +1828,-0.797 +1829,0.151 +1830,0.864 +1831,-0.512 +1832,-0.295 +1833,-0.156 +1834,0.585 +1835,0.315 +1836,1.314 +1837,1.435 +1838,-0.476 +1839,-0.266 +1840,-1.483 +1841,-1.658 +1842,-0.139 +1843,0.237 +1844,-0.013 +1845,0.533 +1846,0.448 +1847,1.677 +1848,1.333 +1849,0.706 +1850,0.430 +1851,-0.120 +1852,0.584 +1853,0.779 +1854,0.126 +1855,1.681 +1856,1.485 +1857,1.101 +1858,-0.444 +1859,0.272 +1860,0.796 +1861,-0.654 +1862,-0.653 +1863,-0.502 +1864,-0.333 +1865,0.141 +1866,-0.718 +1867,1.156 +1868,-1.194 +1869,1.642 +1870,1.151 +1871,-0.082 +1872,-0.932 +1873,0.422 +1874,0.981 +1875,-0.432 +1876,-2.126 +1877,0.745 +1878,0.374 +1879,0.603 +1880,-0.970 +1881,-2.599 +1882,0.790 +1883,0.790 +1884,0.055 +1885,-0.386 +1886,1.758 +1887,0.294 +1888,2.387 +1889,0.227 +1890,0.051 +1891,-0.091 +1892,-0.581 +1893,1.082 +1894,0.237 +1895,-0.216 +1896,-0.073 +1897,0.478 +1898,1.082 +1899,1.417 +1900,-0.699 +1901,-0.452 +1902,-0.823 +1903,1.289 +1904,-0.197 +1905,-0.519 +1906,1.403 +1907,-1.428 +1908,1.180 +1909,0.968 +1910,0.905 +1911,-0.315 +1912,0.937 +1913,2.771 +1914,-1.393 +1915,0.481 +1916,0.810 +1917,-0.115 +1918,1.981 +1919,-0.115 +1920,0.589 +1921,-1.416 +1922,-0.837 +1923,-1.267 +1924,-0.155 +1925,0.181 +1926,0.856 +1927,0.572 +1928,0.716 +1929,0.560 +1930,-0.456 +1931,-1.926 +1932,0.146 +1933,-0.797 +1934,-1.524 +1935,2.566 +1936,-1.068 +1937,0.756 +1938,-0.393 +1939,-1.095 +1940,-1.644 +1941,-0.309 +1942,-0.614 +1943,-1.182 +1944,-0.573 +1945,-0.164 +1946,0.067 +1947,0.687 +1948,0.013 +1949,-0.451 +1950,0.002 +1951,0.969 +1952,-0.971 +1953,1.293 +1954,-0.325 +1955,0.695 +1956,-0.327 +1957,-1.199 +1958,0.187 +1959,0.858 +1960,0.623 +1961,-0.520 +1962,0.266 +1963,0.147 +1964,-1.246 +1965,-0.156 +1966,-0.585 +1967,0.231 +1968,1.143 +1969,0.230 +1970,0.668 +1971,0.777 +1972,-1.352 +1973,0.006 +1974,-1.159 +1975,0.048 +1976,0.761 +1977,-0.063 +1978,-1.470 +1979,0.771 +1980,-0.393 +1981,-1.378 +1982,0.312 +1983,-2.238 +1984,0.151 +1985,1.085 +1986,1.060 +1987,1.056 +1988,0.450 +1989,0.165 +1990,-1.101 +1991,2.354 +1992,-1.828 +1993,1.537 +1994,0.529 +1995,-0.895 +1996,0.701 +1997,-1.697 +1998,-0.374 +1999,1.525 +2000,-1.512 +2001,-0.337 +2002,0.329 +2003,-0.460 +2004,0.328 +2005,1.472 +2006,-0.604 +2007,0.071 +2008,0.206 +2009,1.590 +2010,-0.860 +2011,0.025 +2012,-0.045 +2013,2.072 +2014,-0.955 +2015,-0.079 +2016,-1.598 +2017,0.547 +2018,1.696 +2019,0.699 +2020,0.638 +2021,1.975 +2022,-0.260 +2023,0.601 +2024,1.463 +2025,0.085 +2026,-0.856 +2027,-0.500 +2028,-0.304 +2029,0.577 +2030,0.261 +2031,1.104 +2032,0.729 +2033,-0.182 +2034,1.619 +2035,0.354 +2036,-1.205 +2037,2.705 +2038,-0.970 +2039,0.880 +2040,0.343 +2041,-0.783 +2042,-0.158 +2043,-0.018 +2044,1.321 +2045,0.776 +2046,-0.718 +2047,-0.976 +2048,-0.751 +2049,0.089 +2050,0.042 +2051,0.831 +2052,-2.517 +2053,0.241 +2054,-1.678 +2055,-1.018 +2056,0.594 +2057,-0.513 +2058,-1.206 +2059,0.011 +2060,0.727 +2061,0.416 +2062,0.735 +2063,0.822 +2064,-0.317 +2065,0.574 +2066,-0.753 +2067,-1.386 +2068,1.767 +2069,1.676 +2070,1.360 +2071,0.374 +2072,-1.392 +2073,0.831 +2074,1.497 +2075,0.043 +2076,0.192 +2077,-0.080 +2078,0.425 +2079,-0.043 +2080,1.290 +2081,1.282 +2082,-1.904 +2083,1.650 +2084,-1.864 +2085,-0.467 +2086,-0.091 +2087,-0.627 +2088,-0.093 +2089,0.553 +2090,0.512 +2091,0.175 +2092,0.929 +2093,-0.303 +2094,-0.107 +2095,-0.069 +2096,-0.784 +2097,-0.880 +2098,-0.260 +2099,2.834 +2100,1.405 +2101,0.253 +2102,1.402 +2103,-0.772 +2104,-1.687 +2105,-0.260 +2106,0.074 +2107,-1.546 +2108,0.791 +2109,0.326 +2110,0.947 +2111,-0.023 +2112,0.936 +2113,0.185 +2114,-1.217 +2115,0.377 +2116,1.903 +2117,0.723 +2118,-2.196 +2119,0.511 +2120,-0.999 +2121,-0.396 +2122,-0.831 +2123,-0.451 +2124,-0.014 +2125,0.494 +2126,1.167 +2127,1.458 +2128,-0.367 +2129,-0.761 +2130,0.028 +2131,1.349 +2132,0.964 +2133,-0.096 +2134,1.558 +2135,0.415 +2136,-1.382 +2137,-0.192 +2138,0.756 +2139,0.038 +2140,1.545 +2141,0.330 +2142,-0.353 +2143,0.799 +2144,0.917 +2145,-0.584 +2146,0.265 +2147,-1.513 +2148,-0.119 +2149,1.732 +2150,-2.200 +2151,0.079 +2152,-0.302 +2153,0.228 +2154,0.770 +2155,-0.986 +2156,-1.274 +2157,0.460 +2158,-0.159 +2159,1.957 +2160,0.277 +2161,0.348 +2162,-0.961 +2163,-0.538 +2164,-0.587 +2165,-1.190 +2166,1.280 +2167,1.626 +2168,-0.109 +2169,0.282 +2170,1.192 +2171,0.386 +2172,0.036 +2173,0.758 +2174,0.056 +2175,1.017 +2176,1.347 +2177,-0.946 +2178,-0.296 +2179,-0.437 +2180,-0.899 +2181,0.715 +2182,0.230 +2183,0.206 +2184,0.364 +2185,0.218 +2186,-0.728 +2187,-0.982 +2188,-1.658 +2189,1.234 +2190,-1.792 +2191,-1.373 +2192,-0.626 +2193,-0.110 +2194,-0.202 +2195,1.105 +2196,-0.392 +2197,-0.917 +2198,1.049 +2199,-1.837 +2200,0.919 +2201,0.986 +2202,-0.367 +2203,-0.414 +2204,-0.151 +2205,-0.246 +2206,-0.471 +2207,-0.522 +2208,-0.188 +2209,-1.022 +2210,0.126 +2211,-2.445 +2212,0.048 +2213,-0.473 +2214,-1.239 +2215,0.145 +2216,-0.621 +2217,-0.390 +2218,-0.280 +2219,1.408 +2220,0.140 +2221,0.170 +2222,0.531 +2223,0.045 +2224,0.824 +2225,-0.727 +2226,-0.559 +2227,-1.129 +2228,-1.000 +2229,-0.328 +2230,1.368 +2231,0.287 +2232,-0.726 +2233,-0.553 +2234,-0.275 +2235,0.213 +2236,-0.437 +2237,-0.790 +2238,0.963 +2239,-0.277 +2240,-0.050 +2241,-0.412 +2242,1.767 +2243,-0.962 +2244,0.027 +2245,1.187 +2246,0.134 +2247,0.712 +2248,-0.051 +2249,0.503 +2250,-0.524 +2251,-1.318 +2252,-1.411 +2253,-1.001 +2254,0.470 +2255,2.182 +2256,0.367 +2257,1.322 +2258,-0.812 +2259,0.257 +2260,1.560 +2261,0.447 +2262,0.724 +2263,-0.840 +2264,0.626 +2265,-1.019 +2266,-0.613 +2267,0.811 +2268,0.090 +2269,0.328 +2270,-0.307 +2271,0.591 +2272,-0.687 +2273,-0.524 +2274,-0.472 +2275,0.085 +2276,-1.091 +2277,-1.106 +2278,0.897 +2279,-1.881 +2280,-0.293 +2281,-2.632 +2282,-0.253 +2283,-1.016 +2284,0.596 +2285,-1.647 +2286,1.567 +2287,0.326 +2288,-0.925 +2289,-0.084 +2290,-0.645 +2291,-1.186 +2292,1.672 +2293,-0.413 +2294,-1.208 +2295,1.034 +2296,-0.766 +2297,-0.141 +2298,2.250 +2299,1.663 +2300,0.160 +2301,0.994 +2302,-1.201 +2303,-0.550 +2304,2.202 +2305,1.073 +2306,0.008 +2307,-1.080 +2308,-0.187 +2309,-0.165 +2310,1.363 +2311,2.416 +2312,0.517 +2313,-0.785 +2314,-1.101 +2315,-1.599 +2316,0.408 +2317,1.495 +2318,-1.750 +2319,-1.339 +2320,0.363 +2321,-0.082 +2322,0.199 +2323,-1.359 +2324,-0.308 +2325,0.901 +2326,0.632 +2327,1.298 +2328,-2.299 +2329,-0.416 +2330,1.086 +2331,-0.105 +2332,0.906 +2333,0.002 +2334,0.625 +2335,-0.609 +2336,-0.032 +2337,0.023 +2338,-0.200 +2339,0.589 +2340,-0.854 +2341,-0.517 +2342,-0.798 +2343,-1.250 +2344,-0.285 +2345,-0.719 +2346,0.018 +2347,0.649 +2348,0.354 +2349,-0.208 +2350,0.094 +2351,-0.783 +2352,-0.791 +2353,-1.156 +2354,-1.042 +2355,0.676 +2356,1.892 +2357,1.459 +2358,-1.190 +2359,0.780 +2360,0.106 +2361,1.965 +2362,-0.208 +2363,0.763 +2364,-0.575 +2365,0.363 +2366,1.303 +2367,-0.977 +2368,0.982 +2369,0.381 +2370,0.844 +2371,-0.429 +2372,0.287 +2373,-0.890 +2374,-0.012 +2375,0.678 +2376,0.268 +2377,0.002 +2378,0.272 +2379,0.527 +2380,-0.895 +2381,-0.281 +2382,0.367 +2383,-0.207 +2384,-1.122 +2385,-0.706 +2386,-0.261 +2387,0.016 +2388,0.697 +2389,-1.679 +2390,0.263 +2391,0.368 +2392,-0.404 +2393,-0.905 +2394,-3.522 +2395,-0.956 +2396,-0.550 +2397,-1.782 +2398,0.057 +2399,0.666 +2400,0.009 +2401,-0.364 +2402,-0.109 +2403,0.028 +2404,0.542 +2405,0.809 +2406,-0.884 +2407,-1.329 +2408,-0.405 +2409,0.159 +2410,-0.307 +2411,-2.034 +2412,-0.546 +2413,0.423 +2414,-0.857 +2415,1.997 +2416,-0.832 +2417,1.557 +2418,-0.434 +2419,1.626 +2420,-0.183 +2421,0.115 +2422,0.778 +2423,0.457 +2424,-0.208 +2425,-1.587 +2426,0.788 +2427,0.522 +2428,-2.999 +2429,0.677 +2430,-1.185 +2431,-0.952 +2432,-0.254 +2433,0.397 +2434,-0.446 +2435,2.142 +2436,-1.332 +2437,0.388 +2438,1.058 +2439,1.689 +2440,0.539 +2441,1.422 +2442,2.077 +2443,-1.268 +2444,1.404 +2445,1.327 +2446,-0.487 +2447,-0.800 +2448,-0.341 +2449,-1.714 +2450,-1.452 +2451,0.654 +2452,0.342 +2453,0.252 +2454,0.764 +2455,-0.335 +2456,0.320 +2457,-0.455 +2458,1.276 +2459,-0.401 +2460,-0.532 +2461,-0.901 +2462,-1.756 +2463,0.779 +2464,-2.035 +2465,1.265 +2466,0.336 +2467,1.266 +2468,-0.450 +2469,-0.131 +2470,-0.426 +2471,1.123 +2472,-1.748 +2473,-0.255 +2474,0.530 +2475,-1.215 +2476,-0.547 +2477,1.347 +2478,-0.725 +2479,0.637 +2480,0.755 +2481,-1.067 +2482,0.385 +2483,0.507 +2484,0.680 +2485,0.951 +2486,0.612 +2487,0.481 +2488,0.445 +2489,-0.242 +2490,2.159 +2491,-0.225 +2492,-1.612 +2493,0.758 +2494,-0.061 +2495,-0.924 +2496,0.548 +2497,-0.993 +2498,-0.545 +2499,2.357 +2500,0.829 +2501,0.381 +2502,-0.622 +2503,-0.165 +2504,-1.056 +2505,-1.196 +2506,1.337 +2507,-0.734 +2508,-0.015 +2509,0.935 +2510,-0.760 +2511,0.515 +2512,-0.351 +2513,0.075 +2514,-0.380 +2515,-1.490 +2516,0.422 +2517,0.059 +2518,-0.859 +2519,1.266 +2520,0.208 +2521,0.363 +2522,0.280 +2523,1.181 +2524,2.517 +2525,1.575 +2526,0.496 +2527,1.658 +2528,-0.808 +2529,1.288 +2530,-1.380 +2531,0.317 +2532,-0.967 +2533,0.149 +2534,-2.132 +2535,0.395 +2536,0.010 +2537,-1.108 +2538,-0.464 +2539,-1.352 +2540,1.374 +2541,0.072 +2542,0.354 +2543,1.884 +2544,-1.845 +2545,0.825 +2546,0.136 +2547,-0.450 +2548,-0.284 +2549,0.199 +2550,0.404 +2551,-0.881 +2552,-1.765 +2553,0.338 +2554,-0.542 +2555,1.111 +2556,-0.202 +2557,0.095 +2558,0.491 +2559,0.020 +2560,-0.691 +2561,1.444 +2562,0.523 +2563,-0.625 +2564,-0.389 +2565,0.398 +2566,0.421 +2567,1.385 +2568,1.641 +2569,-0.341 +2570,0.454 +2571,0.930 +2572,-1.928 +2573,0.971 +2574,-0.621 +2575,-0.439 +2576,0.214 +2577,1.697 +2578,0.420 +2579,-1.954 +2580,1.120 +2581,0.054 +2582,-1.123 +2583,1.139 +2584,0.728 +2585,-0.443 +2586,1.124 +2587,0.479 +2588,1.457 +2589,0.038 +2590,0.344 +2591,0.198 +2592,-1.744 +2593,1.024 +2594,0.762 +2595,1.084 +2596,0.622 +2597,-1.094 +2598,0.675 +2599,-0.641 +2600,2.591 +2601,0.744 +2602,-0.343 +2603,-2.880 +2604,1.782 +2605,-1.528 +2606,-0.352 +2607,-0.184 +2608,-0.916 +2609,-0.022 +2610,0.075 +2611,0.465 +2612,0.111 +2613,-0.758 +2614,-0.735 +2615,0.104 +2616,-0.513 +2617,1.060 +2618,-1.432 +2619,0.400 +2620,-1.881 +2621,0.384 +2622,1.100 +2623,0.021 +2624,-0.416 +2625,0.362 +2626,-1.451 +2627,0.585 +2628,0.476 +2629,1.238 +2630,-0.816 +2631,0.847 +2632,-2.065 +2633,-0.883 +2634,1.674 +2635,0.018 +2636,0.238 +2637,1.075 +2638,-0.667 +2639,0.458 +2640,0.225 +2641,-0.825 +2642,-1.569 +2643,1.618 +2644,-0.336 +2645,-0.285 +2646,0.338 +2647,-1.496 +2648,-0.403 +2649,0.033 +2650,-0.620 +2651,-1.321 +2652,1.997 +2653,0.614 +2654,-0.441 +2655,-0.907 +2656,0.821 +2657,0.214 +2658,1.268 +2659,1.158 +2660,-0.653 +2661,0.292 +2662,-1.760 +2663,-0.421 +2664,-0.673 +2665,2.995 +2666,0.705 +2667,0.065 +2668,0.137 +2669,-2.848 +2670,-0.877 +2671,-1.192 +2672,1.189 +2673,0.203 +2674,0.310 +2675,-1.164 +2676,-0.634 +2677,-0.123 +2678,-0.376 +2679,0.026 +2680,0.068 +2681,0.994 +2682,0.096 +2683,1.277 +2684,1.359 +2685,0.107 +2686,-0.593 +2687,-1.284 +2688,0.123 +2689,1.318 +2690,1.320 +2691,0.694 +2692,-1.382 +2693,-0.797 +2694,0.313 +2695,-2.279 +2696,-0.443 +2697,1.525 +2698,-0.264 +2699,-0.787 +2700,2.084 +2701,-0.963 +2702,-2.128 +2703,3.695 +2704,-0.108 +2705,0.241 +2706,-2.448 +2707,-0.295 +2708,0.637 +2709,0.745 +2710,-0.059 +2711,0.566 +2712,1.047 +2713,0.060 +2714,0.402 +2715,1.170 +2716,0.922 +2717,0.019 +2718,-0.664 +2719,-1.192 +2720,-0.492 +2721,-0.683 +2722,1.007 +2723,-2.129 +2724,1.282 +2725,-0.594 +2726,-0.264 +2727,0.461 +2728,1.673 +2729,-0.808 +2730,1.023 +2731,1.117 +2732,-1.309 +2733,0.501 +2734,0.276 +2735,-0.721 +2736,-0.241 +2737,-0.151 +2738,-0.312 +2739,0.369 +2740,-0.656 +2741,-1.162 +2742,-1.053 +2743,1.881 +2744,0.850 +2745,-0.910 +2746,-1.304 +2747,0.385 +2748,0.137 +2749,0.330 +2750,1.648 +2751,1.012 +2752,0.577 +2753,-0.530 +2754,0.332 +2755,0.596 +2756,-1.050 +2757,0.226 +2758,-0.440 +2759,0.033 +2760,0.268 +2761,0.563 +2762,-0.804 +2763,-0.434 +2764,1.184 +2765,1.038 +2766,-1.336 +2767,-0.386 +2768,1.059 +2769,-0.310 +2770,0.781 +2771,0.176 +2772,-1.955 +2773,0.308 +2774,0.828 +2775,-0.510 +2776,1.169 +2777,-0.322 +2778,-0.066 +2779,-0.937 +2780,-1.767 +2781,-0.017 +2782,-0.204 +2783,-0.105 +2784,1.934 +2785,0.969 +2786,0.885 +2787,0.459 +2788,-0.228 +2789,-0.166 +2790,-0.321 +2791,0.619 +2792,-0.121 +2793,-1.242 +2794,-0.294 +2795,1.279 +2796,-1.374 +2797,-0.146 +2798,0.395 +2799,-0.211 +2800,0.716 +2801,0.058 +2802,0.345 +2803,0.563 +2804,-0.419 +2805,-0.293 +2806,0.401 +2807,-0.238 +2808,-1.095 +2809,0.202 +2810,-0.327 +2811,1.882 +2812,-0.503 +2813,-0.434 +2814,0.018 +2815,0.345 +2816,-1.078 +2817,-0.037 +2818,0.847 +2819,-0.274 +2820,1.696 +2821,1.091 +2822,-0.897 +2823,0.730 +2824,-0.211 +2825,0.062 +2826,0.024 +2827,0.188 +2828,0.114 +2829,-0.583 +2830,-1.729 +2831,-0.665 +2832,-0.648 +2833,0.195 +2834,0.708 +2835,1.083 +2836,1.380 +2837,-0.300 +2838,1.375 +2839,-0.563 +2840,0.304 +2841,0.817 +2842,0.600 +2843,0.865 +2844,0.877 +2845,0.497 +2846,0.407 +2847,-0.034 +2848,1.090 +2849,-0.761 +2850,0.670 +2851,1.949 +2852,-1.125 +2853,1.662 +2854,-0.078 +2855,-0.552 +2856,0.493 +2857,1.982 +2858,0.471 +2859,0.519 +2860,1.304 +2861,0.419 +2862,-1.168 +2863,1.863 +2864,0.641 +2865,-0.247 +2866,0.722 +2867,-0.551 +2868,-1.684 +2869,-0.411 +2870,0.669 +2871,-0.161 +2872,-0.231 +2873,0.265 +2874,-0.551 +2875,-0.381 +2876,1.077 +2877,-0.626 +2878,-0.437 +2879,1.243 +2880,0.492 +2881,-0.855 +2882,-0.350 +2883,-1.785 +2884,0.550 +2885,1.476 +2886,1.690 +2887,-0.714 +2888,-1.243 +2889,0.036 +2890,0.443 +2891,-0.419 +2892,-0.537 +2893,-0.023 +2894,0.569 +2895,-1.369 +2896,0.804 +2897,-0.855 +2898,-1.097 +2899,1.231 +2900,0.231 +2901,-0.710 +2902,-0.038 +2903,0.378 +2904,0.696 +2905,-1.195 +2906,-0.199 +2907,0.015 +2908,-1.915 +2909,0.155 +2910,0.635 +2911,0.602 +2912,-0.545 +2913,0.581 +2914,-0.474 +2915,1.764 +2916,1.023 +2917,-1.278 +2918,0.402 +2919,-0.345 +2920,-0.386 +2921,0.744 +2922,-1.223 +2923,0.203 +2924,-1.116 +2925,0.159 +2926,0.818 +2927,0.535 +2928,-0.677 +2929,0.675 +2930,-1.941 +2931,-0.027 +2932,0.669 +2933,0.417 +2934,-1.826 +2935,-1.034 +2936,-0.221 +2937,0.711 +2938,0.087 +2939,0.394 +2940,-1.209 +2941,-1.073 +2942,0.244 +2943,-2.785 +2944,-0.584 +2945,-0.619 +2946,0.191 +2947,-0.743 +2948,0.126 +2949,0.916 +2950,0.924 +2951,-0.655 +2952,0.533 +2953,0.164 +2954,1.634 +2955,0.531 +2956,2.579 +2957,0.045 +2958,1.041 +2959,0.023 +2960,-0.374 +2961,0.301 +2962,-1.694 +2963,0.521 +2964,0.258 +2965,0.172 +2966,-0.984 +2967,-0.209 +2968,0.207 +2969,0.761 +2970,-0.357 +2971,0.905 +2972,-2.484 +2973,-0.130 +2974,0.287 +2975,0.386 +2976,-1.079 +2977,-0.954 +2978,0.615 +2979,-0.314 +2980,0.181 +2981,1.662 +2982,-0.354 +2983,0.144 +2984,-0.088 +2985,3.147 +2986,0.283 +2987,0.476 +2988,0.879 +2989,1.678 +2990,-1.369 +2991,0.058 +2992,0.441 +2993,0.462 +2994,0.166 +2995,0.411 +2996,0.207 +2997,-0.965 +2998,-1.135 +2999,1.714 +3000,2.939 +3001,1.114 +3002,0.637 +3003,-0.639 +3004,0.917 +3005,-0.795 +3006,1.180 +3007,-0.466 +3008,0.363 +3009,0.002 +3010,1.356 +3011,-0.930 +3012,-0.768 +3013,-0.096 +3014,0.133 +3015,-0.447 +3016,-1.010 +3017,-1.618 +3018,0.381 +3019,-0.273 +3020,0.240 +3021,-0.837 +3022,-0.082 +3023,-1.855 +3024,-0.687 +3025,2.308 +3026,-0.446 +3027,-1.447 +3028,1.702 +3029,0.146 +3030,1.433 +3031,0.499 +3032,-0.905 +3033,-0.239 +3034,-0.643 +3035,0.557 +3036,-1.297 +3037,0.937 +3038,-0.274 +3039,-0.234 +3040,1.462 +3041,-0.274 +3042,-1.189 +3043,-0.577 +3044,0.163 +3045,-2.052 +3046,0.682 +3047,0.192 +3048,-0.148 +3049,-1.385 +3050,-0.914 +3051,-0.298 +3052,0.605 +3053,-0.077 +3054,-0.094 +3055,1.832 +3056,0.869 +3057,-1.137 +3058,-1.103 +3059,0.300 +3060,-1.000 +3061,-0.570 +3062,0.137 +3063,0.755 +3064,0.198 +3065,-1.835 +3066,-0.843 +3067,-1.008 +3068,-0.199 +3069,-0.911 +3070,-0.521 +3071,-0.444 +3072,0.452 +3073,-0.167 +3074,-1.869 +3075,-0.479 +3076,0.170 +3077,-1.040 +3078,0.220 +3079,0.046 +3080,-0.680 +3081,0.489 +3082,-0.028 +3083,0.406 +3084,1.715 +3085,-0.076 +3086,-0.676 +3087,1.284 +3088,-0.271 +3089,-0.937 +3090,-0.389 +3091,-1.699 +3092,0.092 +3093,-0.125 +3094,-0.728 +3095,-1.817 +3096,-1.250 +3097,0.139 +3098,0.490 +3099,-0.614 +3100,0.901 +3101,0.471 +3102,1.117 +3103,0.722 +3104,-0.786 +3105,1.372 +3106,2.185 +3107,-1.194 +3108,0.722 +3109,-0.907 +3110,0.857 +3111,-0.357 +3112,0.326 +3113,0.111 +3114,-0.519 +3115,-0.211 +3116,-1.931 +3117,0.274 +3118,-0.567 +3119,1.325 +3120,0.384 +3121,1.148 +3122,0.028 +3123,0.865 +3124,-1.358 +3125,-2.627 +3126,-1.118 +3127,-0.471 +3128,-0.887 +3129,-0.947 +3130,-0.849 +3131,1.083 +3132,-1.823 +3133,-1.582 +3134,0.649 +3135,0.409 +3136,-0.468 +3137,0.756 +3138,-0.362 +3139,-0.560 +3140,-0.567 +3141,0.120 +3142,-1.130 +3143,-3.252 +3144,1.288 +3145,0.052 +3146,0.210 +3147,0.425 +3148,-1.000 +3149,-0.106 +3150,0.663 +3151,0.526 +3152,-1.867 +3153,-0.184 +3154,-1.063 +3155,1.178 +3156,-1.917 +3157,-1.781 +3158,-0.797 +3159,0.810 +3160,-1.222 +3161,1.726 +3162,1.999 +3163,-0.767 +3164,-0.403 +3165,-1.079 +3166,-0.551 +3167,2.460 +3168,-1.383 +3169,0.132 +3170,-0.927 +3171,-1.514 +3172,-0.035 +3173,0.057 +3174,0.104 +3175,1.037 +3176,-2.029 +3177,1.192 +3178,-0.292 +3179,-0.646 +3180,-0.806 +3181,-1.634 +3182,0.775 +3183,0.183 +3184,0.391 +3185,0.997 +3186,-1.444 +3187,1.381 +3188,0.666 +3189,-0.183 +3190,-0.862 +3191,-1.562 +3192,-1.900 +3193,-0.049 +3194,1.661 +3195,1.077 +3196,0.317 +3197,-0.603 +3198,1.228 +3199,-0.188 +3200,-0.048 +3201,-1.403 +3202,-0.824 +3203,0.385 +3204,-0.875 +3205,0.729 +3206,0.222 +3207,-0.047 +3208,1.329 +3209,-1.158 +3210,0.292 +3211,-0.924 +3212,-0.844 +3213,-1.733 +3214,1.161 +3215,0.383 +3216,-0.074 +3217,1.003 +3218,0.173 +3219,0.635 +3220,0.520 +3221,-1.463 +3222,1.043 +3223,0.549 +3224,-1.944 +3225,0.602 +3226,0.953 +3227,0.585 +3228,-0.944 +3229,0.434 +3230,0.199 +3231,-0.481 +3232,0.665 +3233,-0.328 +3234,0.690 +3235,-0.244 +3236,-0.074 +3237,-1.363 +3238,-0.102 +3239,-1.390 +3240,-0.166 +3241,-0.245 +3242,-0.693 +3243,0.423 +3244,-0.086 +3245,-1.224 +3246,0.945 +3247,1.331 +3248,1.007 +3249,0.747 +3250,-1.089 +3251,-0.719 +3252,-0.306 +3253,-1.491 +3254,-0.720 +3255,0.469 +3256,-0.387 +3257,1.080 +3258,0.394 +3259,2.465 +3260,-0.189 +3261,-0.212 +3262,2.324 +3263,0.530 +3264,0.261 +3265,-0.010 +3266,-0.397 +3267,-1.240 +3268,-0.601 +3269,0.477 +3270,0.066 +3271,-1.640 +3272,0.292 +3273,-2.171 +3274,0.923 +3275,0.288 +3276,0.467 +3277,0.126 +3278,-1.352 +3279,0.448 +3280,-0.607 +3281,0.969 +3282,0.319 +3283,0.492 +3284,0.812 +3285,-0.289 +3286,0.019 +3287,1.220 +3288,1.926 +3289,0.541 +3290,-1.105 +3291,-0.316 +3292,0.361 +3293,0.464 +3294,2.268 +3295,0.891 +3296,0.487 +3297,-0.109 +3298,0.789 +3299,0.896 +3300,-0.324 +3301,-0.745 +3302,1.148 +3303,-0.566 +3304,0.263 +3305,0.084 +3306,-1.080 +3307,0.334 +3308,0.553 +3309,-0.597 +3310,-1.938 +3311,-1.159 +3312,-1.258 +3313,1.805 +3314,-1.464 +3315,0.175 +3316,0.168 +3317,0.366 +3318,1.496 +3319,-0.024 +3320,0.318 +3321,-1.426 +3322,1.841 +3323,0.520 +3324,1.657 +3325,-1.092 +3326,0.178 +3327,0.444 +3328,0.155 +3329,-0.417 +3330,0.704 +3331,-1.072 +3332,0.518 +3333,0.130 +3334,0.166 +3335,1.420 +3336,-0.300 +3337,0.607 +3338,-1.229 +3339,-0.516 +3340,-1.008 +3341,0.082 +3342,1.469 +3343,-0.799 +3344,-0.709 +3345,1.238 +3346,0.832 +3347,-1.462 +3348,-1.524 +3349,1.062 +3350,-0.719 +3351,-0.353 +3352,0.299 +3353,-1.991 +3354,-0.729 +3355,0.123 +3356,-1.488 +3357,-0.256 +3358,-0.718 +3359,0.095 +3360,-0.949 +3361,-0.666 +3362,0.105 +3363,-0.701 +3364,0.613 +3365,-1.607 +3366,-0.094 +3367,0.625 +3368,-1.477 +3369,-0.066 +3370,-0.248 +3371,-0.303 +3372,0.845 +3373,0.042 +3374,1.281 +3375,0.146 +3376,1.384 +3377,-2.323 +3378,1.539 +3379,-0.045 +3380,0.229 +3381,0.413 +3382,1.215 +3383,-0.340 +3384,-1.063 +3385,0.009 +3386,-0.477 +3387,-0.008 +3388,0.478 +3389,-0.553 +3390,0.993 +3391,-1.059 +3392,-3.375 +3393,1.828 +3394,1.438 +3395,0.689 +3396,1.509 +3397,0.913 +3398,-0.262 +3399,0.401 +3400,-0.747 +3401,-0.572 +3402,0.618 +3403,1.533 +3404,-1.620 +3405,-1.401 +3406,1.278 +3407,1.237 +3408,-0.223 +3409,1.191 +3410,0.258 +3411,0.729 +3412,0.579 +3413,0.103 +3414,0.437 +3415,-0.556 +3416,0.615 +3417,-0.367 +3418,0.793 +3419,0.682 +3420,1.136 +3421,0.332 +3422,0.381 +3423,0.317 +3424,-2.489 +3425,0.525 +3426,0.248 +3427,-1.274 +3428,-0.573 +3429,-0.180 +3430,-0.428 +3431,0.279 +3432,1.763 +3433,-1.393 +3434,-0.165 +3435,-0.475 +3436,2.169 +3437,0.843 +3438,-1.133 +3439,-0.464 +3440,-0.653 +3441,0.643 +3442,-1.316 +3443,-1.469 +3444,-1.742 +3445,-1.576 +3446,0.670 +3447,-0.984 +3448,-0.110 +3449,1.983 +3450,0.050 +3451,0.237 +3452,0.080 +3453,0.534 +3454,-0.637 +3455,-0.566 +3456,0.902 +3457,0.276 +3458,-0.092 +3459,0.368 +3460,-0.726 +3461,-0.853 +3462,0.329 +3463,0.315 +3464,-0.466 +3465,-0.107 +3466,-0.458 +3467,0.502 +3468,-0.534 +3469,0.497 +3470,-0.136 +3471,-2.102 +3472,-1.235 +3473,0.188 +3474,0.489 +3475,0.546 +3476,-0.019 +3477,-0.176 +3478,-1.036 +3479,1.237 +3480,0.627 +3481,-0.533 +3482,1.097 +3483,-1.061 +3484,0.332 +3485,0.228 +3486,0.478 +3487,0.480 +3488,-0.018 +3489,-0.570 +3490,0.979 +3491,-0.966 +3492,1.180 +3493,0.914 +3494,-0.443 +3495,0.153 +3496,0.658 +3497,0.484 +3498,-2.019 +3499,-0.475 +3500,-0.962 +3501,-0.774 +3502,-0.228 +3503,1.210 +3504,-1.074 +3505,-0.801 +3506,0.410 +3507,1.543 +3508,-0.019 +3509,-1.901 +3510,0.584 +3511,-0.400 +3512,-0.019 +3513,-1.841 +3514,0.110 +3515,-0.986 +3516,0.253 +3517,-2.326 +3518,-0.070 +3519,0.512 +3520,-1.028 +3521,-0.428 +3522,1.126 +3523,1.343 +3524,-0.518 +3525,-0.387 +3526,-1.225 +3527,0.789 +3528,0.064 +3529,-0.127 +3530,0.840 +3531,0.433 +3532,0.619 +3533,-2.977 +3534,-0.621 +3535,-0.204 +3536,0.134 +3537,-1.251 +3538,-1.255 +3539,0.025 +3540,0.890 +3541,1.691 +3542,-0.518 +3543,0.963 +3544,0.263 +3545,0.755 +3546,0.670 +3547,-1.401 +3548,0.172 +3549,0.055 +3550,-0.885 +3551,0.513 +3552,1.850 +3553,0.408 +3554,-0.254 +3555,-1.399 +3556,-0.584 +3557,-0.453 +3558,-0.407 +3559,-3.601 +3560,-0.320 +3561,2.465 +3562,-1.219 +3563,1.979 +3564,0.966 +3565,1.540 +3566,-0.736 +3567,-0.137 +3568,1.349 +3569,-1.029 +3570,-1.460 +3571,-0.914 +3572,-1.945 +3573,1.937 +3574,0.886 +3575,-1.659 +3576,-0.832 +3577,-1.877 +3578,0.397 +3579,0.771 +3580,-0.711 +3581,0.415 +3582,1.399 +3583,-0.131 +3584,0.437 +3585,0.938 +3586,-1.076 +3587,0.044 +3588,0.069 +3589,-0.245 +3590,-0.031 +3591,0.320 +3592,0.802 +3593,0.620 +3594,0.558 +3595,0.144 +3596,0.344 +3597,-2.466 +3598,-1.097 +3599,-0.243 +3600,-1.138 +3601,-0.023 +3602,-0.416 +3603,0.921 +3604,1.012 +3605,-0.644 +3606,0.066 +3607,-0.691 +3608,0.244 +3609,-0.867 +3610,0.213 +3611,-0.427 +3612,0.513 +3613,-1.077 +3614,0.332 +3615,-1.054 +3616,1.427 +3617,-0.958 +3618,-1.644 +3619,-0.468 +3620,-0.235 +3621,0.047 +3622,0.826 +3623,0.080 +3624,-0.636 +3625,0.506 +3626,-0.422 +3627,0.122 +3628,-0.553 +3629,0.044 +3630,0.101 +3631,-0.334 +3632,-0.495 +3633,-1.388 +3634,1.518 +3635,-1.336 +3636,1.390 +3637,1.261 +3638,-1.398 +3639,0.208 +3640,-0.545 +3641,-0.069 +3642,-0.099 +3643,0.105 +3644,0.755 +3645,1.213 +3646,-0.693 +3647,-0.699 +3648,0.437 +3649,-1.247 +3650,0.091 +3651,1.565 +3652,0.075 +3653,0.740 +3654,0.238 +3655,-0.118 +3656,0.574 +3657,-0.463 +3658,0.535 +3659,-0.393 +3660,0.697 +3661,1.021 +3662,0.434 +3663,-0.397 +3664,0.087 +3665,-1.050 +3666,-0.629 +3667,-0.702 +3668,-0.856 +3669,1.608 +3670,1.837 +3671,1.058 +3672,0.177 +3673,-0.438 +3674,-0.516 +3675,-0.840 +3676,-0.161 +3677,0.924 +3678,-0.501 +3679,0.014 +3680,1.009 +3681,0.411 +3682,0.158 +3683,-0.045 +3684,0.229 +3685,0.812 +3686,-1.381 +3687,1.072 +3688,-1.023 +3689,-1.631 +3690,-0.612 +3691,-0.176 +3692,1.932 +3693,-0.458 +3694,1.551 +3695,0.763 +3696,0.557 +3697,0.808 +3698,1.007 +3699,-0.604 +3700,0.910 +3701,0.511 +3702,-0.538 +3703,-1.036 +3704,-1.185 +3705,1.297 +3706,0.690 +3707,-1.680 +3708,0.429 +3709,0.363 +3710,0.335 +3711,0.368 +3712,-0.278 +3713,-0.032 +3714,1.395 +3715,-0.676 +3716,-0.813 +3717,0.641 +3718,0.943 +3719,-0.707 +3720,-0.932 +3721,-1.337 +3722,0.630 +3723,1.108 +3724,0.179 +3725,-0.546 +3726,-1.588 +3727,1.578 +3728,-1.462 +3729,0.198 +3730,0.519 +3731,1.078 +3732,-2.030 +3733,1.257 +3734,0.414 +3735,1.692 +3736,-0.724 +3737,-0.670 +3738,-0.791 +3739,-0.311 +3740,0.206 +3741,-1.219 +3742,-2.201 +3743,0.529 +3744,0.358 +3745,-1.439 +3746,1.263 +3747,0.148 +3748,1.030 +3749,0.100 +3750,-0.767 +3751,-1.013 +3752,0.526 +3753,-0.827 +3754,0.412 +3755,-1.493 +3756,0.185 +3757,-0.426 +3758,-1.224 +3759,-0.915 +3760,-0.696 +3761,0.035 +3762,1.109 +3763,1.170 +3764,0.396 +3765,-0.713 +3766,-0.039 +3767,0.431 +3768,-0.173 +3769,-1.214 +3770,-0.782 +3771,1.307 +3772,0.845 +3773,1.321 +3774,-0.124 +3775,-1.265 +3776,-0.568 +3777,-1.685 +3778,1.862 +3779,-0.571 +3780,-1.286 +3781,-0.244 +3782,1.474 +3783,-0.821 +3784,0.938 +3785,0.239 +3786,-0.244 +3787,-0.319 +3788,-0.634 +3789,-0.967 +3790,-0.036 +3791,1.644 +3792,0.407 +3793,0.003 +3794,-1.215 +3795,0.328 +3796,0.242 +3797,0.856 +3798,0.264 +3799,-0.423 +3800,-1.508 +3801,0.851 +3802,0.967 +3803,0.305 +3804,-1.464 +3805,0.895 +3806,0.666 +3807,-0.299 +3808,0.896 +3809,-0.172 +3810,1.020 +3811,0.563 +3812,0.279 +3813,-0.476 +3814,-0.271 +3815,0.265 +3816,-0.844 +3817,2.261 +3818,-0.159 +3819,-0.344 +3820,1.443 +3821,0.023 +3822,0.355 +3823,0.282 +3824,1.124 +3825,0.592 +3826,-0.808 +3827,-0.659 +3828,-0.222 +3829,-2.017 +3830,-0.796 +3831,-0.486 +3832,0.354 +3833,-1.118 +3834,1.261 +3835,-1.515 +3836,2.612 +3837,0.186 +3838,-1.366 +3839,-2.343 +3840,0.281 +3841,1.518 +3842,0.383 +3843,1.772 +3844,0.061 +3845,0.278 +3846,-0.378 +3847,-0.121 +3848,-0.570 +3849,1.409 +3850,-1.260 +3851,-0.378 +3852,-0.588 +3853,-1.728 +3854,-0.088 +3855,0.853 +3856,-0.030 +3857,-0.001 +3858,-1.252 +3859,0.312 +3860,1.920 +3861,0.241 +3862,1.502 +3863,0.699 +3864,-0.082 +3865,-1.097 +3866,1.189 +3867,-0.644 +3868,0.503 +3869,0.849 +3870,-0.199 +3871,-0.379 +3872,0.148 +3873,-0.198 +3874,-1.201 +3875,0.907 +3876,1.610 +3877,-0.380 +3878,-0.276 +3879,0.079 +3880,0.238 +3881,-0.068 +3882,-0.861 +3883,-1.574 +3884,-1.831 +3885,1.603 +3886,-1.694 +3887,-1.302 +3888,-0.192 +3889,0.493 +3890,3.570 +3891,0.653 +3892,0.946 +3893,-0.868 +3894,1.275 +3895,0.053 +3896,-0.773 +3897,-0.987 +3898,-1.126 +3899,-1.040 +3900,-1.462 +3901,-0.896 +3902,-1.172 +3903,0.050 +3904,-0.426 +3905,-1.330 +3906,-1.721 +3907,-0.129 +3908,-0.981 +3909,-1.582 +3910,-1.147 +3911,-0.929 +3912,-0.635 +3913,-0.017 +3914,-0.618 +3915,1.141 +3916,-2.257 +3917,-0.114 +3918,0.086 +3919,-0.486 +3920,3.613 +3921,-1.171 +3922,-0.224 +3923,-1.641 +3924,0.679 +3925,0.706 +3926,0.641 +3927,1.458 +3928,0.886 +3929,0.473 +3930,-0.884 +3931,0.012 +3932,0.044 +3933,-1.051 +3934,-0.417 +3935,0.917 +3936,-0.088 +3937,-0.301 +3938,-0.656 +3939,-0.789 +3940,0.424 +3941,0.117 +3942,1.288 +3943,0.131 +3944,2.004 +3945,1.693 +3946,1.082 +3947,-0.120 +3948,1.043 +3949,-0.028 +3950,-1.121 +3951,0.365 +3952,0.610 +3953,0.616 +3954,0.596 +3955,-0.435 +3956,0.184 +3957,-0.129 +3958,-0.916 +3959,0.138 +3960,-0.993 +3961,0.520 +3962,1.103 +3963,-0.787 +3964,-0.440 +3965,0.901 +3966,-0.932 +3967,-0.331 +3968,0.611 +3969,1.035 +3970,-1.217 +3971,1.846 +3972,0.256 +3973,-0.887 +3974,-0.657 +3975,-0.729 +3976,0.114 +3977,0.421 +3978,0.815 +3979,0.630 +3980,1.713 +3981,-0.020 +3982,1.164 +3983,1.336 +3984,0.840 +3985,-0.051 +3986,0.770 +3987,0.414 +3988,0.028 +3989,2.056 +3990,-1.347 +3991,1.611 +3992,-1.301 +3993,-1.655 +3994,-1.484 +3995,-1.110 +3996,-0.654 +3997,1.249 +3998,-0.820 +3999,0.334 +4000,2.451 +4001,-0.947 +4002,-0.368 +4003,0.404 +4004,-0.812 +4005,-0.777 +4006,-0.207 +4007,-1.624 +4008,0.039 +4009,-1.133 +4010,-0.161 +4011,2.105 +4012,0.208 +4013,0.732 +4014,-0.206 +4015,2.130 +4016,-0.354 +4017,0.144 +4018,-0.078 +4019,-0.361 +4020,1.683 +4021,0.484 +4022,-0.216 +4023,-0.758 +4024,1.332 +4025,1.478 +4026,0.624 +4027,0.509 +4028,0.087 +4029,0.305 +4030,0.426 +4031,0.072 +4032,0.664 +4033,-1.585 +4034,-1.151 +4035,-1.400 +4036,-0.345 +4037,-1.101 +4038,-0.019 +4039,0.669 +4040,0.000 +4041,1.932 +4042,-0.544 +4043,0.005 +4044,0.849 +4045,0.177 +4046,-1.169 +4047,0.603 +4048,-1.920 +4049,-0.367 +4050,-0.399 +4051,1.439 +4052,2.125 +4053,-0.354 +4054,-1.241 +4055,0.401 +4056,-0.971 +4057,0.907 +4058,-1.452 +4059,-1.921 +4060,-0.512 +4061,-0.017 +4062,-1.463 +4063,-0.064 +4064,-0.443 +4065,0.664 +4066,0.235 +4067,-0.288 +4068,-0.364 +4069,-0.938 +4070,-0.238 +4071,1.093 +4072,-1.025 +4073,0.319 +4074,-1.046 +4075,0.133 +4076,-0.073 +4077,1.264 +4078,0.186 +4079,-1.451 +4080,0.070 +4081,-0.794 +4082,0.449 +4083,-0.729 +4084,1.465 +4085,0.280 +4086,1.192 +4087,1.671 +4088,-1.336 +4089,1.139 +4090,0.793 +4091,-1.960 +4092,0.463 +4093,0.614 +4094,-0.865 +4095,1.061 +4096,-0.584 +4097,-0.355 +4098,-1.464 +4099,-1.517 +4100,-1.120 +4101,-1.034 +4102,2.439 +4103,-0.309 +4104,0.471 +4105,1.427 +4106,-0.235 +4107,-0.572 +4108,-1.280 +4109,0.630 +4110,-0.342 +4111,-1.880 +4112,-1.633 +4113,0.521 +4114,0.807 +4115,-1.380 +4116,-1.166 +4117,0.684 +4118,1.310 +4119,-1.175 +4120,0.609 +4121,2.549 +4122,1.989 +4123,0.035 +4124,-0.426 +4125,0.448 +4126,1.064 +4127,1.014 +4128,-0.690 +4129,-0.036 +4130,0.800 +4131,0.617 +4132,-0.391 +4133,-0.797 +4134,-0.747 +4135,0.080 +4136,0.854 +4137,0.317 +4138,-0.375 +4139,1.690 +4140,-0.677 +4141,0.311 +4142,-0.197 +4143,-1.141 +4144,0.563 +4145,1.019 +4146,-1.581 +4147,1.325 +4148,-1.525 +4149,-0.858 +4150,0.731 +4151,-0.525 +4152,0.536 +4153,-0.502 +4154,-1.747 +4155,-0.263 +4156,0.944 +4157,0.443 +4158,0.097 +4159,0.384 +4160,-0.753 +4161,0.704 +4162,1.153 +4163,-0.274 +4164,0.562 +4165,-0.149 +4166,0.392 +4167,-0.125 +4168,0.662 +4169,-0.575 +4170,-0.768 +4171,1.463 +4172,-0.676 +4173,-1.523 +4174,0.213 +4175,-1.744 +4176,0.943 +4177,-0.477 +4178,-0.249 +4179,-1.048 +4180,-1.580 +4181,0.005 +4182,-0.463 +4183,-0.275 +4184,0.644 +4185,1.878 +4186,0.118 +4187,0.449 +4188,-0.233 +4189,2.113 +4190,-0.269 +4191,-0.382 +4192,0.062 +4193,0.715 +4194,-0.257 +4195,1.010 +4196,-1.078 +4197,-0.493 +4198,-0.741 +4199,1.140 +4200,0.188 +4201,0.662 +4202,1.208 +4203,0.504 +4204,1.057 +4205,-1.214 +4206,1.030 +4207,0.046 +4208,-0.552 +4209,-0.378 +4210,-2.857 +4211,-0.041 +4212,0.235 +4213,1.251 +4214,0.026 +4215,0.252 +4216,-0.426 +4217,0.113 +4218,0.660 +4219,-1.167 +4220,0.594 +4221,0.087 +4222,1.614 +4223,-1.070 +4224,-1.267 +4225,0.949 +4226,0.221 +4227,1.496 +4228,-0.013 +4229,0.591 +4230,-0.032 +4231,-0.735 +4232,0.784 +4233,0.944 +4234,-0.320 +4235,0.438 +4236,-1.420 +4237,1.043 +4238,-1.324 +4239,0.845 +4240,-1.256 +4241,1.180 +4242,-0.018 +4243,-0.847 +4244,-0.565 +4245,-1.049 +4246,0.812 +4247,-0.601 +4248,1.607 +4249,-0.174 +4250,-1.430 +4251,-0.098 +4252,0.533 +4253,0.481 +4254,1.475 +4255,1.331 +4256,0.138 +4257,-0.216 +4258,1.312 +4259,-0.823 +4260,1.095 +4261,-1.773 +4262,0.470 +4263,0.272 +4264,0.576 +4265,-1.324 +4266,0.359 +4267,-0.494 +4268,-0.001 +4269,1.025 +4270,0.888 +4271,-0.662 +4272,0.366 +4273,0.491 +4274,-0.512 +4275,0.254 +4276,-1.098 +4277,-0.497 +4278,-1.495 +4279,-0.041 +4280,-2.872 +4281,0.776 +4282,-0.512 +4283,-0.755 +4284,-1.034 +4285,-0.134 +4286,0.304 +4287,0.929 +4288,-0.738 +4289,-0.731 +4290,-1.003 +4291,0.039 +4292,1.288 +4293,2.799 +4294,-3.401 +4295,0.828 +4296,-0.186 +4297,0.391 +4298,-1.033 +4299,-1.944 +4300,0.658 +4301,0.186 +4302,-0.016 +4303,-0.634 +4304,0.358 +4305,-0.468 +4306,-0.182 +4307,1.009 +4308,0.411 +4309,0.079 +4310,-1.858 +4311,1.575 +4312,-2.521 +4313,-1.472 +4314,-2.459 +4315,0.677 +4316,0.897 +4317,-0.341 +4318,-0.718 +4319,0.129 +4320,1.359 +4321,-1.546 +4322,-0.215 +4323,1.437 +4324,-0.306 +4325,1.126 +4326,0.679 +4327,-0.156 +4328,0.314 +4329,2.885 +4330,-1.751 +4331,-0.316 +4332,-1.914 +4333,0.207 +4334,0.264 +4335,1.068 +4336,0.515 +4337,0.387 +4338,1.071 +4339,-0.446 +4340,-0.278 +4341,0.655 +4342,-0.273 +4343,0.533 +4344,0.150 +4345,0.105 +4346,0.362 +4347,1.254 +4348,-0.280 +4349,-0.096 +4350,1.148 +4351,0.720 +4352,-0.267 +4353,-0.788 +4354,0.176 +4355,0.094 +4356,-0.456 +4357,-0.245 +4358,-0.427 +4359,-0.878 +4360,0.593 +4361,0.347 +4362,0.980 +4363,0.092 +4364,0.728 +4365,0.399 +4366,-0.189 +4367,0.324 +4368,0.660 +4369,1.244 +4370,-1.567 +4371,-1.160 +4372,-0.199 +4373,-2.825 +4374,1.218 +4375,-0.134 +4376,-0.317 +4377,0.093 +4378,0.702 +4379,0.300 +4380,-0.679 +4381,-1.306 +4382,0.821 +4383,-1.342 +4384,-0.206 +4385,-1.709 +4386,0.951 +4387,-0.674 +4388,0.065 +4389,-0.318 +4390,0.609 +4391,-0.629 +4392,-0.642 +4393,-1.074 +4394,0.530 +4395,2.393 +4396,1.259 +4397,-1.356 +4398,-0.737 +4399,0.498 +4400,-1.232 +4401,-1.438 +4402,1.605 +4403,1.354 +4404,-0.582 +4405,-1.579 +4406,-1.087 +4407,0.143 +4408,0.274 +4409,-0.614 +4410,-0.567 +4411,-1.306 +4412,1.274 +4413,-1.544 +4414,-1.283 +4415,0.252 +4416,-0.189 +4417,-2.086 +4418,0.473 +4419,-0.279 +4420,-2.043 +4421,-0.156 +4422,1.214 +4423,-1.482 +4424,0.187 +4425,0.988 +4426,-1.162 +4427,-0.379 +4428,-1.725 +4429,0.331 +4430,2.756 +4431,1.610 +4432,1.590 +4433,1.953 +4434,0.830 +4435,-0.079 +4436,-0.476 +4437,0.463 +4438,-0.583 +4439,-0.674 +4440,1.123 +4441,2.193 +4442,3.306 +4443,0.237 +4444,-1.126 +4445,0.158 +4446,-1.689 +4447,-0.224 +4448,-1.973 +4449,0.131 +4450,0.292 +4451,0.472 +4452,-0.388 +4453,0.240 +4454,0.235 +4455,-0.254 +4456,-2.138 +4457,0.176 +4458,-0.160 +4459,-1.364 +4460,0.716 +4461,1.157 +4462,-0.117 +4463,2.282 +4464,0.434 +4465,0.517 +4466,1.735 +4467,0.172 +4468,0.541 +4469,-0.147 +4470,0.686 +4471,0.103 +4472,0.426 +4473,-1.103 +4474,-0.545 +4475,-0.590 +4476,-0.442 +4477,-0.305 +4478,1.695 +4479,0.452 +4480,1.493 +4481,-0.609 +4482,0.462 +4483,1.527 +4484,0.243 +4485,-0.630 +4486,-0.186 +4487,0.151 +4488,-1.393 +4489,2.539 +4490,-0.097 +4491,-1.784 +4492,-0.545 +4493,0.051 +4494,1.871 +4495,-0.404 +4496,-1.195 +4497,0.189 +4498,1.040 +4499,0.826 +4500,0.411 +4501,-0.780 +4502,1.262 +4503,0.094 +4504,0.481 +4505,-0.039 +4506,0.427 +4507,0.767 +4508,0.669 +4509,0.132 +4510,-1.073 +4511,-0.989 +4512,0.151 +4513,-0.365 +4514,-1.481 +4515,-0.445 +4516,-1.326 +4517,0.192 +4518,-1.571 +4519,0.207 +4520,-0.327 +4521,0.304 +4522,-1.533 +4523,0.668 +4524,-0.993 +4525,0.859 +4526,-1.950 +4527,0.000 +4528,0.191 +4529,-1.457 +4530,-1.113 +4531,0.013 +4532,-2.375 +4533,0.742 +4534,-1.446 +4535,1.084 +4536,-0.083 +4537,0.152 +4538,-0.614 +4539,0.156 +4540,0.471 +4541,-0.118 +4542,-1.296 +4543,-1.317 +4544,-0.100 +4545,-1.032 +4546,-0.042 +4547,0.708 +4548,-0.699 +4549,1.854 +4550,1.458 +4551,0.664 +4552,-0.306 +4553,0.279 +4554,0.507 +4555,-0.478 +4556,0.207 +4557,0.696 +4558,-0.788 +4559,-1.432 +4560,-0.785 +4561,-1.026 +4562,0.506 +4563,-0.163 +4564,0.401 +4565,0.747 +4566,-0.785 +4567,-0.483 +4568,-0.138 +4569,-0.655 +4570,0.043 +4571,-0.284 +4572,-0.131 +4573,0.992 +4574,0.869 +4575,0.048 +4576,-0.429 +4577,-0.086 +4578,-0.086 +4579,-0.469 +4580,1.448 +4581,2.268 +4582,-0.058 +4583,0.391 +4584,-2.241 +4585,-0.380 +4586,0.567 +4587,1.429 +4588,1.876 +4589,0.191 +4590,-0.686 +4591,0.167 +4592,0.358 +4593,0.646 +4594,1.940 +4595,0.800 +4596,0.113 +4597,-0.512 +4598,0.363 +4599,0.610 +4600,1.260 +4601,-0.117 +4602,-1.026 +4603,0.908 +4604,-1.292 +4605,-0.049 +4606,-0.631 +4607,0.814 +4608,0.514 +4609,1.355 +4610,-0.891 +4611,-0.173 +4612,-0.539 +4613,1.233 +4614,2.141 +4615,1.072 +4616,2.265 +4617,0.618 +4618,-0.578 +4619,0.416 +4620,-0.189 +4621,2.153 +4622,-0.326 +4623,1.089 +4624,-0.265 +4625,0.347 +4626,0.074 +4627,1.562 +4628,1.013 +4629,-0.430 +4630,0.496 +4631,0.025 +4632,0.584 +4633,0.083 +4634,-0.092 +4635,-0.517 +4636,-0.555 +4637,1.156 +4638,0.067 +4639,0.986 +4640,-2.021 +4641,-1.179 +4642,-1.033 +4643,-1.544 +4644,0.830 +4645,1.039 +4646,-1.056 +4647,0.988 +4648,0.144 +4649,0.659 +4650,-0.600 +4651,-0.791 +4652,-2.290 +4653,-0.471 +4654,1.751 +4655,1.775 +4656,-0.969 +4657,-1.825 +4658,0.161 +4659,-1.459 +4660,-0.466 +4661,0.393 +4662,-0.433 +4663,0.691 +4664,-1.016 +4665,-1.048 +4666,2.893 +4667,-0.263 +4668,-0.404 +4669,0.348 +4670,-0.668 +4671,0.594 +4672,0.125 +4673,0.333 +4674,0.418 +4675,-2.471 +4676,1.004 +4677,-1.304 +4678,0.644 +4679,1.196 +4680,0.929 +4681,-0.435 +4682,0.785 +4683,0.674 +4684,-0.595 +4685,0.479 +4686,-0.769 +4687,0.846 +4688,0.384 +4689,0.103 +4690,-1.339 +4691,-0.783 +4692,1.402 +4693,-0.093 +4694,0.652 +4695,1.574 +4696,1.121 +4697,2.051 +4698,2.018 +4699,-1.785 +4700,1.950 +4701,0.511 +4702,2.578 +4703,1.269 +4704,-0.365 +4705,-0.503 +4706,-1.549 +4707,-0.132 +4708,0.282 +4709,-1.309 +4710,1.527 +4711,0.788 +4712,0.176 +4713,0.074 +4714,1.042 +4715,0.683 +4716,-0.016 +4717,-0.511 +4718,0.681 +4719,-1.141 +4720,-1.214 +4721,-0.545 +4722,-2.149 +4723,1.045 +4724,-1.326 +4725,-0.446 +4726,-0.456 +4727,0.622 +4728,-0.646 +4729,0.443 +4730,0.192 +4731,0.515 +4732,0.727 +4733,-0.000 +4734,-0.605 +4735,0.352 +4736,1.204 +4737,-0.747 +4738,2.447 +4739,0.089 +4740,-1.689 +4741,0.429 +4742,0.736 +4743,0.781 +4744,-0.544 +4745,-0.739 +4746,0.789 +4747,-0.276 +4748,0.631 +4749,0.977 +4750,-0.113 +4751,-1.730 +4752,-0.320 +4753,-0.121 +4754,-1.063 +4755,-0.169 +4756,0.106 +4757,-1.043 +4758,1.045 +4759,-0.355 +4760,-0.859 +4761,-0.754 +4762,1.022 +4763,1.168 +4764,1.096 +4765,0.010 +4766,0.700 +4767,-1.495 +4768,-1.057 +4769,0.530 +4770,0.743 +4771,0.733 +4772,-1.405 +4773,-1.897 +4774,-1.791 +4775,1.403 +4776,-0.270 +4777,-1.281 +4778,-1.639 +4779,1.051 +4780,0.088 +4781,-1.390 +4782,0.499 +4783,-1.546 +4784,1.789 +4785,-0.515 +4786,0.404 +4787,0.406 +4788,0.046 +4789,-0.874 +4790,-0.627 +4791,-0.539 +4792,1.195 +4793,-0.230 +4794,-1.814 +4795,0.195 +4796,-0.021 +4797,-0.610 +4798,0.056 +4799,-0.857 +4800,-0.678 +4801,0.167 +4802,-0.416 +4803,2.688 +4804,1.672 +4805,-0.350 +4806,-0.543 +4807,-0.421 +4808,0.764 +4809,-0.756 +4810,-1.106 +4811,0.106 +4812,-1.064 +4813,-0.963 +4814,1.464 +4815,0.309 +4816,-0.262 +4817,0.809 +4818,-0.363 +4819,0.694 +4820,-0.144 +4821,-0.743 +4822,-1.199 +4823,1.854 +4824,0.008 +4825,0.651 +4826,0.182 +4827,0.894 +4828,-1.514 +4829,0.941 +4830,-0.690 +4831,-0.853 +4832,-1.569 +4833,0.655 +4834,-1.430 +4835,-0.339 +4836,-1.131 +4837,0.806 +4838,-0.090 +4839,-0.683 +4840,1.786 +4841,1.073 +4842,-1.286 +4843,1.577 +4844,0.105 +4845,-0.838 +4846,0.329 +4847,1.216 +4848,0.217 +4849,0.817 +4850,-1.429 +4851,-2.019 +4852,-1.513 +4853,-0.013 +4854,0.894 +4855,0.218 +4856,2.261 +4857,-0.469 +4858,-0.906 +4859,-1.437 +4860,-0.766 +4861,-0.759 +4862,0.593 +4863,-1.137 +4864,0.701 +4865,-0.885 +4866,2.101 +4867,0.357 +4868,0.941 +4869,-1.832 +4870,0.045 +4871,-0.935 +4872,1.592 +4873,0.528 +4874,0.688 +4875,-0.177 +4876,0.306 +4877,0.374 +4878,0.966 +4879,0.758 +4880,-1.635 +4881,-0.561 +4882,-0.635 +4883,0.560 +4884,1.839 +4885,0.964 +4886,1.182 +4887,0.555 +4888,-1.053 +4889,-0.585 +4890,-2.107 +4891,-1.104 +4892,0.941 +4893,0.416 +4894,-0.754 +4895,0.503 +4896,0.143 +4897,1.205 +4898,1.312 +4899,2.653 +4900,0.243 +4901,0.690 +4902,0.151 +4903,1.984 +4904,-1.496 +4905,-1.568 +4906,-0.392 +4907,0.080 +4908,-0.345 +4909,-0.913 +4910,-1.604 +4911,1.843 +4912,-0.768 +4913,-0.846 +4914,1.204 +4915,0.660 +4916,1.256 +4917,0.743 +4918,0.605 +4919,0.896 +4920,0.677 +4921,1.496 +4922,0.328 +4923,1.217 +4924,0.122 +4925,-1.252 +4926,0.790 +4927,0.483 +4928,-0.112 +4929,1.746 +4930,1.279 +4931,0.015 +4932,-0.255 +4933,0.984 +4934,-1.479 +4935,-0.862 +4936,-0.849 +4937,0.444 +4938,0.581 +4939,0.086 +4940,-0.445 +4941,-1.107 +4942,-0.961 +4943,0.213 +4944,0.386 +4945,-0.225 +4946,2.379 +4947,-0.265 +4948,-0.908 +4949,-0.828 +4950,2.223 +4951,-0.444 +4952,-0.152 +4953,-0.520 +4954,0.928 +4955,-1.110 +4956,-2.500 +4957,-0.973 +4958,0.208 +4959,0.085 +4960,1.417 +4961,-1.371 +4962,2.037 +4963,0.721 +4964,3.037 +4965,0.984 +4966,1.258 +4967,1.528 +4968,0.047 +4969,1.221 +4970,0.888 +4971,-0.138 +4972,0.092 +4973,1.676 +4974,0.153 +4975,1.395 +4976,0.671 +4977,-0.302 +4978,-0.102 +4979,1.080 +4980,0.778 +4981,-0.698 +4982,0.780 +4983,0.767 +4984,0.891 +4985,0.165 +4986,0.396 +4987,-0.882 +4988,-0.892 +4989,0.259 +4990,1.391 +4991,0.152 +4992,-0.340 +4993,-1.256 +4994,0.484 +4995,0.781 +4996,0.444 +4997,-0.899 +4998,0.438 +4999,2.340 +5000,1.566 +5001,0.982 +5002,0.173 +5003,-0.275 +5004,0.899 +5005,-1.933 +5006,-0.031 +5007,0.452 +5008,-0.385 +5009,-0.158 +5010,0.076 +5011,-0.390 +5012,1.932 +5013,0.937 +5014,0.861 +5015,0.429 +5016,-0.140 +5017,-0.411 +5018,-0.188 +5019,0.278 +5020,-0.802 +5021,1.285 +5022,0.203 +5023,-0.242 +5024,-0.950 +5025,-0.513 +5026,1.741 +5027,0.312 +5028,1.111 +5029,0.137 +5030,-1.390 +5031,1.889 +5032,-0.855 +5033,-1.626 +5034,0.844 +5035,1.186 +5036,-0.630 +5037,-0.198 +5038,0.731 +5039,-0.631 +5040,-0.613 +5041,0.881 +5042,-0.066 +5043,1.640 +5044,-1.773 +5045,0.020 +5046,1.431 +5047,1.632 +5048,-2.347 +5049,-0.757 +5050,-1.191 +5051,0.281 +5052,1.457 +5053,-1.421 +5054,-0.309 +5055,1.549 +5056,0.692 +5057,1.473 +5058,-0.734 +5059,0.329 +5060,0.064 +5061,-0.589 +5062,-0.119 +5063,-1.032 +5064,0.069 +5065,-1.198 +5066,1.793 +5067,1.643 +5068,0.897 +5069,0.689 +5070,-0.171 +5071,-3.408 +5072,-0.749 +5073,1.085 +5074,0.156 +5075,-0.203 +5076,-0.547 +5077,-0.975 +5078,0.415 +5079,0.084 +5080,-1.331 +5081,-1.289 +5082,-0.148 +5083,-0.072 +5084,0.607 +5085,0.074 +5086,0.096 +5087,-0.241 +5088,-0.035 +5089,1.418 +5090,0.743 +5091,-0.452 +5092,0.366 +5093,0.966 +5094,1.190 +5095,-0.392 +5096,-0.814 +5097,-0.701 +5098,1.797 +5099,-0.305 +5100,-1.524 +5101,0.015 +5102,2.288 +5103,2.074 +5104,1.796 +5105,-0.511 +5106,1.504 +5107,0.332 +5108,-1.788 +5109,-0.702 +5110,-0.015 +5111,-0.457 +5112,1.693 +5113,1.600 +5114,-1.257 +5115,0.412 +5116,-0.367 +5117,0.382 +5118,-1.049 +5119,-2.601 +5120,0.697 +5121,0.216 +5122,2.014 +5123,1.149 +5124,-0.380 +5125,1.763 +5126,1.193 +5127,-0.177 +5128,0.844 +5129,0.338 +5130,0.740 +5131,1.498 +5132,2.204 +5133,-0.941 +5134,-0.751 +5135,0.709 +5136,-0.446 +5137,0.664 +5138,0.985 +5139,-0.454 +5140,0.443 +5141,0.052 +5142,0.580 +5143,0.610 +5144,0.997 +5145,0.969 +5146,0.387 +5147,0.618 +5148,-0.911 +5149,-1.130 +5150,0.543 +5151,1.046 +5152,-1.267 +5153,-1.783 +5154,0.246 +5155,0.070 +5156,0.317 +5157,-0.920 +5158,-0.496 +5159,1.056 +5160,0.963 +5161,0.186 +5162,1.652 +5163,-0.386 +5164,0.339 +5165,-0.876 +5166,0.909 +5167,0.211 +5168,-1.089 +5169,0.112 +5170,0.543 +5171,-1.110 +5172,1.836 +5173,0.263 +5174,0.310 +5175,-0.412 +5176,-1.749 +5177,-0.088 +5178,-2.243 +5179,0.035 +5180,-0.614 +5181,-0.263 +5182,2.118 +5183,-1.314 +5184,0.214 +5185,-0.147 +5186,0.780 +5187,-0.350 +5188,0.815 +5189,0.842 +5190,-0.932 +5191,-1.280 +5192,1.269 +5193,-1.511 +5194,1.560 +5195,0.221 +5196,1.272 +5197,0.243 +5198,-0.560 +5199,1.085 +5200,-0.775 +5201,0.912 +5202,0.706 +5203,0.505 +5204,0.552 +5205,1.162 +5206,-0.584 +5207,-0.142 +5208,0.616 +5209,-0.821 +5210,-1.959 +5211,0.874 +5212,0.107 +5213,-0.716 +5214,0.852 +5215,0.242 +5216,0.223 +5217,-0.489 +5218,-0.592 +5219,-0.356 +5220,-0.736 +5221,0.210 +5222,-0.978 +5223,-1.413 +5224,2.646 +5225,-0.489 +5226,-0.137 +5227,-1.277 +5228,0.052 +5229,0.839 +5230,0.048 +5231,0.208 +5232,0.133 +5233,0.396 +5234,0.117 +5235,0.163 +5236,0.214 +5237,-1.486 +5238,0.644 +5239,0.766 +5240,-0.119 +5241,-0.613 +5242,-0.981 +5243,0.569 +5244,-1.475 +5245,-1.771 +5246,-2.007 +5247,1.383 +5248,0.705 +5249,-0.596 +5250,-0.760 +5251,-0.110 +5252,0.881 +5253,-0.790 +5254,-0.051 +5255,0.882 +5256,0.407 +5257,-0.571 +5258,-0.527 +5259,0.364 +5260,-0.259 +5261,-1.217 +5262,-0.405 +5263,-0.028 +5264,2.631 +5265,-1.178 +5266,-1.053 +5267,-0.609 +5268,0.103 +5269,0.499 +5270,0.718 +5271,1.117 +5272,0.115 +5273,1.744 +5274,0.905 +5275,-1.025 +5276,-1.997 +5277,0.920 +5278,0.427 +5279,-0.616 +5280,-0.670 +5281,-0.276 +5282,1.671 +5283,-0.694 +5284,1.370 +5285,1.089 +5286,-1.430 +5287,1.959 +5288,-0.921 +5289,0.057 +5290,-1.399 +5291,0.295 +5292,-0.387 +5293,-1.572 +5294,-0.820 +5295,-0.849 +5296,1.317 +5297,0.229 +5298,-0.014 +5299,-0.931 +5300,-0.579 +5301,-0.278 +5302,-1.566 +5303,0.378 +5304,0.926 +5305,0.300 +5306,0.302 +5307,0.951 +5308,-0.015 +5309,-0.045 +5310,-0.629 +5311,1.054 +5312,0.297 +5313,-1.351 +5314,-0.364 +5315,-0.047 +5316,-0.117 +5317,-0.140 +5318,-1.040 +5319,0.642 +5320,0.950 +5321,0.368 +5322,0.515 +5323,0.701 +5324,-1.284 +5325,-0.896 +5326,0.343 +5327,0.065 +5328,-0.362 +5329,-0.174 +5330,0.231 +5331,-0.045 +5332,-0.314 +5333,0.763 +5334,0.888 +5335,-0.345 +5336,1.637 +5337,1.265 +5338,0.243 +5339,0.892 +5340,-0.406 +5341,1.224 +5342,0.246 +5343,0.021 +5344,1.316 +5345,-1.391 +5346,-1.571 +5347,-1.589 +5348,0.402 +5349,-0.925 +5350,0.729 +5351,0.258 +5352,-0.028 +5353,1.578 +5354,-0.105 +5355,1.322 +5356,-0.795 +5357,-2.968 +5358,-0.474 +5359,-0.204 +5360,1.571 +5361,-0.317 +5362,-0.231 +5363,0.178 +5364,0.080 +5365,0.488 +5366,0.242 +5367,0.053 +5368,-0.449 +5369,-0.868 +5370,-1.488 +5371,0.017 +5372,-1.358 +5373,-0.903 +5374,0.341 +5375,0.200 +5376,-0.208 +5377,-0.213 +5378,-0.607 +5379,0.408 +5380,0.235 +5381,0.532 +5382,0.575 +5383,0.229 +5384,0.882 +5385,0.699 +5386,-2.052 +5387,-0.272 +5388,-0.744 +5389,-0.087 +5390,0.915 +5391,0.550 +5392,0.211 +5393,-0.486 +5394,-0.458 +5395,-0.483 +5396,0.904 +5397,-0.211 +5398,-1.130 +5399,-0.265 +5400,-0.267 +5401,-0.071 +5402,-0.265 +5403,-0.006 +5404,0.962 +5405,-0.394 +5406,1.363 +5407,-0.436 +5408,0.062 +5409,-0.497 +5410,-2.734 +5411,-1.394 +5412,1.013 +5413,-0.417 +5414,1.613 +5415,-0.689 +5416,-1.362 +5417,-0.278 +5418,-0.849 +5419,-1.003 +5420,-0.175 +5421,0.157 +5422,-0.672 +5423,-0.328 +5424,0.470 +5425,0.965 +5426,0.578 +5427,1.906 +5428,-0.788 +5429,1.142 +5430,0.149 +5431,0.693 +5432,-1.019 +5433,0.559 +5434,0.046 +5435,-0.123 +5436,0.960 +5437,0.375 +5438,0.177 +5439,0.505 +5440,0.450 +5441,-0.304 +5442,1.491 +5443,0.969 +5444,-0.059 +5445,0.983 +5446,-0.106 +5447,-0.847 +5448,0.013 +5449,-0.399 +5450,0.197 +5451,-0.705 +5452,0.512 +5453,0.803 +5454,-0.313 +5455,0.179 +5456,-1.102 +5457,-0.207 +5458,-0.592 +5459,-0.415 +5460,-0.007 +5461,-0.713 +5462,0.809 +5463,-0.803 +5464,0.386 +5465,-1.705 +5466,1.608 +5467,0.397 +5468,0.540 +5469,-1.808 +5470,-0.019 +5471,-1.213 +5472,-0.194 +5473,0.136 +5474,-0.046 +5475,-1.853 +5476,1.671 +5477,0.443 +5478,-1.134 +5479,-0.073 +5480,0.491 +5481,-0.867 +5482,-0.738 +5483,-0.763 +5484,-0.969 +5485,0.944 +5486,-0.733 +5487,-0.206 +5488,1.047 +5489,0.349 +5490,0.527 +5491,-1.422 +5492,1.361 +5493,-1.086 +5494,1.252 +5495,-1.792 +5496,-1.140 +5497,-1.420 +5498,-1.257 +5499,-0.459 +5500,-0.395 +5501,-0.212 +5502,0.417 +5503,1.368 +5504,-2.374 +5505,-0.261 +5506,0.099 +5507,0.144 +5508,0.066 +5509,-0.787 +5510,0.377 +5511,-0.542 +5512,0.467 +5513,-1.841 +5514,-1.880 +5515,0.594 +5516,-0.458 +5517,0.047 +5518,-1.009 +5519,-0.004 +5520,-0.650 +5521,0.624 +5522,1.142 +5523,0.827 +5524,-0.164 +5525,0.089 +5526,-0.261 +5527,-1.334 +5528,-0.148 +5529,0.536 +5530,1.859 +5531,0.271 +5532,0.117 +5533,-0.280 +5534,-1.132 +5535,-1.051 +5536,-0.821 +5537,-1.868 +5538,0.142 +5539,0.421 +5540,-0.552 +5541,0.266 +5542,-0.789 +5543,-0.615 +5544,-1.528 +5545,-1.340 +5546,-1.241 +5547,0.893 +5548,-0.942 +5549,0.022 +5550,-0.432 +5551,-1.512 +5552,0.141 +5553,-1.092 +5554,0.006 +5555,-0.169 +5556,-2.120 +5557,1.036 +5558,-1.247 +5559,-1.391 +5560,2.139 +5561,-1.798 +5562,0.698 +5563,0.566 +5564,0.919 +5565,-1.073 +5566,-1.491 +5567,-0.684 +5568,0.904 +5569,-0.616 +5570,-0.003 +5571,-0.537 +5572,0.571 +5573,0.677 +5574,0.715 +5575,-0.532 +5576,-0.461 +5577,-1.512 +5578,-0.065 +5579,-0.925 +5580,1.233 +5581,-1.463 +5582,1.205 +5583,1.690 +5584,-1.216 +5585,-1.788 +5586,-0.019 +5587,-0.900 +5588,1.094 +5589,-1.445 +5590,0.282 +5591,1.196 +5592,0.085 +5593,-0.300 +5594,0.226 +5595,1.352 +5596,-1.095 +5597,-0.809 +5598,1.598 +5599,0.707 +5600,1.234 +5601,2.178 +5602,-0.170 +5603,1.437 +5604,-1.557 +5605,2.496 +5606,0.249 +5607,0.376 +5608,0.434 +5609,0.809 +5610,-2.114 +5611,0.352 +5612,-0.014 +5613,2.295 +5614,0.903 +5615,-0.644 +5616,-0.067 +5617,-1.772 +5618,0.250 +5619,0.708 +5620,1.586 +5621,0.719 +5622,1.419 +5623,0.930 +5624,1.107 +5625,-1.798 +5626,0.043 +5627,0.850 +5628,-0.644 +5629,-1.282 +5630,-1.794 +5631,0.740 +5632,-0.055 +5633,-1.104 +5634,-1.793 +5635,-0.719 +5636,1.386 +5637,0.186 +5638,-0.961 +5639,-2.433 +5640,-1.365 +5641,-0.253 +5642,0.287 +5643,-1.827 +5644,-0.698 +5645,0.792 +5646,-0.116 +5647,-0.309 +5648,0.135 +5649,0.965 +5650,-0.696 +5651,0.097 +5652,-1.078 +5653,-0.759 +5654,-1.857 +5655,0.358 +5656,-0.390 +5657,-0.022 +5658,-0.510 +5659,2.757 +5660,0.383 +5661,1.035 +5662,1.230 +5663,-0.118 +5664,1.782 +5665,0.984 +5666,0.102 +5667,1.201 +5668,0.498 +5669,0.061 +5670,0.342 +5671,0.116 +5672,-1.586 +5673,0.042 +5674,-0.120 +5675,-1.028 +5676,0.132 +5677,-0.899 +5678,1.065 +5679,-0.882 +5680,0.138 +5681,0.647 +5682,1.499 +5683,-0.244 +5684,-1.247 +5685,-0.185 +5686,1.495 +5687,-0.185 +5688,0.845 +5689,0.399 +5690,-1.508 +5691,0.016 +5692,1.956 +5693,0.208 +5694,-0.645 +5695,0.222 +5696,-0.256 +5697,0.310 +5698,-1.195 +5699,-0.418 +5700,0.925 +5701,-1.705 +5702,-0.616 +5703,-0.640 +5704,0.893 +5705,0.590 +5706,-1.026 +5707,0.317 +5708,0.826 +5709,-0.553 +5710,-0.512 +5711,1.009 +5712,1.026 +5713,-2.267 +5714,1.523 +5715,2.678 +5716,0.597 +5717,-0.264 +5718,1.312 +5719,-2.929 +5720,-0.503 +5721,1.097 +5722,-0.540 +5723,-0.430 +5724,-0.726 +5725,-0.020 +5726,0.895 +5727,-1.476 +5728,0.516 +5729,1.108 +5730,2.743 +5731,1.406 +5732,0.084 +5733,-0.554 +5734,0.363 +5735,1.023 +5736,-0.839 +5737,0.324 +5738,0.952 +5739,-0.387 +5740,-0.218 +5741,0.459 +5742,-0.083 +5743,0.976 +5744,-2.138 +5745,-0.081 +5746,1.481 +5747,0.263 +5748,1.885 +5749,0.780 +5750,-1.462 +5751,0.335 +5752,-0.212 +5753,-0.484 +5754,0.761 +5755,-0.545 +5756,0.042 +5757,0.466 +5758,0.364 +5759,0.440 +5760,0.162 +5761,1.194 +5762,-0.094 +5763,2.549 +5764,-2.215 +5765,0.228 +5766,-0.112 +5767,0.944 +5768,-0.771 +5769,-0.538 +5770,0.242 +5771,-0.412 +5772,0.151 +5773,0.986 +5774,0.536 +5775,-1.580 +5776,-0.672 +5777,-1.412 +5778,-0.122 +5779,-0.674 +5780,1.997 +5781,0.593 +5782,2.222 +5783,-0.473 +5784,-1.040 +5785,-0.239 +5786,0.657 +5787,-0.269 +5788,-1.869 +5789,-1.428 +5790,0.659 +5791,0.094 +5792,0.930 +5793,-0.590 +5794,-1.879 +5795,-0.738 +5796,1.145 +5797,0.319 +5798,1.123 +5799,-0.327 +5800,2.207 +5801,0.131 +5802,-0.639 +5803,-0.834 +5804,0.076 +5805,0.217 +5806,-0.421 +5807,0.493 +5808,2.066 +5809,2.390 +5810,-1.095 +5811,-0.557 +5812,-0.795 +5813,-1.231 +5814,1.053 +5815,0.532 +5816,-0.097 +5817,2.064 +5818,0.279 +5819,1.148 +5820,-2.245 +5821,-1.887 +5822,-0.243 +5823,1.693 +5824,-1.436 +5825,-0.165 +5826,-0.195 +5827,-0.227 +5828,0.500 +5829,2.046 +5830,-1.691 +5831,-1.722 +5832,1.799 +5833,-0.075 +5834,1.067 +5835,-0.392 +5836,-0.232 +5837,0.232 +5838,-1.109 +5839,0.516 +5840,0.008 +5841,0.320 +5842,1.099 +5843,0.150 +5844,0.422 +5845,1.302 +5846,-0.549 +5847,1.647 +5848,-1.238 +5849,1.382 +5850,-0.568 +5851,0.252 +5852,1.821 +5853,0.416 +5854,-0.456 +5855,-1.027 +5856,-0.548 +5857,-0.464 +5858,0.390 +5859,-0.484 +5860,-0.538 +5861,-1.176 +5862,1.919 +5863,-0.571 +5864,-0.972 +5865,-1.366 +5866,2.495 +5867,-1.557 +5868,-1.141 +5869,0.558 +5870,0.693 +5871,1.076 +5872,-0.425 +5873,0.019 +5874,0.010 +5875,0.312 +5876,-1.949 +5877,0.013 +5878,1.080 +5879,-0.218 +5880,-0.105 +5881,-0.421 +5882,1.012 +5883,-0.815 +5884,-0.595 +5885,1.888 +5886,1.369 +5887,1.371 +5888,-2.413 +5889,-0.353 +5890,-0.571 +5891,0.566 +5892,0.502 +5893,0.018 +5894,-0.167 +5895,-0.538 +5896,0.102 +5897,0.700 +5898,-1.381 +5899,0.356 +5900,-0.258 +5901,-0.173 +5902,0.296 +5903,-0.044 +5904,-0.645 +5905,-0.896 +5906,-0.138 +5907,0.752 +5908,-0.748 +5909,-0.167 +5910,2.190 +5911,-0.491 +5912,-0.609 +5913,-0.218 +5914,0.055 +5915,-0.431 +5916,-1.046 +5917,-0.921 +5918,-0.831 +5919,0.758 +5920,0.314 +5921,-0.275 +5922,0.212 +5923,1.092 +5924,1.397 +5925,2.333 +5926,2.864 +5927,-1.171 +5928,-0.609 +5929,-2.097 +5930,-0.795 +5931,-0.175 +5932,0.526 +5933,0.035 +5934,0.522 +5935,-0.102 +5936,0.176 +5937,-0.333 +5938,1.231 +5939,0.390 +5940,0.490 +5941,-1.804 +5942,-0.420 +5943,-0.076 +5944,-1.288 +5945,-0.625 +5946,1.363 +5947,-0.075 +5948,-1.957 +5949,-0.048 +5950,0.777 +5951,0.466 +5952,0.432 +5953,-2.245 +5954,1.142 +5955,0.400 +5956,-0.052 +5957,1.261 +5958,-0.196 +5959,-1.426 +5960,0.173 +5961,1.249 +5962,0.086 +5963,1.396 +5964,-1.459 +5965,0.895 +5966,-0.319 +5967,-0.111 +5968,-0.075 +5969,-0.173 +5970,-0.647 +5971,1.260 +5972,1.672 +5973,0.349 +5974,-0.928 +5975,0.037 +5976,0.546 +5977,0.685 +5978,-0.693 +5979,1.892 +5980,-0.754 +5981,1.233 +5982,-0.696 +5983,1.582 +5984,-0.385 +5985,-1.317 +5986,-0.820 +5987,-0.815 +5988,0.343 +5989,-0.599 +5990,-0.521 +5991,-0.921 +5992,0.256 +5993,1.560 +5994,-0.552 +5995,-0.011 +5996,-0.539 +5997,-0.596 +5998,0.241 +5999,-0.376 +6000,-0.835 +6001,-1.645 +6002,0.450 +6003,1.176 +6004,0.749 +6005,-0.781 +6006,0.465 +6007,1.457 +6008,0.126 +6009,-0.066 +6010,-0.321 +6011,-1.638 +6012,0.445 +6013,0.241 +6014,0.485 +6015,-0.019 +6016,1.146 +6017,-1.661 +6018,0.999 +6019,-0.707 +6020,-0.159 +6021,-1.652 +6022,0.123 +6023,0.939 +6024,1.640 +6025,-0.635 +6026,0.819 +6027,-1.176 +6028,0.189 +6029,-0.996 +6030,-0.884 +6031,0.725 +6032,1.152 +6033,-0.599 +6034,-0.451 +6035,1.530 +6036,-0.482 +6037,1.150 +6038,-0.046 +6039,0.900 +6040,1.129 +6041,1.723 +6042,0.304 +6043,0.081 +6044,0.084 +6045,-0.046 +6046,-0.481 +6047,1.862 +6048,-0.459 +6049,1.262 +6050,-1.665 +6051,0.478 +6052,-1.590 +6053,-0.841 +6054,0.706 +6055,-2.183 +6056,1.140 +6057,-0.669 +6058,-1.012 +6059,0.565 +6060,-1.056 +6061,-0.720 +6062,1.047 +6063,-1.060 +6064,0.291 +6065,-0.484 +6066,1.391 +6067,-0.123 +6068,1.151 +6069,0.975 +6070,1.077 +6071,0.386 +6072,-0.379 +6073,0.642 +6074,-0.941 +6075,0.444 +6076,1.466 +6077,0.537 +6078,0.562 +6079,-1.719 +6080,2.501 +6081,-1.474 +6082,-0.004 +6083,-0.463 +6084,-1.966 +6085,-0.904 +6086,-0.466 +6087,0.221 +6088,0.688 +6089,0.985 +6090,-1.475 +6091,0.461 +6092,1.089 +6093,0.171 +6094,-0.192 +6095,0.358 +6096,0.918 +6097,1.498 +6098,-1.483 +6099,1.051 +6100,-0.901 +6101,0.336 +6102,1.614 +6103,0.227 +6104,0.955 +6105,-0.701 +6106,-1.517 +6107,1.819 +6108,0.935 +6109,-0.844 +6110,-0.828 +6111,0.562 +6112,0.590 +6113,0.655 +6114,2.077 +6115,1.177 +6116,0.526 +6117,-1.583 +6118,2.865 +6119,-1.175 +6120,-1.110 +6121,-0.689 +6122,1.137 +6123,0.359 +6124,-0.998 +6125,-1.233 +6126,1.530 +6127,0.716 +6128,-0.609 +6129,1.416 +6130,0.395 +6131,-0.274 +6132,0.267 +6133,0.090 +6134,0.863 +6135,-1.151 +6136,0.365 +6137,0.710 +6138,0.277 +6139,1.017 +6140,0.064 +6141,0.156 +6142,1.420 +6143,-1.574 +6144,-0.502 +6145,0.012 +6146,-1.157 +6147,-1.859 +6148,-0.043 +6149,-0.032 +6150,0.004 +6151,0.255 +6152,0.079 +6153,-0.225 +6154,0.118 +6155,-0.395 +6156,-1.107 +6157,-0.336 +6158,1.275 +6159,-0.334 +6160,0.932 +6161,-1.424 +6162,-0.989 +6163,-0.057 +6164,-2.285 +6165,-0.852 +6166,0.784 +6167,0.482 +6168,-0.250 +6169,-0.428 +6170,-0.542 +6171,-1.812 +6172,1.414 +6173,-0.546 +6174,-0.618 +6175,1.542 +6176,-0.807 +6177,-1.599 +6178,0.497 +6179,-0.131 +6180,-1.645 +6181,-0.217 +6182,1.213 +6183,0.150 +6184,0.931 +6185,0.754 +6186,-0.959 +6187,-1.478 +6188,-1.055 +6189,0.048 +6190,-0.900 +6191,-0.123 +6192,0.511 +6193,2.203 +6194,0.073 +6195,0.637 +6196,1.650 +6197,-1.475 +6198,2.132 +6199,0.491 +6200,1.637 +6201,0.009 +6202,0.324 +6203,0.908 +6204,-0.024 +6205,-0.398 +6206,-1.174 +6207,-0.070 +6208,0.507 +6209,0.521 +6210,-0.222 +6211,-1.067 +6212,-1.813 +6213,-1.058 +6214,0.197 +6215,-0.040 +6216,-1.095 +6217,0.455 +6218,-1.232 +6219,-0.553 +6220,1.093 +6221,0.658 +6222,0.026 +6223,0.542 +6224,0.449 +6225,0.518 +6226,2.741 +6227,-2.120 +6228,-0.415 +6229,-1.824 +6230,0.553 +6231,-0.738 +6232,0.113 +6233,0.866 +6234,-0.206 +6235,-2.006 +6236,0.517 +6237,-0.543 +6238,1.899 +6239,0.386 +6240,-0.983 +6241,0.755 +6242,-0.584 +6243,-0.821 +6244,-0.806 +6245,-2.432 +6246,-0.277 +6247,-0.249 +6248,-0.165 +6249,0.110 +6250,-0.359 +6251,-0.198 +6252,-0.675 +6253,0.818 +6254,-2.550 +6255,1.194 +6256,-0.444 +6257,-0.665 +6258,-0.532 +6259,-0.631 +6260,-0.862 +6261,0.075 +6262,0.198 +6263,-2.930 +6264,-0.538 +6265,-0.093 +6266,-0.217 +6267,0.334 +6268,1.837 +6269,0.333 +6270,0.402 +6271,1.829 +6272,2.072 +6273,-1.161 +6274,-0.742 +6275,0.319 +6276,0.591 +6277,-1.264 +6278,0.271 +6279,0.303 +6280,0.191 +6281,0.033 +6282,-0.992 +6283,-0.533 +6284,0.947 +6285,1.891 +6286,0.136 +6287,-0.134 +6288,0.101 +6289,-0.686 +6290,0.414 +6291,1.336 +6292,0.738 +6293,-0.372 +6294,-0.386 +6295,-0.445 +6296,0.434 +6297,0.932 +6298,-0.507 +6299,1.556 +6300,2.554 +6301,-0.128 +6302,0.572 +6303,-0.698 +6304,1.997 +6305,-0.471 +6306,0.336 +6307,1.147 +6308,-0.398 +6309,0.672 +6310,-0.254 +6311,0.614 +6312,0.278 +6313,-0.726 +6314,-0.487 +6315,1.388 +6316,0.586 +6317,-0.535 +6318,-0.944 +6319,0.482 +6320,0.304 +6321,0.001 +6322,-1.196 +6323,1.318 +6324,1.272 +6325,0.284 +6326,0.751 +6327,0.333 +6328,0.013 +6329,0.367 +6330,-0.532 +6331,0.235 +6332,0.221 +6333,-0.291 +6334,-0.393 +6335,0.430 +6336,0.130 +6337,-1.839 +6338,-0.178 +6339,-0.547 +6340,-1.133 +6341,-0.462 +6342,-0.079 +6343,-1.504 +6344,0.051 +6345,0.356 +6346,0.402 +6347,0.762 +6348,0.505 +6349,-0.055 +6350,-0.330 +6351,2.530 +6352,-0.330 +6353,-1.273 +6354,-1.382 +6355,-0.453 +6356,-0.128 +6357,0.517 +6358,-0.099 +6359,0.272 +6360,-0.610 +6361,1.812 +6362,-1.654 +6363,-1.043 +6364,-0.620 +6365,0.319 +6366,-0.567 +6367,0.643 +6368,0.391 +6369,-0.118 +6370,2.004 +6371,-0.940 +6372,0.697 +6373,-0.159 +6374,-0.666 +6375,-0.454 +6376,0.017 +6377,2.288 +6378,0.910 +6379,0.019 +6380,1.256 +6381,0.854 +6382,-0.341 +6383,-0.767 +6384,0.171 +6385,1.305 +6386,-0.015 +6387,1.922 +6388,-0.540 +6389,-0.734 +6390,-0.553 +6391,-0.357 +6392,-0.957 +6393,-0.596 +6394,-0.763 +6395,-1.279 +6396,0.475 +6397,0.557 +6398,1.013 +6399,-0.913 +6400,0.214 +6401,-0.629 +6402,0.061 +6403,-0.610 +6404,0.894 +6405,-2.128 +6406,-1.455 +6407,-0.764 +6408,0.480 +6409,0.731 +6410,-0.393 +6411,0.096 +6412,-0.444 +6413,1.432 +6414,0.030 +6415,-0.845 +6416,-0.896 +6417,2.446 +6418,-0.130 +6419,0.112 +6420,0.253 +6421,-0.502 +6422,1.063 +6423,0.291 +6424,0.416 +6425,-0.667 +6426,-1.087 +6427,-0.585 +6428,-0.780 +6429,2.162 +6430,1.250 +6431,1.657 +6432,-0.092 +6433,0.413 +6434,-0.084 +6435,-0.571 +6436,1.845 +6437,-1.314 +6438,-1.695 +6439,-0.122 +6440,0.561 +6441,-0.628 +6442,-1.042 +6443,0.082 +6444,0.158 +6445,-0.836 +6446,0.276 +6447,1.474 +6448,-0.895 +6449,0.909 +6450,0.053 +6451,-0.074 +6452,-0.976 +6453,-0.958 +6454,-0.353 +6455,0.667 +6456,-0.646 +6457,-1.807 +6458,-0.671 +6459,0.179 +6460,-0.383 +6461,-1.362 +6462,-0.980 +6463,-1.440 +6464,-0.995 +6465,-0.987 +6466,0.171 +6467,-0.323 +6468,-0.210 +6469,0.797 +6470,0.612 +6471,-0.664 +6472,-0.935 +6473,0.883 +6474,1.059 +6475,0.950 +6476,1.462 +6477,0.900 +6478,-0.072 +6479,-1.689 +6480,0.967 +6481,-0.809 +6482,-0.564 +6483,0.933 +6484,-0.042 +6485,0.637 +6486,0.597 +6487,0.524 +6488,-0.322 +6489,0.093 +6490,0.941 +6491,-1.916 +6492,0.073 +6493,0.346 +6494,-1.423 +6495,0.338 +6496,0.584 +6497,2.314 +6498,0.014 +6499,-0.774 +6500,-1.227 +6501,-1.245 +6502,0.414 +6503,-0.140 +6504,0.440 +6505,-0.557 +6506,0.012 +6507,2.209 +6508,-0.300 +6509,1.523 +6510,0.334 +6511,-0.747 +6512,0.516 +6513,0.651 +6514,-0.546 +6515,0.607 +6516,0.214 +6517,-1.030 +6518,-1.449 +6519,0.242 +6520,-1.447 +6521,0.665 +6522,-1.090 +6523,0.670 +6524,-0.441 +6525,2.054 +6526,0.515 +6527,1.108 +6528,-0.324 +6529,0.448 +6530,-0.533 +6531,0.658 +6532,-0.028 +6533,-1.561 +6534,0.648 +6535,-0.240 +6536,0.974 +6537,0.918 +6538,-0.592 +6539,0.185 +6540,0.146 +6541,-0.864 +6542,0.577 +6543,0.021 +6544,1.179 +6545,-1.126 +6546,0.015 +6547,-0.036 +6548,0.301 +6549,0.024 +6550,-0.243 +6551,-0.310 +6552,0.372 +6553,1.825 +6554,-0.462 +6555,-0.100 +6556,1.596 +6557,-0.119 +6558,-0.424 +6559,0.025 +6560,2.222 +6561,0.180 +6562,0.517 +6563,1.680 +6564,1.120 +6565,-1.868 +6566,-1.197 +6567,-0.615 +6568,-0.815 +6569,1.306 +6570,1.738 +6571,0.441 +6572,-1.369 +6573,-1.294 +6574,-1.810 +6575,1.179 +6576,-0.164 +6577,-0.055 +6578,0.501 +6579,-1.335 +6580,2.825 +6581,-1.677 +6582,-0.965 +6583,0.148 +6584,0.252 +6585,2.875 +6586,0.303 +6587,1.052 +6588,-0.307 +6589,-0.898 +6590,-0.718 +6591,-0.004 +6592,-0.857 +6593,0.131 +6594,1.011 +6595,0.424 +6596,1.147 +6597,0.336 +6598,-0.038 +6599,-1.877 +6600,0.802 +6601,-0.798 +6602,0.732 +6603,0.457 +6604,1.054 +6605,-0.415 +6606,0.253 +6607,-0.812 +6608,1.031 +6609,0.444 +6610,-1.799 +6611,-0.382 +6612,0.287 +6613,-0.179 +6614,0.623 +6615,0.913 +6616,-0.293 +6617,-1.965 +6618,0.700 +6619,-1.298 +6620,-0.735 +6621,2.132 +6622,0.031 +6623,-1.472 +6624,1.386 +6625,2.040 +6626,-0.832 +6627,1.355 +6628,-0.236 +6629,-0.965 +6630,0.367 +6631,-0.125 +6632,0.583 +6633,-1.252 +6634,-0.811 +6635,1.091 +6636,-0.414 +6637,-0.522 +6638,-0.931 +6639,-1.740 +6640,-1.076 +6641,0.216 +6642,-0.192 +6643,-0.518 +6644,-1.084 +6645,0.511 +6646,1.812 +6647,0.867 +6648,0.080 +6649,-0.817 +6650,0.573 +6651,-0.724 +6652,-0.469 +6653,0.831 +6654,1.767 +6655,-1.208 +6656,0.692 +6657,0.313 +6658,-2.009 +6659,0.220 +6660,1.487 +6661,0.251 +6662,0.812 +6663,0.859 +6664,-1.607 +6665,1.794 +6666,0.132 +6667,-1.712 +6668,1.811 +6669,-0.081 +6670,0.025 +6671,0.965 +6672,-1.514 +6673,-0.778 +6674,0.278 +6675,1.083 +6676,0.198 +6677,1.407 +6678,-1.061 +6679,1.384 +6680,0.513 +6681,1.441 +6682,1.184 +6683,2.012 +6684,-0.859 +6685,-1.378 +6686,0.459 +6687,-1.753 +6688,-0.780 +6689,0.341 +6690,1.049 +6691,0.685 +6692,0.833 +6693,-0.096 +6694,0.643 +6695,-0.551 +6696,0.330 +6697,-0.690 +6698,0.978 +6699,2.796 +6700,-0.045 +6701,0.278 +6702,-0.052 +6703,-0.854 +6704,-0.999 +6705,1.702 +6706,-0.090 +6707,0.092 +6708,-0.642 +6709,1.471 +6710,-1.137 +6711,-0.560 +6712,-1.019 +6713,-0.883 +6714,0.606 +6715,0.327 +6716,0.431 +6717,1.404 +6718,1.070 +6719,-0.096 +6720,0.513 +6721,-1.296 +6722,0.058 +6723,0.205 +6724,-1.868 +6725,-0.685 +6726,0.200 +6727,1.917 +6728,0.687 +6729,-1.348 +6730,0.582 +6731,-1.148 +6732,-2.250 +6733,1.130 +6734,0.530 +6735,0.124 +6736,2.299 +6737,-0.408 +6738,0.530 +6739,-1.196 +6740,0.507 +6741,0.513 +6742,0.314 +6743,-1.419 +6744,-0.239 +6745,0.084 +6746,0.796 +6747,-0.208 +6748,1.633 +6749,-1.752 +6750,0.706 +6751,0.221 +6752,-0.674 +6753,0.531 +6754,0.821 +6755,-0.049 +6756,-2.810 +6757,0.814 +6758,-0.443 +6759,-0.664 +6760,0.984 +6761,1.678 +6762,0.250 +6763,0.053 +6764,-1.680 +6765,-0.292 +6766,-0.906 +6767,0.513 +6768,-0.796 +6769,0.053 +6770,0.643 +6771,0.089 +6772,0.530 +6773,-0.426 +6774,0.506 +6775,0.383 +6776,0.197 +6777,-0.275 +6778,-0.269 +6779,3.677 +6780,0.196 +6781,0.871 +6782,1.307 +6783,-0.726 +6784,-1.110 +6785,-0.946 +6786,-2.353 +6787,-0.175 +6788,1.005 +6789,-0.387 +6790,-1.689 +6791,0.102 +6792,0.235 +6793,-0.498 +6794,-0.567 +6795,0.378 +6796,0.687 +6797,-1.154 +6798,0.424 +6799,-1.234 +6800,-0.520 +6801,0.627 +6802,0.056 +6803,-1.276 +6804,0.307 +6805,-0.745 +6806,0.530 +6807,0.338 +6808,-0.170 +6809,1.369 +6810,1.302 +6811,-0.412 +6812,-0.345 +6813,0.569 +6814,-1.201 +6815,1.235 +6816,-1.264 +6817,0.994 +6818,0.662 +6819,-0.118 +6820,0.285 +6821,-0.710 +6822,2.339 +6823,0.050 +6824,2.366 +6825,1.647 +6826,0.532 +6827,-0.135 +6828,-0.839 +6829,-0.581 +6830,0.789 +6831,-0.546 +6832,0.506 +6833,-0.121 +6834,1.690 +6835,0.327 +6836,0.354 +6837,0.161 +6838,-1.438 +6839,-1.548 +6840,-0.827 +6841,-1.376 +6842,-0.185 +6843,0.844 +6844,-1.415 +6845,-0.930 +6846,0.397 +6847,-0.903 +6848,-0.519 +6849,-0.156 +6850,-0.352 +6851,-0.460 +6852,0.584 +6853,-0.308 +6854,1.110 +6855,0.742 +6856,1.771 +6857,0.794 +6858,0.268 +6859,-2.057 +6860,-0.461 +6861,-0.924 +6862,-0.899 +6863,-0.637 +6864,-1.886 +6865,0.291 +6866,-1.140 +6867,-0.590 +6868,1.666 +6869,-2.153 +6870,0.978 +6871,0.969 +6872,1.382 +6873,0.499 +6874,0.203 +6875,0.320 +6876,1.456 +6877,0.450 +6878,-0.138 +6879,1.644 +6880,-1.365 +6881,-0.300 +6882,1.096 +6883,1.223 +6884,-0.547 +6885,0.278 +6886,-1.419 +6887,0.010 +6888,-1.236 +6889,-1.610 +6890,-0.300 +6891,-0.428 +6892,0.891 +6893,2.159 +6894,-1.258 +6895,-1.562 +6896,1.326 +6897,0.161 +6898,0.203 +6899,1.174 +6900,0.994 +6901,0.641 +6902,0.746 +6903,0.119 +6904,-0.117 +6905,-0.242 +6906,0.854 +6907,-0.666 +6908,1.143 +6909,-0.742 +6910,-1.209 +6911,0.162 +6912,0.414 +6913,-1.028 +6914,0.302 +6915,0.801 +6916,-0.878 +6917,2.053 +6918,2.293 +6919,-0.705 +6920,0.753 +6921,-0.412 +6922,-0.993 +6923,-0.941 +6924,0.919 +6925,1.605 +6926,1.216 +6927,0.336 +6928,-0.435 +6929,1.364 +6930,0.608 +6931,1.770 +6932,0.293 +6933,-0.384 +6934,0.783 +6935,-0.899 +6936,-1.762 +6937,-0.162 +6938,0.364 +6939,1.578 +6940,-1.319 +6941,0.374 +6942,-1.021 +6943,0.100 +6944,0.049 +6945,-1.487 +6946,1.325 +6947,1.907 +6948,0.370 +6949,-1.154 +6950,-0.142 +6951,0.715 +6952,-0.030 +6953,-0.073 +6954,0.043 +6955,0.055 +6956,-0.210 +6957,0.012 +6958,0.838 +6959,1.111 +6960,-0.356 +6961,0.242 +6962,-2.571 +6963,0.945 +6964,0.259 +6965,1.894 +6966,-0.921 +6967,1.049 +6968,-0.791 +6969,0.815 +6970,-0.076 +6971,0.314 +6972,0.164 +6973,-1.985 +6974,0.771 +6975,0.883 +6976,0.574 +6977,0.372 +6978,-0.181 +6979,1.207 +6980,1.398 +6981,0.487 +6982,-0.616 +6983,-1.524 +6984,-0.108 +6985,0.598 +6986,0.214 +6987,-0.339 +6988,0.681 +6989,0.868 +6990,1.370 +6991,-0.223 +6992,0.321 +6993,-0.402 +6994,-0.071 +6995,-0.329 +6996,-1.120 +6997,-1.509 +6998,-1.760 +6999,-0.195 +7000,1.038 +7001,1.306 +7002,-0.144 +7003,-1.558 +7004,-0.785 +7005,0.080 +7006,-0.452 +7007,1.036 +7008,1.669 +7009,-0.981 +7010,0.265 +7011,0.488 +7012,0.798 +7013,0.571 +7014,-1.709 +7015,0.041 +7016,1.178 +7017,-1.041 +7018,0.298 +7019,0.131 +7020,-0.167 +7021,-0.277 +7022,1.457 +7023,-0.099 +7024,-0.664 +7025,0.100 +7026,-1.288 +7027,-0.581 +7028,0.462 +7029,1.232 +7030,2.223 +7031,0.886 +7032,-0.369 +7033,0.794 +7034,0.023 +7035,0.980 +7036,-0.772 +7037,0.290 +7038,-0.093 +7039,0.259 +7040,-2.578 +7041,0.965 +7042,1.836 +7043,-0.182 +7044,-0.645 +7045,1.255 +7046,0.642 +7047,0.054 +7048,-1.078 +7049,-0.322 +7050,0.134 +7051,-0.366 +7052,1.134 +7053,-0.146 +7054,-1.379 +7055,0.919 +7056,-1.236 +7057,1.004 +7058,-0.002 +7059,-0.707 +7060,-0.582 +7061,0.858 +7062,-0.630 +7063,-2.806 +7064,-1.405 +7065,-0.993 +7066,-0.026 +7067,-0.625 +7068,-0.456 +7069,-1.450 +7070,0.214 +7071,0.737 +7072,0.507 +7073,-0.377 +7074,-0.320 +7075,-1.521 +7076,-1.405 +7077,0.200 +7078,0.538 +7079,-2.622 +7080,1.415 +7081,1.526 +7082,-1.019 +7083,0.748 +7084,0.073 +7085,-0.084 +7086,-0.798 +7087,1.370 +7088,-0.197 +7089,0.822 +7090,0.314 +7091,-1.647 +7092,-0.802 +7093,0.626 +7094,-0.190 +7095,-1.200 +7096,-0.310 +7097,0.053 +7098,0.782 +7099,-0.826 +7100,0.572 +7101,0.306 +7102,-0.416 +7103,-0.606 +7104,0.261 +7105,0.696 +7106,-0.472 +7107,-0.349 +7108,-0.185 +7109,0.219 +7110,-1.063 +7111,-0.558 +7112,-0.567 +7113,0.561 +7114,-0.936 +7115,1.317 +7116,-2.233 +7117,0.243 +7118,-0.109 +7119,0.814 +7120,0.215 +7121,-0.792 +7122,-0.657 +7123,0.833 +7124,0.667 +7125,-0.842 +7126,1.424 +7127,2.318 +7128,0.216 +7129,0.109 +7130,-0.028 +7131,0.004 +7132,0.555 +7133,0.847 +7134,-1.915 +7135,-0.717 +7136,-0.593 +7137,0.179 +7138,-0.020 +7139,-0.076 +7140,-1.814 +7141,-2.477 +7142,0.250 +7143,-1.407 +7144,1.160 +7145,0.419 +7146,1.015 +7147,0.118 +7148,-0.178 +7149,-0.611 +7150,2.369 +7151,0.643 +7152,0.284 +7153,-0.806 +7154,-1.214 +7155,0.645 +7156,0.782 +7157,-1.633 +7158,0.378 +7159,0.807 +7160,-0.625 +7161,1.042 +7162,-0.639 +7163,-0.778 +7164,-0.387 +7165,0.084 +7166,0.357 +7167,0.661 +7168,-0.989 +7169,-0.343 +7170,0.438 +7171,-1.380 +7172,1.122 +7173,-0.721 +7174,0.187 +7175,0.266 +7176,-0.158 +7177,0.101 +7178,-0.006 +7179,0.503 +7180,-0.930 +7181,0.318 +7182,-2.275 +7183,0.470 +7184,0.576 +7185,-2.461 +7186,1.001 +7187,-0.492 +7188,-0.415 +7189,0.173 +7190,0.091 +7191,-2.411 +7192,-1.172 +7193,0.128 +7194,-0.467 +7195,0.882 +7196,-0.126 +7197,1.329 +7198,1.568 +7199,-0.069 +7200,-0.431 +7201,1.202 +7202,0.111 +7203,1.108 +7204,-0.055 +7205,0.742 +7206,0.664 +7207,0.543 +7208,-1.603 +7209,1.226 +7210,-0.330 +7211,-1.988 +7212,0.742 +7213,1.652 +7214,-0.925 +7215,0.746 +7216,0.318 +7217,0.647 +7218,-0.390 +7219,-0.402 +7220,-1.270 +7221,1.572 +7222,-1.018 +7223,0.162 +7224,-0.882 +7225,1.315 +7226,-1.154 +7227,-0.229 +7228,-1.187 +7229,0.189 +7230,-1.264 +7231,1.487 +7232,0.353 +7233,0.384 +7234,-1.268 +7235,0.276 +7236,-1.295 +7237,-1.918 +7238,1.597 +7239,-1.198 +7240,-2.734 +7241,0.297 +7242,-0.227 +7243,-0.701 +7244,-0.756 +7245,-0.447 +7246,0.246 +7247,1.241 +7248,0.319 +7249,-0.443 +7250,0.883 +7251,1.495 +7252,-0.517 +7253,-0.653 +7254,-1.576 +7255,0.766 +7256,1.199 +7257,0.178 +7258,0.899 +7259,1.268 +7260,-1.413 +7261,-0.441 +7262,-0.762 +7263,0.852 +7264,-0.878 +7265,-1.235 +7266,0.063 +7267,1.739 +7268,-1.555 +7269,0.686 +7270,1.100 +7271,0.812 +7272,-0.057 +7273,2.369 +7274,0.147 +7275,1.166 +7276,1.726 +7277,0.833 +7278,-1.903 +7279,-0.362 +7280,0.757 +7281,0.658 +7282,1.345 +7283,0.097 +7284,-0.190 +7285,1.995 +7286,1.146 +7287,0.634 +7288,0.267 +7289,0.482 +7290,0.728 +7291,1.047 +7292,-0.904 +7293,2.216 +7294,0.226 +7295,-0.248 +7296,0.052 +7297,1.667 +7298,0.033 +7299,1.787 +7300,-1.874 +7301,-1.420 +7302,0.351 +7303,-0.514 +7304,0.492 +7305,1.096 +7306,0.409 +7307,-1.297 +7308,1.274 +7309,-0.559 +7310,0.579 +7311,-1.767 +7312,-2.921 +7313,-0.041 +7314,-0.738 +7315,-0.076 +7316,-0.240 +7317,0.635 +7318,0.065 +7319,-1.078 +7320,-1.189 +7321,0.977 +7322,0.294 +7323,-1.002 +7324,-0.609 +7325,2.763 +7326,0.929 +7327,-1.019 +7328,-0.083 +7329,-0.961 +7330,-0.613 +7331,1.094 +7332,0.935 +7333,-1.197 +7334,1.099 +7335,-1.636 +7336,-0.253 +7337,0.054 +7338,1.486 +7339,2.511 +7340,0.091 +7341,-0.322 +7342,-0.166 +7343,-0.798 +7344,0.372 +7345,-0.656 +7346,0.863 +7347,2.297 +7348,0.471 +7349,-0.040 +7350,-1.158 +7351,0.796 +7352,-1.839 +7353,0.379 +7354,2.195 +7355,-3.158 +7356,0.798 +7357,0.816 +7358,0.340 +7359,1.310 +7360,0.974 +7361,0.096 +7362,-0.516 +7363,-0.165 +7364,0.622 +7365,-1.076 +7366,-0.294 +7367,0.568 +7368,0.041 +7369,-0.602 +7370,-0.521 +7371,-0.517 +7372,-1.779 +7373,-0.453 +7374,0.587 +7375,-1.161 +7376,-0.138 +7377,-0.358 +7378,-0.645 +7379,0.919 +7380,0.043 +7381,-0.737 +7382,1.160 +7383,-0.508 +7384,-0.152 +7385,0.289 +7386,1.919 +7387,-0.859 +7388,-0.238 +7389,-1.089 +7390,-0.259 +7391,-2.131 +7392,1.177 +7393,0.128 +7394,-0.595 +7395,0.093 +7396,1.742 +7397,-0.024 +7398,-0.390 +7399,0.489 +7400,0.296 +7401,-0.217 +7402,1.226 +7403,0.842 +7404,-0.774 +7405,-0.791 +7406,-1.562 +7407,1.142 +7408,-1.575 +7409,0.204 +7410,0.452 +7411,0.765 +7412,1.607 +7413,0.196 +7414,-0.770 +7415,-0.883 +7416,0.590 +7417,1.378 +7418,0.754 +7419,0.347 +7420,1.138 +7421,2.240 +7422,-0.776 +7423,-0.974 +7424,0.165 +7425,0.143 +7426,0.119 +7427,-0.635 +7428,1.597 +7429,0.120 +7430,-1.580 +7431,0.455 +7432,0.279 +7433,1.367 +7434,-0.300 +7435,3.117 +7436,-0.243 +7437,-1.645 +7438,-0.641 +7439,-0.488 +7440,2.029 +7441,-1.457 +7442,0.158 +7443,0.182 +7444,-0.377 +7445,1.335 +7446,-0.211 +7447,-0.979 +7448,-2.122 +7449,1.453 +7450,-0.232 +7451,0.779 +7452,0.025 +7453,0.458 +7454,0.270 +7455,0.363 +7456,0.390 +7457,-0.074 +7458,0.064 +7459,2.613 +7460,-0.746 +7461,-0.977 +7462,-1.229 +7463,0.747 +7464,0.606 +7465,0.769 +7466,-1.597 +7467,0.455 +7468,-0.157 +7469,0.960 +7470,0.801 +7471,-1.020 +7472,0.376 +7473,0.643 +7474,-0.477 +7475,-0.538 +7476,-0.200 +7477,0.296 +7478,0.348 +7479,1.101 +7480,-0.097 +7481,-1.216 +7482,0.219 +7483,-0.760 +7484,-0.851 +7485,-0.782 +7486,-0.540 +7487,0.088 +7488,0.631 +7489,-0.039 +7490,-0.556 +7491,1.165 +7492,0.391 +7493,0.940 +7494,0.308 +7495,-0.780 +7496,-0.423 +7497,-0.245 +7498,1.188 +7499,0.918 +7500,-0.370 +7501,-1.873 +7502,-1.101 +7503,-0.030 +7504,-0.194 +7505,-0.171 +7506,1.112 +7507,0.390 +7508,1.774 +7509,1.497 +7510,1.348 +7511,0.413 +7512,2.039 +7513,-1.423 +7514,0.801 +7515,0.226 +7516,-0.719 +7517,-0.203 +7518,1.223 +7519,-0.200 +7520,0.925 +7521,-0.018 +7522,-0.043 +7523,0.952 +7524,0.074 +7525,-0.449 +7526,-1.398 +7527,0.758 +7528,-1.722 +7529,-0.469 +7530,0.932 +7531,-0.741 +7532,-0.325 +7533,1.721 +7534,1.023 +7535,-0.217 +7536,-1.163 +7537,-1.323 +7538,-1.785 +7539,0.712 +7540,-0.302 +7541,-0.193 +7542,0.907 +7543,-0.846 +7544,0.050 +7545,-0.211 +7546,1.435 +7547,0.778 +7548,0.798 +7549,0.392 +7550,-1.787 +7551,-1.966 +7552,-0.261 +7553,2.378 +7554,-1.722 +7555,1.014 +7556,-1.526 +7557,-1.534 +7558,-0.864 +7559,1.429 +7560,-0.363 +7561,0.212 +7562,2.840 +7563,1.260 +7564,2.260 +7565,-1.636 +7566,0.521 +7567,-1.121 +7568,-0.071 +7569,1.022 +7570,-0.255 +7571,-0.855 +7572,0.878 +7573,-0.064 +7574,0.333 +7575,-1.153 +7576,-0.990 +7577,0.731 +7578,0.059 +7579,0.710 +7580,-0.637 +7581,-0.078 +7582,-0.398 +7583,0.881 +7584,1.484 +7585,0.733 +7586,-1.991 +7587,-0.689 +7588,0.257 +7589,0.015 +7590,-0.234 +7591,-0.138 +7592,-0.263 +7593,0.543 +7594,0.176 +7595,0.994 +7596,-0.755 +7597,-0.693 +7598,0.607 +7599,-0.064 +7600,0.517 +7601,-0.215 +7602,-0.462 +7603,1.068 +7604,-1.036 +7605,-0.301 +7606,0.015 +7607,-1.702 +7608,-0.391 +7609,1.064 +7610,-0.611 +7611,0.227 +7612,-1.304 +7613,0.474 +7614,-0.453 +7615,-0.734 +7616,1.291 +7617,0.209 +7618,0.048 +7619,-0.579 +7620,0.196 +7621,-1.745 +7622,-0.047 +7623,-0.579 +7624,-2.391 +7625,0.242 +7626,-1.293 +7627,-1.202 +7628,0.879 +7629,-0.141 +7630,-0.498 +7631,1.125 +7632,-0.287 +7633,-1.132 +7634,0.453 +7635,-1.419 +7636,2.256 +7637,-1.770 +7638,1.311 +7639,-0.047 +7640,0.464 +7641,0.571 +7642,0.213 +7643,-0.787 +7644,-0.796 +7645,0.150 +7646,0.361 +7647,-0.009 +7648,-0.359 +7649,-1.125 +7650,-1.806 +7651,-0.926 +7652,0.427 +7653,1.244 +7654,0.191 +7655,-0.058 +7656,0.773 +7657,0.443 +7658,-0.572 +7659,0.767 +7660,-1.188 +7661,1.080 +7662,-0.856 +7663,1.323 +7664,-0.384 +7665,-0.483 +7666,0.944 +7667,-0.540 +7668,0.178 +7669,1.182 +7670,-0.361 +7671,-0.373 +7672,0.152 +7673,0.355 +7674,1.447 +7675,-0.267 +7676,1.484 +7677,0.498 +7678,-0.019 +7679,0.713 +7680,-1.171 +7681,1.693 +7682,0.015 +7683,-0.474 +7684,-1.029 +7685,-2.311 +7686,-1.819 +7687,0.215 +7688,-1.210 +7689,-1.058 +7690,1.543 +7691,-0.545 +7692,-2.152 +7693,1.778 +7694,-1.062 +7695,1.380 +7696,0.036 +7697,-0.616 +7698,0.458 +7699,0.473 +7700,0.650 +7701,-1.868 +7702,0.601 +7703,0.759 +7704,-1.244 +7705,-0.295 +7706,-1.755 +7707,1.014 +7708,-0.955 +7709,-1.243 +7710,0.150 +7711,-0.361 +7712,-0.888 +7713,-0.500 +7714,1.854 +7715,0.032 +7716,-0.422 +7717,-0.774 +7718,0.417 +7719,0.576 +7720,-0.731 +7721,0.223 +7722,0.180 +7723,-0.129 +7724,0.687 +7725,-1.319 +7726,-0.912 +7727,0.862 +7728,-2.480 +7729,-0.596 +7730,-0.685 +7731,2.636 +7732,0.758 +7733,1.265 +7734,0.972 +7735,0.015 +7736,-0.131 +7737,-1.174 +7738,0.348 +7739,0.247 +7740,1.785 +7741,-1.386 +7742,0.839 +7743,-0.514 +7744,-0.652 +7745,1.351 +7746,-0.585 +7747,0.306 +7748,2.400 +7749,0.187 +7750,-1.365 +7751,-0.480 +7752,1.082 +7753,-2.266 +7754,-1.687 +7755,-2.223 +7756,0.710 +7757,-0.067 +7758,0.158 +7759,0.129 +7760,-1.659 +7761,0.165 +7762,0.431 +7763,-1.314 +7764,0.439 +7765,-0.283 +7766,0.411 +7767,-0.784 +7768,-0.621 +7769,-0.017 +7770,0.798 +7771,-0.453 +7772,1.973 +7773,1.547 +7774,-2.153 +7775,-1.017 +7776,0.716 +7777,0.256 +7778,-1.048 +7779,-1.344 +7780,-2.144 +7781,-0.955 +7782,1.490 +7783,-0.483 +7784,0.380 +7785,1.134 +7786,0.459 +7787,-0.067 +7788,-0.150 +7789,1.443 +7790,0.522 +7791,-0.623 +7792,-1.462 +7793,0.000 +7794,-1.058 +7795,0.462 +7796,1.499 +7797,-0.944 +7798,-0.306 +7799,0.344 +7800,0.386 +7801,-0.385 +7802,0.326 +7803,0.043 +7804,-0.131 +7805,1.536 +7806,0.899 +7807,-1.403 +7808,-0.180 +7809,-0.167 +7810,-0.007 +7811,0.604 +7812,2.143 +7813,-0.276 +7814,0.860 +7815,-0.875 +7816,1.708 +7817,-0.727 +7818,0.211 +7819,0.452 +7820,1.186 +7821,-0.595 +7822,0.213 +7823,0.455 +7824,0.112 +7825,-0.938 +7826,-0.103 +7827,1.760 +7828,-0.694 +7829,0.791 +7830,2.415 +7831,-1.011 +7832,-1.110 +7833,1.172 +7834,-0.496 +7835,0.817 +7836,-0.159 +7837,-1.802 +7838,-0.180 +7839,-0.216 +7840,0.850 +7841,-0.330 +7842,0.708 +7843,0.304 +7844,-1.353 +7845,0.335 +7846,2.217 +7847,0.509 +7848,0.985 +7849,0.325 +7850,0.818 +7851,-0.168 +7852,-0.196 +7853,0.248 +7854,-0.641 +7855,-2.416 +7856,-0.030 +7857,0.537 +7858,1.898 +7859,-0.176 +7860,-0.514 +7861,-1.416 +7862,-0.422 +7863,0.103 +7864,0.025 +7865,-0.730 +7866,0.429 +7867,0.534 +7868,-0.633 +7869,0.010 +7870,0.571 +7871,0.850 +7872,-0.121 +7873,-0.150 +7874,-1.572 +7875,0.390 +7876,0.820 +7877,-1.191 +7878,-0.934 +7879,-1.066 +7880,1.282 +7881,-0.130 +7882,-0.075 +7883,-0.459 +7884,0.393 +7885,0.801 +7886,1.232 +7887,-0.313 +7888,0.256 +7889,0.247 +7890,-0.662 +7891,-0.872 +7892,0.293 +7893,0.585 +7894,-0.627 +7895,-1.308 +7896,1.828 +7897,0.345 +7898,-0.412 +7899,0.159 +7900,-0.780 +7901,0.996 +7902,0.885 +7903,-0.004 +7904,-0.925 +7905,-2.623 +7906,-0.695 +7907,-0.374 +7908,0.531 +7909,-0.554 +7910,-1.159 +7911,0.836 +7912,0.994 +7913,0.825 +7914,1.268 +7915,0.122 +7916,0.886 +7917,1.619 +7918,0.141 +7919,-1.274 +7920,0.800 +7921,-0.973 +7922,1.441 +7923,-1.581 +7924,-0.497 +7925,-0.214 +7926,-0.951 +7927,1.029 +7928,-1.219 +7929,-0.421 +7930,-0.051 +7931,1.161 +7932,0.298 +7933,-0.071 +7934,0.660 +7935,0.599 +7936,-0.901 +7937,0.448 +7938,-0.600 +7939,-0.961 +7940,0.858 +7941,-1.003 +7942,0.527 +7943,-0.405 +7944,0.396 +7945,-0.406 +7946,1.096 +7947,-0.082 +7948,-1.327 +7949,1.691 +7950,1.714 +7951,1.535 +7952,0.522 +7953,0.379 +7954,1.266 +7955,0.643 +7956,1.477 +7957,-0.206 +7958,-1.000 +7959,-1.413 +7960,-0.223 +7961,-0.243 +7962,1.245 +7963,0.282 +7964,-1.177 +7965,-0.128 +7966,0.160 +7967,1.272 +7968,0.651 +7969,0.110 +7970,0.278 +7971,1.268 +7972,0.907 +7973,0.044 +7974,-0.619 +7975,-0.116 +7976,-0.365 +7977,1.152 +7978,-0.075 +7979,-0.303 +7980,0.098 +7981,0.286 +7982,0.118 +7983,-0.707 +7984,-0.332 +7985,0.435 +7986,-1.040 +7987,-1.181 +7988,-1.449 +7989,1.053 +7990,0.272 +7991,3.365 +7992,1.381 +7993,1.549 +7994,2.023 +7995,0.463 +7996,-0.399 +7997,0.529 +7998,1.422 +7999,0.213 +8000,-1.042 +8001,0.252 +8002,-0.476 +8003,0.725 +8004,0.303 +8005,-1.086 +8006,-0.060 +8007,1.112 +8008,-1.688 +8009,-0.054 +8010,-1.190 +8011,1.453 +8012,0.863 +8013,0.931 +8014,0.166 +8015,-1.328 +8016,-1.232 +8017,0.697 +8018,-0.888 +8019,-0.489 +8020,-0.003 +8021,-1.336 +8022,-0.947 +8023,0.942 +8024,0.079 +8025,-0.596 +8026,-0.624 +8027,-0.068 +8028,-2.286 +8029,-0.148 +8030,0.322 +8031,0.297 +8032,-0.172 +8033,1.438 +8034,0.233 +8035,-0.297 +8036,0.539 +8037,-1.847 +8038,0.641 +8039,1.004 +8040,0.155 +8041,0.634 +8042,1.149 +8043,-0.425 +8044,1.388 +8045,-0.610 +8046,0.706 +8047,-0.467 +8048,1.532 +8049,2.027 +8050,1.233 +8051,1.195 +8052,0.066 +8053,0.876 +8054,0.056 +8055,-0.421 +8056,1.335 +8057,0.622 +8058,-1.091 +8059,0.616 +8060,-0.304 +8061,-0.855 +8062,-0.284 +8063,-0.630 +8064,0.743 +8065,-0.076 +8066,-0.079 +8067,-1.354 +8068,-0.418 +8069,0.011 +8070,0.858 +8071,-2.279 +8072,0.469 +8073,0.536 +8074,0.693 +8075,-0.203 +8076,1.781 +8077,1.110 +8078,1.634 +8079,-0.258 +8080,1.068 +8081,-0.473 +8082,-1.381 +8083,-0.801 +8084,-0.403 +8085,1.026 +8086,-0.579 +8087,1.594 +8088,0.321 +8089,0.982 +8090,0.234 +8091,0.602 +8092,0.256 +8093,1.571 +8094,-0.087 +8095,1.203 +8096,0.885 +8097,1.656 +8098,-0.166 +8099,3.121 +8100,1.594 +8101,-1.350 +8102,0.341 +8103,2.486 +8104,-0.133 +8105,-1.985 +8106,1.327 +8107,0.670 +8108,0.052 +8109,1.395 +8110,-0.439 +8111,-0.152 +8112,0.017 +8113,0.478 +8114,-1.388 +8115,0.033 +8116,-0.891 +8117,-1.260 +8118,1.591 +8119,-1.381 +8120,-1.396 +8121,0.053 +8122,-0.679 +8123,-0.203 +8124,-0.496 +8125,-0.139 +8126,-0.434 +8127,0.177 +8128,1.005 +8129,1.895 +8130,0.815 +8131,0.257 +8132,0.268 +8133,0.811 +8134,0.634 +8135,1.424 +8136,1.395 +8137,-0.168 +8138,0.919 +8139,1.863 +8140,1.621 +8141,-0.927 +8142,-0.859 +8143,0.389 +8144,-0.001 +8145,0.689 +8146,-0.253 +8147,0.126 +8148,-0.867 +8149,-0.631 +8150,-0.593 +8151,0.078 +8152,-0.831 +8153,0.322 +8154,-0.651 +8155,-0.920 +8156,-1.083 +8157,0.471 +8158,0.112 +8159,-0.508 +8160,0.315 +8161,0.549 +8162,-0.280 +8163,0.337 +8164,0.669 +8165,0.017 +8166,-1.149 +8167,-0.835 +8168,-1.311 +8169,-0.911 +8170,0.615 +8171,0.131 +8172,1.010 +8173,0.131 +8174,0.127 +8175,1.051 +8176,0.324 +8177,0.322 +8178,-0.703 +8179,0.476 +8180,0.386 +8181,-0.857 +8182,-0.319 +8183,-1.619 +8184,0.183 +8185,-0.284 +8186,0.238 +8187,1.545 +8188,0.027 +8189,1.478 +8190,1.564 +8191,-1.506 +8192,-0.579 +8193,0.492 +8194,0.866 +8195,-0.772 +8196,0.020 +8197,0.106 +8198,0.450 +8199,-0.374 +8200,0.739 +8201,-0.647 +8202,0.316 +8203,0.896 +8204,0.561 +8205,-0.874 +8206,0.582 +8207,1.142 +8208,-0.705 +8209,0.983 +8210,3.045 +8211,0.671 +8212,-0.468 +8213,0.900 +8214,0.138 +8215,-0.053 +8216,-0.154 +8217,-0.256 +8218,0.098 +8219,-1.028 +8220,1.456 +8221,-0.367 +8222,0.031 +8223,-0.398 +8224,0.797 +8225,1.527 +8226,0.629 +8227,0.175 +8228,-0.516 +8229,0.262 +8230,1.322 +8231,0.257 +8232,-0.284 +8233,0.366 +8234,0.211 +8235,0.914 +8236,-0.517 +8237,-0.315 +8238,0.504 +8239,-0.099 +8240,1.049 +8241,0.751 +8242,-0.950 +8243,0.623 +8244,-2.064 +8245,0.878 +8246,0.560 +8247,-0.057 +8248,0.671 +8249,-0.369 +8250,-0.244 +8251,-0.111 +8252,1.156 +8253,0.114 +8254,-0.513 +8255,0.231 +8256,-0.639 +8257,-1.937 +8258,0.153 +8259,-0.495 +8260,-0.689 +8261,-0.515 +8262,-0.210 +8263,-0.782 +8264,-1.238 +8265,-0.299 +8266,-1.196 +8267,-1.226 +8268,0.936 +8269,1.782 +8270,-0.487 +8271,-0.141 +8272,-1.373 +8273,-0.394 +8274,-0.011 +8275,0.335 +8276,-0.242 +8277,-0.731 +8278,-2.901 +8279,-0.914 +8280,-0.378 +8281,0.655 +8282,-0.683 +8283,0.264 +8284,-0.347 +8285,-0.220 +8286,2.055 +8287,-0.107 +8288,0.380 +8289,1.141 +8290,0.680 +8291,-0.721 +8292,0.681 +8293,-1.018 +8294,-0.432 +8295,-1.081 +8296,0.360 +8297,1.529 +8298,-2.075 +8299,0.414 +8300,1.098 +8301,-0.908 +8302,0.461 +8303,-1.850 +8304,-1.287 +8305,2.788 +8306,0.901 +8307,1.883 +8308,0.008 +8309,-0.203 +8310,0.130 +8311,1.787 +8312,1.506 +8313,-1.073 +8314,1.056 +8315,0.962 +8316,-0.146 +8317,-0.908 +8318,-1.546 +8319,0.540 +8320,-1.583 +8321,0.116 +8322,-0.321 +8323,0.009 +8324,0.285 +8325,0.622 +8326,1.591 +8327,0.604 +8328,0.186 +8329,-1.104 +8330,0.667 +8331,-0.918 +8332,0.350 +8333,-1.535 +8334,-1.129 +8335,1.135 +8336,1.469 +8337,1.092 +8338,0.269 +8339,0.631 +8340,1.173 +8341,-1.798 +8342,-0.081 +8343,-2.058 +8344,-0.865 +8345,0.116 +8346,0.468 +8347,-1.616 +8348,-0.282 +8349,-0.832 +8350,-0.893 +8351,0.132 +8352,-0.347 +8353,0.089 +8354,0.160 +8355,0.045 +8356,0.539 +8357,0.626 +8358,-0.532 +8359,-0.856 +8360,-1.403 +8361,1.499 +8362,1.347 +8363,1.815 +8364,-1.543 +8365,0.213 +8366,0.191 +8367,2.230 +8368,1.470 +8369,0.676 +8370,0.380 +8371,0.554 +8372,-0.231 +8373,-0.738 +8374,1.356 +8375,-0.804 +8376,-1.130 +8377,-0.345 +8378,-0.941 +8379,0.323 +8380,1.188 +8381,-0.209 +8382,0.971 +8383,-0.534 +8384,-0.534 +8385,-0.399 +8386,-0.726 +8387,0.602 +8388,0.391 +8389,-0.022 +8390,-0.458 +8391,-0.975 +8392,0.470 +8393,-1.763 +8394,0.701 +8395,0.436 +8396,0.679 +8397,0.458 +8398,-0.664 +8399,1.478 +8400,0.113 +8401,-0.608 +8402,-1.132 +8403,0.376 +8404,0.049 +8405,-1.625 +8406,0.366 +8407,-1.427 +8408,1.432 +8409,1.025 +8410,-0.607 +8411,-0.371 +8412,-1.168 +8413,-0.521 +8414,-0.457 +8415,-0.036 +8416,0.886 +8417,0.475 +8418,1.545 +8419,-0.775 +8420,-1.477 +8421,-1.724 +8422,-0.570 +8423,-0.825 +8424,-0.490 +8425,-0.852 +8426,0.653 +8427,1.655 +8428,-1.347 +8429,0.719 +8430,-0.798 +8431,-1.793 +8432,0.859 +8433,-0.221 +8434,-1.338 +8435,-1.137 +8436,-0.541 +8437,-0.505 +8438,-0.200 +8439,-0.441 +8440,-0.492 +8441,1.399 +8442,0.027 +8443,0.103 +8444,-0.804 +8445,-1.256 +8446,0.921 +8447,-0.059 +8448,1.185 +8449,-1.002 +8450,0.200 +8451,-1.014 +8452,-0.412 +8453,0.733 +8454,-0.460 +8455,-1.838 +8456,0.553 +8457,0.400 +8458,1.054 +8459,-0.664 +8460,0.865 +8461,2.997 +8462,-0.596 +8463,-0.429 +8464,0.859 +8465,-1.118 +8466,0.892 +8467,-0.915 +8468,-0.760 +8469,-1.164 +8470,0.216 +8471,-0.189 +8472,0.385 +8473,-0.909 +8474,-0.095 +8475,-0.039 +8476,-0.930 +8477,0.874 +8478,-0.163 +8479,-1.588 +8480,0.606 +8481,-0.202 +8482,0.083 +8483,0.682 +8484,0.456 +8485,-0.807 +8486,-0.413 +8487,-0.988 +8488,-0.324 +8489,-1.191 +8490,-0.069 +8491,0.930 +8492,0.815 +8493,-1.127 +8494,1.770 +8495,-0.434 +8496,0.587 +8497,0.035 +8498,-0.986 +8499,-0.364 +8500,-0.742 +8501,-0.932 +8502,0.367 +8503,0.881 +8504,-1.177 +8505,-0.229 +8506,-0.877 +8507,-0.567 +8508,-0.896 +8509,-1.000 +8510,0.109 +8511,-0.268 +8512,1.627 +8513,-0.292 +8514,0.669 +8515,0.140 +8516,0.115 +8517,-0.724 +8518,1.144 +8519,0.842 +8520,0.072 +8521,-2.109 +8522,-0.854 +8523,0.099 +8524,0.099 +8525,-0.480 +8526,-0.016 +8527,-0.776 +8528,0.798 +8529,0.385 +8530,-0.317 +8531,-0.315 +8532,1.300 +8533,1.205 +8534,-1.021 +8535,0.911 +8536,0.031 +8537,0.849 +8538,1.285 +8539,-0.788 +8540,0.230 +8541,-1.637 +8542,-0.300 +8543,2.328 +8544,1.489 +8545,-2.239 +8546,1.233 +8547,-0.700 +8548,-1.685 +8549,-1.589 +8550,1.502 +8551,-0.192 +8552,-1.707 +8553,-1.495 +8554,0.848 +8555,-0.148 +8556,-0.876 +8557,-0.244 +8558,-0.814 +8559,-0.465 +8560,-1.828 +8561,-0.624 +8562,0.426 +8563,-0.869 +8564,0.139 +8565,1.007 +8566,-0.156 +8567,0.543 +8568,-0.436 +8569,-0.636 +8570,-0.702 +8571,-1.030 +8572,0.650 +8573,-0.226 +8574,1.536 +8575,-1.345 +8576,0.635 +8577,0.235 +8578,-0.352 +8579,1.152 +8580,-0.001 +8581,0.345 +8582,-1.094 +8583,-0.698 +8584,-0.658 +8585,0.005 +8586,0.540 +8587,-0.821 +8588,-0.365 +8589,-0.704 +8590,1.531 +8591,-0.779 +8592,-0.082 +8593,0.018 +8594,-1.408 +8595,-0.347 +8596,1.228 +8597,-1.897 +8598,-1.069 +8599,1.049 +8600,-0.877 +8601,0.139 +8602,1.541 +8603,0.009 +8604,1.227 +8605,-1.304 +8606,-0.679 +8607,-1.642 +8608,1.101 +8609,-0.458 +8610,0.361 +8611,-1.362 +8612,0.565 +8613,1.629 +8614,1.085 +8615,0.056 +8616,-0.530 +8617,-0.248 +8618,0.563 +8619,0.657 +8620,-0.655 +8621,-1.948 +8622,-1.525 +8623,-1.166 +8624,0.107 +8625,0.204 +8626,-0.327 +8627,0.214 +8628,-0.805 +8629,0.647 +8630,-0.467 +8631,1.500 +8632,-0.413 +8633,-0.012 +8634,-0.192 +8635,0.298 +8636,0.127 +8637,-0.124 +8638,1.087 +8639,2.316 +8640,-1.211 +8641,0.341 +8642,-0.332 +8643,0.091 +8644,-0.270 +8645,-0.577 +8646,-0.926 +8647,-0.366 +8648,-0.073 +8649,0.942 +8650,0.139 +8651,1.687 +8652,-2.064 +8653,-0.442 +8654,-0.054 +8655,-0.802 +8656,-1.058 +8657,-0.183 +8658,-0.589 +8659,-1.255 +8660,-0.714 +8661,1.129 +8662,1.173 +8663,-0.458 +8664,0.713 +8665,0.069 +8666,0.409 +8667,-1.475 +8668,2.325 +8669,0.146 +8670,0.358 +8671,0.141 +8672,-1.067 +8673,-0.374 +8674,0.748 +8675,-0.751 +8676,-0.793 +8677,0.420 +8678,-0.678 +8679,-0.659 +8680,-0.309 +8681,0.636 +8682,0.856 +8683,-0.974 +8684,0.106 +8685,-0.559 +8686,-0.535 +8687,-0.407 +8688,-0.101 +8689,-0.475 +8690,-1.174 +8691,-0.856 +8692,-0.594 +8693,-0.686 +8694,-0.257 +8695,-1.572 +8696,0.057 +8697,-1.067 +8698,-1.497 +8699,-1.021 +8700,-1.613 +8701,-0.686 +8702,-1.478 +8703,0.970 +8704,-0.040 +8705,0.272 +8706,-0.342 +8707,0.447 +8708,0.975 +8709,0.649 +8710,0.976 +8711,0.005 +8712,0.736 +8713,-0.290 +8714,-0.201 +8715,0.786 +8716,0.687 +8717,-0.136 +8718,-0.209 +8719,0.183 +8720,0.914 +8721,-1.847 +8722,-0.108 +8723,0.664 +8724,-0.747 +8725,0.103 +8726,-0.850 +8727,-0.504 +8728,0.944 +8729,0.209 +8730,-0.054 +8731,0.676 +8732,1.411 +8733,0.848 +8734,-0.682 +8735,-0.945 +8736,2.894 +8737,-2.101 +8738,1.071 +8739,0.286 +8740,-0.758 +8741,0.479 +8742,0.865 +8743,-1.022 +8744,0.359 +8745,0.867 +8746,-0.321 +8747,-0.379 +8748,1.369 +8749,0.983 +8750,0.149 +8751,-0.671 +8752,-0.800 +8753,0.105 +8754,0.880 +8755,-0.624 +8756,-0.523 +8757,1.538 +8758,2.070 +8759,-0.569 +8760,-0.830 +8761,-2.076 +8762,0.349 +8763,-1.340 +8764,0.368 +8765,0.177 +8766,0.124 +8767,-1.122 +8768,1.311 +8769,-1.834 +8770,-1.655 +8771,0.133 +8772,1.710 +8773,-0.739 +8774,0.502 +8775,-1.338 +8776,-2.003 +8777,0.453 +8778,0.305 +8779,-1.106 +8780,0.964 +8781,-0.130 +8782,0.279 +8783,0.743 +8784,-0.550 +8785,0.845 +8786,2.140 +8787,1.045 +8788,1.759 +8789,1.798 +8790,0.396 +8791,-0.792 +8792,1.098 +8793,0.001 +8794,0.783 +8795,0.179 +8796,-0.322 +8797,0.693 +8798,0.180 +8799,0.089 +8800,0.968 +8801,0.736 +8802,-0.479 +8803,-0.301 +8804,1.191 +8805,0.681 +8806,0.092 +8807,0.893 +8808,-1.740 +8809,1.189 +8810,0.270 +8811,-1.283 +8812,1.282 +8813,-1.855 +8814,1.527 +8815,-0.019 +8816,-0.011 +8817,-1.474 +8818,-0.346 +8819,1.717 +8820,0.213 +8821,1.224 +8822,0.214 +8823,-0.547 +8824,0.397 +8825,-0.847 +8826,-0.968 +8827,-0.602 +8828,1.962 +8829,0.044 +8830,0.514 +8831,1.725 +8832,-1.557 +8833,-0.050 +8834,1.620 +8835,-1.423 +8836,0.010 +8837,-0.719 +8838,1.210 +8839,-0.378 +8840,-0.035 +8841,0.048 +8842,-1.134 +8843,-1.424 +8844,0.976 +8845,-0.163 +8846,0.094 +8847,0.843 +8848,0.226 +8849,0.024 +8850,-0.986 +8851,-0.002 +8852,1.600 +8853,0.095 +8854,-0.700 +8855,-0.558 +8856,1.100 +8857,-0.638 +8858,0.073 +8859,-1.640 +8860,-1.794 +8861,-0.699 +8862,-0.243 +8863,-0.348 +8864,-0.594 +8865,1.624 +8866,0.496 +8867,-1.562 +8868,0.100 +8869,-1.406 +8870,0.039 +8871,0.081 +8872,0.977 +8873,-0.413 +8874,-0.068 +8875,-0.156 +8876,0.749 +8877,-0.871 +8878,-0.139 +8879,-0.169 +8880,-0.548 +8881,-1.355 +8882,1.086 +8883,-0.081 +8884,-0.136 +8885,-1.104 +8886,-1.650 +8887,-0.279 +8888,0.509 +8889,0.093 +8890,0.671 +8891,1.455 +8892,-2.082 +8893,0.624 +8894,-0.065 +8895,-0.692 +8896,1.524 +8897,0.112 +8898,-0.593 +8899,0.837 +8900,0.131 +8901,-0.852 +8902,-0.775 +8903,0.990 +8904,-0.707 +8905,0.511 +8906,0.474 +8907,-0.945 +8908,0.256 +8909,-0.164 +8910,-2.323 +8911,1.399 +8912,0.988 +8913,-1.263 +8914,-1.426 +8915,-1.076 +8916,-0.576 +8917,1.715 +8918,0.979 +8919,0.663 +8920,0.326 +8921,1.347 +8922,-1.207 +8923,-1.253 +8924,0.131 +8925,-1.291 +8926,-0.081 +8927,0.288 +8928,-0.598 +8929,0.120 +8930,0.458 +8931,0.058 +8932,-0.369 +8933,1.744 +8934,-0.225 +8935,0.751 +8936,-1.423 +8937,-1.777 +8938,-1.046 +8939,-0.218 +8940,0.860 +8941,-0.659 +8942,0.119 +8943,0.478 +8944,1.372 +8945,-2.246 +8946,1.013 +8947,1.011 +8948,0.796 +8949,-0.852 +8950,1.415 +8951,-0.492 +8952,-0.904 +8953,-0.694 +8954,-0.215 +8955,-0.295 +8956,-0.159 +8957,-1.719 +8958,0.399 +8959,1.473 +8960,2.785 +8961,1.612 +8962,-1.068 +8963,-0.023 +8964,0.224 +8965,-0.761 +8966,0.671 +8967,0.584 +8968,-0.057 +8969,-0.232 +8970,1.990 +8971,1.262 +8972,0.804 +8973,0.660 +8974,0.341 +8975,1.194 +8976,0.941 +8977,-1.934 +8978,-1.179 +8979,0.561 +8980,-0.080 +8981,0.312 +8982,-1.269 +8983,0.208 +8984,-0.348 +8985,1.482 +8986,0.219 +8987,1.497 +8988,0.644 +8989,-0.141 +8990,1.175 +8991,2.022 +8992,1.007 +8993,-1.277 +8994,-1.629 +8995,-0.406 +8996,0.538 +8997,-0.008 +8998,-1.301 +8999,0.867 +9000,-1.804 +9001,0.311 +9002,-0.902 +9003,-0.491 +9004,-0.058 +9005,-2.403 +9006,0.302 +9007,-0.137 +9008,-0.279 +9009,-1.238 +9010,-0.034 +9011,1.769 +9012,1.985 +9013,0.589 +9014,-0.678 +9015,2.190 +9016,1.359 +9017,1.321 +9018,-0.557 +9019,-0.008 +9020,-0.779 +9021,-1.222 +9022,0.962 +9023,-1.404 +9024,-0.926 +9025,-1.420 +9026,1.156 +9027,-1.267 +9028,0.751 +9029,-0.247 +9030,1.919 +9031,-0.088 +9032,-0.335 +9033,0.615 +9034,-0.689 +9035,-0.053 +9036,0.065 +9037,1.140 +9038,0.736 +9039,0.601 +9040,-0.660 +9041,-0.728 +9042,-0.800 +9043,1.777 +9044,-0.473 +9045,-1.365 +9046,3.079 +9047,1.770 +9048,0.600 +9049,0.120 +9050,0.022 +9051,-1.577 +9052,-0.862 +9053,-0.007 +9054,1.190 +9055,-0.647 +9056,-0.218 +9057,-1.686 +9058,1.087 +9059,0.640 +9060,0.129 +9061,0.731 +9062,-1.580 +9063,0.844 +9064,-0.307 +9065,1.446 +9066,0.310 +9067,1.371 +9068,-0.413 +9069,-1.460 +9070,0.227 +9071,2.512 +9072,-0.024 +9073,0.482 +9074,0.425 +9075,0.788 +9076,-0.610 +9077,-0.856 +9078,1.362 +9079,-0.253 +9080,0.391 +9081,1.035 +9082,-0.017 +9083,-0.494 +9084,1.116 +9085,-0.043 +9086,-1.486 +9087,-0.516 +9088,0.111 +9089,-0.252 +9090,-0.624 +9091,-0.659 +9092,-0.125 +9093,-0.950 +9094,-0.331 +9095,-0.261 +9096,-0.289 +9097,0.142 +9098,-2.642 +9099,-0.033 +9100,-1.170 +9101,-0.764 +9102,-1.337 +9103,-0.113 +9104,0.119 +9105,-0.204 +9106,0.771 +9107,0.443 +9108,0.601 +9109,0.959 +9110,-0.946 +9111,0.025 +9112,1.478 +9113,1.561 +9114,-0.278 +9115,-0.767 +9116,-1.173 +9117,-0.163 +9118,-1.161 +9119,-1.207 +9120,0.250 +9121,0.355 +9122,0.499 +9123,0.092 +9124,0.856 +9125,0.861 +9126,0.861 +9127,0.124 +9128,-0.873 +9129,-2.363 +9130,-0.072 +9131,0.916 +9132,-1.133 +9133,1.985 +9134,1.893 +9135,0.465 +9136,0.006 +9137,1.979 +9138,-0.328 +9139,1.754 +9140,0.514 +9141,-0.527 +9142,-0.242 +9143,0.291 +9144,0.298 +9145,0.607 +9146,-1.375 +9147,-0.319 +9148,1.749 +9149,0.368 +9150,0.496 +9151,-0.091 +9152,1.248 +9153,1.489 +9154,-0.134 +9155,-0.755 +9156,0.452 +9157,-0.298 +9158,-0.114 +9159,0.520 +9160,-1.670 +9161,-0.177 +9162,1.014 +9163,1.017 +9164,-0.617 +9165,3.313 +9166,0.161 +9167,-0.541 +9168,0.421 +9169,-0.532 +9170,-1.255 +9171,0.565 +9172,-0.121 +9173,-1.056 +9174,-0.663 +9175,-0.244 +9176,0.670 +9177,-0.345 +9178,-1.791 +9179,0.082 +9180,0.258 +9181,-0.462 +9182,-0.251 +9183,0.703 +9184,0.307 +9185,-0.767 +9186,-0.213 +9187,0.435 +9188,-0.486 +9189,-1.218 +9190,0.335 +9191,-0.658 +9192,-1.718 +9193,-0.912 +9194,-0.378 +9195,0.615 +9196,-0.685 +9197,1.585 +9198,0.525 +9199,-0.781 +9200,-0.607 +9201,0.330 +9202,-1.505 +9203,-0.008 +9204,-0.688 +9205,-0.843 +9206,1.235 +9207,0.571 +9208,-0.390 +9209,1.544 +9210,-1.417 +9211,-0.879 +9212,0.210 +9213,-0.443 +9214,0.664 +9215,1.173 +9216,1.682 +9217,-1.836 +9218,1.147 +9219,1.198 +9220,-0.395 +9221,-0.493 +9222,-0.140 +9223,0.689 +9224,0.801 +9225,-1.011 +9226,-1.669 +9227,-0.974 +9228,-2.233 +9229,1.988 +9230,1.499 +9231,1.038 +9232,0.879 +9233,-1.000 +9234,-0.785 +9235,-1.485 +9236,0.964 +9237,-1.243 +9238,-0.542 +9239,1.031 +9240,-0.802 +9241,-0.074 +9242,-1.053 +9243,1.282 +9244,1.233 +9245,2.195 +9246,-0.365 +9247,0.724 +9248,0.558 +9249,0.199 +9250,0.035 +9251,-1.461 +9252,-0.178 +9253,-0.448 +9254,0.041 +9255,-0.795 +9256,1.055 +9257,0.301 +9258,1.632 +9259,-0.760 +9260,-0.665 +9261,-1.473 +9262,-1.376 +9263,-0.555 +9264,-1.562 +9265,-0.881 +9266,-0.374 +9267,-0.204 +9268,1.113 +9269,1.932 +9270,0.190 +9271,-0.657 +9272,-1.209 +9273,-0.138 +9274,1.601 +9275,-1.040 +9276,0.037 +9277,-0.104 +9278,-0.130 +9279,0.336 +9280,-0.842 +9281,-0.312 +9282,-1.149 +9283,-2.124 +9284,-1.328 +9285,-0.020 +9286,-0.392 +9287,0.496 +9288,1.142 +9289,-1.643 +9290,0.444 +9291,0.308 +9292,-0.115 +9293,0.549 +9294,-1.834 +9295,0.079 +9296,-1.408 +9297,-0.824 +9298,1.371 +9299,1.185 +9300,-0.570 +9301,0.026 +9302,-0.723 +9303,-0.671 +9304,0.105 +9305,-0.036 +9306,1.552 +9307,0.025 +9308,1.449 +9309,-0.403 +9310,-0.085 +9311,-1.249 +9312,-1.172 +9313,0.751 +9314,-0.893 +9315,-1.439 +9316,1.640 +9317,-1.710 +9318,1.336 +9319,0.581 +9320,1.033 +9321,-0.140 +9322,-0.427 +9323,-0.753 +9324,0.751 +9325,1.352 +9326,-0.954 +9327,-2.021 +9328,-0.585 +9329,0.564 +9330,1.342 +9331,-0.215 +9332,-1.160 +9333,-0.548 +9334,-1.244 +9335,-0.677 +9336,-1.186 +9337,0.241 +9338,-0.441 +9339,0.718 +9340,0.998 +9341,0.894 +9342,-0.077 +9343,-0.157 +9344,1.839 +9345,1.296 +9346,-0.191 +9347,1.103 +9348,1.487 +9349,-0.544 +9350,-0.805 +9351,1.582 +9352,-1.129 +9353,0.412 +9354,0.021 +9355,0.332 +9356,-0.334 +9357,1.397 +9358,1.595 +9359,-0.861 +9360,-1.969 +9361,-1.059 +9362,-0.194 +9363,0.049 +9364,1.235 +9365,2.319 +9366,0.108 +9367,-0.717 +9368,-1.080 +9369,1.304 +9370,1.248 +9371,-1.914 +9372,0.440 +9373,-0.694 +9374,-0.465 +9375,1.816 +9376,-1.137 +9377,0.063 +9378,-0.345 +9379,-1.733 +9380,-1.452 +9381,-0.048 +9382,-0.722 +9383,-0.183 +9384,-1.733 +9385,-0.228 +9386,3.221 +9387,1.767 +9388,0.083 +9389,0.883 +9390,1.010 +9391,-1.150 +9392,0.617 +9393,-0.766 +9394,-0.146 +9395,-2.478 +9396,0.418 +9397,-0.546 +9398,0.028 +9399,0.699 +9400,0.017 +9401,-1.817 +9402,-1.235 +9403,0.082 +9404,-0.499 +9405,-0.324 +9406,1.979 +9407,2.036 +9408,-0.067 +9409,-0.200 +9410,1.260 +9411,0.183 +9412,-0.342 +9413,-1.999 +9414,1.086 +9415,-1.444 +9416,2.452 +9417,0.997 +9418,-1.361 +9419,1.611 +9420,0.772 +9421,-0.977 +9422,-0.972 +9423,0.607 +9424,-0.463 +9425,-0.277 +9426,1.508 +9427,1.215 +9428,-1.241 +9429,-0.186 +9430,-0.372 +9431,0.807 +9432,0.800 +9433,0.332 +9434,0.537 +9435,-0.590 +9436,0.747 +9437,-0.557 +9438,-1.668 +9439,0.025 +9440,1.380 +9441,1.110 +9442,-0.151 +9443,-0.499 +9444,-2.410 +9445,1.073 +9446,-1.544 +9447,1.463 +9448,1.491 +9449,-1.515 +9450,-0.057 +9451,-1.207 +9452,1.017 +9453,0.393 +9454,0.675 +9455,-0.826 +9456,-0.102 +9457,-0.362 +9458,-0.879 +9459,0.472 +9460,0.692 +9461,0.356 +9462,0.254 +9463,-1.292 +9464,1.155 +9465,1.622 +9466,-0.255 +9467,-0.618 +9468,-0.226 +9469,1.404 +9470,1.592 +9471,0.597 +9472,0.198 +9473,-0.102 +9474,1.003 +9475,-0.413 +9476,-0.087 +9477,0.970 +9478,-0.900 +9479,-1.175 +9480,0.284 +9481,-0.989 +9482,-1.876 +9483,-0.152 +9484,-1.270 +9485,-0.074 +9486,2.425 +9487,0.210 +9488,-0.754 +9489,-0.254 +9490,-1.162 +9491,0.053 +9492,-0.634 +9493,0.180 +9494,-2.281 +9495,0.392 +9496,0.323 +9497,-0.568 +9498,0.394 +9499,0.592 +9500,-1.661 +9501,-0.459 +9502,3.140 +9503,-2.239 +9504,0.287 +9505,-0.623 +9506,-0.457 +9507,-0.654 +9508,1.619 +9509,-1.245 +9510,1.588 +9511,0.065 +9512,-1.608 +9513,0.780 +9514,-2.194 +9515,1.754 +9516,0.590 +9517,0.712 +9518,1.980 +9519,-0.805 +9520,-0.019 +9521,0.156 +9522,-1.391 +9523,1.504 +9524,-0.165 +9525,0.138 +9526,-0.987 +9527,-0.766 +9528,0.053 +9529,0.627 +9530,0.701 +9531,0.431 +9532,1.509 +9533,-2.020 +9534,-0.231 +9535,0.663 +9536,-0.477 +9537,1.282 +9538,0.947 +9539,0.977 +9540,-0.364 +9541,-2.381 +9542,1.090 +9543,-0.486 +9544,0.584 +9545,1.158 +9546,-0.520 +9547,0.999 +9548,-0.855 +9549,-0.846 +9550,0.404 +9551,-0.987 +9552,-1.678 +9553,0.314 +9554,0.152 +9555,0.262 +9556,1.516 +9557,0.501 +9558,-0.551 +9559,-1.267 +9560,-0.566 +9561,0.952 +9562,-0.659 +9563,1.281 +9564,0.251 +9565,-0.216 +9566,1.792 +9567,-0.091 +9568,0.730 +9569,0.242 +9570,0.374 +9571,0.028 +9572,1.581 +9573,-1.926 +9574,0.539 +9575,0.014 +9576,1.416 +9577,0.476 +9578,1.609 +9579,-0.369 +9580,0.816 +9581,0.798 +9582,1.409 +9583,-0.683 +9584,-0.764 +9585,-0.081 +9586,0.151 +9587,1.727 +9588,0.423 +9589,-0.464 +9590,-0.168 +9591,1.369 +9592,-1.330 +9593,1.604 +9594,0.505 +9595,0.330 +9596,0.533 +9597,-0.151 +9598,0.002 +9599,-0.638 +9600,1.411 +9601,-0.866 +9602,1.389 +9603,-1.723 +9604,-1.040 +9605,-0.134 +9606,-1.193 +9607,0.715 +9608,-0.257 +9609,-2.507 +9610,-0.654 +9611,1.151 +9612,0.512 +9613,-1.122 +9614,0.469 +9615,1.712 +9616,-2.168 +9617,0.254 +9618,1.257 +9619,-1.062 +9620,-1.656 +9621,-1.228 +9622,0.700 +9623,-0.193 +9624,-1.238 +9625,1.005 +9626,-0.427 +9627,0.452 +9628,0.841 +9629,0.770 +9630,-0.747 +9631,-0.217 +9632,0.161 +9633,-0.997 +9634,0.560 +9635,-2.466 +9636,-0.929 +9637,0.572 +9638,1.336 +9639,1.005 +9640,-0.717 +9641,0.128 +9642,-1.472 +9643,0.961 +9644,1.143 +9645,0.613 +9646,1.436 +9647,1.017 +9648,-1.537 +9649,0.025 +9650,-0.084 +9651,-0.581 +9652,0.757 +9653,-0.736 +9654,0.053 +9655,-0.804 +9656,1.436 +9657,0.418 +9658,-0.741 +9659,-0.852 +9660,-1.703 +9661,0.701 +9662,0.317 +9663,-0.904 +9664,-0.293 +9665,2.382 +9666,0.422 +9667,0.086 +9668,-0.011 +9669,-0.889 +9670,0.433 +9671,-0.586 +9672,-0.712 +9673,-0.368 +9674,0.540 +9675,0.768 +9676,-0.191 +9677,0.261 +9678,-0.193 +9679,-0.811 +9680,1.580 +9681,0.109 +9682,1.035 +9683,1.350 +9684,0.648 +9685,0.637 +9686,0.326 +9687,0.242 +9688,-0.438 +9689,0.801 +9690,0.492 +9691,-0.570 +9692,0.410 +9693,-0.291 +9694,1.531 +9695,1.179 +9696,-0.521 +9697,-0.573 +9698,1.487 +9699,-0.625 +9700,0.277 +9701,0.470 +9702,-0.534 +9703,0.391 +9704,3.241 +9705,0.240 +9706,-2.809 +9707,-0.860 +9708,0.830 +9709,-1.681 +9710,-0.304 +9711,-0.728 +9712,-1.587 +9713,0.737 +9714,0.468 +9715,-1.512 +9716,-0.608 +9717,-0.554 +9718,-0.203 +9719,-0.074 +9720,-2.221 +9721,0.893 +9722,-2.001 +9723,0.461 +9724,1.675 +9725,-0.671 +9726,1.445 +9727,0.096 +9728,-0.192 +9729,1.143 +9730,-0.298 +9731,0.233 +9732,-0.754 +9733,0.251 +9734,-0.241 +9735,1.837 +9736,-1.133 +9737,1.324 +9738,0.123 +9739,0.689 +9740,1.215 +9741,-0.842 +9742,0.791 +9743,-0.176 +9744,0.757 +9745,-1.191 +9746,0.590 +9747,0.325 +9748,1.586 +9749,0.235 +9750,-0.977 +9751,2.119 +9752,0.396 +9753,-0.147 +9754,0.884 +9755,1.152 +9756,-1.100 +9757,-0.135 +9758,1.747 +9759,0.895 +9760,0.350 +9761,2.218 +9762,0.255 +9763,0.499 +9764,-0.622 +9765,0.407 +9766,-0.215 +9767,-0.951 +9768,0.314 +9769,-0.911 +9770,-0.239 +9771,1.957 +9772,-0.519 +9773,0.829 +9774,-0.243 +9775,0.856 +9776,0.765 +9777,-0.588 +9778,0.153 +9779,1.525 +9780,0.382 +9781,-0.698 +9782,0.693 +9783,-0.075 +9784,1.458 +9785,-0.554 +9786,1.024 +9787,0.669 +9788,-1.582 +9789,-0.795 +9790,0.067 +9791,0.629 +9792,-1.065 +9793,1.055 +9794,-1.512 +9795,-0.466 +9796,-2.179 +9797,-0.453 +9798,0.580 +9799,0.302 +9800,0.388 +9801,1.210 +9802,0.033 +9803,0.214 +9804,1.739 +9805,0.092 +9806,-0.372 +9807,0.777 +9808,-0.933 +9809,-0.693 +9810,1.057 +9811,-0.755 +9812,-0.704 +9813,0.276 +9814,-1.474 +9815,0.598 +9816,-2.212 +9817,0.649 +9818,-1.592 +9819,-0.280 +9820,-1.940 +9821,0.539 +9822,0.372 +9823,0.497 +9824,-2.037 +9825,1.698 +9826,-0.730 +9827,-2.455 +9828,-1.151 +9829,-0.279 +9830,0.302 +9831,-0.284 +9832,0.789 +9833,-1.556 +9834,-0.140 +9835,-0.476 +9836,-1.729 +9837,-0.199 +9838,-0.177 +9839,2.027 +9840,-0.198 +9841,-1.699 +9842,0.092 +9843,0.469 +9844,0.334 +9845,0.280 +9846,-1.897 +9847,1.421 +9848,-0.140 +9849,0.343 +9850,-0.583 +9851,-1.031 +9852,0.711 +9853,-2.020 +9854,0.765 +9855,0.812 +9856,0.309 +9857,-0.252 +9858,-0.242 +9859,-0.373 +9860,-0.680 +9861,-0.646 +9862,-0.761 +9863,-0.247 +9864,-1.083 +9865,0.272 +9866,0.123 +9867,-1.226 +9868,-1.248 +9869,-0.559 +9870,0.759 +9871,-2.898 +9872,0.950 +9873,0.601 +9874,-1.230 +9875,0.516 +9876,2.832 +9877,-2.051 +9878,-1.119 +9879,0.173 +9880,-2.437 +9881,1.551 +9882,-1.914 +9883,1.390 +9884,0.366 +9885,-0.585 +9886,1.693 +9887,-0.867 +9888,0.749 +9889,-1.310 +9890,0.476 +9891,0.230 +9892,0.367 +9893,-0.336 +9894,-0.522 +9895,-0.626 +9896,0.919 +9897,-0.841 +9898,-1.056 +9899,0.155 +9900,0.538 +9901,0.885 +9902,-0.413 +9903,-0.859 +9904,0.082 +9905,1.581 +9906,-3.005 +9907,-2.201 +9908,0.280 +9909,-1.021 +9910,0.381 +9911,-1.666 +9912,-0.530 +9913,-1.167 +9914,-0.008 +9915,0.653 +9916,-2.666 +9917,0.003 +9918,-1.665 +9919,1.025 +9920,-1.942 +9921,-0.581 +9922,-0.271 +9923,0.647 +9924,-0.388 +9925,-0.451 +9926,-0.664 +9927,-0.177 +9928,-1.088 +9929,1.943 +9930,0.557 +9931,-0.706 +9932,-1.749 +9933,-0.498 +9934,-1.367 +9935,1.703 +9936,0.288 +9937,-0.039 +9938,0.765 +9939,0.288 +9940,-0.243 +9941,0.632 +9942,0.132 +9943,0.144 +9944,1.125 +9945,0.860 +9946,1.248 +9947,-0.385 +9948,-1.409 +9949,-0.346 +9950,1.716 +9951,1.275 +9952,-0.705 +9953,-0.728 +9954,-1.335 +9955,0.628 +9956,-0.455 +9957,1.274 +9958,1.329 +9959,-1.395 +9960,-0.502 +9961,0.882 +9962,0.405 +9963,-1.378 +9964,1.725 +9965,1.164 +9966,0.970 +9967,0.586 +9968,0.414 +9969,1.513 +9970,0.351 +9971,0.995 +9972,-0.995 +9973,-0.955 +9974,-1.290 +9975,0.155 +9976,0.264 +9977,1.053 +9978,0.401 +9979,0.609 +9980,1.180 +9981,0.874 +9982,-2.060 +9983,-0.852 +9984,-0.924 +9985,0.027 +9986,-0.348 +9987,0.349 +9988,0.883 +9989,0.693 +9990,0.373 +9991,0.344 +9992,0.030 +9993,-1.565 +9994,0.308 +9995,-0.705 +9996,-0.702 +9997,1.466 +9998,0.261 +9999,1.300 +10000,-0.029 +10001,0.935 +10002,0.896 +10003,2.167 +10004,1.030 +10005,-0.013 +10006,-0.593 +10007,-0.361 +10008,0.998 +10009,-0.302 +10010,0.615 +10011,-0.065 +10012,-0.692 +10013,-1.154 +10014,-1.093 +10015,-0.160 +10016,0.749 +10017,-0.360 +10018,0.365 +10019,0.364 +10020,-0.395 +10021,-1.307 +10022,0.096 +10023,2.137 +10024,-1.340 +10025,0.486 +10026,0.442 +10027,1.149 +10028,0.838 +10029,-0.788 +10030,-0.343 +10031,-0.047 +10032,-1.171 +10033,3.900 +10034,0.498 +10035,2.067 +10036,-0.208 +10037,0.800 +10038,0.103 +10039,0.305 +10040,1.001 +10041,1.069 +10042,0.039 +10043,-1.084 +10044,1.071 +10045,1.371 +10046,0.500 +10047,1.419 +10048,-1.564 +10049,1.078 +10050,-0.626 +10051,-0.117 +10052,-1.292 +10053,0.668 +10054,1.282 +10055,1.171 +10056,1.122 +10057,-0.096 +10058,-1.010 +10059,-1.513 +10060,-0.066 +10061,-0.062 +10062,0.016 +10063,-2.126 +10064,-0.154 +10065,-1.052 +10066,0.886 +10067,0.685 +10068,0.511 +10069,1.396 +10070,1.154 +10071,-0.067 +10072,-1.368 +10073,0.398 +10074,1.874 +10075,0.183 +10076,-1.134 +10077,-1.004 +10078,0.459 +10079,-0.767 +10080,-0.245 +10081,-0.899 +10082,0.715 +10083,0.788 +10084,-0.269 +10085,0.094 +10086,1.352 +10087,0.235 +10088,1.072 +10089,-0.402 +10090,0.298 +10091,0.934 +10092,-0.343 +10093,0.924 +10094,-0.775 +10095,-2.221 +10096,-0.423 +10097,-0.305 +10098,1.540 +10099,1.329 +10100,-1.815 +10101,0.049 +10102,1.423 +10103,-2.291 +10104,-1.928 +10105,0.958 +10106,-1.010 +10107,-0.813 +10108,-0.257 +10109,0.144 +10110,-0.952 +10111,-0.833 +10112,-1.455 +10113,-1.125 +10114,-1.663 +10115,0.611 +10116,-0.781 +10117,0.813 +10118,0.874 +10119,1.440 +10120,-1.331 +10121,-0.798 +10122,-0.334 +10123,-0.312 +10124,-0.033 +10125,-1.248 +10126,-0.293 +10127,0.179 +10128,1.345 +10129,0.641 +10130,-1.463 +10131,-1.196 +10132,0.166 +10133,-0.298 +10134,-0.411 +10135,-1.665 +10136,1.088 +10137,-0.060 +10138,0.612 +10139,0.302 +10140,-1.564 +10141,-0.362 +10142,-0.210 +10143,-0.409 +10144,-0.199 +10145,0.272 +10146,1.282 +10147,0.931 +10148,-0.507 +10149,-1.794 +10150,-0.527 +10151,0.362 +10152,1.253 +10153,-0.676 +10154,0.533 +10155,0.420 +10156,0.141 +10157,0.192 +10158,2.018 +10159,-0.205 +10160,0.845 +10161,1.206 +10162,0.102 +10163,0.064 +10164,-0.050 +10165,1.195 +10166,-0.353 +10167,0.329 +10168,0.347 +10169,-1.023 +10170,0.655 +10171,-0.593 +10172,0.426 +10173,0.407 +10174,-0.514 +10175,-0.051 +10176,-0.448 +10177,1.215 +10178,-0.080 +10179,-1.515 +10180,-0.560 +10181,-0.440 +10182,0.975 +10183,0.886 +10184,0.036 +10185,0.910 +10186,0.611 +10187,0.339 +10188,0.262 +10189,0.099 +10190,0.446 +10191,-2.140 +10192,-0.978 +10193,0.179 +10194,1.126 +10195,2.348 +10196,0.160 +10197,-1.172 +10198,1.149 +10199,-1.070 +10200,-1.128 +10201,1.313 +10202,1.017 +10203,0.122 +10204,0.477 +10205,0.274 +10206,-1.074 +10207,-0.327 +10208,-0.356 +10209,-1.617 +10210,-0.845 +10211,0.523 +10212,0.188 +10213,-1.519 +10214,0.749 +10215,-0.519 +10216,1.329 +10217,-0.959 +10218,-0.112 +10219,1.400 +10220,0.150 +10221,-0.489 +10222,-0.879 +10223,-1.549 +10224,1.062 +10225,-0.386 +10226,-1.514 +10227,0.174 +10228,0.533 +10229,0.548 +10230,-0.927 +10231,-0.718 +10232,0.337 +10233,0.351 +10234,0.038 +10235,0.804 +10236,0.761 +10237,0.827 +10238,-1.532 +10239,-1.847 +10240,0.113 +10241,1.137 +10242,-1.482 +10243,-0.848 +10244,-0.581 +10245,0.198 +10246,-1.304 +10247,-0.325 +10248,1.599 +10249,-0.069 +10250,0.548 +10251,0.855 +10252,-0.605 +10253,-0.088 +10254,1.134 +10255,0.315 +10256,0.026 +10257,0.406 +10258,0.681 +10259,0.643 +10260,0.144 +10261,-1.105 +10262,0.544 +10263,0.587 +10264,1.007 +10265,1.140 +10266,0.407 +10267,-0.632 +10268,-0.566 +10269,1.066 +10270,-1.731 +10271,0.603 +10272,-1.370 +10273,-0.545 +10274,-0.627 +10275,0.128 +10276,0.861 +10277,0.604 +10278,-1.386 +10279,0.821 +10280,0.171 +10281,1.374 +10282,0.651 +10283,-0.631 +10284,-1.488 +10285,-0.228 +10286,0.269 +10287,0.388 +10288,1.278 +10289,1.566 +10290,0.632 +10291,0.390 +10292,1.265 +10293,1.294 +10294,0.270 +10295,-0.428 +10296,0.436 +10297,-0.734 +10298,0.648 +10299,-2.128 +10300,0.037 +10301,1.256 +10302,0.840 +10303,0.244 +10304,-1.823 +10305,0.357 +10306,-0.719 +10307,-2.875 +10308,-1.892 +10309,-0.359 +10310,0.920 +10311,-1.267 +10312,0.274 +10313,1.637 +10314,0.725 +10315,-0.290 +10316,0.184 +10317,-0.433 +10318,1.253 +10319,0.824 +10320,1.622 +10321,-0.978 +10322,0.373 +10323,-0.989 +10324,0.253 +10325,-2.187 +10326,0.615 +10327,1.221 +10328,2.179 +10329,-0.258 +10330,0.061 +10331,-0.072 +10332,0.850 +10333,-0.517 +10334,1.628 +10335,-1.250 +10336,-0.211 +10337,1.231 +10338,-0.284 +10339,0.904 +10340,-0.674 +10341,0.932 +10342,-0.316 +10343,0.117 +10344,-1.044 +10345,0.335 +10346,0.406 +10347,1.022 +10348,-0.194 +10349,0.812 +10350,2.226 +10351,0.619 +10352,-0.500 +10353,0.665 +10354,1.252 +10355,1.273 +10356,-0.629 +10357,0.246 +10358,0.598 +10359,0.263 +10360,0.492 +10361,0.614 +10362,1.479 +10363,-0.352 +10364,-1.510 +10365,1.483 +10366,-0.367 +10367,0.488 +10368,-1.078 +10369,2.047 +10370,-0.599 +10371,-0.214 +10372,0.002 +10373,1.306 +10374,-0.007 +10375,1.126 +10376,-0.075 +10377,0.365 +10378,0.384 +10379,-1.476 +10380,0.495 +10381,-1.038 +10382,-0.735 +10383,-0.114 +10384,-1.193 +10385,0.727 +10386,-1.397 +10387,-1.486 +10388,1.110 +10389,1.131 +10390,-0.599 +10391,-0.014 +10392,1.801 +10393,0.301 +10394,0.085 +10395,-0.218 +10396,-0.846 +10397,0.270 +10398,0.358 +10399,-0.009 +10400,1.223 +10401,-0.492 +10402,0.572 +10403,0.217 +10404,1.468 +10405,-0.464 +10406,-1.571 +10407,-0.138 +10408,-0.914 +10409,-1.061 +10410,-1.554 +10411,0.460 +10412,-0.350 +10413,0.940 +10414,-0.405 +10415,0.597 +10416,-1.686 +10417,0.201 +10418,0.381 +10419,-0.050 +10420,-0.991 +10421,0.464 +10422,1.578 +10423,0.544 +10424,-0.018 +10425,-1.722 +10426,1.048 +10427,0.543 +10428,-0.570 +10429,0.704 +10430,0.568 +10431,0.599 +10432,0.563 +10433,-1.769 +10434,-0.136 +10435,-0.663 +10436,-0.033 +10437,0.814 +10438,-0.699 +10439,-0.574 +10440,0.007 +10441,-0.010 +10442,-0.819 +10443,0.772 +10444,-1.186 +10445,1.419 +10446,-0.095 +10447,0.988 +10448,-1.301 +10449,-0.784 +10450,0.619 +10451,-1.056 +10452,-0.872 +10453,-0.187 +10454,1.588 +10455,-0.214 +10456,-0.246 +10457,-0.759 +10458,-1.337 +10459,-0.798 +10460,0.809 +10461,-0.696 +10462,-0.804 +10463,-0.544 +10464,0.911 +10465,1.976 +10466,1.085 +10467,1.196 +10468,-1.425 +10469,-1.151 +10470,-1.291 +10471,-0.518 +10472,-1.418 +10473,-1.622 +10474,-0.341 +10475,1.054 +10476,-0.138 +10477,-0.986 +10478,-1.748 +10479,-0.536 +10480,-0.321 +10481,0.805 +10482,-2.445 +10483,-1.460 +10484,-0.304 +10485,0.091 +10486,-0.369 +10487,-1.480 +10488,-0.426 +10489,-1.118 +10490,-0.659 +10491,0.374 +10492,-0.043 +10493,0.582 +10494,0.879 +10495,-0.268 +10496,-0.712 +10497,0.099 +10498,0.137 +10499,0.997 +10500,1.776 +10501,0.038 +10502,1.291 +10503,-1.243 +10504,-0.404 +10505,0.070 +10506,3.273 +10507,-1.429 +10508,-1.659 +10509,0.577 +10510,-1.389 +10511,0.191 +10512,0.235 +10513,0.234 +10514,0.371 +10515,-0.438 +10516,1.117 +10517,-1.042 +10518,-0.009 +10519,-0.487 +10520,0.135 +10521,-1.189 +10522,-1.714 +10523,1.441 +10524,0.981 +10525,0.680 +10526,-0.436 +10527,0.170 +10528,-0.452 +10529,-0.395 +10530,-1.105 +10531,-1.570 +10532,0.578 +10533,0.397 +10534,-0.612 +10535,-0.521 +10536,0.813 +10537,0.306 +10538,-0.420 +10539,-0.023 +10540,1.216 +10541,0.274 +10542,0.121 +10543,-0.643 +10544,0.226 +10545,0.263 +10546,0.514 +10547,-2.007 +10548,0.615 +10549,-0.582 +10550,-0.705 +10551,-1.079 +10552,-2.153 +10553,-0.750 +10554,-0.886 +10555,0.616 +10556,1.435 +10557,-0.269 +10558,-1.030 +10559,-0.259 +10560,0.653 +10561,-0.897 +10562,-0.799 +10563,-0.779 +10564,1.072 +10565,-1.193 +10566,-1.755 +10567,-0.907 +10568,-0.427 +10569,0.613 +10570,-0.512 +10571,-0.040 +10572,0.897 +10573,-1.105 +10574,-1.378 +10575,-1.107 +10576,0.228 +10577,-0.100 +10578,-1.195 +10579,1.923 +10580,1.455 +10581,0.291 +10582,0.241 +10583,-0.327 +10584,0.765 +10585,0.718 +10586,0.728 +10587,0.249 +10588,-1.750 +10589,-0.430 +10590,0.429 +10591,0.360 +10592,-0.142 +10593,0.812 +10594,2.055 +10595,-2.096 +10596,1.303 +10597,0.738 +10598,-1.098 +10599,-0.875 +10600,0.958 +10601,0.992 +10602,1.086 +10603,1.576 +10604,-2.544 +10605,2.353 +10606,0.719 +10607,-0.034 +10608,-0.546 +10609,-0.212 +10610,0.029 +10611,-0.342 +10612,0.519 +10613,1.388 +10614,-2.178 +10615,0.201 +10616,-0.071 +10617,-1.495 +10618,0.379 +10619,0.716 +10620,1.575 +10621,-0.430 +10622,-0.496 +10623,2.120 +10624,-0.633 +10625,1.446 +10626,-0.688 +10627,-1.075 +10628,0.566 +10629,-1.737 +10630,1.332 +10631,-0.394 +10632,1.065 +10633,-0.528 +10634,1.885 +10635,-0.671 +10636,0.071 +10637,0.228 +10638,-0.669 +10639,-0.439 +10640,0.903 +10641,-0.923 +10642,1.109 +10643,2.886 +10644,0.983 +10645,0.878 +10646,2.128 +10647,-1.410 +10648,1.013 +10649,-1.038 +10650,-1.091 +10651,-0.039 +10652,0.137 +10653,1.148 +10654,0.400 +10655,0.816 +10656,0.574 +10657,-0.313 +10658,0.863 +10659,-0.738 +10660,0.514 +10661,-0.855 +10662,1.415 +10663,-0.896 +10664,0.292 +10665,0.164 +10666,0.719 +10667,0.172 +10668,0.467 +10669,0.218 +10670,0.086 +10671,1.386 +10672,1.765 +10673,-0.800 +10674,-0.572 +10675,2.846 +10676,-1.182 +10677,0.864 +10678,0.684 +10679,1.477 +10680,2.541 +10681,0.769 +10682,0.280 +10683,-0.491 +10684,-0.605 +10685,-2.569 +10686,-1.870 +10687,-0.079 +10688,-0.025 +10689,-0.959 +10690,0.742 +10691,-0.574 +10692,0.369 +10693,0.090 +10694,-0.080 +10695,1.092 +10696,-0.258 +10697,0.878 +10698,-0.625 +10699,0.048 +10700,1.233 +10701,-1.018 +10702,1.363 +10703,0.965 +10704,-0.188 +10705,-1.206 +10706,1.683 +10707,0.544 +10708,-0.360 +10709,-0.320 +10710,-0.289 +10711,0.389 +10712,-0.377 +10713,0.388 +10714,0.838 +10715,0.991 +10716,-0.364 +10717,-0.181 +10718,1.505 +10719,-0.779 +10720,0.607 +10721,1.164 +10722,-1.386 +10723,0.803 +10724,-0.152 +10725,-1.897 +10726,-0.987 +10727,1.231 +10728,-0.025 +10729,-0.990 +10730,0.890 +10731,2.473 +10732,-0.002 +10733,0.846 +10734,-1.212 +10735,1.284 +10736,-1.641 +10737,-0.602 +10738,1.200 +10739,-0.997 +10740,-2.179 +10741,-0.469 +10742,0.662 +10743,-0.126 +10744,-0.532 +10745,-1.666 +10746,1.344 +10747,0.952 +10748,0.689 +10749,-1.588 +10750,-0.084 +10751,-0.372 +10752,-1.674 +10753,0.437 +10754,-0.322 +10755,0.822 +10756,2.178 +10757,0.396 +10758,-0.185 +10759,-0.299 +10760,-0.607 +10761,1.643 +10762,-0.011 +10763,1.657 +10764,-0.085 +10765,1.173 +10766,1.575 +10767,-0.990 +10768,-0.577 +10769,-0.243 +10770,-0.669 +10771,0.719 +10772,0.375 +10773,0.919 +10774,-0.028 +10775,-0.397 +10776,-0.587 +10777,-1.384 +10778,-0.482 +10779,0.552 +10780,-2.203 +10781,-1.861 +10782,0.925 +10783,0.591 +10784,0.722 +10785,0.438 +10786,-0.061 +10787,-0.837 +10788,0.099 +10789,-0.330 +10790,-1.144 +10791,0.224 +10792,1.528 +10793,0.008 +10794,0.369 +10795,-0.529 +10796,-2.364 +10797,-1.633 +10798,0.632 +10799,-0.510 +10800,0.405 +10801,-0.574 +10802,0.460 +10803,-0.604 +10804,0.528 +10805,-0.072 +10806,-0.329 +10807,-0.883 +10808,0.930 +10809,-0.337 +10810,-0.075 +10811,-0.214 +10812,0.145 +10813,1.014 +10814,-0.017 +10815,-0.162 +10816,0.283 +10817,-0.908 +10818,-0.375 +10819,-1.469 +10820,-1.440 +10821,-0.505 +10822,-0.690 +10823,-0.394 +10824,-0.863 +10825,-0.806 +10826,-1.559 +10827,0.141 +10828,0.884 +10829,-1.193 +10830,-1.002 +10831,0.628 +10832,2.175 +10833,-0.152 +10834,1.854 +10835,0.951 +10836,-0.360 +10837,-0.521 +10838,-0.225 +10839,-0.158 +10840,0.107 +10841,-1.537 +10842,0.547 +10843,-0.742 +10844,-0.402 +10845,1.261 +10846,0.068 +10847,0.346 +10848,-1.228 +10849,-1.929 +10850,-0.459 +10851,-0.307 +10852,-1.744 +10853,-0.091 +10854,1.156 +10855,-0.587 +10856,-0.493 +10857,-0.933 +10858,1.124 +10859,0.117 +10860,0.813 +10861,0.725 +10862,-0.752 +10863,-1.417 +10864,-0.410 +10865,-0.559 +10866,0.756 +10867,-1.127 +10868,0.486 +10869,0.541 +10870,-0.312 +10871,0.065 +10872,-0.726 +10873,0.993 +10874,0.781 +10875,0.430 +10876,-0.426 +10877,0.138 +10878,1.172 +10879,-0.378 +10880,-0.035 +10881,1.530 +10882,1.313 +10883,-0.613 +10884,-2.146 +10885,0.420 +10886,0.893 +10887,0.123 +10888,0.684 +10889,0.251 +10890,-1.453 +10891,1.594 +10892,0.633 +10893,0.618 +10894,-0.832 +10895,-2.081 +10896,-0.426 +10897,1.919 +10898,0.487 +10899,-1.666 +10900,-0.466 +10901,1.714 +10902,-1.240 +10903,-1.434 +10904,-0.086 +10905,0.063 +10906,0.356 +10907,0.287 +10908,-0.038 +10909,-1.052 +10910,-1.390 +10911,0.431 +10912,-0.794 +10913,0.420 +10914,1.089 +10915,1.767 +10916,0.426 +10917,0.181 +10918,0.750 +10919,-1.411 +10920,-0.558 +10921,-0.140 +10922,-0.689 +10923,-0.192 +10924,-0.834 +10925,-0.653 +10926,1.328 +10927,-0.143 +10928,1.056 +10929,0.495 +10930,-1.248 +10931,0.943 +10932,0.817 +10933,-0.475 +10934,1.258 +10935,0.066 +10936,-0.323 +10937,0.632 +10938,1.381 +10939,1.266 +10940,-0.069 +10941,1.922 +10942,-0.483 +10943,-0.786 +10944,-0.098 +10945,-1.449 +10946,0.790 +10947,0.251 +10948,-0.951 +10949,1.257 +10950,0.918 +10951,-0.252 +10952,-0.898 +10953,-0.130 +10954,-1.563 +10955,0.447 +10956,0.082 +10957,0.572 +10958,0.393 +10959,1.412 +10960,-1.450 +10961,-0.793 +10962,-0.870 +10963,0.779 +10964,0.952 +10965,0.420 +10966,-0.401 +10967,0.198 +10968,-2.056 +10969,1.152 +10970,1.095 +10971,0.601 +10972,0.281 +10973,-1.630 +10974,-1.012 +10975,-1.200 +10976,-1.142 +10977,0.401 +10978,-0.246 +10979,0.800 +10980,-0.343 +10981,0.644 +10982,-0.376 +10983,-0.834 +10984,-0.351 +10985,-1.556 +10986,0.206 +10987,-1.723 +10988,0.109 +10989,-0.499 +10990,1.215 +10991,-0.600 +10992,-0.026 +10993,1.227 +10994,1.430 +10995,-0.759 +10996,0.235 +10997,-0.346 +10998,-0.608 +10999,1.033 +11000,0.252 +11001,-0.352 +11002,0.439 +11003,0.508 +11004,-0.073 +11005,2.924 +11006,-0.771 +11007,-1.584 +11008,1.664 +11009,2.413 +11010,-1.427 +11011,-1.532 +11012,0.494 +11013,-0.859 +11014,0.900 +11015,-0.611 +11016,1.246 +11017,-0.866 +11018,0.332 +11019,-0.136 +11020,-1.736 +11021,0.349 +11022,-0.484 +11023,2.004 +11024,-0.978 +11025,-0.687 +11026,-0.273 +11027,-2.393 +11028,0.171 +11029,-0.593 +11030,-0.799 +11031,-0.048 +11032,1.280 +11033,1.131 +11034,-0.576 +11035,-0.597 +11036,-0.708 +11037,-0.623 +11038,-0.466 +11039,2.065 +11040,-0.369 +11041,1.558 +11042,0.135 +11043,-0.395 +11044,-0.150 +11045,1.435 +11046,-1.459 +11047,0.018 +11048,0.440 +11049,0.762 +11050,1.103 +11051,-1.574 +11052,1.254 +11053,-0.075 +11054,-0.908 +11055,-0.705 +11056,0.115 +11057,-0.553 +11058,0.346 +11059,0.183 +11060,-2.324 +11061,0.146 +11062,-0.446 +11063,-1.262 +11064,0.058 +11065,0.094 +11066,0.136 +11067,0.225 +11068,0.028 +11069,0.559 +11070,-1.747 +11071,-0.744 +11072,-2.093 +11073,0.217 +11074,0.102 +11075,-0.726 +11076,-0.284 +11077,-0.715 +11078,0.289 +11079,0.531 +11080,-0.918 +11081,-2.160 +11082,2.122 +11083,0.824 +11084,0.676 +11085,0.128 +11086,-0.912 +11087,0.071 +11088,0.219 +11089,1.697 +11090,-0.631 +11091,1.423 +11092,-0.594 +11093,-0.990 +11094,-0.025 +11095,0.003 +11096,-1.171 +11097,-0.766 +11098,0.590 +11099,-1.263 +11100,-0.086 +11101,0.044 +11102,0.667 +11103,-0.110 +11104,0.344 +11105,-0.246 +11106,0.162 +11107,0.698 +11108,-0.410 +11109,1.189 +11110,-0.338 +11111,1.170 +11112,-0.839 +11113,0.513 +11114,-0.445 +11115,1.784 +11116,1.681 +11117,-0.282 +11118,-2.943 +11119,-0.538 +11120,0.256 +11121,-2.771 +11122,0.287 +11123,-0.363 +11124,-0.647 +11125,0.361 +11126,-0.938 +11127,0.934 +11128,-0.874 +11129,0.429 +11130,-0.666 +11131,0.813 +11132,-0.892 +11133,0.131 +11134,-0.140 +11135,-1.241 +11136,-1.783 +11137,-1.784 +11138,-1.096 +11139,0.432 +11140,0.126 +11141,0.296 +11142,-0.521 +11143,-0.587 +11144,0.273 +11145,1.392 +11146,-0.571 +11147,-0.012 +11148,1.362 +11149,0.153 +11150,-1.881 +11151,-2.176 +11152,-0.407 +11153,-0.485 +11154,1.027 +11155,-1.707 +11156,-0.316 +11157,0.631 +11158,0.065 +11159,-0.703 +11160,-0.339 +11161,0.361 +11162,1.498 +11163,0.601 +11164,0.289 +11165,-0.569 +11166,2.310 +11167,1.272 +11168,-0.493 +11169,0.700 +11170,-1.383 +11171,2.755 +11172,-0.514 +11173,0.281 +11174,-0.680 +11175,-0.230 +11176,-0.261 +11177,0.113 +11178,1.127 +11179,0.563 +11180,-0.900 +11181,0.412 +11182,0.276 +11183,-0.512 +11184,0.569 +11185,-1.859 +11186,1.778 +11187,0.671 +11188,-0.599 +11189,-1.333 +11190,-0.226 +11191,-0.351 +11192,-0.296 +11193,0.940 +11194,2.557 +11195,-1.191 +11196,0.074 +11197,-0.564 +11198,0.968 +11199,0.190 +11200,1.245 +11201,-0.894 +11202,0.519 +11203,0.648 +11204,0.621 +11205,-0.544 +11206,0.417 +11207,-2.440 +11208,0.797 +11209,-1.332 +11210,0.629 +11211,-0.602 +11212,1.224 +11213,2.033 +11214,-0.484 +11215,0.007 +11216,-1.189 +11217,1.887 +11218,0.043 +11219,-0.686 +11220,-0.108 +11221,0.742 +11222,0.776 +11223,-0.661 +11224,-0.505 +11225,1.464 +11226,0.560 +11227,-1.821 +11228,0.774 +11229,0.922 +11230,0.497 +11231,2.470 +11232,-1.009 +11233,-0.421 +11234,2.137 +11235,-1.627 +11236,-1.816 +11237,-0.478 +11238,-1.101 +11239,-0.878 +11240,-0.579 +11241,0.267 +11242,2.094 +11243,0.269 +11244,1.039 +11245,0.521 +11246,-0.434 +11247,-0.851 +11248,0.097 +11249,-0.756 +11250,-0.821 +11251,-0.276 +11252,-0.355 +11253,1.263 +11254,-0.275 +11255,1.286 +11256,1.602 +11257,1.755 +11258,-0.027 +11259,0.360 +11260,-0.978 +11261,-0.686 +11262,-1.020 +11263,-1.014 +11264,1.245 +11265,-0.655 +11266,-0.137 +11267,2.173 +11268,0.447 +11269,-0.188 +11270,0.980 +11271,-0.046 +11272,-0.354 +11273,-0.691 +11274,-1.982 +11275,-1.769 +11276,1.136 +11277,1.373 +11278,0.729 +11279,-0.016 +11280,1.515 +11281,-0.051 +11282,1.377 +11283,-0.588 +11284,-1.303 +11285,-2.502 +11286,1.273 +11287,1.566 +11288,1.070 +11289,0.386 +11290,-1.128 +11291,-1.016 +11292,0.076 +11293,-1.268 +11294,-0.483 +11295,3.080 +11296,1.556 +11297,1.386 +11298,0.230 +11299,-0.611 +11300,0.361 +11301,1.125 +11302,-0.412 +11303,0.481 +11304,0.344 +11305,-1.997 +11306,2.363 +11307,-0.872 +11308,-0.936 +11309,-0.960 +11310,0.029 +11311,-1.733 +11312,-0.642 +11313,0.312 +11314,2.871 +11315,0.180 +11316,0.159 +11317,0.060 +11318,-0.153 +11319,-1.489 +11320,0.624 +11321,0.442 +11322,1.581 +11323,-0.474 +11324,0.341 +11325,-0.519 +11326,0.529 +11327,3.129 +11328,-0.042 +11329,-0.987 +11330,1.622 +11331,0.712 +11332,1.005 +11333,-0.056 +11334,-0.330 +11335,-1.712 +11336,-0.011 +11337,0.268 +11338,1.236 +11339,1.451 +11340,1.021 +11341,-0.181 +11342,0.409 +11343,1.265 +11344,0.140 +11345,0.504 +11346,-0.231 +11347,1.071 +11348,-0.113 +11349,-1.530 +11350,1.123 +11351,0.449 +11352,-0.356 +11353,-0.601 +11354,0.933 +11355,0.005 +11356,0.530 +11357,-0.489 +11358,-0.436 +11359,-0.267 +11360,0.599 +11361,0.206 +11362,-1.821 +11363,-0.869 +11364,-0.197 +11365,0.703 +11366,-1.819 +11367,-0.919 +11368,-0.448 +11369,1.106 +11370,0.407 +11371,1.074 +11372,-2.784 +11373,-0.452 +11374,0.979 +11375,0.457 +11376,-0.141 +11377,-0.523 +11378,0.101 +11379,0.166 +11380,0.066 +11381,0.129 +11382,-0.351 +11383,-0.924 +11384,-0.314 +11385,2.146 +11386,1.352 +11387,0.682 +11388,0.195 +11389,0.943 +11390,-0.320 +11391,-0.937 +11392,-0.427 +11393,-1.891 +11394,1.647 +11395,-0.473 +11396,-0.091 +11397,0.196 +11398,1.979 +11399,0.348 +11400,-0.818 +11401,1.803 +11402,1.320 +11403,-0.983 +11404,-0.733 +11405,0.455 +11406,-0.131 +11407,1.299 +11408,-0.085 +11409,-0.585 +11410,-0.279 +11411,-0.037 +11412,-0.368 +11413,-0.710 +11414,-0.589 +11415,-0.685 +11416,0.319 +11417,1.055 +11418,0.536 +11419,-0.870 +11420,1.166 +11421,-1.070 +11422,0.916 +11423,0.037 +11424,-0.908 +11425,-0.465 +11426,2.077 +11427,0.355 +11428,0.199 +11429,0.849 +11430,-0.302 +11431,-0.136 +11432,-0.258 +11433,1.597 +11434,0.417 +11435,-0.108 +11436,-0.959 +11437,-0.066 +11438,0.052 +11439,-1.760 +11440,-0.962 +11441,0.443 +11442,0.452 +11443,-2.217 +11444,-0.904 +11445,-0.337 +11446,1.095 +11447,1.027 +11448,-2.599 +11449,2.213 +11450,-1.230 +11451,-0.851 +11452,1.388 +11453,-0.695 +11454,0.400 +11455,-0.136 +11456,-0.124 +11457,-0.487 +11458,1.148 +11459,-0.827 +11460,-1.223 +11461,-0.888 +11462,-0.410 +11463,-0.714 +11464,-0.802 +11465,-0.093 +11466,-0.066 +11467,-1.446 +11468,-0.118 +11469,-1.548 +11470,-0.443 +11471,-0.890 +11472,0.425 +11473,-0.117 +11474,0.449 +11475,0.097 +11476,0.342 +11477,-1.273 +11478,1.220 +11479,-0.801 +11480,-0.791 +11481,-0.193 +11482,0.315 +11483,-0.352 +11484,-0.354 +11485,0.418 +11486,-1.108 +11487,-0.007 +11488,-0.311 +11489,0.287 +11490,0.600 +11491,0.187 +11492,0.041 +11493,-1.072 +11494,0.172 +11495,0.843 +11496,0.799 +11497,0.356 +11498,1.072 +11499,-0.511 +11500,-0.710 +11501,-1.602 +11502,1.150 +11503,-0.390 +11504,-1.118 +11505,0.006 +11506,0.157 +11507,0.561 +11508,-1.349 +11509,-0.304 +11510,1.053 +11511,0.920 +11512,1.565 +11513,0.382 +11514,0.987 +11515,0.642 +11516,-1.199 +11517,1.066 +11518,-0.645 +11519,0.372 +11520,0.888 +11521,-0.206 +11522,0.381 +11523,-1.514 +11524,-1.200 +11525,1.135 +11526,-0.966 +11527,0.039 +11528,-0.400 +11529,0.541 +11530,-0.327 +11531,-0.278 +11532,-0.760 +11533,1.146 +11534,0.148 +11535,0.439 +11536,-0.030 +11537,-0.731 +11538,-1.284 +11539,0.423 +11540,0.356 +11541,-0.790 +11542,0.152 +11543,-0.288 +11544,-2.288 +11545,-0.935 +11546,-2.134 +11547,2.082 +11548,0.556 +11549,0.370 +11550,1.222 +11551,0.842 +11552,0.323 +11553,-0.042 +11554,0.898 +11555,-0.806 +11556,0.084 +11557,1.505 +11558,0.671 +11559,0.342 +11560,-1.812 +11561,0.684 +11562,0.357 +11563,-0.950 +11564,-0.228 +11565,-0.601 +11566,1.481 +11567,-0.826 +11568,-1.412 +11569,-0.071 +11570,0.884 +11571,-0.657 +11572,0.583 +11573,2.257 +11574,0.359 +11575,0.771 +11576,-0.311 +11577,-0.720 +11578,0.378 +11579,0.106 +11580,1.088 +11581,1.121 +11582,0.053 +11583,1.044 +11584,0.988 +11585,-0.277 +11586,1.117 +11587,1.372 +11588,0.519 +11589,-0.628 +11590,1.571 +11591,1.287 +11592,-0.725 +11593,2.150 +11594,-0.937 +11595,-0.085 +11596,-0.135 +11597,-1.265 +11598,-0.333 +11599,-0.235 +11600,-0.647 +11601,-0.138 +11602,-0.784 +11603,-0.634 +11604,-1.458 +11605,-0.322 +11606,-0.170 +11607,-0.270 +11608,-0.565 +11609,2.109 +11610,1.203 +11611,-0.937 +11612,-0.403 +11613,-0.650 +11614,-0.466 +11615,-0.417 +11616,0.102 +11617,0.768 +11618,-0.254 +11619,-1.521 +11620,1.036 +11621,0.502 +11622,-0.688 +11623,1.553 +11624,1.250 +11625,0.178 +11626,-0.186 +11627,-0.906 +11628,-0.670 +11629,-0.466 +11630,0.231 +11631,1.372 +11632,0.317 +11633,-0.422 +11634,0.571 +11635,-0.505 +11636,-1.765 +11637,0.441 +11638,0.479 +11639,-0.733 +11640,0.037 +11641,-0.417 +11642,1.535 +11643,-0.304 +11644,-0.766 +11645,-1.645 +11646,-1.198 +11647,-0.730 +11648,-0.713 +11649,0.278 +11650,0.586 +11651,-0.760 +11652,1.021 +11653,0.738 +11654,-0.238 +11655,1.042 +11656,2.444 +11657,1.214 +11658,-2.749 +11659,1.176 +11660,-0.546 +11661,0.457 +11662,2.332 +11663,1.356 +11664,0.410 +11665,0.125 +11666,0.068 +11667,-0.005 +11668,1.600 +11669,0.370 +11670,0.904 +11671,0.596 +11672,0.796 +11673,0.918 +11674,-1.142 +11675,1.238 +11676,-2.051 +11677,-1.204 +11678,0.420 +11679,-1.419 +11680,0.415 +11681,0.703 +11682,-1.266 +11683,-2.089 +11684,0.565 +11685,0.391 +11686,-0.582 +11687,-0.702 +11688,-1.794 +11689,-0.949 +11690,2.170 +11691,0.939 +11692,-0.228 +11693,2.296 +11694,0.170 +11695,-1.016 +11696,0.582 +11697,-0.840 +11698,0.871 +11699,0.450 +11700,-0.680 +11701,0.532 +11702,-0.505 +11703,0.325 +11704,-0.580 +11705,0.740 +11706,-1.870 +11707,-0.148 +11708,0.691 +11709,1.643 +11710,-0.239 +11711,1.270 +11712,1.321 +11713,0.075 +11714,-0.595 +11715,-0.154 +11716,-0.125 +11717,1.621 +11718,-0.935 +11719,0.467 +11720,-0.087 +11721,1.312 +11722,-0.773 +11723,0.269 +11724,-0.584 +11725,0.388 +11726,-0.403 +11727,-0.208 +11728,1.343 +11729,0.599 +11730,2.003 +11731,1.019 +11732,-0.990 +11733,0.699 +11734,-1.489 +11735,2.296 +11736,-1.185 +11737,-0.598 +11738,-0.057 +11739,-0.082 +11740,2.790 +11741,0.735 +11742,-0.551 +11743,1.898 +11744,-0.460 +11745,1.586 +11746,0.503 +11747,-1.294 +11748,-0.917 +11749,0.271 +11750,-0.538 +11751,0.318 +11752,-1.126 +11753,-1.421 +11754,-1.124 +11755,-0.391 +11756,-1.710 +11757,-1.444 +11758,0.554 +11759,1.116 +11760,-0.092 +11761,-0.051 +11762,0.565 +11763,0.469 +11764,-0.659 +11765,0.580 +11766,0.055 +11767,-0.230 +11768,0.534 +11769,0.916 +11770,0.230 +11771,0.229 +11772,2.561 +11773,0.558 +11774,-0.060 +11775,-0.280 +11776,-0.375 +11777,0.942 +11778,0.770 +11779,-0.213 +11780,-0.024 +11781,0.443 +11782,-0.289 +11783,-0.167 +11784,-0.409 +11785,1.587 +11786,-0.599 +11787,-0.192 +11788,-1.032 +11789,-1.391 +11790,-1.020 +11791,-0.620 +11792,0.745 +11793,-0.033 +11794,-0.400 +11795,0.051 +11796,-2.022 +11797,-0.375 +11798,-0.261 +11799,0.266 +11800,-2.522 +11801,0.346 +11802,-0.620 +11803,-0.336 +11804,-1.636 +11805,-0.111 +11806,-0.881 +11807,1.438 +11808,-0.728 +11809,-0.644 +11810,0.330 +11811,0.916 +11812,0.007 +11813,-0.457 +11814,-0.720 +11815,-0.715 +11816,0.017 +11817,0.660 +11818,-0.142 +11819,0.238 +11820,-0.892 +11821,0.741 +11822,0.840 +11823,-1.174 +11824,-0.920 +11825,-0.352 +11826,0.337 +11827,-0.251 +11828,0.315 +11829,-0.666 +11830,0.449 +11831,-0.462 +11832,0.842 +11833,0.548 +11834,-1.305 +11835,-0.352 +11836,1.138 +11837,0.997 +11838,0.748 +11839,0.516 +11840,-2.178 +11841,1.635 +11842,-1.783 +11843,-1.537 +11844,0.152 +11845,-0.900 +11846,0.658 +11847,2.198 +11848,-1.690 +11849,-0.083 +11850,-0.172 +11851,-1.085 +11852,-0.079 +11853,0.329 +11854,-0.182 +11855,-0.492 +11856,-0.456 +11857,0.351 +11858,-0.747 +11859,0.451 +11860,-1.825 +11861,0.433 +11862,0.520 +11863,1.462 +11864,0.795 +11865,0.704 +11866,-0.206 +11867,-0.455 +11868,-1.043 +11869,-1.430 +11870,0.729 +11871,-0.171 +11872,-0.669 +11873,0.820 +11874,1.479 +11875,0.490 +11876,0.352 +11877,0.706 +11878,1.648 +11879,0.943 +11880,0.977 +11881,0.125 +11882,0.285 +11883,-1.293 +11884,0.173 +11885,0.849 +11886,1.242 +11887,-0.748 +11888,-0.384 +11889,-1.039 +11890,0.966 +11891,0.015 +11892,0.565 +11893,2.474 +11894,-0.197 +11895,0.624 +11896,-1.077 +11897,-0.075 +11898,-1.149 +11899,-0.980 +11900,2.401 +11901,-2.329 +11902,0.902 +11903,-2.263 +11904,1.110 +11905,0.986 +11906,0.811 +11907,-0.479 +11908,-0.645 +11909,-0.504 +11910,-0.282 +11911,-0.149 +11912,-0.240 +11913,-0.438 +11914,0.241 +11915,-0.614 +11916,-0.709 +11917,-0.092 +11918,0.343 +11919,0.703 +11920,-0.571 +11921,-0.053 +11922,-1.727 +11923,-0.325 +11924,-0.790 +11925,0.182 +11926,-0.095 +11927,0.418 +11928,-0.126 +11929,0.138 +11930,-0.588 +11931,1.541 +11932,0.334 +11933,0.807 +11934,0.235 +11935,-0.612 +11936,0.002 +11937,0.497 +11938,-0.441 +11939,-1.251 +11940,-1.015 +11941,0.762 +11942,0.440 +11943,-2.087 +11944,-1.875 +11945,1.958 +11946,-0.905 +11947,1.103 +11948,-0.355 +11949,-0.832 +11950,0.257 +11951,1.304 +11952,-1.318 +11953,0.285 +11954,-1.145 +11955,0.802 +11956,-1.405 +11957,-1.948 +11958,0.142 +11959,0.395 +11960,-0.355 +11961,-2.216 +11962,-0.173 +11963,-1.090 +11964,-0.145 +11965,-0.570 +11966,1.120 +11967,-1.501 +11968,-0.706 +11969,1.045 +11970,2.166 +11971,0.844 +11972,2.005 +11973,-2.602 +11974,-0.493 +11975,-0.228 +11976,1.158 +11977,1.949 +11978,-0.567 +11979,-0.300 +11980,-0.768 +11981,0.604 +11982,-0.043 +11983,0.546 +11984,2.210 +11985,1.295 +11986,1.923 +11987,-0.114 +11988,-1.070 +11989,-0.411 +11990,-0.744 +11991,0.072 +11992,-0.686 +11993,-0.334 +11994,0.917 +11995,0.945 +11996,-0.235 +11997,1.835 +11998,-0.130 +11999,-1.819 +12000,-1.104 +12001,0.814 +12002,-0.794 +12003,-0.991 +12004,0.626 +12005,-0.110 +12006,0.700 +12007,-1.236 +12008,0.393 +12009,-0.689 +12010,-1.746 +12011,-0.664 +12012,-1.157 +12013,1.102 +12014,-0.992 +12015,-0.553 +12016,0.115 +12017,0.001 +12018,1.394 +12019,0.444 +12020,2.168 +12021,-0.831 +12022,0.521 +12023,1.479 +12024,0.350 +12025,-0.052 +12026,1.258 +12027,-0.270 +12028,-0.871 +12029,1.385 +12030,0.086 +12031,-1.065 +12032,-0.357 +12033,1.143 +12034,-0.057 +12035,0.422 +12036,0.682 +12037,-0.430 +12038,-0.189 +12039,0.517 +12040,0.363 +12041,-1.169 +12042,0.481 +12043,-1.085 +12044,-0.838 +12045,-0.759 +12046,0.207 +12047,0.299 +12048,0.866 +12049,-0.460 +12050,1.047 +12051,0.876 +12052,1.101 +12053,-0.268 +12054,1.238 +12055,-1.231 +12056,-0.772 +12057,0.796 +12058,0.482 +12059,-0.149 +12060,1.190 +12061,1.624 +12062,1.000 +12063,-1.126 +12064,-0.540 +12065,-2.634 +12066,-2.379 +12067,1.451 +12068,-0.800 +12069,-0.102 +12070,-0.535 +12071,-1.762 +12072,1.097 +12073,-1.292 +12074,1.057 +12075,1.033 +12076,0.095 +12077,0.356 +12078,-0.954 +12079,-0.078 +12080,2.737 +12081,-1.489 +12082,0.479 +12083,0.269 +12084,0.301 +12085,1.003 +12086,-0.666 +12087,-0.038 +12088,0.760 +12089,-1.025 +12090,1.813 +12091,1.486 +12092,1.434 +12093,-0.094 +12094,-1.793 +12095,0.605 +12096,-1.535 +12097,-0.010 +12098,0.389 +12099,-0.829 +12100,-0.031 +12101,-0.298 +12102,-0.686 +12103,-0.201 +12104,-0.257 +12105,1.114 +12106,0.659 +12107,0.815 +12108,-1.052 +12109,1.555 +12110,-1.878 +12111,0.455 +12112,-2.105 +12113,0.134 +12114,0.183 +12115,1.699 +12116,-1.009 +12117,0.691 +12118,0.059 +12119,-0.172 +12120,-0.186 +12121,-1.307 +12122,0.323 +12123,-0.448 +12124,1.212 +12125,1.623 +12126,1.451 +12127,-0.583 +12128,-0.501 +12129,-1.552 +12130,-0.294 +12131,-0.320 +12132,1.166 +12133,-2.722 +12134,-0.861 +12135,0.041 +12136,-0.340 +12137,-1.625 +12138,-0.682 +12139,0.464 +12140,0.596 +12141,0.311 +12142,-0.207 +12143,0.324 +12144,1.145 +12145,-1.116 +12146,-0.234 +12147,0.864 +12148,0.698 +12149,0.208 +12150,0.758 +12151,-2.022 +12152,0.756 +12153,-0.119 +12154,-2.173 +12155,1.202 +12156,1.398 +12157,0.608 +12158,1.824 +12159,-1.168 +12160,-0.359 +12161,-0.544 +12162,-0.098 +12163,-0.526 +12164,1.608 +12165,-0.389 +12166,-0.706 +12167,-2.251 +12168,0.198 +12169,-0.006 +12170,1.311 +12171,-0.699 +12172,0.757 +12173,-1.930 +12174,1.408 +12175,1.462 +12176,-0.464 +12177,3.239 +12178,-1.529 +12179,0.505 +12180,-0.353 +12181,-1.052 +12182,1.858 +12183,-0.739 +12184,-0.036 +12185,-0.801 +12186,-0.228 +12187,-1.354 +12188,1.538 +12189,0.228 +12190,0.659 +12191,-0.791 +12192,-1.206 +12193,0.029 +12194,0.165 +12195,0.922 +12196,-0.643 +12197,-0.604 +12198,-2.320 +12199,0.768 +12200,0.342 +12201,-2.443 +12202,-0.015 +12203,-0.172 +12204,-1.402 +12205,1.291 +12206,-0.927 +12207,-0.411 +12208,-0.164 +12209,1.052 +12210,0.082 +12211,-0.526 +12212,0.585 +12213,0.209 +12214,-0.419 +12215,-0.071 +12216,0.767 +12217,1.212 +12218,0.676 +12219,-0.473 +12220,0.221 +12221,0.268 +12222,-2.542 +12223,1.218 +12224,-2.005 +12225,0.739 +12226,1.415 +12227,-0.083 +12228,-0.306 +12229,1.744 +12230,-0.329 +12231,-1.947 +12232,1.848 +12233,-0.124 +12234,-0.215 +12235,1.566 +12236,1.703 +12237,-0.226 +12238,-0.520 +12239,-1.195 +12240,-0.097 +12241,-0.432 +12242,-1.139 +12243,0.657 +12244,-1.025 +12245,0.690 +12246,-0.956 +12247,-0.278 +12248,-0.342 +12249,-0.573 +12250,1.544 +12251,0.868 +12252,-1.483 +12253,-2.009 +12254,-1.672 +12255,-1.556 +12256,-0.435 +12257,2.168 +12258,-1.237 +12259,-0.772 +12260,-1.128 +12261,-0.353 +12262,-0.098 +12263,0.841 +12264,-0.980 +12265,1.214 +12266,0.521 +12267,0.167 +12268,-0.626 +12269,0.634 +12270,-0.351 +12271,-2.753 +12272,1.127 +12273,-0.158 +12274,-0.642 +12275,1.913 +12276,-0.042 +12277,0.484 +12278,-0.519 +12279,0.328 +12280,1.325 +12281,-1.831 +12282,-0.349 +12283,0.279 +12284,-0.128 +12285,0.753 +12286,-1.585 +12287,0.376 +12288,-1.021 +12289,-0.107 +12290,0.135 +12291,-0.953 +12292,-0.444 +12293,0.418 +12294,-1.272 +12295,-0.413 +12296,-0.699 +12297,-0.030 +12298,0.054 +12299,-1.010 +12300,-0.592 +12301,-0.586 +12302,0.557 +12303,-0.019 +12304,0.600 +12305,2.111 +12306,-1.338 +12307,-0.298 +12308,0.847 +12309,0.066 +12310,-1.757 +12311,-0.386 +12312,0.808 +12313,0.421 +12314,0.854 +12315,-1.730 +12316,0.490 +12317,-1.108 +12318,-1.197 +12319,-1.600 +12320,-0.241 +12321,1.021 +12322,0.413 +12323,-0.321 +12324,1.507 +12325,-0.700 +12326,-2.937 +12327,-0.013 +12328,-0.165 +12329,1.296 +12330,0.073 +12331,-0.128 +12332,1.173 +12333,-0.270 +12334,0.947 +12335,-1.961 +12336,0.451 +12337,1.304 +12338,-0.272 +12339,0.165 +12340,0.601 +12341,-1.860 +12342,0.611 +12343,0.909 +12344,0.009 +12345,0.836 +12346,1.081 +12347,0.793 +12348,0.183 +12349,0.389 +12350,1.718 +12351,-1.347 +12352,0.958 +12353,0.297 +12354,-0.798 +12355,0.004 +12356,0.627 +12357,1.250 +12358,-0.261 +12359,1.122 +12360,0.014 +12361,-0.986 +12362,0.300 +12363,-0.869 +12364,-0.776 +12365,0.136 +12366,-0.118 +12367,0.278 +12368,-0.910 +12369,-0.653 +12370,0.589 +12371,-1.723 +12372,-1.198 +12373,0.331 +12374,0.267 +12375,-1.084 +12376,1.366 +12377,-1.428 +12378,1.311 +12379,0.085 +12380,0.557 +12381,0.423 +12382,-0.391 +12383,1.607 +12384,-0.651 +12385,-1.929 +12386,-0.469 +12387,0.580 +12388,-1.983 +12389,1.017 +12390,-1.083 +12391,-0.111 +12392,0.439 +12393,1.132 +12394,-0.134 +12395,-0.088 +12396,0.950 +12397,1.265 +12398,1.959 +12399,0.194 +12400,-0.703 +12401,-0.627 +12402,1.316 +12403,2.004 +12404,-0.600 +12405,-0.976 +12406,-0.578 +12407,1.079 +12408,-0.019 +12409,-0.783 +12410,1.242 +12411,0.012 +12412,-0.770 +12413,-1.236 +12414,0.035 +12415,-0.103 +12416,-0.534 +12417,0.404 +12418,-1.450 +12419,-1.443 +12420,-0.339 +12421,-0.115 +12422,-0.610 +12423,0.673 +12424,-0.132 +12425,0.344 +12426,-0.993 +12427,0.702 +12428,0.306 +12429,0.274 +12430,1.193 +12431,0.850 +12432,-1.210 +12433,0.187 +12434,0.159 +12435,0.955 +12436,0.757 +12437,0.895 +12438,1.100 +12439,-0.137 +12440,-1.538 +12441,-0.331 +12442,-0.833 +12443,0.842 +12444,-0.092 +12445,-0.070 +12446,-2.021 +12447,0.648 +12448,2.198 +12449,-0.294 +12450,-0.201 +12451,1.734 +12452,0.012 +12453,-0.292 +12454,0.085 +12455,-0.178 +12456,0.989 +12457,1.305 +12458,-0.343 +12459,0.601 +12460,-1.348 +12461,0.675 +12462,-0.151 +12463,0.009 +12464,2.577 +12465,-0.798 +12466,-1.181 +12467,-0.332 +12468,0.612 +12469,-1.436 +12470,-0.681 +12471,-0.069 +12472,1.244 +12473,0.469 +12474,-0.977 +12475,1.470 +12476,-0.879 +12477,0.046 +12478,-2.915 +12479,1.255 +12480,0.405 +12481,0.164 +12482,-0.943 +12483,1.364 +12484,-0.876 +12485,0.984 +12486,2.197 +12487,0.383 +12488,0.559 +12489,0.304 +12490,0.699 +12491,-0.974 +12492,-0.073 +12493,0.724 +12494,-0.364 +12495,0.881 +12496,-0.812 +12497,-0.269 +12498,-0.902 +12499,0.864 +12500,-1.959 +12501,-0.143 +12502,1.154 +12503,-0.104 +12504,-0.199 +12505,2.892 +12506,-1.340 +12507,1.218 +12508,0.048 +12509,-1.156 +12510,1.181 +12511,1.054 +12512,0.152 +12513,-1.280 +12514,-0.833 +12515,-1.753 +12516,1.733 +12517,1.204 +12518,-0.654 +12519,0.241 +12520,0.975 +12521,1.549 +12522,1.064 +12523,-1.411 +12524,-1.488 +12525,1.624 +12526,-0.245 +12527,0.061 +12528,0.282 +12529,0.091 +12530,0.034 +12531,0.472 +12532,-0.797 +12533,0.255 +12534,-0.318 +12535,0.224 +12536,0.081 +12537,0.211 +12538,-1.749 +12539,2.026 +12540,-1.380 +12541,-0.345 +12542,-1.251 +12543,-0.053 +12544,-0.391 +12545,-1.645 +12546,1.015 +12547,0.719 +12548,-0.565 +12549,-2.830 +12550,-0.060 +12551,1.427 +12552,-0.832 +12553,0.209 +12554,0.690 +12555,-1.211 +12556,1.176 +12557,-0.085 +12558,-1.159 +12559,-0.646 +12560,-0.322 +12561,-1.855 +12562,0.577 +12563,1.266 +12564,0.442 +12565,0.862 +12566,-0.590 +12567,-1.438 +12568,1.523 +12569,0.925 +12570,0.164 +12571,0.220 +12572,0.542 +12573,-0.139 +12574,0.047 +12575,-0.569 +12576,1.412 +12577,0.470 +12578,1.481 +12579,-1.234 +12580,-1.098 +12581,-2.492 +12582,-0.321 +12583,-1.200 +12584,-1.307 +12585,0.745 +12586,-0.951 +12587,0.278 +12588,0.379 +12589,0.096 +12590,-1.580 +12591,-1.451 +12592,-2.735 +12593,-2.198 +12594,1.411 +12595,0.817 +12596,-0.402 +12597,-0.432 +12598,1.836 +12599,-0.562 +12600,0.924 +12601,0.037 +12602,0.996 +12603,-2.198 +12604,1.314 +12605,-2.497 +12606,0.152 +12607,1.096 +12608,0.211 +12609,1.021 +12610,-0.293 +12611,0.173 +12612,1.045 +12613,1.557 +12614,0.729 +12615,0.652 +12616,1.100 +12617,-0.790 +12618,1.477 +12619,0.553 +12620,-0.393 +12621,-0.409 +12622,0.542 +12623,-0.450 +12624,1.560 +12625,0.339 +12626,2.117 +12627,-0.343 +12628,-1.157 +12629,-0.657 +12630,1.320 +12631,1.251 +12632,-0.783 +12633,0.370 +12634,1.770 +12635,-0.322 +12636,1.086 +12637,-0.148 +12638,-0.557 +12639,-0.089 +12640,-0.155 +12641,-0.381 +12642,-0.600 +12643,-0.222 +12644,-0.102 +12645,-0.060 +12646,1.282 +12647,1.092 +12648,0.214 +12649,-0.289 +12650,0.046 +12651,0.343 +12652,-1.574 +12653,0.449 +12654,0.683 +12655,-1.190 +12656,-0.364 +12657,1.193 +12658,1.380 +12659,-0.612 +12660,-0.185 +12661,2.497 +12662,-0.242 +12663,0.182 +12664,0.053 +12665,-1.210 +12666,-1.550 +12667,1.071 +12668,-1.080 +12669,0.405 +12670,-0.573 +12671,-2.179 +12672,-1.220 +12673,-0.449 +12674,0.387 +12675,0.792 +12676,0.929 +12677,0.864 +12678,-0.547 +12679,1.148 +12680,-0.943 +12681,0.134 +12682,0.193 +12683,0.842 +12684,1.889 +12685,-1.262 +12686,0.952 +12687,-0.426 +12688,0.387 +12689,0.280 +12690,-1.993 +12691,-0.896 +12692,0.096 +12693,0.426 +12694,-0.213 +12695,0.993 +12696,0.554 +12697,1.582 +12698,-2.225 +12699,1.038 +12700,-0.743 +12701,-1.211 +12702,-0.146 +12703,2.772 +12704,-0.513 +12705,0.144 +12706,1.388 +12707,-1.066 +12708,-0.953 +12709,0.865 +12710,-0.648 +12711,0.827 +12712,-0.329 +12713,-1.026 +12714,-0.470 +12715,-1.496 +12716,-0.464 +12717,-0.700 +12718,-0.065 +12719,-0.952 +12720,0.921 +12721,0.934 +12722,1.717 +12723,-0.219 +12724,-0.324 +12725,0.639 +12726,-1.024 +12727,-0.022 +12728,0.081 +12729,0.653 +12730,0.923 +12731,-0.736 +12732,0.957 +12733,0.843 +12734,-0.454 +12735,-0.696 +12736,-1.486 +12737,1.125 +12738,-2.677 +12739,1.122 +12740,-1.294 +12741,0.426 +12742,0.969 +12743,1.679 +12744,-1.097 +12745,1.026 +12746,0.067 +12747,-1.350 +12748,0.282 +12749,0.273 +12750,0.436 +12751,-1.718 +12752,-0.052 +12753,-1.083 +12754,0.859 +12755,0.707 +12756,-0.839 +12757,0.608 +12758,0.323 +12759,-0.165 +12760,-0.218 +12761,0.177 +12762,-0.238 +12763,-0.395 +12764,-0.579 +12765,-0.128 +12766,-0.014 +12767,0.647 +12768,1.400 +12769,1.387 +12770,1.147 +12771,-0.620 +12772,1.251 +12773,0.366 +12774,-2.025 +12775,2.243 +12776,0.946 +12777,0.373 +12778,-0.453 +12779,-1.608 +12780,0.623 +12781,-1.494 +12782,-0.498 +12783,-0.413 +12784,1.790 +12785,1.010 +12786,1.034 +12787,-0.307 +12788,-1.075 +12789,0.122 +12790,-0.948 +12791,0.747 +12792,0.105 +12793,-1.056 +12794,-0.220 +12795,-1.327 +12796,1.672 +12797,1.339 +12798,-0.877 +12799,-0.924 +12800,-1.548 +12801,-1.584 +12802,1.496 +12803,-1.457 +12804,-1.149 +12805,0.253 +12806,0.566 +12807,0.196 +12808,-2.110 +12809,0.755 +12810,-0.794 +12811,0.705 +12812,-0.134 +12813,1.516 +12814,-0.190 +12815,0.684 +12816,-0.705 +12817,0.595 +12818,0.204 +12819,0.396 +12820,2.193 +12821,1.046 +12822,0.828 +12823,1.213 +12824,0.466 +12825,1.192 +12826,-0.275 +12827,0.550 +12828,0.442 +12829,0.034 +12830,0.257 +12831,2.019 +12832,2.474 +12833,0.272 +12834,-0.219 +12835,0.422 +12836,0.928 +12837,-0.214 +12838,1.246 +12839,0.974 +12840,-0.854 +12841,0.915 +12842,0.157 +12843,-0.348 +12844,-0.687 +12845,-0.144 +12846,1.120 +12847,0.876 +12848,1.449 +12849,1.411 +12850,-1.718 +12851,1.153 +12852,-0.755 +12853,-0.532 +12854,1.602 +12855,0.896 +12856,0.462 +12857,0.833 +12858,1.088 +12859,1.180 +12860,0.295 +12861,1.079 +12862,0.175 +12863,1.241 +12864,0.071 +12865,-0.090 +12866,-0.701 +12867,-0.016 +12868,0.896 +12869,0.050 +12870,0.177 +12871,1.134 +12872,0.949 +12873,-0.026 +12874,0.455 +12875,-1.011 +12876,0.652 +12877,-1.535 +12878,0.799 +12879,0.218 +12880,-0.324 +12881,-1.053 +12882,-1.160 +12883,-0.375 +12884,0.122 +12885,0.896 +12886,-0.696 +12887,-0.174 +12888,0.044 +12889,0.116 +12890,-2.140 +12891,0.024 +12892,0.722 +12893,0.459 +12894,-0.822 +12895,0.059 +12896,-1.004 +12897,-0.213 +12898,0.554 +12899,-0.810 +12900,-0.808 +12901,-0.064 +12902,-0.595 +12903,-0.271 +12904,-1.223 +12905,-0.555 +12906,0.247 +12907,0.005 +12908,-0.948 +12909,-1.176 +12910,1.244 +12911,-2.166 +12912,1.878 +12913,1.580 +12914,-1.136 +12915,-0.308 +12916,0.240 +12917,2.235 +12918,2.282 +12919,0.762 +12920,2.002 +12921,0.767 +12922,-0.789 +12923,1.504 +12924,0.215 +12925,0.559 +12926,2.087 +12927,-0.606 +12928,0.799 +12929,-0.366 +12930,-0.135 +12931,-0.597 +12932,-1.191 +12933,1.161 +12934,-1.157 +12935,-0.738 +12936,-0.503 +12937,0.543 +12938,1.330 +12939,0.209 +12940,-1.250 +12941,0.851 +12942,0.054 +12943,-0.493 +12944,0.678 +12945,0.445 +12946,-0.113 +12947,-0.583 +12948,0.513 +12949,0.840 +12950,-0.894 +12951,-0.997 +12952,0.252 +12953,-0.059 +12954,1.271 +12955,1.548 +12956,0.336 +12957,0.005 +12958,-0.234 +12959,0.701 +12960,1.106 +12961,0.337 +12962,-0.823 +12963,-0.521 +12964,-0.014 +12965,1.031 +12966,1.309 +12967,0.470 +12968,-1.663 +12969,-0.995 +12970,0.618 +12971,-0.495 +12972,-0.231 +12973,-0.026 +12974,-1.395 +12975,0.908 +12976,0.403 +12977,-0.465 +12978,1.398 +12979,1.173 +12980,0.092 +12981,-0.913 +12982,0.198 +12983,-0.580 +12984,1.329 +12985,-0.747 +12986,-2.482 +12987,0.428 +12988,-0.353 +12989,0.127 +12990,0.256 +12991,-0.486 +12992,0.950 +12993,1.159 +12994,0.958 +12995,-1.644 +12996,0.817 +12997,0.007 +12998,-0.408 +12999,-0.211 +13000,-2.294 +13001,0.222 +13002,0.883 +13003,1.063 +13004,-0.383 +13005,-0.331 +13006,0.112 +13007,-1.633 +13008,-0.331 +13009,2.471 +13010,1.338 +13011,-1.708 +13012,-0.546 +13013,0.309 +13014,0.841 +13015,1.678 +13016,0.208 +13017,0.351 +13018,-0.570 +13019,0.225 +13020,-1.070 +13021,0.565 +13022,-1.199 +13023,0.863 +13024,1.277 +13025,0.715 +13026,2.333 +13027,-1.524 +13028,-0.834 +13029,-1.266 +13030,0.381 +13031,-0.543 +13032,-0.897 +13033,-0.299 +13034,0.823 +13035,1.567 +13036,0.179 +13037,-1.668 +13038,0.549 +13039,0.698 +13040,-0.565 +13041,0.415 +13042,0.659 +13043,-1.315 +13044,0.906 +13045,-0.241 +13046,-1.012 +13047,1.421 +13048,0.743 +13049,-0.098 +13050,0.485 +13051,0.692 +13052,-0.843 +13053,-0.536 +13054,-0.416 +13055,-0.109 +13056,0.338 +13057,0.999 +13058,-0.042 +13059,-0.260 +13060,0.293 +13061,0.088 +13062,-1.484 +13063,0.613 +13064,0.277 +13065,-0.298 +13066,-0.167 +13067,-2.178 +13068,-0.819 +13069,-0.960 +13070,0.775 +13071,-0.963 +13072,0.815 +13073,-0.597 +13074,0.746 +13075,0.882 +13076,1.490 +13077,0.510 +13078,0.708 +13079,0.003 +13080,-0.183 +13081,0.867 +13082,-0.175 +13083,0.792 +13084,-1.917 +13085,0.293 +13086,1.678 +13087,-0.403 +13088,-1.240 +13089,1.921 +13090,0.286 +13091,-1.520 +13092,-1.786 +13093,-1.283 +13094,-0.947 +13095,0.867 +13096,1.958 +13097,-0.661 +13098,0.080 +13099,0.168 +13100,-1.162 +13101,-0.015 +13102,0.527 +13103,-0.585 +13104,1.578 +13105,0.932 +13106,0.408 +13107,1.354 +13108,-0.689 +13109,1.422 +13110,-0.214 +13111,1.140 +13112,-0.089 +13113,-1.081 +13114,-0.586 +13115,1.126 +13116,0.067 +13117,0.236 +13118,-0.422 +13119,0.387 +13120,1.090 +13121,0.600 +13122,-0.533 +13123,0.047 +13124,1.157 +13125,0.585 +13126,0.441 +13127,-0.180 +13128,0.833 +13129,-0.772 +13130,-0.879 +13131,-1.354 +13132,-1.061 +13133,1.227 +13134,-1.272 +13135,1.022 +13136,0.260 +13137,-0.058 +13138,-0.751 +13139,1.009 +13140,0.655 +13141,-1.709 +13142,0.715 +13143,-1.455 +13144,-0.146 +13145,0.496 +13146,-0.230 +13147,-0.787 +13148,-1.548 +13149,-1.740 +13150,-0.714 +13151,0.441 +13152,0.531 +13153,-0.974 +13154,0.031 +13155,-0.216 +13156,1.189 +13157,-0.891 +13158,0.080 +13159,-0.265 +13160,0.664 +13161,0.121 +13162,-0.231 +13163,1.486 +13164,0.154 +13165,0.401 +13166,-0.559 +13167,2.426 +13168,1.578 +13169,0.548 +13170,0.646 +13171,-1.802 +13172,1.098 +13173,-0.293 +13174,0.477 +13175,0.408 +13176,-1.127 +13177,0.253 +13178,0.428 +13179,-0.224 +13180,0.211 +13181,-1.098 +13182,-0.810 +13183,-1.871 +13184,-0.190 +13185,-0.712 +13186,0.377 +13187,0.063 +13188,-0.329 +13189,-0.149 +13190,0.319 +13191,0.067 +13192,1.916 +13193,0.312 +13194,1.063 +13195,0.064 +13196,0.186 +13197,-0.358 +13198,0.587 +13199,1.206 +13200,-0.843 +13201,0.569 +13202,1.574 +13203,0.480 +13204,0.381 +13205,-1.317 +13206,0.522 +13207,0.160 +13208,-1.071 +13209,1.135 +13210,2.123 +13211,0.574 +13212,0.102 +13213,0.755 +13214,0.267 +13215,-1.037 +13216,-0.051 +13217,0.683 +13218,-0.986 +13219,-0.624 +13220,1.306 +13221,0.500 +13222,-1.226 +13223,-0.413 +13224,-1.026 +13225,-1.453 +13226,0.195 +13227,2.581 +13228,-0.705 +13229,0.489 +13230,-0.323 +13231,1.057 +13232,-0.317 +13233,1.091 +13234,-1.390 +13235,-0.307 +13236,-0.184 +13237,0.591 +13238,1.318 +13239,1.839 +13240,-0.159 +13241,-0.147 +13242,0.702 +13243,-1.027 +13244,-0.546 +13245,0.461 +13246,-0.768 +13247,-1.548 +13248,-0.432 +13249,0.700 +13250,-0.839 +13251,0.879 +13252,-0.809 +13253,-0.101 +13254,-0.905 +13255,0.766 +13256,-1.168 +13257,-0.040 +13258,0.761 +13259,0.377 +13260,0.229 +13261,-0.393 +13262,-1.107 +13263,-0.769 +13264,0.110 +13265,0.982 +13266,-0.620 +13267,-0.545 +13268,-0.001 +13269,-0.551 +13270,1.640 +13271,2.944 +13272,-0.192 +13273,-0.015 +13274,-0.141 +13275,1.292 +13276,-0.627 +13277,0.299 +13278,0.265 +13279,0.039 +13280,0.491 +13281,0.789 +13282,0.675 +13283,-0.942 +13284,1.669 +13285,-0.405 +13286,-0.850 +13287,-2.109 +13288,2.444 +13289,0.587 +13290,-0.659 +13291,0.500 +13292,-1.193 +13293,0.845 +13294,1.102 +13295,1.781 +13296,0.569 +13297,-1.138 +13298,-0.776 +13299,-0.141 +13300,-0.805 +13301,-1.157 +13302,0.157 +13303,2.962 +13304,0.017 +13305,0.332 +13306,-0.243 +13307,-2.177 +13308,-1.055 +13309,0.129 +13310,-0.694 +13311,-0.901 +13312,-0.035 +13313,0.405 +13314,0.381 +13315,0.151 +13316,0.162 +13317,0.191 +13318,0.990 +13319,1.609 +13320,0.323 +13321,-0.675 +13322,-0.298 +13323,-1.302 +13324,-0.380 +13325,-0.215 +13326,0.609 +13327,-0.519 +13328,-0.172 +13329,-0.659 +13330,-1.375 +13331,-1.278 +13332,-0.044 +13333,0.614 +13334,-0.633 +13335,-0.508 +13336,-1.252 +13337,1.611 +13338,0.832 +13339,-0.634 +13340,2.105 +13341,-0.152 +13342,1.063 +13343,-0.468 +13344,-0.049 +13345,-0.602 +13346,1.857 +13347,-0.900 +13348,-1.200 +13349,-0.606 +13350,-1.111 +13351,-0.218 +13352,-1.590 +13353,-0.394 +13354,0.073 +13355,-0.098 +13356,1.784 +13357,-1.025 +13358,-0.554 +13359,-0.894 +13360,-1.222 +13361,0.003 +13362,0.004 +13363,-0.987 +13364,-0.016 +13365,0.226 +13366,0.489 +13367,1.445 +13368,-0.586 +13369,1.084 +13370,1.192 +13371,-0.156 +13372,0.524 +13373,-1.160 +13374,1.875 +13375,-0.711 +13376,-0.120 +13377,-0.075 +13378,1.144 +13379,-2.083 +13380,0.976 +13381,-0.319 +13382,-1.711 +13383,0.482 +13384,-0.409 +13385,-0.549 +13386,0.513 +13387,1.375 +13388,-0.410 +13389,-0.525 +13390,0.244 +13391,0.862 +13392,-1.039 +13393,0.666 +13394,0.715 +13395,1.525 +13396,0.285 +13397,-0.508 +13398,1.235 +13399,0.017 +13400,-2.082 +13401,-1.466 +13402,0.333 +13403,-0.077 +13404,-1.373 +13405,1.391 +13406,1.140 +13407,-0.322 +13408,-0.905 +13409,-0.101 +13410,-0.636 +13411,-0.553 +13412,-1.704 +13413,-2.832 +13414,0.773 +13415,-0.561 +13416,-0.364 +13417,-0.883 +13418,1.519 +13419,2.067 +13420,-2.508 +13421,-0.167 +13422,-0.591 +13423,-0.400 +13424,0.188 +13425,-1.157 +13426,0.382 +13427,1.457 +13428,0.644 +13429,0.660 +13430,-1.576 +13431,-0.954 +13432,-0.635 +13433,-0.460 +13434,-0.652 +13435,-0.031 +13436,1.365 +13437,-0.557 +13438,0.405 +13439,-0.634 +13440,0.571 +13441,0.629 +13442,1.244 +13443,-0.793 +13444,0.842 +13445,-1.279 +13446,-0.493 +13447,0.340 +13448,-0.262 +13449,0.338 +13450,0.966 +13451,1.114 +13452,-0.740 +13453,1.789 +13454,-0.602 +13455,1.078 +13456,-0.619 +13457,-0.196 +13458,-0.558 +13459,-1.065 +13460,-0.839 +13461,0.038 +13462,-0.684 +13463,0.241 +13464,0.722 +13465,1.282 +13466,-1.056 +13467,-0.723 +13468,0.172 +13469,-0.319 +13470,-0.168 +13471,0.744 +13472,-0.618 +13473,-0.107 +13474,0.447 +13475,0.346 +13476,-1.507 +13477,1.282 +13478,-2.516 +13479,-0.888 +13480,0.281 +13481,1.692 +13482,-0.704 +13483,-1.817 +13484,1.666 +13485,-2.002 +13486,0.708 +13487,-0.924 +13488,-0.891 +13489,-0.697 +13490,-0.465 +13491,-0.485 +13492,0.592 +13493,2.555 +13494,0.534 +13495,0.515 +13496,-2.044 +13497,-0.313 +13498,0.324 +13499,1.630 +13500,-0.956 +13501,1.921 +13502,0.385 +13503,1.395 +13504,-0.555 +13505,-0.769 +13506,1.254 +13507,-2.013 +13508,-0.320 +13509,-1.767 +13510,0.475 +13511,2.036 +13512,-0.759 +13513,1.059 +13514,-0.974 +13515,0.401 +13516,0.352 +13517,-0.515 +13518,-0.179 +13519,0.244 +13520,-2.385 +13521,-0.685 +13522,-0.016 +13523,-1.046 +13524,-0.783 +13525,-0.164 +13526,0.681 +13527,0.809 +13528,-0.291 +13529,-0.839 +13530,0.522 +13531,0.834 +13532,-1.984 +13533,0.087 +13534,0.704 +13535,-1.373 +13536,0.273 +13537,-1.731 +13538,-0.476 +13539,0.602 +13540,0.700 +13541,-0.147 +13542,-1.326 +13543,1.907 +13544,-0.304 +13545,-1.749 +13546,-1.112 +13547,0.326 +13548,-0.465 +13549,1.268 +13550,0.704 +13551,-0.301 +13552,-0.622 +13553,0.297 +13554,0.150 +13555,0.067 +13556,-1.599 +13557,0.879 +13558,-0.488 +13559,0.843 +13560,-1.967 +13561,0.697 +13562,2.118 +13563,-1.003 +13564,-0.197 +13565,-0.933 +13566,0.251 +13567,0.768 +13568,0.290 +13569,1.199 +13570,1.689 +13571,-0.632 +13572,0.139 +13573,-0.354 +13574,-0.237 +13575,1.293 +13576,-0.496 +13577,0.398 +13578,-0.153 +13579,0.087 +13580,-0.175 +13581,-1.037 +13582,0.166 +13583,0.161 +13584,-0.461 +13585,-0.182 +13586,-0.412 +13587,1.602 +13588,-1.452 +13589,-0.903 +13590,0.744 +13591,-0.136 +13592,0.523 +13593,1.345 +13594,-2.336 +13595,-2.336 +13596,0.005 +13597,-0.620 +13598,-0.964 +13599,-0.425 +13600,0.195 +13601,1.204 +13602,0.729 +13603,-0.175 +13604,1.853 +13605,0.517 +13606,-0.198 +13607,-0.813 +13608,-0.044 +13609,1.317 +13610,-1.316 +13611,1.411 +13612,-0.194 +13613,1.217 +13614,1.662 +13615,-1.287 +13616,-1.645 +13617,-1.262 +13618,-0.417 +13619,1.682 +13620,0.690 +13621,-0.221 +13622,1.799 +13623,0.003 +13624,-1.167 +13625,-0.518 +13626,0.877 +13627,0.346 +13628,0.320 +13629,0.022 +13630,-1.298 +13631,-1.128 +13632,1.020 +13633,-1.742 +13634,-1.857 +13635,0.591 +13636,-2.441 +13637,-1.489 +13638,1.185 +13639,-1.207 +13640,-1.316 +13641,-0.734 +13642,1.786 +13643,0.395 +13644,-0.671 +13645,-0.103 +13646,-0.955 +13647,1.603 +13648,-0.946 +13649,0.110 +13650,-0.106 +13651,0.102 +13652,1.312 +13653,-0.128 +13654,0.884 +13655,-1.357 +13656,-0.355 +13657,0.747 +13658,-1.460 +13659,-0.233 +13660,-1.435 +13661,-0.656 +13662,-0.153 +13663,0.517 +13664,0.763 +13665,0.478 +13666,1.159 +13667,-1.044 +13668,0.081 +13669,1.709 +13670,-0.729 +13671,0.423 +13672,1.363 +13673,-0.905 +13674,0.094 +13675,-1.085 +13676,0.492 +13677,0.494 +13678,-1.016 +13679,1.219 +13680,-3.944 +13681,1.018 +13682,0.381 +13683,0.510 +13684,2.401 +13685,-1.567 +13686,-1.336 +13687,2.056 +13688,-0.472 +13689,0.061 +13690,-1.666 +13691,0.489 +13692,1.472 +13693,1.400 +13694,-0.325 +13695,0.556 +13696,-0.088 +13697,0.705 +13698,-0.882 +13699,-0.189 +13700,-0.498 +13701,0.074 +13702,-0.381 +13703,-2.126 +13704,-2.395 +13705,-0.157 +13706,0.792 +13707,0.149 +13708,0.592 +13709,0.038 +13710,0.274 +13711,-0.126 +13712,1.404 +13713,0.783 +13714,0.273 +13715,0.763 +13716,-0.337 +13717,0.500 +13718,-1.564 +13719,1.957 +13720,-0.784 +13721,0.004 +13722,-0.613 +13723,-0.328 +13724,1.837 +13725,-1.735 +13726,-2.877 +13727,-1.756 +13728,-0.061 +13729,0.446 +13730,1.559 +13731,0.766 +13732,-0.083 +13733,0.343 +13734,-2.136 +13735,-1.554 +13736,-1.591 +13737,1.300 +13738,-0.906 +13739,-1.776 +13740,-0.211 +13741,-1.642 +13742,-1.061 +13743,-2.417 +13744,-1.015 +13745,0.480 +13746,0.084 +13747,0.041 +13748,0.575 +13749,0.561 +13750,-0.123 +13751,-0.476 +13752,-0.521 +13753,-1.013 +13754,0.875 +13755,0.250 +13756,0.855 +13757,1.481 +13758,-0.988 +13759,0.282 +13760,-0.422 +13761,2.423 +13762,-0.859 +13763,0.157 +13764,1.458 +13765,-1.249 +13766,0.279 +13767,-0.747 +13768,0.890 +13769,1.180 +13770,-1.609 +13771,-0.938 +13772,0.304 +13773,1.286 +13774,0.311 +13775,0.792 +13776,0.419 +13777,-1.568 +13778,0.563 +13779,0.638 +13780,0.193 +13781,-0.672 +13782,1.026 +13783,0.464 +13784,-1.084 +13785,-1.212 +13786,0.354 +13787,-1.766 +13788,1.118 +13789,-0.505 +13790,-0.316 +13791,0.229 +13792,-0.090 +13793,0.056 +13794,0.314 +13795,0.974 +13796,2.264 +13797,-1.733 +13798,0.014 +13799,0.173 +13800,-0.335 +13801,-0.617 +13802,1.366 +13803,-2.945 +13804,-1.117 +13805,-0.352 +13806,-0.146 +13807,0.927 +13808,1.426 +13809,-0.534 +13810,-0.262 +13811,0.147 +13812,0.333 +13813,0.887 +13814,-0.107 +13815,0.510 +13816,-0.544 +13817,-0.313 +13818,-0.673 +13819,-0.484 +13820,0.894 +13821,0.482 +13822,-0.067 +13823,-0.127 +13824,-1.698 +13825,-1.114 +13826,0.008 +13827,1.589 +13828,0.009 +13829,-1.214 +13830,0.477 +13831,-0.051 +13832,0.627 +13833,-2.478 +13834,0.124 +13835,-1.836 +13836,0.604 +13837,-0.740 +13838,1.430 +13839,-0.576 +13840,0.026 +13841,0.267 +13842,0.252 +13843,0.666 +13844,0.848 +13845,-0.326 +13846,0.901 +13847,0.454 +13848,-0.921 +13849,0.967 +13850,-1.099 +13851,0.782 +13852,-0.673 +13853,-0.737 +13854,0.928 +13855,-0.334 +13856,0.412 +13857,0.964 +13858,0.498 +13859,-0.529 +13860,0.645 +13861,-0.826 +13862,-1.757 +13863,-0.832 +13864,-1.112 +13865,0.952 +13866,0.044 +13867,-1.520 +13868,1.403 +13869,0.304 +13870,0.038 +13871,-0.140 +13872,0.085 +13873,0.450 +13874,-0.343 +13875,-0.141 +13876,-2.757 +13877,-1.333 +13878,-0.318 +13879,0.230 +13880,1.390 +13881,0.942 +13882,-0.130 +13883,-0.263 +13884,1.310 +13885,-0.623 +13886,0.648 +13887,-0.850 +13888,-0.284 +13889,-0.310 +13890,0.180 +13891,1.112 +13892,0.848 +13893,1.690 +13894,-0.534 +13895,0.525 +13896,2.300 +13897,2.749 +13898,-1.459 +13899,0.536 +13900,0.348 +13901,0.880 +13902,-2.227 +13903,0.540 +13904,-1.321 +13905,2.249 +13906,-1.098 +13907,1.891 +13908,-0.759 +13909,-1.120 +13910,-0.833 +13911,2.001 +13912,-2.236 +13913,0.327 +13914,0.082 +13915,2.246 +13916,-0.358 +13917,0.314 +13918,-0.840 +13919,-2.069 +13920,1.374 +13921,1.084 +13922,0.419 +13923,-0.154 +13924,1.078 +13925,-1.165 +13926,0.305 +13927,-0.360 +13928,0.053 +13929,0.305 +13930,0.319 +13931,-1.614 +13932,-0.313 +13933,0.092 +13934,0.172 +13935,-0.049 +13936,-0.871 +13937,0.000 +13938,-0.098 +13939,-0.941 +13940,1.100 +13941,0.375 +13942,-2.672 +13943,0.743 +13944,0.546 +13945,1.037 +13946,1.489 +13947,-0.553 +13948,-0.965 +13949,-0.744 +13950,0.789 +13951,-0.371 +13952,-0.747 +13953,-1.153 +13954,0.130 +13955,-3.292 +13956,-0.564 +13957,-2.069 +13958,-1.121 +13959,-1.336 +13960,0.068 +13961,-0.298 +13962,-1.072 +13963,2.296 +13964,0.383 +13965,-0.539 +13966,-0.881 +13967,-1.251 +13968,0.199 +13969,0.922 +13970,-0.380 +13971,-1.120 +13972,-0.677 +13973,0.189 +13974,1.879 +13975,-1.225 +13976,-1.437 +13977,0.713 +13978,1.556 +13979,0.203 +13980,-0.049 +13981,0.328 +13982,-0.191 +13983,0.695 +13984,1.291 +13985,-0.219 +13986,0.913 +13987,0.045 +13988,-0.745 +13989,-0.766 +13990,-1.590 +13991,0.867 +13992,-0.813 +13993,-0.895 +13994,-1.491 +13995,0.082 +13996,-0.554 +13997,-0.000 +13998,0.441 +13999,0.428 +14000,-1.829 +14001,-0.539 +14002,-0.731 +14003,-1.551 +14004,0.094 +14005,0.743 +14006,0.063 +14007,-1.171 +14008,0.628 +14009,0.741 +14010,1.117 +14011,-2.251 +14012,-0.506 +14013,0.272 +14014,0.914 +14015,-1.948 +14016,0.354 +14017,0.542 +14018,1.652 +14019,1.790 +14020,-0.864 +14021,-0.680 +14022,0.298 +14023,-1.124 +14024,0.973 +14025,0.815 +14026,-0.269 +14027,-0.569 +14028,0.002 +14029,1.050 +14030,0.319 +14031,-0.448 +14032,0.904 +14033,0.205 +14034,0.602 +14035,0.695 +14036,-0.673 +14037,0.085 +14038,1.008 +14039,-0.155 +14040,0.076 +14041,-1.091 +14042,0.785 +14043,-1.148 +14044,-2.319 +14045,-0.770 +14046,-0.087 +14047,2.044 +14048,-0.644 +14049,1.801 +14050,0.389 +14051,-0.792 +14052,-1.441 +14053,0.332 +14054,0.583 +14055,1.059 +14056,-1.631 +14057,-0.676 +14058,0.880 +14059,1.199 +14060,2.134 +14061,-0.211 +14062,-0.330 +14063,1.744 +14064,0.107 +14065,-0.134 +14066,-0.352 +14067,1.541 +14068,0.897 +14069,-0.775 +14070,2.073 +14071,0.442 +14072,-0.356 +14073,-0.982 +14074,1.183 +14075,-1.376 +14076,-0.496 +14077,-0.861 +14078,-1.406 +14079,0.020 +14080,1.386 +14081,0.085 +14082,-0.334 +14083,0.562 +14084,-0.720 +14085,-1.138 +14086,-0.090 +14087,0.034 +14088,-1.196 +14089,-1.098 +14090,0.510 +14091,0.279 +14092,0.479 +14093,-0.284 +14094,1.909 +14095,-1.237 +14096,1.186 +14097,-1.844 +14098,-1.349 +14099,-1.358 +14100,2.077 +14101,0.091 +14102,1.968 +14103,0.422 +14104,0.512 +14105,-0.712 +14106,-1.091 +14107,0.937 +14108,-0.785 +14109,0.713 +14110,-0.768 +14111,1.433 +14112,-0.442 +14113,1.089 +14114,-1.972 +14115,0.353 +14116,1.135 +14117,2.401 +14118,-0.569 +14119,0.814 +14120,-1.656 +14121,1.190 +14122,-1.801 +14123,1.444 +14124,0.016 +14125,0.283 +14126,0.653 +14127,-0.139 +14128,1.100 +14129,1.429 +14130,-0.733 +14131,-1.456 +14132,0.299 +14133,-0.120 +14134,-0.259 +14135,-0.840 +14136,0.579 +14137,0.914 +14138,0.155 +14139,-0.796 +14140,-1.290 +14141,0.698 +14142,-0.160 +14143,-0.383 +14144,-1.253 +14145,-0.527 +14146,-0.513 +14147,0.538 +14148,-1.721 +14149,-0.154 +14150,-0.759 +14151,0.775 +14152,0.233 +14153,-0.667 +14154,0.992 +14155,-1.631 +14156,0.784 +14157,0.280 +14158,0.858 +14159,1.532 +14160,1.340 +14161,1.862 +14162,-1.297 +14163,-0.550 +14164,0.899 +14165,0.543 +14166,-0.216 +14167,0.749 +14168,1.051 +14169,-0.244 +14170,0.993 +14171,0.392 +14172,0.512 +14173,0.968 +14174,1.014 +14175,0.721 +14176,0.818 +14177,-0.225 +14178,1.073 +14179,-0.459 +14180,0.522 +14181,-0.561 +14182,1.171 +14183,-1.069 +14184,-0.389 +14185,0.232 +14186,0.143 +14187,0.945 +14188,1.713 +14189,1.918 +14190,-0.333 +14191,-0.231 +14192,-2.181 +14193,-1.443 +14194,0.273 +14195,-0.651 +14196,1.692 +14197,0.658 +14198,-0.437 +14199,-0.597 +14200,0.182 +14201,-0.415 +14202,0.727 +14203,-0.273 +14204,1.081 +14205,-0.963 +14206,0.126 +14207,0.452 +14208,-0.355 +14209,-0.406 +14210,0.100 +14211,0.705 +14212,-0.926 +14213,0.318 +14214,0.602 +14215,0.718 +14216,-0.945 +14217,0.747 +14218,0.544 +14219,-0.898 +14220,1.451 +14221,-0.943 +14222,-1.961 +14223,-0.683 +14224,0.146 +14225,0.652 +14226,-1.732 +14227,0.374 +14228,-1.230 +14229,0.808 +14230,-0.753 +14231,-0.779 +14232,-1.431 +14233,1.417 +14234,-0.870 +14235,-2.100 +14236,-1.031 +14237,0.215 +14238,0.996 +14239,0.190 +14240,-0.156 +14241,-1.250 +14242,0.782 +14243,0.427 +14244,0.050 +14245,1.720 +14246,-1.027 +14247,1.464 +14248,0.102 +14249,0.324 +14250,1.120 +14251,1.945 +14252,-0.640 +14253,1.176 +14254,0.397 +14255,-1.436 +14256,1.320 +14257,0.805 +14258,-0.779 +14259,-0.898 +14260,0.991 +14261,-1.532 +14262,-0.094 +14263,1.138 +14264,1.232 +14265,-0.733 +14266,-0.191 +14267,-0.418 +14268,-0.689 +14269,-2.143 +14270,-1.168 +14271,0.311 +14272,0.022 +14273,-0.534 +14274,0.345 +14275,-0.423 +14276,0.033 +14277,-1.522 +14278,-0.657 +14279,-1.159 +14280,0.098 +14281,0.475 +14282,1.101 +14283,-0.285 +14284,1.701 +14285,-1.315 +14286,-2.971 +14287,0.376 +14288,1.365 +14289,0.875 +14290,-1.061 +14291,1.273 +14292,-0.095 +14293,-0.461 +14294,-1.149 +14295,-0.948 +14296,1.016 +14297,1.773 +14298,-2.507 +14299,0.392 +14300,0.493 +14301,0.184 +14302,-0.576 +14303,-0.232 +14304,-0.302 +14305,0.730 +14306,-0.136 +14307,0.492 +14308,-0.072 +14309,-1.801 +14310,1.144 +14311,-1.177 +14312,-0.386 +14313,-0.118 +14314,1.078 +14315,2.071 +14316,-0.521 +14317,-1.565 +14318,0.304 +14319,-0.299 +14320,-1.234 +14321,-1.126 +14322,0.152 +14323,-0.253 +14324,0.770 +14325,-0.468 +14326,0.119 +14327,0.257 +14328,1.780 +14329,1.016 +14330,0.028 +14331,-0.140 +14332,-0.691 +14333,0.044 +14334,-1.338 +14335,0.089 +14336,-1.933 +14337,0.524 +14338,1.672 +14339,-0.735 +14340,1.120 +14341,-0.795 +14342,0.401 +14343,0.220 +14344,-0.417 +14345,2.239 +14346,2.023 +14347,-1.557 +14348,0.462 +14349,0.028 +14350,0.762 +14351,1.023 +14352,-0.228 +14353,-0.359 +14354,0.625 +14355,-0.429 +14356,0.252 +14357,0.274 +14358,-0.920 +14359,0.293 +14360,0.233 +14361,-1.294 +14362,0.075 +14363,-0.441 +14364,-1.861 +14365,0.124 +14366,0.586 +14367,2.161 +14368,2.298 +14369,-0.536 +14370,-1.734 +14371,0.449 +14372,1.113 +14373,1.145 +14374,1.250 +14375,-1.070 +14376,-0.588 +14377,-0.373 +14378,1.501 +14379,-0.973 +14380,2.393 +14381,0.391 +14382,-0.057 +14383,0.270 +14384,0.011 +14385,1.633 +14386,-0.992 +14387,-2.262 +14388,-0.452 +14389,-1.451 +14390,-2.001 +14391,1.266 +14392,0.990 +14393,0.191 +14394,-0.969 +14395,1.315 +14396,0.954 +14397,-0.455 +14398,0.045 +14399,0.860 +14400,-1.758 +14401,-0.083 +14402,-0.615 +14403,-0.968 +14404,-0.923 +14405,0.306 +14406,-0.445 +14407,0.864 +14408,3.003 +14409,1.766 +14410,-0.068 +14411,2.073 +14412,-0.265 +14413,0.321 +14414,0.122 +14415,-0.976 +14416,-1.535 +14417,-0.814 +14418,0.862 +14419,-0.053 +14420,0.786 +14421,0.061 +14422,0.138 +14423,0.847 +14424,0.303 +14425,-0.462 +14426,-0.385 +14427,-0.752 +14428,-0.115 +14429,-0.009 +14430,0.155 +14431,-0.897 +14432,-0.774 +14433,-1.268 +14434,2.792 +14435,1.202 +14436,1.144 +14437,-0.023 +14438,0.071 +14439,-0.028 +14440,0.809 +14441,-0.083 +14442,-0.636 +14443,-1.842 +14444,-1.444 +14445,1.731 +14446,0.557 +14447,0.810 +14448,-0.935 +14449,-0.677 +14450,0.152 +14451,0.558 +14452,2.287 +14453,-0.149 +14454,-0.197 +14455,-0.339 +14456,1.403 +14457,0.064 +14458,-1.055 +14459,0.147 +14460,0.598 +14461,0.285 +14462,-1.119 +14463,-1.945 +14464,1.276 +14465,0.598 +14466,-1.819 +14467,-1.004 +14468,0.075 +14469,-0.472 +14470,2.636 +14471,-1.844 +14472,0.119 +14473,0.008 +14474,0.500 +14475,-0.749 +14476,-1.556 +14477,-0.453 +14478,0.911 +14479,1.370 +14480,-1.158 +14481,-0.177 +14482,1.152 +14483,-0.655 +14484,1.913 +14485,1.456 +14486,-0.190 +14487,-1.192 +14488,1.068 +14489,1.173 +14490,-0.196 +14491,-0.216 +14492,2.038 +14493,-0.679 +14494,-0.758 +14495,-1.727 +14496,-1.193 +14497,-0.007 +14498,0.500 +14499,0.669 +14500,-1.486 +14501,0.128 +14502,0.830 +14503,-1.369 +14504,1.785 +14505,-0.479 +14506,0.739 +14507,-0.080 +14508,-0.137 +14509,0.746 +14510,1.000 +14511,0.674 +14512,0.962 +14513,-0.379 +14514,0.270 +14515,1.257 +14516,0.446 +14517,-0.739 +14518,-1.178 +14519,1.542 +14520,1.905 +14521,0.927 +14522,0.707 +14523,0.915 +14524,0.061 +14525,-0.891 +14526,1.615 +14527,0.648 +14528,-0.730 +14529,-0.325 +14530,-2.643 +14531,1.829 +14532,0.603 +14533,0.955 +14534,1.238 +14535,0.217 +14536,-1.973 +14537,-1.284 +14538,-0.171 +14539,1.112 +14540,-1.357 +14541,0.931 +14542,-0.750 +14543,-0.450 +14544,-0.004 +14545,-0.975 +14546,-0.825 +14547,-0.341 +14548,-0.536 +14549,-1.805 +14550,0.856 +14551,-1.800 +14552,-0.144 +14553,1.698 +14554,-0.987 +14555,-0.485 +14556,0.463 +14557,0.236 +14558,-1.053 +14559,-1.211 +14560,0.461 +14561,0.322 +14562,0.420 +14563,-0.343 +14564,-0.252 +14565,0.713 +14566,2.237 +14567,0.512 +14568,-0.306 +14569,-1.479 +14570,-0.161 +14571,0.609 +14572,0.174 +14573,2.350 +14574,-0.347 +14575,0.517 +14576,-1.554 +14577,-0.190 +14578,-2.289 +14579,0.678 +14580,0.523 +14581,-0.569 +14582,-2.164 +14583,0.604 +14584,0.842 +14585,0.980 +14586,-0.420 +14587,-0.630 +14588,-1.251 +14589,0.305 +14590,-0.042 +14591,-2.007 +14592,-0.904 +14593,-0.993 +14594,1.976 +14595,0.891 +14596,-0.218 +14597,-0.470 +14598,-1.451 +14599,2.709 +14600,-1.311 +14601,0.234 +14602,-0.614 +14603,-1.485 +14604,-0.200 +14605,-0.918 +14606,0.700 +14607,-0.117 +14608,0.308 +14609,1.749 +14610,1.403 +14611,-0.139 +14612,-0.425 +14613,0.319 +14614,-0.717 +14615,-0.921 +14616,-0.603 +14617,0.979 +14618,-0.774 +14619,-0.326 +14620,-0.462 +14621,0.344 +14622,-0.495 +14623,-0.420 +14624,-1.963 +14625,-0.435 +14626,1.051 +14627,2.076 +14628,-1.298 +14629,0.385 +14630,-0.681 +14631,0.006 +14632,0.073 +14633,-0.434 +14634,-0.294 +14635,-1.044 +14636,1.251 +14637,1.518 +14638,0.738 +14639,-1.690 +14640,1.459 +14641,2.011 +14642,0.661 +14643,-0.725 +14644,-0.247 +14645,0.896 +14646,-0.590 +14647,2.422 +14648,-0.989 +14649,0.563 +14650,0.477 +14651,-0.423 +14652,-0.899 +14653,1.141 +14654,1.417 +14655,1.194 +14656,0.181 +14657,-0.154 +14658,1.412 +14659,2.182 +14660,0.044 +14661,0.066 +14662,0.600 +14663,0.229 +14664,0.552 +14665,0.248 +14666,-1.132 +14667,0.150 +14668,-0.254 +14669,-0.169 +14670,0.628 +14671,-1.201 +14672,0.209 +14673,0.848 +14674,-0.102 +14675,-1.111 +14676,-0.501 +14677,-0.288 +14678,-0.627 +14679,0.226 +14680,-1.099 +14681,-1.194 +14682,1.203 +14683,-0.780 +14684,0.217 +14685,-0.754 +14686,1.607 +14687,-0.033 +14688,-0.111 +14689,-0.977 +14690,0.307 +14691,0.724 +14692,0.126 +14693,0.005 +14694,-0.779 +14695,-1.347 +14696,1.106 +14697,-1.649 +14698,0.153 +14699,-1.910 +14700,-0.855 +14701,0.204 +14702,-3.071 +14703,-0.534 +14704,-1.260 +14705,-0.226 +14706,-0.384 +14707,-1.578 +14708,0.086 +14709,-0.446 +14710,0.978 +14711,-0.407 +14712,-0.053 +14713,0.481 +14714,2.534 +14715,-0.518 +14716,0.462 +14717,-1.149 +14718,0.946 +14719,0.146 +14720,-1.694 +14721,-1.093 +14722,2.281 +14723,1.368 +14724,-0.143 +14725,0.532 +14726,-0.244 +14727,-0.370 +14728,1.121 +14729,-1.588 +14730,0.639 +14731,0.592 +14732,-0.402 +14733,-1.441 +14734,0.368 +14735,-0.291 +14736,0.291 +14737,-0.741 +14738,0.611 +14739,0.566 +14740,-0.392 +14741,0.303 +14742,0.436 +14743,0.793 +14744,-0.917 +14745,-0.109 +14746,-2.342 +14747,0.157 +14748,-0.177 +14749,-0.735 +14750,-0.647 +14751,1.016 +14752,-1.295 +14753,-0.392 +14754,1.038 +14755,-2.335 +14756,1.204 +14757,1.165 +14758,1.049 +14759,0.552 +14760,-0.488 +14761,-0.522 +14762,-1.299 +14763,-0.394 +14764,-0.749 +14765,-1.504 +14766,-2.006 +14767,-0.836 +14768,-1.610 +14769,1.375 +14770,-1.140 +14771,0.363 +14772,-0.787 +14773,-1.437 +14774,0.806 +14775,-2.304 +14776,0.122 +14777,0.576 +14778,-1.481 +14779,-0.358 +14780,-0.289 +14781,-0.084 +14782,0.648 +14783,-1.648 +14784,1.125 +14785,2.136 +14786,0.201 +14787,0.416 +14788,-0.540 +14789,-0.046 +14790,-0.109 +14791,-0.933 +14792,-1.653 +14793,1.818 +14794,0.428 +14795,1.310 +14796,0.138 +14797,-0.067 +14798,1.008 +14799,1.886 +14800,1.547 +14801,-1.162 +14802,0.078 +14803,-0.944 +14804,-0.358 +14805,-0.958 +14806,-0.417 +14807,0.174 +14808,-0.352 +14809,-0.009 +14810,-0.601 +14811,-0.568 +14812,0.068 +14813,0.813 +14814,-0.009 +14815,0.038 +14816,-1.029 +14817,0.532 +14818,-2.421 +14819,-0.710 +14820,1.049 +14821,1.434 +14822,-0.421 +14823,-0.445 +14824,-0.754 +14825,0.519 +14826,-0.999 +14827,-1.058 +14828,0.275 +14829,-0.237 +14830,-0.303 +14831,1.501 +14832,0.419 +14833,0.242 +14834,-2.563 +14835,0.921 +14836,-0.450 +14837,-0.648 +14838,0.436 +14839,-0.495 +14840,0.884 +14841,0.609 +14842,-0.800 +14843,-0.159 +14844,-0.563 +14845,0.491 +14846,1.073 +14847,-0.273 +14848,1.755 +14849,-0.475 +14850,0.285 +14851,-1.141 +14852,-0.284 +14853,0.741 +14854,-0.889 +14855,0.970 +14856,-0.117 +14857,0.408 +14858,1.447 +14859,-1.161 +14860,-0.707 +14861,0.536 +14862,0.399 +14863,-0.072 +14864,0.703 +14865,1.904 +14866,1.025 +14867,-0.249 +14868,0.884 +14869,1.528 +14870,0.330 +14871,-0.067 +14872,-0.804 +14873,0.234 +14874,-1.066 +14875,0.173 +14876,1.340 +14877,-1.507 +14878,-1.987 +14879,0.945 +14880,0.796 +14881,-0.712 +14882,1.636 +14883,0.795 +14884,-0.707 +14885,-0.576 +14886,0.316 +14887,1.230 +14888,0.196 +14889,1.598 +14890,-1.691 +14891,1.105 +14892,-2.101 +14893,-0.289 +14894,-0.529 +14895,-0.257 +14896,-0.422 +14897,-0.461 +14898,0.774 +14899,-0.045 +14900,0.315 +14901,0.710 +14902,-1.708 +14903,0.080 +14904,0.842 +14905,0.302 +14906,-0.447 +14907,-0.678 +14908,-0.714 +14909,-1.350 +14910,1.392 +14911,-0.223 +14912,-0.138 +14913,-0.111 +14914,-0.464 +14915,0.643 +14916,-0.893 +14917,2.026 +14918,-0.980 +14919,-0.569 +14920,0.477 +14921,0.795 +14922,1.156 +14923,-1.756 +14924,-1.532 +14925,0.925 +14926,-2.455 +14927,1.828 +14928,-0.996 +14929,2.153 +14930,-0.286 +14931,0.200 +14932,-0.719 +14933,2.460 +14934,-0.116 +14935,-0.382 +14936,0.780 +14937,0.799 +14938,1.702 +14939,0.201 +14940,-0.241 +14941,0.259 +14942,1.149 +14943,0.766 +14944,-1.385 +14945,-1.413 +14946,-0.234 +14947,0.340 +14948,0.005 +14949,1.464 +14950,0.464 +14951,-0.536 +14952,1.110 +14953,0.854 +14954,1.421 +14955,-0.496 +14956,1.058 +14957,-1.697 +14958,-0.250 +14959,-0.722 +14960,-0.855 +14961,0.915 +14962,0.559 +14963,1.243 +14964,1.127 +14965,-1.864 +14966,1.295 +14967,-0.032 +14968,-1.209 +14969,-0.507 +14970,-0.373 +14971,-1.640 +14972,-0.248 +14973,0.772 +14974,0.190 +14975,-0.663 +14976,1.286 +14977,-0.672 +14978,0.846 +14979,0.890 +14980,2.550 +14981,-3.174 +14982,-0.873 +14983,1.577 +14984,0.687 +14985,0.108 +14986,1.004 +14987,-0.884 +14988,1.331 +14989,0.422 +14990,-0.970 +14991,1.368 +14992,-0.068 +14993,0.817 +14994,-0.213 +14995,-1.015 +14996,-0.833 +14997,0.314 +14998,0.182 +14999,-0.881 +15000,0.269 +15001,-0.762 +15002,1.849 +15003,-0.858 +15004,-1.349 +15005,-0.467 +15006,0.148 +15007,0.464 +15008,-1.238 +15009,1.116 +15010,-0.159 +15011,-0.363 +15012,-0.873 +15013,2.248 +15014,-0.567 +15015,0.831 +15016,0.167 +15017,-0.097 +15018,1.678 +15019,0.746 +15020,1.659 +15021,0.124 +15022,-1.410 +15023,0.896 +15024,1.795 +15025,-0.075 +15026,-1.622 +15027,1.254 +15028,0.825 +15029,0.465 +15030,1.907 +15031,-0.546 +15032,-0.027 +15033,-0.033 +15034,0.632 +15035,-0.327 +15036,-0.425 +15037,1.257 +15038,1.407 +15039,0.368 +15040,-0.286 +15041,-0.406 +15042,-0.476 +15043,0.791 +15044,-1.530 +15045,-0.793 +15046,-0.929 +15047,1.012 +15048,1.399 +15049,-1.147 +15050,-0.779 +15051,1.631 +15052,-0.752 +15053,-0.239 +15054,-1.103 +15055,-0.448 +15056,0.158 +15057,0.369 +15058,0.778 +15059,-1.063 +15060,1.434 +15061,0.634 +15062,-1.034 +15063,-0.537 +15064,-1.649 +15065,1.604 +15066,0.745 +15067,0.512 +15068,-1.329 +15069,-0.468 +15070,0.657 +15071,-0.081 +15072,0.371 +15073,0.098 +15074,-0.255 +15075,0.136 +15076,0.067 +15077,-1.171 +15078,0.268 +15079,0.763 +15080,0.574 +15081,-0.979 +15082,1.415 +15083,-1.688 +15084,0.513 +15085,-0.268 +15086,1.410 +15087,-0.451 +15088,-0.004 +15089,0.420 +15090,-0.940 +15091,-0.601 +15092,1.409 +15093,-0.145 +15094,0.119 +15095,-1.282 +15096,0.003 +15097,-0.074 +15098,0.046 +15099,-0.066 +15100,1.360 +15101,1.008 +15102,2.396 +15103,-1.040 +15104,-0.222 +15105,0.585 +15106,1.341 +15107,1.291 +15108,0.751 +15109,-1.657 +15110,0.143 +15111,-0.983 +15112,-0.475 +15113,-0.643 +15114,0.516 +15115,-0.140 +15116,0.113 +15117,-1.549 +15118,0.720 +15119,0.286 +15120,-0.170 +15121,-0.860 +15122,-0.621 +15123,2.494 +15124,-0.030 +15125,0.285 +15126,0.063 +15127,-0.244 +15128,0.315 +15129,-0.158 +15130,0.275 +15131,1.273 +15132,1.648 +15133,1.189 +15134,0.474 +15135,-0.055 +15136,-2.072 +15137,1.442 +15138,-0.247 +15139,0.508 +15140,-1.823 +15141,0.268 +15142,-1.061 +15143,1.561 +15144,-0.472 +15145,-0.056 +15146,-1.833 +15147,1.319 +15148,2.032 +15149,1.840 +15150,0.702 +15151,2.457 +15152,0.264 +15153,-0.278 +15154,-1.932 +15155,-0.664 +15156,-0.976 +15157,0.720 +15158,-1.388 +15159,-1.173 +15160,1.453 +15161,-2.086 +15162,0.394 +15163,0.181 +15164,2.524 +15165,0.259 +15166,-0.058 +15167,0.377 +15168,0.121 +15169,-1.020 +15170,0.458 +15171,-0.446 +15172,-0.255 +15173,1.061 +15174,-0.169 +15175,1.698 +15176,-0.930 +15177,-0.705 +15178,0.847 +15179,0.560 +15180,1.029 +15181,1.400 +15182,0.508 +15183,-0.219 +15184,1.231 +15185,-0.213 +15186,0.099 +15187,0.202 +15188,0.149 +15189,-0.673 +15190,-0.425 +15191,-0.731 +15192,-0.091 +15193,-0.708 +15194,0.742 +15195,0.211 +15196,0.564 +15197,2.474 +15198,-0.338 +15199,0.716 +15200,-1.609 +15201,-0.928 +15202,-1.127 +15203,1.895 +15204,-0.407 +15205,0.439 +15206,0.111 +15207,-0.091 +15208,0.073 +15209,-0.386 +15210,-0.684 +15211,0.995 +15212,0.258 +15213,-0.225 +15214,0.461 +15215,-0.940 +15216,-0.580 +15217,-1.836 +15218,1.192 +15219,-1.010 +15220,0.325 +15221,-0.415 +15222,-0.895 +15223,1.319 +15224,-2.188 +15225,-0.880 +15226,-0.146 +15227,0.060 +15228,1.350 +15229,-2.436 +15230,-1.202 +15231,0.466 +15232,1.015 +15233,-0.607 +15234,0.789 +15235,-0.175 +15236,-1.288 +15237,-0.354 +15238,-1.224 +15239,0.432 +15240,-0.248 +15241,-0.804 +15242,-0.633 +15243,-0.564 +15244,0.842 +15245,0.181 +15246,-1.126 +15247,1.380 +15248,-1.066 +15249,0.840 +15250,-1.494 +15251,-1.009 +15252,1.657 +15253,2.243 +15254,-0.678 +15255,-0.741 +15256,-1.272 +15257,-1.319 +15258,0.002 +15259,-0.146 +15260,-1.368 +15261,-1.495 +15262,0.750 +15263,1.349 +15264,0.621 +15265,0.177 +15266,-0.905 +15267,-0.079 +15268,1.489 +15269,0.910 +15270,-1.230 +15271,0.334 +15272,-0.423 +15273,0.959 +15274,-0.886 +15275,1.974 +15276,1.109 +15277,-0.420 +15278,0.035 +15279,1.912 +15280,1.228 +15281,2.176 +15282,-0.819 +15283,-2.065 +15284,-0.724 +15285,1.654 +15286,-0.018 +15287,0.851 +15288,0.889 +15289,0.276 +15290,0.314 +15291,-1.288 +15292,-0.988 +15293,1.013 +15294,2.319 +15295,-0.123 +15296,-0.358 +15297,0.117 +15298,-0.120 +15299,0.366 +15300,0.966 +15301,0.056 +15302,1.084 +15303,0.488 +15304,1.400 +15305,-1.017 +15306,-0.763 +15307,-0.614 +15308,1.034 +15309,1.324 +15310,0.900 +15311,1.878 +15312,-0.366 +15313,-1.676 +15314,0.376 +15315,-0.426 +15316,-0.529 +15317,-0.893 +15318,0.694 +15319,0.013 +15320,-0.249 +15321,-1.272 +15322,0.903 +15323,0.096 +15324,2.966 +15325,-0.191 +15326,-1.835 +15327,-2.758 +15328,-1.772 +15329,-0.976 +15330,2.311 +15331,0.542 +15332,-0.189 +15333,-1.617 +15334,-0.976 +15335,0.060 +15336,0.941 +15337,1.029 +15338,-0.785 +15339,-0.039 +15340,-0.834 +15341,-0.252 +15342,0.470 +15343,-0.978 +15344,0.250 +15345,-0.084 +15346,-0.040 +15347,0.998 +15348,0.535 +15349,-1.222 +15350,1.378 +15351,-0.829 +15352,-0.709 +15353,0.375 +15354,0.751 +15355,1.451 +15356,-1.206 +15357,-0.344 +15358,-0.304 +15359,-0.383 +15360,-0.805 +15361,-2.357 +15362,-0.686 +15363,0.963 +15364,0.115 +15365,0.261 +15366,-0.848 +15367,-0.287 +15368,-1.786 +15369,0.251 +15370,-0.015 +15371,-0.415 +15372,0.037 +15373,-1.275 +15374,1.565 +15375,-0.917 +15376,1.187 +15377,0.729 +15378,2.470 +15379,-1.373 +15380,-0.657 +15381,0.077 +15382,1.247 +15383,-0.980 +15384,0.873 +15385,-2.085 +15386,0.801 +15387,0.291 +15388,1.064 +15389,0.728 +15390,0.966 +15391,-0.130 +15392,1.601 +15393,-0.504 +15394,0.446 +15395,0.411 +15396,0.117 +15397,1.557 +15398,-1.566 +15399,0.438 +15400,0.132 +15401,-0.092 +15402,0.905 +15403,-0.454 +15404,-1.303 +15405,1.191 +15406,-0.970 +15407,0.829 +15408,0.939 +15409,0.014 +15410,0.454 +15411,0.203 +15412,-0.403 +15413,-1.333 +15414,-0.814 +15415,-0.055 +15416,0.683 +15417,-0.922 +15418,-0.299 +15419,0.920 +15420,0.421 +15421,-1.421 +15422,-0.792 +15423,-0.285 +15424,-0.373 +15425,-1.365 +15426,0.180 +15427,-1.058 +15428,-0.150 +15429,-0.341 +15430,0.739 +15431,-1.838 +15432,0.270 +15433,-0.091 +15434,-1.076 +15435,-0.138 +15436,0.537 +15437,-0.034 +15438,-0.157 +15439,1.605 +15440,-0.342 +15441,-0.973 +15442,1.031 +15443,0.731 +15444,0.970 +15445,-0.983 +15446,-1.268 +15447,-1.706 +15448,-0.943 +15449,0.040 +15450,-0.716 +15451,-1.890 +15452,1.014 +15453,-0.069 +15454,-0.467 +15455,0.711 +15456,0.692 +15457,0.585 +15458,0.569 +15459,0.519 +15460,1.096 +15461,-0.452 +15462,-0.875 +15463,-0.513 +15464,0.243 +15465,0.655 +15466,0.356 +15467,-0.493 +15468,-0.316 +15469,-0.158 +15470,0.692 +15471,-0.603 +15472,0.940 +15473,0.661 +15474,-0.414 +15475,0.301 +15476,-0.415 +15477,-0.500 +15478,-0.166 +15479,1.183 +15480,1.169 +15481,0.797 +15482,1.006 +15483,0.331 +15484,1.696 +15485,0.561 +15486,-1.288 +15487,1.836 +15488,1.070 +15489,1.360 +15490,0.846 +15491,0.767 +15492,0.329 +15493,0.214 +15494,1.248 +15495,1.066 +15496,-1.209 +15497,-0.316 +15498,0.011 +15499,-0.876 +15500,-1.273 +15501,-1.961 +15502,0.300 +15503,-0.661 +15504,1.171 +15505,1.618 +15506,-1.488 +15507,0.501 +15508,0.215 +15509,0.656 +15510,-0.173 +15511,0.986 +15512,-0.443 +15513,0.783 +15514,0.703 +15515,-1.254 +15516,0.280 +15517,-0.616 +15518,1.751 +15519,-0.283 +15520,-0.096 +15521,-0.941 +15522,-1.012 +15523,0.067 +15524,-0.851 +15525,1.850 +15526,0.904 +15527,0.739 +15528,0.951 +15529,0.020 +15530,0.545 +15531,-0.112 +15532,-0.269 +15533,-0.082 +15534,-0.319 +15535,-0.451 +15536,-0.334 +15537,-0.211 +15538,0.420 +15539,-0.652 +15540,-0.417 +15541,0.412 +15542,-1.341 +15543,-1.096 +15544,-2.014 +15545,0.665 +15546,-1.128 +15547,-0.877 +15548,-0.407 +15549,0.107 +15550,0.692 +15551,-1.955 +15552,0.426 +15553,-0.269 +15554,0.012 +15555,-1.685 +15556,0.583 +15557,1.662 +15558,0.610 +15559,-0.163 +15560,-1.620 +15561,1.625 +15562,0.397 +15563,-0.388 +15564,-0.676 +15565,0.389 +15566,1.428 +15567,0.207 +15568,-1.127 +15569,-1.037 +15570,0.159 +15571,1.014 +15572,-0.469 +15573,1.081 +15574,-2.237 +15575,1.156 +15576,-0.383 +15577,-0.973 +15578,-0.360 +15579,-1.289 +15580,-0.943 +15581,-0.629 +15582,-0.980 +15583,-1.238 +15584,-1.200 +15585,0.648 +15586,0.440 +15587,1.051 +15588,-1.956 +15589,0.726 +15590,2.886 +15591,0.340 +15592,-0.116 +15593,-3.414 +15594,-0.854 +15595,-1.098 +15596,-2.061 +15597,-2.491 +15598,-0.476 +15599,0.206 +15600,-0.940 +15601,-1.319 +15602,0.369 +15603,0.058 +15604,0.891 +15605,0.170 +15606,0.148 +15607,1.788 +15608,-1.000 +15609,-1.289 +15610,-0.216 +15611,0.852 +15612,3.182 +15613,-0.824 +15614,1.619 +15615,-0.868 +15616,-1.082 +15617,-0.328 +15618,-2.155 +15619,-0.402 +15620,-1.383 +15621,-0.820 +15622,0.680 +15623,-2.426 +15624,0.015 +15625,1.139 +15626,-0.716 +15627,1.590 +15628,1.068 +15629,-0.401 +15630,0.947 +15631,-1.011 +15632,-0.689 +15633,0.830 +15634,0.189 +15635,0.572 +15636,0.827 +15637,-1.084 +15638,-1.633 +15639,0.742 +15640,-0.352 +15641,0.257 +15642,0.712 +15643,-0.957 +15644,-0.242 +15645,0.444 +15646,-0.627 +15647,0.781 +15648,0.831 +15649,-0.091 +15650,-0.366 +15651,-1.542 +15652,0.387 +15653,1.057 +15654,0.131 +15655,-0.703 +15656,0.621 +15657,-0.716 +15658,-0.944 +15659,-0.302 +15660,-0.656 +15661,-0.668 +15662,-0.532 +15663,-0.435 +15664,-0.683 +15665,1.224 +15666,-0.482 +15667,-0.344 +15668,0.301 +15669,1.659 +15670,-1.674 +15671,-0.332 +15672,0.339 +15673,0.371 +15674,0.024 +15675,-0.316 +15676,0.183 +15677,0.231 +15678,0.943 +15679,1.965 +15680,0.936 +15681,-0.136 +15682,-1.319 +15683,-0.549 +15684,0.863 +15685,2.544 +15686,0.807 +15687,0.417 +15688,0.351 +15689,2.260 +15690,-0.207 +15691,-1.827 +15692,-1.375 +15693,-0.818 +15694,0.491 +15695,2.083 +15696,1.243 +15697,0.655 +15698,-0.107 +15699,-0.887 +15700,0.497 +15701,-1.460 +15702,0.263 +15703,0.208 +15704,1.666 +15705,1.394 +15706,-1.823 +15707,1.195 +15708,-1.443 +15709,1.790 +15710,-1.167 +15711,-1.292 +15712,-1.489 +15713,1.001 +15714,0.063 +15715,1.291 +15716,-1.240 +15717,-0.197 +15718,-0.176 +15719,-0.734 +15720,-0.161 +15721,0.247 +15722,1.494 +15723,0.079 +15724,-0.060 +15725,0.146 +15726,-0.489 +15727,0.116 +15728,-0.909 +15729,-1.264 +15730,-1.240 +15731,1.390 +15732,2.433 +15733,-2.392 +15734,0.732 +15735,0.098 +15736,0.214 +15737,-1.676 +15738,1.247 +15739,-1.529 +15740,-1.248 +15741,-0.859 +15742,-1.219 +15743,-1.272 +15744,-0.885 +15745,0.943 +15746,0.528 +15747,-0.229 +15748,-0.827 +15749,-3.213 +15750,-0.746 +15751,0.820 +15752,-0.101 +15753,1.082 +15754,1.162 +15755,0.284 +15756,0.289 +15757,-1.437 +15758,-0.404 +15759,-0.349 +15760,-0.890 +15761,0.488 +15762,0.169 +15763,-0.659 +15764,0.757 +15765,0.210 +15766,-1.644 +15767,-1.095 +15768,0.068 +15769,0.052 +15770,-1.500 +15771,-0.262 +15772,0.148 +15773,0.426 +15774,-0.464 +15775,-0.632 +15776,-0.505 +15777,-1.866 +15778,-0.349 +15779,-1.092 +15780,-1.094 +15781,0.144 +15782,-0.561 +15783,1.233 +15784,-1.026 +15785,-0.667 +15786,1.003 +15787,0.235 +15788,-1.273 +15789,0.073 +15790,-0.542 +15791,-0.901 +15792,-0.082 +15793,-1.518 +15794,-0.557 +15795,1.154 +15796,-0.101 +15797,-0.618 +15798,-1.560 +15799,-0.554 +15800,-1.100 +15801,-0.911 +15802,-0.094 +15803,0.347 +15804,0.325 +15805,-1.166 +15806,0.797 +15807,-0.649 +15808,1.162 +15809,-0.370 +15810,1.187 +15811,1.626 +15812,0.493 +15813,-0.182 +15814,-1.027 +15815,-0.915 +15816,0.130 +15817,0.515 +15818,-0.156 +15819,-0.031 +15820,-1.034 +15821,-0.199 +15822,-0.876 +15823,-1.317 +15824,-0.870 +15825,-0.444 +15826,0.559 +15827,0.716 +15828,0.947 +15829,0.537 +15830,0.563 +15831,-0.657 +15832,-0.204 +15833,0.530 +15834,0.555 +15835,-0.601 +15836,-0.226 +15837,-0.308 +15838,0.018 +15839,0.674 +15840,1.632 +15841,0.249 +15842,-1.295 +15843,0.030 +15844,0.885 +15845,-0.654 +15846,1.129 +15847,-0.343 +15848,0.143 +15849,-0.506 +15850,-0.235 +15851,1.038 +15852,-0.594 +15853,1.098 +15854,-1.124 +15855,0.377 +15856,0.063 +15857,-0.577 +15858,-0.658 +15859,0.663 +15860,0.557 +15861,-1.712 +15862,1.635 +15863,-0.749 +15864,0.110 +15865,-0.602 +15866,0.750 +15867,0.389 +15868,-0.720 +15869,-0.171 +15870,-0.619 +15871,0.607 +15872,1.109 +15873,0.727 +15874,1.404 +15875,-1.436 +15876,-0.457 +15877,1.318 +15878,0.940 +15879,-1.570 +15880,1.611 +15881,-0.066 +15882,-0.614 +15883,0.558 +15884,-0.929 +15885,-0.774 +15886,0.288 +15887,-1.934 +15888,0.796 +15889,-1.412 +15890,1.109 +15891,-1.254 +15892,-0.142 +15893,-0.505 +15894,0.384 +15895,-0.255 +15896,0.268 +15897,-0.198 +15898,0.224 +15899,1.635 +15900,-0.515 +15901,0.138 +15902,-0.522 +15903,-0.281 +15904,0.281 +15905,0.312 +15906,1.213 +15907,1.498 +15908,2.162 +15909,0.306 +15910,-1.516 +15911,0.484 +15912,-0.416 +15913,-0.659 +15914,-0.737 +15915,0.396 +15916,1.245 +15917,0.452 +15918,-1.607 +15919,-0.915 +15920,-1.376 +15921,-1.528 +15922,-0.695 +15923,-0.288 +15924,-0.167 +15925,-0.581 +15926,-0.361 +15927,0.251 +15928,0.902 +15929,1.203 +15930,2.264 +15931,-0.689 +15932,0.386 +15933,-0.168 +15934,0.181 +15935,0.374 +15936,0.549 +15937,1.020 +15938,-1.411 +15939,0.606 +15940,0.678 +15941,0.286 +15942,1.563 +15943,0.480 +15944,-0.063 +15945,-0.736 +15946,0.250 +15947,0.251 +15948,-0.641 +15949,0.266 +15950,-0.692 +15951,-2.166 +15952,-1.476 +15953,-0.667 +15954,-0.747 +15955,1.808 +15956,1.001 +15957,0.760 +15958,-0.689 +15959,-0.994 +15960,-0.060 +15961,-0.259 +15962,0.217 +15963,-0.631 +15964,-0.310 +15965,-0.813 +15966,-0.431 +15967,0.114 +15968,3.167 +15969,1.038 +15970,-1.466 +15971,-0.863 +15972,-0.976 +15973,-2.237 +15974,-1.726 +15975,0.030 +15976,-0.433 +15977,1.203 +15978,-0.116 +15979,1.380 +15980,-3.037 +15981,-0.767 +15982,1.390 +15983,1.115 +15984,0.693 +15985,-0.071 +15986,-2.334 +15987,-1.112 +15988,-0.054 +15989,0.236 +15990,-0.025 +15991,-1.377 +15992,-1.995 +15993,-1.626 +15994,-1.262 +15995,0.366 +15996,0.164 +15997,-0.920 +15998,-0.125 +15999,1.233 +16000,-0.775 +16001,-1.458 +16002,1.023 +16003,1.006 +16004,0.680 +16005,-0.211 +16006,3.031 +16007,0.630 +16008,-0.297 +16009,-0.310 +16010,-0.831 +16011,0.492 +16012,-1.198 +16013,2.032 +16014,-0.326 +16015,-0.594 +16016,-0.255 +16017,0.471 +16018,-0.476 +16019,-0.681 +16020,-0.482 +16021,0.991 +16022,-0.389 +16023,1.975 +16024,1.015 +16025,-0.967 +16026,0.826 +16027,-0.140 +16028,0.829 +16029,0.128 +16030,1.054 +16031,1.151 +16032,0.737 +16033,-0.090 +16034,0.365 +16035,-0.581 +16036,0.043 +16037,1.654 +16038,0.193 +16039,1.882 +16040,-0.040 +16041,0.450 +16042,-0.370 +16043,1.119 +16044,0.775 +16045,0.483 +16046,-0.622 +16047,-2.115 +16048,0.456 +16049,-0.667 +16050,0.327 +16051,-1.072 +16052,-1.836 +16053,-1.413 +16054,0.305 +16055,-2.191 +16056,0.317 +16057,0.420 +16058,-0.341 +16059,0.076 +16060,-2.217 +16061,0.386 +16062,1.153 +16063,0.056 +16064,-0.968 +16065,0.291 +16066,-0.309 +16067,0.194 +16068,-0.698 +16069,-0.615 +16070,-0.100 +16071,0.315 +16072,-1.442 +16073,0.896 +16074,1.751 +16075,0.107 +16076,-0.250 +16077,1.266 +16078,-0.298 +16079,0.796 +16080,-1.683 +16081,0.690 +16082,-0.376 +16083,0.788 +16084,-0.604 +16085,-0.305 +16086,0.816 +16087,-1.335 +16088,-0.927 +16089,0.119 +16090,-0.008 +16091,1.558 +16092,-0.040 +16093,0.103 +16094,0.609 +16095,1.895 +16096,-0.018 +16097,-0.406 +16098,-0.885 +16099,-0.052 +16100,-1.052 +16101,0.138 +16102,-0.659 +16103,-0.651 +16104,-1.625 +16105,-0.760 +16106,-3.501 +16107,1.535 +16108,0.586 +16109,-0.285 +16110,-0.097 +16111,-2.610 +16112,-0.479 +16113,0.109 +16114,0.615 +16115,-0.428 +16116,0.097 +16117,0.633 +16118,1.454 +16119,-1.176 +16120,-0.509 +16121,0.635 +16122,-0.025 +16123,0.289 +16124,-1.280 +16125,-0.220 +16126,-1.414 +16127,2.155 +16128,0.235 +16129,-0.480 +16130,0.940 +16131,0.835 +16132,0.077 +16133,0.587 +16134,-0.037 +16135,0.831 +16136,-0.073 +16137,0.480 +16138,2.058 +16139,-0.234 +16140,0.339 +16141,0.182 +16142,0.386 +16143,-0.716 +16144,-1.827 +16145,0.237 +16146,0.033 +16147,1.873 +16148,-0.438 +16149,-1.770 +16150,0.863 +16151,-0.304 +16152,-0.354 +16153,-0.584 +16154,0.938 +16155,0.026 +16156,0.970 +16157,-1.647 +16158,-2.585 +16159,-0.334 +16160,-0.764 +16161,-0.751 +16162,3.339 +16163,-0.322 +16164,-1.476 +16165,-0.205 +16166,0.010 +16167,0.855 +16168,0.461 +16169,0.674 +16170,1.161 +16171,0.698 +16172,-0.173 +16173,-1.509 +16174,-0.656 +16175,-1.921 +16176,0.238 +16177,1.609 +16178,0.848 +16179,-0.208 +16180,0.774 +16181,-1.548 +16182,1.094 +16183,0.373 +16184,-0.866 +16185,-0.279 +16186,-2.443 +16187,-0.486 +16188,1.567 +16189,-1.562 +16190,-0.830 +16191,0.355 +16192,1.487 +16193,-0.554 +16194,-0.909 +16195,1.382 +16196,-1.851 +16197,-0.896 +16198,1.610 +16199,1.122 +16200,-0.511 +16201,0.969 +16202,0.621 +16203,-1.612 +16204,0.865 +16205,-0.095 +16206,0.188 +16207,0.089 +16208,-0.312 +16209,0.154 +16210,1.111 +16211,-0.350 +16212,0.244 +16213,-0.336 +16214,-0.098 +16215,-2.390 +16216,0.122 +16217,0.016 +16218,0.270 +16219,1.204 +16220,-0.886 +16221,-1.442 +16222,-0.526 +16223,-1.417 +16224,0.394 +16225,2.184 +16226,-1.066 +16227,0.016 +16228,0.181 +16229,0.267 +16230,0.973 +16231,-0.203 +16232,-1.583 +16233,-0.235 +16234,-0.511 +16235,-0.910 +16236,1.349 +16237,0.317 +16238,-0.018 +16239,1.504 +16240,0.122 +16241,-0.437 +16242,-0.431 +16243,1.997 +16244,2.516 +16245,-0.746 +16246,-0.785 +16247,0.580 +16248,-0.343 +16249,-0.659 +16250,-1.897 +16251,-0.524 +16252,0.762 +16253,-1.008 +16254,0.955 +16255,-0.909 +16256,-1.476 +16257,0.536 +16258,-0.730 +16259,0.375 +16260,-1.937 +16261,-1.511 +16262,-0.546 +16263,-1.011 +16264,0.528 +16265,0.203 +16266,-0.106 +16267,-0.363 +16268,-0.532 +16269,1.083 +16270,-0.528 +16271,-0.206 +16272,0.237 +16273,0.464 +16274,-1.166 +16275,0.637 +16276,1.098 +16277,-0.968 +16278,0.820 +16279,1.631 +16280,0.004 +16281,0.340 +16282,0.491 +16283,0.899 +16284,0.989 +16285,-0.161 +16286,1.000 +16287,0.621 +16288,0.211 +16289,1.474 +16290,0.070 +16291,-0.801 +16292,-2.197 +16293,-0.167 +16294,-0.606 +16295,1.176 +16296,-1.202 +16297,1.845 +16298,0.029 +16299,0.063 +16300,0.720 +16301,0.506 +16302,-0.024 +16303,0.312 +16304,-1.193 +16305,-0.162 +16306,-1.948 +16307,0.142 +16308,-0.418 +16309,-0.424 +16310,-0.788 +16311,0.342 +16312,0.775 +16313,0.887 +16314,-0.449 +16315,0.724 +16316,-1.314 +16317,-1.202 +16318,-0.324 +16319,0.363 +16320,-1.358 +16321,0.906 +16322,0.263 +16323,0.073 +16324,-0.794 +16325,1.599 +16326,0.430 +16327,0.196 +16328,0.462 +16329,1.579 +16330,0.480 +16331,0.986 +16332,-0.157 +16333,-1.227 +16334,1.093 +16335,0.129 +16336,1.297 +16337,-0.082 +16338,0.737 +16339,0.176 +16340,0.622 +16341,0.726 +16342,-0.251 +16343,-2.164 +16344,-0.159 +16345,0.873 +16346,0.867 +16347,-0.191 +16348,-0.387 +16349,2.472 +16350,0.791 +16351,-0.311 +16352,0.305 +16353,-0.220 +16354,-0.424 +16355,-1.258 +16356,-0.641 +16357,-1.069 +16358,-0.936 +16359,1.663 +16360,1.200 +16361,-1.672 +16362,0.828 +16363,-0.085 +16364,-0.092 +16365,0.555 +16366,-1.277 +16367,0.567 +16368,-0.202 +16369,0.906 +16370,-0.068 +16371,-2.148 +16372,-0.216 +16373,-0.263 +16374,2.196 +16375,0.411 +16376,0.691 +16377,-0.089 +16378,-0.120 +16379,-0.694 +16380,0.123 +16381,0.637 +16382,-0.798 +16383,0.795 +16384,0.193 +16385,-1.077 +16386,0.609 +16387,-0.544 +16388,-0.192 +16389,-0.380 +16390,0.952 +16391,-1.860 +16392,1.000 +16393,0.221 +16394,-1.711 +16395,0.443 +16396,0.478 +16397,-0.632 +16398,-0.458 +16399,-0.101 +16400,0.452 +16401,1.917 +16402,1.012 +16403,-2.945 +16404,-1.598 +16405,1.665 +16406,-1.134 +16407,-0.379 +16408,-0.235 +16409,-0.408 +16410,0.027 +16411,0.336 +16412,-2.366 +16413,0.403 +16414,0.158 +16415,-1.311 +16416,-0.595 +16417,-0.007 +16418,-0.250 +16419,-1.017 +16420,0.385 +16421,-0.191 +16422,0.298 +16423,0.053 +16424,-0.894 +16425,-0.628 +16426,-0.631 +16427,-0.870 +16428,-0.569 +16429,0.002 +16430,1.121 +16431,0.755 +16432,-0.148 +16433,-1.350 +16434,0.929 +16435,-0.842 +16436,0.925 +16437,-0.242 +16438,-0.205 +16439,-1.561 +16440,-1.378 +16441,-0.390 +16442,-0.983 +16443,-0.679 +16444,1.061 +16445,-1.066 +16446,-0.397 +16447,-1.268 +16448,0.202 +16449,0.631 +16450,1.555 +16451,-0.769 +16452,-1.148 +16453,-0.298 +16454,-0.351 +16455,0.166 +16456,0.559 +16457,-2.957 +16458,-0.538 +16459,3.144 +16460,1.599 +16461,0.456 +16462,-0.565 +16463,-0.925 +16464,0.152 +16465,0.186 +16466,0.920 +16467,-0.810 +16468,0.847 +16469,0.677 +16470,-0.252 +16471,0.907 +16472,-0.072 +16473,0.141 +16474,-0.351 +16475,-0.592 +16476,1.501 +16477,-1.752 +16478,-0.062 +16479,0.171 +16480,-0.252 +16481,1.091 +16482,-0.028 +16483,2.052 +16484,0.987 +16485,-1.563 +16486,-1.018 +16487,-1.535 +16488,0.970 +16489,0.963 +16490,0.631 +16491,1.075 +16492,-0.103 +16493,0.656 +16494,-0.644 +16495,-0.239 +16496,-0.104 +16497,-2.461 +16498,0.372 +16499,-0.160 +16500,1.048 +16501,0.296 +16502,-0.485 +16503,0.525 +16504,-0.384 +16505,1.150 +16506,-0.382 +16507,0.038 +16508,-3.162 +16509,0.049 +16510,0.831 +16511,0.502 +16512,1.156 +16513,-1.063 +16514,-1.103 +16515,-0.322 +16516,-0.818 +16517,-0.915 +16518,-1.653 +16519,0.295 +16520,1.000 +16521,0.515 +16522,-0.178 +16523,-1.445 +16524,2.127 +16525,1.037 +16526,0.292 +16527,-0.300 +16528,-0.569 +16529,0.873 +16530,1.229 +16531,-0.279 +16532,1.132 +16533,0.793 +16534,-0.021 +16535,-0.857 +16536,2.303 +16537,0.438 +16538,-0.200 +16539,-0.018 +16540,1.820 +16541,1.137 +16542,-1.904 +16543,-0.045 +16544,0.355 +16545,-1.326 +16546,0.770 +16547,0.942 +16548,0.756 +16549,1.387 +16550,0.482 +16551,-0.985 +16552,-0.207 +16553,-0.453 +16554,0.687 +16555,-0.642 +16556,-0.684 +16557,-0.004 +16558,-1.159 +16559,1.341 +16560,0.624 +16561,1.049 +16562,-0.561 +16563,0.011 +16564,-1.742 +16565,-0.243 +16566,-1.053 +16567,-1.772 +16568,-0.058 +16569,-0.147 +16570,0.386 +16571,0.718 +16572,0.860 +16573,0.658 +16574,-0.061 +16575,0.008 +16576,1.460 +16577,-2.515 +16578,-0.309 +16579,-1.168 +16580,0.072 +16581,1.678 +16582,0.494 +16583,1.795 +16584,-0.673 +16585,1.084 +16586,0.025 +16587,-0.553 +16588,0.594 +16589,1.094 +16590,-0.660 +16591,-0.585 +16592,0.516 +16593,0.290 +16594,0.925 +16595,1.574 +16596,-1.449 +16597,1.115 +16598,-1.909 +16599,1.032 +16600,-0.516 +16601,0.130 +16602,0.894 +16603,1.267 +16604,-1.877 +16605,0.649 +16606,0.943 +16607,-0.612 +16608,0.333 +16609,1.094 +16610,1.387 +16611,-0.651 +16612,-2.591 +16613,-1.382 +16614,-1.040 +16615,0.670 +16616,-1.140 +16617,-0.576 +16618,-1.374 +16619,0.790 +16620,0.239 +16621,0.020 +16622,1.293 +16623,1.613 +16624,-1.460 +16625,1.370 +16626,0.901 +16627,-0.984 +16628,0.329 +16629,-1.365 +16630,0.385 +16631,-1.127 +16632,0.661 +16633,-0.494 +16634,-0.712 +16635,-0.637 +16636,-1.014 +16637,-0.328 +16638,0.781 +16639,-2.592 +16640,1.064 +16641,-0.074 +16642,0.795 +16643,0.062 +16644,-0.112 +16645,-1.246 +16646,-0.398 +16647,-0.101 +16648,-1.120 +16649,1.638 +16650,0.350 +16651,-1.112 +16652,0.712 +16653,0.062 +16654,-0.061 +16655,-0.645 +16656,1.303 +16657,-0.021 +16658,-1.069 +16659,-1.368 +16660,-0.735 +16661,-0.786 +16662,1.313 +16663,0.599 +16664,1.565 +16665,1.381 +16666,1.418 +16667,-0.390 +16668,-0.247 +16669,0.033 +16670,-0.615 +16671,1.210 +16672,-0.910 +16673,-1.027 +16674,0.174 +16675,-0.932 +16676,-0.144 +16677,0.239 +16678,0.359 +16679,-0.540 +16680,-0.177 +16681,0.866 +16682,-1.703 +16683,0.364 +16684,-0.545 +16685,0.823 +16686,2.032 +16687,-1.031 +16688,-1.239 +16689,0.890 +16690,1.134 +16691,1.128 +16692,0.568 +16693,-0.220 +16694,-1.097 +16695,0.099 +16696,1.049 +16697,1.016 +16698,-0.497 +16699,-0.789 +16700,-1.893 +16701,-1.398 +16702,-1.597 +16703,0.560 +16704,0.326 +16705,0.099 +16706,0.345 +16707,-0.387 +16708,-0.082 +16709,0.662 +16710,-0.574 +16711,1.210 +16712,0.574 +16713,-0.115 +16714,-0.006 +16715,0.157 +16716,-0.340 +16717,1.350 +16718,0.568 +16719,-1.259 +16720,-1.811 +16721,-1.409 +16722,-0.738 +16723,-0.348 +16724,-0.380 +16725,0.447 +16726,2.074 +16727,-0.060 +16728,-0.840 +16729,-2.366 +16730,0.879 +16731,-0.210 +16732,0.059 +16733,-1.601 +16734,-0.434 +16735,-1.570 +16736,-0.277 +16737,0.919 +16738,0.062 +16739,0.855 +16740,0.705 +16741,1.579 +16742,0.887 +16743,-0.965 +16744,-0.174 +16745,2.173 +16746,1.242 +16747,0.669 +16748,-0.184 +16749,2.012 +16750,0.603 +16751,-0.712 +16752,0.647 +16753,0.917 +16754,0.294 +16755,-0.671 +16756,1.903 +16757,0.086 +16758,-1.997 +16759,0.274 +16760,0.451 +16761,0.659 +16762,-0.239 +16763,1.781 +16764,0.818 +16765,-0.448 +16766,1.434 +16767,0.230 +16768,-1.390 +16769,0.545 +16770,-2.543 +16771,2.036 +16772,-0.731 +16773,0.770 +16774,1.643 +16775,0.881 +16776,-0.436 +16777,0.412 +16778,0.782 +16779,-0.778 +16780,0.836 +16781,-0.664 +16782,0.533 +16783,0.534 +16784,-0.131 +16785,-1.340 +16786,1.019 +16787,-0.352 +16788,-0.817 +16789,1.063 +16790,0.971 +16791,-1.378 +16792,-0.761 +16793,1.713 +16794,-0.425 +16795,0.244 +16796,0.757 +16797,-0.813 +16798,1.323 +16799,0.082 +16800,-1.417 +16801,0.676 +16802,-0.837 +16803,0.879 +16804,0.810 +16805,0.259 +16806,0.517 +16807,-0.965 +16808,1.392 +16809,-1.021 +16810,0.449 +16811,1.202 +16812,-0.250 +16813,0.275 +16814,0.692 +16815,1.163 +16816,0.589 +16817,0.116 +16818,0.686 +16819,1.961 +16820,0.377 +16821,0.569 +16822,-0.449 +16823,0.549 +16824,0.634 +16825,-1.298 +16826,0.968 +16827,-0.710 +16828,-1.292 +16829,0.083 +16830,-0.377 +16831,1.380 +16832,-0.921 +16833,-2.804 +16834,-0.745 +16835,-1.055 +16836,-0.488 +16837,0.359 +16838,-0.589 +16839,1.573 +16840,-0.130 +16841,1.224 +16842,0.126 +16843,-0.325 +16844,-0.609 +16845,-0.271 +16846,0.826 +16847,-0.012 +16848,-0.525 +16849,-0.130 +16850,1.297 +16851,-0.662 +16852,-1.637 +16853,-0.890 +16854,-1.389 +16855,0.055 +16856,-0.971 +16857,0.523 +16858,0.602 +16859,0.309 +16860,0.299 +16861,0.926 +16862,-0.239 +16863,0.399 +16864,-2.641 +16865,-2.495 +16866,-2.459 +16867,0.182 +16868,1.275 +16869,0.632 +16870,-1.708 +16871,-0.043 +16872,-1.334 +16873,-1.820 +16874,0.678 +16875,-0.654 +16876,0.919 +16877,0.030 +16878,-1.436 +16879,1.557 +16880,0.593 +16881,-0.134 +16882,1.971 +16883,2.519 +16884,-1.358 +16885,-0.232 +16886,-0.519 +16887,0.088 +16888,-0.695 +16889,0.357 +16890,0.024 +16891,-1.428 +16892,-1.038 +16893,0.538 +16894,0.999 +16895,1.520 +16896,-0.053 +16897,0.515 +16898,0.924 +16899,0.561 +16900,1.899 +16901,0.749 +16902,0.645 +16903,-1.430 +16904,-0.347 +16905,-0.311 +16906,0.631 +16907,-1.178 +16908,1.848 +16909,-0.253 +16910,-0.613 +16911,-1.130 +16912,1.035 +16913,-0.524 +16914,-1.495 +16915,2.145 +16916,-0.580 +16917,-0.220 +16918,0.069 +16919,1.835 +16920,0.198 +16921,1.248 +16922,-0.612 +16923,-0.721 +16924,-0.025 +16925,-1.086 +16926,1.396 +16927,-0.266 +16928,-0.272 +16929,-1.464 +16930,-0.278 +16931,-0.681 +16932,-0.765 +16933,0.350 +16934,-1.466 +16935,-0.270 +16936,0.156 +16937,0.348 +16938,-1.885 +16939,-0.525 +16940,1.146 +16941,0.162 +16942,0.459 +16943,0.961 +16944,-0.024 +16945,-0.629 +16946,0.305 +16947,-0.094 +16948,-0.588 +16949,-0.414 +16950,0.800 +16951,1.183 +16952,1.848 +16953,0.157 +16954,-1.050 +16955,-0.790 +16956,-0.313 +16957,-0.322 +16958,-1.384 +16959,-0.144 +16960,-1.603 +16961,-1.229 +16962,0.675 +16963,-1.063 +16964,-0.339 +16965,0.966 +16966,-0.222 +16967,-0.291 +16968,-0.541 +16969,-0.957 +16970,0.099 +16971,0.309 +16972,-0.226 +16973,0.491 +16974,-0.420 +16975,-2.427 +16976,0.956 +16977,0.287 +16978,-0.330 +16979,-0.476 +16980,0.335 +16981,0.052 +16982,0.568 +16983,0.297 +16984,0.885 +16985,-0.182 +16986,1.607 +16987,0.447 +16988,1.644 +16989,1.112 +16990,-0.504 +16991,-1.598 +16992,-0.028 +16993,-2.003 +16994,0.872 +16995,-0.658 +16996,0.075 +16997,-0.810 +16998,0.117 +16999,-0.414 +17000,-1.536 +17001,-0.520 +17002,-0.378 +17003,-1.425 +17004,-0.698 +17005,-0.983 +17006,-0.216 +17007,-0.991 +17008,1.082 +17009,1.087 +17010,-0.214 +17011,-1.495 +17012,1.152 +17013,-1.974 +17014,1.995 +17015,0.249 +17016,-0.268 +17017,0.230 +17018,1.237 +17019,0.413 +17020,-1.083 +17021,-0.166 +17022,-0.286 +17023,-1.037 +17024,1.387 +17025,0.073 +17026,-0.425 +17027,-1.445 +17028,-1.313 +17029,0.845 +17030,0.900 +17031,1.133 +17032,0.786 +17033,1.611 +17034,-0.579 +17035,-0.889 +17036,-0.294 +17037,-0.378 +17038,0.085 +17039,0.095 +17040,-0.098 +17041,-0.525 +17042,-1.182 +17043,-0.369 +17044,0.305 +17045,-1.415 +17046,1.209 +17047,-0.738 +17048,0.347 +17049,-1.840 +17050,-0.588 +17051,0.911 +17052,1.400 +17053,1.003 +17054,0.290 +17055,-0.317 +17056,0.097 +17057,2.715 +17058,0.299 +17059,1.274 +17060,0.395 +17061,0.170 +17062,-0.331 +17063,1.030 +17064,0.641 +17065,-1.162 +17066,-0.324 +17067,0.649 +17068,0.880 +17069,-0.428 +17070,-0.717 +17071,0.980 +17072,-0.064 +17073,0.735 +17074,0.041 +17075,-0.511 +17076,-0.306 +17077,-0.031 +17078,-0.999 +17079,-0.663 +17080,0.515 +17081,-0.227 +17082,0.798 +17083,-0.981 +17084,0.289 +17085,0.754 +17086,1.102 +17087,0.116 +17088,-0.545 +17089,-0.097 +17090,0.246 +17091,1.850 +17092,0.107 +17093,0.968 +17094,-0.801 +17095,0.439 +17096,2.021 +17097,-1.226 +17098,-0.866 +17099,0.327 +17100,-0.332 +17101,-0.379 +17102,-0.742 +17103,-0.394 +17104,-0.386 +17105,-0.509 +17106,-1.473 +17107,1.011 +17108,1.832 +17109,-1.273 +17110,-0.531 +17111,-1.376 +17112,0.480 +17113,3.037 +17114,-1.272 +17115,-1.032 +17116,-1.119 +17117,0.103 +17118,-1.115 +17119,-2.581 +17120,-1.853 +17121,-0.115 +17122,0.067 +17123,0.135 +17124,0.421 +17125,1.835 +17126,0.206 +17127,-0.700 +17128,0.164 +17129,0.843 +17130,-0.180 +17131,-0.311 +17132,-1.109 +17133,-0.143 +17134,0.452 +17135,-1.478 +17136,-0.005 +17137,2.105 +17138,0.662 +17139,1.521 +17140,0.007 +17141,1.027 +17142,-0.410 +17143,0.855 +17144,-0.352 +17145,-0.487 +17146,-0.830 +17147,-0.209 +17148,0.488 +17149,0.218 +17150,1.416 +17151,1.685 +17152,0.622 +17153,-0.038 +17154,0.081 +17155,0.148 +17156,1.899 +17157,-0.232 +17158,-0.031 +17159,-0.129 +17160,2.783 +17161,0.830 +17162,-0.690 +17163,-0.773 +17164,-2.157 +17165,-0.900 +17166,2.357 +17167,0.314 +17168,0.523 +17169,-0.140 +17170,0.953 +17171,0.344 +17172,0.703 +17173,-0.400 +17174,-0.039 +17175,1.174 +17176,0.795 +17177,-0.786 +17178,-0.662 +17179,-0.108 +17180,-0.192 +17181,-0.176 +17182,-1.647 +17183,1.120 +17184,2.014 +17185,0.367 +17186,0.636 +17187,-0.936 +17188,0.012 +17189,-1.590 +17190,0.511 +17191,-0.901 +17192,2.062 +17193,-1.202 +17194,-0.337 +17195,-0.349 +17196,0.880 +17197,-0.426 +17198,-2.153 +17199,-0.297 +17200,2.266 +17201,0.746 +17202,1.010 +17203,-0.973 +17204,1.046 +17205,0.246 +17206,1.074 +17207,-0.402 +17208,0.540 +17209,1.505 +17210,-0.793 +17211,1.251 +17212,-1.554 +17213,0.163 +17214,-0.656 +17215,-0.147 +17216,-0.600 +17217,-0.396 +17218,0.983 +17219,0.389 +17220,2.433 +17221,-0.003 +17222,1.273 +17223,1.380 +17224,0.561 +17225,2.272 +17226,-2.172 +17227,1.495 +17228,0.597 +17229,-0.727 +17230,0.156 +17231,1.946 +17232,1.242 +17233,1.022 +17234,0.561 +17235,0.084 +17236,0.911 +17237,-1.000 +17238,-1.042 +17239,1.698 +17240,-1.964 +17241,1.580 +17242,0.004 +17243,-1.977 +17244,-0.640 +17245,0.650 +17246,0.196 +17247,1.075 +17248,-1.440 +17249,0.878 +17250,0.936 +17251,1.100 +17252,1.311 +17253,-0.613 +17254,-0.230 +17255,0.541 +17256,-0.995 +17257,0.346 +17258,0.318 +17259,1.183 +17260,-0.652 +17261,-1.528 +17262,-1.482 +17263,-0.417 +17264,-0.012 +17265,-1.297 +17266,0.063 +17267,-1.587 +17268,-0.541 +17269,0.441 +17270,0.426 +17271,1.017 +17272,0.206 +17273,1.610 +17274,-0.415 +17275,0.459 +17276,0.267 +17277,0.057 +17278,-0.932 +17279,-0.998 +17280,-1.904 +17281,-0.898 +17282,0.183 +17283,0.037 +17284,-0.694 +17285,-1.625 +17286,-1.444 +17287,-1.027 +17288,2.233 +17289,0.480 +17290,-0.363 +17291,0.064 +17292,0.181 +17293,-0.080 +17294,0.225 +17295,1.363 +17296,0.691 +17297,-0.148 +17298,2.155 +17299,1.052 +17300,-0.261 +17301,0.310 +17302,-0.983 +17303,1.878 +17304,2.151 +17305,0.355 +17306,-0.792 +17307,0.599 +17308,-0.563 +17309,1.692 +17310,-1.222 +17311,-1.342 +17312,1.113 +17313,-0.407 +17314,-0.539 +17315,1.253 +17316,-1.059 +17317,-0.506 +17318,0.082 +17319,0.158 +17320,-1.421 +17321,0.418 +17322,1.103 +17323,0.151 +17324,-0.110 +17325,0.400 +17326,1.375 +17327,1.453 +17328,0.832 +17329,-0.105 +17330,-0.490 +17331,0.448 +17332,-0.907 +17333,0.891 +17334,0.431 +17335,-0.213 +17336,-0.040 +17337,0.050 +17338,-1.485 +17339,-1.746 +17340,1.066 +17341,-0.378 +17342,1.740 +17343,-0.829 +17344,-0.028 +17345,-0.988 +17346,-0.433 +17347,0.124 +17348,0.760 +17349,0.069 +17350,0.444 +17351,-1.143 +17352,0.873 +17353,1.001 +17354,-1.621 +17355,1.213 +17356,0.341 +17357,-0.381 +17358,1.478 +17359,0.264 +17360,0.395 +17361,-2.077 +17362,-0.155 +17363,-1.439 +17364,1.340 +17365,0.172 +17366,0.186 +17367,2.060 +17368,0.693 +17369,1.278 +17370,1.154 +17371,-0.345 +17372,2.216 +17373,-0.291 +17374,1.772 +17375,0.385 +17376,1.483 +17377,-1.785 +17378,0.688 +17379,1.499 +17380,-0.054 +17381,-0.287 +17382,1.098 +17383,-2.015 +17384,1.217 +17385,-1.034 +17386,-0.176 +17387,1.219 +17388,0.391 +17389,0.351 +17390,1.466 +17391,0.180 +17392,0.398 +17393,0.625 +17394,-0.007 +17395,0.239 +17396,-0.394 +17397,0.015 +17398,1.803 +17399,-0.839 +17400,0.221 +17401,-1.240 +17402,-0.323 +17403,0.673 +17404,0.909 +17405,0.778 +17406,0.715 +17407,0.623 +17408,1.199 +17409,0.083 +17410,1.220 +17411,-0.547 +17412,1.066 +17413,0.775 +17414,0.294 +17415,1.254 +17416,0.112 +17417,0.309 +17418,2.538 +17419,0.466 +17420,-1.302 +17421,-0.753 +17422,0.320 +17423,0.766 +17424,-0.040 +17425,-0.500 +17426,0.383 +17427,-2.213 +17428,1.068 +17429,0.345 +17430,0.519 +17431,0.227 +17432,0.655 +17433,-0.835 +17434,-0.524 +17435,-1.388 +17436,-0.030 +17437,0.390 +17438,-1.896 +17439,1.284 +17440,1.189 +17441,0.613 +17442,0.335 +17443,-2.657 +17444,1.436 +17445,0.457 +17446,0.495 +17447,1.966 +17448,-0.393 +17449,0.785 +17450,-0.293 +17451,-1.865 +17452,-0.852 +17453,-0.204 +17454,-1.997 +17455,-0.573 +17456,-0.563 +17457,1.088 +17458,-0.338 +17459,0.063 +17460,-0.177 +17461,0.161 +17462,-0.369 +17463,-1.297 +17464,0.101 +17465,0.643 +17466,0.153 +17467,0.074 +17468,1.244 +17469,-1.334 +17470,0.105 +17471,-0.194 +17472,0.470 +17473,-0.424 +17474,-0.557 +17475,-0.286 +17476,1.067 +17477,0.874 +17478,0.424 +17479,0.893 +17480,0.096 +17481,-0.339 +17482,0.320 +17483,-0.922 +17484,1.715 +17485,-0.720 +17486,-0.525 +17487,-0.471 +17488,-0.964 +17489,0.619 +17490,-0.208 +17491,-0.786 +17492,-0.010 +17493,-0.329 +17494,0.415 +17495,-1.093 +17496,1.300 +17497,-1.195 +17498,-0.404 +17499,1.486 +17500,-0.126 +17501,-0.874 +17502,0.393 +17503,1.726 +17504,0.127 +17505,1.480 +17506,0.223 +17507,-0.747 +17508,-1.170 +17509,0.187 +17510,-0.494 +17511,2.225 +17512,-2.142 +17513,0.092 +17514,0.483 +17515,0.786 +17516,-0.765 +17517,-0.917 +17518,0.077 +17519,0.298 +17520,1.415 +17521,-0.897 +17522,-0.346 +17523,0.089 +17524,0.211 +17525,-2.399 +17526,-0.863 +17527,-1.231 +17528,-0.145 +17529,0.987 +17530,0.227 +17531,0.156 +17532,0.434 +17533,0.909 +17534,-0.753 +17535,0.031 +17536,0.832 +17537,-0.244 +17538,1.336 +17539,0.949 +17540,0.877 +17541,0.715 +17542,-1.272 +17543,0.592 +17544,-0.847 +17545,0.303 +17546,0.596 +17547,-0.143 +17548,2.000 +17549,0.058 +17550,1.176 +17551,1.818 +17552,1.598 +17553,-0.662 +17554,-0.405 +17555,-0.591 +17556,-2.062 +17557,1.264 +17558,-2.140 +17559,-0.599 +17560,-0.009 +17561,-1.492 +17562,1.620 +17563,-0.814 +17564,1.321 +17565,-0.227 +17566,0.979 +17567,-0.416 +17568,-1.649 +17569,-0.159 +17570,-1.026 +17571,0.454 +17572,-0.090 +17573,0.021 +17574,0.280 +17575,-2.534 +17576,-0.296 +17577,0.011 +17578,-0.289 +17579,0.494 +17580,0.528 +17581,0.221 +17582,-0.881 +17583,1.289 +17584,-0.912 +17585,1.013 +17586,-0.966 +17587,-0.883 +17588,2.381 +17589,-0.451 +17590,0.534 +17591,0.515 +17592,1.582 +17593,-0.811 +17594,0.242 +17595,-1.051 +17596,0.579 +17597,-1.727 +17598,0.604 +17599,-1.926 +17600,-0.691 +17601,-0.097 +17602,0.078 +17603,0.064 +17604,-0.491 +17605,1.736 +17606,-0.713 +17607,-0.492 +17608,-0.348 +17609,0.438 +17610,0.624 +17611,0.393 +17612,-0.708 +17613,1.413 +17614,0.821 +17615,0.113 +17616,0.723 +17617,-0.049 +17618,0.223 +17619,0.667 +17620,1.186 +17621,0.298 +17622,0.811 +17623,-0.844 +17624,-0.429 +17625,-2.577 +17626,-3.149 +17627,-0.143 +17628,0.362 +17629,-0.150 +17630,-0.371 +17631,0.301 +17632,0.473 +17633,-0.926 +17634,0.402 +17635,1.271 +17636,0.114 +17637,1.537 +17638,-0.581 +17639,-0.803 +17640,-0.745 +17641,-1.715 +17642,-1.547 +17643,0.077 +17644,0.103 +17645,-0.836 +17646,-0.101 +17647,-0.356 +17648,-1.591 +17649,-0.805 +17650,-0.101 +17651,-1.514 +17652,-1.608 +17653,1.628 +17654,0.593 +17655,-0.393 +17656,-0.583 +17657,0.503 +17658,-0.002 +17659,-0.677 +17660,0.325 +17661,0.177 +17662,0.304 +17663,0.605 +17664,-0.149 +17665,-0.074 +17666,-0.382 +17667,-0.292 +17668,-1.438 +17669,1.359 +17670,-1.985 +17671,-0.315 +17672,1.465 +17673,-0.503 +17674,0.974 +17675,2.114 +17676,-0.652 +17677,1.488 +17678,0.254 +17679,-0.708 +17680,-0.055 +17681,0.996 +17682,0.570 +17683,0.674 +17684,0.851 +17685,1.036 +17686,-0.070 +17687,-0.303 +17688,0.868 +17689,-0.007 +17690,-0.498 +17691,-0.321 +17692,-1.242 +17693,-0.324 +17694,-1.592 +17695,0.609 +17696,-1.908 +17697,0.771 +17698,2.049 +17699,-1.107 +17700,-0.744 +17701,-0.577 +17702,1.409 +17703,0.358 +17704,0.221 +17705,-1.122 +17706,0.434 +17707,-0.136 +17708,1.318 +17709,0.102 +17710,0.633 +17711,-0.101 +17712,-0.073 +17713,-0.087 +17714,0.147 +17715,0.227 +17716,0.038 +17717,0.389 +17718,0.066 +17719,-0.439 +17720,-0.180 +17721,1.235 +17722,0.511 +17723,-0.728 +17724,-1.391 +17725,1.262 +17726,-0.316 +17727,-1.716 +17728,0.801 +17729,-1.005 +17730,-0.083 +17731,-0.420 +17732,2.172 +17733,-0.196 +17734,-0.086 +17735,-2.247 +17736,0.824 +17737,0.242 +17738,0.027 +17739,-0.349 +17740,1.300 +17741,0.420 +17742,0.022 +17743,0.316 +17744,1.186 +17745,0.153 +17746,0.357 +17747,-0.918 +17748,2.144 +17749,-0.879 +17750,-0.880 +17751,0.905 +17752,-0.607 +17753,-1.204 +17754,-0.328 +17755,0.803 +17756,0.092 +17757,-0.770 +17758,0.687 +17759,-1.002 +17760,2.109 +17761,-1.453 +17762,1.179 +17763,1.210 +17764,-2.309 +17765,0.376 +17766,-0.454 +17767,-1.902 +17768,1.838 +17769,-1.149 +17770,-0.423 +17771,0.582 +17772,-1.225 +17773,0.470 +17774,-1.211 +17775,0.172 +17776,-0.295 +17777,-1.230 +17778,0.198 +17779,0.188 +17780,0.579 +17781,-0.205 +17782,0.961 +17783,0.307 +17784,-0.067 +17785,-0.033 +17786,-1.091 +17787,1.014 +17788,-0.482 +17789,1.060 +17790,1.662 +17791,0.197 +17792,-1.440 +17793,0.094 +17794,1.072 +17795,-0.207 +17796,1.213 +17797,0.161 +17798,1.250 +17799,-0.965 +17800,1.363 +17801,-0.477 +17802,-0.083 +17803,-0.037 +17804,-0.255 +17805,0.390 +17806,0.082 +17807,-1.410 +17808,1.267 +17809,0.176 +17810,-0.897 +17811,-0.285 +17812,-1.571 +17813,-1.848 +17814,2.091 +17815,-0.223 +17816,-0.957 +17817,-0.376 +17818,0.283 +17819,-0.769 +17820,-0.419 +17821,1.221 +17822,0.458 +17823,0.465 +17824,-0.047 +17825,-0.988 +17826,0.324 +17827,-0.724 +17828,0.385 +17829,-1.485 +17830,-0.027 +17831,0.255 +17832,-1.935 +17833,-1.846 +17834,0.287 +17835,-0.618 +17836,0.623 +17837,-1.253 +17838,-0.840 +17839,-1.855 +17840,-1.213 +17841,1.029 +17842,-0.156 +17843,0.175 +17844,0.698 +17845,-0.927 +17846,0.947 +17847,-0.707 +17848,0.174 +17849,1.355 +17850,1.459 +17851,1.359 +17852,0.254 +17853,1.886 +17854,0.687 +17855,1.112 +17856,-0.100 +17857,-0.378 +17858,0.609 +17859,0.712 +17860,-0.637 +17861,0.145 +17862,0.540 +17863,0.766 +17864,0.917 +17865,-1.012 +17866,0.762 +17867,0.199 +17868,-2.803 +17869,-0.862 +17870,0.320 +17871,0.386 +17872,2.162 +17873,0.942 +17874,-1.900 +17875,-0.255 +17876,1.470 +17877,-0.601 +17878,0.654 +17879,-0.649 +17880,0.616 +17881,2.121 +17882,-1.043 +17883,0.745 +17884,0.646 +17885,-0.116 +17886,0.228 +17887,-1.224 +17888,-0.515 +17889,-1.899 +17890,-0.101 +17891,-0.463 +17892,-2.934 +17893,0.594 +17894,0.839 +17895,1.353 +17896,-0.052 +17897,0.266 +17898,0.007 +17899,0.630 +17900,-0.703 +17901,-0.433 +17902,-0.987 +17903,1.802 +17904,1.141 +17905,0.965 +17906,1.097 +17907,0.371 +17908,0.913 +17909,0.838 +17910,1.075 +17911,0.166 +17912,1.153 +17913,0.973 +17914,2.212 +17915,0.867 +17916,0.180 +17917,-0.131 +17918,-0.143 +17919,0.352 +17920,0.408 +17921,0.563 +17922,0.825 +17923,-0.020 +17924,-1.256 +17925,-1.625 +17926,0.691 +17927,0.257 +17928,0.587 +17929,0.353 +17930,1.023 +17931,0.585 +17932,-0.157 +17933,-0.052 +17934,0.303 +17935,0.244 +17936,0.486 +17937,1.143 +17938,1.046 +17939,-1.009 +17940,0.108 +17941,-0.816 +17942,-0.502 +17943,-2.043 +17944,0.468 +17945,-1.397 +17946,0.331 +17947,-1.739 +17948,-0.599 +17949,-0.717 +17950,0.181 +17951,-2.136 +17952,0.619 +17953,-0.150 +17954,-0.500 +17955,0.226 +17956,1.068 +17957,-0.630 +17958,-0.150 +17959,-0.138 +17960,-1.064 +17961,-0.404 +17962,-0.119 +17963,0.386 +17964,0.075 +17965,0.159 +17966,-0.226 +17967,-1.729 +17968,1.465 +17969,1.001 +17970,0.430 +17971,-0.096 +17972,-0.146 +17973,0.019 +17974,-1.376 +17975,0.182 +17976,0.315 +17977,-1.057 +17978,0.856 +17979,0.047 +17980,-2.537 +17981,-0.025 +17982,-0.074 +17983,-0.752 +17984,0.221 +17985,0.578 +17986,-0.669 +17987,-1.733 +17988,-2.685 +17989,-0.331 +17990,0.887 +17991,1.732 +17992,0.823 +17993,0.102 +17994,-0.927 +17995,-0.036 +17996,-0.186 +17997,-0.774 +17998,1.481 +17999,-0.622 +18000,-1.678 +18001,-0.161 +18002,0.048 +18003,-0.912 +18004,-0.992 +18005,-0.414 +18006,-1.291 +18007,-0.159 +18008,0.087 +18009,-0.876 +18010,1.027 +18011,0.565 +18012,-0.303 +18013,-1.275 +18014,-0.237 +18015,0.798 +18016,-0.302 +18017,-0.305 +18018,1.246 +18019,-1.796 +18020,0.291 +18021,1.896 +18022,-0.379 +18023,1.092 +18024,0.381 +18025,-0.885 +18026,-0.218 +18027,-0.799 +18028,-0.334 +18029,-0.126 +18030,-0.237 +18031,0.080 +18032,-2.285 +18033,1.470 +18034,0.162 +18035,1.104 +18036,0.006 +18037,1.332 +18038,-1.196 +18039,-0.961 +18040,0.041 +18041,0.497 +18042,-0.594 +18043,0.576 +18044,0.198 +18045,0.239 +18046,-1.209 +18047,-0.084 +18048,1.410 +18049,0.316 +18050,0.541 +18051,1.903 +18052,0.916 +18053,-0.821 +18054,-0.415 +18055,0.709 +18056,-0.198 +18057,0.835 +18058,-0.618 +18059,1.803 +18060,0.200 +18061,0.841 +18062,0.707 +18063,1.568 +18064,0.490 +18065,1.214 +18066,-0.286 +18067,1.365 +18068,-0.667 +18069,1.240 +18070,-0.215 +18071,-0.857 +18072,0.371 +18073,-0.517 +18074,-1.240 +18075,-0.713 +18076,-0.780 +18077,-1.094 +18078,-1.032 +18079,-0.867 +18080,-0.314 +18081,-0.642 +18082,-1.115 +18083,0.283 +18084,0.031 +18085,0.780 +18086,1.641 +18087,-1.096 +18088,0.744 +18089,0.445 +18090,-1.329 +18091,1.617 +18092,1.005 +18093,1.067 +18094,-1.498 +18095,0.405 +18096,-0.325 +18097,-1.836 +18098,0.127 +18099,-2.482 +18100,-1.239 +18101,-0.194 +18102,-0.492 +18103,0.148 +18104,-0.785 +18105,0.703 +18106,-0.937 +18107,1.507 +18108,-0.589 +18109,-1.176 +18110,-1.820 +18111,-1.204 +18112,-0.611 +18113,-0.532 +18114,1.470 +18115,-0.193 +18116,0.854 +18117,-0.123 +18118,1.144 +18119,-0.393 +18120,1.448 +18121,1.767 +18122,-0.097 +18123,-0.897 +18124,0.514 +18125,-0.618 +18126,0.753 +18127,-1.815 +18128,0.899 +18129,-0.432 +18130,0.209 +18131,-0.081 +18132,0.199 +18133,-1.966 +18134,-0.305 +18135,-0.652 +18136,-0.130 +18137,0.621 +18138,-0.680 +18139,-0.669 +18140,1.266 +18141,-0.456 +18142,0.738 +18143,1.596 +18144,-0.355 +18145,0.578 +18146,-0.194 +18147,-0.610 +18148,-0.055 +18149,0.497 +18150,0.804 +18151,0.150 +18152,-0.160 +18153,0.785 +18154,-0.586 +18155,-1.445 +18156,0.496 +18157,-0.491 +18158,0.057 +18159,-1.468 +18160,-0.741 +18161,-0.278 +18162,0.559 +18163,0.958 +18164,-1.499 +18165,0.071 +18166,-0.351 +18167,0.549 +18168,-0.136 +18169,1.383 +18170,0.155 +18171,0.532 +18172,-1.352 +18173,1.032 +18174,0.359 +18175,1.072 +18176,-1.346 +18177,-1.068 +18178,2.271 +18179,0.467 +18180,-1.370 +18181,0.841 +18182,0.137 +18183,-0.559 +18184,0.380 +18185,-0.509 +18186,0.362 +18187,-1.220 +18188,0.211 +18189,-0.723 +18190,-0.183 +18191,0.717 +18192,-0.807 +18193,-0.037 +18194,-0.523 +18195,0.522 +18196,-0.564 +18197,-2.181 +18198,-0.392 +18199,-0.075 +18200,1.864 +18201,0.607 +18202,1.197 +18203,-0.810 +18204,-0.297 +18205,0.870 +18206,0.242 +18207,1.138 +18208,0.349 +18209,-0.475 +18210,0.438 +18211,-1.410 +18212,-0.452 +18213,0.712 +18214,1.360 +18215,-0.694 +18216,1.042 +18217,-0.523 +18218,-0.388 +18219,-0.317 +18220,0.769 +18221,0.949 +18222,0.931 +18223,0.409 +18224,0.760 +18225,0.043 +18226,0.168 +18227,1.310 +18228,0.409 +18229,1.136 +18230,-1.252 +18231,0.818 +18232,-1.651 +18233,-0.758 +18234,-0.295 +18235,1.009 +18236,0.452 +18237,-0.029 +18238,1.055 +18239,0.325 +18240,1.428 +18241,-0.618 +18242,-1.582 +18243,-2.461 +18244,0.216 +18245,-1.611 +18246,-0.273 +18247,-0.449 +18248,1.020 +18249,-0.185 +18250,0.533 +18251,0.218 +18252,-0.405 +18253,0.925 +18254,0.893 +18255,-1.077 +18256,-1.586 +18257,-2.175 +18258,-1.696 +18259,-3.660 +18260,-1.580 +18261,0.970 +18262,-0.907 +18263,1.011 +18264,-0.634 +18265,0.494 +18266,-0.443 +18267,-1.218 +18268,-1.581 +18269,-0.140 +18270,-0.645 +18271,0.396 +18272,0.624 +18273,0.446 +18274,-2.164 +18275,0.270 +18276,0.764 +18277,-0.477 +18278,0.639 +18279,1.046 +18280,-1.731 +18281,-0.387 +18282,0.999 +18283,-0.169 +18284,-0.404 +18285,-1.012 +18286,-0.618 +18287,0.542 +18288,-1.139 +18289,-1.182 +18290,-0.682 +18291,-0.060 +18292,0.419 +18293,0.090 +18294,0.027 +18295,0.165 +18296,0.644 +18297,0.929 +18298,-0.950 +18299,-0.213 +18300,-0.129 +18301,-2.394 +18302,0.391 +18303,0.294 +18304,-2.275 +18305,-0.056 +18306,-0.881 +18307,0.642 +18308,0.488 +18309,1.757 +18310,-0.572 +18311,0.616 +18312,0.869 +18313,-1.282 +18314,-0.413 +18315,-0.399 +18316,1.376 +18317,-1.973 +18318,-0.740 +18319,-1.055 +18320,0.425 +18321,0.404 +18322,-0.158 +18323,0.391 +18324,-1.469 +18325,-2.313 +18326,-0.912 +18327,0.388 +18328,1.245 +18329,0.193 +18330,-0.322 +18331,-0.181 +18332,-1.248 +18333,-0.682 +18334,-0.635 +18335,-2.288 +18336,-0.422 +18337,-0.910 +18338,0.133 +18339,0.853 +18340,-1.641 +18341,-1.359 +18342,-1.559 +18343,-1.546 +18344,1.067 +18345,1.228 +18346,0.466 +18347,-1.593 +18348,0.016 +18349,0.551 +18350,-0.603 +18351,1.578 +18352,0.346 +18353,-0.073 +18354,0.680 +18355,-1.568 +18356,-0.879 +18357,0.103 +18358,0.080 +18359,0.571 +18360,0.919 +18361,0.434 +18362,0.844 +18363,-0.870 +18364,1.168 +18365,-0.888 +18366,0.571 +18367,-0.965 +18368,-0.347 +18369,0.075 +18370,0.161 +18371,1.510 +18372,0.926 +18373,-0.240 +18374,1.090 +18375,0.267 +18376,1.319 +18377,-0.184 +18378,-0.397 +18379,-0.269 +18380,-0.397 +18381,0.431 +18382,-0.238 +18383,0.710 +18384,-0.748 +18385,-0.536 +18386,1.141 +18387,0.187 +18388,1.400 +18389,-0.376 +18390,-0.606 +18391,0.440 +18392,-0.190 +18393,0.334 +18394,-1.613 +18395,-0.117 +18396,-0.886 +18397,0.043 +18398,0.833 +18399,0.105 +18400,-0.902 +18401,-0.976 +18402,0.776 +18403,1.324 +18404,-0.208 +18405,0.483 +18406,-1.675 +18407,1.152 +18408,0.848 +18409,-0.729 +18410,0.677 +18411,1.986 +18412,1.460 +18413,-0.552 +18414,0.243 +18415,-0.189 +18416,0.596 +18417,0.478 +18418,-0.615 +18419,-0.525 +18420,0.345 +18421,0.225 +18422,-2.073 +18423,0.383 +18424,0.221 +18425,-0.128 +18426,-0.935 +18427,-0.783 +18428,-0.075 +18429,0.463 +18430,0.434 +18431,1.069 +18432,-0.863 +18433,-0.744 +18434,1.334 +18435,-0.129 +18436,-1.712 +18437,0.658 +18438,-0.440 +18439,-1.202 +18440,0.506 +18441,-1.180 +18442,0.020 +18443,1.226 +18444,-1.934 +18445,1.112 +18446,-1.394 +18447,-0.743 +18448,-0.237 +18449,-1.296 +18450,-0.565 +18451,1.063 +18452,1.884 +18453,2.131 +18454,1.181 +18455,0.769 +18456,-0.111 +18457,0.821 +18458,1.027 +18459,1.735 +18460,-0.685 +18461,1.593 +18462,-0.355 +18463,-0.117 +18464,0.681 +18465,-0.862 +18466,0.949 +18467,0.733 +18468,0.929 +18469,0.098 +18470,-1.416 +18471,1.219 +18472,0.772 +18473,-0.050 +18474,0.504 +18475,1.228 +18476,0.207 +18477,0.579 +18478,-1.582 +18479,0.674 +18480,-1.363 +18481,0.137 +18482,0.550 +18483,-0.149 +18484,1.090 +18485,0.994 +18486,-0.596 +18487,1.708 +18488,0.082 +18489,0.964 +18490,0.596 +18491,0.236 +18492,0.031 +18493,-0.365 +18494,0.608 +18495,-0.421 +18496,-0.075 +18497,-0.531 +18498,-0.243 +18499,0.026 +18500,-0.937 +18501,-1.031 +18502,0.488 +18503,0.219 +18504,-0.248 +18505,0.860 +18506,-0.844 +18507,0.585 +18508,-0.533 +18509,-0.013 +18510,0.163 +18511,0.224 +18512,-0.549 +18513,0.006 +18514,0.002 +18515,-1.359 +18516,-1.995 +18517,0.965 +18518,-0.127 +18519,-1.380 +18520,-1.187 +18521,-0.071 +18522,1.601 +18523,0.339 +18524,0.135 +18525,-0.353 +18526,0.344 +18527,-0.205 +18528,0.187 +18529,-1.222 +18530,-0.566 +18531,0.094 +18532,-1.693 +18533,0.045 +18534,0.076 +18535,-1.438 +18536,-0.473 +18537,-0.101 +18538,-0.625 +18539,1.601 +18540,0.372 +18541,0.034 +18542,1.269 +18543,-1.765 +18544,-2.466 +18545,0.622 +18546,0.508 +18547,0.700 +18548,1.311 +18549,-0.326 +18550,2.180 +18551,-1.527 +18552,1.130 +18553,-0.420 +18554,-1.725 +18555,-0.232 +18556,0.661 +18557,1.383 +18558,0.573 +18559,1.160 +18560,-0.236 +18561,-0.167 +18562,-0.454 +18563,0.157 +18564,-0.062 +18565,-0.974 +18566,-0.476 +18567,1.901 +18568,-0.654 +18569,-0.690 +18570,1.881 +18571,1.004 +18572,0.508 +18573,0.649 +18574,0.634 +18575,-0.769 +18576,-1.317 +18577,2.273 +18578,0.401 +18579,-0.562 +18580,-0.763 +18581,-1.493 +18582,0.060 +18583,-0.238 +18584,1.697 +18585,-0.885 +18586,0.975 +18587,-0.693 +18588,1.799 +18589,1.252 +18590,0.669 +18591,1.186 +18592,-1.153 +18593,0.408 +18594,-0.650 +18595,-0.396 +18596,0.210 +18597,-0.042 +18598,1.702 +18599,1.208 +18600,0.959 +18601,0.023 +18602,0.526 +18603,0.453 +18604,0.861 +18605,0.259 +18606,0.636 +18607,-0.624 +18608,0.147 +18609,0.116 +18610,0.005 +18611,0.375 +18612,3.040 +18613,-0.845 +18614,-0.884 +18615,1.163 +18616,0.874 +18617,0.338 +18618,0.546 +18619,-0.822 +18620,0.799 +18621,-0.872 +18622,-0.435 +18623,0.303 +18624,0.573 +18625,1.703 +18626,-0.990 +18627,1.038 +18628,-0.451 +18629,-0.560 +18630,-1.940 +18631,0.770 +18632,1.550 +18633,-0.291 +18634,-0.094 +18635,1.029 +18636,-0.723 +18637,0.332 +18638,1.814 +18639,0.196 +18640,-0.869 +18641,0.203 +18642,0.987 +18643,-0.654 +18644,-0.468 +18645,1.161 +18646,-0.818 +18647,0.051 +18648,3.540 +18649,-1.551 +18650,1.063 +18651,-0.405 +18652,-0.151 +18653,0.349 +18654,0.355 +18655,-0.172 +18656,1.837 +18657,0.088 +18658,0.448 +18659,-0.999 +18660,2.172 +18661,-0.447 +18662,-0.678 +18663,-0.388 +18664,-0.128 +18665,0.582 +18666,-0.131 +18667,0.726 +18668,-0.637 +18669,0.501 +18670,0.650 +18671,2.312 +18672,-1.744 +18673,-0.555 +18674,2.035 +18675,-0.106 +18676,-0.041 +18677,-0.342 +18678,0.171 +18679,0.948 +18680,-1.768 +18681,0.340 +18682,-0.382 +18683,-1.612 +18684,2.008 +18685,-0.031 +18686,0.134 +18687,-0.048 +18688,-0.167 +18689,0.898 +18690,-1.121 +18691,-0.448 +18692,0.888 +18693,0.161 +18694,0.536 +18695,-0.919 +18696,0.252 +18697,0.323 +18698,-0.385 +18699,0.355 +18700,0.395 +18701,-1.669 +18702,-0.036 +18703,1.343 +18704,-1.472 +18705,0.752 +18706,-0.926 +18707,0.633 +18708,0.465 +18709,-0.080 +18710,0.173 +18711,1.032 +18712,1.290 +18713,0.283 +18714,-0.871 +18715,-2.286 +18716,0.741 +18717,0.932 +18718,1.128 +18719,-0.893 +18720,1.256 +18721,-1.473 +18722,-0.407 +18723,1.377 +18724,-1.466 +18725,0.841 +18726,-1.354 +18727,-0.894 +18728,1.033 +18729,1.012 +18730,-1.752 +18731,0.097 +18732,-0.843 +18733,-0.081 +18734,1.568 +18735,0.000 +18736,1.216 +18737,-0.811 +18738,-0.072 +18739,-0.540 +18740,1.527 +18741,0.409 +18742,-0.802 +18743,-0.340 +18744,0.428 +18745,1.919 +18746,0.930 +18747,1.020 +18748,-0.812 +18749,1.420 +18750,0.666 +18751,-0.429 +18752,-0.567 +18753,0.517 +18754,-0.949 +18755,-0.202 +18756,-0.299 +18757,-0.417 +18758,0.236 +18759,-0.416 +18760,-0.879 +18761,0.299 +18762,1.001 +18763,1.323 +18764,0.184 +18765,-0.705 +18766,-1.520 +18767,0.919 +18768,0.850 +18769,1.163 +18770,0.137 +18771,0.335 +18772,0.831 +18773,-2.724 +18774,-1.012 +18775,-0.307 +18776,-0.730 +18777,-1.197 +18778,-1.377 +18779,0.208 +18780,-1.728 +18781,0.674 +18782,-1.654 +18783,1.569 +18784,-1.178 +18785,-0.736 +18786,-1.101 +18787,-0.352 +18788,0.501 +18789,0.808 +18790,0.132 +18791,0.802 +18792,2.036 +18793,-1.229 +18794,-0.408 +18795,-0.985 +18796,0.580 +18797,-1.254 +18798,-1.570 +18799,0.134 +18800,1.170 +18801,-0.613 +18802,-0.855 +18803,-1.197 +18804,0.686 +18805,1.556 +18806,0.222 +18807,-2.484 +18808,1.489 +18809,-1.359 +18810,0.481 +18811,0.810 +18812,0.240 +18813,0.070 +18814,-0.519 +18815,0.783 +18816,-0.492 +18817,-0.086 +18818,1.541 +18819,-1.426 +18820,-1.640 +18821,0.556 +18822,0.286 +18823,-1.588 +18824,-0.151 +18825,1.218 +18826,1.355 +18827,-0.874 +18828,0.124 +18829,-1.153 +18830,0.847 +18831,-0.742 +18832,-0.379 +18833,-0.626 +18834,0.240 +18835,0.256 +18836,-0.254 +18837,-0.259 +18838,1.179 +18839,0.870 +18840,0.530 +18841,-0.591 +18842,0.492 +18843,-0.137 +18844,-0.227 +18845,-0.393 +18846,-0.798 +18847,-1.530 +18848,-0.362 +18849,0.351 +18850,-1.422 +18851,0.090 +18852,-0.884 +18853,1.622 +18854,0.175 +18855,1.933 +18856,0.530 +18857,0.109 +18858,-0.722 +18859,0.429 +18860,0.579 +18861,-0.542 +18862,0.587 +18863,1.975 +18864,0.720 +18865,2.413 +18866,-0.418 +18867,-0.836 +18868,-0.870 +18869,-0.392 +18870,0.676 +18871,-0.951 +18872,1.012 +18873,-1.031 +18874,1.417 +18875,0.433 +18876,0.575 +18877,-0.455 +18878,-0.062 +18879,0.475 +18880,-0.829 +18881,0.998 +18882,0.133 +18883,1.029 +18884,0.019 +18885,1.366 +18886,1.592 +18887,0.379 +18888,-0.298 +18889,1.153 +18890,0.173 +18891,0.575 +18892,0.478 +18893,-0.778 +18894,0.270 +18895,-0.066 +18896,1.385 +18897,0.793 +18898,-0.174 +18899,0.240 +18900,-0.052 +18901,0.497 +18902,0.319 +18903,-1.892 +18904,0.583 +18905,-0.945 +18906,1.480 +18907,2.899 +18908,0.719 +18909,-0.534 +18910,-0.928 +18911,0.098 +18912,1.741 +18913,-0.383 +18914,2.358 +18915,0.691 +18916,-0.936 +18917,1.202 +18918,-0.840 +18919,-0.930 +18920,0.723 +18921,-1.333 +18922,0.700 +18923,-1.101 +18924,0.032 +18925,-0.313 +18926,-1.286 +18927,-0.075 +18928,2.001 +18929,-0.194 +18930,-0.408 +18931,-1.370 +18932,-0.770 +18933,-2.504 +18934,0.500 +18935,-1.287 +18936,-0.831 +18937,-0.135 +18938,0.174 +18939,-0.018 +18940,-0.415 +18941,0.286 +18942,2.039 +18943,-0.643 +18944,-1.502 +18945,1.445 +18946,-0.805 +18947,-0.568 +18948,-0.586 +18949,-0.612 +18950,0.092 +18951,1.263 +18952,-0.114 +18953,-0.744 +18954,0.155 +18955,-0.856 +18956,-1.521 +18957,-0.101 +18958,1.036 +18959,2.001 +18960,1.558 +18961,-0.279 +18962,-0.211 +18963,-0.030 +18964,-1.409 +18965,0.454 +18966,-1.217 +18967,-0.588 +18968,-1.007 +18969,0.203 +18970,1.927 +18971,0.364 +18972,-0.327 +18973,0.737 +18974,-1.247 +18975,0.939 +18976,1.184 +18977,-0.157 +18978,-0.907 +18979,0.435 +18980,0.047 +18981,-1.660 +18982,-0.478 +18983,0.285 +18984,-0.002 +18985,-1.356 +18986,-1.037 +18987,-1.887 +18988,0.031 +18989,1.068 +18990,1.353 +18991,-0.447 +18992,-0.583 +18993,0.129 +18994,-0.544 +18995,-0.918 +18996,-1.249 +18997,-1.752 +18998,-1.704 +18999,-0.348 +19000,-1.389 +19001,-1.022 +19002,-0.289 +19003,0.460 +19004,-1.845 +19005,1.014 +19006,-0.834 +19007,0.611 +19008,1.368 +19009,-0.038 +19010,0.742 +19011,0.174 +19012,-0.910 +19013,-1.469 +19014,-0.810 +19015,-0.374 +19016,-1.555 +19017,0.572 +19018,-0.052 +19019,-0.356 +19020,1.398 +19021,0.454 +19022,-0.567 +19023,-0.590 +19024,-0.381 +19025,-1.301 +19026,-0.104 +19027,0.868 +19028,1.301 +19029,-1.044 +19030,1.566 +19031,0.270 +19032,-0.175 +19033,-1.599 +19034,0.321 +19035,1.284 +19036,0.606 +19037,0.411 +19038,-0.651 +19039,0.300 +19040,-0.249 +19041,-0.523 +19042,2.097 +19043,1.205 +19044,-1.665 +19045,-0.228 +19046,1.451 +19047,0.824 +19048,-1.214 +19049,0.631 +19050,-0.822 +19051,-0.669 +19052,-0.841 +19053,0.685 +19054,1.248 +19055,0.447 +19056,-1.303 +19057,-1.496 +19058,-0.667 +19059,1.726 +19060,-0.061 +19061,0.029 +19062,-3.329 +19063,-0.901 +19064,0.526 +19065,1.026 +19066,1.848 +19067,1.422 +19068,-0.976 +19069,-0.210 +19070,0.810 +19071,-0.546 +19072,1.352 +19073,0.179 +19074,-0.272 +19075,-0.512 +19076,0.360 +19077,0.702 +19078,-1.182 +19079,1.077 +19080,1.556 +19081,-0.394 +19082,-0.386 +19083,-0.748 +19084,-0.303 +19085,0.084 +19086,-0.385 +19087,0.304 +19088,-0.005 +19089,-0.369 +19090,-0.281 +19091,1.362 +19092,-0.531 +19093,-1.806 +19094,1.324 +19095,-0.487 +19096,-1.992 +19097,-0.516 +19098,0.014 +19099,-1.832 +19100,-0.751 +19101,-2.577 +19102,-0.262 +19103,-0.202 +19104,0.728 +19105,1.023 +19106,0.715 +19107,-0.400 +19108,-1.315 +19109,1.013 +19110,-0.318 +19111,-0.041 +19112,1.720 +19113,-0.133 +19114,0.197 +19115,0.316 +19116,0.941 +19117,-0.476 +19118,-1.383 +19119,-2.100 +19120,-0.698 +19121,2.474 +19122,0.935 +19123,-1.509 +19124,0.953 +19125,1.741 +19126,-0.091 +19127,-0.069 +19128,0.723 +19129,-0.911 +19130,0.217 +19131,-0.430 +19132,0.763 +19133,0.251 +19134,0.335 +19135,0.202 +19136,0.864 +19137,-0.396 +19138,-2.513 +19139,-1.424 +19140,0.220 +19141,1.296 +19142,0.784 +19143,1.183 +19144,-0.828 +19145,-1.497 +19146,0.389 +19147,-0.186 +19148,-0.945 +19149,0.709 +19150,-1.318 +19151,-0.463 +19152,-0.627 +19153,-1.144 +19154,-1.479 +19155,-0.436 +19156,0.588 +19157,-0.346 +19158,1.226 +19159,1.191 +19160,2.019 +19161,-1.109 +19162,0.110 +19163,0.252 +19164,-1.010 +19165,-0.265 +19166,0.678 +19167,0.545 +19168,-0.305 +19169,1.602 +19170,1.056 +19171,-0.771 +19172,-0.642 +19173,0.511 +19174,0.317 +19175,1.746 +19176,-0.070 +19177,0.128 +19178,-1.102 +19179,2.097 +19180,0.102 +19181,0.553 +19182,-0.458 +19183,-0.134 +19184,0.006 +19185,0.513 +19186,1.010 +19187,-0.583 +19188,-0.357 +19189,-0.033 +19190,-0.266 +19191,0.300 +19192,1.406 +19193,-0.287 +19194,0.032 +19195,0.283 +19196,0.217 +19197,-0.656 +19198,1.181 +19199,-0.619 +19200,1.384 +19201,-0.363 +19202,-0.256 +19203,0.029 +19204,-0.069 +19205,-0.557 +19206,0.121 +19207,-0.444 +19208,-1.208 +19209,-0.157 +19210,0.029 +19211,1.586 +19212,-0.275 +19213,-0.188 +19214,-0.353 +19215,-0.368 +19216,0.721 +19217,-0.086 +19218,-1.543 +19219,0.245 +19220,0.969 +19221,1.461 +19222,-1.139 +19223,0.673 +19224,0.471 +19225,0.123 +19226,-1.002 +19227,2.292 +19228,-0.166 +19229,1.150 +19230,0.792 +19231,0.529 +19232,1.445 +19233,-0.883 +19234,-0.489 +19235,-0.191 +19236,0.860 +19237,0.520 +19238,0.043 +19239,-0.644 +19240,-0.305 +19241,-1.504 +19242,-0.101 +19243,-0.070 +19244,0.939 +19245,-0.075 +19246,-0.629 +19247,1.718 +19248,-1.398 +19249,1.212 +19250,0.218 +19251,0.407 +19252,0.225 +19253,-0.288 +19254,-0.310 +19255,-1.438 +19256,1.592 +19257,1.115 +19258,0.635 +19259,-1.492 +19260,-0.523 +19261,-0.213 +19262,-0.402 +19263,1.063 +19264,-0.013 +19265,-0.474 +19266,-0.822 +19267,0.121 +19268,-0.814 +19269,-0.498 +19270,0.807 +19271,-0.311 +19272,0.455 +19273,-0.816 +19274,0.950 +19275,0.174 +19276,-0.693 +19277,-0.121 +19278,0.256 +19279,1.476 +19280,0.467 +19281,-0.167 +19282,-0.211 +19283,-0.491 +19284,0.383 +19285,-0.879 +19286,0.063 +19287,-0.263 +19288,1.722 +19289,-0.758 +19290,1.298 +19291,0.767 +19292,0.865 +19293,-1.097 +19294,0.076 +19295,1.830 +19296,-1.106 +19297,-0.917 +19298,-1.105 +19299,-0.733 +19300,0.362 +19301,1.084 +19302,-1.042 +19303,-1.341 +19304,-0.562 +19305,-1.011 +19306,0.942 +19307,0.523 +19308,0.355 +19309,-0.569 +19310,-0.566 +19311,-0.847 +19312,-0.875 +19313,1.125 +19314,-0.004 +19315,1.451 +19316,0.422 +19317,-0.711 +19318,0.225 +19319,-0.539 +19320,0.637 +19321,-0.684 +19322,0.830 +19323,-0.641 +19324,0.229 +19325,0.892 +19326,-1.870 +19327,0.242 +19328,0.266 +19329,0.826 +19330,0.441 +19331,1.569 +19332,0.973 +19333,0.252 +19334,0.076 +19335,-0.095 +19336,2.719 +19337,1.374 +19338,-1.287 +19339,0.847 +19340,0.834 +19341,-1.498 +19342,0.419 +19343,-0.533 +19344,0.431 +19345,1.218 +19346,1.279 +19347,1.160 +19348,-1.048 +19349,2.715 +19350,0.013 +19351,-0.481 +19352,1.448 +19353,0.707 +19354,-0.467 +19355,-0.569 +19356,-1.503 +19357,0.551 +19358,0.530 +19359,0.287 +19360,0.270 +19361,-0.305 +19362,-0.542 +19363,0.615 +19364,0.326 +19365,1.109 +19366,0.756 +19367,0.540 +19368,-0.052 +19369,-0.382 +19370,0.438 +19371,-1.465 +19372,-0.000 +19373,1.284 +19374,1.008 +19375,-0.155 +19376,-0.254 +19377,0.585 +19378,-0.065 +19379,-1.731 +19380,-1.034 +19381,1.253 +19382,-1.791 +19383,0.755 +19384,-0.564 +19385,1.819 +19386,0.716 +19387,-2.217 +19388,0.998 +19389,-0.858 +19390,0.099 +19391,-0.824 +19392,-1.376 +19393,1.163 +19394,0.393 +19395,-0.733 +19396,-0.040 +19397,-0.206 +19398,-0.736 +19399,-0.034 +19400,1.597 +19401,-0.889 +19402,-0.629 +19403,0.183 +19404,-0.303 +19405,-0.956 +19406,-0.720 +19407,0.592 +19408,-1.011 +19409,0.231 +19410,0.826 +19411,0.699 +19412,0.239 +19413,0.572 +19414,0.952 +19415,-1.976 +19416,-0.715 +19417,0.648 +19418,0.466 +19419,-0.911 +19420,-0.368 +19421,-0.562 +19422,-2.391 +19423,-0.290 +19424,-0.065 +19425,-0.128 +19426,1.757 +19427,-0.052 +19428,-1.090 +19429,-0.267 +19430,1.247 +19431,-1.841 +19432,1.025 +19433,0.363 +19434,1.188 +19435,-1.382 +19436,-0.113 +19437,-0.823 +19438,2.263 +19439,-0.931 +19440,1.193 +19441,0.372 +19442,-0.298 +19443,-0.679 +19444,0.153 +19445,-0.458 +19446,0.113 +19447,-2.278 +19448,2.115 +19449,-0.585 +19450,-0.849 +19451,-0.690 +19452,-0.568 +19453,-0.192 +19454,0.587 +19455,-0.697 +19456,-1.393 +19457,0.881 +19458,0.910 +19459,-0.274 +19460,0.041 +19461,-0.285 +19462,0.017 +19463,0.846 +19464,-0.926 +19465,2.269 +19466,-1.746 +19467,0.101 +19468,-0.756 +19469,-0.725 +19470,1.602 +19471,0.928 +19472,0.938 +19473,1.502 +19474,-1.282 +19475,-0.267 +19476,0.359 +19477,0.037 +19478,0.504 +19479,-1.122 +19480,-0.995 +19481,0.045 +19482,0.595 +19483,-0.645 +19484,0.023 +19485,-0.446 +19486,0.224 +19487,1.004 +19488,-0.493 +19489,1.300 +19490,-0.418 +19491,0.177 +19492,1.065 +19493,1.185 +19494,0.665 +19495,-0.844 +19496,-0.847 +19497,0.154 +19498,-0.206 +19499,0.620 +19500,-2.332 +19501,-0.202 +19502,0.548 +19503,-0.437 +19504,0.056 +19505,0.647 +19506,0.027 +19507,-0.274 +19508,1.559 +19509,-1.134 +19510,0.902 +19511,-1.275 +19512,0.415 +19513,-0.264 +19514,-2.519 +19515,-1.395 +19516,-0.315 +19517,-0.646 +19518,0.359 +19519,-0.295 +19520,-0.388 +19521,-2.112 +19522,0.098 +19523,-0.693 +19524,-1.062 +19525,-0.892 +19526,0.233 +19527,0.875 +19528,1.063 +19529,-0.772 +19530,0.019 +19531,-0.525 +19532,-0.337 +19533,-0.750 +19534,-1.122 +19535,-0.686 +19536,-0.213 +19537,0.052 +19538,0.028 +19539,-1.458 +19540,-0.607 +19541,0.816 +19542,-0.362 +19543,-0.062 +19544,0.934 +19545,-1.304 +19546,-0.229 +19547,-0.802 +19548,-0.317 +19549,0.811 +19550,-0.518 +19551,2.808 +19552,0.038 +19553,-1.367 +19554,0.877 +19555,-1.630 +19556,-0.333 +19557,-1.892 +19558,0.041 +19559,0.192 +19560,-1.341 +19561,0.431 +19562,1.647 +19563,-2.741 +19564,-1.201 +19565,0.504 +19566,-0.434 +19567,-0.359 +19568,-0.481 +19569,0.799 +19570,-0.539 +19571,1.006 +19572,-0.386 +19573,0.080 +19574,0.973 +19575,-0.836 +19576,0.218 +19577,-0.649 +19578,-1.180 +19579,2.157 +19580,-0.023 +19581,-0.324 +19582,0.162 +19583,-2.119 +19584,-0.625 +19585,-0.751 +19586,1.044 +19587,1.280 +19588,0.106 +19589,-0.432 +19590,-0.016 +19591,0.241 +19592,-0.100 +19593,0.542 +19594,-0.026 +19595,-1.960 +19596,0.640 +19597,0.573 +19598,0.021 +19599,-2.250 +19600,0.093 +19601,1.952 +19602,0.891 +19603,1.960 +19604,0.962 +19605,0.574 +19606,1.137 +19607,-0.018 +19608,-0.661 +19609,0.472 +19610,0.435 +19611,-0.152 +19612,0.623 +19613,2.389 +19614,0.463 +19615,-0.472 +19616,-0.037 +19617,0.332 +19618,-0.390 +19619,-0.804 +19620,0.140 +19621,1.367 +19622,-0.104 +19623,2.075 +19624,-0.758 +19625,-0.057 +19626,0.423 +19627,-0.082 +19628,-0.286 +19629,0.121 +19630,-0.264 +19631,-0.022 +19632,-2.039 +19633,-1.164 +19634,-1.011 +19635,0.206 +19636,-0.869 +19637,0.842 +19638,0.143 +19639,0.903 +19640,-0.394 +19641,0.372 +19642,0.236 +19643,-0.368 +19644,0.196 +19645,0.141 +19646,2.144 +19647,-0.642 +19648,-0.088 +19649,-0.182 +19650,-0.207 +19651,-1.616 +19652,-1.382 +19653,-0.173 +19654,0.020 +19655,-0.195 +19656,-2.198 +19657,0.347 +19658,1.513 +19659,0.327 +19660,-0.361 +19661,-1.066 +19662,0.137 +19663,-0.763 +19664,2.091 +19665,0.561 +19666,-0.829 +19667,-0.790 +19668,-1.103 +19669,1.975 +19670,0.568 +19671,0.250 +19672,1.215 +19673,0.904 +19674,0.145 +19675,-1.304 +19676,0.070 +19677,1.986 +19678,0.819 +19679,1.946 +19680,0.942 +19681,0.200 +19682,-0.307 +19683,-0.556 +19684,-0.296 +19685,-1.011 +19686,0.427 +19687,-0.871 +19688,0.024 +19689,0.860 +19690,-2.622 +19691,-1.492 +19692,0.190 +19693,1.687 +19694,0.189 +19695,0.985 +19696,0.979 +19697,1.372 +19698,0.661 +19699,0.552 +19700,-0.912 +19701,-0.276 +19702,0.448 +19703,-0.357 +19704,-1.971 +19705,0.806 +19706,1.652 +19707,-0.100 +19708,0.371 +19709,-0.064 +19710,0.761 +19711,0.515 +19712,-0.246 +19713,0.185 +19714,-0.412 +19715,-0.394 +19716,1.139 +19717,1.194 +19718,-0.532 +19719,1.085 +19720,-2.266 +19721,-0.771 +19722,2.768 +19723,0.391 +19724,0.100 +19725,0.370 +19726,-0.705 +19727,-1.958 +19728,0.149 +19729,1.919 +19730,-0.774 +19731,-0.449 +19732,0.468 +19733,-1.118 +19734,-0.115 +19735,0.193 +19736,1.493 +19737,-0.477 +19738,-0.039 +19739,-1.447 +19740,1.413 +19741,1.517 +19742,0.692 +19743,-0.876 +19744,-1.730 +19745,0.294 +19746,-0.681 +19747,-0.791 +19748,1.775 +19749,-1.592 +19750,1.342 +19751,-0.225 +19752,-0.645 +19753,-0.398 +19754,-0.799 +19755,0.776 +19756,0.991 +19757,-0.515 +19758,1.275 +19759,0.510 +19760,-0.690 +19761,-0.318 +19762,1.113 +19763,-0.671 +19764,1.212 +19765,-0.389 +19766,0.119 +19767,-2.693 +19768,0.546 +19769,-0.381 +19770,0.917 +19771,-1.205 +19772,0.158 +19773,-0.799 +19774,0.623 +19775,-1.902 +19776,-0.403 +19777,0.028 +19778,-0.667 +19779,-0.008 +19780,-0.229 +19781,-2.359 +19782,0.980 +19783,-0.291 +19784,0.233 +19785,0.149 +19786,0.598 +19787,-0.156 +19788,-0.706 +19789,-0.291 +19790,0.535 +19791,-0.188 +19792,0.844 +19793,1.033 +19794,-2.114 +19795,0.583 +19796,-1.621 +19797,-1.435 +19798,0.277 +19799,-1.876 +19800,0.879 +19801,-0.281 +19802,-0.956 +19803,0.753 +19804,0.305 +19805,-0.071 +19806,0.155 +19807,-0.513 +19808,0.989 +19809,0.079 +19810,1.288 +19811,-0.163 +19812,-0.373 +19813,-1.135 +19814,0.095 +19815,-0.966 +19816,1.202 +19817,0.991 +19818,0.058 +19819,1.243 +19820,0.785 +19821,0.049 +19822,-1.342 +19823,-0.110 +19824,-1.661 +19825,-0.175 +19826,0.999 +19827,0.139 +19828,0.507 +19829,-0.535 +19830,-0.374 +19831,-0.136 +19832,1.218 +19833,-0.298 +19834,-2.402 +19835,0.134 +19836,-0.427 +19837,-1.375 +19838,0.336 +19839,0.640 +19840,0.574 +19841,0.340 +19842,-0.194 +19843,0.356 +19844,-1.885 +19845,0.159 +19846,-1.532 +19847,-0.609 +19848,0.994 +19849,0.499 +19850,-0.753 +19851,1.534 +19852,-0.718 +19853,0.743 +19854,0.095 +19855,0.078 +19856,1.282 +19857,0.224 +19858,0.566 +19859,0.576 +19860,0.401 +19861,0.847 +19862,0.283 +19863,-0.088 +19864,0.473 +19865,1.105 +19866,-1.617 +19867,-0.264 +19868,-1.307 +19869,0.452 +19870,0.331 +19871,-1.243 +19872,0.512 +19873,0.012 +19874,0.540 +19875,-1.002 +19876,0.809 +19877,0.372 +19878,-0.810 +19879,-0.186 +19880,-0.603 +19881,0.885 +19882,-0.785 +19883,-1.219 +19884,2.401 +19885,-0.421 +19886,-0.287 +19887,0.247 +19888,-0.448 +19889,-0.935 +19890,1.294 +19891,-0.366 +19892,-1.056 +19893,1.840 +19894,-1.447 +19895,-0.370 +19896,-0.018 +19897,0.006 +19898,-0.115 +19899,0.169 +19900,0.029 +19901,0.594 +19902,0.236 +19903,-0.622 +19904,1.111 +19905,-1.284 +19906,-1.435 +19907,1.487 +19908,-0.937 +19909,1.320 +19910,1.362 +19911,-0.119 +19912,-0.286 +19913,-0.863 +19914,-0.705 +19915,-0.122 +19916,1.530 +19917,-0.688 +19918,0.436 +19919,-0.727 +19920,0.425 +19921,0.462 +19922,0.053 +19923,0.875 +19924,-0.565 +19925,0.349 +19926,-0.732 +19927,0.012 +19928,-1.333 +19929,0.843 +19930,-1.163 +19931,-0.058 +19932,0.046 +19933,-0.537 +19934,-2.414 +19935,0.686 +19936,-0.606 +19937,0.357 +19938,-0.372 +19939,0.597 +19940,1.076 +19941,-1.017 +19942,-1.250 +19943,-0.281 +19944,0.122 +19945,-0.385 +19946,-0.621 +19947,-1.977 +19948,0.335 +19949,-1.850 +19950,1.104 +19951,-1.582 +19952,1.724 +19953,0.258 +19954,-0.842 +19955,0.016 +19956,0.534 +19957,0.056 +19958,1.690 +19959,-0.048 +19960,0.463 +19961,-0.111 +19962,0.429 +19963,-0.445 +19964,-0.333 +19965,-0.322 +19966,2.084 +19967,-0.399 +19968,-1.054 +19969,-0.325 +19970,0.978 +19971,-1.366 +19972,0.840 +19973,0.378 +19974,-1.060 +19975,-1.017 +19976,2.632 +19977,-1.058 +19978,1.412 +19979,0.103 +19980,-1.631 +19981,0.214 +19982,-0.234 +19983,-0.355 +19984,-0.700 +19985,-0.187 +19986,-0.074 +19987,-0.804 +19988,-0.666 +19989,1.116 +19990,-1.679 +19991,0.365 +19992,-0.788 +19993,-2.621 +19994,0.684 +19995,0.759 +19996,-0.562 +19997,-0.801 +19998,-1.805 +19999,0.847 +20000,-0.595 +20001,-1.496 +20002,2.264 +20003,1.405 +20004,-0.678 +20005,-0.630 +20006,0.003 +20007,-0.409 +20008,1.104 +20009,1.026 +20010,0.908 +20011,1.148 +20012,0.245 +20013,0.637 +20014,1.138 +20015,-0.846 +20016,-0.444 +20017,-0.355 +20018,0.023 +20019,-1.356 +20020,-0.361 +20021,-0.830 +20022,-0.546 +20023,-0.150 +20024,1.366 +20025,0.680 +20026,-1.462 +20027,-0.222 +20028,0.075 +20029,1.577 +20030,0.961 +20031,-1.223 +20032,-0.060 +20033,-0.402 +20034,0.093 +20035,1.015 +20036,0.015 +20037,-1.390 +20038,-0.360 +20039,1.592 +20040,0.774 +20041,0.002 +20042,0.968 +20043,1.280 +20044,-0.242 +20045,-1.020 +20046,0.227 +20047,-0.750 +20048,-0.773 +20049,-0.037 +20050,-0.588 +20051,1.077 +20052,-1.309 +20053,1.080 +20054,0.369 +20055,-1.662 +20056,-0.553 +20057,-1.390 +20058,-0.415 +20059,0.170 +20060,-0.002 +20061,-0.383 +20062,0.632 +20063,1.583 +20064,1.563 +20065,-0.008 +20066,-0.617 +20067,0.441 +20068,0.793 +20069,0.119 +20070,-1.491 +20071,-0.303 +20072,0.822 +20073,-1.478 +20074,-1.084 +20075,-0.181 +20076,0.546 +20077,0.364 +20078,0.640 +20079,0.394 +20080,-2.855 +20081,-0.884 +20082,0.482 +20083,1.266 +20084,-0.251 +20085,-0.149 +20086,-1.056 +20087,0.355 +20088,-1.200 +20089,-0.900 +20090,-1.151 +20091,0.174 +20092,0.021 +20093,1.477 +20094,0.907 +20095,-0.801 +20096,-0.285 +20097,-0.278 +20098,-0.822 +20099,-0.331 +20100,0.138 +20101,-0.463 +20102,-2.422 +20103,1.051 +20104,-1.333 +20105,1.148 +20106,-1.355 +20107,0.217 +20108,1.661 +20109,-1.215 +20110,0.746 +20111,1.492 +20112,1.223 +20113,-1.746 +20114,0.891 +20115,-0.112 +20116,-0.121 +20117,-0.095 +20118,-0.742 +20119,0.037 +20120,-0.099 +20121,0.202 +20122,0.173 +20123,-0.569 +20124,-1.027 +20125,0.235 +20126,-1.879 +20127,0.296 +20128,0.698 +20129,0.837 +20130,0.078 +20131,-0.173 +20132,0.457 +20133,0.569 +20134,1.484 +20135,-2.311 +20136,0.167 +20137,-1.742 +20138,-0.586 +20139,0.719 +20140,0.235 +20141,0.232 +20142,-0.093 +20143,-1.102 +20144,-0.552 +20145,-0.474 +20146,0.242 +20147,-0.023 +20148,0.150 +20149,2.339 +20150,0.293 +20151,0.420 +20152,-0.304 +20153,1.540 +20154,1.188 +20155,-0.723 +20156,2.290 +20157,0.570 +20158,-0.380 +20159,-0.669 +20160,0.221 +20161,-0.167 +20162,1.060 +20163,-1.092 +20164,1.145 +20165,-1.689 +20166,0.944 +20167,-0.530 +20168,-0.021 +20169,0.991 +20170,-1.801 +20171,-1.319 +20172,-0.347 +20173,0.761 +20174,0.064 +20175,-0.740 +20176,0.148 +20177,1.158 +20178,-1.752 +20179,0.271 +20180,0.579 +20181,-2.332 +20182,-0.503 +20183,-0.611 +20184,-0.819 +20185,-0.716 +20186,-2.751 +20187,1.124 +20188,0.846 +20189,0.360 +20190,0.513 +20191,0.641 +20192,1.100 +20193,1.161 +20194,-0.417 +20195,-0.336 +20196,-1.254 +20197,1.509 +20198,-1.336 +20199,0.253 +20200,0.191 +20201,0.848 +20202,-0.548 +20203,0.289 +20204,-1.072 +20205,-0.252 +20206,0.855 +20207,0.040 +20208,-0.598 +20209,0.157 +20210,-0.417 +20211,-0.775 +20212,-0.482 +20213,-0.264 +20214,-0.344 +20215,-0.642 +20216,-1.248 +20217,0.012 +20218,-0.347 +20219,-1.445 +20220,2.529 +20221,0.757 +20222,-0.208 +20223,-1.617 +20224,-0.644 +20225,1.277 +20226,1.459 +20227,-0.805 +20228,-0.123 +20229,-0.299 +20230,-0.788 +20231,0.298 +20232,-0.303 +20233,-1.687 +20234,0.490 +20235,0.557 +20236,-0.392 +20237,0.613 +20238,-0.925 +20239,0.289 +20240,-0.070 +20241,-0.870 +20242,-0.210 +20243,1.153 +20244,-1.135 +20245,1.126 +20246,-0.353 +20247,0.143 +20248,0.443 +20249,0.646 +20250,-0.573 +20251,0.658 +20252,1.296 +20253,1.908 +20254,-0.704 +20255,-0.189 +20256,-0.717 +20257,0.826 +20258,-0.633 +20259,0.515 +20260,-2.037 +20261,-0.775 +20262,-1.011 +20263,-0.521 +20264,-2.202 +20265,1.320 +20266,-0.223 +20267,0.051 +20268,-0.761 +20269,-0.941 +20270,1.754 +20271,0.989 +20272,1.028 +20273,1.082 +20274,-0.155 +20275,-0.018 +20276,-1.365 +20277,1.891 +20278,1.824 +20279,-0.180 +20280,-0.738 +20281,0.311 +20282,-0.914 +20283,0.916 +20284,-0.003 +20285,-1.013 +20286,-1.451 +20287,0.914 +20288,-1.073 +20289,0.496 +20290,-0.326 +20291,0.037 +20292,-0.490 +20293,-0.090 +20294,0.307 +20295,-0.257 +20296,-0.232 +20297,0.777 +20298,0.142 +20299,-0.264 +20300,-0.422 +20301,-0.324 +20302,0.910 +20303,0.731 +20304,0.451 +20305,0.104 +20306,1.254 +20307,-0.360 +20308,0.027 +20309,0.173 +20310,1.133 +20311,-0.432 +20312,1.365 +20313,-0.882 +20314,0.967 +20315,0.277 +20316,0.074 +20317,1.406 +20318,0.584 +20319,-0.566 +20320,1.277 +20321,-0.027 +20322,0.259 +20323,0.282 +20324,1.081 +20325,-0.416 +20326,-0.751 +20327,0.427 +20328,0.608 +20329,-0.033 +20330,0.011 +20331,-0.037 +20332,-1.246 +20333,-0.310 +20334,1.889 +20335,0.150 +20336,-0.647 +20337,0.362 +20338,1.577 +20339,1.137 +20340,-1.013 +20341,0.110 +20342,-1.711 +20343,1.331 +20344,1.064 +20345,-0.371 +20346,0.596 +20347,2.170 +20348,0.169 +20349,1.475 +20350,-0.095 +20351,0.230 +20352,0.689 +20353,-0.507 +20354,2.779 +20355,0.793 +20356,0.384 +20357,-0.930 +20358,2.120 +20359,0.263 +20360,0.605 +20361,-0.554 +20362,-0.198 +20363,-0.658 +20364,-0.511 +20365,-0.532 +20366,0.188 +20367,-1.760 +20368,0.904 +20369,0.774 +20370,1.330 +20371,0.920 +20372,1.742 +20373,2.594 +20374,0.442 +20375,0.551 +20376,1.500 +20377,-0.362 +20378,2.493 +20379,-0.009 +20380,0.363 +20381,-1.341 +20382,0.479 +20383,-0.542 +20384,-2.338 +20385,-0.660 +20386,0.994 +20387,-0.731 +20388,-1.111 +20389,1.160 +20390,-0.234 +20391,-2.652 +20392,1.641 +20393,-0.427 +20394,-0.595 +20395,-0.719 +20396,0.386 +20397,-0.609 +20398,-0.892 +20399,-1.308 +20400,-0.170 +20401,-0.493 +20402,-0.571 +20403,-0.779 +20404,0.969 +20405,-0.421 +20406,-0.101 +20407,0.502 +20408,0.573 +20409,-1.664 +20410,1.055 +20411,1.002 +20412,2.451 +20413,0.619 +20414,1.180 +20415,0.121 +20416,0.271 +20417,1.003 +20418,-0.390 +20419,0.855 +20420,0.268 +20421,0.751 +20422,1.127 +20423,-1.062 +20424,-0.833 +20425,-0.295 +20426,-1.431 +20427,1.654 +20428,0.484 +20429,-0.622 +20430,-0.834 +20431,-0.013 +20432,-0.801 +20433,0.452 +20434,-2.361 +20435,1.303 +20436,0.878 +20437,0.164 +20438,1.007 +20439,0.755 +20440,1.318 +20441,-1.174 +20442,1.291 +20443,-1.037 +20444,-0.097 +20445,-2.142 +20446,-1.624 +20447,-0.165 +20448,1.466 +20449,0.221 +20450,2.775 +20451,0.505 +20452,-1.177 +20453,0.413 +20454,0.268 +20455,-0.783 +20456,1.041 +20457,-1.778 +20458,-0.626 +20459,-1.369 +20460,0.210 +20461,-0.848 +20462,1.251 +20463,-1.094 +20464,-1.802 +20465,1.554 +20466,-1.322 +20467,1.808 +20468,-0.764 +20469,-0.283 +20470,1.682 +20471,0.421 +20472,0.500 +20473,0.163 +20474,-0.145 +20475,-0.173 +20476,0.926 +20477,-1.113 +20478,0.977 +20479,-1.208 +20480,0.940 +20481,1.237 +20482,0.657 +20483,1.323 +20484,-0.114 +20485,1.656 +20486,-0.988 +20487,-0.770 +20488,0.706 +20489,-0.761 +20490,-0.821 +20491,-0.910 +20492,1.773 +20493,0.832 +20494,-0.012 +20495,-0.088 +20496,0.096 +20497,0.473 +20498,-0.090 +20499,0.078 +20500,-0.634 +20501,-0.155 +20502,-1.279 +20503,-0.399 +20504,-0.189 +20505,-1.329 +20506,0.840 +20507,0.402 +20508,0.038 +20509,-1.709 +20510,0.703 +20511,-0.136 +20512,1.598 +20513,-0.821 +20514,0.721 +20515,1.916 +20516,0.088 +20517,0.901 +20518,0.912 +20519,1.239 +20520,1.060 +20521,0.970 +20522,0.499 +20523,1.210 +20524,1.950 +20525,-1.660 +20526,0.985 +20527,-0.338 +20528,1.843 +20529,-1.472 +20530,0.661 +20531,-0.965 +20532,0.929 +20533,0.574 +20534,1.817 +20535,1.393 +20536,0.582 +20537,0.578 +20538,-0.321 +20539,-0.037 +20540,1.043 +20541,-0.679 +20542,-1.198 +20543,0.290 +20544,0.298 +20545,0.815 +20546,2.524 +20547,-2.214 +20548,-1.028 +20549,-0.544 +20550,-0.169 +20551,1.269 +20552,-0.355 +20553,-1.808 +20554,-0.701 +20555,1.483 +20556,-0.030 +20557,-0.607 +20558,-0.291 +20559,-3.504 +20560,1.004 +20561,-0.898 +20562,0.453 +20563,2.144 +20564,-0.475 +20565,-0.976 +20566,0.716 +20567,-2.505 +20568,0.640 +20569,-1.311 +20570,1.695 +20571,-0.247 +20572,0.457 +20573,-1.245 +20574,0.213 +20575,-0.807 +20576,-1.759 +20577,0.716 +20578,0.110 +20579,-0.028 +20580,0.854 +20581,-0.116 +20582,-0.266 +20583,-1.749 +20584,0.354 +20585,-1.113 +20586,0.387 +20587,0.263 +20588,0.006 +20589,0.196 +20590,-1.545 +20591,-1.920 +20592,-0.824 +20593,-0.017 +20594,1.066 +20595,-1.746 +20596,-0.100 +20597,-0.740 +20598,1.697 +20599,0.846 +20600,-0.200 +20601,1.465 +20602,-0.488 +20603,-0.110 +20604,1.388 +20605,1.337 +20606,-0.889 +20607,1.305 +20608,-0.203 +20609,-0.429 +20610,-0.532 +20611,0.485 +20612,0.403 +20613,-0.551 +20614,-0.263 +20615,1.200 +20616,-0.063 +20617,-0.125 +20618,0.030 +20619,-1.004 +20620,1.298 +20621,-0.117 +20622,1.062 +20623,-0.836 +20624,1.419 +20625,0.964 +20626,-0.043 +20627,-1.266 +20628,-2.091 +20629,0.286 +20630,-0.731 +20631,0.053 +20632,-0.562 +20633,-0.340 +20634,-0.349 +20635,1.314 +20636,-1.148 +20637,-0.033 +20638,1.131 +20639,0.516 +20640,-0.720 +20641,-0.859 +20642,-0.744 +20643,0.611 +20644,-1.131 +20645,0.439 +20646,0.288 +20647,-0.633 +20648,0.462 +20649,0.990 +20650,-1.169 +20651,-1.852 +20652,2.126 +20653,-1.521 +20654,-0.375 +20655,-1.642 +20656,1.474 +20657,2.583 +20658,-0.451 +20659,-0.853 +20660,0.954 +20661,-0.303 +20662,0.085 +20663,0.593 +20664,0.930 +20665,-0.421 +20666,-0.004 +20667,-1.649 +20668,0.668 +20669,-1.247 +20670,0.083 +20671,2.597 +20672,-0.908 +20673,-0.268 +20674,0.510 +20675,-0.725 +20676,-2.301 +20677,0.587 +20678,-0.760 +20679,0.977 +20680,-0.538 +20681,1.559 +20682,-0.646 +20683,-0.434 +20684,-1.216 +20685,0.066 +20686,0.600 +20687,-1.165 +20688,-0.992 +20689,-0.269 +20690,-0.246 +20691,-0.854 +20692,1.954 +20693,1.590 +20694,0.851 +20695,1.243 +20696,0.003 +20697,-0.013 +20698,-0.151 +20699,-0.513 +20700,-0.975 +20701,-0.570 +20702,-1.037 +20703,-0.509 +20704,-0.534 +20705,-0.346 +20706,-0.435 +20707,-0.694 +20708,-0.172 +20709,-0.502 +20710,0.470 +20711,-0.100 +20712,-0.218 +20713,0.927 +20714,-0.567 +20715,-0.622 +20716,1.969 +20717,1.138 +20718,0.109 +20719,-0.084 +20720,-0.018 +20721,0.375 +20722,0.229 +20723,1.024 +20724,-1.327 +20725,0.310 +20726,-1.218 +20727,-0.588 +20728,0.135 +20729,-0.275 +20730,0.089 +20731,-0.928 +20732,0.873 +20733,-1.057 +20734,1.293 +20735,1.518 +20736,0.086 +20737,-0.134 +20738,-0.635 +20739,-0.209 +20740,1.011 +20741,1.545 +20742,1.226 +20743,1.240 +20744,1.459 +20745,-0.251 +20746,0.562 +20747,0.049 +20748,-0.908 +20749,-1.108 +20750,1.340 +20751,0.341 +20752,0.898 +20753,-0.119 +20754,-1.896 +20755,-1.347 +20756,-2.025 +20757,1.484 +20758,-0.754 +20759,-0.674 +20760,0.277 +20761,-0.282 +20762,-1.251 +20763,0.406 +20764,1.166 +20765,0.368 +20766,-0.884 +20767,0.285 +20768,-0.263 +20769,0.435 +20770,0.036 +20771,-0.107 +20772,-0.544 +20773,0.601 +20774,-0.232 +20775,-0.793 +20776,0.253 +20777,1.398 +20778,2.393 +20779,-0.006 +20780,0.458 +20781,-0.926 +20782,0.793 +20783,-0.822 +20784,0.258 +20785,-0.484 +20786,0.940 +20787,2.143 +20788,-0.174 +20789,0.259 +20790,0.469 +20791,-0.627 +20792,0.912 +20793,1.395 +20794,1.176 +20795,-0.924 +20796,0.142 +20797,0.137 +20798,-0.025 +20799,-0.541 +20800,-1.144 +20801,0.762 +20802,-0.840 +20803,-1.509 +20804,0.161 +20805,0.629 +20806,-1.099 +20807,-0.420 +20808,-0.627 +20809,-0.632 +20810,0.178 +20811,-0.741 +20812,0.706 +20813,-0.419 +20814,0.849 +20815,1.619 +20816,-0.597 +20817,0.119 +20818,0.695 +20819,0.071 +20820,-0.056 +20821,0.129 +20822,1.126 +20823,-0.777 +20824,-0.206 +20825,-0.616 +20826,1.499 +20827,0.394 +20828,0.242 +20829,-1.655 +20830,-0.891 +20831,-1.690 +20832,0.769 +20833,0.325 +20834,-1.412 +20835,1.259 +20836,0.175 +20837,-0.540 +20838,-0.253 +20839,0.331 +20840,0.898 +20841,0.249 +20842,-0.687 +20843,-0.724 +20844,-0.572 +20845,-0.522 +20846,-1.932 +20847,-1.506 +20848,0.628 +20849,0.368 +20850,0.511 +20851,2.036 +20852,0.186 +20853,0.167 +20854,-0.478 +20855,-0.863 +20856,-0.250 +20857,0.439 +20858,-1.151 +20859,-1.265 +20860,-0.283 +20861,-1.659 +20862,0.570 +20863,-0.179 +20864,-0.492 +20865,1.767 +20866,1.628 +20867,1.479 +20868,-0.811 +20869,-0.606 +20870,-0.071 +20871,-0.538 +20872,-0.264 +20873,1.880 +20874,0.580 +20875,-0.884 +20876,-0.899 +20877,0.327 +20878,-0.146 +20879,-0.357 +20880,0.486 +20881,-0.063 +20882,0.679 +20883,-0.778 +20884,-0.083 +20885,-1.023 +20886,-0.277 +20887,-1.213 +20888,-0.329 +20889,-0.744 +20890,1.648 +20891,0.943 +20892,1.195 +20893,0.656 +20894,-1.440 +20895,0.488 +20896,-1.959 +20897,0.108 +20898,-0.881 +20899,-1.462 +20900,-0.604 +20901,0.804 +20902,0.080 +20903,-0.028 +20904,0.374 +20905,-0.449 +20906,0.328 +20907,-1.193 +20908,0.196 +20909,1.640 +20910,-1.073 +20911,-0.485 +20912,-0.112 +20913,-1.560 +20914,-0.387 +20915,1.500 +20916,-1.004 +20917,2.169 +20918,0.815 +20919,-0.114 +20920,-0.389 +20921,0.270 +20922,-0.495 +20923,-0.090 +20924,1.833 +20925,0.460 +20926,-0.642 +20927,0.432 +20928,-1.398 +20929,0.943 +20930,2.453 +20931,0.599 +20932,0.235 +20933,0.973 +20934,-0.012 +20935,-1.567 +20936,-0.051 +20937,0.481 +20938,-0.729 +20939,-1.034 +20940,-0.547 +20941,0.903 +20942,0.172 +20943,1.137 +20944,-1.008 +20945,1.108 +20946,1.252 +20947,0.968 +20948,1.238 +20949,0.249 +20950,0.141 +20951,1.324 +20952,0.474 +20953,-0.159 +20954,-1.553 +20955,0.516 +20956,2.349 +20957,0.152 +20958,-0.674 +20959,1.513 +20960,-0.731 +20961,-0.380 +20962,0.062 +20963,-0.171 +20964,0.230 +20965,-1.063 +20966,-1.219 +20967,0.609 +20968,1.711 +20969,0.341 +20970,1.377 +20971,-1.986 +20972,1.128 +20973,-1.061 +20974,-1.377 +20975,-1.618 +20976,-0.966 +20977,-1.050 +20978,0.159 +20979,-0.777 +20980,1.007 +20981,-1.097 +20982,-0.815 +20983,-0.134 +20984,-0.617 +20985,-1.025 +20986,-0.010 +20987,-0.102 +20988,-1.142 +20989,0.346 +20990,-0.783 +20991,1.250 +20992,-1.243 +20993,-0.368 +20994,-0.284 +20995,-2.198 +20996,-1.200 +20997,-0.627 +20998,-0.981 +20999,-0.816 +21000,0.806 +21001,-0.552 +21002,0.272 +21003,-1.755 +21004,0.246 +21005,-0.780 +21006,-0.232 +21007,-0.221 +21008,-2.349 +21009,-1.921 +21010,-1.664 +21011,-1.108 +21012,-0.733 +21013,0.569 +21014,-0.007 +21015,0.059 +21016,0.246 +21017,0.819 +21018,2.453 +21019,0.497 +21020,-0.407 +21021,-0.565 +21022,1.364 +21023,-1.055 +21024,0.770 +21025,0.358 +21026,-0.119 +21027,-1.708 +21028,0.800 +21029,-0.017 +21030,-0.637 +21031,0.576 +21032,0.677 +21033,0.337 +21034,-0.150 +21035,-0.046 +21036,-0.865 +21037,-0.119 +21038,0.683 +21039,0.021 +21040,-0.691 +21041,1.254 +21042,-0.312 +21043,1.936 +21044,0.603 +21045,0.536 +21046,0.115 +21047,0.263 +21048,1.511 +21049,1.723 +21050,-0.379 +21051,-0.342 +21052,0.299 +21053,2.663 +21054,1.458 +21055,0.358 +21056,-0.426 +21057,-0.913 +21058,-1.322 +21059,-2.004 +21060,-0.243 +21061,0.582 +21062,0.267 +21063,0.223 +21064,-0.111 +21065,-0.873 +21066,-1.713 +21067,-0.369 +21068,-0.113 +21069,-0.098 +21070,0.652 +21071,1.476 +21072,-0.213 +21073,0.366 +21074,-0.557 +21075,0.594 +21076,-1.413 +21077,-1.917 +21078,0.376 +21079,0.544 +21080,-1.054 +21081,-2.376 +21082,0.812 +21083,-0.432 +21084,-0.593 +21085,0.102 +21086,-1.029 +21087,-0.598 +21088,-0.159 +21089,1.212 +21090,1.389 +21091,3.206 +21092,0.404 +21093,-0.910 +21094,0.071 +21095,0.761 +21096,-0.483 +21097,0.703 +21098,-1.426 +21099,1.278 +21100,1.547 +21101,0.180 +21102,-0.864 +21103,0.466 +21104,0.361 +21105,1.265 +21106,-1.368 +21107,-1.187 +21108,-0.077 +21109,-0.460 +21110,0.479 +21111,-0.498 +21112,0.770 +21113,1.414 +21114,0.021 +21115,-0.086 +21116,1.723 +21117,1.297 +21118,-0.760 +21119,1.257 +21120,1.515 +21121,0.698 +21122,-1.234 +21123,-0.437 +21124,0.532 +21125,-0.672 +21126,-0.379 +21127,-0.371 +21128,-0.986 +21129,-0.201 +21130,-0.155 +21131,0.570 +21132,-0.306 +21133,0.688 +21134,-0.038 +21135,-0.222 +21136,0.821 +21137,-0.080 +21138,-0.260 +21139,0.404 +21140,-2.354 +21141,0.156 +21142,-1.873 +21143,-0.741 +21144,1.755 +21145,1.329 +21146,-0.263 +21147,-1.056 +21148,0.838 +21149,0.929 +21150,1.904 +21151,0.143 +21152,-0.843 +21153,-0.396 +21154,-2.296 +21155,-0.126 +21156,0.992 +21157,-0.045 +21158,1.115 +21159,0.819 +21160,-0.339 +21161,0.595 +21162,-1.297 +21163,-1.747 +21164,-0.534 +21165,-0.952 +21166,-0.146 +21167,-0.308 +21168,0.216 +21169,2.344 +21170,0.854 +21171,-0.021 +21172,2.169 +21173,-0.636 +21174,1.765 +21175,0.950 +21176,0.887 +21177,0.405 +21178,0.704 +21179,-0.859 +21180,-0.699 +21181,0.170 +21182,0.036 +21183,-0.428 +21184,-1.073 +21185,1.101 +21186,-0.727 +21187,0.380 +21188,-0.786 +21189,-1.281 +21190,-0.163 +21191,2.773 +21192,0.436 +21193,0.342 +21194,-0.577 +21195,0.293 +21196,2.323 +21197,0.804 +21198,-0.925 +21199,0.483 +21200,-1.768 +21201,0.844 +21202,-0.735 +21203,-0.314 +21204,0.094 +21205,-1.102 +21206,-0.127 +21207,-1.278 +21208,-0.158 +21209,0.465 +21210,-0.091 +21211,2.204 +21212,-0.317 +21213,1.244 +21214,0.328 +21215,1.878 +21216,2.005 +21217,0.522 +21218,1.089 +21219,0.153 +21220,-0.579 +21221,1.189 +21222,0.049 +21223,0.080 +21224,-1.042 +21225,-0.248 +21226,1.073 +21227,0.486 +21228,-1.445 +21229,-1.327 +21230,-2.081 +21231,1.272 +21232,1.312 +21233,-1.280 +21234,1.095 +21235,-1.577 +21236,0.317 +21237,-1.244 +21238,0.394 +21239,0.229 +21240,0.964 +21241,2.016 +21242,2.869 +21243,0.520 +21244,0.875 +21245,-0.272 +21246,-0.396 +21247,0.318 +21248,-0.109 +21249,-0.616 +21250,0.705 +21251,0.168 +21252,1.211 +21253,1.204 +21254,0.421 +21255,0.370 +21256,-1.805 +21257,1.257 +21258,-0.365 +21259,-0.604 +21260,1.083 +21261,-0.630 +21262,0.292 +21263,-0.723 +21264,-0.890 +21265,0.770 +21266,0.291 +21267,-0.981 +21268,-0.420 +21269,1.523 +21270,-1.250 +21271,0.548 +21272,-0.512 +21273,0.605 +21274,-1.259 +21275,2.279 +21276,-1.436 +21277,-0.131 +21278,1.375 +21279,-0.297 +21280,0.867 +21281,0.645 +21282,-0.300 +21283,-1.357 +21284,-0.880 +21285,0.217 +21286,0.427 +21287,-0.054 +21288,-0.066 +21289,0.292 +21290,0.415 +21291,2.147 +21292,-1.480 +21293,0.941 +21294,-1.510 +21295,0.771 +21296,-1.113 +21297,1.263 +21298,0.711 +21299,0.103 +21300,0.849 +21301,-0.157 +21302,-0.212 +21303,-0.433 +21304,-0.756 +21305,0.545 +21306,2.251 +21307,-1.096 +21308,-1.355 +21309,-1.462 +21310,-0.032 +21311,-0.079 +21312,1.596 +21313,0.084 +21314,-0.194 +21315,-0.587 +21316,0.646 +21317,-1.259 +21318,0.546 +21319,-0.456 +21320,0.138 +21321,-1.743 +21322,1.577 +21323,-0.054 +21324,0.474 +21325,0.931 +21326,-1.358 +21327,1.130 +21328,1.271 +21329,-0.724 +21330,-0.599 +21331,0.034 +21332,0.168 +21333,-1.225 +21334,-2.147 +21335,-1.783 +21336,-0.518 +21337,-0.138 +21338,-0.081 +21339,-1.185 +21340,-0.226 +21341,1.081 +21342,-0.551 +21343,-0.078 +21344,0.123 +21345,-0.250 +21346,-0.880 +21347,-0.838 +21348,0.740 +21349,-0.421 +21350,1.486 +21351,0.554 +21352,0.248 +21353,-1.057 +21354,-0.820 +21355,-0.196 +21356,-0.397 +21357,0.136 +21358,0.411 +21359,-0.368 +21360,1.880 +21361,-1.193 +21362,0.848 +21363,0.350 +21364,-0.731 +21365,-0.053 +21366,0.441 +21367,-0.463 +21368,0.771 +21369,1.151 +21370,-1.850 +21371,-0.366 +21372,0.588 +21373,0.951 +21374,-0.726 +21375,0.771 +21376,-2.077 +21377,0.035 +21378,0.168 +21379,-0.875 +21380,0.235 +21381,-0.517 +21382,-0.471 +21383,0.530 +21384,0.050 +21385,1.266 +21386,0.428 +21387,0.035 +21388,0.577 +21389,-0.063 +21390,-1.225 +21391,0.207 +21392,-2.173 +21393,0.535 +21394,-2.076 +21395,0.320 +21396,-1.103 +21397,0.699 +21398,0.264 +21399,-3.277 +21400,-0.466 +21401,-2.192 +21402,-0.542 +21403,-0.247 +21404,0.537 +21405,-0.060 +21406,0.078 +21407,-0.961 +21408,-0.053 +21409,-0.659 +21410,0.257 +21411,1.471 +21412,1.249 +21413,-1.441 +21414,1.502 +21415,-1.985 +21416,-0.163 +21417,-0.934 +21418,-0.622 +21419,0.380 +21420,1.870 +21421,-0.691 +21422,-0.297 +21423,0.637 +21424,0.013 +21425,-0.015 +21426,-0.362 +21427,2.292 +21428,-0.898 +21429,0.492 +21430,1.165 +21431,-0.291 +21432,0.243 +21433,-0.653 +21434,-0.497 +21435,-0.655 +21436,-0.622 +21437,0.598 +21438,1.194 +21439,0.694 +21440,-0.876 +21441,0.072 +21442,-0.664 +21443,1.562 +21444,1.817 +21445,1.004 +21446,-2.870 +21447,-0.236 +21448,-1.295 +21449,0.571 +21450,-0.752 +21451,1.492 +21452,-1.916 +21453,1.116 +21454,-1.492 +21455,-0.010 +21456,0.542 +21457,-0.300 +21458,0.360 +21459,0.281 +21460,-1.241 +21461,0.522 +21462,-1.786 +21463,1.662 +21464,-0.761 +21465,-0.524 +21466,-0.461 +21467,-0.793 +21468,1.411 +21469,1.853 +21470,0.271 +21471,1.356 +21472,-0.418 +21473,-0.213 +21474,-0.158 +21475,-0.535 +21476,1.096 +21477,1.939 +21478,0.671 +21479,-0.016 +21480,-0.632 +21481,-2.947 +21482,-0.460 +21483,-0.732 +21484,0.369 +21485,-1.097 +21486,0.984 +21487,0.448 +21488,-1.187 +21489,-0.205 +21490,-1.266 +21491,1.461 +21492,-3.254 +21493,1.002 +21494,1.446 +21495,2.005 +21496,-0.678 +21497,-1.287 +21498,0.678 +21499,0.411 +21500,-1.571 +21501,0.370 +21502,-0.433 +21503,-0.844 +21504,0.837 +21505,-1.008 +21506,-0.191 +21507,0.631 +21508,-1.327 +21509,0.658 +21510,2.154 +21511,-0.847 +21512,-0.143 +21513,0.611 +21514,-0.138 +21515,0.532 +21516,-0.607 +21517,1.033 +21518,0.305 +21519,-0.016 +21520,0.514 +21521,0.709 +21522,-0.644 +21523,-0.067 +21524,-0.086 +21525,-1.321 +21526,-0.515 +21527,-0.189 +21528,-0.508 +21529,1.732 +21530,-0.165 +21531,0.263 +21532,-0.224 +21533,0.271 +21534,0.012 +21535,0.023 +21536,0.745 +21537,1.759 +21538,0.129 +21539,1.249 +21540,-0.395 +21541,-1.123 +21542,1.258 +21543,0.498 +21544,0.127 +21545,0.387 +21546,-0.525 +21547,1.213 +21548,-0.117 +21549,-1.243 +21550,-0.617 +21551,-0.830 +21552,0.047 +21553,-0.809 +21554,-2.272 +21555,-1.337 +21556,-0.392 +21557,0.934 +21558,0.559 +21559,-0.436 +21560,0.377 +21561,1.520 +21562,-0.159 +21563,0.174 +21564,1.493 +21565,0.408 +21566,-0.379 +21567,-2.344 +21568,-1.378 +21569,0.389 +21570,-0.432 +21571,1.131 +21572,-1.251 +21573,0.098 +21574,-1.554 +21575,-0.115 +21576,1.341 +21577,0.678 +21578,1.540 +21579,0.592 +21580,2.620 +21581,-0.165 +21582,1.244 +21583,-2.117 +21584,-0.995 +21585,0.370 +21586,0.506 +21587,-2.023 +21588,0.306 +21589,-0.329 +21590,-2.349 +21591,-0.829 +21592,-1.109 +21593,0.722 +21594,-0.308 +21595,0.720 +21596,0.792 +21597,0.336 +21598,0.585 +21599,1.096 +21600,-2.005 +21601,1.903 +21602,0.973 +21603,0.544 +21604,-1.245 +21605,0.610 +21606,1.286 +21607,1.675 +21608,-1.722 +21609,0.427 +21610,-0.445 +21611,1.331 +21612,1.484 +21613,1.066 +21614,2.273 +21615,-0.472 +21616,-1.242 +21617,-0.874 +21618,0.752 +21619,0.750 +21620,1.398 +21621,-1.537 +21622,-0.003 +21623,-1.378 +21624,-1.324 +21625,0.853 +21626,-0.381 +21627,-1.485 +21628,-0.817 +21629,-1.102 +21630,-0.248 +21631,-0.069 +21632,-1.795 +21633,-0.754 +21634,1.260 +21635,0.328 +21636,-0.640 +21637,0.090 +21638,0.324 +21639,1.068 +21640,0.598 +21641,-0.626 +21642,-1.258 +21643,0.453 +21644,-0.015 +21645,-0.816 +21646,-0.932 +21647,0.279 +21648,-0.283 +21649,-0.491 +21650,-1.367 +21651,0.267 +21652,1.561 +21653,0.055 +21654,1.645 +21655,-1.639 +21656,0.018 +21657,1.324 +21658,0.714 +21659,-2.217 +21660,-1.735 +21661,-0.198 +21662,-0.720 +21663,-0.081 +21664,0.426 +21665,-0.808 +21666,0.885 +21667,0.343 +21668,-1.299 +21669,1.608 +21670,1.396 +21671,0.760 +21672,0.324 +21673,0.481 +21674,-0.227 +21675,1.792 +21676,-0.296 +21677,-0.521 +21678,-1.355 +21679,0.160 +21680,0.148 +21681,-0.453 +21682,-1.231 +21683,-0.797 +21684,-0.216 +21685,0.608 +21686,-1.625 +21687,-0.854 +21688,0.586 +21689,-1.759 +21690,2.711 +21691,-1.622 +21692,-0.964 +21693,1.034 +21694,-0.169 +21695,1.001 +21696,1.046 +21697,-2.278 +21698,-1.437 +21699,-0.567 +21700,-0.637 +21701,-0.384 +21702,1.415 +21703,-0.182 +21704,0.876 +21705,0.254 +21706,1.804 +21707,-0.683 +21708,-0.652 +21709,-0.269 +21710,1.121 +21711,-0.280 +21712,-1.408 +21713,-0.265 +21714,0.153 +21715,-1.122 +21716,-0.758 +21717,-0.727 +21718,-0.057 +21719,0.059 +21720,-0.481 +21721,0.744 +21722,-0.273 +21723,-0.541 +21724,1.071 +21725,-0.566 +21726,2.318 +21727,-0.388 +21728,-1.501 +21729,-1.403 +21730,-0.344 +21731,1.100 +21732,-0.590 +21733,1.842 +21734,1.398 +21735,0.640 +21736,-0.414 +21737,0.101 +21738,0.162 +21739,1.033 +21740,-0.847 +21741,-1.512 +21742,2.054 +21743,0.476 +21744,-1.028 +21745,0.593 +21746,0.054 +21747,-1.022 +21748,0.207 +21749,0.791 +21750,-3.133 +21751,-0.982 +21752,-1.074 +21753,-2.429 +21754,-0.301 +21755,0.033 +21756,1.120 +21757,-1.080 +21758,1.296 +21759,0.867 +21760,-0.313 +21761,0.201 +21762,-0.781 +21763,-0.123 +21764,-1.230 +21765,-1.254 +21766,0.532 +21767,0.591 +21768,-1.035 +21769,-0.076 +21770,1.266 +21771,2.356 +21772,-0.428 +21773,0.199 +21774,0.461 +21775,-0.266 +21776,-0.855 +21777,-0.925 +21778,-0.806 +21779,-0.357 +21780,0.888 +21781,-0.438 +21782,2.651 +21783,-0.707 +21784,1.136 +21785,-1.045 +21786,0.472 +21787,-1.394 +21788,-0.101 +21789,0.027 +21790,-0.098 +21791,0.514 +21792,0.137 +21793,1.135 +21794,0.845 +21795,-0.300 +21796,1.790 +21797,-2.255 +21798,2.729 +21799,0.913 +21800,1.355 +21801,-0.810 +21802,-0.338 +21803,-0.899 +21804,1.366 +21805,-1.374 +21806,-0.404 +21807,1.052 +21808,-1.454 +21809,-0.878 +21810,1.050 +21811,0.065 +21812,0.536 +21813,1.382 +21814,0.733 +21815,0.165 +21816,0.007 +21817,0.201 +21818,-0.575 +21819,1.214 +21820,-0.152 +21821,-0.264 +21822,0.311 +21823,-0.466 +21824,1.209 +21825,-0.687 +21826,-0.458 +21827,-0.471 +21828,1.091 +21829,0.142 +21830,-0.005 +21831,0.128 +21832,-0.441 +21833,-0.400 +21834,-0.177 +21835,-0.477 +21836,-1.478 +21837,0.702 +21838,0.268 +21839,1.120 +21840,-2.047 +21841,1.178 +21842,0.634 +21843,0.071 +21844,-0.042 +21845,1.222 +21846,-0.569 +21847,-0.283 +21848,-2.487 +21849,0.248 +21850,0.616 +21851,-0.573 +21852,-0.598 +21853,0.773 +21854,-1.429 +21855,3.266 +21856,-1.118 +21857,-0.334 +21858,-0.102 +21859,-1.367 +21860,0.531 +21861,-1.247 +21862,0.255 +21863,-1.927 +21864,-1.209 +21865,1.176 +21866,-1.348 +21867,-1.205 +21868,-2.262 +21869,-1.092 +21870,0.084 +21871,-1.983 +21872,-1.897 +21873,0.345 +21874,1.792 +21875,0.256 +21876,0.101 +21877,-0.492 +21878,1.021 +21879,2.333 +21880,-1.236 +21881,-1.292 +21882,1.320 +21883,0.240 +21884,0.320 +21885,1.203 +21886,1.720 +21887,-0.287 +21888,-0.652 +21889,-0.886 +21890,0.538 +21891,-0.402 +21892,0.843 +21893,-0.315 +21894,0.236 +21895,0.622 +21896,-0.935 +21897,0.442 +21898,1.230 +21899,0.392 +21900,-0.717 +21901,0.591 +21902,2.193 +21903,0.449 +21904,0.869 +21905,-0.351 +21906,0.024 +21907,0.714 +21908,1.134 +21909,1.387 +21910,1.144 +21911,-1.904 +21912,0.483 +21913,-0.337 +21914,-0.640 +21915,-1.839 +21916,-0.355 +21917,1.340 +21918,-0.534 +21919,0.506 +21920,-0.419 +21921,-2.237 +21922,-0.077 +21923,-0.068 +21924,0.709 +21925,-0.628 +21926,0.042 +21927,-1.502 +21928,-0.848 +21929,-0.417 +21930,-1.003 +21931,-0.830 +21932,0.489 +21933,0.651 +21934,-0.657 +21935,1.186 +21936,-0.056 +21937,-0.123 +21938,0.766 +21939,1.407 +21940,-1.106 +21941,0.229 +21942,0.262 +21943,1.260 +21944,-0.437 +21945,-0.981 +21946,0.292 +21947,-0.256 +21948,-1.160 +21949,-0.191 +21950,-2.066 +21951,-0.508 +21952,-1.909 +21953,-1.228 +21954,1.838 +21955,1.085 +21956,1.972 +21957,1.082 +21958,-1.173 +21959,0.708 +21960,0.831 +21961,1.006 +21962,-0.714 +21963,-0.142 +21964,-0.219 +21965,1.175 +21966,-2.027 +21967,0.885 +21968,-1.156 +21969,-1.474 +21970,1.209 +21971,0.901 +21972,2.062 +21973,0.884 +21974,-0.414 +21975,-1.332 +21976,0.651 +21977,-0.239 +21978,-0.890 +21979,-0.114 +21980,-0.301 +21981,0.144 +21982,0.173 +21983,1.887 +21984,0.940 +21985,2.320 +21986,0.004 +21987,0.514 +21988,-0.621 +21989,0.647 +21990,0.031 +21991,-0.847 +21992,0.843 +21993,0.237 +21994,-0.270 +21995,0.914 +21996,-2.607 +21997,-0.073 +21998,0.982 +21999,-0.658 +22000,-0.044 +22001,-0.302 +22002,-0.212 +22003,0.691 +22004,0.067 +22005,0.329 +22006,-0.753 +22007,0.100 +22008,1.093 +22009,-0.262 +22010,0.119 +22011,-1.092 +22012,0.290 +22013,-0.521 +22014,-1.143 +22015,0.389 diff --git a/CRVConditions/data/scintyield_wideband4modules.txt b/CRVConditions/data/scintyield_wideband4modules.txt index 543c1317b0..0510314357 100644 --- a/CRVConditions/data/scintyield_wideband4modules.txt +++ b/CRVConditions/data/scintyield_wideband4modules.txt @@ -1,258 +1,1026 @@ TABLE CRVScint -#counter,scintYieldDeviation -0,-0.40817829 -1,0.478392983 -2,-1.742534815 -3,-1.083696214 -4,-0.232897289 -5,-1.133704616 -6,0.708299822 -7,-0.255976244 -8,0.454536537 -9,0.34589287 -10,-0.914151313 -11,-0.219176211 -12,1.540090237 -13,-0.06729041 -14,0.750185173 -15,-1.252525599 -16,1.881276793 -17,1.08307137 -18,0.403799169 -19,-0.66013052 -20,0.996921357 -21,-0.466640679 -22,-0.147430802 -23,0.465758366 -24,1.472209636 -25,-0.089248445 -26,0.077041903 -27,0.812045767 -28,0.116082738 -29,2.444925959 -30,-0.643804806 -31,0.197596893 -32,0.496921984 -33,1.855947974 -34,0.073004041 -35,-0.766896413 -36,-1.120294518 -37,-1.285900187 -38,1.462787967 -39,-0.175869471 -40,0.576923821 -41,-0.241021451 -42,-1.135892295 -43,0.006762617 -44,-1.656346974 -45,-1.072041249 -46,0.179748625 -47,0.272906454 -48,0.014156971 -49,-0.046374193 -50,0.006439565 -51,-0.644237792 -52,-0.007830788 -53,0.293738714 -54,0.918094334 -55,0.723697415 -56,0.06599502 -57,0.843457846 -58,-0.156088783 -59,0.768268835 -60,-1.049871276 -61,-0.053859518 -62,-0.472876414 -63,-0.657052687 -64,-0.670193813 -65,-0.056785721 -66,-0.437127642 -67,1.138593278 -68,0.367129055 -69,-0.681090652 -70,0.320863282 -71,-1.284949167 -72,-0.512218056 -73,1.001620998 -74,0.381645129 -75,1.462008713 -76,-0.639059588 -77,0.871553559 -78,0.161576853 -79,0.165354377 -80,-0.803663752 -81,-0.114701532 -82,0.491418645 -83,1.292607075 -84,-0.979921489 -85,0.973688432 -86,1.594841866 -87,0.371110412 -88,-0.27214148 -89,-1.915335772 -90,-0.041963719 -91,0.262880908 -92,-0.689180237 -93,0.246577909 -94,1.19357776 -95,0.542303852 -96,-0.654314151 -97,0.786000959 -98,-0.704262875 -99,-0.072265143 -100,0.208576412 -101,1.296570941 -102,-0.063855034 -103,0.159200191 -104,0.925960111 -105,-2.042826473 -106,2.075169182 -107,-0.222235 -108,1.35332452 -109,-0.002027946 -110,0.397365683 -111,0.354055184 -112,0.511771393 -113,-0.457738167 -114,1.155370009 -115,-0.115781727 -116,-0.840449092 -117,0.321826222 -118,-0.461556427 -119,-1.19008102 -120,0.401419897 -121,0.560289182 -122,-0.162565747 -123,0.331663265 -124,-0.313720184 -125,-1.389663479 -126,0.617972175 -127,-0.610932716 -128,0.15998996 -129,1.471532457 -130,-0.166092867 -131,-0.507920517 -132,0.338036954 -133,-1.40898172 -134,1.270972215 -135,-0.144821609 -136,-1.965002639 -137,-0.765306087 -138,0.577112948 -139,-0.714690883 -140,1.673938548 -141,1.283248438 -142,0.111830082 -143,0.393560045 -144,-0.704160562 -145,-0.892621182 -146,-0.288656835 -147,1.833763681 -148,-0.089292317 -149,0.916267188 -150,-0.780835161 -151,0.097099476 -152,1.386262532 -153,-0.094783916 -154,-1.715879581 -155,0.053034023 -156,-2.41327277 -157,1.000076796 -158,-0.67093874 -159,0.239788482 -160,0.465575947 -161,-0.897566218 -162,0.285623216 -163,-0.760963944 -164,-1.023673817 -165,-1.391641336 -166,-0.242148271 -167,0.590555063 -168,0.464393322 -169,-1.486813908 -170,0.394357776 -171,0.902535297 -172,-1.452469922 -173,0.178071392 -174,-0.371711772 -175,1.204077962 -176,-0.80514245 -177,-0.07796681 -178,-0.39354941 -179,-2.089904828 -180,-0.816150506 -181,-1.129655392 -182,-0.03139441 -183,0.8896484 -184,-0.652208727 -185,-0.397336115 -186,1.971118498 -187,1.701910592 -188,0.285792663 -189,-1.738091689 -190,-0.789743994 -191,-0.691520263 -192,-1.313018844 -193,-0.319232912 -194,0.83927878 -195,1.306147453 -196,1.98204058 -197,0.047865666 -198,-0.359924628 -199,0.696814511 -200,-0.005355014 -201,0.69741095 -202,0.146527025 -203,-1.380544453 -204,-1.429810506 -205,-0.407681799 -206,-1.528747625 -207,-0.166433636 -208,1.29328001 -209,2.034089345 -210,-0.16133237 -211,-1.333930035 -212,0.791834757 -213,-0.632238067 -214,-0.130231195 -215,0.349612982 -216,1.609446664 -217,-0.327849039 -218,-0.492717167 -219,1.299194 -220,-0.718527533 -221,-0.671708083 -222,1.60457056 -223,-0.867398704 -224,-1.109376665 -225,-1.145681704 -226,-0.679705033 -227,0.175969876 -228,-0.362956639 -229,1.135676944 -230,-0.685920146 -231,2.015346083 -232,0.207859477 -233,-0.200225515 -234,1.477822045 -235,0.22662747 -236,-1.270463891 -237,0.791715611 -238,0.344362716 -239,0.162729038 -240,0.372231898 -241,0.896106612 -242,-0.218775195 -243,-1.020718808 -244,0.965974581 -245,-0.76316394 -246,0.989352797 -247,1.718669209 -248,0.714001118 -249,-0.631049114 -250,0.735906505 -251,-0.249884282 -252,-0.969527779 -253,-0.439858992 -254,0.549916092 -255,-0.80050398 +#channel,scintYieldDeviation +0,-0.357 +1,0.074 +2,-1.648 +3,-1.091 +4,-1.510 +5,0.928 +6,-0.898 +7,0.742 +8,-0.680 +9,-1.422 +10,0.603 +11,-0.091 +12,-0.449 +13,1.089 +14,-0.174 +15,0.529 +16,-0.056 +17,-0.808 +18,-0.967 +19,-1.277 +20,-0.600 +21,-1.068 +22,-0.767 +23,1.252 +24,2.183 +25,-0.214 +26,0.135 +27,1.456 +28,-1.853 +29,-0.491 +30,-0.416 +31,0.641 +32,-0.627 +33,-0.826 +34,0.563 +35,0.290 +36,-0.166 +37,0.327 +38,-0.775 +39,1.056 +40,-0.039 +41,0.889 +42,0.222 +43,0.002 +44,-2.335 +45,0.426 +46,-0.630 +47,-0.147 +48,1.339 +49,-0.990 +50,1.888 +51,-0.241 +52,-0.802 +53,-0.110 +54,0.142 +55,0.314 +56,1.907 +57,-0.309 +58,-0.099 +59,0.746 +60,0.195 +61,-1.318 +62,0.466 +63,-0.400 +64,-0.109 +65,0.682 +66,1.431 +67,1.538 +68,0.800 +69,-0.295 +70,-0.297 +71,2.020 +72,1.011 +73,-0.995 +74,0.387 +75,1.212 +76,0.404 +77,1.077 +78,0.143 +79,-0.822 +80,-0.378 +81,-0.064 +82,-1.523 +83,-1.130 +84,0.302 +85,0.422 +86,-0.734 +87,1.362 +88,0.467 +89,1.136 +90,0.370 +91,-1.070 +92,0.526 +93,-0.800 +94,0.719 +95,1.721 +96,0.728 +97,0.484 +98,0.412 +99,0.176 +100,-0.007 +101,0.483 +102,0.675 +103,0.652 +104,-1.565 +105,0.079 +106,-0.258 +107,1.445 +108,-0.785 +109,-0.771 +110,-0.025 +111,1.162 +112,-0.956 +113,-1.575 +114,0.365 +115,-0.692 +116,0.228 +117,-0.324 +118,0.449 +119,-1.016 +120,-0.208 +121,0.985 +122,1.007 +123,-0.382 +124,-0.461 +125,-0.569 +126,1.339 +127,1.226 +128,1.798 +129,-0.006 +130,-0.583 +131,-0.198 +132,-0.782 +133,0.573 +134,1.756 +135,-1.541 +136,-0.210 +137,-0.234 +138,-1.185 +139,0.092 +140,-0.080 +141,0.436 +142,-0.010 +143,1.139 +144,-0.682 +145,-0.952 +146,-0.801 +147,-0.069 +148,-0.526 +149,0.927 +150,0.194 +151,-0.288 +152,0.735 +153,-0.574 +154,-0.905 +155,1.147 +156,0.234 +157,-1.506 +158,-1.129 +159,-0.176 +160,0.474 +161,-0.627 +162,2.357 +163,0.941 +164,0.367 +165,-0.486 +166,-1.170 +167,0.153 +168,0.489 +169,-1.879 +170,0.222 +171,-0.795 +172,-1.657 +173,0.691 +174,0.959 +175,1.198 +176,0.612 +177,-1.489 +178,0.282 +179,-0.189 +180,-0.822 +181,0.380 +182,1.715 +183,0.410 +184,0.306 +185,-0.243 +186,0.117 +187,1.080 +188,-0.565 +189,1.548 +190,0.335 +191,-0.081 +192,0.582 +193,1.009 +194,-0.371 +195,0.984 +196,1.211 +197,-0.034 +198,0.635 +199,0.314 +200,0.116 +201,3.344 +202,0.207 +203,0.116 +204,-0.553 +205,0.746 +206,0.816 +207,-0.770 +208,-1.366 +209,0.558 +210,0.405 +211,-0.276 +212,1.141 +213,1.388 +214,1.425 +215,0.149 +216,-0.577 +217,0.435 +218,1.852 +219,0.548 +220,-0.086 +221,0.430 +222,0.301 +223,0.773 +224,-2.709 +225,0.337 +226,0.460 +227,-0.393 +228,0.670 +229,-0.186 +230,-0.517 +231,0.537 +232,0.359 +233,-0.923 +234,-0.711 +235,-0.644 +236,-0.926 +237,0.150 +238,1.184 +239,-0.649 +240,-1.567 +241,1.075 +242,-0.348 +243,-1.265 +244,-0.810 +245,-1.409 +246,1.100 +247,-0.725 +248,-0.493 +249,-0.498 +250,-1.927 +251,0.292 +252,-0.661 +253,1.439 +254,-0.614 +255,0.909 +256,1.314 +257,1.352 +258,0.826 +259,0.081 +260,-0.271 +261,0.312 +262,0.176 +263,2.019 +264,1.550 +265,-0.541 +266,-0.977 +267,0.823 +268,-1.874 +269,-1.451 +270,0.256 +271,-0.786 +272,0.247 +273,-0.212 +274,-1.198 +275,0.927 +276,-2.228 +277,1.665 +278,1.387 +279,-0.022 +280,-0.515 +281,0.416 +282,0.898 +283,1.164 +284,-0.111 +285,0.543 +286,-1.013 +287,1.419 +288,-0.302 +289,-1.725 +290,1.800 +291,0.084 +292,0.436 +293,-1.366 +294,-1.840 +295,-0.030 +296,-0.540 +297,1.053 +298,0.679 +299,1.042 +300,0.214 +301,-0.378 +302,0.427 +303,0.534 +304,0.819 +305,0.220 +306,-0.256 +307,1.054 +308,-0.075 +309,0.220 +310,-1.104 +311,-0.436 +312,-0.556 +313,0.709 +314,-0.331 +315,-1.003 +316,-0.932 +317,-0.910 +318,-1.757 +319,0.861 +320,0.884 +321,-0.855 +322,-1.134 +323,0.163 +324,-0.798 +325,0.627 +326,-0.848 +327,0.356 +328,0.001 +329,0.464 +330,-0.069 +331,-0.690 +332,-0.199 +333,1.533 +334,0.537 +335,-0.074 +336,1.255 +337,1.670 +338,0.000 +339,-2.420 +340,0.708 +341,-0.556 +342,-0.704 +343,-0.473 +344,0.896 +345,1.779 +346,-1.215 +347,-0.085 +348,-1.638 +349,1.169 +350,1.778 +351,-1.166 +352,-1.656 +353,0.562 +354,-1.234 +355,-0.419 +356,-0.418 +357,-0.457 +358,0.852 +359,-0.840 +360,0.896 +361,0.181 +362,1.575 +363,-1.348 +364,-1.111 +365,-0.291 +366,-0.999 +367,0.548 +368,-0.612 +369,0.480 +370,0.768 +371,-1.437 +372,0.555 +373,-0.322 +374,-0.680 +375,-0.523 +376,0.395 +377,0.347 +378,0.300 +379,0.036 +380,0.392 +381,-1.963 +382,-0.615 +383,-1.174 +384,-0.618 +385,-0.737 +386,-0.538 +387,0.779 +388,-0.228 +389,-1.512 +390,0.750 +391,0.081 +392,0.534 +393,-0.375 +394,1.329 +395,-0.640 +396,0.552 +397,-0.807 +398,-0.620 +399,-0.455 +400,-0.016 +401,-1.836 +402,1.653 +403,0.031 +404,-1.248 +405,0.441 +406,-0.069 +407,-0.372 +408,1.656 +409,-2.669 +410,0.246 +411,-0.128 +412,0.639 +413,0.513 +414,-0.241 +415,0.480 +416,0.568 +417,0.431 +418,1.923 +419,0.712 +420,-0.382 +421,-0.076 +422,0.760 +423,-1.616 +424,-0.924 +425,-0.403 +426,-0.781 +427,-0.962 +428,0.688 +429,1.200 +430,0.075 +431,-0.416 +432,-0.338 +433,0.425 +434,0.985 +435,1.051 +436,0.469 +437,-1.157 +438,-0.224 +439,-0.247 +440,0.952 +441,0.981 +442,-0.071 +443,0.456 +444,0.022 +445,3.346 +446,0.794 +447,-1.624 +448,1.269 +449,-0.234 +450,-0.219 +451,1.193 +452,-0.369 +453,1.048 +454,0.446 +455,0.565 +456,-1.066 +457,-0.281 +458,-2.148 +459,0.021 +460,-0.372 +461,-0.784 +462,0.223 +463,1.337 +464,-1.085 +465,-1.042 +466,-1.028 +467,-3.013 +468,-1.637 +469,0.991 +470,1.183 +471,0.131 +472,0.317 +473,-3.021 +474,1.794 +475,0.511 +476,1.594 +477,-1.788 +478,-1.462 +479,-0.194 +480,0.227 +481,-0.223 +482,1.863 +483,0.278 +484,-0.311 +485,0.991 +486,0.384 +487,-0.814 +488,0.170 +489,0.378 +490,-1.673 +491,0.479 +492,-0.306 +493,1.500 +494,1.015 +495,0.128 +496,0.700 +497,0.211 +498,-1.802 +499,-0.421 +500,0.326 +501,-0.738 +502,1.021 +503,-1.452 +504,0.586 +505,-1.555 +506,0.991 +507,0.279 +508,0.639 +509,0.488 +510,0.160 +511,0.407 +512,1.043 +513,0.818 +514,-0.252 +515,-1.263 +516,1.669 +517,-1.032 +518,-0.175 +519,0.030 +520,0.085 +521,-0.291 +522,-0.688 +523,0.074 +524,-0.835 +525,-1.969 +526,0.115 +527,1.258 +528,1.076 +529,1.211 +530,-0.573 +531,0.097 +532,0.243 +533,-0.692 +534,-0.473 +535,0.880 +536,1.627 +537,0.851 +538,-1.223 +539,-2.485 +540,1.166 +541,1.872 +542,0.078 +543,-1.142 +544,0.017 +545,0.444 +546,-1.638 +547,-0.964 +548,-0.114 +549,-0.227 +550,1.117 +551,-1.084 +552,0.452 +553,-1.337 +554,0.205 +555,0.820 +556,-1.181 +557,-1.603 +558,-1.310 +559,-0.049 +560,-0.359 +561,0.052 +562,1.161 +563,-0.179 +564,0.221 +565,-0.541 +566,-0.454 +567,-0.445 +568,0.146 +569,0.747 +570,-0.900 +571,-0.943 +572,-0.801 +573,-1.285 +574,-2.027 +575,0.201 +576,-1.207 +577,-0.968 +578,0.371 +579,-2.127 +580,-0.311 +581,-0.652 +582,0.122 +583,-0.904 +584,0.798 +585,0.291 +586,1.173 +587,2.235 +588,-0.378 +589,1.284 +590,-0.183 +591,-0.584 +592,-0.362 +593,-0.570 +594,-0.874 +595,1.219 +596,0.287 +597,0.158 +598,0.171 +599,0.410 +600,-0.674 +601,-0.575 +602,0.810 +603,1.220 +604,-0.487 +605,0.740 +606,0.104 +607,0.823 +608,-0.616 +609,-1.489 +610,0.198 +611,0.506 +612,0.620 +613,0.819 +614,-1.112 +615,-0.539 +616,-1.855 +617,-0.116 +618,-0.553 +619,-0.629 +620,-2.078 +621,1.540 +622,-1.175 +623,-1.393 +624,-0.015 +625,0.521 +626,2.351 +627,0.265 +628,-0.329 +629,-1.119 +630,0.073 +631,2.697 +632,0.824 +633,0.152 +634,-2.251 +635,0.895 +636,1.584 +637,0.648 +638,1.325 +639,0.186 +640,1.421 +641,0.023 +642,-0.835 +643,-0.094 +644,-1.550 +645,-0.019 +646,1.140 +647,-1.245 +648,1.083 +649,0.828 +650,-0.003 +651,-1.058 +652,-0.455 +653,0.003 +654,-0.039 +655,0.177 +656,1.445 +657,-0.208 +658,-2.007 +659,-1.919 +660,-0.946 +661,-1.508 +662,0.026 +663,2.482 +664,0.520 +665,-0.271 +666,1.290 +667,-2.208 +668,-0.058 +669,-0.878 +670,-1.177 +671,-1.406 +672,0.548 +673,0.193 +674,1.555 +675,-1.581 +676,-1.295 +677,-0.656 +678,0.259 +679,0.444 +680,0.185 +681,1.710 +682,-0.279 +683,-0.699 +684,0.362 +685,0.403 +686,-0.294 +687,-0.811 +688,-0.074 +689,-0.634 +690,0.039 +691,-1.061 +692,0.858 +693,1.191 +694,-2.011 +695,-0.357 +696,-0.011 +697,1.066 +698,-0.600 +699,0.090 +700,0.436 +701,0.128 +702,-0.196 +703,-1.377 +704,-0.322 +705,-1.808 +706,-0.328 +707,0.199 +708,0.722 +709,-1.739 +710,-1.298 +711,-0.005 +712,-0.724 +713,0.404 +714,-1.062 +715,0.214 +716,-0.101 +717,-0.236 +718,0.576 +719,-0.714 +720,1.278 +721,1.892 +722,1.953 +723,-0.699 +724,1.114 +725,0.583 +726,-0.107 +727,1.835 +728,1.424 +729,-1.994 +730,0.156 +731,-1.029 +732,-0.300 +733,0.538 +734,-0.839 +735,-1.679 +736,-0.650 +737,0.502 +738,0.391 +739,-1.030 +740,1.130 +741,-1.206 +742,-0.135 +743,0.984 +744,0.054 +745,-1.233 +746,0.270 +747,0.969 +748,-0.208 +749,0.907 +750,4.033 +751,-2.113 +752,0.297 +753,0.661 +754,-0.449 +755,0.216 +756,0.067 +757,-0.322 +758,-0.700 +759,1.171 +760,0.448 +761,-2.344 +762,1.178 +763,-0.795 +764,0.233 +765,-0.234 +766,-1.234 +767,1.264 +768,-1.333 +769,0.120 +770,0.085 +771,-0.809 +772,0.756 +773,-0.422 +774,0.091 +775,0.336 +776,-0.602 +777,0.363 +778,0.733 +779,1.908 +780,-0.180 +781,0.150 +782,0.892 +783,0.154 +784,0.751 +785,0.107 +786,-0.139 +787,2.164 +788,0.472 +789,-1.525 +790,1.234 +791,0.003 +792,-0.416 +793,-0.218 +794,-0.581 +795,-0.057 +796,-0.041 +797,1.679 +798,0.610 +799,1.023 +800,-0.483 +801,-1.145 +802,-1.091 +803,1.243 +804,-1.741 +805,0.160 +806,1.385 +807,-0.449 +808,-0.772 +809,1.558 +810,0.136 +811,0.583 +812,-0.573 +813,1.294 +814,0.629 +815,0.499 +816,0.818 +817,0.771 +818,-2.320 +819,-2.034 +820,0.364 +821,-0.694 +822,-0.642 +823,-1.067 +824,0.680 +825,-0.408 +826,-0.247 +827,-0.671 +828,0.322 +829,0.093 +830,-0.423 +831,1.205 +832,0.788 +833,0.169 +834,-0.038 +835,-0.608 +836,0.680 +837,0.945 +838,-0.655 +839,0.408 +840,0.519 +841,-0.053 +842,-0.001 +843,0.169 +844,-1.391 +845,1.203 +846,-1.181 +847,1.636 +848,0.238 +849,0.455 +850,-0.372 +851,-0.084 +852,-1.319 +853,2.317 +854,-0.666 +855,0.748 +856,-2.188 +857,-1.569 +858,0.188 +859,-0.869 +860,0.227 +861,-0.484 +862,-0.154 +863,0.053 +864,-1.828 +865,0.355 +866,-0.186 +867,-0.177 +868,0.189 +869,0.280 +870,0.492 +871,-1.055 +872,0.229 +873,0.045 +874,0.582 +875,1.942 +876,-0.962 +877,0.933 +878,1.455 +879,-1.105 +880,-1.087 +881,0.571 +882,0.723 +883,-0.393 +884,-1.423 +885,-2.160 +886,-0.910 +887,-0.649 +888,1.371 +889,-1.231 +890,-0.270 +891,2.392 +892,1.269 +893,-0.107 +894,0.366 +895,1.715 +896,-0.037 +897,0.171 +898,-1.250 +899,-0.140 +900,-0.767 +901,-1.390 +902,-0.197 +903,-0.440 +904,0.537 +905,-0.489 +906,-0.653 +907,-0.642 +908,0.489 +909,0.392 +910,1.327 +911,-0.769 +912,-1.035 +913,-0.318 +914,-0.038 +915,0.391 +916,-1.228 +917,0.200 +918,-0.754 +919,0.866 +920,0.934 +921,1.951 +922,0.053 +923,0.705 +924,-0.335 +925,-1.243 +926,0.115 +927,-1.021 +928,1.370 +929,-0.230 +930,-0.374 +931,0.398 +932,0.849 +933,-0.529 +934,2.625 +935,-0.702 +936,0.344 +937,-0.657 +938,0.664 +939,-1.100 +940,-0.580 +941,0.010 +942,-0.244 +943,1.774 +944,-0.407 +945,0.643 +946,-1.016 +947,0.956 +948,-0.214 +949,0.391 +950,0.946 +951,-0.823 +952,-1.356 +953,-1.731 +954,-0.262 +955,-0.933 +956,-1.032 +957,-1.481 +958,-0.752 +959,-1.135 +960,-0.201 +961,-0.386 +962,0.089 +963,-0.976 +964,2.700 +965,0.134 +966,1.805 +967,-0.212 +968,-0.533 +969,-0.198 +970,-0.882 +971,0.268 +972,-0.866 +973,-0.518 +974,0.644 +975,-1.935 +976,0.251 +977,0.443 +978,-0.062 +979,-1.433 +980,0.417 +981,0.256 +982,1.467 +983,0.229 +984,-0.467 +985,0.878 +986,-0.195 +987,-0.307 +988,1.925 +989,1.746 +990,-0.542 +991,-0.014 +992,0.610 +993,0.704 +994,-0.018 +995,-1.254 +996,-1.215 +997,-0.654 +998,-0.626 +999,0.780 +1000,0.401 +1001,0.572 +1002,-1.036 +1003,0.333 +1004,1.307 +1005,-0.218 +1006,-0.449 +1007,-2.055 +1008,-0.512 +1009,-1.329 +1010,0.352 +1011,-1.354 +1012,0.199 +1013,-0.905 +1014,-0.444 +1015,-0.946 +1016,1.219 +1017,-0.947 +1018,0.384 +1019,1.578 +1020,-0.533 +1021,-0.755 +1022,0.869 +1023,0.211 diff --git a/CRVConditions/inc/CRVScintYield.hh b/CRVConditions/inc/CRVScintYield.hh index 6b0e3cccb1..dc16601626 100644 --- a/CRVConditions/inc/CRVScintYield.hh +++ b/CRVConditions/inc/CRVScintYield.hh @@ -2,7 +2,7 @@ #define CRVConditions_CRVScintYield_hh // -// Holds scintillation yield spread of CRV counters +// Holds scintillation yield spread of CRV channels // #include "Offline/DataProducts/inc/CRSScintillatorBarIndex.hh" diff --git a/CRVConditions/inc/CRVScintYieldMaker.hh b/CRVConditions/inc/CRVScintYieldMaker.hh index dcb65e0a4b..0f9479a980 100644 --- a/CRVConditions/inc/CRVScintYieldMaker.hh +++ b/CRVConditions/inc/CRVScintYieldMaker.hh @@ -3,7 +3,7 @@ // // construct a CRVScintYield proditions entity -// (scintillation yield spread of CRV counters) +// (scintillation yield spread of CRV channels) // from fcl or database // diff --git a/CRVConditions/src/CRVScintYieldMaker.cc b/CRVConditions/src/CRVScintYieldMaker.cc index 4c6e9ea8d7..16382791c7 100644 --- a/CRVConditions/src/CRVScintYieldMaker.cc +++ b/CRVConditions/src/CRVScintYieldMaker.cc @@ -14,12 +14,14 @@ namespace mu2e { CRVScintYield::ptr_t CRVScintYieldMaker::fromFcl() { if (_config.verbose()) { - cout << "scintillation yield spread set to 0 for all CRV counters, because database is not used.\n"; + cout << "scintillation yield spread set to 0 for all CRV channels, because database is not used.\n"; } - size_t nCounters = GeomHandle()->getAllCRSScintillatorBars().size(); + size_t nChan = + GeomHandle()->getAllCRSScintillatorBars().size() * + CRVId::nChanPerBar; - CRVScintYield::ScintYieldVec svec(nCounters, 0.0); + CRVScintYield::ScintYieldVec svec(nChan, 0.0); auto ptr = make_shared(svec); return ptr; @@ -33,27 +35,29 @@ CRVScintYield::ptr_t CRVScintYieldMaker::fromDb(CRVScint::cptr_t sci_p) { cout << "CRVScintYieldMaker::fromDb making CRVScintYield\n"; } - size_t nCounters = GeomHandle()->getAllCRSScintillatorBars().size(); + size_t nChan = + GeomHandle()->getAllCRSScintillatorBars().size() * + CRVId::nChanPerBar; if (_config.verbose()) { - cout << "CRVScintYieldMaker::fromDb checking for " << nCounters << " counters\n"; + cout << "CRVScintYieldMaker::fromDb checking for " << nChan << " channels\n"; } // require the db tables are the same length as geometry - if (sci_p->nrow() != nCounters) { + if (sci_p->nrow() != nChan) { throw cet::exception("CRVSCINTYIELDMAKE_BAD_N_COUNTERS") - << "CRVScintYieldMaker::fromDb bad counter counts: " - << " geometry: " << nCounters << " CRVScint: " << sci_p->nrow() << "\n"; + << "CRVScintYieldMaker::fromDb bad channel counts: " + << " geometry: " << nChan << " CRVScint: " << sci_p->nrow() << "\n"; } - CRVScintYield::ScintYieldVec svec(nCounters, 0.0); + CRVScintYield::ScintYieldVec svec(nChan, 0.0); for (auto const& row : sci_p->rows()) { - svec[row.counter()] = row.scintYieldDeviation(); + svec[row.channel()] = row.scintYieldDeviation(); if (_config.verbose()) { - if (_config.verbose() > 1 || row.counter() < 5 || - CRVId::nBars - row.counter() <= 5) { - cout << setw(10) << row.counter() << fixed << setprecision(3) + if (_config.verbose() > 1 || row.channel() < 5 || + CRVId::nBars - row.channel() <= 5) { + cout << setw(10) << row.channel() << fixed << setprecision(3) << setw(10) << row.scintYieldDeviation() << "\n"; } } diff --git a/CRVConfig/inc/CRVScintYieldConfig.hh b/CRVConfig/inc/CRVScintYieldConfig.hh index 2ec8f0f26d..f1c6234d9e 100644 --- a/CRVConfig/inc/CRVScintYieldConfig.hh +++ b/CRVConfig/inc/CRVScintYieldConfig.hh @@ -1,7 +1,7 @@ #ifndef STMConfig_CRVScintYieldConfig_hh #define STMConfig_CRVScintYieldConfig_hh // -// Fcl stanza for CRV ScintYield (scintillation yield spread of CRV counters) prodition +// Fcl stanza for CRV ScintYield (scintillation yield spread of CRV channels) prodition // #include "fhiclcpp/types/Atom.h" #include "fhiclcpp/types/Sequence.h" diff --git a/CRVResponse/fcl/prolog_v11.fcl b/CRVResponse/fcl/prolog_v11.fcl index 7c02559de4..123102534a 100644 --- a/CRVResponse/fcl/prolog_v11.fcl +++ b/CRVResponse/fcl/prolog_v11.fcl @@ -62,12 +62,12 @@ BEGIN_PROLOG 39400,39400,39400,39400, //D1...4 0,0,39400,39400] //C1...4 - scintillationYieldScaleFactor : 0.42 //scale factor applied to scintillation yields to mimic aging + photonYieldScaleFactor : 0.42 //scale factor applied to scintillation yields to mimic aging //0.42 results in 28.6 PE/SiPM @ 1 m away from SiPM (expected in 2025) //used in SU2020 - scintillationYieldVariation : 0.05 //gaussian distribution with sigma equal to 5% of the mean - scintillationYieldVariationCutoffLow :-0.2 //the scintillation yield variation is cut off at 20% below the mean - scintillationYieldVariationCutoffHigh : 0.2 //the scintillation yield variation is cut off at 20% above the mean + photonYieldVariationSigma : 0.05 //gaussian distribution with sigma equal to 5% of the mean + photonYieldVariationCutoffLow :-0.2 //the scintillation yield variation is cut off at 20% below the mean + photonYieldVariationCutoffHigh : 0.2 //the scintillation yield variation is cut off at 20% above the mean digitizationStart : 400.0 //400ns digitizationEnd : 1750.0 //1750ns digitizationStartMargin : 50.0 //50ns diff --git a/CRVResponse/inc/MakeCrvPhotons.hh b/CRVResponse/inc/MakeCrvPhotons.hh index 6aa6c89256..42c9fc8de4 100644 --- a/CRVResponse/inc/MakeCrvPhotons.hh +++ b/CRVResponse/inc/MakeCrvPhotons.hh @@ -92,15 +92,20 @@ struct LookupBin class MakeCrvPhotons { public: + static const int _nSiPMs=4; MakeCrvPhotons(CLHEP::RandFlat &randFlat, CLHEP::RandGaussQ &randGaussQ, CLHEP::RandPoissonQ &randPoissonQ) : - _randFlat(randFlat), _randGaussQ(randGaussQ), _randPoissonQ(randPoissonQ) {} + _randFlat(randFlat), _randGaussQ(randGaussQ), _randPoissonQ(randPoissonQ) + { + _scintillationYield=39400; + for(int i=0; i<_nSiPMs; ++i) _photonYieldDeviation[i]=1.0; + } ~MakeCrvPhotons(); const std::string &GetFileName() const {return _fileName;} - void LoadLookupTable(const std::string &filename, int debug); + void LoadLookupTable(const std::string &filename, int debug); void MakePhotons(const CLHEP::Hep3Vector &stepStart, //they need to be points const CLHEP::Hep3Vector &stepEnd, //local to the CRV bar double timeStart, double timeEnd, @@ -111,14 +116,16 @@ class MakeCrvPhotons int GetNumberOfPhotons(int SiPM); const std::vector &GetArrivalTimes(int SiPM); void SetScintillationYield(double yield) {_scintillationYield=yield;} + void SetPhotonYieldDeviation(double deviation, int SiPM) {_photonYieldDeviation[SiPM]=deviation;} private: std::string _fileName; int _reflector; - std::vector _arrivalTimes[4]; + std::vector _arrivalTimes[_nSiPMs]; double _scintillationYield; + double _photonYieldDeviation[_nSiPMs]; LookupConstants _LC; LookupCerenkov _LCerenkov; diff --git a/CRVResponse/src/CrvPhotonGenerator_module.cc b/CRVResponse/src/CrvPhotonGenerator_module.cc index 32a1f88d85..a7c4639375 100644 --- a/CRVResponse/src/CrvPhotonGenerator_module.cc +++ b/CRVResponse/src/CrvPhotonGenerator_module.cc @@ -8,6 +8,7 @@ #include "Offline/CRVResponse/inc/MakeCrvPhotons.hh" #include "Offline/CosmicRayShieldGeom/inc/CosmicRayShield.hh" #include "Offline/DataProducts/inc/CRSScintillatorBarIndex.hh" +#include "Offline/DataProducts/inc/CRVId.hh" #include "Offline/GlobalConstantsService/inc/GlobalConstantsHandle.hh" #include "Offline/GlobalConstantsService/inc/ParticleDataList.hh" @@ -64,14 +65,10 @@ namespace mu2e fhicl::Sequence reflectors{ Name("reflectors"), Comment("location of reflectors at Crv sectors")}; fhicl::Sequence lookupTableFileNames{ Name("lookupTableFileNames"), Comment("lookup tables for Crv sectors")}; fhicl::Sequence scintillationYields{ Name("scintillationYields"), Comment("scintillation yields at Crv sectors")}; - fhicl::Atom scintillationYieldScaleFactor{ Name("scintillationYieldScaleFactor"), - Comment("scale factor for scintillation yield")}; - fhicl::Atom scintillationYieldVariation{ Name("scintillationYieldVariation"), - Comment("sigma of gaussian variation of scintillation yield")}; - fhicl::Atom scintillationYieldVariationCutoffLow{ Name("scintillationYieldVariationCutoffLow"), - Comment("lower cutoff at scintillation yield variation")}; - fhicl::Atom scintillationYieldVariationCutoffHigh{ Name("scintillationYieldVariationCutoffHigh"), - Comment("upper cutoff at scintillation yield variation")}; + fhicl::Atom photonYieldScaleFactor{ Name("photonYieldScaleFactor"), Comment("scale factor for light yield")}; + fhicl::Atom photonYieldVariationSigma{ Name("photonYieldVariationSigma"),Comment("sigma of gaussian variation of scintillation yield")}; + fhicl::Atom photonYieldVariationCutoffLow{ Name("photonYieldVariationCutoffLow"),Comment("lower cutoff at photon yield variation")}; + fhicl::Atom photonYieldVariationCutoffHigh{ Name("photonYieldVariationCutoffHigh"),Comment("upper cutoff at photon yield variation")}; fhicl::Atom digitizationStart{ Name("digitizationStart"), Comment("start of digitization")}; fhicl::Atom digitizationEnd{ Name("digitizationEnd"), Comment("end of digitization")}; fhicl::Atom digitizationStartMargin{ Name("digitizationStartMargin"), @@ -98,11 +95,11 @@ namespace mu2e std::vector _scintillationYields; std::vector > _makeCrvPhotons; - mu2e::ProditionsHandle _scintillationYieldVector; - double _scintillationYieldScaleFactor; - double _scintillationYieldVariation; - double _scintillationYieldVariationCutoffLow; - double _scintillationYieldVariationCutoffHigh; + double _photonYieldScaleFactor; + mu2e::ProditionsHandle _photonYieldVariationVector; + double _photonYieldVariationSigma; + double _photonYieldVariationCutoffLow; + double _photonYieldVariationCutoffHigh; //On-spill //-Digitization window @@ -158,10 +155,10 @@ namespace mu2e _reflectors(conf().reflectors()), _lookupTableFileNames(conf().lookupTableFileNames()), _scintillationYields(conf().scintillationYields()), - _scintillationYieldScaleFactor(conf().scintillationYieldScaleFactor()), - _scintillationYieldVariation(conf().scintillationYieldVariation()), - _scintillationYieldVariationCutoffLow(conf().scintillationYieldVariationCutoffLow()), - _scintillationYieldVariationCutoffHigh(conf().scintillationYieldVariationCutoffHigh()), + _photonYieldScaleFactor(conf().photonYieldScaleFactor()), + _photonYieldVariationSigma(conf().photonYieldVariationSigma()), + _photonYieldVariationCutoffLow(conf().photonYieldVariationCutoffLow()), + _photonYieldVariationCutoffHigh(conf().photonYieldVariationCutoffHigh()), _digitizationStart(conf().digitizationStart()), _digitizationEnd(conf().digitizationEnd()), _digitizationStartMargin(conf().digitizationStartMargin()), @@ -192,8 +189,6 @@ namespace mu2e std::set filedirs; for(size_t i=0; i<_lookupTableFileNames.size(); ++i) { - _scintillationYields[i]*=_scintillationYieldScaleFactor; - bool tableLoaded=false; for(size_t j=0; j,std::vector > photonMap; - auto const& scintillationYieldVector = _scintillationYieldVector.get(event.id()); + auto const& photonYieldVariationVector = _photonYieldVariationVector.get(event.id()); GeomHandle CRS; GlobalConstantsHandle particleDataList; @@ -323,16 +318,20 @@ namespace mu2e const CRSScintillatorBarId &barId = CRSbar.id(); int CRVSectorNumber=barId.getShieldNumber(); - //get the deviation of the scintillation yield from the nominal scintillation yield for each counter - float sectorScintillationYield = _scintillationYields[CRVSectorNumber]; - float scintillationYieldDeviation = scintillationYieldVector.scintYieldDeviation(step.barIndex().asUint()); - scintillationYieldDeviation *= _scintillationYieldVariation; - if(scintillationYieldDeviation<_scintillationYieldVariationCutoffLow) scintillationYieldDeviation=_scintillationYieldVariationCutoffLow; - if(scintillationYieldDeviation>_scintillationYieldVariationCutoffHigh) scintillationYieldDeviation=_scintillationYieldVariationCutoffHigh; - float adjustedScintillationYield = sectorScintillationYield + scintillationYieldDeviation*sectorScintillationYield; - boost::shared_ptr &photonMaker=_makeCrvPhotons.at(CRVSectorNumber); - photonMaker->SetScintillationYield(adjustedScintillationYield); + + //get the channel-specific deviation of the light yield (total from scintillation and Cerenkov) from the nominal value, + //e.g. due to scintillator variations or SiPM misalignments + for(size_t SiPM=0; SiPM_photonYieldVariationCutoffHigh) photonYieldDeviation=_photonYieldVariationCutoffHigh; + photonYieldDeviation = (photonYieldDeviation+1.0)*_photonYieldScaleFactor; //global photon yield scale factor for e.g. aging + photonMaker->SetPhotonYieldDeviation(photonYieldDeviation,SiPM); + } + photonMaker->MakePhotons(pos1Local, pos2Local, t1, t2, avgBeta, charge, step.visibleEDep(), @@ -340,7 +339,7 @@ namespace mu2e _reflectors[CRVSectorNumber]); art::Ptr crvStepPtr(CrvSteps,istep); - for(int SiPM=0; SiPM<4; ++SiPM) + for(size_t SiPM=0; SiPM barIndexSiPMNumber(step.barIndex(),SiPM); const std::vector ×=photonMaker->GetArrivalTimes(SiPM); diff --git a/CRVResponse/src/MakeCrvPhotons.cc b/CRVResponse/src/MakeCrvPhotons.cc index efd71807ac..fab2fe1378 100644 --- a/CRVResponse/src/MakeCrvPhotons.cc +++ b/CRVResponse/src/MakeCrvPhotons.cc @@ -295,14 +295,14 @@ void MakeCrvPhotons::MakePhotons(const CLHEP::Hep3Vector &stepStartTmp, //they { if(_LC.reflector!=std::abs(reflector)) throw std::logic_error("Expected reflector/absorber doesn't match lookup table."); - for(int SiPM=0; SiPM<4; SiPM++) _arrivalTimes[SiPM].clear(); + for(int SiPM=0; SiPM<_nSiPMs; SiPM++) _arrivalTimes[SiPM].clear(); //coordinates are in local coordinates of the scintillator (x:thickness, y:width, z:length) - CLHEP::Hep3Vector stepStart[4]; - CLHEP::Hep3Vector stepEnd[4]; + CLHEP::Hep3Vector stepStart[_nSiPMs]; + CLHEP::Hep3Vector stepEnd[_nSiPMs]; //local start/end positions for all for SiPMs derived from the symmetries of the counter, //because lookup tables are stored only for SiPM #0. - for(int SiPM=0; SiPM<4; SiPM++) + for(int SiPM=0; SiPM<_nSiPMs; SiPM++) { stepStart[SiPM] = stepStartTmp; stepEnd[SiPM] = stepEndTmp; @@ -324,7 +324,7 @@ void MakeCrvPhotons::MakePhotons(const CLHEP::Hep3Vector &stepStartTmp, //they static int nPScintillation=0; static int nPCerenkov=0; - for(int SiPM=0; SiPM<4; SiPM++) + for(int SiPM=0; SiPM<_nSiPMs; SiPM++) { //there are only lookup tables without reflector or with reflector on the +z side (i.e. at SiPMs #1 and #3) if(reflector!=0 && (SiPM==1 || SiPM==3)) continue; @@ -401,6 +401,7 @@ nPCerenkov+=nPhotonsCerenkov; //photon arrival probability at SiPM double probability = theBin->arrivalProbability; + probability*=_photonYieldDeviation[SiPM]; //channel-specific deviation from nominal, e.g. due to scintillator variations or SiPM misalignments if(_randFlat.fire()<=probability) //a photon arrives at the SiPM --> calculate arrival time { //start time of photons diff --git a/CRVResponse/test/randomDeadChannels.py b/CRVResponse/test/randomDeadChannels.py new file mode 100644 index 0000000000..ca9faa1193 --- /dev/null +++ b/CRVResponse/test/randomDeadChannels.py @@ -0,0 +1,22 @@ +import random +import sys + +if len(sys.argv) != 3: + print("usage \"randomDeadChannels nChannels probability\"") + print("nChannels=22016 when using the full CRV\"") + sys.exit() + +nChannels=int(sys.argv[1]) +probability=float(sys.argv[2]) + +print("TABLE CRVBadChan") +print("#status 1: not connected") +print("#status 2: dead") +print("#status 3: no data") +print("#status 4: no pedestal") +print("#status 5: no calibration constant") +print("#status 6: noisy") +print("#channel,status") +for channel in range(nChannels): + if random.random() const& rows() const { return _rows; } std::size_t nrow() const override { return _rows.size(); }; std::size_t size() const override { return baseSize() + nrow() * sizeof(Row); }; - const std::string orderBy() const override { return std::string("counter"); } + const std::string orderBy() const override { return std::string("channel"); } void addRow(const std::vector& columns) override { - std::uint16_t counter = std::stoul(columns[0]); - // enforce order, so counters can be looked up by index - if (counter >= CRVId::nBars || counter != _rows.size()) { + std::uint16_t channel = std::stoul(columns[0]); + // enforce order, so channel can be looked up by index + if (channel >= CRVId::nBars || channel != _rows.size()) { throw cet::exception("CRVSCINT_BAD_CHANNEL") - << "CRVScint::addRow bad counter, saw " << columns[0] << ", expected " + << "CRVScint::addRow bad channel, saw " << columns[0] << ", expected " << _rows.size() << "\n"; } _rows.emplace_back(std::stoi(columns[0]), std::stof(columns[1])); @@ -56,7 +56,7 @@ class CRVScint : public DbTable { void rowToCsv(std::ostringstream& sstream, std::size_t irow) const override { Row const& r = _rows.at(irow); - sstream << r.counter() << ","; + sstream << r.channel() << ","; sstream << std::fixed << std::setprecision(3); sstream << r.scintYieldDeviation(); } diff --git a/EventDisplay/fcl/EventDisplayWideband4modules.fcl b/EventDisplay/fcl/EventDisplayWideband4modules.fcl index af052a314f..aaf27c77c1 100644 --- a/EventDisplay/fcl/EventDisplayWideband4modules.fcl +++ b/EventDisplay/fcl/EventDisplayWideband4modules.fcl @@ -35,6 +35,6 @@ physics : } services.GeometryService.simulatedDetector.tool_type : "Mu2e" -services.GeometryService.inputFile: "Offline/Mu2eG4/geom/geom_Wideband4modules.txt" +services.GeometryService.inputFile: "Offline/Mu2eG4/geom/geom_Wideband4modules_v2.txt" #services.ProditionsService.crvCalib.pedestal : 0.0 #for special cases (100.0 is default pedestal for simulations) #source.readParameterSets : false diff --git a/Mu2eG4/geom/geom_Wideband4modules_v1.txt b/Mu2eG4/geom/geom_Wideband4modules_v1.txt new file mode 100644 index 0000000000..27b40bf307 --- /dev/null +++ b/Mu2eG4/geom/geom_Wideband4modules_v1.txt @@ -0,0 +1,91 @@ +#include "Offline/Mu2eG4/geom/geom_common.txt" + +bool hasSTM = false; //to prevent errors from the Offline environment + +string crs.name = "wideband4modules"; // same as channelMap name + +int crs.nSectors = 4; +int crs.nLayers = 4; + +vector crs.sectorNames = {"W1","W2","W3","W4"}; + + +double crs.scintillatorBarThickness = 19.78; //mm +double crs.scintillatorBarWidth = 51.34; //mm +double crs.layerOffset = 42.0; //mm +double crs.gapLarge = 0.2; //mm //0.366 according to crv_parameters.xlsx //previously 0.5 +double crs.gapSmall = 0.0; //mm //previously 0.0875 +double crs.gapBetweenModules = 3.0; //mm +vector crs.gapBetweenLayers = {9.525, 9.525, 9.525}; //mm +double crs.aluminumSheetThickness = 3.175; //mm +double crs.strongBackThickness = 12.7; //mm + +double crs.scintillatorBarLengthW1 = 6000; +double crs.scintillatorBarLengthW2 = 6000; +double crs.scintillatorBarLengthW3 = 6000; +double crs.scintillatorBarLengthW4 = 6000; + +int crs.nModulesW1 = 1; +int crs.nModulesW2 = 1; +int crs.nModulesW3 = 1; +int crs.nModulesW4 = 1; + +int crs.nCountersPerModuleW1 = 16; //per layer +int crs.nCountersPerModuleW2 = 16; +int crs.nCountersPerModuleW3 = 16; +int crs.nCountersPerModuleW4 = 16; + +vector crs.firstCounterW1 = {-3904.0, 0.0, 20000.0}; +vector crs.firstCounterW2 = {-3904.0, -225.25, 20000.0}; +vector crs.firstCounterW3 = {-3904.0, -450.50, 20000.0}; +vector crs.firstCounterW4 = {-3904.0, -675.75, 20000.0}; + +vector crs.layerDirectionW1 = {0, 1, 0}; +vector crs.layerDirectionW2 = {0, 1, 0}; +vector crs.layerDirectionW3 = {0, 1, 0}; +vector crs.layerDirectionW4 = {0, 1, 0}; + +vector crs.offsetDirectionW1 = {0, 0, 1}; +vector crs.offsetDirectionW2 = {0, 0, 1}; +vector crs.offsetDirectionW3 = {0, 0, 1}; +vector crs.offsetDirectionW4 = {0, 0, 1}; + +vector crs.gapDirectionW1 = {0, 0, 1}; +vector crs.gapDirectionW2 = {0, 0, 1}; +vector crs.gapDirectionW3 = {0, 0, 1}; +vector crs.gapDirectionW4 = {0, 0, 1}; + +int crs.precedingSectorForW1 = -1; //no preceding sector +int crs.precedingSectorForW2 = -1; +int crs.precedingSectorForW3 = -1; +int crs.precedingSectorForW4 = -1; + +int crs.sectorTypeW1 = 1; +int crs.sectorTypeW2 = 2; +int crs.sectorTypeW3 = 3; +int crs.sectorTypeW4 = 4; + +bool crs.sipmsAtSide0W1 = true; +bool crs.sipmsAtSide0W2 = true; +bool crs.sipmsAtSide0W3 = true; +bool crs.sipmsAtSide0W4 = true; + +bool crs.sipmsAtSide1W1 = false; +bool crs.sipmsAtSide1W2 = false; +bool crs.sipmsAtSide1W3 = false; +bool crs.sipmsAtSide1W4 = false; + +int crs.FEBBoxesAtSide0W1 = 0; +int crs.FEBBoxesAtSide0W2 = 0; +int crs.FEBBoxesAtSide0W3 = 0; +int crs.FEBBoxesAtSide0W4 = 0; + +int crs.FEBBoxesAtSide1W1 = 0; +int crs.FEBBoxesAtSide1W2 = 0; +int crs.FEBBoxesAtSide1W3 = 0; +int crs.FEBBoxesAtSide1W4 = 0; + +//bool g4.doSurfaceCheck = true; +int g4.nSurfaceCheckPointsPercmsq = 1; +int g4.minSurfaceCheckPoints = 100; // per volume +int g4.maxSurfaceCheckPoints = 10000000; // per volume diff --git a/Mu2eG4/geom/geom_Wideband4modules.txt b/Mu2eG4/geom/geom_Wideband4modules_v2.txt similarity index 100% rename from Mu2eG4/geom/geom_Wideband4modules.txt rename to Mu2eG4/geom/geom_Wideband4modules_v2.txt diff --git a/ProditionsService/inc/ProditionsService.hh b/ProditionsService/inc/ProditionsService.hh index bd782629fc..5f63e05885 100644 --- a/ProditionsService/inc/ProditionsService.hh +++ b/ProditionsService/inc/ProditionsService.hh @@ -56,7 +56,7 @@ class ProditionsService { Comment("CRV online-offline numbering configuration")}; fhicl::Table crvScintYield{ Name("crvScintYield"), - Comment("CRV scintillation yield deviation map for each counter")}; + Comment("CRV scintillation yield deviation map for each channel")}; fhicl::Table crvStatus{ Name("crvStatus"), Comment("CRV bad channels configuration")}; fhicl::Table crvCalib{ From 7cd0540e1f34c78c1ae0029c43e87e28971e8d44 Mon Sep 17 00:00:00 2001 From: ehrlich-uva Date: Sat, 13 Jan 2024 12:32:31 -0600 Subject: [PATCH 066/213] renamed CRVScintYield to CRVPhotonYield --- ...ld_nominal.txt => photonyield_nominal.txt} | 4 +- ...s.txt => photonyield_wideband4modules.txt} | 4 +- CRVConditions/fcl/prolog.fcl | 4 +- CRVConditions/inc/CRVPhotonYield.hh | 43 +++++++++++++++++++ ...ntYieldCache.hh => CRVPhotonYieldCache.hh} | 18 ++++---- CRVConditions/inc/CRVPhotonYieldMaker.hh | 30 +++++++++++++ CRVConditions/inc/CRVScintYield.hh | 43 ------------------- CRVConditions/inc/CRVScintYieldMaker.hh | 30 ------------- ...ntYieldMaker.cc => CRVPhotonYieldMaker.cc} | 32 +++++++------- .../test/randomDeadChannels.py | 0 .../test/randomPhotonYieldDeviation.py | 6 +-- ...YieldConfig.hh => CRVPhotonYieldConfig.hh} | 8 ++-- CRVResponse/src/CrvPhotonGenerator_module.cc | 14 +++--- CRVResponse/test/CRVResponse.fcl | 4 +- .../test/wideband/wideband4modules.fcl | 4 +- DbTables/inc/{CRVScint.hh => CRVPhoton.hh} | 32 +++++++------- DbTables/src/DbTableFactory.cc | 6 +-- ProditionsService/fcl/prolog.fcl | 2 +- ProditionsService/inc/ProditionsService.hh | 8 ++-- ProditionsService/src/ProditionsService.cc | 4 +- 20 files changed, 148 insertions(+), 148 deletions(-) rename CRVConditions/data/{scintyield_nominal.txt => photonyield_nominal.txt} (99%) rename CRVConditions/data/{scintyield_wideband4modules.txt => photonyield_wideband4modules.txt} (99%) create mode 100644 CRVConditions/inc/CRVPhotonYield.hh rename CRVConditions/inc/{CRVScintYieldCache.hh => CRVPhotonYieldCache.hh} (65%) create mode 100644 CRVConditions/inc/CRVPhotonYieldMaker.hh delete mode 100644 CRVConditions/inc/CRVScintYield.hh delete mode 100644 CRVConditions/inc/CRVScintYieldMaker.hh rename CRVConditions/src/{CRVScintYieldMaker.cc => CRVPhotonYieldMaker.cc} (52%) rename {CRVResponse => CRVConditions}/test/randomDeadChannels.py (100%) rename CRVResponse/test/randomScintDeviation.py => CRVConditions/test/randomPhotonYieldDeviation.py (65%) rename CRVConfig/inc/{CRVScintYieldConfig.hh => CRVPhotonYieldConfig.hh} (65%) rename DbTables/inc/{CRVScint.hh => CRVPhoton.hh} (65%) diff --git a/CRVConditions/data/scintyield_nominal.txt b/CRVConditions/data/photonyield_nominal.txt similarity index 99% rename from CRVConditions/data/scintyield_nominal.txt rename to CRVConditions/data/photonyield_nominal.txt index e108704bff..ab2c63f42a 100644 --- a/CRVConditions/data/scintyield_nominal.txt +++ b/CRVConditions/data/photonyield_nominal.txt @@ -1,5 +1,5 @@ -TABLE CRVScint -#channel,scintYieldDeviation +TABLE CRVPhoton +#channel,photonYieldDeviation 0,1.303 1,0.744 2,-0.248 diff --git a/CRVConditions/data/scintyield_wideband4modules.txt b/CRVConditions/data/photonyield_wideband4modules.txt similarity index 99% rename from CRVConditions/data/scintyield_wideband4modules.txt rename to CRVConditions/data/photonyield_wideband4modules.txt index 0510314357..2ffe681b58 100644 --- a/CRVConditions/data/scintyield_wideband4modules.txt +++ b/CRVConditions/data/photonyield_wideband4modules.txt @@ -1,5 +1,5 @@ -TABLE CRVScint -#channel,scintYieldDeviation +TABLE CRVPhoton +#channel,photonYieldDeviation 0,-0.357 1,0.074 2,-1.648 diff --git a/CRVConditions/fcl/prolog.fcl b/CRVConditions/fcl/prolog.fcl index 4bc7270dad..65c1430510 100644 --- a/CRVConditions/fcl/prolog.fcl +++ b/CRVConditions/fcl/prolog.fcl @@ -6,8 +6,8 @@ CRVOrdinal : { filePath : "Offline/CRVConditions/data" } -CRVScintYield : { - useDb : false #false sets all scintillation yield deviations to 0 +CRVPhotonYield : { + useDb : false #false sets all photon yield deviations to 0 verbose : 0 } diff --git a/CRVConditions/inc/CRVPhotonYield.hh b/CRVConditions/inc/CRVPhotonYield.hh new file mode 100644 index 0000000000..3f5a184160 --- /dev/null +++ b/CRVConditions/inc/CRVPhotonYield.hh @@ -0,0 +1,43 @@ +#ifndef CRVConditions_CRVPhotonYield_hh +#define CRVConditions_CRVPhotonYield_hh + +// +// Holds photon yield deviations of CRV channels +// + +#include "Offline/DataProducts/inc/CRSScintillatorBarIndex.hh" +#include "Offline/Mu2eInterfaces/inc/ProditionsEntity.hh" +#include "cetlib_except/exception.h" +#include +#include +#include + +namespace mu2e { + +class CRVPhotonYield : virtual public ProditionsEntity { + public: + typedef std::shared_ptr ptr_t; + typedef std::shared_ptr cptr_t; + constexpr static const char* cxname = {"CRVPhotonYield"}; + + typedef std::vector PhotonYieldVec; + + CRVPhotonYield(PhotonYieldVec const& svec) : ProditionsEntity(cxname), _svec(svec) {} + + // photon yield deviation (from nominal value) for a channel + float photonYieldDeviation(std::uint16_t channel) const { + if (channel >= _svec.size()) { + throw cet::exception("CRVPHOTONYIELD_BAD_SCINTILLATOR BAR INDEX") + << "CRVPhotonYield::photonYieldDeviation bad channel requested: " + << " channel=" << channel << "\n"; + } + return _svec.at(channel); + } + + private: + PhotonYieldVec _svec; +}; + +} // namespace mu2e + +#endif diff --git a/CRVConditions/inc/CRVScintYieldCache.hh b/CRVConditions/inc/CRVPhotonYieldCache.hh similarity index 65% rename from CRVConditions/inc/CRVScintYieldCache.hh rename to CRVConditions/inc/CRVPhotonYieldCache.hh index 722c778c26..7c7389b67b 100644 --- a/CRVConditions/inc/CRVScintYieldCache.hh +++ b/CRVConditions/inc/CRVPhotonYieldCache.hh @@ -1,20 +1,20 @@ -#ifndef CRVConditions_CRVScintYieldCache_hh -#define CRVConditions_CRVScintYieldCache_hh +#ifndef CRVConditions_CRVPhotonYieldCache_hh +#define CRVConditions_CRVPhotonYieldCache_hh -#include "Offline/CRVConditions/inc/CRVScintYieldMaker.hh" +#include "Offline/CRVConditions/inc/CRVPhotonYieldMaker.hh" #include "Offline/Mu2eInterfaces/inc/ProditionsCache.hh" namespace mu2e { -class CRVScintYieldCache : public ProditionsCache { +class CRVPhotonYieldCache : public ProditionsCache { public: - CRVScintYieldCache(CRVScintYieldConfig const& config) : - ProditionsCache(CRVScintYield::cxname, config.verbose()), + CRVPhotonYieldCache(CRVPhotonYieldConfig const& config) : + ProditionsCache(CRVPhotonYield::cxname, config.verbose()), _useDb(config.useDb()), _maker(config) {} void initialize() { if (_useDb) { - _sci_p = std::make_unique>(); + _sci_p = std::make_unique>(); } } @@ -47,11 +47,11 @@ class CRVScintYieldCache : public ProditionsCache { private: bool _useDb; - CRVScintYieldMaker _maker; + CRVPhotonYieldMaker _maker; // these handles are not default constructed // so the db can be completely turned off - std::unique_ptr> _sci_p; + std::unique_ptr> _sci_p; }; } // namespace mu2e diff --git a/CRVConditions/inc/CRVPhotonYieldMaker.hh b/CRVConditions/inc/CRVPhotonYieldMaker.hh new file mode 100644 index 0000000000..f7ba616ae8 --- /dev/null +++ b/CRVConditions/inc/CRVPhotonYieldMaker.hh @@ -0,0 +1,30 @@ +#ifndef CRVConditions_CRVPhotonYieldMaker_hh +#define CRVConditions_CRVPhotonYieldMaker_hh + +// +// construct a CRVPhotonYield proditions entity +// (photon yield spread of CRV channels) +// from fcl or database +// + +#include "Offline/CRVConditions/inc/CRVPhotonYield.hh" +#include "Offline/CRVConfig/inc/CRVPhotonYieldConfig.hh" +#include "Offline/DbTables/inc/CRVPhoton.hh" + +namespace mu2e { + +class CRVPhotonYieldMaker { + public: + CRVPhotonYieldMaker(CRVPhotonYieldConfig const& config) : _config(config) {} + + CRVPhotonYield::ptr_t fromFcl(); + CRVPhotonYield::ptr_t fromDb(CRVPhoton::cptr_t sci_p); + + private: + // this object needs to be thread safe, + // _config should only be initialized once + const CRVPhotonYieldConfig _config; +}; +} // namespace mu2e + +#endif diff --git a/CRVConditions/inc/CRVScintYield.hh b/CRVConditions/inc/CRVScintYield.hh deleted file mode 100644 index dc16601626..0000000000 --- a/CRVConditions/inc/CRVScintYield.hh +++ /dev/null @@ -1,43 +0,0 @@ -#ifndef CRVConditions_CRVScintYield_hh -#define CRVConditions_CRVScintYield_hh - -// -// Holds scintillation yield spread of CRV channels -// - -#include "Offline/DataProducts/inc/CRSScintillatorBarIndex.hh" -#include "Offline/Mu2eInterfaces/inc/ProditionsEntity.hh" -#include "cetlib_except/exception.h" -#include -#include -#include - -namespace mu2e { - -class CRVScintYield : virtual public ProditionsEntity { - public: - typedef std::shared_ptr ptr_t; - typedef std::shared_ptr cptr_t; - constexpr static const char* cxname = {"CRVScintYield"}; - - typedef std::vector ScintYieldVec; - - CRVScintYield(ScintYieldVec const& svec) : ProditionsEntity(cxname), _svec(svec) {} - - // scintillation yield deviation (from nominal value) for a scintillator bar index - float scintYieldDeviation(size_t barIndex) const { - if (barIndex >= _svec.size()) { - throw cet::exception("CRVSCINTYIELD_BAD_SCINTILLATOR BAR INDEX") - << "CRVScintYield::scinYieldDeviation bad barIndex requested: " - << " barIndex=" << barIndex << "\n"; - } - return _svec.at(barIndex); - } - - private: - ScintYieldVec _svec; -}; - -} // namespace mu2e - -#endif diff --git a/CRVConditions/inc/CRVScintYieldMaker.hh b/CRVConditions/inc/CRVScintYieldMaker.hh deleted file mode 100644 index 0f9479a980..0000000000 --- a/CRVConditions/inc/CRVScintYieldMaker.hh +++ /dev/null @@ -1,30 +0,0 @@ -#ifndef CRVConditions_CRVScintYieldMaker_hh -#define CRVConditions_CRVScintYieldMaker_hh - -// -// construct a CRVScintYield proditions entity -// (scintillation yield spread of CRV channels) -// from fcl or database -// - -#include "Offline/CRVConditions/inc/CRVScintYield.hh" -#include "Offline/CRVConfig/inc/CRVScintYieldConfig.hh" -#include "Offline/DbTables/inc/CRVScint.hh" - -namespace mu2e { - -class CRVScintYieldMaker { - public: - CRVScintYieldMaker(CRVScintYieldConfig const& config) : _config(config) {} - - CRVScintYield::ptr_t fromFcl(); - CRVScintYield::ptr_t fromDb(CRVScint::cptr_t sci_p); - - private: - // this object needs to be thread safe, - // _config should only be initialized once - const CRVScintYieldConfig _config; -}; -} // namespace mu2e - -#endif diff --git a/CRVConditions/src/CRVScintYieldMaker.cc b/CRVConditions/src/CRVPhotonYieldMaker.cc similarity index 52% rename from CRVConditions/src/CRVScintYieldMaker.cc rename to CRVConditions/src/CRVPhotonYieldMaker.cc index 16382791c7..44316d5368 100644 --- a/CRVConditions/src/CRVScintYieldMaker.cc +++ b/CRVConditions/src/CRVPhotonYieldMaker.cc @@ -1,4 +1,4 @@ -#include "Offline/CRVConditions/inc/CRVScintYieldMaker.hh" +#include "Offline/CRVConditions/inc/CRVPhotonYieldMaker.hh" #include "Offline/CosmicRayShieldGeom/inc/CosmicRayShield.hh" #include "Offline/GeometryService/inc/GeomHandle.hh" #include "Offline/GeometryService/inc/GeometryService.hh" @@ -12,27 +12,27 @@ namespace mu2e { //*************************************************** -CRVScintYield::ptr_t CRVScintYieldMaker::fromFcl() { +CRVPhotonYield::ptr_t CRVPhotonYieldMaker::fromFcl() { if (_config.verbose()) { - cout << "scintillation yield spread set to 0 for all CRV channels, because database is not used.\n"; + cout << "photon yield deviations set to 0 for all CRV channels, because database is not used.\n"; } size_t nChan = GeomHandle()->getAllCRSScintillatorBars().size() * CRVId::nChanPerBar; - CRVScintYield::ScintYieldVec svec(nChan, 0.0); + CRVPhotonYield::PhotonYieldVec svec(nChan, 0.0); - auto ptr = make_shared(svec); + auto ptr = make_shared(svec); return ptr; } // end fromFcl //*************************************************** -CRVScintYield::ptr_t CRVScintYieldMaker::fromDb(CRVScint::cptr_t sci_p) { +CRVPhotonYield::ptr_t CRVPhotonYieldMaker::fromDb(CRVPhoton::cptr_t sci_p) { if (_config.verbose()) { - cout << "CRVScintYieldMaker::fromDb making CRVScintYield\n"; + cout << "CRVPhotonYieldMaker::fromDb making CRVPhotonYield\n"; } size_t nChan = @@ -40,30 +40,30 @@ CRVScintYield::ptr_t CRVScintYieldMaker::fromDb(CRVScint::cptr_t sci_p) { CRVId::nChanPerBar; if (_config.verbose()) { - cout << "CRVScintYieldMaker::fromDb checking for " << nChan << " channels\n"; + cout << "CRVPhotonYieldMaker::fromDb checking for " << nChan << " channels\n"; } // require the db tables are the same length as geometry if (sci_p->nrow() != nChan) { - throw cet::exception("CRVSCINTYIELDMAKE_BAD_N_COUNTERS") - << "CRVScintYieldMaker::fromDb bad channel counts: " - << " geometry: " << nChan << " CRVScint: " << sci_p->nrow() << "\n"; + throw cet::exception("CRVPHOTONYIELDMAKE_BAD_N_COUNTERS") + << "CRVPhotonYieldMaker::fromDb bad channel counts: " + << " geometry: " << nChan << " CRVPhoton: " << sci_p->nrow() << "\n"; } - CRVScintYield::ScintYieldVec svec(nChan, 0.0); + CRVPhotonYield::PhotonYieldVec svec(nChan, 0.0); for (auto const& row : sci_p->rows()) { - svec[row.channel()] = row.scintYieldDeviation(); + svec[row.channel()] = row.photonYieldDeviation(); if (_config.verbose()) { if (_config.verbose() > 1 || row.channel() < 5 || - CRVId::nBars - row.channel() <= 5) { + CRVId::nChannels - row.channel() <= 5) { cout << setw(10) << row.channel() << fixed << setprecision(3) - << setw(10) << row.scintYieldDeviation() << "\n"; + << setw(10) << row.photonYieldDeviation() << "\n"; } } } - auto ptr = make_shared(svec); + auto ptr = make_shared(svec); return ptr; } // end fromDb diff --git a/CRVResponse/test/randomDeadChannels.py b/CRVConditions/test/randomDeadChannels.py similarity index 100% rename from CRVResponse/test/randomDeadChannels.py rename to CRVConditions/test/randomDeadChannels.py diff --git a/CRVResponse/test/randomScintDeviation.py b/CRVConditions/test/randomPhotonYieldDeviation.py similarity index 65% rename from CRVResponse/test/randomScintDeviation.py rename to CRVConditions/test/randomPhotonYieldDeviation.py index 99913e49f9..cbe41696c5 100644 --- a/CRVResponse/test/randomScintDeviation.py +++ b/CRVConditions/test/randomPhotonYieldDeviation.py @@ -2,13 +2,13 @@ import sys if len(sys.argv) != 2: - print("usage \"randomScintDeviation nChannels\"") + print("usage \"randomPhotonYieldDeviation nChannels\"") print("nChannels=22016 when using the full CRV\"") sys.exit() nChannels=int(sys.argv[1]) -print("TABLE CRVScint") -print("#channel,scintYieldDeviation") +print("TABLE CRVPhoton") +print("#channel,photonYieldDeviation") for channel in range(nChannels): print("{},{:.3f}".format(channel,random.gauss(0, 1))) diff --git a/CRVConfig/inc/CRVScintYieldConfig.hh b/CRVConfig/inc/CRVPhotonYieldConfig.hh similarity index 65% rename from CRVConfig/inc/CRVScintYieldConfig.hh rename to CRVConfig/inc/CRVPhotonYieldConfig.hh index f1c6234d9e..92123693ec 100644 --- a/CRVConfig/inc/CRVScintYieldConfig.hh +++ b/CRVConfig/inc/CRVPhotonYieldConfig.hh @@ -1,7 +1,7 @@ -#ifndef STMConfig_CRVScintYieldConfig_hh -#define STMConfig_CRVScintYieldConfig_hh +#ifndef STMConfig_CRVPhotonYieldConfig_hh +#define STMConfig_CRVPhotonYieldConfig_hh // -// Fcl stanza for CRV ScintYield (scintillation yield spread of CRV channels) prodition +// Fcl stanza for CRV PhotonYield (scintillation yield spread of CRV channels) prodition // #include "fhiclcpp/types/Atom.h" #include "fhiclcpp/types/Sequence.h" @@ -10,7 +10,7 @@ namespace mu2e { -struct CRVScintYieldConfig { +struct CRVPhotonYieldConfig { using Name = fhicl::Name; using Comment = fhicl::Comment; diff --git a/CRVResponse/src/CrvPhotonGenerator_module.cc b/CRVResponse/src/CrvPhotonGenerator_module.cc index a7c4639375..9fe335fc67 100644 --- a/CRVResponse/src/CrvPhotonGenerator_module.cc +++ b/CRVResponse/src/CrvPhotonGenerator_module.cc @@ -4,7 +4,7 @@ // // Original Author: Ralf Ehrlich -#include "Offline/CRVConditions/inc/CRVScintYield.hh" +#include "Offline/CRVConditions/inc/CRVPhotonYield.hh" #include "Offline/CRVResponse/inc/MakeCrvPhotons.hh" #include "Offline/CosmicRayShieldGeom/inc/CosmicRayShield.hh" #include "Offline/DataProducts/inc/CRSScintillatorBarIndex.hh" @@ -95,11 +95,11 @@ namespace mu2e std::vector _scintillationYields; std::vector > _makeCrvPhotons; - double _photonYieldScaleFactor; - mu2e::ProditionsHandle _photonYieldVariationVector; - double _photonYieldVariationSigma; - double _photonYieldVariationCutoffLow; - double _photonYieldVariationCutoffHigh; + double _photonYieldScaleFactor; + mu2e::ProditionsHandle _photonYieldVariationVector; + double _photonYieldVariationSigma; + double _photonYieldVariationCutoffLow; + double _photonYieldVariationCutoffHigh; //On-spill //-Digitization window @@ -324,7 +324,7 @@ namespace mu2e //e.g. due to scintillator variations or SiPM misalignments for(size_t SiPM=0; SiPM_photonYieldVariationCutoffHigh) photonYieldDeviation=_photonYieldVariationCutoffHigh; diff --git a/CRVResponse/test/CRVResponse.fcl b/CRVResponse/test/CRVResponse.fcl index ebbcdc1377..ffdeaeb608 100644 --- a/CRVResponse/test/CRVResponse.fcl +++ b/CRVResponse/test/CRVResponse.fcl @@ -43,9 +43,9 @@ physics.producers.CrvPhotons.crvStepModuleLabels : ["CrvSteps"] physics.producers.CrvPhotons.crvStepProcessNames : ["CrvStepsConverter"] #physics.producers.CrvPhotons.crvStepModuleLabels : ["compressRecoMCs"] #physics.producers.CrvPhotons.crvStepProcessNames : ["Reconstruct"] -services.ProditionsService.crvScintYield.useDb : true +services.ProditionsService.crvPhotonYield.useDb : true services.ProditionsService.crvStatus.useDb: true -services.DbService.textFile : ["Offline/CRVConditions/data/status_nominal.txt","Offline/CRVConditions/data/scintyield_nominal.txt"] +services.DbService.textFile : ["Offline/CRVConditions/data/status_nominal.txt","Offline/CRVConditions/data/photonyield_nominal.txt"] services.GeometryService.simulatedDetector.tool_type : "Mu2e" services.SeedService.baseSeed : 773651 services.SeedService.maxUniqueEngines : 20 diff --git a/CRVResponse/test/wideband/wideband4modules.fcl b/CRVResponse/test/wideband/wideband4modules.fcl index 5ab5fc1255..bfd9ca79d7 100644 --- a/CRVResponse/test/wideband/wideband4modules.fcl +++ b/CRVResponse/test/wideband/wideband4modules.fcl @@ -167,9 +167,9 @@ physics.producers.CrvCoincidenceClusterFinder.sectorConfig: services.GeometryService.inputFile: "Offline/Mu2eG4/geom/geom_Wideband4modules_v2.txt" services.GeometryService.bFieldFile: "Offline/Mu2eG4/geom/bfgeom_no_field.txt" -services.ProditionsService.crvScintYield.useDb : true +services.ProditionsService.crvPhotonYield.useDb : true services.ProditionsService.crvStatus.useDb: true -services.DbService.textFile : ["Offline/CRVConditions/data/status_wideband4modules.txt","Offline/CRVConditions/data/scintyield_wideband4modules.txt"] +services.DbService.textFile : ["Offline/CRVConditions/data/status_wideband4modules.txt","Offline/CRVConditions/data/photonyield_wideband4modules.txt"] services.SeedService.baseSeed : @local::Common.BaseSeed services.TFileService.fileName : "nts.owner.CRV_wideband_cosmics-mc.configuration.sequencer.root" diff --git a/DbTables/inc/CRVScint.hh b/DbTables/inc/CRVPhoton.hh similarity index 65% rename from DbTables/inc/CRVScint.hh rename to DbTables/inc/CRVPhoton.hh index 952abeb583..5ee6d79025 100644 --- a/DbTables/inc/CRVScint.hh +++ b/DbTables/inc/CRVPhoton.hh @@ -1,5 +1,5 @@ -#ifndef DbTables_CRVScint_hh -#define DbTables_CRVScint_hh +#ifndef DbTables_CRVPhoton_hh +#define DbTables_CRVPhoton_hh #include "Offline/DataProducts/inc/CRVId.hh" #include "Offline/DbTables/inc/DbTable.hh" @@ -12,28 +12,28 @@ namespace mu2e { -class CRVScint : public DbTable { +class CRVPhoton : public DbTable { public: - typedef std::shared_ptr ptr_t; - typedef std::shared_ptr cptr_t; + typedef std::shared_ptr ptr_t; + typedef std::shared_ptr cptr_t; class Row { public: - Row(std::uint16_t channel, float scintYieldDeviation) : + Row(std::uint16_t channel, float photonYieldDeviation) : _channel(channel), - _scintYieldDeviation(scintYieldDeviation) {} + _photonYieldDeviation(photonYieldDeviation) {} std::uint16_t channel() const { return _channel; } - float scintYieldDeviation() const { return _scintYieldDeviation; } + float photonYieldDeviation() const { return _photonYieldDeviation; } private: std::uint16_t _channel; - float _scintYieldDeviation; + float _photonYieldDeviation; }; - constexpr static const char* cxname = "CRVScint"; + constexpr static const char* cxname = "CRVPhoton"; - CRVScint() : - DbTable(cxname, "crv.scint", "channel,scintYieldDeviation") {} + CRVPhoton() : + DbTable(cxname, "crv.photon", "channel,photonYieldDeviation") {} const Row& rowAt(const std::size_t index) const { return _rows.at(index); } const Row& row(std::uint16_t channel) const { return _rows.at(channel); } std::vector const& rows() const { return _rows; } @@ -46,9 +46,9 @@ class CRVScint : public DbTable { void addRow(const std::vector& columns) override { std::uint16_t channel = std::stoul(columns[0]); // enforce order, so channel can be looked up by index - if (channel >= CRVId::nBars || channel != _rows.size()) { - throw cet::exception("CRVSCINT_BAD_CHANNEL") - << "CRVScint::addRow bad channel, saw " << columns[0] << ", expected " + if (channel >= CRVId::nChannels || channel != _rows.size()) { + throw cet::exception("CRVPHOTON_BAD_CHANNEL") + << "CRVPhoton::addRow bad channel, saw " << columns[0] << ", expected " << _rows.size() << "\n"; } _rows.emplace_back(std::stoi(columns[0]), std::stof(columns[1])); @@ -58,7 +58,7 @@ class CRVScint : public DbTable { Row const& r = _rows.at(irow); sstream << r.channel() << ","; sstream << std::fixed << std::setprecision(3); - sstream << r.scintYieldDeviation(); + sstream << r.photonYieldDeviation(); } virtual void clear() override { diff --git a/DbTables/src/DbTableFactory.cc b/DbTables/src/DbTableFactory.cc index 44580cfc95..9573e9a82d 100644 --- a/DbTables/src/DbTableFactory.cc +++ b/DbTables/src/DbTableFactory.cc @@ -1,7 +1,7 @@ #include "Offline/DbTables/inc/DbTableFactory.hh" #include "Offline/DbTables/inc/AnaTrkQualDb.hh" #include "Offline/DbTables/inc/CRVBadChan.hh" -#include "Offline/DbTables/inc/CRVScint.hh" +#include "Offline/DbTables/inc/CRVPhoton.hh" #include "Offline/DbTables/inc/CRVSiPM.hh" #include "Offline/DbTables/inc/CRVTime.hh" #include "Offline/DbTables/inc/STMEnergyPar.hh" @@ -71,8 +71,8 @@ mu2e::DbTable::ptr_t mu2e::DbTableFactory::newTable(std::string const& name) { return std::shared_ptr(new mu2e::STMPedestals()); } else if (name == "CRVBadChan") { return std::shared_ptr(new mu2e::CRVBadChan()); - } else if (name == "CRVScint") { - return std::shared_ptr(new mu2e::CRVScint()); + } else if (name == "CRVPhoton") { + return std::shared_ptr(new mu2e::CRVPhoton()); } else if (name == "CRVSiPM") { return std::shared_ptr(new mu2e::CRVSiPM()); } else if (name == "CRVTime") { diff --git a/ProditionsService/fcl/prolog.fcl b/ProditionsService/fcl/prolog.fcl index 51c3c91473..83852f0bff 100644 --- a/ProditionsService/fcl/prolog.fcl +++ b/ProditionsService/fcl/prolog.fcl @@ -23,7 +23,7 @@ Proditions : { caloDAQConditions : @local::CaloDAQConditions trkQualCatalog : @local::TrkQualCatalog crvOrdinal : @local::CRVOrdinal - crvScintYield : @local::CRVScintYield + crvPhotonYield : @local::CRVPhotonYield crvStatus : @local::CRVStatus crvCalib : @local::CRVCalib simbookkeeper : @local::SimBookkeeper diff --git a/ProditionsService/inc/ProditionsService.hh b/ProditionsService/inc/ProditionsService.hh index 5f63e05885..e211b46f4f 100644 --- a/ProditionsService/inc/ProditionsService.hh +++ b/ProditionsService/inc/ProditionsService.hh @@ -9,7 +9,7 @@ #include "Offline/AnalysisConfig/inc/MVACatalogConfig.hh" #include "Offline/CRVConfig/inc/CRVCalibConfig.hh" #include "Offline/CRVConfig/inc/CRVOrdinalConfig.hh" -#include "Offline/CRVConfig/inc/CRVScintYieldConfig.hh" +#include "Offline/CRVConfig/inc/CRVPhotonYieldConfig.hh" #include "Offline/CRVConfig/inc/CRVStatusConfig.hh" #include "Offline/CaloConfig/inc/CaloDAQMapConfig.hh" #include "Offline/DAQConfig/inc/EventTimingConfig.hh" @@ -54,9 +54,9 @@ class ProditionsService { fhicl::Table crvOrdinal{ Name("crvOrdinal"), Comment("CRV online-offline numbering configuration")}; - fhicl::Table crvScintYield{ - Name("crvScintYield"), - Comment("CRV scintillation yield deviation map for each channel")}; + fhicl::Table crvPhotonYield{ + Name("crvPhotonYield"), + Comment("CRV photon yield deviation map for each channel")}; fhicl::Table crvStatus{ Name("crvStatus"), Comment("CRV bad channels configuration")}; fhicl::Table crvCalib{ diff --git a/ProditionsService/src/ProditionsService.cc b/ProditionsService/src/ProditionsService.cc index bfa78af38b..4f57632ccd 100644 --- a/ProditionsService/src/ProditionsService.cc +++ b/ProditionsService/src/ProditionsService.cc @@ -5,7 +5,7 @@ #include "Offline/DbService/inc/DbHandle.hh" #include "Offline/CRVConditions/inc/CRVCalibCache.hh" #include "Offline/CRVConditions/inc/CRVOrdinalCache.hh" -#include "Offline/CRVConditions/inc/CRVScintYieldCache.hh" +#include "Offline/CRVConditions/inc/CRVPhotonYieldCache.hh" #include "Offline/CRVConditions/inc/CRVStatusCache.hh" #include "Offline/CaloConditions/inc/CaloDAQMapCache.hh" #include "Offline/DAQConditions/inc/EventTimingCache.hh" @@ -51,7 +51,7 @@ ProditionsService::ProditionsService(Parameters const& sTable, auto cor = std::make_shared(_config.crvOrdinal()); _caches[cor->name()] = cor; - auto csy = std::make_shared(_config.crvScintYield()); + auto csy = std::make_shared(_config.crvPhotonYield()); _caches[csy->name()] = csy; auto cst = std::make_shared(_config.crvStatus()); _caches[cst->name()] = cst; From 107b2cd431d9f3f47313ccfaefe753f18bd2c028 Mon Sep 17 00:00:00 2001 From: David Nathan Brown Date: Sat, 13 Jan 2024 16:56:36 -0800 Subject: [PATCH 067/213] Follow core KinKal changes --- Mu2eKinKal/inc/HelixFit_module.hh | 4 ++-- Mu2eKinKal/inc/KKFit.hh | 2 +- Mu2eKinKal/inc/KKStrawXing.hh | 12 ++++-------- 3 files changed, 7 insertions(+), 11 deletions(-) diff --git a/Mu2eKinKal/inc/HelixFit_module.hh b/Mu2eKinKal/inc/HelixFit_module.hh index c170afc015..419b54540b 100644 --- a/Mu2eKinKal/inc/HelixFit_module.hh +++ b/Mu2eKinKal/inc/HelixFit_module.hh @@ -98,7 +98,7 @@ namespace mu2e { fhicl::OptionalAtom fixedBField { Name("ConstantBField"), Comment("Constant BField value") }; }; - struct GlobalConfig { + struct HelixFitConfig { fhicl::Table modSettings { Name("ModuleSettings") }; fhicl::Table kkfitSettings { Name("KKFitSettings") }; fhicl::Table fitSettings { Name("FitSettings") }; @@ -111,7 +111,7 @@ namespace mu2e { class HelixFit : public art::EDProducer { public: - using Parameters = art::EDProducer::Table; + using Parameters = art::EDProducer::Table; explicit HelixFit(const Parameters& settings,TrkFitFlag fitflag); virtual ~HelixFit() {} void beginRun(art::Run& run) override; diff --git a/Mu2eKinKal/inc/KKFit.hh b/Mu2eKinKal/inc/KKFit.hh index fdb213f2e6..b381744f1d 100644 --- a/Mu2eKinKal/inc/KKFit.hh +++ b/Mu2eKinKal/inc/KKFit.hh @@ -542,7 +542,7 @@ namespace mu2e { for(auto const& sxing : kktrk.strawXings()) { std::array dmom = {0.0,0.0,0.0}, momvar = {0.0,0.0,0.0}; // compute energy loss - sxing->materialEffects(KinKal::TimeDir::forwards, dmom, momvar); + sxing->materialEffects(dmom, momvar); VEC3 dm(dmom[0],dmom[1],dmom[2]); // find material crossing properties double gaspath(0.0); diff --git a/Mu2eKinKal/inc/KKStrawXing.hh b/Mu2eKinKal/inc/KKStrawXing.hh index 3a1a6e8106..4b2da2214d 100644 --- a/Mu2eKinKal/inc/KKStrawXing.hh +++ b/Mu2eKinKal/inc/KKStrawXing.hh @@ -16,7 +16,6 @@ namespace mu2e { using KinKal::SVEC3; using KinKal::DVEC; using KinKal::CAHint; - using KinKal::TimeDir; using KinKal::DPDV; using KinKal::MomBasis; using KinKal::NParams; @@ -38,7 +37,7 @@ namespace mu2e { // ElementXing interface void updateReference(KTRAJPTR const& ktrajptr) override; void updateState(MetaIterConfig const& config,bool first) override; - Parameters parameters(TimeDir tdir) const override; + Parameters params() const override; std::vectorconst& matXings() const override { return mxings_; } // offset time WRT TOCA to avoid exact overlapp with the wire hit. Note: the offset must be POSITIVE to insure // Xing is updated after the associated hit @@ -94,11 +93,8 @@ namespace mu2e { } } - template Parameters KKStrawXing::parameters(TimeDir tdir) const { - if(tdir == TimeDir::forwards) - return fparams_; - else - return Parameters(-fparams_.parameters(),fparams_.covariance()); + template Parameters KKStrawXing::params() const { + return fparams_; } template void KKStrawXing::updateState(MetaIterConfig const& miconfig,bool first) { @@ -132,7 +128,7 @@ namespace mu2e { if(mxings_.size() > 0){ // compute the parameter effect for forwards time std::array dmom = {0.0,0.0,0.0}, momvar = {0.0,0.0,0.0}; - this->materialEffects(TimeDir::forwards, dmom, momvar); + this->materialEffects(dmom, momvar); // get the parameter derivative WRT momentum DPDV dPdM = referenceTrajectory().dPardM(time()); double mommag = referenceTrajectory().momentum(time()); From 37f95a13734494a9733040be471514ade85a8694 Mon Sep 17 00:00:00 2001 From: ehrlich-uva Date: Mon, 15 Jan 2024 06:04:27 -0600 Subject: [PATCH 068/213] renamed a CRV photon yield variable --- CRVConditions/data/time_nominal.txt | 22018 ++++++++++++++++ CRVConditions/data/time_wideband4modules.txt | 1026 + CRVConditions/test/randomTimeOffsets.py | 14 + CRVResponse/fcl/prolog_v11.fcl | 15 +- CRVResponse/src/CrvPhotonGenerator_module.cc | 10 +- .../test/wideband/wideband4modules.fcl | 2 +- 6 files changed, 23075 insertions(+), 10 deletions(-) create mode 100644 CRVConditions/data/time_nominal.txt create mode 100644 CRVConditions/data/time_wideband4modules.txt create mode 100644 CRVConditions/test/randomTimeOffsets.py diff --git a/CRVConditions/data/time_nominal.txt b/CRVConditions/data/time_nominal.txt new file mode 100644 index 0000000000..542e23a2a0 --- /dev/null +++ b/CRVConditions/data/time_nominal.txt @@ -0,0 +1,22018 @@ +TABLE CRVTime +#channel,timeOffset +0,0.313 +1,-0.218 +2,0.816 +3,1.706 +4,-0.413 +5,-0.372 +6,-0.388 +7,0.628 +8,-0.644 +9,0.657 +10,0.373 +11,-2.917 +12,0.297 +13,1.573 +14,0.560 +15,0.034 +16,-1.317 +17,0.833 +18,0.253 +19,0.160 +20,-0.804 +21,0.016 +22,-1.088 +23,0.384 +24,-0.335 +25,0.250 +26,-1.261 +27,0.317 +28,0.337 +29,-0.254 +30,0.538 +31,0.590 +32,-0.998 +33,0.435 +34,0.613 +35,-0.168 +36,0.429 +37,0.964 +38,0.565 +39,-0.920 +40,0.151 +41,-0.179 +42,-1.376 +43,1.102 +44,-0.608 +45,-0.672 +46,-0.955 +47,-0.198 +48,0.616 +49,-1.750 +50,0.201 +51,-0.507 +52,-1.470 +53,1.256 +54,0.631 +55,0.376 +56,-0.720 +57,0.064 +58,1.638 +59,-0.040 +60,-0.156 +61,-0.916 +62,2.123 +63,-0.638 +64,1.921 +65,0.079 +66,1.414 +67,0.346 +68,0.828 +69,-0.494 +70,1.511 +71,0.382 +72,-0.023 +73,-1.309 +74,-0.315 +75,-0.484 +76,-1.167 +77,-0.574 +78,0.238 +79,0.753 +80,-2.824 +81,1.063 +82,-1.238 +83,-0.338 +84,-1.010 +85,-0.531 +86,0.877 +87,-0.569 +88,0.074 +89,0.430 +90,-0.195 +91,-1.176 +92,0.211 +93,2.371 +94,-0.352 +95,-0.605 +96,-0.079 +97,0.651 +98,-0.572 +99,0.323 +100,-0.026 +101,0.380 +102,1.603 +103,0.625 +104,-1.120 +105,-0.799 +106,1.869 +107,1.877 +108,0.889 +109,-0.168 +110,-0.954 +111,-0.972 +112,1.701 +113,0.308 +114,-0.024 +115,0.180 +116,-0.806 +117,-0.260 +118,-1.555 +119,0.750 +120,0.097 +121,-0.591 +122,0.460 +123,-0.737 +124,1.698 +125,0.696 +126,0.569 +127,-1.537 +128,-0.906 +129,0.151 +130,1.729 +131,-0.146 +132,-0.122 +133,-1.610 +134,-0.668 +135,-1.458 +136,0.685 +137,0.615 +138,0.154 +139,0.088 +140,-0.426 +141,-0.985 +142,1.428 +143,0.331 +144,0.864 +145,0.573 +146,-0.688 +147,-0.009 +148,-0.009 +149,0.412 +150,0.250 +151,-0.396 +152,-0.132 +153,-0.223 +154,0.016 +155,1.651 +156,0.596 +157,-0.640 +158,0.103 +159,-1.287 +160,-1.023 +161,-0.830 +162,-1.395 +163,0.318 +164,-0.529 +165,0.958 +166,-0.239 +167,0.448 +168,-0.731 +169,0.189 +170,0.123 +171,-1.328 +172,0.790 +173,0.513 +174,1.098 +175,-2.041 +176,-0.069 +177,-1.211 +178,-0.796 +179,-0.088 +180,0.049 +181,-0.834 +182,0.038 +183,0.703 +184,-0.653 +185,-1.159 +186,-0.946 +187,0.415 +188,-2.205 +189,0.271 +190,0.184 +191,1.579 +192,1.913 +193,-0.521 +194,2.694 +195,-0.249 +196,0.019 +197,-0.107 +198,-1.059 +199,-1.880 +200,-0.327 +201,-2.169 +202,-1.603 +203,-1.846 +204,1.127 +205,0.238 +206,1.292 +207,-0.046 +208,-0.248 +209,-0.583 +210,-0.028 +211,-0.658 +212,-0.298 +213,-0.400 +214,-0.309 +215,1.534 +216,-1.140 +217,-0.661 +218,1.378 +219,0.357 +220,2.011 +221,0.227 +222,0.078 +223,-0.523 +224,-2.120 +225,0.775 +226,-0.220 +227,-0.841 +228,0.311 +229,-0.451 +230,0.483 +231,0.935 +232,1.469 +233,0.295 +234,0.286 +235,1.280 +236,-1.754 +237,0.176 +238,1.009 +239,0.648 +240,0.940 +241,-0.033 +242,-0.113 +243,-1.509 +244,0.022 +245,1.002 +246,-0.901 +247,-0.373 +248,0.393 +249,0.079 +250,-0.523 +251,0.587 +252,2.225 +253,1.317 +254,0.485 +255,0.220 +256,-1.305 +257,-1.304 +258,0.229 +259,1.142 +260,-0.985 +261,2.328 +262,0.120 +263,-0.298 +264,0.593 +265,-2.024 +266,0.810 +267,1.311 +268,-0.450 +269,-0.302 +270,-0.463 +271,-1.097 +272,0.028 +273,-0.206 +274,-0.470 +275,0.136 +276,1.428 +277,0.541 +278,0.116 +279,0.591 +280,1.137 +281,-0.676 +282,0.080 +283,0.268 +284,0.502 +285,0.419 +286,-0.773 +287,0.764 +288,-0.263 +289,0.375 +290,-2.267 +291,0.088 +292,-0.731 +293,0.834 +294,0.443 +295,-0.773 +296,0.312 +297,0.014 +298,-0.169 +299,-0.621 +300,1.472 +301,-1.428 +302,1.466 +303,2.352 +304,1.714 +305,-0.562 +306,1.193 +307,-1.004 +308,1.216 +309,-0.026 +310,-1.085 +311,0.367 +312,0.930 +313,-0.394 +314,0.976 +315,1.908 +316,0.907 +317,-0.589 +318,1.210 +319,-2.249 +320,0.559 +321,-0.161 +322,-0.151 +323,0.108 +324,0.312 +325,-0.480 +326,1.106 +327,1.485 +328,0.816 +329,-1.159 +330,-1.104 +331,-0.073 +332,1.067 +333,-0.715 +334,2.011 +335,0.688 +336,0.098 +337,-0.916 +338,0.761 +339,-0.396 +340,1.073 +341,-0.783 +342,-0.815 +343,-0.602 +344,0.451 +345,0.651 +346,1.485 +347,0.737 +348,-0.882 +349,0.040 +350,1.743 +351,-0.067 +352,0.625 +353,-0.204 +354,0.869 +355,-0.558 +356,0.983 +357,-0.989 +358,-1.901 +359,0.112 +360,0.905 +361,0.937 +362,1.273 +363,0.640 +364,1.407 +365,-0.791 +366,-0.262 +367,-1.498 +368,-0.447 +369,-0.564 +370,-0.602 +371,-0.548 +372,1.440 +373,-0.069 +374,-0.683 +375,0.898 +376,0.877 +377,-0.584 +378,-0.948 +379,-1.331 +380,-0.540 +381,-0.332 +382,0.272 +383,0.085 +384,-0.238 +385,0.976 +386,-1.008 +387,-0.138 +388,-1.278 +389,-0.165 +390,0.264 +391,-2.052 +392,-1.313 +393,-0.229 +394,-0.602 +395,0.057 +396,0.951 +397,0.020 +398,1.643 +399,-0.120 +400,0.917 +401,0.543 +402,1.539 +403,-0.229 +404,-0.966 +405,-0.575 +406,0.562 +407,0.042 +408,1.046 +409,1.498 +410,1.045 +411,-0.675 +412,-0.155 +413,-0.471 +414,2.224 +415,-0.371 +416,-0.910 +417,-1.028 +418,-0.271 +419,-0.750 +420,0.462 +421,-1.465 +422,0.419 +423,-0.361 +424,0.108 +425,0.661 +426,-0.978 +427,1.012 +428,-1.020 +429,-0.210 +430,-0.407 +431,1.063 +432,-0.028 +433,-1.282 +434,0.252 +435,-0.240 +436,0.187 +437,0.102 +438,-0.971 +439,-0.257 +440,0.103 +441,-0.266 +442,-0.874 +443,-2.339 +444,0.603 +445,2.562 +446,0.728 +447,0.055 +448,1.601 +449,-0.041 +450,0.139 +451,2.001 +452,-0.581 +453,1.395 +454,-0.944 +455,0.402 +456,-0.195 +457,1.321 +458,-0.347 +459,1.518 +460,1.975 +461,0.474 +462,1.923 +463,-0.153 +464,-0.036 +465,0.165 +466,-2.886 +467,0.085 +468,-1.182 +469,0.000 +470,0.318 +471,0.567 +472,2.219 +473,2.789 +474,-0.023 +475,0.271 +476,-1.104 +477,-0.755 +478,-0.535 +479,-0.716 +480,0.477 +481,-0.029 +482,-2.581 +483,0.343 +484,-1.169 +485,0.553 +486,-0.099 +487,0.512 +488,-1.379 +489,-0.214 +490,0.062 +491,-0.450 +492,1.535 +493,0.764 +494,-0.134 +495,-1.427 +496,0.635 +497,-1.191 +498,-0.132 +499,-1.661 +500,-1.571 +501,-0.047 +502,-1.455 +503,-1.528 +504,0.013 +505,0.958 +506,0.185 +507,0.840 +508,1.331 +509,1.127 +510,-1.352 +511,-0.439 +512,0.404 +513,-1.765 +514,-0.812 +515,-0.071 +516,0.636 +517,2.805 +518,0.906 +519,1.431 +520,0.098 +521,-0.196 +522,0.470 +523,0.570 +524,-0.323 +525,-0.516 +526,-1.239 +527,0.814 +528,1.300 +529,-0.969 +530,-0.275 +531,-1.136 +532,0.436 +533,0.660 +534,0.424 +535,-0.001 +536,2.203 +537,-0.417 +538,-2.081 +539,-0.695 +540,1.634 +541,0.204 +542,-0.444 +543,-0.871 +544,-0.264 +545,-0.537 +546,-0.140 +547,-0.552 +548,2.917 +549,-0.516 +550,-0.470 +551,0.050 +552,1.102 +553,0.808 +554,0.543 +555,-1.787 +556,1.238 +557,0.086 +558,-0.554 +559,-0.283 +560,-0.654 +561,-1.088 +562,-0.239 +563,-0.784 +564,0.540 +565,-0.034 +566,-0.646 +567,-1.424 +568,0.372 +569,0.248 +570,-2.217 +571,1.043 +572,0.225 +573,0.560 +574,-0.250 +575,0.400 +576,0.676 +577,-0.355 +578,-0.325 +579,-0.688 +580,-2.504 +581,-0.500 +582,-1.307 +583,-0.279 +584,-1.235 +585,0.288 +586,-0.647 +587,-0.925 +588,-1.371 +589,0.714 +590,1.236 +591,1.032 +592,-0.556 +593,1.714 +594,0.609 +595,0.356 +596,-1.027 +597,-0.745 +598,-0.185 +599,1.482 +600,-0.025 +601,-2.269 +602,-0.452 +603,-1.840 +604,-1.522 +605,0.752 +606,0.963 +607,-0.219 +608,0.828 +609,-1.642 +610,-1.049 +611,0.152 +612,0.245 +613,-0.310 +614,1.150 +615,-1.071 +616,0.743 +617,0.989 +618,-0.831 +619,-0.829 +620,-1.451 +621,-0.249 +622,0.138 +623,0.334 +624,-1.171 +625,-0.840 +626,1.345 +627,0.042 +628,0.924 +629,0.269 +630,0.710 +631,-1.811 +632,0.753 +633,-1.316 +634,-0.833 +635,0.126 +636,1.522 +637,-1.292 +638,0.779 +639,-3.202 +640,-1.486 +641,-0.493 +642,0.140 +643,-0.625 +644,1.105 +645,1.721 +646,-0.624 +647,1.132 +648,0.696 +649,-0.096 +650,-0.520 +651,0.180 +652,-0.072 +653,1.256 +654,-0.534 +655,0.397 +656,0.371 +657,-0.181 +658,-1.150 +659,1.025 +660,-0.087 +661,-0.255 +662,0.623 +663,-0.904 +664,-0.471 +665,-0.417 +666,0.006 +667,-0.601 +668,-0.020 +669,-1.561 +670,-1.051 +671,0.196 +672,-0.628 +673,-1.037 +674,0.448 +675,1.272 +676,-1.265 +677,-0.190 +678,-1.210 +679,-0.289 +680,-0.641 +681,0.798 +682,1.318 +683,-0.488 +684,0.240 +685,0.253 +686,-1.217 +687,-0.251 +688,-0.860 +689,-0.732 +690,0.040 +691,1.826 +692,-1.401 +693,-1.311 +694,1.369 +695,-0.815 +696,-0.061 +697,-0.640 +698,1.465 +699,-0.510 +700,-0.107 +701,-0.119 +702,-0.515 +703,-0.167 +704,0.533 +705,0.642 +706,-2.812 +707,1.360 +708,-1.305 +709,0.000 +710,-1.244 +711,0.336 +712,-0.570 +713,0.252 +714,-0.041 +715,-1.182 +716,0.013 +717,1.180 +718,0.020 +719,-0.110 +720,0.061 +721,-0.110 +722,0.545 +723,-0.482 +724,0.544 +725,-0.327 +726,1.441 +727,-0.249 +728,-1.781 +729,1.198 +730,0.376 +731,-0.782 +732,-0.947 +733,2.261 +734,0.732 +735,0.941 +736,0.597 +737,-0.079 +738,-0.365 +739,0.303 +740,0.542 +741,-1.530 +742,-1.260 +743,1.278 +744,0.086 +745,-0.198 +746,1.781 +747,-0.368 +748,-0.139 +749,0.273 +750,0.485 +751,0.558 +752,0.256 +753,0.650 +754,0.667 +755,0.275 +756,-0.181 +757,-1.250 +758,-0.353 +759,-0.158 +760,-0.789 +761,1.780 +762,0.045 +763,-0.404 +764,-1.105 +765,1.624 +766,1.234 +767,-0.644 +768,0.337 +769,-0.770 +770,2.114 +771,-1.850 +772,-1.517 +773,-0.583 +774,-0.938 +775,1.729 +776,-0.444 +777,-0.063 +778,-0.369 +779,0.545 +780,0.485 +781,-0.714 +782,-0.927 +783,0.479 +784,1.029 +785,-1.664 +786,-0.866 +787,-0.732 +788,-1.271 +789,-0.142 +790,-1.352 +791,-1.122 +792,0.590 +793,-0.705 +794,0.550 +795,-0.764 +796,-0.830 +797,-0.042 +798,0.636 +799,-0.335 +800,1.306 +801,-0.439 +802,1.729 +803,0.371 +804,2.111 +805,0.220 +806,-0.115 +807,-1.538 +808,0.119 +809,0.234 +810,-0.282 +811,-1.280 +812,0.845 +813,-0.229 +814,-0.154 +815,0.578 +816,-0.469 +817,-0.808 +818,-0.341 +819,0.864 +820,0.189 +821,0.176 +822,-1.288 +823,-0.375 +824,0.679 +825,-1.136 +826,0.377 +827,0.952 +828,0.815 +829,-1.892 +830,0.494 +831,-0.599 +832,-0.030 +833,-2.385 +834,0.738 +835,-0.201 +836,0.419 +837,-0.864 +838,-1.127 +839,-0.958 +840,1.914 +841,-0.641 +842,0.678 +843,1.036 +844,1.914 +845,-0.969 +846,1.181 +847,0.300 +848,0.683 +849,1.060 +850,-0.681 +851,0.325 +852,-0.095 +853,0.120 +854,-0.833 +855,0.958 +856,-1.013 +857,-0.238 +858,0.527 +859,0.068 +860,-1.737 +861,1.807 +862,0.456 +863,-0.250 +864,1.668 +865,1.209 +866,-1.113 +867,-1.137 +868,-0.668 +869,-0.420 +870,-1.105 +871,-0.341 +872,-1.234 +873,-0.658 +874,0.193 +875,1.079 +876,-0.308 +877,0.896 +878,-0.773 +879,0.550 +880,0.311 +881,-1.353 +882,-0.807 +883,0.185 +884,0.163 +885,-1.395 +886,-0.114 +887,2.672 +888,-0.652 +889,0.678 +890,-0.436 +891,-0.577 +892,0.365 +893,-2.716 +894,-0.442 +895,1.040 +896,0.256 +897,-0.083 +898,-0.979 +899,0.372 +900,0.249 +901,-0.224 +902,-0.190 +903,0.121 +904,1.039 +905,-1.211 +906,-1.033 +907,-0.869 +908,-0.099 +909,-0.188 +910,0.896 +911,0.478 +912,0.014 +913,-0.347 +914,-1.142 +915,-0.442 +916,0.025 +917,0.273 +918,-2.107 +919,0.456 +920,-3.344 +921,-0.039 +922,-1.204 +923,0.194 +924,-0.554 +925,0.528 +926,-0.120 +927,-0.716 +928,0.487 +929,0.353 +930,-1.552 +931,-0.619 +932,0.560 +933,-0.022 +934,1.468 +935,-0.438 +936,-0.832 +937,0.161 +938,-0.227 +939,-2.085 +940,0.052 +941,-1.294 +942,-0.135 +943,1.177 +944,0.045 +945,-0.827 +946,-0.715 +947,-0.402 +948,1.120 +949,1.320 +950,-1.424 +951,0.269 +952,0.747 +953,-2.115 +954,0.069 +955,-0.854 +956,0.524 +957,-0.475 +958,1.364 +959,2.602 +960,0.446 +961,-0.602 +962,-0.192 +963,-1.059 +964,0.058 +965,0.559 +966,-0.446 +967,-0.453 +968,-1.286 +969,-1.019 +970,-0.126 +971,-0.024 +972,-0.382 +973,-0.020 +974,-0.405 +975,-0.052 +976,0.276 +977,-0.023 +978,-1.350 +979,0.606 +980,-0.147 +981,1.469 +982,0.455 +983,-1.449 +984,1.122 +985,0.342 +986,-0.927 +987,0.821 +988,0.752 +989,-0.843 +990,0.516 +991,0.827 +992,-0.580 +993,2.024 +994,-1.061 +995,-0.766 +996,-0.182 +997,-1.250 +998,1.161 +999,0.203 +1000,-0.604 +1001,-0.503 +1002,0.850 +1003,0.092 +1004,-1.297 +1005,2.175 +1006,-0.278 +1007,-0.790 +1008,-0.275 +1009,-0.468 +1010,0.589 +1011,-0.279 +1012,3.106 +1013,0.763 +1014,0.352 +1015,-0.752 +1016,0.739 +1017,1.316 +1018,0.551 +1019,0.562 +1020,0.047 +1021,0.364 +1022,-0.150 +1023,1.046 +1024,-0.060 +1025,0.600 +1026,1.672 +1027,0.050 +1028,-0.650 +1029,0.643 +1030,-1.547 +1031,-0.015 +1032,0.397 +1033,0.518 +1034,-0.843 +1035,0.722 +1036,0.317 +1037,-0.127 +1038,0.803 +1039,1.187 +1040,-0.956 +1041,1.753 +1042,-0.808 +1043,-0.979 +1044,-0.935 +1045,0.889 +1046,-0.564 +1047,1.345 +1048,0.777 +1049,0.054 +1050,-0.178 +1051,0.024 +1052,0.380 +1053,0.074 +1054,0.686 +1055,1.216 +1056,-0.724 +1057,-1.007 +1058,-0.517 +1059,-0.002 +1060,-0.376 +1061,0.844 +1062,-1.170 +1063,-0.978 +1064,-0.999 +1065,0.063 +1066,-1.164 +1067,-0.417 +1068,-0.346 +1069,-0.120 +1070,2.962 +1071,-1.005 +1072,-1.476 +1073,-1.228 +1074,-0.971 +1075,-1.095 +1076,0.015 +1077,-0.468 +1078,-1.843 +1079,-0.549 +1080,0.451 +1081,-0.299 +1082,-0.073 +1083,-1.037 +1084,1.202 +1085,1.071 +1086,-0.126 +1087,-0.252 +1088,-0.872 +1089,1.305 +1090,1.204 +1091,-1.705 +1092,1.906 +1093,1.415 +1094,0.160 +1095,0.219 +1096,-0.605 +1097,-0.827 +1098,0.556 +1099,0.980 +1100,-0.042 +1101,0.293 +1102,-1.132 +1103,-1.326 +1104,-0.448 +1105,-0.600 +1106,0.043 +1107,-0.769 +1108,-0.227 +1109,1.460 +1110,-1.446 +1111,0.043 +1112,-0.476 +1113,0.364 +1114,1.036 +1115,-0.323 +1116,-2.397 +1117,-1.086 +1118,-0.053 +1119,1.156 +1120,1.392 +1121,-0.447 +1122,0.349 +1123,-0.766 +1124,0.603 +1125,0.855 +1126,-0.025 +1127,-0.985 +1128,0.211 +1129,0.075 +1130,-0.572 +1131,0.534 +1132,0.690 +1133,0.878 +1134,0.712 +1135,-0.634 +1136,1.165 +1137,1.464 +1138,-1.581 +1139,-1.641 +1140,-0.539 +1141,0.380 +1142,0.120 +1143,-0.586 +1144,0.475 +1145,-1.122 +1146,0.192 +1147,-0.833 +1148,-0.412 +1149,0.912 +1150,-0.059 +1151,-0.299 +1152,2.068 +1153,0.499 +1154,0.857 +1155,-2.001 +1156,0.890 +1157,-1.301 +1158,0.326 +1159,-0.363 +1160,-0.295 +1161,-1.743 +1162,0.328 +1163,0.809 +1164,-1.321 +1165,1.017 +1166,-0.049 +1167,1.063 +1168,1.030 +1169,-0.678 +1170,1.864 +1171,1.966 +1172,-2.569 +1173,-0.312 +1174,-1.042 +1175,1.322 +1176,0.377 +1177,-0.650 +1178,-0.391 +1179,0.431 +1180,0.067 +1181,0.185 +1182,1.025 +1183,-0.543 +1184,0.259 +1185,-1.288 +1186,-0.748 +1187,0.104 +1188,-0.075 +1189,-0.312 +1190,-0.629 +1191,0.072 +1192,-0.149 +1193,-0.089 +1194,0.673 +1195,-0.469 +1196,0.568 +1197,-1.932 +1198,-0.225 +1199,-0.700 +1200,1.725 +1201,1.197 +1202,-0.632 +1203,-0.052 +1204,0.884 +1205,0.295 +1206,0.445 +1207,0.463 +1208,-1.899 +1209,-2.969 +1210,0.282 +1211,0.329 +1212,-0.085 +1213,-0.274 +1214,0.928 +1215,-1.710 +1216,0.465 +1217,0.289 +1218,-0.043 +1219,0.363 +1220,-0.580 +1221,1.619 +1222,-1.530 +1223,0.542 +1224,-0.885 +1225,0.572 +1226,1.417 +1227,-0.200 +1228,1.213 +1229,1.810 +1230,2.396 +1231,-0.271 +1232,-1.887 +1233,-0.732 +1234,0.181 +1235,0.503 +1236,-0.008 +1237,0.525 +1238,-0.342 +1239,-0.682 +1240,-0.668 +1241,1.127 +1242,0.909 +1243,-2.668 +1244,1.041 +1245,0.055 +1246,0.396 +1247,-0.384 +1248,1.951 +1249,0.501 +1250,-0.670 +1251,1.017 +1252,-0.710 +1253,-0.325 +1254,0.812 +1255,-0.319 +1256,0.284 +1257,-1.033 +1258,-0.864 +1259,-0.164 +1260,1.156 +1261,0.020 +1262,0.225 +1263,-0.903 +1264,1.559 +1265,-0.508 +1266,-0.086 +1267,0.501 +1268,0.124 +1269,0.315 +1270,0.877 +1271,-0.176 +1272,1.178 +1273,1.649 +1274,-0.622 +1275,-0.913 +1276,-0.345 +1277,1.013 +1278,0.807 +1279,-0.537 +1280,-0.358 +1281,0.169 +1282,1.152 +1283,0.490 +1284,0.789 +1285,0.646 +1286,-0.328 +1287,0.507 +1288,0.868 +1289,-1.214 +1290,0.161 +1291,-1.964 +1292,-1.920 +1293,-0.149 +1294,1.068 +1295,-0.508 +1296,-0.381 +1297,-1.953 +1298,0.646 +1299,-1.181 +1300,-0.523 +1301,0.340 +1302,-1.247 +1303,-0.903 +1304,0.792 +1305,-0.683 +1306,0.615 +1307,-1.538 +1308,0.001 +1309,0.351 +1310,-0.455 +1311,0.250 +1312,-1.500 +1313,0.021 +1314,1.512 +1315,2.013 +1316,-0.960 +1317,-0.075 +1318,-1.871 +1319,-0.763 +1320,-1.035 +1321,-0.666 +1322,0.352 +1323,-0.086 +1324,1.441 +1325,1.326 +1326,1.953 +1327,0.787 +1328,2.072 +1329,2.003 +1330,-1.674 +1331,1.643 +1332,1.997 +1333,-2.167 +1334,0.367 +1335,-0.356 +1336,-0.459 +1337,0.696 +1338,1.608 +1339,0.802 +1340,0.182 +1341,0.038 +1342,0.603 +1343,-0.519 +1344,-0.066 +1345,-0.248 +1346,0.215 +1347,-0.265 +1348,-1.090 +1349,1.344 +1350,0.984 +1351,1.887 +1352,0.638 +1353,-1.383 +1354,-0.797 +1355,0.234 +1356,1.907 +1357,1.663 +1358,1.103 +1359,-0.359 +1360,-0.970 +1361,-1.056 +1362,0.384 +1363,-0.532 +1364,0.274 +1365,0.791 +1366,0.646 +1367,-0.995 +1368,0.397 +1369,0.731 +1370,-0.357 +1371,-0.067 +1372,0.517 +1373,2.063 +1374,-0.317 +1375,1.213 +1376,-0.895 +1377,-0.378 +1378,0.823 +1379,-0.286 +1380,0.888 +1381,-1.865 +1382,-1.139 +1383,-1.080 +1384,-2.091 +1385,-1.250 +1386,-0.830 +1387,-0.369 +1388,-1.620 +1389,-0.881 +1390,-0.607 +1391,1.789 +1392,-0.461 +1393,0.557 +1394,0.974 +1395,0.823 +1396,-1.276 +1397,0.411 +1398,0.339 +1399,1.028 +1400,2.329 +1401,-1.010 +1402,0.429 +1403,-0.365 +1404,-0.543 +1405,-0.021 +1406,-1.069 +1407,-3.254 +1408,-1.295 +1409,0.251 +1410,1.154 +1411,1.394 +1412,0.261 +1413,-0.005 +1414,-0.915 +1415,-0.177 +1416,-1.392 +1417,-0.055 +1418,-0.481 +1419,1.907 +1420,1.937 +1421,0.623 +1422,-0.604 +1423,-0.454 +1424,0.038 +1425,0.924 +1426,0.659 +1427,-0.793 +1428,0.485 +1429,1.164 +1430,-0.290 +1431,-0.631 +1432,0.015 +1433,0.671 +1434,0.245 +1435,1.219 +1436,-1.735 +1437,1.768 +1438,-1.261 +1439,0.838 +1440,-0.164 +1441,0.427 +1442,-1.025 +1443,1.525 +1444,-0.384 +1445,-0.612 +1446,-1.570 +1447,1.061 +1448,-0.344 +1449,1.140 +1450,-0.146 +1451,0.212 +1452,-0.052 +1453,0.656 +1454,0.606 +1455,0.414 +1456,1.792 +1457,-1.664 +1458,-1.991 +1459,-1.835 +1460,0.652 +1461,0.578 +1462,-0.231 +1463,0.142 +1464,0.296 +1465,-2.468 +1466,-0.834 +1467,-0.484 +1468,-0.494 +1469,-0.209 +1470,-0.234 +1471,-0.958 +1472,1.110 +1473,0.330 +1474,-0.412 +1475,-0.935 +1476,-0.154 +1477,-0.482 +1478,1.365 +1479,1.145 +1480,0.118 +1481,0.602 +1482,0.813 +1483,1.211 +1484,-0.849 +1485,0.485 +1486,0.768 +1487,0.166 +1488,-0.511 +1489,-1.500 +1490,0.124 +1491,0.827 +1492,1.149 +1493,-0.368 +1494,-0.303 +1495,0.895 +1496,-1.456 +1497,-2.095 +1498,-1.445 +1499,0.180 +1500,-1.080 +1501,-0.026 +1502,-0.344 +1503,-2.051 +1504,1.240 +1505,-0.166 +1506,0.726 +1507,0.566 +1508,-0.164 +1509,2.192 +1510,1.120 +1511,-1.642 +1512,0.195 +1513,-0.108 +1514,-0.430 +1515,-0.518 +1516,0.480 +1517,-2.072 +1518,2.211 +1519,-1.234 +1520,0.368 +1521,-0.620 +1522,-0.492 +1523,-1.166 +1524,-0.711 +1525,-0.654 +1526,0.472 +1527,-2.003 +1528,-0.092 +1529,1.025 +1530,1.594 +1531,0.872 +1532,-1.862 +1533,0.248 +1534,1.049 +1535,1.277 +1536,1.056 +1537,-0.168 +1538,-0.407 +1539,-0.609 +1540,0.822 +1541,-0.320 +1542,0.049 +1543,0.185 +1544,-1.116 +1545,0.168 +1546,-0.287 +1547,-0.247 +1548,2.362 +1549,0.168 +1550,0.307 +1551,0.781 +1552,-0.292 +1553,0.149 +1554,-0.020 +1555,0.776 +1556,-0.213 +1557,0.301 +1558,-1.197 +1559,-0.235 +1560,0.931 +1561,-0.860 +1562,0.370 +1563,0.591 +1564,1.522 +1565,1.335 +1566,-0.429 +1567,0.079 +1568,-0.330 +1569,-0.007 +1570,0.814 +1571,0.881 +1572,0.911 +1573,0.292 +1574,1.037 +1575,0.160 +1576,0.875 +1577,0.478 +1578,-0.798 +1579,-0.642 +1580,0.075 +1581,1.470 +1582,1.458 +1583,-0.108 +1584,2.198 +1585,1.127 +1586,1.168 +1587,-0.932 +1588,0.985 +1589,-0.588 +1590,-0.213 +1591,0.888 +1592,1.245 +1593,-0.326 +1594,0.415 +1595,-0.345 +1596,-1.200 +1597,-0.051 +1598,-2.020 +1599,0.170 +1600,1.225 +1601,0.224 +1602,0.058 +1603,-0.142 +1604,0.562 +1605,-1.212 +1606,1.103 +1607,1.097 +1608,0.918 +1609,-0.338 +1610,0.086 +1611,0.137 +1612,-2.212 +1613,-0.352 +1614,2.432 +1615,1.361 +1616,-0.647 +1617,-1.283 +1618,-0.640 +1619,0.649 +1620,0.288 +1621,1.329 +1622,0.413 +1623,0.013 +1624,1.084 +1625,0.468 +1626,-0.426 +1627,0.862 +1628,-0.218 +1629,-0.927 +1630,-0.430 +1631,-0.664 +1632,0.857 +1633,1.813 +1634,-1.261 +1635,-0.328 +1636,-0.730 +1637,0.425 +1638,-0.013 +1639,0.475 +1640,-1.368 +1641,0.033 +1642,1.697 +1643,-0.688 +1644,-0.962 +1645,0.462 +1646,0.981 +1647,-0.015 +1648,0.304 +1649,0.455 +1650,1.950 +1651,1.539 +1652,0.090 +1653,1.140 +1654,-1.157 +1655,-0.192 +1656,0.604 +1657,0.234 +1658,-2.517 +1659,0.015 +1660,-1.178 +1661,0.594 +1662,0.322 +1663,-1.062 +1664,0.975 +1665,0.274 +1666,0.452 +1667,0.255 +1668,0.206 +1669,1.627 +1670,0.170 +1671,0.458 +1672,0.185 +1673,-0.743 +1674,-0.525 +1675,0.663 +1676,0.329 +1677,-1.004 +1678,-0.903 +1679,0.932 +1680,-2.349 +1681,0.500 +1682,-1.871 +1683,-0.364 +1684,-1.587 +1685,-1.237 +1686,0.501 +1687,0.201 +1688,1.295 +1689,0.389 +1690,-0.066 +1691,-0.280 +1692,-1.819 +1693,1.175 +1694,0.250 +1695,-0.766 +1696,-0.808 +1697,-0.187 +1698,-0.264 +1699,-1.518 +1700,-0.782 +1701,0.213 +1702,-0.547 +1703,0.133 +1704,0.245 +1705,1.134 +1706,0.660 +1707,-2.372 +1708,-0.221 +1709,0.538 +1710,1.001 +1711,-1.255 +1712,0.761 +1713,-1.910 +1714,-1.333 +1715,-0.606 +1716,-1.358 +1717,0.980 +1718,0.459 +1719,0.807 +1720,0.520 +1721,0.749 +1722,-0.038 +1723,0.292 +1724,-0.669 +1725,-0.611 +1726,-0.890 +1727,0.802 +1728,-2.107 +1729,-0.424 +1730,2.079 +1731,-0.182 +1732,-1.536 +1733,0.283 +1734,-1.709 +1735,-0.669 +1736,1.453 +1737,-0.997 +1738,-0.621 +1739,0.925 +1740,0.717 +1741,-0.733 +1742,-1.182 +1743,0.723 +1744,0.533 +1745,-0.163 +1746,0.825 +1747,0.245 +1748,-0.529 +1749,0.358 +1750,0.204 +1751,-0.057 +1752,1.392 +1753,-0.911 +1754,-0.198 +1755,2.101 +1756,-0.142 +1757,0.697 +1758,-1.584 +1759,-0.051 +1760,-0.179 +1761,1.446 +1762,1.107 +1763,0.948 +1764,0.717 +1765,0.442 +1766,-2.736 +1767,0.397 +1768,-0.627 +1769,1.454 +1770,0.553 +1771,0.525 +1772,1.691 +1773,-1.069 +1774,-1.061 +1775,-1.163 +1776,-1.350 +1777,-0.232 +1778,0.000 +1779,0.429 +1780,-0.100 +1781,-0.236 +1782,-0.157 +1783,-0.616 +1784,-2.161 +1785,3.125 +1786,1.921 +1787,-0.409 +1788,1.162 +1789,-0.188 +1790,1.962 +1791,-0.704 +1792,-1.326 +1793,0.631 +1794,-0.739 +1795,1.231 +1796,2.214 +1797,0.491 +1798,1.764 +1799,0.559 +1800,-0.260 +1801,-1.599 +1802,-0.159 +1803,0.876 +1804,-0.785 +1805,-0.705 +1806,-1.442 +1807,0.971 +1808,-0.751 +1809,1.526 +1810,0.453 +1811,0.210 +1812,1.096 +1813,0.215 +1814,-1.318 +1815,-0.016 +1816,0.297 +1817,0.606 +1818,0.747 +1819,-0.989 +1820,-0.087 +1821,-0.200 +1822,-0.418 +1823,0.068 +1824,-0.636 +1825,-0.723 +1826,2.376 +1827,-0.245 +1828,-1.002 +1829,0.450 +1830,0.623 +1831,-0.718 +1832,0.572 +1833,0.897 +1834,-1.913 +1835,-0.111 +1836,-1.212 +1837,1.488 +1838,-0.197 +1839,-0.234 +1840,1.809 +1841,1.018 +1842,-0.244 +1843,0.498 +1844,-0.011 +1845,-0.219 +1846,1.033 +1847,0.527 +1848,-0.199 +1849,-0.030 +1850,0.793 +1851,-0.016 +1852,-0.561 +1853,-0.571 +1854,0.574 +1855,-0.029 +1856,-1.203 +1857,1.175 +1858,-1.070 +1859,-1.059 +1860,1.439 +1861,-0.175 +1862,-1.164 +1863,0.588 +1864,0.238 +1865,-0.072 +1866,0.417 +1867,-0.795 +1868,-1.135 +1869,-0.325 +1870,-1.401 +1871,0.969 +1872,0.815 +1873,0.802 +1874,1.533 +1875,0.346 +1876,-0.174 +1877,0.659 +1878,-1.379 +1879,1.060 +1880,-0.741 +1881,0.445 +1882,1.228 +1883,-0.187 +1884,1.272 +1885,-0.555 +1886,-0.556 +1887,-1.134 +1888,0.385 +1889,0.892 +1890,0.398 +1891,-0.293 +1892,-1.048 +1893,-0.340 +1894,0.147 +1895,1.811 +1896,-0.718 +1897,1.562 +1898,-0.019 +1899,1.550 +1900,1.135 +1901,1.376 +1902,-0.814 +1903,-0.794 +1904,0.389 +1905,-0.093 +1906,-0.256 +1907,0.679 +1908,-2.096 +1909,-0.663 +1910,-1.249 +1911,-0.344 +1912,-1.413 +1913,-0.287 +1914,-0.765 +1915,0.837 +1916,-1.287 +1917,-0.561 +1918,0.720 +1919,0.614 +1920,1.003 +1921,0.684 +1922,0.651 +1923,-1.340 +1924,-0.216 +1925,-0.779 +1926,0.119 +1927,-0.416 +1928,0.523 +1929,0.020 +1930,0.628 +1931,-2.120 +1932,-0.352 +1933,-1.264 +1934,-0.147 +1935,-1.508 +1936,-0.554 +1937,1.411 +1938,0.979 +1939,0.297 +1940,-0.137 +1941,-0.645 +1942,-1.347 +1943,-0.361 +1944,-2.321 +1945,-0.674 +1946,0.438 +1947,2.083 +1948,0.136 +1949,-0.202 +1950,-0.157 +1951,-0.617 +1952,1.486 +1953,1.487 +1954,-0.374 +1955,-1.072 +1956,1.307 +1957,-0.438 +1958,-0.082 +1959,-0.458 +1960,-0.622 +1961,-1.124 +1962,0.709 +1963,1.673 +1964,-0.647 +1965,-0.581 +1966,0.204 +1967,-0.001 +1968,-0.831 +1969,-0.694 +1970,-1.052 +1971,1.066 +1972,-0.992 +1973,-1.115 +1974,1.398 +1975,1.048 +1976,0.226 +1977,-1.269 +1978,-1.110 +1979,-0.338 +1980,0.488 +1981,2.137 +1982,-0.161 +1983,0.976 +1984,-0.687 +1985,1.602 +1986,-0.938 +1987,-0.413 +1988,-0.624 +1989,1.193 +1990,-0.915 +1991,-0.237 +1992,0.313 +1993,0.881 +1994,-0.383 +1995,0.001 +1996,-0.141 +1997,0.343 +1998,-1.440 +1999,-0.194 +2000,-0.553 +2001,-0.230 +2002,1.204 +2003,-1.527 +2004,1.261 +2005,-1.693 +2006,0.925 +2007,-1.121 +2008,-0.022 +2009,-1.614 +2010,-0.406 +2011,-0.101 +2012,-1.643 +2013,-1.301 +2014,0.962 +2015,0.944 +2016,-2.056 +2017,0.702 +2018,1.973 +2019,-0.619 +2020,2.033 +2021,0.838 +2022,1.723 +2023,0.095 +2024,-0.379 +2025,-2.700 +2026,0.550 +2027,1.010 +2028,-1.042 +2029,0.178 +2030,1.067 +2031,-2.069 +2032,0.809 +2033,-0.593 +2034,-0.526 +2035,0.219 +2036,-1.051 +2037,-0.994 +2038,-0.698 +2039,0.083 +2040,-0.590 +2041,-0.467 +2042,0.064 +2043,-1.442 +2044,1.318 +2045,-0.455 +2046,-0.987 +2047,-1.570 +2048,-0.717 +2049,1.565 +2050,0.433 +2051,0.720 +2052,-1.690 +2053,-0.670 +2054,-1.588 +2055,-0.563 +2056,-0.256 +2057,-0.263 +2058,-0.981 +2059,1.263 +2060,-0.823 +2061,0.492 +2062,1.652 +2063,1.522 +2064,-0.333 +2065,-1.000 +2066,-0.553 +2067,-2.717 +2068,-0.539 +2069,-0.633 +2070,-2.286 +2071,0.707 +2072,1.079 +2073,0.545 +2074,2.482 +2075,-0.492 +2076,0.659 +2077,-0.314 +2078,-1.720 +2079,0.501 +2080,0.991 +2081,0.126 +2082,0.490 +2083,-0.126 +2084,1.439 +2085,-1.123 +2086,-1.225 +2087,-1.472 +2088,0.282 +2089,0.582 +2090,-0.540 +2091,0.749 +2092,0.883 +2093,-0.375 +2094,-1.427 +2095,0.262 +2096,0.151 +2097,0.172 +2098,-0.113 +2099,-1.128 +2100,0.663 +2101,1.116 +2102,0.344 +2103,0.654 +2104,0.268 +2105,-0.702 +2106,0.012 +2107,-0.111 +2108,1.135 +2109,0.145 +2110,-0.855 +2111,-1.547 +2112,0.442 +2113,0.710 +2114,1.217 +2115,0.914 +2116,1.416 +2117,-0.387 +2118,0.469 +2119,1.880 +2120,0.010 +2121,0.446 +2122,-0.021 +2123,-0.310 +2124,-0.272 +2125,0.339 +2126,-0.700 +2127,0.362 +2128,0.551 +2129,-0.725 +2130,-0.888 +2131,-0.152 +2132,0.444 +2133,-0.489 +2134,0.150 +2135,1.962 +2136,1.333 +2137,0.006 +2138,0.173 +2139,-0.691 +2140,-0.317 +2141,-2.227 +2142,-1.599 +2143,-0.932 +2144,1.222 +2145,-0.049 +2146,-0.482 +2147,1.075 +2148,0.096 +2149,1.279 +2150,0.761 +2151,-0.244 +2152,-0.235 +2153,1.792 +2154,-1.019 +2155,-0.119 +2156,0.309 +2157,0.031 +2158,0.151 +2159,0.024 +2160,0.010 +2161,0.047 +2162,-0.477 +2163,-0.397 +2164,-0.862 +2165,0.862 +2166,-0.450 +2167,0.415 +2168,0.159 +2169,1.538 +2170,0.393 +2171,1.143 +2172,-0.110 +2173,-0.936 +2174,-0.545 +2175,1.188 +2176,0.294 +2177,-1.585 +2178,0.334 +2179,-1.507 +2180,0.245 +2181,1.108 +2182,-1.341 +2183,1.579 +2184,-0.621 +2185,0.115 +2186,0.154 +2187,-0.021 +2188,-0.479 +2189,0.328 +2190,-0.504 +2191,1.191 +2192,-0.226 +2193,-0.689 +2194,-0.130 +2195,1.076 +2196,-0.825 +2197,-1.620 +2198,0.465 +2199,1.511 +2200,0.742 +2201,2.114 +2202,-1.215 +2203,-0.581 +2204,0.364 +2205,0.987 +2206,0.823 +2207,0.377 +2208,-0.411 +2209,-0.581 +2210,1.924 +2211,0.614 +2212,0.446 +2213,-0.296 +2214,0.054 +2215,-0.745 +2216,-0.115 +2217,-0.959 +2218,-0.113 +2219,-1.099 +2220,-1.104 +2221,-1.689 +2222,-0.765 +2223,0.647 +2224,-0.841 +2225,-1.619 +2226,1.145 +2227,-0.833 +2228,1.327 +2229,-0.248 +2230,0.250 +2231,0.256 +2232,-0.919 +2233,0.951 +2234,-0.262 +2235,-0.843 +2236,1.240 +2237,-0.313 +2238,2.563 +2239,-0.672 +2240,-0.913 +2241,-0.533 +2242,1.068 +2243,0.527 +2244,0.551 +2245,-1.452 +2246,-0.066 +2247,-0.381 +2248,-1.013 +2249,1.050 +2250,-0.825 +2251,0.429 +2252,0.080 +2253,-0.903 +2254,-0.432 +2255,-1.475 +2256,0.188 +2257,0.759 +2258,-1.665 +2259,0.527 +2260,-0.476 +2261,-1.398 +2262,0.016 +2263,0.568 +2264,-1.351 +2265,-1.031 +2266,0.151 +2267,-0.821 +2268,-0.842 +2269,0.875 +2270,0.748 +2271,0.590 +2272,0.869 +2273,1.120 +2274,1.191 +2275,0.991 +2276,-1.497 +2277,0.458 +2278,0.253 +2279,-1.049 +2280,-1.360 +2281,0.044 +2282,0.839 +2283,-0.555 +2284,1.551 +2285,1.518 +2286,0.035 +2287,1.999 +2288,0.841 +2289,0.759 +2290,-1.833 +2291,1.213 +2292,1.326 +2293,-0.001 +2294,0.140 +2295,1.648 +2296,0.540 +2297,-0.867 +2298,-1.372 +2299,1.018 +2300,-1.344 +2301,-0.807 +2302,-0.067 +2303,0.496 +2304,0.925 +2305,-0.607 +2306,-0.494 +2307,-0.504 +2308,-1.302 +2309,0.762 +2310,-0.955 +2311,-0.768 +2312,-1.367 +2313,0.208 +2314,-0.954 +2315,1.294 +2316,-0.039 +2317,0.557 +2318,-0.765 +2319,0.074 +2320,1.131 +2321,0.789 +2322,1.148 +2323,0.848 +2324,-1.227 +2325,-1.415 +2326,-0.606 +2327,-0.748 +2328,2.013 +2329,-1.174 +2330,-0.203 +2331,-1.328 +2332,-2.575 +2333,-0.992 +2334,-0.596 +2335,0.351 +2336,-1.523 +2337,0.195 +2338,-0.628 +2339,0.839 +2340,1.739 +2341,0.831 +2342,-0.066 +2343,-0.768 +2344,0.818 +2345,-0.107 +2346,0.333 +2347,2.094 +2348,-0.919 +2349,0.216 +2350,0.222 +2351,0.826 +2352,-0.508 +2353,-0.411 +2354,1.146 +2355,2.022 +2356,0.987 +2357,0.567 +2358,0.002 +2359,-0.412 +2360,1.354 +2361,0.024 +2362,0.818 +2363,0.448 +2364,1.162 +2365,-1.130 +2366,1.515 +2367,1.252 +2368,-0.309 +2369,-0.567 +2370,0.520 +2371,0.046 +2372,0.233 +2373,-0.567 +2374,-0.008 +2375,-1.692 +2376,-0.269 +2377,0.218 +2378,0.345 +2379,0.242 +2380,0.287 +2381,0.568 +2382,-1.520 +2383,0.529 +2384,-1.364 +2385,0.256 +2386,1.492 +2387,0.024 +2388,-0.955 +2389,-1.150 +2390,1.406 +2391,-0.902 +2392,0.213 +2393,0.033 +2394,-2.246 +2395,-0.355 +2396,-0.087 +2397,-0.184 +2398,0.912 +2399,-1.247 +2400,0.900 +2401,1.696 +2402,1.217 +2403,0.791 +2404,0.621 +2405,0.279 +2406,-0.897 +2407,0.776 +2408,2.358 +2409,-0.906 +2410,-1.231 +2411,0.038 +2412,2.433 +2413,0.410 +2414,1.350 +2415,-0.147 +2416,-0.577 +2417,-0.042 +2418,0.118 +2419,0.777 +2420,0.449 +2421,-0.148 +2422,-0.647 +2423,-0.287 +2424,0.388 +2425,0.952 +2426,-1.319 +2427,-0.044 +2428,-0.561 +2429,1.333 +2430,-0.972 +2431,-0.746 +2432,-0.068 +2433,0.226 +2434,0.596 +2435,-1.189 +2436,-0.420 +2437,-0.506 +2438,0.471 +2439,1.417 +2440,-0.018 +2441,-1.593 +2442,1.884 +2443,0.354 +2444,0.485 +2445,-1.969 +2446,-0.775 +2447,-0.114 +2448,-1.293 +2449,0.838 +2450,-0.797 +2451,0.908 +2452,0.132 +2453,0.815 +2454,0.301 +2455,-2.943 +2456,-0.543 +2457,-1.447 +2458,-0.748 +2459,-0.281 +2460,-1.110 +2461,0.074 +2462,-1.265 +2463,0.618 +2464,1.237 +2465,0.284 +2466,0.207 +2467,1.946 +2468,0.498 +2469,0.624 +2470,0.033 +2471,0.337 +2472,-0.704 +2473,-1.120 +2474,-0.116 +2475,-0.177 +2476,0.910 +2477,1.046 +2478,1.862 +2479,-1.198 +2480,-0.083 +2481,0.035 +2482,-1.311 +2483,0.367 +2484,1.600 +2485,-0.186 +2486,-1.342 +2487,0.411 +2488,0.345 +2489,-0.399 +2490,-0.267 +2491,0.759 +2492,-0.642 +2493,0.329 +2494,1.020 +2495,-0.351 +2496,-0.105 +2497,-0.371 +2498,0.485 +2499,0.658 +2500,-0.441 +2501,-0.270 +2502,-1.968 +2503,-1.818 +2504,0.733 +2505,0.280 +2506,-0.077 +2507,-1.298 +2508,-0.303 +2509,0.245 +2510,-0.772 +2511,0.883 +2512,-1.550 +2513,-1.091 +2514,0.896 +2515,1.147 +2516,0.720 +2517,-0.843 +2518,-0.724 +2519,-0.600 +2520,-0.723 +2521,-0.648 +2522,-0.415 +2523,-1.386 +2524,0.547 +2525,-0.078 +2526,-1.495 +2527,0.452 +2528,1.031 +2529,0.614 +2530,-2.917 +2531,-0.660 +2532,0.387 +2533,-0.784 +2534,2.007 +2535,-0.922 +2536,2.246 +2537,-1.501 +2538,-0.014 +2539,1.316 +2540,-1.389 +2541,-1.646 +2542,0.620 +2543,1.172 +2544,1.584 +2545,-0.216 +2546,1.604 +2547,-0.189 +2548,-1.751 +2549,-0.441 +2550,-1.228 +2551,-1.534 +2552,0.754 +2553,-0.532 +2554,0.433 +2555,1.641 +2556,-0.858 +2557,-0.055 +2558,-0.279 +2559,-0.401 +2560,0.079 +2561,-0.032 +2562,0.441 +2563,-1.498 +2564,-2.150 +2565,0.416 +2566,-0.939 +2567,0.341 +2568,0.179 +2569,-0.125 +2570,-0.069 +2571,0.891 +2572,0.506 +2573,-1.830 +2574,-0.518 +2575,0.661 +2576,-0.472 +2577,-1.126 +2578,0.264 +2579,0.569 +2580,0.245 +2581,1.510 +2582,2.567 +2583,0.537 +2584,-2.733 +2585,1.712 +2586,-0.910 +2587,0.615 +2588,0.662 +2589,-0.522 +2590,-1.875 +2591,0.772 +2592,-0.912 +2593,0.893 +2594,1.034 +2595,0.173 +2596,0.530 +2597,-0.946 +2598,-1.532 +2599,-0.384 +2600,-0.213 +2601,-1.418 +2602,-2.470 +2603,0.864 +2604,-0.984 +2605,0.697 +2606,-0.694 +2607,-2.039 +2608,0.117 +2609,-0.143 +2610,-1.054 +2611,-0.103 +2612,2.252 +2613,0.813 +2614,0.463 +2615,0.428 +2616,0.746 +2617,-1.798 +2618,-0.083 +2619,1.079 +2620,1.292 +2621,-0.496 +2622,0.933 +2623,0.662 +2624,-1.910 +2625,-1.009 +2626,-0.204 +2627,0.596 +2628,-0.949 +2629,1.550 +2630,-0.402 +2631,0.440 +2632,-0.180 +2633,0.379 +2634,-0.142 +2635,-0.230 +2636,1.135 +2637,0.099 +2638,0.547 +2639,0.159 +2640,-0.076 +2641,-0.516 +2642,-0.658 +2643,-0.151 +2644,0.038 +2645,1.261 +2646,1.741 +2647,-0.040 +2648,1.115 +2649,0.078 +2650,-0.581 +2651,2.365 +2652,1.909 +2653,-1.099 +2654,0.088 +2655,-0.968 +2656,-0.143 +2657,0.085 +2658,-1.110 +2659,0.556 +2660,1.585 +2661,1.187 +2662,0.396 +2663,-0.877 +2664,-0.108 +2665,-0.052 +2666,-1.272 +2667,0.580 +2668,0.951 +2669,1.323 +2670,0.749 +2671,-2.087 +2672,1.405 +2673,-0.279 +2674,-0.078 +2675,-1.933 +2676,-0.493 +2677,0.108 +2678,1.354 +2679,0.178 +2680,-1.611 +2681,0.891 +2682,1.065 +2683,-1.299 +2684,-0.458 +2685,0.465 +2686,1.074 +2687,-0.592 +2688,-0.125 +2689,0.735 +2690,-0.241 +2691,0.178 +2692,0.284 +2693,1.753 +2694,0.377 +2695,2.249 +2696,0.208 +2697,1.109 +2698,-0.399 +2699,-0.612 +2700,-1.365 +2701,0.801 +2702,0.578 +2703,-0.832 +2704,-0.461 +2705,0.612 +2706,-0.786 +2707,-0.821 +2708,-0.367 +2709,0.833 +2710,0.935 +2711,-1.070 +2712,-0.080 +2713,2.838 +2714,0.799 +2715,-1.413 +2716,0.121 +2717,-0.609 +2718,0.773 +2719,-0.991 +2720,-0.834 +2721,1.079 +2722,-0.855 +2723,-0.387 +2724,-1.370 +2725,-0.343 +2726,-0.926 +2727,-0.651 +2728,0.887 +2729,-1.434 +2730,-0.644 +2731,0.107 +2732,0.137 +2733,0.727 +2734,-0.033 +2735,1.141 +2736,-0.124 +2737,-1.624 +2738,1.658 +2739,-0.616 +2740,0.167 +2741,0.204 +2742,1.204 +2743,-0.782 +2744,-0.675 +2745,0.191 +2746,-2.002 +2747,-0.573 +2748,0.719 +2749,-1.774 +2750,-0.732 +2751,2.010 +2752,-0.311 +2753,1.616 +2754,-2.545 +2755,-0.725 +2756,-0.121 +2757,-0.176 +2758,-0.422 +2759,-0.255 +2760,-0.961 +2761,-0.598 +2762,-1.001 +2763,0.958 +2764,2.318 +2765,1.765 +2766,-0.683 +2767,-0.072 +2768,-0.098 +2769,-0.191 +2770,0.214 +2771,1.337 +2772,0.613 +2773,-0.308 +2774,0.243 +2775,0.971 +2776,0.885 +2777,0.059 +2778,-1.385 +2779,0.097 +2780,-0.623 +2781,0.626 +2782,0.924 +2783,-0.171 +2784,0.339 +2785,-0.662 +2786,0.576 +2787,0.523 +2788,1.242 +2789,-0.086 +2790,-0.281 +2791,-0.325 +2792,0.943 +2793,0.747 +2794,0.632 +2795,0.733 +2796,-0.584 +2797,0.198 +2798,-0.654 +2799,0.788 +2800,0.531 +2801,-0.065 +2802,-0.146 +2803,-0.846 +2804,2.731 +2805,-2.076 +2806,-0.005 +2807,1.201 +2808,-0.162 +2809,0.308 +2810,0.389 +2811,-0.923 +2812,0.036 +2813,-0.268 +2814,-0.023 +2815,0.239 +2816,-0.739 +2817,-0.087 +2818,-0.373 +2819,-0.774 +2820,-1.978 +2821,0.084 +2822,-0.425 +2823,-1.150 +2824,-0.949 +2825,-1.201 +2826,0.260 +2827,-1.139 +2828,1.499 +2829,-0.638 +2830,-0.017 +2831,-1.052 +2832,-0.488 +2833,0.729 +2834,0.040 +2835,1.464 +2836,-0.720 +2837,-0.475 +2838,-0.924 +2839,-0.580 +2840,-1.145 +2841,-0.174 +2842,-0.612 +2843,-1.605 +2844,0.213 +2845,-0.636 +2846,0.919 +2847,1.517 +2848,-1.183 +2849,0.831 +2850,0.812 +2851,1.318 +2852,-0.135 +2853,-0.048 +2854,0.390 +2855,1.157 +2856,0.084 +2857,0.806 +2858,0.032 +2859,0.799 +2860,-0.237 +2861,-0.610 +2862,-1.724 +2863,-0.222 +2864,-0.013 +2865,-1.491 +2866,-0.057 +2867,1.450 +2868,-1.236 +2869,0.248 +2870,0.160 +2871,-0.364 +2872,0.710 +2873,0.883 +2874,-0.425 +2875,-0.939 +2876,1.233 +2877,2.342 +2878,-0.878 +2879,-0.437 +2880,-0.108 +2881,1.139 +2882,-0.818 +2883,1.785 +2884,-1.604 +2885,1.493 +2886,-2.034 +2887,0.438 +2888,0.556 +2889,0.279 +2890,-0.578 +2891,0.501 +2892,-1.224 +2893,0.478 +2894,-0.990 +2895,-2.229 +2896,0.894 +2897,0.589 +2898,-2.881 +2899,-0.059 +2900,-0.212 +2901,-0.370 +2902,-1.859 +2903,-1.659 +2904,-0.186 +2905,-1.762 +2906,0.129 +2907,0.881 +2908,1.210 +2909,-0.288 +2910,1.761 +2911,1.116 +2912,0.138 +2913,0.079 +2914,0.085 +2915,-0.613 +2916,0.861 +2917,-1.782 +2918,-1.367 +2919,0.295 +2920,-0.262 +2921,0.156 +2922,1.357 +2923,-1.402 +2924,-0.104 +2925,0.134 +2926,-0.755 +2927,0.592 +2928,1.184 +2929,-1.914 +2930,0.623 +2931,0.659 +2932,-0.772 +2933,0.185 +2934,-1.382 +2935,0.746 +2936,-0.075 +2937,0.523 +2938,0.451 +2939,0.815 +2940,-0.467 +2941,0.276 +2942,0.353 +2943,0.306 +2944,-0.962 +2945,0.290 +2946,-1.231 +2947,-0.635 +2948,-0.650 +2949,1.284 +2950,-0.955 +2951,0.648 +2952,2.691 +2953,0.642 +2954,-0.314 +2955,0.656 +2956,1.253 +2957,0.651 +2958,0.507 +2959,2.535 +2960,0.949 +2961,0.777 +2962,-0.325 +2963,0.643 +2964,1.316 +2965,-0.587 +2966,-0.873 +2967,0.571 +2968,1.184 +2969,-1.147 +2970,0.548 +2971,1.868 +2972,-0.938 +2973,0.325 +2974,1.004 +2975,0.504 +2976,-0.924 +2977,-0.535 +2978,0.236 +2979,1.108 +2980,-0.068 +2981,-0.419 +2982,1.459 +2983,-1.834 +2984,-0.427 +2985,1.567 +2986,-0.484 +2987,0.421 +2988,-1.276 +2989,0.476 +2990,0.509 +2991,-2.414 +2992,-0.988 +2993,-2.030 +2994,-0.144 +2995,-0.061 +2996,-1.244 +2997,0.695 +2998,-1.431 +2999,-0.235 +3000,2.506 +3001,1.708 +3002,-0.392 +3003,0.429 +3004,-0.979 +3005,-0.580 +3006,0.876 +3007,1.904 +3008,-1.166 +3009,-0.305 +3010,0.752 +3011,-0.415 +3012,0.119 +3013,0.958 +3014,-0.135 +3015,-1.279 +3016,0.826 +3017,-0.814 +3018,0.039 +3019,0.102 +3020,0.341 +3021,0.768 +3022,0.158 +3023,1.325 +3024,-0.634 +3025,0.932 +3026,1.356 +3027,0.859 +3028,0.391 +3029,1.501 +3030,0.361 +3031,-1.138 +3032,0.921 +3033,-0.436 +3034,0.523 +3035,0.408 +3036,0.537 +3037,0.761 +3038,1.135 +3039,1.416 +3040,-0.673 +3041,-0.866 +3042,0.472 +3043,-0.069 +3044,2.149 +3045,1.330 +3046,-1.194 +3047,-1.315 +3048,-0.402 +3049,-1.261 +3050,0.695 +3051,-0.839 +3052,-0.867 +3053,-0.404 +3054,-0.535 +3055,0.563 +3056,-1.334 +3057,0.796 +3058,-0.246 +3059,-0.331 +3060,-0.560 +3061,1.742 +3062,0.560 +3063,-0.324 +3064,-0.453 +3065,-1.280 +3066,0.143 +3067,-0.302 +3068,-0.069 +3069,-0.337 +3070,1.756 +3071,1.081 +3072,1.614 +3073,0.051 +3074,-1.009 +3075,-0.617 +3076,-1.442 +3077,0.586 +3078,1.322 +3079,-2.293 +3080,-0.796 +3081,-1.133 +3082,0.813 +3083,-1.586 +3084,-1.022 +3085,-0.557 +3086,-0.505 +3087,1.059 +3088,0.139 +3089,0.186 +3090,-0.167 +3091,2.361 +3092,1.015 +3093,-0.754 +3094,-0.590 +3095,0.573 +3096,0.891 +3097,0.213 +3098,-0.894 +3099,-0.821 +3100,-0.135 +3101,1.010 +3102,-1.510 +3103,1.268 +3104,0.275 +3105,-0.552 +3106,-0.174 +3107,-1.848 +3108,-0.686 +3109,-0.554 +3110,-0.122 +3111,1.014 +3112,-0.969 +3113,-0.030 +3114,0.404 +3115,-0.797 +3116,-0.555 +3117,0.638 +3118,1.223 +3119,-0.433 +3120,0.582 +3121,-0.462 +3122,-0.173 +3123,1.431 +3124,-1.066 +3125,0.517 +3126,0.836 +3127,-0.904 +3128,0.257 +3129,-0.375 +3130,-0.164 +3131,0.040 +3132,-0.112 +3133,-0.023 +3134,0.633 +3135,-1.355 +3136,-0.942 +3137,-1.571 +3138,0.213 +3139,-1.817 +3140,-0.091 +3141,-1.220 +3142,0.267 +3143,1.097 +3144,1.716 +3145,1.084 +3146,-1.756 +3147,2.120 +3148,1.112 +3149,0.975 +3150,-0.638 +3151,-1.351 +3152,0.131 +3153,-0.690 +3154,0.372 +3155,-0.627 +3156,-0.845 +3157,1.696 +3158,-0.597 +3159,-0.338 +3160,0.139 +3161,-0.775 +3162,1.385 +3163,0.778 +3164,-2.735 +3165,1.810 +3166,1.260 +3167,-0.287 +3168,-0.235 +3169,0.686 +3170,0.492 +3171,0.493 +3172,0.106 +3173,-0.144 +3174,0.657 +3175,-0.974 +3176,1.096 +3177,0.145 +3178,0.861 +3179,1.328 +3180,-0.887 +3181,-1.122 +3182,2.600 +3183,-0.204 +3184,-0.461 +3185,-1.633 +3186,-1.492 +3187,-1.380 +3188,-1.214 +3189,-0.084 +3190,-1.118 +3191,-1.428 +3192,-0.131 +3193,0.013 +3194,1.077 +3195,-0.680 +3196,0.618 +3197,0.452 +3198,0.090 +3199,0.430 +3200,0.018 +3201,2.213 +3202,-0.021 +3203,0.335 +3204,1.057 +3205,-1.119 +3206,0.368 +3207,-0.389 +3208,0.408 +3209,-1.365 +3210,0.407 +3211,-0.355 +3212,-0.721 +3213,0.980 +3214,0.224 +3215,-0.292 +3216,-0.595 +3217,-2.421 +3218,1.229 +3219,-1.601 +3220,-1.112 +3221,-0.997 +3222,0.259 +3223,1.062 +3224,0.293 +3225,0.262 +3226,0.172 +3227,-0.294 +3228,-0.205 +3229,2.699 +3230,-0.848 +3231,0.046 +3232,0.020 +3233,1.445 +3234,-0.098 +3235,0.144 +3236,-1.303 +3237,0.960 +3238,1.017 +3239,-1.076 +3240,-0.531 +3241,0.583 +3242,-0.843 +3243,0.647 +3244,1.051 +3245,0.844 +3246,0.396 +3247,-1.195 +3248,-0.207 +3249,-1.983 +3250,-1.369 +3251,0.674 +3252,0.196 +3253,-0.383 +3254,0.525 +3255,0.024 +3256,0.498 +3257,0.111 +3258,-2.099 +3259,-1.008 +3260,-0.462 +3261,0.676 +3262,1.428 +3263,-1.090 +3264,1.296 +3265,-0.634 +3266,1.519 +3267,-0.995 +3268,1.367 +3269,0.139 +3270,-0.175 +3271,-0.523 +3272,-1.618 +3273,1.028 +3274,1.251 +3275,-0.219 +3276,-0.939 +3277,0.750 +3278,1.536 +3279,0.144 +3280,1.510 +3281,-1.414 +3282,0.957 +3283,-0.069 +3284,-0.081 +3285,1.739 +3286,-1.250 +3287,1.970 +3288,-0.843 +3289,1.467 +3290,1.193 +3291,0.048 +3292,0.489 +3293,0.691 +3294,-0.382 +3295,-0.413 +3296,0.703 +3297,0.076 +3298,0.576 +3299,-1.408 +3300,-1.022 +3301,0.811 +3302,0.668 +3303,1.133 +3304,-0.651 +3305,1.605 +3306,-0.214 +3307,-1.153 +3308,-1.386 +3309,-0.398 +3310,0.712 +3311,0.135 +3312,0.097 +3313,-0.661 +3314,-0.993 +3315,0.800 +3316,-0.128 +3317,-1.876 +3318,1.139 +3319,1.394 +3320,0.684 +3321,0.621 +3322,0.767 +3323,-1.277 +3324,0.756 +3325,-1.992 +3326,-0.022 +3327,0.968 +3328,1.400 +3329,0.772 +3330,0.168 +3331,-1.836 +3332,0.025 +3333,1.867 +3334,0.509 +3335,0.768 +3336,1.241 +3337,0.127 +3338,-2.128 +3339,-2.798 +3340,0.374 +3341,-1.583 +3342,1.207 +3343,-0.874 +3344,1.064 +3345,0.367 +3346,0.176 +3347,1.032 +3348,-1.503 +3349,-0.895 +3350,-0.178 +3351,-0.034 +3352,0.206 +3353,-0.607 +3354,-1.385 +3355,-1.711 +3356,0.806 +3357,0.651 +3358,-0.704 +3359,1.314 +3360,0.433 +3361,0.182 +3362,0.105 +3363,2.151 +3364,-0.309 +3365,-1.860 +3366,-1.044 +3367,-0.488 +3368,0.793 +3369,-0.203 +3370,-0.909 +3371,-0.580 +3372,-0.326 +3373,-0.001 +3374,0.538 +3375,0.568 +3376,-0.922 +3377,-0.028 +3378,-0.366 +3379,0.884 +3380,0.037 +3381,-0.631 +3382,-1.025 +3383,0.234 +3384,1.487 +3385,-0.785 +3386,-0.836 +3387,0.494 +3388,-0.480 +3389,0.724 +3390,-0.351 +3391,-1.118 +3392,0.494 +3393,1.395 +3394,0.595 +3395,0.124 +3396,-0.456 +3397,1.823 +3398,0.890 +3399,-0.171 +3400,-0.523 +3401,1.977 +3402,-1.049 +3403,-0.121 +3404,-0.460 +3405,-0.564 +3406,1.036 +3407,-1.163 +3408,-1.953 +3409,0.955 +3410,1.587 +3411,0.378 +3412,0.977 +3413,0.881 +3414,0.747 +3415,-0.188 +3416,1.680 +3417,-1.037 +3418,-0.691 +3419,-1.047 +3420,-0.871 +3421,0.171 +3422,-1.183 +3423,-0.785 +3424,-0.199 +3425,-1.988 +3426,0.343 +3427,0.763 +3428,0.654 +3429,-0.811 +3430,-0.894 +3431,0.438 +3432,-0.508 +3433,1.725 +3434,1.037 +3435,1.720 +3436,0.403 +3437,-1.773 +3438,0.332 +3439,1.154 +3440,0.159 +3441,0.223 +3442,0.346 +3443,1.423 +3444,0.412 +3445,-0.102 +3446,0.350 +3447,-1.357 +3448,0.268 +3449,-1.722 +3450,-0.931 +3451,0.870 +3452,-0.621 +3453,-0.950 +3454,0.897 +3455,-0.988 +3456,-0.671 +3457,-0.058 +3458,0.037 +3459,2.020 +3460,1.330 +3461,0.307 +3462,1.127 +3463,0.129 +3464,-0.406 +3465,-1.065 +3466,-0.880 +3467,-0.904 +3468,0.898 +3469,-1.586 +3470,-0.579 +3471,-1.008 +3472,0.008 +3473,-0.008 +3474,-0.682 +3475,-1.078 +3476,1.228 +3477,-0.349 +3478,0.508 +3479,-1.087 +3480,-0.200 +3481,0.227 +3482,0.482 +3483,-1.619 +3484,0.464 +3485,0.819 +3486,0.068 +3487,2.424 +3488,0.224 +3489,0.606 +3490,0.030 +3491,0.244 +3492,0.654 +3493,-0.265 +3494,1.172 +3495,1.337 +3496,-0.228 +3497,-1.204 +3498,0.750 +3499,0.538 +3500,0.241 +3501,0.967 +3502,0.831 +3503,0.161 +3504,-1.113 +3505,0.492 +3506,-0.492 +3507,-0.010 +3508,-0.717 +3509,0.389 +3510,1.895 +3511,-0.198 +3512,-0.140 +3513,-1.071 +3514,-1.183 +3515,0.380 +3516,0.623 +3517,0.969 +3518,-1.196 +3519,0.785 +3520,-1.176 +3521,1.426 +3522,-1.043 +3523,-0.065 +3524,-2.286 +3525,-0.584 +3526,0.690 +3527,-0.029 +3528,0.225 +3529,0.059 +3530,0.902 +3531,-1.468 +3532,0.282 +3533,0.259 +3534,2.005 +3535,0.391 +3536,-0.824 +3537,0.142 +3538,-0.152 +3539,0.616 +3540,0.492 +3541,-0.051 +3542,-0.822 +3543,1.504 +3544,-1.345 +3545,-0.364 +3546,1.018 +3547,-2.004 +3548,-0.962 +3549,-1.324 +3550,-0.245 +3551,1.399 +3552,-1.560 +3553,1.913 +3554,-1.034 +3555,-2.233 +3556,-0.197 +3557,1.044 +3558,0.743 +3559,0.781 +3560,1.608 +3561,-0.200 +3562,2.031 +3563,0.932 +3564,0.194 +3565,-0.684 +3566,-1.578 +3567,-1.610 +3568,-0.730 +3569,0.720 +3570,-1.118 +3571,0.190 +3572,0.869 +3573,0.216 +3574,-0.133 +3575,-0.095 +3576,-0.913 +3577,0.069 +3578,-1.739 +3579,-0.776 +3580,0.376 +3581,-0.629 +3582,1.142 +3583,-0.820 +3584,0.411 +3585,0.577 +3586,0.156 +3587,0.877 +3588,-1.502 +3589,0.209 +3590,-0.377 +3591,0.137 +3592,-0.969 +3593,0.713 +3594,2.150 +3595,-0.735 +3596,-0.865 +3597,-1.644 +3598,-1.146 +3599,-0.531 +3600,0.266 +3601,-0.305 +3602,-0.264 +3603,-0.261 +3604,0.513 +3605,-0.182 +3606,0.529 +3607,-0.852 +3608,-0.719 +3609,-1.367 +3610,-0.706 +3611,-0.003 +3612,1.403 +3613,-0.794 +3614,0.765 +3615,1.264 +3616,1.658 +3617,0.681 +3618,-1.285 +3619,-0.415 +3620,0.334 +3621,0.158 +3622,-0.797 +3623,0.596 +3624,-0.372 +3625,0.761 +3626,0.390 +3627,-0.795 +3628,0.061 +3629,0.726 +3630,0.135 +3631,0.463 +3632,-0.900 +3633,-0.919 +3634,-0.404 +3635,-0.096 +3636,-0.085 +3637,1.333 +3638,0.737 +3639,0.773 +3640,-0.391 +3641,0.740 +3642,-0.955 +3643,0.536 +3644,-0.241 +3645,-0.573 +3646,0.675 +3647,-1.213 +3648,-0.357 +3649,-0.956 +3650,-0.758 +3651,-0.187 +3652,-0.764 +3653,0.210 +3654,0.003 +3655,0.347 +3656,-0.637 +3657,0.032 +3658,0.191 +3659,-0.059 +3660,0.825 +3661,1.680 +3662,-0.355 +3663,0.230 +3664,-0.515 +3665,-0.726 +3666,-0.766 +3667,0.832 +3668,1.375 +3669,1.748 +3670,0.910 +3671,0.140 +3672,-1.101 +3673,-1.167 +3674,1.303 +3675,-0.090 +3676,0.811 +3677,-1.582 +3678,-2.974 +3679,1.308 +3680,1.344 +3681,0.666 +3682,0.688 +3683,0.580 +3684,-0.133 +3685,-0.173 +3686,1.034 +3687,1.205 +3688,-0.273 +3689,-0.231 +3690,-0.865 +3691,1.581 +3692,-0.027 +3693,-0.369 +3694,1.449 +3695,-0.624 +3696,-0.345 +3697,0.277 +3698,0.030 +3699,-0.106 +3700,0.116 +3701,-2.018 +3702,0.772 +3703,-1.259 +3704,0.302 +3705,-1.336 +3706,-1.331 +3707,-0.819 +3708,0.469 +3709,-0.305 +3710,0.360 +3711,0.429 +3712,0.455 +3713,-0.110 +3714,1.231 +3715,2.108 +3716,2.306 +3717,0.617 +3718,0.184 +3719,-0.014 +3720,0.192 +3721,0.218 +3722,-3.141 +3723,0.637 +3724,-1.241 +3725,-0.758 +3726,-1.179 +3727,0.462 +3728,0.530 +3729,-0.383 +3730,-1.827 +3731,-0.657 +3732,0.237 +3733,-0.602 +3734,1.970 +3735,1.881 +3736,-0.210 +3737,-1.458 +3738,-2.229 +3739,0.064 +3740,-1.316 +3741,1.965 +3742,0.805 +3743,-0.066 +3744,1.939 +3745,-0.924 +3746,-0.099 +3747,0.641 +3748,0.469 +3749,-1.158 +3750,-0.673 +3751,-1.353 +3752,0.134 +3753,1.613 +3754,0.271 +3755,-0.013 +3756,0.383 +3757,-0.744 +3758,-1.475 +3759,1.421 +3760,-1.253 +3761,-0.385 +3762,0.163 +3763,-1.441 +3764,0.717 +3765,1.422 +3766,1.213 +3767,-0.715 +3768,-0.203 +3769,-0.341 +3770,-1.019 +3771,0.274 +3772,-0.579 +3773,-0.972 +3774,1.111 +3775,1.512 +3776,1.083 +3777,0.494 +3778,-0.833 +3779,0.803 +3780,0.595 +3781,-0.123 +3782,1.021 +3783,-2.106 +3784,0.753 +3785,-0.950 +3786,0.769 +3787,-1.233 +3788,0.717 +3789,0.947 +3790,1.023 +3791,0.331 +3792,1.250 +3793,-0.929 +3794,-1.871 +3795,-0.438 +3796,1.231 +3797,-0.999 +3798,-0.487 +3799,0.430 +3800,-0.617 +3801,0.096 +3802,0.350 +3803,-0.423 +3804,1.918 +3805,-0.254 +3806,-0.182 +3807,-1.020 +3808,1.284 +3809,1.924 +3810,0.489 +3811,-1.070 +3812,0.474 +3813,-1.777 +3814,-1.152 +3815,-1.395 +3816,1.484 +3817,0.539 +3818,-0.759 +3819,-0.261 +3820,-0.124 +3821,1.108 +3822,0.027 +3823,-2.300 +3824,-0.173 +3825,1.249 +3826,-0.672 +3827,-0.979 +3828,-1.823 +3829,-1.544 +3830,1.191 +3831,-1.928 +3832,-0.437 +3833,1.767 +3834,-0.143 +3835,-0.001 +3836,-0.205 +3837,-1.373 +3838,0.368 +3839,0.450 +3840,-0.262 +3841,0.295 +3842,0.754 +3843,0.208 +3844,0.544 +3845,-0.100 +3846,-0.727 +3847,0.377 +3848,0.487 +3849,-0.633 +3850,1.392 +3851,0.643 +3852,-2.186 +3853,-1.701 +3854,-0.434 +3855,-0.079 +3856,-0.067 +3857,0.774 +3858,0.916 +3859,1.117 +3860,-0.240 +3861,-0.857 +3862,1.786 +3863,1.434 +3864,0.882 +3865,-1.608 +3866,-1.285 +3867,-0.066 +3868,0.708 +3869,-1.493 +3870,0.072 +3871,-1.040 +3872,1.095 +3873,-1.564 +3874,-1.710 +3875,0.077 +3876,0.413 +3877,1.671 +3878,-0.730 +3879,0.291 +3880,0.466 +3881,-0.291 +3882,-2.048 +3883,0.461 +3884,-0.173 +3885,-1.038 +3886,-0.800 +3887,-2.004 +3888,-0.030 +3889,1.020 +3890,0.698 +3891,0.167 +3892,0.099 +3893,0.679 +3894,0.056 +3895,0.922 +3896,1.337 +3897,2.084 +3898,0.320 +3899,0.082 +3900,-0.716 +3901,0.284 +3902,-0.791 +3903,-0.041 +3904,1.990 +3905,-0.262 +3906,1.349 +3907,-1.401 +3908,0.239 +3909,0.922 +3910,0.981 +3911,0.519 +3912,-0.858 +3913,-1.902 +3914,0.008 +3915,-0.536 +3916,-0.884 +3917,0.344 +3918,-0.182 +3919,0.240 +3920,1.576 +3921,1.364 +3922,1.499 +3923,-2.301 +3924,0.665 +3925,-0.571 +3926,-1.129 +3927,1.415 +3928,-1.426 +3929,0.269 +3930,0.898 +3931,0.919 +3932,-0.684 +3933,-1.183 +3934,-1.350 +3935,1.559 +3936,-0.827 +3937,0.057 +3938,-1.214 +3939,0.583 +3940,-0.409 +3941,0.052 +3942,-0.505 +3943,0.359 +3944,-0.025 +3945,0.153 +3946,-0.639 +3947,0.444 +3948,0.091 +3949,-0.089 +3950,0.886 +3951,-1.268 +3952,-1.516 +3953,0.353 +3954,0.248 +3955,0.469 +3956,-0.396 +3957,-0.546 +3958,-1.077 +3959,0.627 +3960,-1.439 +3961,0.300 +3962,2.044 +3963,0.422 +3964,0.130 +3965,-1.405 +3966,-1.248 +3967,-2.241 +3968,2.791 +3969,0.993 +3970,0.827 +3971,-1.511 +3972,-0.280 +3973,1.843 +3974,2.996 +3975,0.478 +3976,0.726 +3977,-0.975 +3978,0.015 +3979,-1.920 +3980,-0.966 +3981,2.400 +3982,-0.108 +3983,-0.684 +3984,-0.116 +3985,0.346 +3986,-0.725 +3987,-0.445 +3988,-0.721 +3989,0.177 +3990,0.726 +3991,-0.991 +3992,-0.941 +3993,-0.974 +3994,1.890 +3995,-0.511 +3996,-1.020 +3997,-1.192 +3998,0.691 +3999,0.004 +4000,0.894 +4001,-0.140 +4002,-1.885 +4003,-0.223 +4004,-1.787 +4005,0.026 +4006,-1.551 +4007,0.841 +4008,-2.441 +4009,-0.009 +4010,-0.459 +4011,-0.512 +4012,-1.693 +4013,-1.204 +4014,1.133 +4015,-0.970 +4016,-0.017 +4017,0.310 +4018,-2.722 +4019,-0.770 +4020,-1.166 +4021,-0.411 +4022,-0.005 +4023,0.258 +4024,-2.030 +4025,0.480 +4026,0.941 +4027,-2.232 +4028,-0.230 +4029,-0.271 +4030,-0.597 +4031,-1.541 +4032,-0.947 +4033,-1.078 +4034,1.763 +4035,1.883 +4036,0.923 +4037,0.799 +4038,0.510 +4039,1.012 +4040,0.761 +4041,-0.377 +4042,-2.167 +4043,-0.387 +4044,-0.159 +4045,0.943 +4046,0.545 +4047,-1.085 +4048,-1.254 +4049,1.092 +4050,-1.650 +4051,-0.827 +4052,-0.439 +4053,0.594 +4054,1.533 +4055,-0.236 +4056,-0.614 +4057,0.835 +4058,2.023 +4059,1.235 +4060,-0.545 +4061,0.993 +4062,-0.424 +4063,-0.439 +4064,1.199 +4065,0.667 +4066,-0.729 +4067,-0.558 +4068,-0.952 +4069,-0.732 +4070,-0.153 +4071,0.441 +4072,0.693 +4073,-0.553 +4074,1.008 +4075,0.869 +4076,0.214 +4077,0.096 +4078,0.593 +4079,0.872 +4080,-1.303 +4081,0.083 +4082,0.710 +4083,-0.939 +4084,-0.972 +4085,-1.600 +4086,1.196 +4087,-0.178 +4088,0.066 +4089,-0.264 +4090,-0.406 +4091,0.663 +4092,0.215 +4093,0.057 +4094,-0.888 +4095,0.280 +4096,1.767 +4097,2.702 +4098,-1.201 +4099,1.756 +4100,-1.925 +4101,0.011 +4102,0.379 +4103,-0.032 +4104,-1.109 +4105,0.284 +4106,-0.643 +4107,-0.370 +4108,0.060 +4109,0.870 +4110,0.156 +4111,-1.676 +4112,0.868 +4113,0.670 +4114,1.382 +4115,0.935 +4116,-0.542 +4117,-0.199 +4118,-0.458 +4119,0.479 +4120,1.010 +4121,0.271 +4122,1.743 +4123,0.493 +4124,0.135 +4125,2.335 +4126,-1.128 +4127,-0.549 +4128,-0.214 +4129,0.225 +4130,-0.959 +4131,0.497 +4132,-0.218 +4133,1.739 +4134,0.366 +4135,-0.010 +4136,0.315 +4137,1.534 +4138,-1.374 +4139,-0.269 +4140,-0.268 +4141,-0.172 +4142,-0.511 +4143,0.305 +4144,-3.455 +4145,-0.627 +4146,1.006 +4147,-0.321 +4148,-0.145 +4149,0.765 +4150,0.534 +4151,2.237 +4152,0.383 +4153,1.567 +4154,0.708 +4155,-0.244 +4156,-1.058 +4157,-1.353 +4158,1.421 +4159,-0.999 +4160,-1.134 +4161,0.202 +4162,0.079 +4163,-0.106 +4164,-0.622 +4165,0.629 +4166,-1.662 +4167,1.124 +4168,-0.095 +4169,0.942 +4170,0.336 +4171,-0.914 +4172,1.856 +4173,0.179 +4174,-0.856 +4175,0.549 +4176,-1.222 +4177,-0.350 +4178,1.570 +4179,-0.582 +4180,-1.092 +4181,0.880 +4182,-0.052 +4183,0.666 +4184,1.590 +4185,0.238 +4186,-1.581 +4187,0.206 +4188,0.441 +4189,0.671 +4190,0.594 +4191,0.318 +4192,-0.440 +4193,-0.952 +4194,0.699 +4195,0.204 +4196,-0.025 +4197,0.247 +4198,-0.664 +4199,-2.333 +4200,1.141 +4201,-0.449 +4202,-0.828 +4203,-1.633 +4204,-0.332 +4205,-0.420 +4206,0.164 +4207,0.796 +4208,-0.185 +4209,-1.215 +4210,1.460 +4211,0.913 +4212,0.989 +4213,0.810 +4214,-0.769 +4215,-2.570 +4216,3.435 +4217,1.402 +4218,0.246 +4219,-0.762 +4220,0.611 +4221,-1.827 +4222,-0.462 +4223,0.875 +4224,1.976 +4225,-0.992 +4226,-0.103 +4227,0.152 +4228,1.453 +4229,0.115 +4230,-0.540 +4231,0.457 +4232,-0.390 +4233,1.818 +4234,0.080 +4235,-0.655 +4236,-1.168 +4237,1.325 +4238,0.237 +4239,1.078 +4240,0.538 +4241,1.085 +4242,-0.569 +4243,-1.645 +4244,1.201 +4245,-0.500 +4246,-1.451 +4247,-0.344 +4248,0.917 +4249,-0.423 +4250,-1.144 +4251,-1.261 +4252,0.964 +4253,0.151 +4254,0.697 +4255,-0.406 +4256,0.812 +4257,-0.191 +4258,-1.218 +4259,0.098 +4260,1.251 +4261,-0.179 +4262,0.926 +4263,-0.961 +4264,-0.839 +4265,-1.967 +4266,0.013 +4267,-0.495 +4268,-2.017 +4269,-1.024 +4270,1.609 +4271,0.909 +4272,0.426 +4273,0.759 +4274,0.037 +4275,-0.009 +4276,0.245 +4277,0.640 +4278,-0.311 +4279,2.247 +4280,-1.222 +4281,-1.401 +4282,1.007 +4283,-1.152 +4284,1.545 +4285,1.445 +4286,0.296 +4287,-1.350 +4288,-0.181 +4289,-0.632 +4290,1.195 +4291,0.148 +4292,0.712 +4293,-0.905 +4294,-1.179 +4295,-0.359 +4296,-1.053 +4297,1.010 +4298,1.086 +4299,-0.112 +4300,-0.333 +4301,0.409 +4302,-0.895 +4303,-1.280 +4304,-0.666 +4305,-1.722 +4306,-0.751 +4307,-0.532 +4308,2.070 +4309,-0.936 +4310,-0.340 +4311,0.332 +4312,-1.642 +4313,0.885 +4314,0.868 +4315,-1.333 +4316,0.768 +4317,1.267 +4318,-1.422 +4319,-1.177 +4320,0.840 +4321,-1.071 +4322,0.242 +4323,0.573 +4324,-0.882 +4325,-2.103 +4326,-0.202 +4327,0.106 +4328,-1.761 +4329,-0.955 +4330,-1.332 +4331,-0.079 +4332,-0.792 +4333,0.368 +4334,-0.631 +4335,-0.398 +4336,0.860 +4337,0.700 +4338,-3.044 +4339,0.592 +4340,-0.402 +4341,-0.583 +4342,0.614 +4343,1.128 +4344,-1.542 +4345,0.264 +4346,1.453 +4347,0.386 +4348,0.553 +4349,-0.207 +4350,-1.251 +4351,0.827 +4352,0.834 +4353,1.522 +4354,0.179 +4355,3.207 +4356,0.083 +4357,-0.808 +4358,-1.072 +4359,-0.828 +4360,-0.221 +4361,0.829 +4362,0.345 +4363,-0.433 +4364,-1.087 +4365,0.889 +4366,-0.609 +4367,-0.094 +4368,1.212 +4369,1.344 +4370,2.545 +4371,-0.233 +4372,-1.151 +4373,-0.487 +4374,-0.405 +4375,0.897 +4376,-0.412 +4377,0.442 +4378,1.736 +4379,-0.197 +4380,-0.036 +4381,-2.117 +4382,-0.324 +4383,0.791 +4384,0.494 +4385,0.033 +4386,-0.461 +4387,-0.219 +4388,-1.356 +4389,0.829 +4390,-0.415 +4391,0.641 +4392,-0.034 +4393,1.535 +4394,0.583 +4395,0.769 +4396,1.057 +4397,-0.001 +4398,-0.250 +4399,1.423 +4400,0.134 +4401,-1.078 +4402,-0.052 +4403,0.407 +4404,-0.379 +4405,0.353 +4406,-1.046 +4407,-0.047 +4408,1.029 +4409,3.578 +4410,0.112 +4411,0.298 +4412,-0.263 +4413,-0.208 +4414,1.266 +4415,-0.544 +4416,0.107 +4417,1.305 +4418,-0.706 +4419,0.592 +4420,-1.768 +4421,-0.590 +4422,-0.902 +4423,1.452 +4424,1.386 +4425,-1.308 +4426,-0.590 +4427,-1.275 +4428,-0.514 +4429,1.424 +4430,1.948 +4431,-0.186 +4432,1.433 +4433,-1.022 +4434,-0.086 +4435,0.694 +4436,-0.686 +4437,0.961 +4438,-0.847 +4439,0.509 +4440,0.281 +4441,0.571 +4442,0.824 +4443,-0.255 +4444,-1.202 +4445,1.154 +4446,-0.845 +4447,1.298 +4448,1.225 +4449,0.336 +4450,0.350 +4451,-0.566 +4452,0.822 +4453,1.709 +4454,0.086 +4455,-0.886 +4456,0.424 +4457,-2.671 +4458,0.065 +4459,-0.232 +4460,-1.868 +4461,-0.153 +4462,-0.819 +4463,0.073 +4464,1.186 +4465,-0.139 +4466,-2.133 +4467,-0.035 +4468,-1.795 +4469,0.618 +4470,0.074 +4471,0.678 +4472,0.378 +4473,0.726 +4474,-0.029 +4475,-0.918 +4476,-0.683 +4477,-0.402 +4478,-0.477 +4479,-1.233 +4480,0.055 +4481,1.820 +4482,-0.636 +4483,2.139 +4484,-1.418 +4485,0.454 +4486,-0.204 +4487,-1.775 +4488,-1.518 +4489,0.011 +4490,0.098 +4491,-0.402 +4492,-0.183 +4493,-1.980 +4494,-0.423 +4495,-1.502 +4496,1.340 +4497,-0.239 +4498,-1.303 +4499,-0.050 +4500,-0.411 +4501,0.173 +4502,0.006 +4503,2.652 +4504,0.444 +4505,2.107 +4506,0.119 +4507,0.731 +4508,-0.064 +4509,0.004 +4510,-0.725 +4511,0.120 +4512,-0.553 +4513,-0.963 +4514,0.187 +4515,-0.924 +4516,-2.668 +4517,-1.223 +4518,-2.151 +4519,0.713 +4520,0.805 +4521,-0.276 +4522,-2.170 +4523,0.886 +4524,1.019 +4525,0.480 +4526,0.417 +4527,0.062 +4528,-0.498 +4529,0.292 +4530,0.872 +4531,0.625 +4532,0.458 +4533,-0.208 +4534,0.956 +4535,0.557 +4536,0.160 +4537,0.240 +4538,-0.365 +4539,-0.230 +4540,-0.069 +4541,1.852 +4542,-0.133 +4543,-0.906 +4544,0.031 +4545,-0.571 +4546,0.221 +4547,-0.171 +4548,-1.350 +4549,-1.411 +4550,-0.040 +4551,-0.358 +4552,-0.748 +4553,-0.909 +4554,-0.038 +4555,0.326 +4556,-0.818 +4557,0.821 +4558,0.249 +4559,0.620 +4560,-1.579 +4561,0.471 +4562,1.649 +4563,0.157 +4564,0.574 +4565,1.029 +4566,-0.385 +4567,0.175 +4568,-0.141 +4569,-0.419 +4570,-0.450 +4571,0.031 +4572,-0.071 +4573,-0.459 +4574,1.248 +4575,0.194 +4576,1.725 +4577,-1.021 +4578,-0.363 +4579,1.141 +4580,-1.072 +4581,-1.251 +4582,-0.333 +4583,-0.509 +4584,-0.465 +4585,0.096 +4586,0.928 +4587,0.445 +4588,-0.199 +4589,-1.152 +4590,0.788 +4591,0.272 +4592,0.371 +4593,-0.872 +4594,0.877 +4595,-0.587 +4596,-1.124 +4597,-0.497 +4598,0.311 +4599,-0.294 +4600,-1.101 +4601,-1.090 +4602,1.053 +4603,-0.171 +4604,1.861 +4605,1.014 +4606,-0.744 +4607,-0.884 +4608,-0.232 +4609,-1.529 +4610,-0.242 +4611,1.516 +4612,0.717 +4613,0.287 +4614,-0.058 +4615,-0.029 +4616,-0.510 +4617,0.374 +4618,-1.882 +4619,-0.378 +4620,2.378 +4621,-0.409 +4622,0.018 +4623,-0.127 +4624,0.445 +4625,-0.161 +4626,0.378 +4627,0.067 +4628,0.578 +4629,-1.472 +4630,1.373 +4631,-1.027 +4632,0.007 +4633,0.880 +4634,1.311 +4635,-1.207 +4636,2.117 +4637,1.447 +4638,0.257 +4639,-0.505 +4640,0.432 +4641,1.043 +4642,-0.129 +4643,0.458 +4644,-1.801 +4645,0.629 +4646,-1.534 +4647,-2.028 +4648,0.975 +4649,-1.865 +4650,0.426 +4651,-1.000 +4652,2.005 +4653,0.563 +4654,-0.290 +4655,0.691 +4656,3.057 +4657,-0.606 +4658,-0.404 +4659,0.409 +4660,1.644 +4661,0.821 +4662,0.637 +4663,-0.086 +4664,-0.781 +4665,0.641 +4666,0.473 +4667,-0.609 +4668,-0.322 +4669,-0.748 +4670,-2.840 +4671,1.859 +4672,-0.352 +4673,-1.001 +4674,0.091 +4675,-1.116 +4676,-0.476 +4677,-0.364 +4678,-0.119 +4679,-1.737 +4680,0.926 +4681,0.509 +4682,-1.406 +4683,0.646 +4684,-1.190 +4685,-3.336 +4686,-1.557 +4687,-0.514 +4688,-0.777 +4689,-0.536 +4690,-1.416 +4691,-1.312 +4692,-2.028 +4693,0.813 +4694,-0.210 +4695,-1.115 +4696,-0.495 +4697,-0.020 +4698,-0.965 +4699,0.488 +4700,-0.327 +4701,-0.768 +4702,-0.401 +4703,-1.438 +4704,0.747 +4705,-1.661 +4706,-0.712 +4707,0.873 +4708,1.343 +4709,0.336 +4710,1.289 +4711,0.913 +4712,-0.001 +4713,0.922 +4714,-0.142 +4715,-0.554 +4716,2.329 +4717,-1.672 +4718,0.020 +4719,0.141 +4720,1.568 +4721,0.467 +4722,1.112 +4723,-1.568 +4724,2.167 +4725,0.140 +4726,-0.250 +4727,-0.053 +4728,-1.199 +4729,-0.667 +4730,-0.854 +4731,-1.245 +4732,1.700 +4733,0.371 +4734,-1.152 +4735,0.583 +4736,-0.606 +4737,2.058 +4738,0.004 +4739,-0.472 +4740,0.179 +4741,-0.573 +4742,-0.767 +4743,1.907 +4744,0.087 +4745,-0.756 +4746,0.704 +4747,0.964 +4748,-0.398 +4749,-1.589 +4750,1.453 +4751,-0.109 +4752,0.080 +4753,0.339 +4754,0.953 +4755,-1.005 +4756,0.228 +4757,-1.884 +4758,0.266 +4759,-0.109 +4760,0.178 +4761,0.440 +4762,1.423 +4763,1.045 +4764,0.715 +4765,-0.022 +4766,0.916 +4767,-0.032 +4768,-0.231 +4769,1.743 +4770,0.093 +4771,0.306 +4772,-1.005 +4773,0.623 +4774,-0.358 +4775,0.848 +4776,-1.899 +4777,-1.278 +4778,0.064 +4779,-0.267 +4780,0.384 +4781,-0.288 +4782,0.649 +4783,-0.861 +4784,1.349 +4785,-0.331 +4786,0.071 +4787,0.792 +4788,0.216 +4789,0.014 +4790,-0.796 +4791,2.259 +4792,-0.350 +4793,-0.944 +4794,1.349 +4795,0.841 +4796,1.017 +4797,-0.243 +4798,-0.911 +4799,-1.105 +4800,-2.268 +4801,-0.142 +4802,-0.723 +4803,0.510 +4804,0.604 +4805,0.888 +4806,-0.150 +4807,0.607 +4808,0.089 +4809,0.566 +4810,0.069 +4811,-1.121 +4812,-0.997 +4813,0.338 +4814,-0.501 +4815,-2.840 +4816,-1.424 +4817,1.195 +4818,-0.898 +4819,0.315 +4820,-0.458 +4821,2.506 +4822,0.002 +4823,-0.574 +4824,-1.249 +4825,0.030 +4826,-1.122 +4827,1.203 +4828,-0.324 +4829,0.554 +4830,-0.588 +4831,-0.473 +4832,1.415 +4833,0.713 +4834,1.974 +4835,-1.192 +4836,1.158 +4837,-0.216 +4838,0.334 +4839,0.003 +4840,-0.300 +4841,0.366 +4842,-0.783 +4843,1.349 +4844,-0.875 +4845,0.810 +4846,0.537 +4847,2.264 +4848,-2.158 +4849,0.254 +4850,-1.834 +4851,0.456 +4852,2.232 +4853,1.620 +4854,-0.999 +4855,1.909 +4856,1.411 +4857,-0.808 +4858,0.492 +4859,0.987 +4860,-1.199 +4861,0.300 +4862,0.248 +4863,-0.484 +4864,0.915 +4865,0.648 +4866,-0.560 +4867,0.121 +4868,0.354 +4869,-0.134 +4870,0.720 +4871,0.268 +4872,1.897 +4873,-1.084 +4874,0.127 +4875,0.883 +4876,0.568 +4877,1.432 +4878,-0.839 +4879,0.778 +4880,-0.516 +4881,-0.128 +4882,0.929 +4883,-0.751 +4884,0.009 +4885,-1.143 +4886,0.270 +4887,-1.165 +4888,0.344 +4889,-0.210 +4890,-1.404 +4891,0.729 +4892,0.014 +4893,-0.819 +4894,0.781 +4895,-1.083 +4896,-0.672 +4897,0.365 +4898,1.009 +4899,-0.535 +4900,-0.961 +4901,0.042 +4902,1.070 +4903,-0.063 +4904,0.971 +4905,0.322 +4906,-1.113 +4907,-0.729 +4908,0.382 +4909,-1.281 +4910,1.037 +4911,-0.380 +4912,-0.476 +4913,-0.428 +4914,0.192 +4915,1.960 +4916,-1.366 +4917,0.623 +4918,1.377 +4919,-1.035 +4920,1.107 +4921,0.911 +4922,0.943 +4923,-1.261 +4924,0.426 +4925,0.524 +4926,0.029 +4927,-0.491 +4928,-0.194 +4929,0.263 +4930,0.053 +4931,-0.248 +4932,-0.590 +4933,0.586 +4934,0.628 +4935,0.601 +4936,-0.498 +4937,-0.691 +4938,0.552 +4939,0.817 +4940,0.395 +4941,1.356 +4942,1.312 +4943,-0.349 +4944,-0.333 +4945,-0.258 +4946,1.230 +4947,0.636 +4948,-0.716 +4949,1.488 +4950,2.110 +4951,0.216 +4952,0.356 +4953,0.835 +4954,-1.535 +4955,0.148 +4956,1.406 +4957,0.274 +4958,1.828 +4959,-0.558 +4960,-0.989 +4961,1.390 +4962,0.837 +4963,0.242 +4964,0.069 +4965,1.573 +4966,-0.330 +4967,0.450 +4968,0.168 +4969,-0.190 +4970,-0.076 +4971,-0.338 +4972,-0.590 +4973,0.502 +4974,-0.379 +4975,-1.745 +4976,0.049 +4977,-0.767 +4978,0.599 +4979,-0.090 +4980,0.918 +4981,-0.872 +4982,2.531 +4983,0.294 +4984,-1.089 +4985,0.674 +4986,-0.890 +4987,0.923 +4988,0.205 +4989,0.597 +4990,0.244 +4991,-0.887 +4992,1.106 +4993,-2.654 +4994,-1.168 +4995,1.722 +4996,-0.275 +4997,-0.070 +4998,-1.482 +4999,1.460 +5000,0.286 +5001,1.259 +5002,1.298 +5003,-1.428 +5004,1.019 +5005,0.186 +5006,0.360 +5007,0.929 +5008,0.094 +5009,0.352 +5010,-0.800 +5011,0.646 +5012,0.984 +5013,0.106 +5014,-0.237 +5015,0.399 +5016,-0.951 +5017,-0.725 +5018,0.698 +5019,0.415 +5020,1.684 +5021,0.290 +5022,-0.687 +5023,-0.049 +5024,0.268 +5025,-2.255 +5026,0.015 +5027,-0.022 +5028,-0.158 +5029,0.039 +5030,-0.164 +5031,0.838 +5032,-0.004 +5033,2.620 +5034,-0.656 +5035,-0.575 +5036,-0.614 +5037,-1.146 +5038,0.333 +5039,-0.586 +5040,-0.335 +5041,-0.446 +5042,-0.501 +5043,-0.217 +5044,0.301 +5045,0.757 +5046,1.994 +5047,0.422 +5048,1.663 +5049,1.719 +5050,-0.523 +5051,1.214 +5052,-0.131 +5053,-0.091 +5054,0.381 +5055,-0.665 +5056,1.622 +5057,0.658 +5058,0.391 +5059,-0.332 +5060,-0.766 +5061,0.172 +5062,-0.356 +5063,1.042 +5064,1.635 +5065,0.706 +5066,1.604 +5067,-0.564 +5068,1.526 +5069,0.493 +5070,-0.961 +5071,0.491 +5072,0.224 +5073,-0.784 +5074,-1.020 +5075,2.088 +5076,-1.489 +5077,0.224 +5078,-0.001 +5079,0.379 +5080,-0.977 +5081,0.821 +5082,0.216 +5083,-1.306 +5084,2.544 +5085,-1.309 +5086,0.702 +5087,1.215 +5088,0.201 +5089,1.007 +5090,0.962 +5091,-1.295 +5092,0.476 +5093,-0.372 +5094,-1.645 +5095,-1.406 +5096,-1.107 +5097,-0.595 +5098,0.324 +5099,1.044 +5100,-0.795 +5101,-1.774 +5102,-1.118 +5103,-0.608 +5104,0.878 +5105,1.012 +5106,-0.478 +5107,1.609 +5108,-0.980 +5109,1.464 +5110,-3.452 +5111,-0.258 +5112,-0.579 +5113,0.497 +5114,-0.532 +5115,-1.782 +5116,-1.944 +5117,0.400 +5118,-0.795 +5119,0.946 +5120,-0.552 +5121,0.212 +5122,-1.392 +5123,-0.414 +5124,0.092 +5125,0.450 +5126,0.703 +5127,0.803 +5128,-1.600 +5129,-1.343 +5130,1.256 +5131,0.582 +5132,-0.141 +5133,0.002 +5134,-0.358 +5135,-1.214 +5136,-0.928 +5137,-0.619 +5138,-0.652 +5139,0.463 +5140,-0.299 +5141,-0.143 +5142,-0.160 +5143,-1.923 +5144,-1.021 +5145,-1.853 +5146,-2.276 +5147,-0.571 +5148,-0.694 +5149,0.468 +5150,1.607 +5151,1.157 +5152,0.888 +5153,-1.106 +5154,1.066 +5155,1.121 +5156,0.957 +5157,0.113 +5158,0.718 +5159,1.059 +5160,0.747 +5161,0.743 +5162,1.015 +5163,0.764 +5164,-0.561 +5165,-0.289 +5166,1.944 +5167,-0.487 +5168,1.999 +5169,-1.642 +5170,-1.426 +5171,-0.740 +5172,-0.364 +5173,-0.413 +5174,0.225 +5175,-1.018 +5176,0.192 +5177,-0.989 +5178,-0.322 +5179,0.011 +5180,-0.582 +5181,-0.407 +5182,1.595 +5183,0.929 +5184,0.880 +5185,1.672 +5186,1.136 +5187,0.463 +5188,-1.030 +5189,-0.861 +5190,0.080 +5191,-1.431 +5192,1.131 +5193,-1.103 +5194,1.064 +5195,-0.055 +5196,0.388 +5197,1.932 +5198,-0.719 +5199,1.485 +5200,-0.022 +5201,1.274 +5202,1.104 +5203,-0.727 +5204,-0.939 +5205,-0.252 +5206,-0.891 +5207,0.278 +5208,0.862 +5209,-1.140 +5210,0.761 +5211,-0.265 +5212,-0.532 +5213,1.361 +5214,0.851 +5215,-2.721 +5216,-0.347 +5217,-0.203 +5218,0.360 +5219,0.318 +5220,-1.099 +5221,-0.504 +5222,-0.891 +5223,-0.044 +5224,1.475 +5225,2.050 +5226,-0.232 +5227,-1.496 +5228,0.377 +5229,-0.123 +5230,-1.131 +5231,-0.739 +5232,-0.647 +5233,-0.972 +5234,-2.660 +5235,-1.974 +5236,0.289 +5237,-0.371 +5238,0.952 +5239,-1.921 +5240,0.907 +5241,-0.819 +5242,-2.045 +5243,-1.088 +5244,0.245 +5245,0.050 +5246,-1.824 +5247,-0.861 +5248,-0.087 +5249,0.217 +5250,0.361 +5251,-0.857 +5252,0.584 +5253,-0.128 +5254,-0.242 +5255,1.846 +5256,-0.156 +5257,-0.137 +5258,-1.521 +5259,-1.249 +5260,0.782 +5261,1.157 +5262,-0.896 +5263,1.729 +5264,-0.621 +5265,-0.384 +5266,-0.539 +5267,0.401 +5268,-0.020 +5269,-2.751 +5270,-0.948 +5271,0.448 +5272,0.445 +5273,-1.006 +5274,0.142 +5275,0.186 +5276,0.743 +5277,2.003 +5278,-0.181 +5279,1.388 +5280,-2.001 +5281,-0.130 +5282,-0.250 +5283,0.400 +5284,1.109 +5285,0.207 +5286,-0.136 +5287,-3.473 +5288,-0.820 +5289,-1.906 +5290,-2.850 +5291,1.200 +5292,0.177 +5293,-2.362 +5294,-1.316 +5295,-0.119 +5296,-1.079 +5297,-0.254 +5298,-0.418 +5299,0.045 +5300,-0.800 +5301,0.340 +5302,2.762 +5303,-0.124 +5304,-0.406 +5305,-1.604 +5306,-1.669 +5307,0.329 +5308,-0.661 +5309,-0.147 +5310,-1.802 +5311,0.415 +5312,-0.034 +5313,-0.139 +5314,0.911 +5315,-0.058 +5316,0.235 +5317,-0.401 +5318,-2.120 +5319,1.264 +5320,1.867 +5321,0.377 +5322,-0.087 +5323,-1.076 +5324,-1.043 +5325,1.498 +5326,0.904 +5327,0.117 +5328,-0.869 +5329,0.538 +5330,-1.232 +5331,2.312 +5332,-0.300 +5333,-0.600 +5334,1.623 +5335,-0.992 +5336,0.525 +5337,1.005 +5338,-0.149 +5339,1.324 +5340,0.629 +5341,2.224 +5342,-0.631 +5343,-0.634 +5344,-0.658 +5345,-0.014 +5346,1.461 +5347,-0.015 +5348,0.819 +5349,0.824 +5350,0.598 +5351,-0.274 +5352,1.856 +5353,0.371 +5354,0.182 +5355,-1.338 +5356,0.976 +5357,0.373 +5358,0.592 +5359,0.630 +5360,-1.217 +5361,-1.232 +5362,-1.349 +5363,0.286 +5364,0.475 +5365,1.122 +5366,-1.834 +5367,1.604 +5368,0.437 +5369,0.502 +5370,-1.548 +5371,-1.117 +5372,-0.838 +5373,1.482 +5374,-0.644 +5375,-0.766 +5376,-0.363 +5377,-0.139 +5378,0.780 +5379,0.976 +5380,-1.065 +5381,-0.533 +5382,-2.888 +5383,1.019 +5384,-0.003 +5385,-1.984 +5386,-0.127 +5387,0.293 +5388,-0.238 +5389,0.697 +5390,0.130 +5391,0.272 +5392,1.290 +5393,-1.251 +5394,-0.171 +5395,0.573 +5396,-2.152 +5397,0.897 +5398,1.059 +5399,0.475 +5400,0.836 +5401,-0.125 +5402,-0.641 +5403,0.673 +5404,1.447 +5405,-0.027 +5406,-0.995 +5407,0.157 +5408,0.305 +5409,0.930 +5410,-1.156 +5411,0.392 +5412,0.732 +5413,1.043 +5414,-0.240 +5415,1.575 +5416,1.676 +5417,0.425 +5418,0.874 +5419,0.421 +5420,2.233 +5421,0.489 +5422,1.271 +5423,0.309 +5424,-0.122 +5425,-0.062 +5426,-0.766 +5427,-0.864 +5428,-0.223 +5429,0.153 +5430,0.604 +5431,1.132 +5432,-0.148 +5433,1.276 +5434,1.093 +5435,-0.045 +5436,0.927 +5437,1.959 +5438,0.643 +5439,-0.149 +5440,-0.550 +5441,0.981 +5442,-1.104 +5443,-0.870 +5444,-1.516 +5445,-0.030 +5446,-0.789 +5447,0.372 +5448,-0.680 +5449,0.979 +5450,0.759 +5451,-0.097 +5452,-0.166 +5453,0.127 +5454,0.010 +5455,0.019 +5456,1.291 +5457,0.287 +5458,-0.179 +5459,1.881 +5460,-2.376 +5461,0.334 +5462,0.939 +5463,0.146 +5464,1.580 +5465,-0.231 +5466,-0.280 +5467,0.598 +5468,-0.951 +5469,-0.681 +5470,0.563 +5471,1.890 +5472,-0.147 +5473,0.123 +5474,-1.623 +5475,0.283 +5476,0.738 +5477,0.913 +5478,-0.412 +5479,0.975 +5480,-0.852 +5481,0.784 +5482,-1.547 +5483,1.117 +5484,0.720 +5485,-0.258 +5486,0.067 +5487,-1.017 +5488,-1.032 +5489,1.748 +5490,0.526 +5491,-1.213 +5492,-1.797 +5493,0.631 +5494,-0.305 +5495,1.325 +5496,-0.191 +5497,-1.826 +5498,-0.035 +5499,-1.692 +5500,-0.041 +5501,0.688 +5502,0.330 +5503,0.276 +5504,-0.486 +5505,0.561 +5506,0.666 +5507,0.956 +5508,0.310 +5509,0.815 +5510,-1.677 +5511,-1.364 +5512,0.521 +5513,0.967 +5514,-0.267 +5515,-1.594 +5516,-0.592 +5517,1.005 +5518,1.817 +5519,0.642 +5520,0.798 +5521,-1.591 +5522,1.963 +5523,0.068 +5524,0.325 +5525,-0.282 +5526,0.886 +5527,0.964 +5528,-0.099 +5529,-0.297 +5530,0.581 +5531,0.725 +5532,-0.081 +5533,-0.568 +5534,0.826 +5535,-0.006 +5536,-1.533 +5537,-1.291 +5538,0.761 +5539,-1.878 +5540,-1.070 +5541,-0.664 +5542,-0.090 +5543,1.032 +5544,1.215 +5545,-0.297 +5546,0.492 +5547,-0.353 +5548,-0.316 +5549,-0.416 +5550,-0.126 +5551,0.402 +5552,0.609 +5553,0.954 +5554,0.917 +5555,0.446 +5556,0.133 +5557,-1.374 +5558,0.219 +5559,1.658 +5560,-0.597 +5561,-0.963 +5562,2.065 +5563,1.452 +5564,0.838 +5565,-1.081 +5566,-1.362 +5567,0.586 +5568,-1.958 +5569,-0.807 +5570,2.570 +5571,-0.689 +5572,2.495 +5573,0.727 +5574,-0.437 +5575,1.432 +5576,-0.050 +5577,-0.061 +5578,0.725 +5579,1.000 +5580,-0.357 +5581,-2.655 +5582,1.548 +5583,1.293 +5584,-1.148 +5585,-0.109 +5586,0.152 +5587,-0.121 +5588,0.120 +5589,-0.453 +5590,0.391 +5591,0.489 +5592,-0.437 +5593,1.961 +5594,0.333 +5595,-0.758 +5596,-0.058 +5597,0.726 +5598,0.132 +5599,-0.795 +5600,-0.316 +5601,0.360 +5602,1.345 +5603,1.338 +5604,-0.501 +5605,0.394 +5606,1.146 +5607,0.457 +5608,-1.346 +5609,-1.285 +5610,1.668 +5611,-2.496 +5612,-0.297 +5613,-0.382 +5614,0.064 +5615,-0.711 +5616,-0.241 +5617,0.578 +5618,0.717 +5619,-0.285 +5620,-0.951 +5621,-1.380 +5622,0.674 +5623,0.357 +5624,0.364 +5625,-1.162 +5626,-1.149 +5627,-1.249 +5628,-0.356 +5629,0.143 +5630,1.062 +5631,1.459 +5632,-1.380 +5633,0.416 +5634,2.649 +5635,0.383 +5636,-0.156 +5637,0.221 +5638,1.131 +5639,0.153 +5640,0.703 +5641,1.979 +5642,-0.146 +5643,0.973 +5644,-2.489 +5645,0.695 +5646,-1.232 +5647,0.787 +5648,0.622 +5649,0.019 +5650,-0.152 +5651,-0.204 +5652,-0.223 +5653,0.096 +5654,1.092 +5655,0.970 +5656,0.473 +5657,0.982 +5658,0.549 +5659,0.030 +5660,0.548 +5661,-0.079 +5662,1.344 +5663,0.383 +5664,-1.882 +5665,-0.086 +5666,1.204 +5667,1.612 +5668,-0.279 +5669,-2.077 +5670,0.264 +5671,0.081 +5672,0.867 +5673,-0.981 +5674,1.717 +5675,-0.841 +5676,-0.645 +5677,2.034 +5678,-1.278 +5679,0.152 +5680,-0.347 +5681,1.822 +5682,-2.682 +5683,2.088 +5684,1.387 +5685,-1.014 +5686,0.673 +5687,0.860 +5688,1.872 +5689,-0.348 +5690,-0.463 +5691,0.296 +5692,0.402 +5693,-0.438 +5694,0.167 +5695,0.775 +5696,0.439 +5697,0.643 +5698,-0.994 +5699,1.135 +5700,-1.800 +5701,-0.689 +5702,-0.707 +5703,-0.756 +5704,0.038 +5705,0.307 +5706,-1.286 +5707,-0.196 +5708,-0.124 +5709,2.267 +5710,1.410 +5711,-0.016 +5712,0.921 +5713,1.191 +5714,-0.198 +5715,-0.986 +5716,1.398 +5717,-0.054 +5718,0.737 +5719,-0.726 +5720,-0.212 +5721,2.120 +5722,0.930 +5723,0.335 +5724,-1.410 +5725,-0.992 +5726,0.742 +5727,-0.502 +5728,-0.949 +5729,0.091 +5730,0.296 +5731,-0.257 +5732,0.964 +5733,-0.319 +5734,-1.042 +5735,-0.858 +5736,1.409 +5737,0.038 +5738,-0.818 +5739,-0.322 +5740,-1.400 +5741,1.963 +5742,0.810 +5743,0.789 +5744,0.751 +5745,1.691 +5746,0.047 +5747,0.087 +5748,1.446 +5749,-0.065 +5750,-0.697 +5751,0.221 +5752,0.946 +5753,-1.610 +5754,-0.104 +5755,0.448 +5756,0.319 +5757,1.205 +5758,-0.420 +5759,-1.132 +5760,-0.048 +5761,0.402 +5762,-0.065 +5763,-1.246 +5764,-0.391 +5765,2.177 +5766,-1.186 +5767,-0.665 +5768,-1.591 +5769,-0.024 +5770,1.044 +5771,0.538 +5772,-0.381 +5773,-0.953 +5774,2.288 +5775,1.108 +5776,-0.338 +5777,-1.475 +5778,-0.769 +5779,1.650 +5780,0.085 +5781,-0.531 +5782,-0.208 +5783,-0.464 +5784,-1.545 +5785,-0.702 +5786,0.843 +5787,0.069 +5788,-1.036 +5789,1.156 +5790,0.743 +5791,1.037 +5792,-0.619 +5793,0.347 +5794,-0.794 +5795,-0.420 +5796,-0.526 +5797,-1.043 +5798,-0.528 +5799,1.969 +5800,3.564 +5801,-0.009 +5802,-0.376 +5803,0.370 +5804,0.783 +5805,-1.125 +5806,-0.389 +5807,1.227 +5808,0.585 +5809,0.195 +5810,0.941 +5811,0.430 +5812,0.163 +5813,-0.195 +5814,-0.822 +5815,-0.394 +5816,-0.379 +5817,-0.813 +5818,-0.433 +5819,-1.906 +5820,-0.794 +5821,-0.227 +5822,0.059 +5823,-1.132 +5824,-0.573 +5825,-0.135 +5826,0.661 +5827,-0.160 +5828,0.458 +5829,1.040 +5830,-0.081 +5831,1.042 +5832,-0.921 +5833,1.299 +5834,-1.152 +5835,-2.742 +5836,0.330 +5837,1.267 +5838,-0.875 +5839,0.192 +5840,-2.203 +5841,-1.338 +5842,0.023 +5843,2.743 +5844,1.513 +5845,-0.822 +5846,0.642 +5847,-1.709 +5848,-1.325 +5849,-0.440 +5850,0.187 +5851,-1.143 +5852,0.119 +5853,-0.437 +5854,0.720 +5855,-0.918 +5856,-0.705 +5857,1.293 +5858,-1.276 +5859,-0.013 +5860,-1.192 +5861,-0.680 +5862,-0.559 +5863,0.359 +5864,1.766 +5865,0.092 +5866,-0.806 +5867,-0.917 +5868,-1.595 +5869,0.636 +5870,0.458 +5871,2.020 +5872,-0.023 +5873,-1.001 +5874,0.380 +5875,-1.322 +5876,-0.047 +5877,0.429 +5878,-0.199 +5879,0.760 +5880,-0.768 +5881,0.289 +5882,-0.460 +5883,0.470 +5884,-0.891 +5885,-0.367 +5886,0.664 +5887,1.062 +5888,0.583 +5889,1.125 +5890,0.982 +5891,0.172 +5892,0.264 +5893,-0.853 +5894,0.059 +5895,1.827 +5896,-0.537 +5897,-0.916 +5898,0.816 +5899,-1.084 +5900,-0.204 +5901,0.771 +5902,-0.392 +5903,-1.889 +5904,0.809 +5905,-0.029 +5906,0.459 +5907,-0.237 +5908,0.128 +5909,-0.044 +5910,-0.309 +5911,-0.248 +5912,-0.134 +5913,2.126 +5914,0.103 +5915,-1.021 +5916,-0.806 +5917,-0.612 +5918,-0.981 +5919,1.104 +5920,-0.275 +5921,1.722 +5922,-0.070 +5923,-0.304 +5924,-0.588 +5925,-0.399 +5926,-0.382 +5927,0.361 +5928,0.908 +5929,-0.590 +5930,-0.654 +5931,0.614 +5932,-1.757 +5933,0.667 +5934,-0.757 +5935,-1.964 +5936,0.901 +5937,0.265 +5938,-0.887 +5939,-0.207 +5940,0.132 +5941,0.528 +5942,0.293 +5943,-1.199 +5944,1.236 +5945,1.002 +5946,-1.007 +5947,-1.776 +5948,-1.523 +5949,0.106 +5950,-0.079 +5951,-1.179 +5952,-1.194 +5953,0.594 +5954,-0.623 +5955,-1.056 +5956,-0.235 +5957,0.003 +5958,-0.468 +5959,0.514 +5960,0.700 +5961,1.209 +5962,1.425 +5963,0.675 +5964,-1.220 +5965,-0.648 +5966,0.794 +5967,0.915 +5968,0.568 +5969,0.549 +5970,-0.128 +5971,1.343 +5972,0.331 +5973,0.041 +5974,-0.696 +5975,1.061 +5976,1.209 +5977,0.770 +5978,-1.137 +5979,0.641 +5980,-0.527 +5981,1.216 +5982,0.180 +5983,0.492 +5984,-0.375 +5985,-0.401 +5986,0.130 +5987,-0.033 +5988,-0.205 +5989,-2.096 +5990,-0.873 +5991,0.176 +5992,-0.450 +5993,0.716 +5994,0.739 +5995,-1.516 +5996,-0.052 +5997,-1.511 +5998,-0.677 +5999,1.357 +6000,1.274 +6001,1.051 +6002,-0.447 +6003,1.306 +6004,0.102 +6005,-0.991 +6006,1.263 +6007,-0.413 +6008,0.524 +6009,0.813 +6010,0.278 +6011,-1.470 +6012,-0.443 +6013,0.656 +6014,-0.794 +6015,-0.372 +6016,0.030 +6017,0.876 +6018,-0.989 +6019,0.370 +6020,-0.819 +6021,-1.090 +6022,0.153 +6023,-0.132 +6024,0.155 +6025,-0.641 +6026,-0.561 +6027,0.238 +6028,-0.955 +6029,-1.195 +6030,0.765 +6031,1.617 +6032,1.891 +6033,0.071 +6034,0.022 +6035,0.240 +6036,0.006 +6037,0.221 +6038,-0.740 +6039,-0.393 +6040,1.528 +6041,0.195 +6042,1.356 +6043,0.755 +6044,2.454 +6045,-0.794 +6046,-0.732 +6047,-1.906 +6048,1.117 +6049,1.790 +6050,0.245 +6051,-0.703 +6052,-0.716 +6053,1.877 +6054,0.180 +6055,0.420 +6056,-1.303 +6057,1.271 +6058,-0.747 +6059,-0.709 +6060,-0.405 +6061,-0.077 +6062,-0.041 +6063,-0.276 +6064,0.007 +6065,0.721 +6066,0.206 +6067,-0.767 +6068,2.525 +6069,1.099 +6070,-1.690 +6071,0.269 +6072,-0.040 +6073,-0.383 +6074,-0.514 +6075,-1.403 +6076,1.531 +6077,-0.668 +6078,0.275 +6079,-0.823 +6080,-0.762 +6081,-1.813 +6082,1.197 +6083,0.298 +6084,0.574 +6085,-0.759 +6086,-0.689 +6087,-0.971 +6088,-1.068 +6089,0.363 +6090,-1.448 +6091,-0.801 +6092,-0.124 +6093,-0.155 +6094,-0.759 +6095,-1.288 +6096,0.142 +6097,-1.098 +6098,0.045 +6099,-1.523 +6100,1.215 +6101,-2.073 +6102,-0.881 +6103,-0.621 +6104,1.282 +6105,-1.492 +6106,-1.663 +6107,-1.486 +6108,0.706 +6109,-0.123 +6110,-0.255 +6111,-0.517 +6112,-0.740 +6113,0.634 +6114,0.306 +6115,0.665 +6116,2.074 +6117,1.335 +6118,0.435 +6119,-0.689 +6120,-1.083 +6121,-0.828 +6122,-0.692 +6123,-1.174 +6124,-0.333 +6125,-2.930 +6126,-2.128 +6127,1.187 +6128,0.346 +6129,-0.485 +6130,1.749 +6131,-0.255 +6132,-0.277 +6133,1.212 +6134,1.449 +6135,-0.684 +6136,0.747 +6137,0.309 +6138,-1.002 +6139,-0.821 +6140,-1.277 +6141,-1.272 +6142,0.954 +6143,0.839 +6144,-0.070 +6145,0.815 +6146,-0.674 +6147,-0.889 +6148,-0.371 +6149,0.041 +6150,-0.937 +6151,0.315 +6152,1.195 +6153,-0.486 +6154,1.191 +6155,1.682 +6156,0.697 +6157,0.709 +6158,0.828 +6159,-0.435 +6160,1.583 +6161,0.699 +6162,0.737 +6163,-1.235 +6164,0.887 +6165,-0.310 +6166,0.355 +6167,-0.437 +6168,1.846 +6169,-0.183 +6170,-0.460 +6171,0.361 +6172,0.130 +6173,2.229 +6174,-0.305 +6175,-0.944 +6176,-2.119 +6177,-0.715 +6178,1.076 +6179,2.219 +6180,0.541 +6181,0.002 +6182,-0.525 +6183,-0.846 +6184,0.182 +6185,-0.343 +6186,0.588 +6187,1.432 +6188,-0.784 +6189,0.681 +6190,1.410 +6191,0.471 +6192,1.314 +6193,-0.044 +6194,-0.378 +6195,2.048 +6196,-1.356 +6197,-0.067 +6198,-0.687 +6199,0.615 +6200,-0.462 +6201,1.523 +6202,1.175 +6203,1.736 +6204,1.437 +6205,1.077 +6206,1.540 +6207,-1.906 +6208,-0.130 +6209,-0.162 +6210,0.719 +6211,-0.405 +6212,-0.272 +6213,-0.418 +6214,-0.356 +6215,0.634 +6216,-1.220 +6217,0.370 +6218,0.295 +6219,-1.017 +6220,0.200 +6221,1.055 +6222,0.841 +6223,-2.005 +6224,-2.379 +6225,1.564 +6226,-1.269 +6227,2.131 +6228,0.310 +6229,-1.200 +6230,0.489 +6231,0.577 +6232,0.484 +6233,1.076 +6234,0.785 +6235,-0.896 +6236,0.682 +6237,0.046 +6238,-1.145 +6239,-0.165 +6240,-0.219 +6241,-1.669 +6242,-1.475 +6243,-0.645 +6244,1.675 +6245,-1.400 +6246,-1.204 +6247,-0.345 +6248,0.778 +6249,-0.751 +6250,-0.973 +6251,0.709 +6252,-0.765 +6253,-0.491 +6254,-0.563 +6255,-1.126 +6256,0.108 +6257,0.966 +6258,-1.917 +6259,0.589 +6260,0.314 +6261,0.412 +6262,0.265 +6263,-1.406 +6264,-0.204 +6265,0.335 +6266,-0.014 +6267,1.758 +6268,-1.350 +6269,1.483 +6270,-1.551 +6271,0.710 +6272,1.579 +6273,0.805 +6274,-0.076 +6275,0.544 +6276,-0.112 +6277,-1.612 +6278,-0.900 +6279,-0.256 +6280,1.245 +6281,-1.067 +6282,-0.069 +6283,1.266 +6284,-1.493 +6285,-0.107 +6286,-0.633 +6287,-0.591 +6288,-1.044 +6289,-0.743 +6290,0.736 +6291,0.534 +6292,1.431 +6293,0.498 +6294,-1.397 +6295,-0.003 +6296,-1.950 +6297,1.830 +6298,0.292 +6299,0.731 +6300,-0.489 +6301,0.689 +6302,-0.212 +6303,1.217 +6304,0.307 +6305,-0.227 +6306,0.579 +6307,0.354 +6308,-1.033 +6309,0.941 +6310,0.808 +6311,1.001 +6312,1.944 +6313,0.170 +6314,-1.095 +6315,-0.811 +6316,0.279 +6317,-0.852 +6318,0.702 +6319,0.642 +6320,-2.795 +6321,-1.084 +6322,-0.794 +6323,-1.044 +6324,0.387 +6325,1.823 +6326,-0.881 +6327,-0.944 +6328,2.179 +6329,-0.916 +6330,0.670 +6331,0.428 +6332,-1.502 +6333,0.279 +6334,-0.988 +6335,0.407 +6336,-0.280 +6337,2.313 +6338,-0.670 +6339,-0.965 +6340,-1.227 +6341,-0.460 +6342,-0.562 +6343,0.828 +6344,-0.708 +6345,-0.444 +6346,0.167 +6347,-0.729 +6348,-0.371 +6349,-0.598 +6350,1.557 +6351,0.689 +6352,-0.484 +6353,-1.539 +6354,0.181 +6355,2.690 +6356,0.011 +6357,0.466 +6358,-1.245 +6359,-1.410 +6360,0.811 +6361,0.322 +6362,0.750 +6363,-2.278 +6364,0.156 +6365,-0.293 +6366,0.845 +6367,1.027 +6368,0.421 +6369,0.426 +6370,-0.042 +6371,0.903 +6372,0.880 +6373,1.033 +6374,-0.733 +6375,0.377 +6376,-0.201 +6377,0.962 +6378,-1.365 +6379,0.187 +6380,0.143 +6381,0.377 +6382,-1.193 +6383,1.284 +6384,-0.147 +6385,-2.210 +6386,-0.194 +6387,1.376 +6388,-1.734 +6389,-0.742 +6390,-1.451 +6391,2.587 +6392,-0.778 +6393,1.540 +6394,-0.797 +6395,1.058 +6396,1.152 +6397,1.741 +6398,-0.257 +6399,-0.361 +6400,-1.831 +6401,0.461 +6402,-0.378 +6403,-0.428 +6404,0.517 +6405,1.854 +6406,-1.266 +6407,-0.408 +6408,0.975 +6409,0.473 +6410,0.921 +6411,-0.325 +6412,-1.076 +6413,0.166 +6414,-1.544 +6415,0.320 +6416,0.416 +6417,1.455 +6418,-0.354 +6419,-1.869 +6420,0.175 +6421,-1.802 +6422,-0.047 +6423,1.057 +6424,-1.060 +6425,-0.108 +6426,0.327 +6427,-0.084 +6428,1.656 +6429,-0.050 +6430,0.299 +6431,-0.306 +6432,-0.233 +6433,0.926 +6434,-1.393 +6435,1.321 +6436,2.018 +6437,1.289 +6438,-1.291 +6439,-0.452 +6440,0.818 +6441,-1.190 +6442,0.374 +6443,0.311 +6444,-1.374 +6445,-0.421 +6446,0.459 +6447,0.466 +6448,0.931 +6449,-1.274 +6450,0.271 +6451,1.667 +6452,-0.885 +6453,-1.266 +6454,1.769 +6455,0.644 +6456,-0.181 +6457,-0.803 +6458,0.825 +6459,1.843 +6460,-1.080 +6461,-0.227 +6462,1.640 +6463,-0.745 +6464,-1.676 +6465,-1.326 +6466,-0.045 +6467,1.707 +6468,1.154 +6469,-0.556 +6470,0.824 +6471,0.381 +6472,0.474 +6473,-1.585 +6474,1.186 +6475,0.424 +6476,-0.487 +6477,-0.381 +6478,-0.828 +6479,0.061 +6480,-0.413 +6481,0.010 +6482,1.897 +6483,-0.369 +6484,0.688 +6485,0.634 +6486,0.839 +6487,-0.520 +6488,-1.287 +6489,1.002 +6490,-0.037 +6491,0.284 +6492,0.362 +6493,0.342 +6494,1.945 +6495,0.784 +6496,-1.066 +6497,-1.297 +6498,0.176 +6499,-0.196 +6500,0.125 +6501,2.283 +6502,-0.081 +6503,-0.252 +6504,-0.776 +6505,-0.188 +6506,-0.267 +6507,1.095 +6508,-1.238 +6509,-1.041 +6510,-0.198 +6511,-0.459 +6512,-0.599 +6513,0.713 +6514,0.616 +6515,-1.525 +6516,0.511 +6517,-0.346 +6518,0.752 +6519,1.511 +6520,-1.844 +6521,-1.409 +6522,0.385 +6523,0.536 +6524,1.718 +6525,-1.783 +6526,-0.229 +6527,0.003 +6528,0.305 +6529,-0.280 +6530,-0.407 +6531,-1.416 +6532,0.199 +6533,0.784 +6534,-0.798 +6535,-0.023 +6536,0.572 +6537,0.557 +6538,1.531 +6539,0.894 +6540,0.087 +6541,-0.382 +6542,0.792 +6543,-0.829 +6544,0.282 +6545,-1.360 +6546,-0.529 +6547,2.856 +6548,-0.540 +6549,-0.064 +6550,-0.656 +6551,0.434 +6552,1.251 +6553,0.479 +6554,-0.245 +6555,1.247 +6556,-0.473 +6557,-0.905 +6558,1.100 +6559,1.303 +6560,-0.315 +6561,-0.353 +6562,-2.223 +6563,0.515 +6564,-0.530 +6565,-2.277 +6566,2.227 +6567,0.668 +6568,-0.254 +6569,1.319 +6570,-0.193 +6571,-0.910 +6572,-0.214 +6573,0.752 +6574,-0.097 +6575,-0.653 +6576,-1.014 +6577,0.563 +6578,-0.314 +6579,-1.362 +6580,-0.172 +6581,0.479 +6582,0.202 +6583,0.897 +6584,-0.552 +6585,-0.364 +6586,-0.135 +6587,-0.122 +6588,-0.122 +6589,-0.333 +6590,-0.253 +6591,-0.162 +6592,-2.661 +6593,-0.239 +6594,-0.494 +6595,-0.314 +6596,-0.815 +6597,-0.028 +6598,0.843 +6599,0.572 +6600,0.163 +6601,0.752 +6602,0.222 +6603,-0.387 +6604,0.367 +6605,0.695 +6606,-0.621 +6607,-0.773 +6608,-1.455 +6609,-0.605 +6610,-0.216 +6611,-0.095 +6612,0.383 +6613,-0.272 +6614,-0.203 +6615,-1.218 +6616,1.869 +6617,-0.024 +6618,0.262 +6619,1.338 +6620,-1.391 +6621,1.420 +6622,0.584 +6623,-0.278 +6624,-0.177 +6625,1.282 +6626,0.013 +6627,-0.495 +6628,0.782 +6629,0.264 +6630,-0.935 +6631,2.377 +6632,-0.673 +6633,2.311 +6634,-0.685 +6635,1.430 +6636,-1.002 +6637,-1.119 +6638,1.702 +6639,0.375 +6640,-1.202 +6641,0.920 +6642,0.139 +6643,-1.101 +6644,0.368 +6645,0.279 +6646,0.442 +6647,-0.846 +6648,-0.339 +6649,1.411 +6650,-0.395 +6651,0.536 +6652,1.645 +6653,-1.306 +6654,-1.617 +6655,1.782 +6656,-0.392 +6657,0.703 +6658,1.309 +6659,-0.130 +6660,0.872 +6661,0.022 +6662,0.004 +6663,-0.353 +6664,-1.102 +6665,-1.455 +6666,0.377 +6667,0.224 +6668,-0.173 +6669,0.528 +6670,1.082 +6671,0.365 +6672,0.557 +6673,0.681 +6674,1.355 +6675,-1.432 +6676,-0.487 +6677,1.030 +6678,-0.692 +6679,-0.427 +6680,-1.650 +6681,0.174 +6682,-0.030 +6683,1.545 +6684,0.530 +6685,-0.273 +6686,-0.108 +6687,1.054 +6688,0.613 +6689,-0.804 +6690,-0.479 +6691,0.741 +6692,-1.494 +6693,-2.202 +6694,0.039 +6695,1.127 +6696,-0.069 +6697,-0.309 +6698,-1.336 +6699,0.756 +6700,-0.092 +6701,-1.291 +6702,0.463 +6703,0.844 +6704,-0.222 +6705,1.416 +6706,0.353 +6707,0.313 +6708,-0.681 +6709,-0.805 +6710,-0.195 +6711,-0.972 +6712,0.297 +6713,-1.933 +6714,1.503 +6715,-0.714 +6716,0.355 +6717,1.284 +6718,-1.186 +6719,-1.107 +6720,-0.721 +6721,-0.053 +6722,-0.103 +6723,0.121 +6724,0.201 +6725,0.664 +6726,-0.489 +6727,-1.119 +6728,0.774 +6729,2.233 +6730,-1.220 +6731,-0.645 +6732,0.389 +6733,-1.021 +6734,-1.052 +6735,-0.900 +6736,0.611 +6737,-0.280 +6738,0.781 +6739,-0.271 +6740,1.538 +6741,-0.311 +6742,-0.482 +6743,-1.389 +6744,2.456 +6745,-1.660 +6746,-0.234 +6747,-0.775 +6748,-0.145 +6749,0.009 +6750,-0.261 +6751,-0.275 +6752,0.542 +6753,-0.921 +6754,-0.300 +6755,-1.937 +6756,1.649 +6757,0.202 +6758,-0.283 +6759,-2.754 +6760,-0.208 +6761,1.893 +6762,-0.017 +6763,-0.274 +6764,0.543 +6765,0.825 +6766,-0.910 +6767,0.248 +6768,-0.299 +6769,-0.469 +6770,0.143 +6771,-0.231 +6772,0.491 +6773,0.278 +6774,-0.170 +6775,-0.404 +6776,-0.557 +6777,-1.155 +6778,-1.298 +6779,0.636 +6780,0.341 +6781,0.715 +6782,-0.872 +6783,0.378 +6784,-0.091 +6785,-0.255 +6786,-0.787 +6787,-0.095 +6788,0.433 +6789,-0.551 +6790,-0.039 +6791,0.363 +6792,-0.266 +6793,-1.141 +6794,0.516 +6795,-1.251 +6796,0.990 +6797,-0.317 +6798,1.111 +6799,0.140 +6800,0.996 +6801,-0.089 +6802,1.640 +6803,-0.131 +6804,-1.370 +6805,-0.458 +6806,1.446 +6807,2.257 +6808,1.226 +6809,0.533 +6810,0.367 +6811,-0.075 +6812,1.043 +6813,-2.012 +6814,0.869 +6815,-0.445 +6816,0.383 +6817,-0.030 +6818,0.017 +6819,0.541 +6820,1.284 +6821,1.136 +6822,0.369 +6823,-0.235 +6824,1.331 +6825,0.776 +6826,0.287 +6827,0.043 +6828,-0.157 +6829,1.301 +6830,-1.023 +6831,0.422 +6832,-0.099 +6833,-1.716 +6834,0.067 +6835,-0.901 +6836,-0.816 +6837,0.635 +6838,0.871 +6839,-0.383 +6840,-0.558 +6841,-0.551 +6842,-0.009 +6843,2.367 +6844,1.759 +6845,-0.660 +6846,-1.053 +6847,-0.788 +6848,0.660 +6849,-0.220 +6850,-0.998 +6851,0.089 +6852,0.061 +6853,-0.730 +6854,1.368 +6855,-1.690 +6856,-0.389 +6857,-1.150 +6858,0.891 +6859,-0.350 +6860,-0.505 +6861,0.072 +6862,-1.503 +6863,0.951 +6864,1.798 +6865,-0.626 +6866,1.155 +6867,0.284 +6868,-0.728 +6869,-1.051 +6870,-0.175 +6871,-0.288 +6872,-1.091 +6873,-1.306 +6874,0.073 +6875,1.190 +6876,1.122 +6877,1.696 +6878,-3.319 +6879,1.429 +6880,-0.429 +6881,0.823 +6882,0.317 +6883,0.209 +6884,-1.269 +6885,0.705 +6886,1.832 +6887,0.949 +6888,0.465 +6889,-0.126 +6890,0.215 +6891,0.920 +6892,-2.037 +6893,-0.698 +6894,1.597 +6895,0.939 +6896,-0.484 +6897,-0.306 +6898,1.089 +6899,-1.068 +6900,-0.635 +6901,-0.985 +6902,-0.635 +6903,-0.579 +6904,0.581 +6905,1.019 +6906,1.686 +6907,0.708 +6908,-0.058 +6909,-0.272 +6910,0.801 +6911,-0.664 +6912,0.922 +6913,-2.019 +6914,-0.953 +6915,0.752 +6916,0.026 +6917,-0.864 +6918,0.177 +6919,-1.066 +6920,0.121 +6921,0.832 +6922,-0.383 +6923,1.625 +6924,-1.502 +6925,-0.766 +6926,-0.009 +6927,1.625 +6928,-0.572 +6929,0.946 +6930,-0.680 +6931,-0.114 +6932,-0.230 +6933,-0.172 +6934,1.177 +6935,0.370 +6936,0.739 +6937,0.037 +6938,-0.438 +6939,-1.017 +6940,-0.507 +6941,0.775 +6942,-0.136 +6943,-1.667 +6944,-0.642 +6945,0.674 +6946,-1.615 +6947,1.019 +6948,-0.614 +6949,-0.282 +6950,-0.926 +6951,-0.161 +6952,-2.484 +6953,0.824 +6954,0.334 +6955,1.219 +6956,-0.345 +6957,1.261 +6958,0.321 +6959,2.376 +6960,0.233 +6961,-0.900 +6962,-0.859 +6963,0.134 +6964,-0.392 +6965,0.044 +6966,-0.176 +6967,0.903 +6968,-0.162 +6969,0.339 +6970,-0.907 +6971,-1.113 +6972,1.512 +6973,0.003 +6974,0.518 +6975,0.654 +6976,-0.388 +6977,-0.523 +6978,-1.868 +6979,-0.638 +6980,-0.756 +6981,-0.064 +6982,0.184 +6983,0.097 +6984,-0.755 +6985,0.514 +6986,-0.098 +6987,-0.968 +6988,1.199 +6989,-1.473 +6990,-1.626 +6991,-0.655 +6992,-0.719 +6993,1.210 +6994,0.130 +6995,2.308 +6996,-1.261 +6997,0.217 +6998,1.663 +6999,0.146 +7000,-0.053 +7001,-2.148 +7002,0.144 +7003,0.314 +7004,-0.994 +7005,-0.710 +7006,0.002 +7007,0.749 +7008,1.040 +7009,0.624 +7010,0.316 +7011,-0.614 +7012,0.195 +7013,-0.052 +7014,0.011 +7015,-0.528 +7016,0.740 +7017,-1.098 +7018,1.081 +7019,0.390 +7020,1.650 +7021,-0.863 +7022,0.061 +7023,0.283 +7024,2.176 +7025,0.242 +7026,-0.286 +7027,-0.586 +7028,0.164 +7029,-2.062 +7030,1.865 +7031,-0.641 +7032,0.879 +7033,0.122 +7034,1.839 +7035,-0.214 +7036,-1.006 +7037,-0.146 +7038,-0.640 +7039,-0.539 +7040,1.529 +7041,0.459 +7042,2.236 +7043,0.899 +7044,-1.648 +7045,-0.682 +7046,0.327 +7047,-0.722 +7048,0.307 +7049,-1.557 +7050,-0.344 +7051,0.856 +7052,0.193 +7053,0.629 +7054,-0.280 +7055,0.964 +7056,1.190 +7057,0.691 +7058,0.469 +7059,1.419 +7060,0.277 +7061,-1.086 +7062,-0.617 +7063,-0.347 +7064,-0.080 +7065,0.783 +7066,0.176 +7067,-0.394 +7068,-0.369 +7069,-0.756 +7070,0.468 +7071,-0.836 +7072,-0.224 +7073,0.367 +7074,1.087 +7075,-0.480 +7076,2.675 +7077,0.961 +7078,0.890 +7079,0.686 +7080,-1.040 +7081,-0.473 +7082,-0.430 +7083,0.399 +7084,-0.088 +7085,0.080 +7086,0.390 +7087,0.560 +7088,0.625 +7089,2.805 +7090,-2.254 +7091,-0.379 +7092,0.006 +7093,-1.488 +7094,1.487 +7095,0.934 +7096,0.070 +7097,0.985 +7098,1.274 +7099,1.482 +7100,-0.342 +7101,0.639 +7102,-0.879 +7103,0.153 +7104,1.058 +7105,1.054 +7106,-1.131 +7107,-0.621 +7108,-1.788 +7109,0.994 +7110,0.258 +7111,1.239 +7112,-0.267 +7113,-0.659 +7114,0.504 +7115,-0.209 +7116,-1.313 +7117,0.274 +7118,-0.804 +7119,-0.067 +7120,0.320 +7121,-0.897 +7122,-0.477 +7123,0.085 +7124,-0.633 +7125,0.930 +7126,1.304 +7127,0.253 +7128,-0.986 +7129,0.395 +7130,-0.205 +7131,1.998 +7132,-0.388 +7133,-0.315 +7134,1.738 +7135,-0.561 +7136,-0.110 +7137,-0.328 +7138,0.965 +7139,1.376 +7140,0.909 +7141,0.492 +7142,1.184 +7143,0.420 +7144,0.044 +7145,1.045 +7146,0.862 +7147,0.239 +7148,-0.343 +7149,1.307 +7150,1.221 +7151,-0.205 +7152,-0.866 +7153,2.783 +7154,-0.537 +7155,-0.829 +7156,-0.426 +7157,-0.857 +7158,-0.572 +7159,0.390 +7160,-1.230 +7161,0.620 +7162,-1.733 +7163,0.948 +7164,-0.981 +7165,-0.450 +7166,0.673 +7167,0.024 +7168,-0.481 +7169,-0.681 +7170,-0.052 +7171,-0.613 +7172,0.645 +7173,-0.074 +7174,1.759 +7175,-1.353 +7176,-0.229 +7177,0.300 +7178,0.995 +7179,-0.469 +7180,-0.004 +7181,-0.602 +7182,1.144 +7183,-0.709 +7184,-1.690 +7185,0.242 +7186,-0.387 +7187,-0.245 +7188,0.628 +7189,0.398 +7190,0.229 +7191,-2.823 +7192,1.847 +7193,0.510 +7194,1.321 +7195,0.072 +7196,1.269 +7197,2.162 +7198,-0.308 +7199,-0.043 +7200,-0.214 +7201,-1.360 +7202,1.316 +7203,0.360 +7204,-1.013 +7205,-0.588 +7206,0.188 +7207,-0.948 +7208,0.698 +7209,1.512 +7210,1.226 +7211,1.084 +7212,0.282 +7213,-0.798 +7214,-1.037 +7215,-0.089 +7216,-1.285 +7217,-0.830 +7218,0.209 +7219,-0.610 +7220,-0.622 +7221,0.053 +7222,1.886 +7223,1.647 +7224,0.117 +7225,0.937 +7226,-0.392 +7227,-1.034 +7228,-0.697 +7229,-0.381 +7230,-1.111 +7231,0.488 +7232,0.611 +7233,0.793 +7234,0.652 +7235,1.224 +7236,-0.200 +7237,-0.919 +7238,-1.819 +7239,-0.072 +7240,-0.300 +7241,-1.468 +7242,1.002 +7243,-0.729 +7244,-0.681 +7245,0.234 +7246,-1.974 +7247,1.777 +7248,0.688 +7249,0.839 +7250,0.132 +7251,-0.196 +7252,1.690 +7253,-0.615 +7254,-0.117 +7255,1.815 +7256,0.264 +7257,-1.437 +7258,0.517 +7259,-2.482 +7260,-0.994 +7261,0.869 +7262,0.614 +7263,-0.793 +7264,-0.427 +7265,-0.487 +7266,-0.029 +7267,-0.969 +7268,-1.338 +7269,-0.350 +7270,0.048 +7271,-0.828 +7272,1.000 +7273,-0.012 +7274,-1.351 +7275,0.009 +7276,0.573 +7277,-2.170 +7278,1.209 +7279,2.875 +7280,-0.395 +7281,-2.195 +7282,-0.477 +7283,1.917 +7284,0.768 +7285,-0.883 +7286,-1.516 +7287,-0.361 +7288,0.759 +7289,0.938 +7290,-1.200 +7291,0.670 +7292,0.527 +7293,-0.119 +7294,-0.363 +7295,0.555 +7296,-1.131 +7297,-1.208 +7298,0.621 +7299,0.282 +7300,1.199 +7301,-3.555 +7302,0.180 +7303,0.883 +7304,0.167 +7305,0.041 +7306,-0.334 +7307,-0.218 +7308,-0.393 +7309,-1.146 +7310,0.479 +7311,-1.695 +7312,2.092 +7313,-0.954 +7314,1.123 +7315,-0.312 +7316,0.549 +7317,-0.305 +7318,-0.065 +7319,0.862 +7320,0.949 +7321,-1.432 +7322,0.557 +7323,0.730 +7324,-1.119 +7325,1.404 +7326,-0.568 +7327,1.153 +7328,-0.824 +7329,0.997 +7330,1.531 +7331,-0.335 +7332,-0.831 +7333,-0.356 +7334,0.974 +7335,-0.509 +7336,0.421 +7337,0.349 +7338,3.046 +7339,-1.055 +7340,-0.085 +7341,0.413 +7342,0.206 +7343,1.703 +7344,-0.817 +7345,-0.916 +7346,-1.471 +7347,-0.374 +7348,-1.292 +7349,0.726 +7350,2.458 +7351,1.448 +7352,1.495 +7353,-0.190 +7354,-0.451 +7355,0.407 +7356,-0.093 +7357,1.944 +7358,0.166 +7359,0.898 +7360,0.618 +7361,0.132 +7362,-0.216 +7363,-0.149 +7364,-0.474 +7365,-0.968 +7366,0.250 +7367,0.733 +7368,-1.907 +7369,-0.531 +7370,-0.223 +7371,0.194 +7372,0.283 +7373,-0.266 +7374,-0.871 +7375,-1.058 +7376,1.319 +7377,-1.420 +7378,0.137 +7379,-0.415 +7380,0.570 +7381,0.914 +7382,-0.654 +7383,0.889 +7384,1.590 +7385,1.172 +7386,0.131 +7387,1.091 +7388,0.660 +7389,-1.215 +7390,0.380 +7391,0.757 +7392,0.455 +7393,0.257 +7394,0.858 +7395,-0.616 +7396,-0.235 +7397,-0.774 +7398,-1.222 +7399,-0.564 +7400,-0.922 +7401,0.945 +7402,-0.772 +7403,-0.530 +7404,-1.300 +7405,-0.777 +7406,0.138 +7407,0.578 +7408,-0.203 +7409,0.499 +7410,0.508 +7411,1.275 +7412,-0.906 +7413,-0.321 +7414,0.278 +7415,0.336 +7416,-1.667 +7417,0.644 +7418,0.430 +7419,-0.712 +7420,-2.501 +7421,1.706 +7422,-0.109 +7423,-0.060 +7424,1.405 +7425,-1.223 +7426,-1.466 +7427,1.668 +7428,0.600 +7429,0.867 +7430,0.481 +7431,-0.200 +7432,-0.354 +7433,0.391 +7434,-0.776 +7435,-1.034 +7436,0.089 +7437,0.996 +7438,2.125 +7439,1.138 +7440,-0.869 +7441,0.384 +7442,-0.225 +7443,1.056 +7444,0.097 +7445,-0.824 +7446,-0.326 +7447,-0.035 +7448,-1.096 +7449,1.436 +7450,-0.989 +7451,-0.318 +7452,-0.716 +7453,-0.800 +7454,0.662 +7455,-0.794 +7456,0.002 +7457,0.545 +7458,1.224 +7459,-1.229 +7460,0.232 +7461,-0.875 +7462,1.249 +7463,0.342 +7464,-0.314 +7465,1.597 +7466,-0.631 +7467,0.440 +7468,0.220 +7469,1.175 +7470,-0.609 +7471,1.667 +7472,1.069 +7473,-1.059 +7474,-1.374 +7475,0.160 +7476,-0.238 +7477,-0.920 +7478,-1.080 +7479,0.817 +7480,-1.014 +7481,0.795 +7482,0.116 +7483,-0.563 +7484,1.645 +7485,-1.390 +7486,-0.422 +7487,0.220 +7488,1.544 +7489,-1.714 +7490,0.191 +7491,-0.497 +7492,-0.564 +7493,0.107 +7494,-0.163 +7495,1.846 +7496,-0.556 +7497,1.270 +7498,0.515 +7499,1.982 +7500,-0.663 +7501,0.038 +7502,0.133 +7503,0.700 +7504,-1.125 +7505,-0.164 +7506,-1.640 +7507,-0.876 +7508,2.619 +7509,0.852 +7510,0.598 +7511,-0.574 +7512,0.550 +7513,1.381 +7514,0.960 +7515,0.519 +7516,-0.537 +7517,-0.813 +7518,-0.699 +7519,-0.052 +7520,0.375 +7521,-1.530 +7522,0.392 +7523,0.890 +7524,0.232 +7525,-0.937 +7526,-0.248 +7527,-0.815 +7528,-0.183 +7529,1.277 +7530,0.513 +7531,-1.213 +7532,0.164 +7533,-0.265 +7534,-1.424 +7535,-0.929 +7536,0.897 +7537,2.456 +7538,0.770 +7539,0.475 +7540,0.259 +7541,0.436 +7542,-1.211 +7543,0.902 +7544,-0.191 +7545,0.793 +7546,0.916 +7547,0.694 +7548,-1.329 +7549,-0.894 +7550,-0.430 +7551,-0.710 +7552,-0.922 +7553,0.750 +7554,-0.676 +7555,-1.132 +7556,-0.357 +7557,0.831 +7558,-0.023 +7559,-0.898 +7560,0.934 +7561,-1.845 +7562,-1.008 +7563,0.055 +7564,2.111 +7565,2.169 +7566,-0.937 +7567,-0.444 +7568,-0.289 +7569,-0.171 +7570,-1.430 +7571,0.283 +7572,0.662 +7573,-1.092 +7574,1.941 +7575,-0.636 +7576,1.148 +7577,1.251 +7578,-1.802 +7579,0.182 +7580,1.592 +7581,-1.596 +7582,-0.376 +7583,1.685 +7584,-0.547 +7585,-0.912 +7586,-0.454 +7587,0.895 +7588,-1.066 +7589,-0.002 +7590,-3.275 +7591,-0.749 +7592,1.894 +7593,1.429 +7594,-0.066 +7595,-1.566 +7596,-0.888 +7597,0.226 +7598,0.837 +7599,0.021 +7600,-0.776 +7601,-0.452 +7602,0.119 +7603,0.393 +7604,-0.617 +7605,-1.255 +7606,1.444 +7607,-1.246 +7608,1.040 +7609,-1.024 +7610,0.770 +7611,-0.144 +7612,-1.401 +7613,0.562 +7614,0.940 +7615,-0.217 +7616,1.301 +7617,-0.836 +7618,-0.630 +7619,-0.731 +7620,0.781 +7621,0.381 +7622,-0.591 +7623,0.465 +7624,0.576 +7625,0.485 +7626,-0.515 +7627,-0.716 +7628,1.801 +7629,-1.034 +7630,1.289 +7631,-1.393 +7632,-1.174 +7633,0.252 +7634,-0.887 +7635,0.524 +7636,0.286 +7637,1.205 +7638,0.377 +7639,0.257 +7640,1.823 +7641,-0.048 +7642,0.061 +7643,-0.737 +7644,-0.181 +7645,0.407 +7646,0.455 +7647,0.517 +7648,1.102 +7649,-0.494 +7650,0.355 +7651,-0.214 +7652,0.356 +7653,-0.477 +7654,0.416 +7655,0.002 +7656,-0.154 +7657,0.528 +7658,-0.192 +7659,-1.103 +7660,-0.446 +7661,0.250 +7662,0.493 +7663,-0.092 +7664,1.564 +7665,1.612 +7666,1.531 +7667,-1.964 +7668,0.814 +7669,-0.150 +7670,0.267 +7671,-1.325 +7672,-0.360 +7673,-0.482 +7674,-1.979 +7675,0.606 +7676,-1.333 +7677,0.804 +7678,-0.131 +7679,-0.095 +7680,1.849 +7681,0.160 +7682,-0.301 +7683,0.813 +7684,1.767 +7685,-0.262 +7686,1.280 +7687,-2.498 +7688,-0.740 +7689,1.534 +7690,-0.237 +7691,-0.821 +7692,0.616 +7693,1.449 +7694,0.554 +7695,0.206 +7696,2.360 +7697,0.790 +7698,-0.037 +7699,-1.047 +7700,1.256 +7701,-0.256 +7702,0.683 +7703,-0.049 +7704,-0.326 +7705,1.577 +7706,1.077 +7707,0.057 +7708,-0.557 +7709,0.913 +7710,-0.729 +7711,-0.609 +7712,0.786 +7713,0.335 +7714,0.592 +7715,-2.785 +7716,0.405 +7717,0.631 +7718,-0.843 +7719,1.447 +7720,0.923 +7721,-0.744 +7722,1.612 +7723,-0.210 +7724,-0.646 +7725,-0.054 +7726,-1.645 +7727,0.622 +7728,0.133 +7729,-0.493 +7730,0.392 +7731,-1.003 +7732,0.353 +7733,-0.378 +7734,-0.074 +7735,-0.698 +7736,-1.017 +7737,0.825 +7738,-1.371 +7739,1.501 +7740,-0.933 +7741,-1.413 +7742,-0.494 +7743,-0.929 +7744,0.558 +7745,-0.288 +7746,0.176 +7747,0.216 +7748,-0.528 +7749,-0.577 +7750,-1.765 +7751,0.471 +7752,-0.643 +7753,0.690 +7754,-0.515 +7755,-0.128 +7756,-0.007 +7757,0.644 +7758,0.240 +7759,1.060 +7760,1.638 +7761,0.543 +7762,0.398 +7763,0.093 +7764,-0.320 +7765,-2.197 +7766,-0.468 +7767,0.428 +7768,0.522 +7769,-1.368 +7770,-1.924 +7771,-0.261 +7772,0.477 +7773,-1.945 +7774,0.223 +7775,0.245 +7776,0.160 +7777,-0.967 +7778,-1.041 +7779,-0.178 +7780,-0.945 +7781,-0.830 +7782,-1.072 +7783,0.908 +7784,0.131 +7785,0.314 +7786,0.538 +7787,-0.470 +7788,-0.132 +7789,-0.815 +7790,-1.042 +7791,0.921 +7792,0.492 +7793,-1.307 +7794,-0.586 +7795,-1.686 +7796,0.847 +7797,0.308 +7798,-1.293 +7799,-0.462 +7800,-0.326 +7801,-0.674 +7802,0.009 +7803,-0.746 +7804,-0.186 +7805,-1.679 +7806,-0.630 +7807,-0.520 +7808,0.367 +7809,-1.614 +7810,0.795 +7811,0.082 +7812,-0.931 +7813,-0.108 +7814,0.880 +7815,-0.564 +7816,0.045 +7817,0.264 +7818,1.158 +7819,-1.363 +7820,0.808 +7821,0.063 +7822,-0.726 +7823,0.717 +7824,-0.289 +7825,1.390 +7826,0.214 +7827,-1.174 +7828,-0.742 +7829,-0.538 +7830,0.103 +7831,-1.086 +7832,-0.356 +7833,-1.247 +7834,-1.381 +7835,-2.139 +7836,-0.028 +7837,0.313 +7838,-0.050 +7839,0.602 +7840,-0.939 +7841,-1.335 +7842,-0.962 +7843,-2.426 +7844,1.682 +7845,-0.001 +7846,-1.004 +7847,-1.697 +7848,-1.385 +7849,0.526 +7850,-0.632 +7851,0.276 +7852,-0.285 +7853,1.109 +7854,-1.392 +7855,-0.962 +7856,0.681 +7857,-1.345 +7858,1.425 +7859,0.443 +7860,0.616 +7861,1.530 +7862,0.627 +7863,0.503 +7864,0.261 +7865,0.507 +7866,0.066 +7867,0.717 +7868,0.674 +7869,1.162 +7870,-0.776 +7871,-1.400 +7872,0.183 +7873,-0.028 +7874,-0.779 +7875,0.324 +7876,2.764 +7877,0.177 +7878,0.157 +7879,-1.095 +7880,0.199 +7881,-1.866 +7882,0.615 +7883,-0.061 +7884,-1.051 +7885,-0.942 +7886,0.207 +7887,-0.812 +7888,0.061 +7889,-1.255 +7890,-0.525 +7891,0.008 +7892,-0.218 +7893,0.623 +7894,-2.148 +7895,0.091 +7896,0.765 +7897,-1.265 +7898,0.267 +7899,-0.370 +7900,-1.443 +7901,-0.813 +7902,-1.810 +7903,0.444 +7904,0.883 +7905,0.023 +7906,0.476 +7907,1.245 +7908,-0.329 +7909,-0.258 +7910,-2.029 +7911,-0.808 +7912,-0.085 +7913,0.648 +7914,-0.699 +7915,-0.871 +7916,1.948 +7917,-1.500 +7918,2.929 +7919,-0.022 +7920,-1.287 +7921,-0.770 +7922,0.452 +7923,-0.275 +7924,0.983 +7925,-0.676 +7926,1.886 +7927,-2.651 +7928,-0.735 +7929,-0.040 +7930,0.701 +7931,0.036 +7932,-0.503 +7933,-0.042 +7934,0.050 +7935,0.824 +7936,0.412 +7937,0.916 +7938,0.891 +7939,0.739 +7940,-0.605 +7941,2.003 +7942,-1.972 +7943,2.185 +7944,-1.556 +7945,0.985 +7946,-0.367 +7947,1.170 +7948,0.310 +7949,-0.420 +7950,-0.965 +7951,-1.336 +7952,0.180 +7953,1.467 +7954,-0.747 +7955,-0.616 +7956,-1.215 +7957,-0.924 +7958,0.362 +7959,-1.905 +7960,2.202 +7961,-1.392 +7962,1.562 +7963,0.185 +7964,-0.406 +7965,0.288 +7966,-0.581 +7967,1.820 +7968,-0.047 +7969,0.530 +7970,0.374 +7971,0.846 +7972,-0.977 +7973,-1.010 +7974,0.699 +7975,1.511 +7976,0.948 +7977,-1.406 +7978,0.289 +7979,0.715 +7980,-0.630 +7981,-0.991 +7982,0.566 +7983,0.496 +7984,0.184 +7985,1.925 +7986,-0.388 +7987,-0.655 +7988,0.342 +7989,-1.239 +7990,1.170 +7991,-0.140 +7992,0.194 +7993,0.234 +7994,0.314 +7995,0.579 +7996,-0.689 +7997,-0.628 +7998,1.417 +7999,-0.489 +8000,1.140 +8001,-0.451 +8002,-0.272 +8003,-0.025 +8004,0.265 +8005,0.920 +8006,-0.622 +8007,0.896 +8008,-1.228 +8009,1.084 +8010,1.171 +8011,-0.413 +8012,-0.935 +8013,1.428 +8014,0.899 +8015,0.621 +8016,-0.074 +8017,0.182 +8018,-0.290 +8019,0.289 +8020,-1.042 +8021,0.248 +8022,-0.475 +8023,0.883 +8024,0.035 +8025,-0.043 +8026,-0.891 +8027,-0.177 +8028,-1.146 +8029,-0.690 +8030,0.169 +8031,1.792 +8032,-0.153 +8033,0.696 +8034,-1.128 +8035,1.248 +8036,0.888 +8037,1.681 +8038,0.412 +8039,0.371 +8040,-0.453 +8041,-0.502 +8042,0.380 +8043,-1.321 +8044,0.044 +8045,-0.403 +8046,2.087 +8047,0.499 +8048,0.907 +8049,-0.412 +8050,-1.317 +8051,2.277 +8052,-0.097 +8053,1.086 +8054,0.376 +8055,0.713 +8056,0.798 +8057,-0.719 +8058,1.498 +8059,0.983 +8060,-0.771 +8061,-0.961 +8062,0.950 +8063,-0.527 +8064,-0.501 +8065,2.058 +8066,0.376 +8067,1.300 +8068,-1.108 +8069,0.398 +8070,2.141 +8071,-0.947 +8072,-0.578 +8073,0.066 +8074,0.512 +8075,-0.065 +8076,-0.779 +8077,-0.350 +8078,0.467 +8079,0.884 +8080,1.058 +8081,-0.696 +8082,-0.959 +8083,0.784 +8084,-1.441 +8085,0.934 +8086,-1.154 +8087,0.042 +8088,1.572 +8089,1.038 +8090,0.236 +8091,0.248 +8092,1.956 +8093,-0.847 +8094,-0.902 +8095,-0.684 +8096,0.667 +8097,0.529 +8098,-0.565 +8099,1.286 +8100,-1.595 +8101,-0.814 +8102,-2.147 +8103,1.164 +8104,0.030 +8105,-1.540 +8106,-0.959 +8107,-0.190 +8108,-0.031 +8109,1.091 +8110,-0.007 +8111,0.511 +8112,-1.901 +8113,-1.374 +8114,0.093 +8115,-1.026 +8116,-1.203 +8117,0.145 +8118,-0.969 +8119,0.738 +8120,0.678 +8121,0.732 +8122,-2.060 +8123,0.095 +8124,-1.707 +8125,0.500 +8126,-1.188 +8127,-1.165 +8128,1.352 +8129,0.976 +8130,0.428 +8131,0.744 +8132,0.812 +8133,0.039 +8134,0.095 +8135,-1.270 +8136,-0.778 +8137,-0.415 +8138,0.183 +8139,0.744 +8140,-0.618 +8141,0.631 +8142,-0.219 +8143,-0.911 +8144,1.787 +8145,1.009 +8146,-0.854 +8147,-1.217 +8148,0.759 +8149,-2.579 +8150,0.867 +8151,0.529 +8152,0.456 +8153,1.000 +8154,-2.190 +8155,-0.851 +8156,0.014 +8157,1.116 +8158,-0.397 +8159,0.213 +8160,-1.151 +8161,-0.361 +8162,0.353 +8163,-0.398 +8164,-0.404 +8165,-1.185 +8166,0.120 +8167,-1.598 +8168,0.452 +8169,1.046 +8170,-0.347 +8171,-1.339 +8172,-0.840 +8173,0.206 +8174,0.368 +8175,0.685 +8176,-0.459 +8177,0.418 +8178,1.162 +8179,0.046 +8180,0.473 +8181,1.199 +8182,0.314 +8183,0.182 +8184,-0.410 +8185,1.609 +8186,0.474 +8187,0.447 +8188,-0.141 +8189,-1.118 +8190,0.649 +8191,1.498 +8192,-0.503 +8193,-1.765 +8194,0.163 +8195,-0.080 +8196,-0.651 +8197,0.152 +8198,0.121 +8199,1.718 +8200,-0.293 +8201,-1.432 +8202,1.205 +8203,-0.373 +8204,-0.252 +8205,0.789 +8206,1.474 +8207,0.409 +8208,1.194 +8209,0.230 +8210,0.519 +8211,-0.676 +8212,0.062 +8213,-1.116 +8214,2.197 +8215,-0.073 +8216,-1.196 +8217,1.835 +8218,0.512 +8219,-0.283 +8220,0.933 +8221,-0.691 +8222,0.112 +8223,-0.669 +8224,-0.977 +8225,-0.941 +8226,-1.506 +8227,-0.073 +8228,1.591 +8229,-2.061 +8230,-1.223 +8231,-1.489 +8232,-0.674 +8233,-1.024 +8234,-0.459 +8235,-0.781 +8236,-0.667 +8237,0.571 +8238,2.160 +8239,-0.111 +8240,0.739 +8241,-0.504 +8242,0.353 +8243,0.431 +8244,-1.251 +8245,-1.676 +8246,-0.058 +8247,0.145 +8248,0.537 +8249,-2.901 +8250,0.550 +8251,-1.099 +8252,0.936 +8253,-0.536 +8254,-0.396 +8255,0.494 +8256,0.824 +8257,0.818 +8258,1.754 +8259,0.018 +8260,-0.473 +8261,0.847 +8262,0.395 +8263,-1.076 +8264,-0.577 +8265,-1.119 +8266,0.579 +8267,-0.169 +8268,-0.284 +8269,-0.867 +8270,-1.637 +8271,0.075 +8272,0.266 +8273,0.032 +8274,-1.276 +8275,0.653 +8276,-0.033 +8277,1.336 +8278,0.743 +8279,-1.906 +8280,-1.403 +8281,-0.409 +8282,-1.695 +8283,0.283 +8284,0.444 +8285,-1.146 +8286,1.173 +8287,0.518 +8288,-1.251 +8289,0.981 +8290,-1.058 +8291,0.242 +8292,-0.803 +8293,-0.832 +8294,0.956 +8295,-0.547 +8296,0.947 +8297,1.172 +8298,-0.711 +8299,1.027 +8300,0.335 +8301,-2.415 +8302,-0.243 +8303,0.043 +8304,1.674 +8305,1.507 +8306,0.768 +8307,-0.254 +8308,-0.365 +8309,0.126 +8310,-0.442 +8311,0.988 +8312,-0.039 +8313,2.191 +8314,-1.160 +8315,-0.394 +8316,2.417 +8317,0.793 +8318,0.050 +8319,-0.230 +8320,-1.591 +8321,1.321 +8322,1.095 +8323,-0.376 +8324,1.357 +8325,1.544 +8326,0.522 +8327,1.247 +8328,-0.107 +8329,0.336 +8330,-0.126 +8331,-1.291 +8332,-1.608 +8333,-0.212 +8334,2.502 +8335,0.255 +8336,-0.760 +8337,0.787 +8338,-0.349 +8339,-0.027 +8340,0.615 +8341,-0.360 +8342,1.248 +8343,-1.017 +8344,-0.809 +8345,0.040 +8346,2.413 +8347,1.477 +8348,-1.056 +8349,0.779 +8350,-0.045 +8351,0.449 +8352,2.148 +8353,-0.485 +8354,1.216 +8355,0.968 +8356,2.400 +8357,-0.865 +8358,0.142 +8359,0.743 +8360,-1.052 +8361,1.449 +8362,1.229 +8363,0.706 +8364,1.331 +8365,-1.484 +8366,0.595 +8367,0.605 +8368,-1.375 +8369,0.473 +8370,-0.485 +8371,-0.611 +8372,-1.381 +8373,0.388 +8374,-0.359 +8375,-0.416 +8376,-0.789 +8377,-1.079 +8378,0.310 +8379,-0.224 +8380,0.910 +8381,-0.284 +8382,1.206 +8383,-0.389 +8384,-0.800 +8385,0.606 +8386,0.077 +8387,-0.390 +8388,0.202 +8389,0.136 +8390,0.747 +8391,-0.105 +8392,0.629 +8393,-0.394 +8394,1.255 +8395,-2.225 +8396,0.591 +8397,0.557 +8398,0.022 +8399,-0.161 +8400,0.440 +8401,0.778 +8402,-0.541 +8403,-2.415 +8404,-1.233 +8405,0.542 +8406,2.634 +8407,-1.864 +8408,-0.441 +8409,0.065 +8410,-0.385 +8411,0.862 +8412,-1.147 +8413,0.159 +8414,-0.150 +8415,-1.777 +8416,1.382 +8417,0.366 +8418,-0.274 +8419,0.443 +8420,0.544 +8421,-0.206 +8422,-0.006 +8423,1.144 +8424,-0.854 +8425,1.243 +8426,-0.776 +8427,-0.322 +8428,-0.315 +8429,0.596 +8430,0.504 +8431,-0.761 +8432,-1.412 +8433,1.143 +8434,-0.660 +8435,0.364 +8436,1.876 +8437,-1.087 +8438,-1.462 +8439,0.325 +8440,-0.576 +8441,-0.061 +8442,0.715 +8443,0.705 +8444,1.400 +8445,-1.557 +8446,0.626 +8447,1.595 +8448,-1.230 +8449,-1.022 +8450,1.260 +8451,-0.293 +8452,-0.285 +8453,0.499 +8454,-0.685 +8455,0.544 +8456,1.065 +8457,1.096 +8458,-1.047 +8459,-0.561 +8460,0.292 +8461,0.560 +8462,0.399 +8463,-1.027 +8464,-0.788 +8465,1.253 +8466,1.127 +8467,-0.110 +8468,0.771 +8469,0.883 +8470,0.077 +8471,-1.635 +8472,-1.429 +8473,-0.550 +8474,-0.671 +8475,-0.567 +8476,1.636 +8477,0.497 +8478,-1.675 +8479,-0.101 +8480,0.704 +8481,0.325 +8482,-0.758 +8483,1.962 +8484,-0.176 +8485,0.322 +8486,0.123 +8487,0.609 +8488,0.651 +8489,-0.184 +8490,-1.260 +8491,0.554 +8492,1.776 +8493,0.035 +8494,-0.870 +8495,-0.319 +8496,0.735 +8497,1.928 +8498,-1.474 +8499,1.604 +8500,-0.671 +8501,0.255 +8502,0.131 +8503,1.268 +8504,-0.925 +8505,-1.097 +8506,-0.019 +8507,-2.477 +8508,0.120 +8509,-0.822 +8510,0.774 +8511,-0.569 +8512,-0.508 +8513,0.962 +8514,-1.509 +8515,1.088 +8516,0.428 +8517,-1.662 +8518,-0.270 +8519,-0.487 +8520,0.794 +8521,0.512 +8522,1.013 +8523,-0.183 +8524,-0.490 +8525,-0.403 +8526,-0.224 +8527,0.528 +8528,-1.480 +8529,-0.839 +8530,0.716 +8531,0.173 +8532,0.062 +8533,-0.947 +8534,1.334 +8535,-1.330 +8536,0.348 +8537,0.846 +8538,-0.477 +8539,1.369 +8540,-1.313 +8541,-1.693 +8542,-0.516 +8543,0.166 +8544,-0.204 +8545,0.736 +8546,-1.701 +8547,-0.505 +8548,0.675 +8549,-0.632 +8550,-0.754 +8551,0.148 +8552,-0.402 +8553,-1.004 +8554,-0.859 +8555,-0.033 +8556,0.785 +8557,-1.417 +8558,-1.159 +8559,0.162 +8560,-1.163 +8561,-0.781 +8562,0.097 +8563,-0.736 +8564,0.963 +8565,-0.284 +8566,-0.670 +8567,-0.464 +8568,-2.096 +8569,-0.717 +8570,-1.010 +8571,0.617 +8572,1.357 +8573,-0.225 +8574,-0.254 +8575,0.633 +8576,-0.741 +8577,-1.480 +8578,-1.159 +8579,-0.191 +8580,1.359 +8581,1.584 +8582,0.657 +8583,0.416 +8584,0.827 +8585,-0.449 +8586,0.776 +8587,-0.695 +8588,1.565 +8589,0.259 +8590,-1.327 +8591,0.112 +8592,-0.130 +8593,-0.005 +8594,-1.304 +8595,-0.319 +8596,0.469 +8597,-0.777 +8598,-0.547 +8599,-1.808 +8600,0.561 +8601,1.009 +8602,-1.290 +8603,1.423 +8604,-0.319 +8605,0.107 +8606,0.423 +8607,-0.493 +8608,0.857 +8609,-0.514 +8610,0.951 +8611,-0.667 +8612,-0.013 +8613,0.672 +8614,0.579 +8615,-0.159 +8616,0.375 +8617,1.797 +8618,1.589 +8619,-0.524 +8620,1.129 +8621,-0.261 +8622,0.978 +8623,-1.073 +8624,1.307 +8625,-1.062 +8626,0.944 +8627,-0.066 +8628,0.454 +8629,-0.678 +8630,-3.541 +8631,-0.945 +8632,0.625 +8633,0.968 +8634,-0.020 +8635,1.202 +8636,1.232 +8637,-0.981 +8638,-2.908 +8639,0.132 +8640,0.415 +8641,0.157 +8642,-0.721 +8643,-0.692 +8644,0.311 +8645,-0.226 +8646,-1.832 +8647,0.062 +8648,2.001 +8649,0.910 +8650,0.768 +8651,0.457 +8652,-0.045 +8653,0.274 +8654,-0.986 +8655,-0.142 +8656,0.112 +8657,-1.054 +8658,0.288 +8659,2.505 +8660,-0.506 +8661,-2.308 +8662,0.102 +8663,0.000 +8664,0.027 +8665,-0.773 +8666,-0.615 +8667,-0.491 +8668,-1.118 +8669,1.658 +8670,-1.003 +8671,-1.387 +8672,0.655 +8673,-1.151 +8674,0.360 +8675,1.413 +8676,0.132 +8677,-0.871 +8678,0.234 +8679,0.675 +8680,0.393 +8681,0.612 +8682,0.045 +8683,1.729 +8684,1.000 +8685,0.265 +8686,-1.390 +8687,0.002 +8688,-0.467 +8689,1.012 +8690,-1.043 +8691,-0.814 +8692,-1.247 +8693,0.852 +8694,-0.474 +8695,-1.037 +8696,0.579 +8697,1.262 +8698,0.482 +8699,0.048 +8700,-0.853 +8701,-0.548 +8702,-0.453 +8703,1.004 +8704,1.017 +8705,0.357 +8706,-0.450 +8707,0.126 +8708,1.307 +8709,0.574 +8710,0.995 +8711,-0.525 +8712,-0.811 +8713,-1.416 +8714,1.125 +8715,-1.243 +8716,-0.067 +8717,0.300 +8718,-0.160 +8719,0.379 +8720,-0.021 +8721,1.082 +8722,0.444 +8723,-0.502 +8724,-1.558 +8725,1.358 +8726,-0.341 +8727,-0.089 +8728,0.442 +8729,0.719 +8730,0.772 +8731,0.735 +8732,1.432 +8733,0.936 +8734,-0.579 +8735,0.619 +8736,-1.037 +8737,0.908 +8738,-0.570 +8739,-1.703 +8740,-0.705 +8741,-1.192 +8742,0.375 +8743,0.479 +8744,-0.904 +8745,0.133 +8746,0.027 +8747,0.051 +8748,0.550 +8749,-0.202 +8750,0.025 +8751,-0.913 +8752,-0.128 +8753,0.860 +8754,-0.568 +8755,-0.931 +8756,0.214 +8757,0.243 +8758,-0.373 +8759,-0.058 +8760,-1.031 +8761,-0.165 +8762,0.683 +8763,-1.721 +8764,-0.812 +8765,-0.226 +8766,0.052 +8767,-1.371 +8768,1.254 +8769,-0.525 +8770,0.862 +8771,0.671 +8772,-0.325 +8773,-0.736 +8774,0.597 +8775,0.175 +8776,1.758 +8777,-0.182 +8778,-0.057 +8779,-0.012 +8780,0.437 +8781,0.640 +8782,0.332 +8783,0.022 +8784,-0.474 +8785,0.674 +8786,-0.430 +8787,0.964 +8788,-1.597 +8789,-0.938 +8790,0.519 +8791,0.825 +8792,-0.424 +8793,-0.283 +8794,0.138 +8795,0.597 +8796,1.237 +8797,-0.983 +8798,-0.212 +8799,-0.601 +8800,0.569 +8801,-1.014 +8802,-0.561 +8803,0.030 +8804,1.617 +8805,-0.078 +8806,0.061 +8807,0.622 +8808,-0.095 +8809,-0.957 +8810,1.427 +8811,0.564 +8812,0.615 +8813,1.221 +8814,0.374 +8815,-0.449 +8816,-0.871 +8817,0.512 +8818,-1.470 +8819,-1.018 +8820,0.119 +8821,-0.116 +8822,0.600 +8823,-0.518 +8824,0.191 +8825,0.406 +8826,-0.002 +8827,-0.777 +8828,2.511 +8829,-1.561 +8830,0.023 +8831,-0.669 +8832,1.935 +8833,1.773 +8834,0.956 +8835,0.498 +8836,-1.016 +8837,1.370 +8838,0.253 +8839,0.183 +8840,-1.101 +8841,-1.284 +8842,-1.114 +8843,-1.064 +8844,-1.258 +8845,-1.607 +8846,0.823 +8847,0.796 +8848,0.747 +8849,-0.392 +8850,1.696 +8851,-0.403 +8852,0.413 +8853,-0.135 +8854,0.168 +8855,-1.226 +8856,-0.723 +8857,1.313 +8858,1.062 +8859,-1.159 +8860,-0.868 +8861,1.495 +8862,0.437 +8863,1.298 +8864,-0.227 +8865,-1.475 +8866,1.118 +8867,-0.999 +8868,0.828 +8869,-0.215 +8870,0.987 +8871,1.983 +8872,1.031 +8873,-0.233 +8874,2.054 +8875,0.693 +8876,-1.049 +8877,-0.094 +8878,2.147 +8879,0.387 +8880,0.704 +8881,-0.273 +8882,-0.359 +8883,0.799 +8884,-1.012 +8885,-1.058 +8886,-1.132 +8887,0.695 +8888,-0.683 +8889,-0.906 +8890,-0.827 +8891,0.466 +8892,1.551 +8893,0.355 +8894,-0.552 +8895,-0.465 +8896,0.651 +8897,1.254 +8898,2.258 +8899,-0.065 +8900,0.145 +8901,0.022 +8902,0.457 +8903,0.778 +8904,-1.255 +8905,1.199 +8906,0.186 +8907,0.321 +8908,-0.745 +8909,-0.530 +8910,-0.044 +8911,0.920 +8912,1.380 +8913,0.910 +8914,-1.675 +8915,0.441 +8916,-1.721 +8917,-0.090 +8918,0.111 +8919,0.232 +8920,0.843 +8921,-0.198 +8922,-0.759 +8923,0.673 +8924,-0.455 +8925,2.042 +8926,0.479 +8927,0.467 +8928,0.941 +8929,-0.782 +8930,0.038 +8931,0.530 +8932,-0.533 +8933,-0.834 +8934,1.447 +8935,-2.047 +8936,-1.397 +8937,1.846 +8938,0.976 +8939,-0.132 +8940,0.026 +8941,-0.123 +8942,-0.313 +8943,-0.550 +8944,-1.494 +8945,-0.390 +8946,0.888 +8947,-0.481 +8948,0.261 +8949,0.533 +8950,0.912 +8951,0.689 +8952,2.130 +8953,-0.566 +8954,0.120 +8955,-0.832 +8956,0.017 +8957,0.658 +8958,-1.107 +8959,0.567 +8960,0.915 +8961,1.594 +8962,0.822 +8963,0.059 +8964,-0.484 +8965,1.882 +8966,-0.168 +8967,-1.108 +8968,-0.760 +8969,0.793 +8970,-0.944 +8971,1.256 +8972,0.035 +8973,-0.042 +8974,-1.372 +8975,-0.665 +8976,-0.980 +8977,0.655 +8978,0.311 +8979,-0.329 +8980,-0.965 +8981,-0.161 +8982,2.000 +8983,0.496 +8984,1.002 +8985,-0.797 +8986,-1.268 +8987,1.159 +8988,-1.905 +8989,0.112 +8990,-0.347 +8991,-1.094 +8992,1.391 +8993,-0.447 +8994,-1.200 +8995,-0.739 +8996,-0.500 +8997,-0.736 +8998,0.411 +8999,1.079 +9000,0.431 +9001,-1.613 +9002,0.699 +9003,-0.472 +9004,-0.568 +9005,0.773 +9006,-0.855 +9007,-0.445 +9008,-1.216 +9009,0.129 +9010,1.315 +9011,1.414 +9012,-0.290 +9013,0.490 +9014,0.748 +9015,-0.063 +9016,0.055 +9017,0.709 +9018,0.697 +9019,-1.204 +9020,-0.737 +9021,0.446 +9022,-0.358 +9023,1.193 +9024,1.266 +9025,0.654 +9026,-0.905 +9027,1.143 +9028,0.333 +9029,-0.012 +9030,-0.377 +9031,-0.730 +9032,0.298 +9033,1.417 +9034,-0.299 +9035,0.142 +9036,0.129 +9037,-0.833 +9038,-0.185 +9039,0.575 +9040,1.192 +9041,-0.300 +9042,0.977 +9043,-0.836 +9044,0.526 +9045,0.365 +9046,0.268 +9047,-1.629 +9048,0.085 +9049,0.273 +9050,-0.259 +9051,0.577 +9052,-0.769 +9053,-0.448 +9054,-0.218 +9055,-0.150 +9056,0.607 +9057,0.649 +9058,0.734 +9059,2.086 +9060,0.078 +9061,-1.397 +9062,-0.028 +9063,0.286 +9064,-0.019 +9065,2.202 +9066,0.770 +9067,1.062 +9068,0.644 +9069,2.304 +9070,-0.904 +9071,-1.190 +9072,-0.302 +9073,-0.885 +9074,0.842 +9075,-1.750 +9076,-1.756 +9077,-1.924 +9078,0.748 +9079,-0.328 +9080,-1.499 +9081,0.581 +9082,1.850 +9083,1.027 +9084,-0.209 +9085,-0.267 +9086,1.291 +9087,0.362 +9088,0.021 +9089,-0.674 +9090,-0.453 +9091,0.458 +9092,-2.079 +9093,-1.360 +9094,0.582 +9095,0.738 +9096,0.034 +9097,0.458 +9098,-0.267 +9099,0.506 +9100,-0.584 +9101,-0.240 +9102,2.052 +9103,-0.523 +9104,-0.085 +9105,-0.103 +9106,0.293 +9107,-0.604 +9108,1.941 +9109,0.675 +9110,-0.748 +9111,0.147 +9112,-0.665 +9113,1.127 +9114,-1.854 +9115,0.409 +9116,-0.229 +9117,-0.537 +9118,0.391 +9119,0.415 +9120,-0.367 +9121,-1.252 +9122,-0.301 +9123,-0.828 +9124,-0.601 +9125,0.542 +9126,-0.075 +9127,-0.114 +9128,0.139 +9129,-0.161 +9130,-0.794 +9131,-2.521 +9132,0.384 +9133,1.073 +9134,0.367 +9135,-0.323 +9136,-0.659 +9137,0.512 +9138,-0.389 +9139,-1.468 +9140,-1.032 +9141,0.179 +9142,1.293 +9143,-2.085 +9144,0.735 +9145,0.415 +9146,0.172 +9147,0.558 +9148,-0.391 +9149,-0.235 +9150,0.289 +9151,0.055 +9152,0.240 +9153,-0.571 +9154,-0.265 +9155,0.760 +9156,-0.624 +9157,-0.760 +9158,-1.145 +9159,-0.570 +9160,-2.159 +9161,1.125 +9162,0.848 +9163,-0.509 +9164,-0.154 +9165,-0.293 +9166,0.743 +9167,-0.476 +9168,0.581 +9169,-1.029 +9170,0.205 +9171,1.126 +9172,0.047 +9173,-0.481 +9174,0.036 +9175,0.697 +9176,-0.533 +9177,-0.013 +9178,0.078 +9179,0.143 +9180,1.152 +9181,-0.163 +9182,0.338 +9183,-0.481 +9184,1.472 +9185,-0.503 +9186,-0.751 +9187,0.600 +9188,-0.471 +9189,1.201 +9190,-1.957 +9191,-1.206 +9192,-1.035 +9193,-0.998 +9194,-0.264 +9195,-0.578 +9196,0.216 +9197,-1.011 +9198,-0.722 +9199,0.272 +9200,0.250 +9201,0.608 +9202,1.112 +9203,0.868 +9204,-0.063 +9205,0.181 +9206,-0.114 +9207,-0.889 +9208,-0.138 +9209,-0.097 +9210,0.912 +9211,-0.317 +9212,0.503 +9213,0.489 +9214,0.287 +9215,1.476 +9216,0.016 +9217,-0.733 +9218,0.797 +9219,0.103 +9220,0.304 +9221,0.535 +9222,-0.952 +9223,-0.685 +9224,0.491 +9225,-0.101 +9226,0.176 +9227,-0.026 +9228,0.420 +9229,0.483 +9230,1.367 +9231,0.900 +9232,1.704 +9233,-1.512 +9234,0.865 +9235,1.085 +9236,-1.135 +9237,-0.053 +9238,-0.154 +9239,-0.582 +9240,-0.035 +9241,0.516 +9242,-0.420 +9243,0.437 +9244,0.444 +9245,-0.179 +9246,0.707 +9247,0.153 +9248,-1.986 +9249,0.725 +9250,-0.868 +9251,-0.704 +9252,0.332 +9253,2.173 +9254,-0.617 +9255,0.746 +9256,1.789 +9257,1.196 +9258,-0.719 +9259,-1.143 +9260,-0.305 +9261,-0.162 +9262,0.376 +9263,0.852 +9264,0.267 +9265,1.902 +9266,0.380 +9267,-2.429 +9268,0.403 +9269,-1.187 +9270,-1.309 +9271,-0.099 +9272,-0.636 +9273,0.807 +9274,1.074 +9275,0.039 +9276,0.347 +9277,0.650 +9278,-0.875 +9279,0.377 +9280,0.097 +9281,1.751 +9282,1.561 +9283,-0.975 +9284,0.608 +9285,0.080 +9286,-2.346 +9287,-0.086 +9288,1.873 +9289,0.896 +9290,0.321 +9291,1.073 +9292,-1.842 +9293,0.355 +9294,-0.881 +9295,-0.984 +9296,0.805 +9297,0.750 +9298,0.634 +9299,0.187 +9300,-1.250 +9301,0.845 +9302,1.594 +9303,0.140 +9304,0.551 +9305,0.316 +9306,1.643 +9307,0.827 +9308,-0.580 +9309,-0.274 +9310,1.252 +9311,-0.249 +9312,-0.452 +9313,-0.893 +9314,0.749 +9315,-1.218 +9316,-1.301 +9317,-0.717 +9318,1.739 +9319,-0.324 +9320,-0.186 +9321,0.643 +9322,0.010 +9323,-1.439 +9324,-0.662 +9325,1.350 +9326,1.710 +9327,-0.180 +9328,1.626 +9329,0.295 +9330,0.884 +9331,-0.235 +9332,0.075 +9333,-0.221 +9334,-0.567 +9335,-0.686 +9336,-0.267 +9337,-1.274 +9338,-0.381 +9339,1.251 +9340,0.380 +9341,0.468 +9342,-1.627 +9343,1.182 +9344,0.032 +9345,-0.357 +9346,-0.682 +9347,1.049 +9348,-1.774 +9349,-1.418 +9350,0.246 +9351,1.074 +9352,-0.198 +9353,1.584 +9354,-0.658 +9355,0.814 +9356,0.090 +9357,1.746 +9358,0.713 +9359,1.743 +9360,-0.450 +9361,0.124 +9362,-0.589 +9363,0.866 +9364,-0.147 +9365,0.851 +9366,0.615 +9367,-2.806 +9368,0.195 +9369,-1.123 +9370,-0.628 +9371,1.629 +9372,-0.602 +9373,-1.518 +9374,-1.291 +9375,-0.459 +9376,1.804 +9377,0.160 +9378,-0.628 +9379,-0.065 +9380,-0.196 +9381,-0.059 +9382,-0.074 +9383,1.139 +9384,0.076 +9385,-1.216 +9386,0.495 +9387,0.134 +9388,0.488 +9389,0.489 +9390,-0.432 +9391,-0.743 +9392,1.214 +9393,-0.276 +9394,2.675 +9395,-1.354 +9396,1.028 +9397,1.242 +9398,0.868 +9399,0.406 +9400,1.173 +9401,1.723 +9402,0.908 +9403,0.145 +9404,2.449 +9405,0.633 +9406,1.099 +9407,0.326 +9408,-0.976 +9409,1.852 +9410,-0.678 +9411,-0.569 +9412,-0.384 +9413,-1.156 +9414,-0.823 +9415,-1.760 +9416,0.862 +9417,0.156 +9418,-1.210 +9419,-1.469 +9420,0.296 +9421,-0.921 +9422,1.275 +9423,0.917 +9424,-0.888 +9425,-1.097 +9426,-0.953 +9427,0.439 +9428,0.103 +9429,-0.763 +9430,0.447 +9431,-0.232 +9432,0.296 +9433,2.905 +9434,1.562 +9435,-1.334 +9436,-0.800 +9437,0.577 +9438,0.909 +9439,1.855 +9440,-0.092 +9441,1.888 +9442,-0.671 +9443,-0.585 +9444,-0.781 +9445,-0.764 +9446,-0.693 +9447,-0.393 +9448,-0.707 +9449,1.506 +9450,-0.510 +9451,0.528 +9452,-1.636 +9453,-1.696 +9454,0.727 +9455,-0.087 +9456,-2.699 +9457,0.272 +9458,1.194 +9459,-0.081 +9460,0.377 +9461,0.767 +9462,-1.298 +9463,0.496 +9464,-1.746 +9465,-0.635 +9466,-0.362 +9467,0.473 +9468,-0.991 +9469,0.738 +9470,0.048 +9471,0.201 +9472,-0.264 +9473,0.528 +9474,-1.066 +9475,0.247 +9476,1.934 +9477,1.231 +9478,0.658 +9479,-0.599 +9480,0.036 +9481,-0.873 +9482,0.714 +9483,-1.628 +9484,1.411 +9485,-0.167 +9486,2.427 +9487,1.481 +9488,-0.241 +9489,0.619 +9490,0.759 +9491,-0.669 +9492,1.942 +9493,1.177 +9494,-1.027 +9495,1.064 +9496,1.035 +9497,-0.858 +9498,-0.642 +9499,0.226 +9500,0.413 +9501,1.568 +9502,-1.190 +9503,-0.240 +9504,-0.128 +9505,1.860 +9506,0.181 +9507,0.482 +9508,-0.757 +9509,-0.229 +9510,-0.025 +9511,-0.872 +9512,0.860 +9513,-0.806 +9514,0.973 +9515,0.138 +9516,1.568 +9517,-0.770 +9518,-0.607 +9519,0.004 +9520,0.577 +9521,-2.230 +9522,0.739 +9523,0.877 +9524,-2.239 +9525,0.781 +9526,0.772 +9527,0.368 +9528,0.375 +9529,-0.928 +9530,-0.165 +9531,1.176 +9532,-1.493 +9533,-2.017 +9534,0.209 +9535,0.901 +9536,0.975 +9537,-0.176 +9538,-0.675 +9539,0.826 +9540,-0.533 +9541,0.200 +9542,-1.505 +9543,-1.616 +9544,0.521 +9545,-1.080 +9546,-0.687 +9547,1.918 +9548,-0.621 +9549,-1.039 +9550,-2.465 +9551,0.951 +9552,0.113 +9553,0.042 +9554,1.742 +9555,-0.557 +9556,0.927 +9557,0.955 +9558,-0.027 +9559,-0.095 +9560,0.576 +9561,-0.813 +9562,0.598 +9563,-0.764 +9564,1.315 +9565,-0.069 +9566,0.457 +9567,0.842 +9568,-2.051 +9569,0.625 +9570,-0.585 +9571,0.164 +9572,0.335 +9573,0.583 +9574,-0.374 +9575,1.834 +9576,0.250 +9577,0.731 +9578,0.259 +9579,-1.098 +9580,-0.492 +9581,0.413 +9582,-0.902 +9583,0.588 +9584,-0.156 +9585,-1.455 +9586,-0.201 +9587,1.093 +9588,2.564 +9589,0.299 +9590,0.740 +9591,-0.790 +9592,-1.466 +9593,1.752 +9594,0.173 +9595,0.916 +9596,-0.180 +9597,-1.048 +9598,-1.528 +9599,0.110 +9600,-0.451 +9601,0.160 +9602,1.199 +9603,0.866 +9604,-1.532 +9605,1.356 +9606,-0.585 +9607,-0.700 +9608,-1.257 +9609,-0.353 +9610,1.104 +9611,-0.009 +9612,0.673 +9613,-2.949 +9614,0.192 +9615,-0.844 +9616,-0.988 +9617,-0.865 +9618,1.118 +9619,0.948 +9620,-1.481 +9621,1.622 +9622,1.042 +9623,0.604 +9624,1.294 +9625,-0.769 +9626,0.728 +9627,-0.364 +9628,1.132 +9629,-0.280 +9630,2.782 +9631,1.091 +9632,-1.165 +9633,-0.997 +9634,0.281 +9635,-1.088 +9636,0.423 +9637,-0.184 +9638,-0.056 +9639,1.306 +9640,-0.080 +9641,-0.151 +9642,0.008 +9643,-0.231 +9644,-0.520 +9645,-0.671 +9646,-1.957 +9647,-0.297 +9648,-1.212 +9649,0.278 +9650,1.201 +9651,0.204 +9652,2.000 +9653,0.003 +9654,-0.617 +9655,-0.242 +9656,-0.355 +9657,0.064 +9658,-0.725 +9659,-0.774 +9660,0.324 +9661,0.728 +9662,-1.692 +9663,-0.168 +9664,-1.706 +9665,1.545 +9666,-0.817 +9667,0.661 +9668,1.379 +9669,0.549 +9670,0.388 +9671,-1.019 +9672,-0.838 +9673,-1.179 +9674,0.935 +9675,-2.606 +9676,1.623 +9677,1.955 +9678,2.289 +9679,-0.909 +9680,0.508 +9681,-0.384 +9682,1.707 +9683,0.726 +9684,-1.758 +9685,-0.200 +9686,-0.117 +9687,-0.069 +9688,0.027 +9689,1.179 +9690,-1.031 +9691,-0.130 +9692,0.887 +9693,-0.410 +9694,0.537 +9695,-0.218 +9696,-1.808 +9697,-0.692 +9698,0.668 +9699,0.274 +9700,0.131 +9701,0.024 +9702,0.710 +9703,-0.300 +9704,-1.774 +9705,-2.429 +9706,-1.177 +9707,0.962 +9708,1.210 +9709,0.893 +9710,-0.244 +9711,-0.429 +9712,-0.501 +9713,-1.747 +9714,0.076 +9715,-0.103 +9716,0.814 +9717,-1.386 +9718,1.357 +9719,-0.079 +9720,1.222 +9721,0.374 +9722,-0.324 +9723,0.010 +9724,1.059 +9725,-0.286 +9726,-0.042 +9727,0.035 +9728,-0.182 +9729,-2.854 +9730,0.324 +9731,0.351 +9732,2.117 +9733,-0.771 +9734,-0.081 +9735,0.136 +9736,-0.432 +9737,0.079 +9738,2.737 +9739,1.057 +9740,-0.073 +9741,0.858 +9742,-0.722 +9743,1.751 +9744,-1.187 +9745,1.233 +9746,0.772 +9747,1.394 +9748,-0.267 +9749,1.017 +9750,-0.060 +9751,0.864 +9752,-0.796 +9753,-1.859 +9754,-0.996 +9755,0.522 +9756,0.472 +9757,0.605 +9758,-0.424 +9759,1.688 +9760,0.656 +9761,-1.260 +9762,-0.792 +9763,1.698 +9764,-0.695 +9765,1.187 +9766,0.376 +9767,-0.465 +9768,-0.579 +9769,-2.557 +9770,-1.082 +9771,0.640 +9772,-0.796 +9773,-0.320 +9774,0.929 +9775,0.464 +9776,0.543 +9777,0.106 +9778,-2.050 +9779,-0.431 +9780,1.134 +9781,-0.032 +9782,-0.786 +9783,-0.969 +9784,0.898 +9785,0.116 +9786,2.137 +9787,-1.807 +9788,0.425 +9789,0.060 +9790,-0.108 +9791,1.547 +9792,0.176 +9793,-0.007 +9794,-0.104 +9795,0.051 +9796,-0.128 +9797,-0.155 +9798,0.618 +9799,-1.342 +9800,-0.210 +9801,0.645 +9802,0.926 +9803,1.508 +9804,0.273 +9805,1.039 +9806,0.331 +9807,0.695 +9808,-0.033 +9809,0.052 +9810,-2.476 +9811,0.399 +9812,-0.161 +9813,-0.773 +9814,0.577 +9815,1.302 +9816,-1.025 +9817,-0.229 +9818,1.574 +9819,-1.504 +9820,1.232 +9821,-0.160 +9822,0.585 +9823,1.218 +9824,0.657 +9825,1.522 +9826,0.586 +9827,-1.041 +9828,-0.396 +9829,0.535 +9830,-0.009 +9831,-0.627 +9832,-1.036 +9833,-1.848 +9834,-0.404 +9835,1.548 +9836,1.192 +9837,0.821 +9838,1.941 +9839,0.965 +9840,-0.717 +9841,-0.952 +9842,-1.073 +9843,-0.078 +9844,-0.022 +9845,2.460 +9846,-0.775 +9847,-0.809 +9848,0.637 +9849,0.026 +9850,-0.050 +9851,2.814 +9852,-0.472 +9853,-1.684 +9854,-0.405 +9855,-1.020 +9856,-0.203 +9857,-0.186 +9858,0.326 +9859,-0.060 +9860,0.642 +9861,-1.138 +9862,-1.903 +9863,1.707 +9864,0.678 +9865,0.170 +9866,-0.584 +9867,-0.096 +9868,-1.285 +9869,-0.929 +9870,-0.271 +9871,-0.153 +9872,-0.611 +9873,-0.098 +9874,0.003 +9875,-0.415 +9876,0.005 +9877,-0.256 +9878,0.220 +9879,1.881 +9880,0.325 +9881,-2.510 +9882,0.565 +9883,-0.987 +9884,-0.155 +9885,1.044 +9886,0.057 +9887,0.147 +9888,1.522 +9889,0.187 +9890,0.394 +9891,1.158 +9892,-2.623 +9893,1.120 +9894,0.242 +9895,-0.656 +9896,0.386 +9897,0.242 +9898,0.433 +9899,-0.771 +9900,-0.205 +9901,0.403 +9902,-1.214 +9903,-0.067 +9904,0.142 +9905,1.081 +9906,-0.871 +9907,2.262 +9908,1.108 +9909,0.595 +9910,-0.486 +9911,0.686 +9912,-1.650 +9913,2.112 +9914,-1.207 +9915,-0.655 +9916,0.827 +9917,0.348 +9918,0.071 +9919,-0.831 +9920,-1.884 +9921,-0.180 +9922,-1.521 +9923,1.071 +9924,1.412 +9925,-0.244 +9926,-0.492 +9927,1.832 +9928,1.304 +9929,1.065 +9930,-0.066 +9931,-2.074 +9932,0.080 +9933,-1.554 +9934,-0.082 +9935,-0.576 +9936,0.795 +9937,0.362 +9938,1.695 +9939,0.251 +9940,1.099 +9941,0.343 +9942,0.571 +9943,-0.387 +9944,1.211 +9945,0.064 +9946,-0.766 +9947,-0.494 +9948,0.023 +9949,-0.425 +9950,0.025 +9951,-0.374 +9952,-1.366 +9953,-0.062 +9954,1.015 +9955,-2.421 +9956,0.086 +9957,-0.290 +9958,0.081 +9959,-0.700 +9960,0.099 +9961,-0.617 +9962,-1.214 +9963,-0.001 +9964,1.578 +9965,-2.886 +9966,0.253 +9967,0.554 +9968,-0.148 +9969,1.092 +9970,0.199 +9971,-2.019 +9972,0.272 +9973,0.442 +9974,0.408 +9975,0.183 +9976,1.503 +9977,-0.049 +9978,0.215 +9979,-0.116 +9980,1.079 +9981,0.643 +9982,1.081 +9983,-1.421 +9984,-0.757 +9985,1.001 +9986,-0.198 +9987,0.506 +9988,1.096 +9989,0.644 +9990,-1.106 +9991,1.157 +9992,-0.396 +9993,0.241 +9994,-0.221 +9995,-0.303 +9996,0.088 +9997,0.204 +9998,1.119 +9999,0.882 +10000,0.405 +10001,0.491 +10002,-1.287 +10003,-0.248 +10004,-1.042 +10005,-0.363 +10006,0.591 +10007,0.295 +10008,0.570 +10009,0.849 +10010,-0.962 +10011,0.676 +10012,0.191 +10013,-0.356 +10014,1.441 +10015,1.364 +10016,2.281 +10017,0.448 +10018,0.993 +10019,0.295 +10020,-1.406 +10021,0.644 +10022,-1.837 +10023,0.316 +10024,0.658 +10025,-0.418 +10026,1.087 +10027,-0.434 +10028,-0.984 +10029,0.756 +10030,-0.439 +10031,0.477 +10032,-0.970 +10033,-0.584 +10034,-0.802 +10035,-2.096 +10036,-1.331 +10037,-0.296 +10038,-1.600 +10039,0.321 +10040,-0.056 +10041,1.115 +10042,0.503 +10043,1.583 +10044,-0.524 +10045,-1.265 +10046,0.611 +10047,0.276 +10048,-1.713 +10049,0.970 +10050,-1.310 +10051,0.935 +10052,0.191 +10053,-1.746 +10054,1.070 +10055,0.201 +10056,0.934 +10057,0.264 +10058,-1.917 +10059,-0.914 +10060,0.556 +10061,0.866 +10062,1.121 +10063,-1.358 +10064,0.586 +10065,0.798 +10066,-0.740 +10067,-1.178 +10068,1.644 +10069,-0.890 +10070,1.424 +10071,-0.239 +10072,-0.595 +10073,-1.588 +10074,0.355 +10075,-0.478 +10076,-1.864 +10077,0.343 +10078,-1.380 +10079,0.085 +10080,0.231 +10081,0.527 +10082,-0.158 +10083,0.555 +10084,-0.184 +10085,-2.447 +10086,1.789 +10087,0.816 +10088,1.271 +10089,0.947 +10090,-0.979 +10091,-0.016 +10092,0.944 +10093,0.462 +10094,-0.434 +10095,0.109 +10096,-0.072 +10097,1.415 +10098,1.853 +10099,-1.730 +10100,1.515 +10101,0.466 +10102,-1.147 +10103,1.231 +10104,1.364 +10105,-1.513 +10106,-1.033 +10107,-0.125 +10108,0.286 +10109,-0.285 +10110,-0.681 +10111,-0.278 +10112,-1.111 +10113,-0.375 +10114,-0.590 +10115,1.354 +10116,0.942 +10117,0.656 +10118,-0.540 +10119,-0.897 +10120,0.582 +10121,0.912 +10122,-0.394 +10123,1.948 +10124,-0.562 +10125,1.939 +10126,-0.433 +10127,1.958 +10128,1.211 +10129,-0.763 +10130,0.920 +10131,0.165 +10132,-0.892 +10133,-0.636 +10134,0.307 +10135,-1.965 +10136,-0.962 +10137,-0.024 +10138,-0.934 +10139,-0.678 +10140,0.245 +10141,0.620 +10142,-1.381 +10143,-0.532 +10144,-0.994 +10145,-1.630 +10146,0.805 +10147,0.616 +10148,2.188 +10149,0.952 +10150,-1.272 +10151,1.716 +10152,-1.146 +10153,0.051 +10154,-1.295 +10155,0.048 +10156,0.369 +10157,0.372 +10158,-1.010 +10159,-0.914 +10160,0.384 +10161,-1.088 +10162,0.110 +10163,-0.732 +10164,-2.073 +10165,-1.973 +10166,-0.140 +10167,0.419 +10168,0.184 +10169,-2.151 +10170,1.098 +10171,0.829 +10172,-0.109 +10173,0.158 +10174,0.325 +10175,1.182 +10176,0.173 +10177,0.824 +10178,-0.389 +10179,-1.194 +10180,1.020 +10181,1.511 +10182,0.634 +10183,0.420 +10184,-0.961 +10185,0.424 +10186,0.006 +10187,0.607 +10188,0.013 +10189,-0.892 +10190,3.402 +10191,-1.285 +10192,-0.207 +10193,-0.289 +10194,0.238 +10195,-1.420 +10196,0.231 +10197,2.260 +10198,-0.595 +10199,-0.219 +10200,-1.231 +10201,2.369 +10202,-0.307 +10203,0.258 +10204,-0.913 +10205,-2.893 +10206,-0.111 +10207,0.323 +10208,2.426 +10209,-1.478 +10210,0.458 +10211,-0.716 +10212,1.262 +10213,-0.146 +10214,-0.912 +10215,0.350 +10216,0.004 +10217,0.344 +10218,0.421 +10219,0.257 +10220,0.131 +10221,0.894 +10222,0.261 +10223,-2.341 +10224,-0.054 +10225,-0.965 +10226,-0.285 +10227,-0.535 +10228,1.576 +10229,-1.766 +10230,0.799 +10231,-0.657 +10232,0.050 +10233,-1.781 +10234,-0.725 +10235,1.318 +10236,-0.922 +10237,-1.771 +10238,-0.211 +10239,-0.010 +10240,-1.170 +10241,-0.085 +10242,-0.040 +10243,0.999 +10244,-0.420 +10245,-0.258 +10246,1.146 +10247,2.369 +10248,-0.895 +10249,0.082 +10250,-1.823 +10251,-0.158 +10252,0.068 +10253,-1.302 +10254,-1.408 +10255,-0.304 +10256,-1.287 +10257,0.534 +10258,-0.070 +10259,-2.114 +10260,0.279 +10261,-0.218 +10262,0.991 +10263,1.472 +10264,-0.788 +10265,-0.408 +10266,0.685 +10267,0.943 +10268,-0.166 +10269,0.118 +10270,-0.180 +10271,-0.713 +10272,-0.880 +10273,1.042 +10274,2.385 +10275,0.972 +10276,0.594 +10277,-0.846 +10278,0.567 +10279,-1.256 +10280,1.300 +10281,-0.856 +10282,0.545 +10283,0.005 +10284,1.044 +10285,0.103 +10286,1.026 +10287,0.463 +10288,1.248 +10289,1.469 +10290,-0.545 +10291,-1.118 +10292,0.134 +10293,-1.182 +10294,0.654 +10295,0.930 +10296,0.382 +10297,0.860 +10298,-0.240 +10299,-2.141 +10300,0.596 +10301,0.106 +10302,0.924 +10303,-0.637 +10304,1.684 +10305,-0.077 +10306,-0.562 +10307,0.332 +10308,0.780 +10309,0.964 +10310,-0.337 +10311,-0.659 +10312,0.803 +10313,-0.135 +10314,-0.763 +10315,-0.930 +10316,-0.235 +10317,-0.978 +10318,0.798 +10319,0.674 +10320,-0.540 +10321,-0.362 +10322,-0.621 +10323,-0.703 +10324,0.876 +10325,-0.088 +10326,-0.875 +10327,-0.197 +10328,-1.061 +10329,0.756 +10330,0.803 +10331,0.585 +10332,-0.580 +10333,0.351 +10334,-0.144 +10335,1.799 +10336,0.816 +10337,0.223 +10338,-1.062 +10339,-0.315 +10340,1.400 +10341,0.126 +10342,0.241 +10343,-0.348 +10344,0.006 +10345,-0.016 +10346,-1.455 +10347,0.392 +10348,-0.493 +10349,0.718 +10350,-1.513 +10351,0.627 +10352,-1.212 +10353,-1.349 +10354,-0.293 +10355,-0.043 +10356,0.275 +10357,0.006 +10358,1.233 +10359,-1.038 +10360,-0.417 +10361,0.070 +10362,-1.178 +10363,-0.759 +10364,0.300 +10365,0.822 +10366,0.385 +10367,-0.294 +10368,1.156 +10369,1.077 +10370,-1.219 +10371,0.546 +10372,0.866 +10373,-0.973 +10374,0.590 +10375,-0.563 +10376,-0.218 +10377,0.919 +10378,-2.300 +10379,-0.553 +10380,1.367 +10381,-0.753 +10382,-0.020 +10383,0.723 +10384,1.258 +10385,0.243 +10386,0.938 +10387,0.980 +10388,-1.522 +10389,1.579 +10390,-0.077 +10391,1.386 +10392,-0.431 +10393,1.247 +10394,-0.367 +10395,0.558 +10396,-0.962 +10397,-0.738 +10398,2.082 +10399,0.942 +10400,-1.010 +10401,-1.301 +10402,-0.648 +10403,-1.442 +10404,1.971 +10405,-0.324 +10406,-0.690 +10407,0.624 +10408,0.381 +10409,-0.031 +10410,-0.618 +10411,-1.229 +10412,1.236 +10413,-2.016 +10414,-0.421 +10415,-2.166 +10416,0.019 +10417,1.345 +10418,0.333 +10419,1.742 +10420,-1.495 +10421,0.995 +10422,0.058 +10423,-1.476 +10424,0.886 +10425,0.231 +10426,-1.460 +10427,-0.757 +10428,0.039 +10429,1.492 +10430,-1.219 +10431,-0.672 +10432,1.141 +10433,0.031 +10434,0.024 +10435,0.172 +10436,1.457 +10437,-1.403 +10438,-0.524 +10439,0.814 +10440,-0.681 +10441,1.203 +10442,1.101 +10443,-1.851 +10444,0.404 +10445,0.580 +10446,-0.095 +10447,0.795 +10448,0.238 +10449,0.258 +10450,-0.137 +10451,0.036 +10452,-0.865 +10453,-1.360 +10454,-0.383 +10455,-0.526 +10456,0.038 +10457,-1.187 +10458,0.725 +10459,-0.534 +10460,1.187 +10461,1.360 +10462,0.835 +10463,-0.844 +10464,0.710 +10465,0.253 +10466,-0.290 +10467,0.656 +10468,1.049 +10469,-1.009 +10470,0.068 +10471,-0.183 +10472,-0.309 +10473,1.222 +10474,-0.723 +10475,-1.503 +10476,0.718 +10477,1.516 +10478,1.349 +10479,0.081 +10480,-0.939 +10481,0.507 +10482,-0.548 +10483,-0.360 +10484,1.275 +10485,0.621 +10486,-1.444 +10487,-0.584 +10488,0.018 +10489,-0.534 +10490,-0.674 +10491,1.668 +10492,-0.104 +10493,-1.291 +10494,-0.435 +10495,0.403 +10496,0.607 +10497,-0.283 +10498,0.237 +10499,1.114 +10500,0.174 +10501,-1.938 +10502,0.828 +10503,0.143 +10504,1.419 +10505,-0.933 +10506,-0.022 +10507,-0.456 +10508,0.026 +10509,0.855 +10510,-0.265 +10511,0.403 +10512,0.570 +10513,0.655 +10514,1.122 +10515,-1.242 +10516,0.745 +10517,1.457 +10518,0.682 +10519,0.345 +10520,0.225 +10521,0.708 +10522,-0.348 +10523,0.939 +10524,-0.824 +10525,-0.087 +10526,0.043 +10527,0.643 +10528,0.866 +10529,0.700 +10530,1.013 +10531,-0.183 +10532,-1.787 +10533,-1.091 +10534,-0.665 +10535,-1.856 +10536,-0.172 +10537,1.217 +10538,0.751 +10539,-0.138 +10540,0.177 +10541,0.122 +10542,-0.928 +10543,-1.042 +10544,-0.175 +10545,-0.240 +10546,-1.651 +10547,1.801 +10548,-1.286 +10549,0.893 +10550,0.290 +10551,0.002 +10552,-0.721 +10553,-0.095 +10554,-0.945 +10555,-0.116 +10556,-0.115 +10557,1.753 +10558,0.000 +10559,1.309 +10560,0.270 +10561,-0.117 +10562,1.064 +10563,0.454 +10564,0.028 +10565,0.458 +10566,0.614 +10567,0.566 +10568,-0.233 +10569,0.104 +10570,0.303 +10571,2.191 +10572,-0.194 +10573,-1.056 +10574,0.479 +10575,0.029 +10576,1.620 +10577,-0.226 +10578,0.618 +10579,-0.821 +10580,-2.072 +10581,-1.205 +10582,-0.195 +10583,0.631 +10584,0.224 +10585,1.197 +10586,-0.779 +10587,-0.964 +10588,-0.861 +10589,-1.690 +10590,-0.799 +10591,-1.119 +10592,-1.427 +10593,0.386 +10594,-1.606 +10595,-1.416 +10596,-2.105 +10597,-0.266 +10598,-1.554 +10599,-0.225 +10600,-0.525 +10601,0.649 +10602,0.205 +10603,0.295 +10604,0.248 +10605,-0.672 +10606,-0.530 +10607,0.888 +10608,0.776 +10609,0.632 +10610,1.464 +10611,0.650 +10612,-1.556 +10613,0.388 +10614,0.512 +10615,-0.757 +10616,0.036 +10617,-0.508 +10618,-2.714 +10619,0.024 +10620,1.578 +10621,-0.348 +10622,-1.729 +10623,-0.027 +10624,-0.375 +10625,-0.169 +10626,-0.160 +10627,1.357 +10628,-1.365 +10629,-1.968 +10630,0.828 +10631,0.306 +10632,1.058 +10633,-0.500 +10634,-1.675 +10635,1.038 +10636,0.850 +10637,0.406 +10638,1.256 +10639,0.910 +10640,-0.542 +10641,-0.496 +10642,-0.978 +10643,0.894 +10644,-0.481 +10645,-1.014 +10646,-0.129 +10647,-1.062 +10648,-0.446 +10649,0.324 +10650,0.459 +10651,0.424 +10652,-1.508 +10653,-0.915 +10654,-0.379 +10655,-0.552 +10656,-0.459 +10657,2.220 +10658,0.945 +10659,-0.034 +10660,-0.342 +10661,0.705 +10662,0.007 +10663,-0.242 +10664,1.502 +10665,-0.211 +10666,-1.347 +10667,0.406 +10668,-0.804 +10669,0.759 +10670,0.394 +10671,-0.278 +10672,0.693 +10673,-1.557 +10674,-0.768 +10675,-0.463 +10676,0.051 +10677,0.667 +10678,1.899 +10679,1.842 +10680,0.624 +10681,-1.448 +10682,0.555 +10683,-0.787 +10684,1.775 +10685,-1.892 +10686,-0.407 +10687,2.386 +10688,0.959 +10689,-1.199 +10690,-3.176 +10691,2.007 +10692,-0.078 +10693,0.316 +10694,-0.192 +10695,0.939 +10696,0.163 +10697,-0.907 +10698,1.625 +10699,0.501 +10700,-0.191 +10701,-1.381 +10702,0.950 +10703,0.298 +10704,-2.448 +10705,0.682 +10706,0.430 +10707,-0.523 +10708,1.253 +10709,0.044 +10710,0.855 +10711,1.927 +10712,0.861 +10713,-1.500 +10714,-0.761 +10715,-1.946 +10716,0.271 +10717,-1.581 +10718,0.080 +10719,0.098 +10720,-0.854 +10721,1.542 +10722,-1.337 +10723,0.323 +10724,0.571 +10725,-0.732 +10726,0.186 +10727,0.684 +10728,-0.014 +10729,-1.426 +10730,-0.270 +10731,-0.931 +10732,1.451 +10733,-0.046 +10734,-0.464 +10735,-0.727 +10736,-1.161 +10737,-0.311 +10738,-0.020 +10739,-0.214 +10740,0.336 +10741,-0.012 +10742,-0.445 +10743,1.771 +10744,1.989 +10745,-0.815 +10746,-0.848 +10747,-1.037 +10748,0.213 +10749,-1.054 +10750,0.287 +10751,1.077 +10752,-0.196 +10753,-0.322 +10754,-0.037 +10755,0.802 +10756,-0.918 +10757,-0.496 +10758,-0.648 +10759,-0.617 +10760,-0.059 +10761,0.455 +10762,-0.959 +10763,0.558 +10764,-0.207 +10765,0.501 +10766,1.950 +10767,1.258 +10768,0.693 +10769,-0.555 +10770,2.341 +10771,-0.659 +10772,0.169 +10773,-1.287 +10774,0.179 +10775,-1.491 +10776,0.820 +10777,1.096 +10778,0.887 +10779,-1.266 +10780,-1.100 +10781,-1.024 +10782,1.001 +10783,-1.319 +10784,-1.188 +10785,-0.893 +10786,0.204 +10787,2.042 +10788,-1.168 +10789,-0.271 +10790,0.150 +10791,-1.050 +10792,0.917 +10793,-2.002 +10794,0.611 +10795,-0.330 +10796,-0.067 +10797,-1.298 +10798,-0.172 +10799,0.126 +10800,0.385 +10801,-0.839 +10802,-0.477 +10803,-1.105 +10804,0.550 +10805,-0.639 +10806,-0.690 +10807,0.206 +10808,0.991 +10809,0.506 +10810,0.291 +10811,1.306 +10812,-0.726 +10813,-0.884 +10814,-2.372 +10815,0.694 +10816,-1.345 +10817,0.953 +10818,1.545 +10819,0.561 +10820,-1.562 +10821,0.286 +10822,0.497 +10823,-0.054 +10824,-0.291 +10825,-0.358 +10826,-1.089 +10827,-0.152 +10828,-1.488 +10829,-0.073 +10830,0.677 +10831,-0.460 +10832,-1.236 +10833,-0.315 +10834,0.850 +10835,1.172 +10836,-0.059 +10837,-1.003 +10838,0.056 +10839,0.592 +10840,0.629 +10841,1.166 +10842,-0.429 +10843,-1.588 +10844,1.362 +10845,-0.979 +10846,1.074 +10847,0.102 +10848,2.311 +10849,-0.500 +10850,-0.780 +10851,-0.282 +10852,-0.056 +10853,0.984 +10854,-0.774 +10855,0.015 +10856,0.743 +10857,-0.476 +10858,2.180 +10859,-0.048 +10860,0.833 +10861,1.067 +10862,1.697 +10863,1.608 +10864,0.425 +10865,0.535 +10866,0.891 +10867,1.708 +10868,0.379 +10869,3.152 +10870,-0.504 +10871,0.103 +10872,0.339 +10873,-1.370 +10874,-0.559 +10875,-0.546 +10876,1.873 +10877,0.298 +10878,0.215 +10879,1.518 +10880,-0.796 +10881,1.451 +10882,0.854 +10883,-1.105 +10884,-2.013 +10885,1.456 +10886,0.876 +10887,1.264 +10888,-0.550 +10889,-0.081 +10890,-0.175 +10891,-0.140 +10892,0.792 +10893,-2.048 +10894,1.345 +10895,0.701 +10896,-1.473 +10897,-1.804 +10898,-0.152 +10899,0.611 +10900,-0.439 +10901,-2.102 +10902,-1.308 +10903,-1.524 +10904,-0.066 +10905,-1.206 +10906,-0.731 +10907,-1.021 +10908,0.819 +10909,-0.638 +10910,0.200 +10911,0.820 +10912,-0.033 +10913,-1.474 +10914,0.985 +10915,0.829 +10916,1.400 +10917,0.595 +10918,2.061 +10919,-1.121 +10920,0.043 +10921,0.365 +10922,-0.528 +10923,0.402 +10924,-0.129 +10925,0.800 +10926,-0.957 +10927,0.982 +10928,-0.231 +10929,-1.157 +10930,1.498 +10931,-0.307 +10932,-1.139 +10933,-0.734 +10934,0.054 +10935,-0.014 +10936,-0.430 +10937,-1.763 +10938,-0.332 +10939,0.146 +10940,-0.268 +10941,-2.098 +10942,-0.023 +10943,0.930 +10944,-1.566 +10945,0.854 +10946,-0.135 +10947,-1.500 +10948,-0.644 +10949,-1.368 +10950,1.385 +10951,-0.860 +10952,-1.047 +10953,-0.103 +10954,0.342 +10955,-1.088 +10956,0.204 +10957,-0.527 +10958,1.049 +10959,-0.757 +10960,-0.411 +10961,2.485 +10962,0.086 +10963,1.021 +10964,0.339 +10965,1.872 +10966,0.831 +10967,1.418 +10968,-0.419 +10969,0.825 +10970,-1.363 +10971,0.757 +10972,1.720 +10973,-1.388 +10974,0.251 +10975,0.461 +10976,-0.046 +10977,0.167 +10978,2.031 +10979,-1.156 +10980,-0.306 +10981,-0.677 +10982,0.804 +10983,-0.030 +10984,0.986 +10985,0.531 +10986,-0.191 +10987,2.128 +10988,-1.210 +10989,-1.508 +10990,0.566 +10991,0.151 +10992,1.018 +10993,0.303 +10994,-1.401 +10995,-0.181 +10996,-0.207 +10997,-0.100 +10998,-0.962 +10999,1.301 +11000,0.712 +11001,-1.034 +11002,-2.411 +11003,0.696 +11004,1.169 +11005,0.343 +11006,0.516 +11007,-1.102 +11008,0.635 +11009,1.156 +11010,0.782 +11011,0.256 +11012,-1.330 +11013,0.961 +11014,0.462 +11015,1.110 +11016,0.267 +11017,0.120 +11018,0.491 +11019,-1.050 +11020,-0.551 +11021,0.829 +11022,-0.209 +11023,0.378 +11024,-0.573 +11025,1.570 +11026,-1.161 +11027,-0.335 +11028,-0.350 +11029,-0.502 +11030,-0.541 +11031,2.546 +11032,-0.596 +11033,-0.214 +11034,-0.938 +11035,0.576 +11036,-2.813 +11037,-2.001 +11038,0.041 +11039,-0.753 +11040,0.107 +11041,-0.763 +11042,-0.978 +11043,0.509 +11044,1.167 +11045,-1.111 +11046,0.579 +11047,1.061 +11048,-0.846 +11049,-0.599 +11050,-1.583 +11051,-1.349 +11052,0.231 +11053,-0.505 +11054,0.011 +11055,1.197 +11056,0.075 +11057,-0.553 +11058,-0.476 +11059,-0.420 +11060,1.733 +11061,0.564 +11062,0.873 +11063,0.304 +11064,1.533 +11065,0.546 +11066,-1.037 +11067,-0.650 +11068,-0.935 +11069,-0.758 +11070,-0.694 +11071,2.019 +11072,-0.402 +11073,0.544 +11074,1.917 +11075,-2.050 +11076,0.464 +11077,-2.051 +11078,1.919 +11079,1.447 +11080,-0.032 +11081,-0.970 +11082,-1.121 +11083,1.672 +11084,0.601 +11085,-0.201 +11086,-0.262 +11087,0.968 +11088,1.981 +11089,0.252 +11090,-1.455 +11091,0.088 +11092,-0.106 +11093,0.102 +11094,-0.135 +11095,-1.024 +11096,0.143 +11097,0.849 +11098,-0.045 +11099,0.708 +11100,-1.764 +11101,-0.816 +11102,0.624 +11103,-0.074 +11104,-0.100 +11105,0.451 +11106,0.743 +11107,0.665 +11108,-2.558 +11109,0.566 +11110,1.772 +11111,0.740 +11112,0.503 +11113,-1.255 +11114,-0.467 +11115,0.757 +11116,0.547 +11117,-0.172 +11118,1.484 +11119,1.150 +11120,1.208 +11121,0.557 +11122,-0.931 +11123,-1.679 +11124,1.536 +11125,0.002 +11126,-0.467 +11127,0.143 +11128,-0.826 +11129,0.526 +11130,0.739 +11131,0.220 +11132,-0.390 +11133,0.391 +11134,0.460 +11135,-0.881 +11136,-1.435 +11137,0.220 +11138,0.238 +11139,0.287 +11140,-1.636 +11141,-0.183 +11142,0.803 +11143,0.248 +11144,0.729 +11145,-1.453 +11146,-0.785 +11147,-1.100 +11148,-0.297 +11149,0.027 +11150,0.357 +11151,-0.962 +11152,0.559 +11153,1.259 +11154,-0.743 +11155,0.829 +11156,-0.674 +11157,-0.676 +11158,0.269 +11159,-0.891 +11160,0.053 +11161,-2.064 +11162,0.839 +11163,-1.271 +11164,0.162 +11165,-0.937 +11166,0.394 +11167,-0.195 +11168,-0.647 +11169,1.444 +11170,-1.098 +11171,0.297 +11172,-0.524 +11173,0.343 +11174,-0.960 +11175,0.144 +11176,-0.300 +11177,0.856 +11178,-0.776 +11179,0.495 +11180,1.078 +11181,2.407 +11182,-0.519 +11183,0.429 +11184,0.564 +11185,1.938 +11186,-0.549 +11187,0.882 +11188,0.402 +11189,-1.036 +11190,1.251 +11191,-1.396 +11192,-1.237 +11193,1.179 +11194,-0.458 +11195,0.102 +11196,0.338 +11197,-0.046 +11198,-0.570 +11199,-0.633 +11200,-0.301 +11201,2.087 +11202,0.237 +11203,-1.492 +11204,1.135 +11205,1.519 +11206,1.000 +11207,-0.661 +11208,-0.740 +11209,1.584 +11210,-1.003 +11211,-0.041 +11212,0.661 +11213,0.388 +11214,-1.376 +11215,-1.008 +11216,-1.690 +11217,0.376 +11218,-0.136 +11219,0.137 +11220,1.476 +11221,-0.259 +11222,1.344 +11223,0.358 +11224,-2.217 +11225,1.685 +11226,0.518 +11227,0.653 +11228,0.204 +11229,-0.418 +11230,-0.164 +11231,1.192 +11232,1.206 +11233,-0.928 +11234,0.857 +11235,-1.699 +11236,0.473 +11237,0.474 +11238,-0.773 +11239,1.293 +11240,-1.729 +11241,-0.486 +11242,0.804 +11243,-0.457 +11244,-0.713 +11245,-0.831 +11246,-1.375 +11247,-0.253 +11248,0.135 +11249,0.458 +11250,0.879 +11251,1.415 +11252,1.016 +11253,0.374 +11254,0.722 +11255,-0.349 +11256,-0.390 +11257,0.643 +11258,-0.861 +11259,-1.690 +11260,0.427 +11261,-1.636 +11262,-1.629 +11263,-1.587 +11264,-0.991 +11265,1.019 +11266,1.142 +11267,-0.157 +11268,0.444 +11269,1.516 +11270,0.357 +11271,-0.873 +11272,-0.149 +11273,0.784 +11274,0.013 +11275,1.893 +11276,1.292 +11277,0.639 +11278,-0.450 +11279,-0.040 +11280,-0.439 +11281,-0.219 +11282,0.135 +11283,-0.057 +11284,0.897 +11285,-0.788 +11286,1.436 +11287,0.814 +11288,1.050 +11289,-1.351 +11290,0.269 +11291,-2.198 +11292,-0.222 +11293,1.739 +11294,0.571 +11295,0.437 +11296,0.160 +11297,-0.168 +11298,1.553 +11299,0.908 +11300,1.158 +11301,0.306 +11302,0.364 +11303,1.221 +11304,-0.400 +11305,-0.265 +11306,-0.170 +11307,0.931 +11308,-0.840 +11309,0.355 +11310,1.550 +11311,-0.461 +11312,0.184 +11313,-1.300 +11314,1.201 +11315,0.625 +11316,0.575 +11317,-2.173 +11318,1.770 +11319,0.829 +11320,-0.935 +11321,-0.092 +11322,-0.401 +11323,-0.051 +11324,1.008 +11325,1.556 +11326,-0.101 +11327,1.541 +11328,1.339 +11329,0.671 +11330,-0.640 +11331,-0.122 +11332,-0.303 +11333,0.358 +11334,-0.073 +11335,-0.454 +11336,1.003 +11337,-1.071 +11338,-1.058 +11339,-0.939 +11340,0.064 +11341,0.135 +11342,0.191 +11343,-0.717 +11344,-1.486 +11345,-0.768 +11346,-0.120 +11347,-0.028 +11348,-0.710 +11349,0.958 +11350,-2.141 +11351,0.147 +11352,-0.921 +11353,0.215 +11354,-0.598 +11355,-1.352 +11356,0.434 +11357,-0.761 +11358,1.125 +11359,-0.004 +11360,-0.155 +11361,-0.563 +11362,-1.030 +11363,0.310 +11364,-1.211 +11365,0.462 +11366,-0.642 +11367,-1.258 +11368,0.801 +11369,-0.848 +11370,1.990 +11371,-1.243 +11372,0.962 +11373,-0.190 +11374,-0.124 +11375,-0.963 +11376,-0.094 +11377,0.195 +11378,-0.792 +11379,1.477 +11380,-1.169 +11381,0.008 +11382,-2.503 +11383,-0.788 +11384,-0.270 +11385,-0.754 +11386,-1.047 +11387,-0.572 +11388,-1.202 +11389,-0.830 +11390,-0.332 +11391,0.176 +11392,-0.764 +11393,0.692 +11394,1.269 +11395,1.238 +11396,-2.138 +11397,1.769 +11398,-0.159 +11399,-0.944 +11400,0.567 +11401,-0.860 +11402,-0.608 +11403,-0.265 +11404,1.265 +11405,-1.280 +11406,-1.201 +11407,-0.213 +11408,-1.034 +11409,0.593 +11410,-1.027 +11411,-0.384 +11412,-0.799 +11413,-0.089 +11414,0.886 +11415,0.801 +11416,1.122 +11417,-0.161 +11418,0.522 +11419,0.271 +11420,0.305 +11421,1.307 +11422,0.890 +11423,-1.538 +11424,-0.410 +11425,-0.158 +11426,0.499 +11427,-1.174 +11428,2.344 +11429,-0.942 +11430,0.482 +11431,-0.052 +11432,0.099 +11433,-1.693 +11434,-0.101 +11435,-2.135 +11436,0.068 +11437,-0.622 +11438,-0.345 +11439,0.855 +11440,-1.082 +11441,-2.863 +11442,-0.254 +11443,-0.493 +11444,-0.354 +11445,0.108 +11446,-0.115 +11447,0.478 +11448,0.822 +11449,-0.413 +11450,-0.317 +11451,-0.278 +11452,0.013 +11453,0.165 +11454,0.667 +11455,0.238 +11456,0.032 +11457,-0.478 +11458,-1.890 +11459,0.577 +11460,2.150 +11461,0.166 +11462,1.069 +11463,0.605 +11464,0.816 +11465,-0.396 +11466,-0.086 +11467,0.172 +11468,1.145 +11469,0.997 +11470,-0.190 +11471,1.781 +11472,-0.598 +11473,-0.395 +11474,-1.170 +11475,-0.417 +11476,-0.920 +11477,-1.499 +11478,-1.852 +11479,1.626 +11480,-0.562 +11481,0.392 +11482,-1.004 +11483,-0.798 +11484,-0.685 +11485,-0.699 +11486,1.312 +11487,0.315 +11488,-0.764 +11489,1.667 +11490,-0.182 +11491,0.023 +11492,0.811 +11493,1.157 +11494,-0.830 +11495,-0.078 +11496,-0.842 +11497,0.213 +11498,-0.600 +11499,0.231 +11500,-1.147 +11501,-0.979 +11502,0.495 +11503,1.186 +11504,0.597 +11505,-0.965 +11506,0.662 +11507,0.937 +11508,-0.096 +11509,2.414 +11510,0.774 +11511,1.699 +11512,-1.664 +11513,0.151 +11514,-0.379 +11515,0.661 +11516,0.435 +11517,-0.351 +11518,0.212 +11519,0.488 +11520,0.409 +11521,-0.786 +11522,1.523 +11523,1.414 +11524,0.687 +11525,0.520 +11526,-0.057 +11527,-0.322 +11528,-0.824 +11529,-1.690 +11530,-0.429 +11531,-1.555 +11532,-0.396 +11533,-1.515 +11534,-0.594 +11535,0.479 +11536,0.724 +11537,-1.124 +11538,0.219 +11539,0.008 +11540,0.453 +11541,-0.024 +11542,-0.617 +11543,1.123 +11544,0.379 +11545,0.821 +11546,-0.080 +11547,1.140 +11548,-0.418 +11549,-0.688 +11550,1.624 +11551,-0.677 +11552,-1.120 +11553,-0.771 +11554,0.793 +11555,-1.320 +11556,-0.638 +11557,-0.448 +11558,0.342 +11559,0.923 +11560,0.612 +11561,0.554 +11562,-0.334 +11563,2.058 +11564,-1.388 +11565,-0.948 +11566,0.711 +11567,-0.630 +11568,0.325 +11569,-0.007 +11570,-1.410 +11571,-2.150 +11572,1.394 +11573,0.488 +11574,0.424 +11575,-1.094 +11576,-1.227 +11577,0.280 +11578,0.172 +11579,-0.885 +11580,1.589 +11581,0.651 +11582,1.267 +11583,-0.413 +11584,-0.015 +11585,0.195 +11586,1.714 +11587,0.863 +11588,-0.591 +11589,1.707 +11590,0.524 +11591,-0.822 +11592,1.253 +11593,-0.053 +11594,1.323 +11595,0.637 +11596,1.220 +11597,-1.316 +11598,-0.194 +11599,0.660 +11600,-0.130 +11601,-0.717 +11602,0.216 +11603,0.478 +11604,-0.098 +11605,-0.370 +11606,-1.573 +11607,0.653 +11608,-0.583 +11609,0.931 +11610,0.731 +11611,1.206 +11612,-0.379 +11613,-2.136 +11614,1.244 +11615,-0.551 +11616,0.541 +11617,-0.659 +11618,-0.725 +11619,1.467 +11620,-1.115 +11621,-0.818 +11622,-0.899 +11623,-0.949 +11624,0.857 +11625,-1.262 +11626,1.186 +11627,-1.261 +11628,2.125 +11629,0.862 +11630,0.014 +11631,-1.454 +11632,0.577 +11633,-0.996 +11634,-0.701 +11635,0.536 +11636,-0.656 +11637,0.649 +11638,1.547 +11639,-0.136 +11640,-0.787 +11641,-0.304 +11642,-0.989 +11643,0.047 +11644,1.039 +11645,0.147 +11646,0.688 +11647,0.964 +11648,0.760 +11649,-0.034 +11650,-0.569 +11651,0.137 +11652,0.862 +11653,-0.582 +11654,-0.215 +11655,-0.972 +11656,-1.195 +11657,0.318 +11658,-0.873 +11659,-0.365 +11660,-0.327 +11661,1.080 +11662,-0.393 +11663,-2.092 +11664,2.462 +11665,1.006 +11666,-0.788 +11667,-0.175 +11668,0.927 +11669,1.206 +11670,1.201 +11671,1.232 +11672,-0.082 +11673,0.457 +11674,0.965 +11675,-1.219 +11676,1.011 +11677,-1.412 +11678,0.331 +11679,-0.622 +11680,-0.820 +11681,-1.214 +11682,-0.141 +11683,0.942 +11684,1.347 +11685,-0.380 +11686,-1.059 +11687,0.252 +11688,0.713 +11689,-1.110 +11690,-0.432 +11691,-0.364 +11692,0.332 +11693,0.339 +11694,-0.394 +11695,2.056 +11696,0.510 +11697,0.215 +11698,0.200 +11699,0.609 +11700,-2.073 +11701,-1.422 +11702,-1.636 +11703,0.427 +11704,0.241 +11705,0.334 +11706,0.337 +11707,-0.136 +11708,-1.173 +11709,-1.570 +11710,0.734 +11711,0.529 +11712,-1.262 +11713,-1.056 +11714,0.009 +11715,-1.108 +11716,-1.930 +11717,0.706 +11718,0.387 +11719,2.924 +11720,1.261 +11721,-0.571 +11722,-0.530 +11723,-1.009 +11724,0.396 +11725,0.849 +11726,-3.038 +11727,0.222 +11728,-1.163 +11729,0.511 +11730,-0.123 +11731,1.652 +11732,0.629 +11733,0.224 +11734,-0.586 +11735,1.126 +11736,0.369 +11737,0.555 +11738,-0.086 +11739,-0.172 +11740,1.501 +11741,3.154 +11742,0.800 +11743,0.731 +11744,-0.378 +11745,-0.307 +11746,0.241 +11747,1.698 +11748,0.278 +11749,1.749 +11750,0.612 +11751,-1.024 +11752,0.400 +11753,0.279 +11754,0.788 +11755,-0.081 +11756,-0.577 +11757,0.129 +11758,-0.346 +11759,0.052 +11760,-2.202 +11761,0.865 +11762,-0.815 +11763,1.649 +11764,-0.114 +11765,0.897 +11766,0.490 +11767,-0.352 +11768,-0.006 +11769,1.313 +11770,0.441 +11771,-1.697 +11772,-0.022 +11773,1.357 +11774,1.147 +11775,-1.550 +11776,1.250 +11777,-0.080 +11778,-0.889 +11779,0.693 +11780,-0.035 +11781,1.256 +11782,1.346 +11783,0.889 +11784,0.065 +11785,0.984 +11786,-0.865 +11787,-0.346 +11788,0.254 +11789,1.026 +11790,0.561 +11791,-0.390 +11792,-0.740 +11793,-0.459 +11794,-1.090 +11795,1.112 +11796,-0.638 +11797,-1.423 +11798,-0.615 +11799,-0.998 +11800,-0.302 +11801,-0.004 +11802,-1.148 +11803,-1.084 +11804,0.067 +11805,-0.671 +11806,-0.076 +11807,-1.378 +11808,0.453 +11809,0.122 +11810,-0.430 +11811,0.190 +11812,0.443 +11813,-1.361 +11814,-0.326 +11815,-0.072 +11816,-2.122 +11817,2.017 +11818,0.575 +11819,0.698 +11820,0.962 +11821,0.186 +11822,-1.049 +11823,1.626 +11824,0.142 +11825,-0.627 +11826,0.557 +11827,-0.540 +11828,-0.387 +11829,1.785 +11830,-0.297 +11831,-1.429 +11832,-2.413 +11833,0.249 +11834,0.099 +11835,-0.312 +11836,-0.076 +11837,0.964 +11838,-1.035 +11839,-0.634 +11840,0.086 +11841,0.271 +11842,1.188 +11843,-0.324 +11844,1.240 +11845,1.549 +11846,0.746 +11847,-0.893 +11848,-1.207 +11849,0.512 +11850,-1.641 +11851,0.526 +11852,1.487 +11853,-1.371 +11854,-0.805 +11855,1.873 +11856,1.436 +11857,-0.631 +11858,-0.942 +11859,-2.071 +11860,-0.128 +11861,-0.226 +11862,-0.110 +11863,0.309 +11864,0.041 +11865,-0.346 +11866,-1.646 +11867,1.699 +11868,1.413 +11869,0.521 +11870,0.589 +11871,0.005 +11872,-1.081 +11873,0.806 +11874,-0.918 +11875,0.181 +11876,1.077 +11877,0.322 +11878,-0.210 +11879,0.772 +11880,-0.610 +11881,0.163 +11882,-0.528 +11883,0.241 +11884,1.395 +11885,-0.216 +11886,1.026 +11887,-0.229 +11888,0.123 +11889,0.676 +11890,1.535 +11891,0.615 +11892,0.710 +11893,-0.099 +11894,-0.284 +11895,0.010 +11896,0.457 +11897,0.370 +11898,-2.282 +11899,0.573 +11900,-0.012 +11901,-0.317 +11902,-0.793 +11903,0.597 +11904,1.036 +11905,0.697 +11906,0.454 +11907,0.202 +11908,-0.432 +11909,0.839 +11910,0.277 +11911,-0.472 +11912,-1.646 +11913,0.113 +11914,0.346 +11915,1.232 +11916,-0.722 +11917,-2.485 +11918,1.153 +11919,0.159 +11920,2.189 +11921,-1.062 +11922,-0.076 +11923,0.483 +11924,-0.885 +11925,-0.881 +11926,-0.786 +11927,1.198 +11928,-0.175 +11929,-1.367 +11930,-0.157 +11931,0.331 +11932,-0.770 +11933,1.426 +11934,-0.483 +11935,1.027 +11936,0.576 +11937,1.294 +11938,-0.483 +11939,1.693 +11940,0.776 +11941,2.571 +11942,-0.439 +11943,1.216 +11944,1.660 +11945,-0.660 +11946,0.259 +11947,-0.938 +11948,-0.921 +11949,-0.048 +11950,1.211 +11951,0.776 +11952,-0.102 +11953,-0.302 +11954,-1.559 +11955,-0.401 +11956,0.346 +11957,-1.623 +11958,1.460 +11959,-1.481 +11960,0.405 +11961,1.181 +11962,1.612 +11963,-1.312 +11964,0.554 +11965,-0.153 +11966,-0.577 +11967,0.711 +11968,-0.507 +11969,0.700 +11970,1.094 +11971,0.464 +11972,-0.370 +11973,0.558 +11974,-0.115 +11975,0.762 +11976,-0.528 +11977,0.870 +11978,-0.357 +11979,-0.807 +11980,-2.020 +11981,0.755 +11982,-1.651 +11983,1.513 +11984,-0.550 +11985,1.516 +11986,1.318 +11987,1.176 +11988,0.092 +11989,-0.928 +11990,-0.765 +11991,-0.475 +11992,0.114 +11993,-0.472 +11994,-1.656 +11995,0.661 +11996,1.557 +11997,-0.289 +11998,-1.086 +11999,-0.301 +12000,0.607 +12001,1.036 +12002,1.072 +12003,-0.537 +12004,1.482 +12005,-1.083 +12006,-0.553 +12007,0.580 +12008,0.543 +12009,0.205 +12010,-2.034 +12011,0.063 +12012,-0.140 +12013,-0.531 +12014,1.225 +12015,0.102 +12016,0.809 +12017,0.506 +12018,0.679 +12019,-2.738 +12020,0.005 +12021,0.919 +12022,0.767 +12023,-1.619 +12024,0.021 +12025,0.734 +12026,-1.064 +12027,1.413 +12028,-0.248 +12029,0.060 +12030,-0.452 +12031,-1.035 +12032,-0.155 +12033,0.749 +12034,-0.018 +12035,-0.196 +12036,-0.615 +12037,-1.033 +12038,-1.384 +12039,0.822 +12040,-0.432 +12041,2.212 +12042,1.390 +12043,-0.690 +12044,-0.139 +12045,-0.588 +12046,0.335 +12047,-0.021 +12048,1.580 +12049,-1.686 +12050,-2.184 +12051,0.223 +12052,-0.722 +12053,1.155 +12054,1.044 +12055,-0.449 +12056,0.635 +12057,1.215 +12058,0.801 +12059,-2.121 +12060,-0.787 +12061,0.143 +12062,-0.820 +12063,-0.793 +12064,1.274 +12065,1.105 +12066,-0.040 +12067,0.937 +12068,1.616 +12069,-1.484 +12070,0.248 +12071,0.169 +12072,1.793 +12073,-1.570 +12074,-2.451 +12075,-1.574 +12076,-0.437 +12077,-1.701 +12078,0.102 +12079,0.631 +12080,1.542 +12081,1.013 +12082,0.944 +12083,1.231 +12084,1.560 +12085,-1.268 +12086,-1.045 +12087,1.781 +12088,1.506 +12089,-0.112 +12090,0.548 +12091,-0.748 +12092,0.054 +12093,0.739 +12094,-0.211 +12095,-0.545 +12096,-2.448 +12097,-0.281 +12098,1.474 +12099,-1.558 +12100,0.176 +12101,-0.219 +12102,-1.650 +12103,0.217 +12104,2.106 +12105,-0.605 +12106,-0.464 +12107,1.290 +12108,-1.817 +12109,1.070 +12110,-1.698 +12111,-0.706 +12112,-0.058 +12113,-0.402 +12114,1.172 +12115,-0.324 +12116,-2.092 +12117,-0.394 +12118,0.432 +12119,-0.606 +12120,0.290 +12121,0.498 +12122,-0.195 +12123,-0.866 +12124,-0.555 +12125,-0.190 +12126,-0.072 +12127,-1.475 +12128,1.086 +12129,-0.193 +12130,1.778 +12131,0.214 +12132,-0.445 +12133,-0.281 +12134,0.244 +12135,-1.529 +12136,1.225 +12137,2.452 +12138,0.078 +12139,0.704 +12140,0.896 +12141,0.384 +12142,0.882 +12143,2.302 +12144,1.693 +12145,0.261 +12146,0.134 +12147,-0.105 +12148,0.389 +12149,-0.020 +12150,1.335 +12151,0.344 +12152,0.184 +12153,0.132 +12154,-1.424 +12155,-2.454 +12156,1.050 +12157,-0.290 +12158,2.811 +12159,1.908 +12160,-0.050 +12161,-1.442 +12162,0.568 +12163,-1.513 +12164,-0.659 +12165,1.312 +12166,-1.620 +12167,-0.193 +12168,0.495 +12169,0.662 +12170,0.397 +12171,-0.138 +12172,0.620 +12173,-0.300 +12174,0.438 +12175,-0.631 +12176,-0.323 +12177,-0.529 +12178,-1.305 +12179,0.165 +12180,-1.453 +12181,-1.172 +12182,-0.981 +12183,0.480 +12184,0.333 +12185,1.170 +12186,0.273 +12187,-0.176 +12188,-1.114 +12189,0.772 +12190,0.354 +12191,0.245 +12192,-2.749 +12193,-1.032 +12194,-0.476 +12195,-1.082 +12196,1.690 +12197,-1.466 +12198,0.341 +12199,-0.236 +12200,-1.218 +12201,0.304 +12202,-0.812 +12203,0.104 +12204,-0.956 +12205,-0.394 +12206,-1.551 +12207,-0.260 +12208,0.593 +12209,0.114 +12210,-0.288 +12211,-0.518 +12212,-0.317 +12213,-1.363 +12214,0.645 +12215,-1.946 +12216,-1.631 +12217,-0.035 +12218,-0.337 +12219,-1.057 +12220,1.239 +12221,-1.466 +12222,0.122 +12223,0.325 +12224,-0.882 +12225,-1.315 +12226,0.805 +12227,0.815 +12228,-0.200 +12229,-1.688 +12230,0.038 +12231,-0.379 +12232,-0.570 +12233,0.412 +12234,0.435 +12235,1.929 +12236,-0.362 +12237,0.889 +12238,-0.385 +12239,-0.753 +12240,0.057 +12241,-1.851 +12242,-1.329 +12243,0.241 +12244,0.224 +12245,1.180 +12246,-0.852 +12247,0.456 +12248,0.584 +12249,0.104 +12250,-0.231 +12251,-1.951 +12252,1.020 +12253,0.729 +12254,-0.171 +12255,-0.392 +12256,-1.027 +12257,0.855 +12258,-1.154 +12259,0.493 +12260,-1.139 +12261,0.405 +12262,-2.480 +12263,1.068 +12264,1.046 +12265,0.430 +12266,0.246 +12267,0.111 +12268,-0.971 +12269,-1.885 +12270,-1.592 +12271,-0.824 +12272,0.677 +12273,0.931 +12274,-0.093 +12275,-0.678 +12276,-0.080 +12277,1.534 +12278,1.066 +12279,-1.062 +12280,-0.599 +12281,-1.191 +12282,-1.218 +12283,-0.139 +12284,-0.114 +12285,0.348 +12286,0.892 +12287,0.406 +12288,-0.088 +12289,-2.605 +12290,-0.173 +12291,-0.036 +12292,-0.058 +12293,1.237 +12294,-1.043 +12295,0.064 +12296,-0.097 +12297,-0.462 +12298,-1.121 +12299,0.902 +12300,-0.443 +12301,0.431 +12302,-0.851 +12303,-0.604 +12304,-1.081 +12305,0.978 +12306,0.394 +12307,-0.003 +12308,-0.984 +12309,1.526 +12310,0.784 +12311,-1.240 +12312,-0.884 +12313,-0.259 +12314,-0.346 +12315,1.280 +12316,0.632 +12317,0.233 +12318,-0.216 +12319,-0.763 +12320,0.008 +12321,0.465 +12322,-1.282 +12323,-1.768 +12324,0.640 +12325,-0.327 +12326,0.951 +12327,-0.666 +12328,1.112 +12329,-0.990 +12330,-0.330 +12331,-1.149 +12332,-0.723 +12333,0.140 +12334,2.096 +12335,0.407 +12336,-0.447 +12337,-0.199 +12338,0.315 +12339,0.896 +12340,-1.358 +12341,-0.640 +12342,-1.477 +12343,-0.143 +12344,1.705 +12345,0.352 +12346,-0.745 +12347,0.619 +12348,-0.471 +12349,-0.256 +12350,0.832 +12351,-2.022 +12352,-0.946 +12353,-0.115 +12354,0.098 +12355,-0.079 +12356,0.799 +12357,1.364 +12358,0.635 +12359,-0.996 +12360,0.669 +12361,0.039 +12362,-0.177 +12363,0.891 +12364,0.383 +12365,1.113 +12366,-0.260 +12367,-0.178 +12368,-0.985 +12369,-0.193 +12370,2.288 +12371,0.054 +12372,-0.404 +12373,1.173 +12374,0.613 +12375,-1.436 +12376,1.023 +12377,0.186 +12378,1.480 +12379,1.518 +12380,1.301 +12381,-0.312 +12382,0.129 +12383,0.249 +12384,-1.195 +12385,-2.132 +12386,-0.240 +12387,-0.234 +12388,0.583 +12389,0.210 +12390,0.590 +12391,0.113 +12392,-1.957 +12393,-1.069 +12394,-0.571 +12395,1.487 +12396,0.013 +12397,0.711 +12398,-1.592 +12399,-1.164 +12400,-0.712 +12401,-1.036 +12402,-0.015 +12403,-0.975 +12404,-1.124 +12405,0.387 +12406,-0.051 +12407,1.051 +12408,0.200 +12409,0.280 +12410,1.003 +12411,-0.426 +12412,-0.472 +12413,-0.044 +12414,0.227 +12415,0.714 +12416,-0.533 +12417,0.460 +12418,-0.113 +12419,0.615 +12420,-0.274 +12421,0.795 +12422,1.147 +12423,0.217 +12424,0.736 +12425,-0.478 +12426,0.552 +12427,-1.420 +12428,-1.239 +12429,-0.244 +12430,-1.581 +12431,-1.366 +12432,-1.304 +12433,0.421 +12434,0.363 +12435,-0.242 +12436,2.288 +12437,-0.153 +12438,-0.263 +12439,1.152 +12440,0.396 +12441,0.305 +12442,-1.007 +12443,1.056 +12444,-0.441 +12445,0.164 +12446,1.354 +12447,0.241 +12448,-0.461 +12449,-0.257 +12450,4.188 +12451,1.045 +12452,-1.202 +12453,-0.268 +12454,0.470 +12455,0.372 +12456,-0.403 +12457,0.804 +12458,0.237 +12459,1.822 +12460,1.238 +12461,0.495 +12462,-0.397 +12463,-1.990 +12464,-1.116 +12465,-1.778 +12466,-1.743 +12467,-0.032 +12468,-0.799 +12469,0.185 +12470,-1.390 +12471,-0.446 +12472,0.497 +12473,-0.493 +12474,-1.100 +12475,-0.718 +12476,0.157 +12477,-0.257 +12478,0.416 +12479,-0.380 +12480,-0.859 +12481,0.309 +12482,-1.204 +12483,1.595 +12484,-0.508 +12485,0.842 +12486,-0.288 +12487,0.629 +12488,0.589 +12489,0.305 +12490,0.781 +12491,-0.277 +12492,0.088 +12493,-3.288 +12494,1.262 +12495,0.059 +12496,-0.830 +12497,1.439 +12498,-1.059 +12499,-0.985 +12500,-0.291 +12501,1.053 +12502,0.605 +12503,0.690 +12504,0.574 +12505,1.359 +12506,-1.587 +12507,-1.003 +12508,1.053 +12509,-0.104 +12510,1.176 +12511,0.310 +12512,0.857 +12513,0.400 +12514,-1.268 +12515,-0.908 +12516,0.695 +12517,0.445 +12518,0.936 +12519,0.186 +12520,2.956 +12521,2.483 +12522,-0.726 +12523,0.163 +12524,-0.583 +12525,0.270 +12526,0.233 +12527,-0.624 +12528,-1.066 +12529,0.015 +12530,0.440 +12531,0.404 +12532,-1.018 +12533,-1.339 +12534,-1.625 +12535,-0.435 +12536,-0.071 +12537,-1.106 +12538,0.018 +12539,1.576 +12540,-2.148 +12541,-0.565 +12542,1.170 +12543,-0.911 +12544,0.645 +12545,0.426 +12546,-0.084 +12547,-1.845 +12548,-1.207 +12549,0.769 +12550,0.127 +12551,2.102 +12552,0.634 +12553,-0.054 +12554,0.767 +12555,1.465 +12556,0.295 +12557,0.069 +12558,-0.716 +12559,-0.240 +12560,1.457 +12561,1.251 +12562,1.101 +12563,-0.864 +12564,0.575 +12565,0.228 +12566,0.099 +12567,0.192 +12568,0.809 +12569,0.174 +12570,0.400 +12571,-0.739 +12572,-0.730 +12573,-0.615 +12574,-0.021 +12575,0.350 +12576,0.603 +12577,-0.808 +12578,1.643 +12579,1.222 +12580,0.547 +12581,0.264 +12582,0.616 +12583,0.081 +12584,-0.141 +12585,1.571 +12586,1.414 +12587,-0.410 +12588,1.271 +12589,0.421 +12590,0.718 +12591,0.045 +12592,-1.266 +12593,-0.552 +12594,0.906 +12595,0.243 +12596,0.576 +12597,1.074 +12598,0.097 +12599,0.748 +12600,-0.277 +12601,-1.371 +12602,0.036 +12603,-0.260 +12604,0.192 +12605,-0.728 +12606,-1.119 +12607,1.169 +12608,-0.949 +12609,-0.287 +12610,-1.001 +12611,-1.151 +12612,-0.581 +12613,0.451 +12614,-0.197 +12615,-0.239 +12616,-1.510 +12617,-0.183 +12618,-1.611 +12619,1.229 +12620,0.409 +12621,-2.339 +12622,0.856 +12623,-0.448 +12624,0.517 +12625,1.395 +12626,-0.787 +12627,0.205 +12628,-1.516 +12629,0.176 +12630,0.845 +12631,-0.960 +12632,0.567 +12633,0.142 +12634,-0.241 +12635,2.417 +12636,0.856 +12637,0.734 +12638,-0.408 +12639,-0.307 +12640,-0.481 +12641,0.702 +12642,0.685 +12643,-2.725 +12644,-0.386 +12645,-0.023 +12646,-1.653 +12647,1.534 +12648,1.243 +12649,1.285 +12650,1.673 +12651,-0.165 +12652,-0.477 +12653,0.513 +12654,-2.901 +12655,-0.061 +12656,0.671 +12657,-0.611 +12658,0.827 +12659,-0.961 +12660,0.245 +12661,0.455 +12662,-0.579 +12663,-0.237 +12664,0.118 +12665,0.546 +12666,-1.522 +12667,-2.015 +12668,1.239 +12669,0.227 +12670,-1.033 +12671,0.186 +12672,0.134 +12673,-1.099 +12674,-1.855 +12675,-0.919 +12676,-1.858 +12677,0.262 +12678,-1.745 +12679,0.870 +12680,0.119 +12681,-0.850 +12682,-0.767 +12683,-1.463 +12684,0.819 +12685,-0.627 +12686,-0.448 +12687,-0.017 +12688,0.162 +12689,0.404 +12690,-0.404 +12691,0.457 +12692,-1.949 +12693,-0.825 +12694,0.037 +12695,-1.364 +12696,-0.060 +12697,-2.391 +12698,0.304 +12699,-0.579 +12700,-1.464 +12701,0.431 +12702,1.265 +12703,0.307 +12704,-0.342 +12705,-0.237 +12706,-1.011 +12707,0.111 +12708,0.755 +12709,0.906 +12710,-1.009 +12711,1.889 +12712,-0.761 +12713,0.658 +12714,-0.434 +12715,0.824 +12716,0.680 +12717,-1.205 +12718,-0.971 +12719,1.384 +12720,1.841 +12721,-0.758 +12722,0.646 +12723,0.535 +12724,-0.079 +12725,-1.112 +12726,0.462 +12727,-1.035 +12728,1.133 +12729,-1.508 +12730,-0.245 +12731,0.193 +12732,0.637 +12733,-1.692 +12734,0.010 +12735,1.045 +12736,-0.196 +12737,-0.026 +12738,0.491 +12739,-1.293 +12740,-0.327 +12741,1.087 +12742,1.120 +12743,-1.890 +12744,0.872 +12745,0.846 +12746,-0.105 +12747,1.772 +12748,-1.517 +12749,1.669 +12750,1.262 +12751,-0.059 +12752,-0.158 +12753,-1.128 +12754,0.137 +12755,1.005 +12756,-1.150 +12757,2.029 +12758,0.671 +12759,0.236 +12760,-0.310 +12761,-1.299 +12762,-0.919 +12763,-0.652 +12764,-0.513 +12765,1.341 +12766,-0.182 +12767,0.166 +12768,0.621 +12769,1.029 +12770,-0.455 +12771,-1.349 +12772,-0.285 +12773,0.400 +12774,0.467 +12775,0.301 +12776,-0.265 +12777,-1.554 +12778,0.139 +12779,-1.495 +12780,-1.951 +12781,-0.488 +12782,-0.024 +12783,-2.391 +12784,1.828 +12785,0.170 +12786,-1.025 +12787,-1.538 +12788,1.929 +12789,-0.659 +12790,1.126 +12791,0.205 +12792,1.008 +12793,-0.950 +12794,-0.081 +12795,-0.940 +12796,0.258 +12797,0.129 +12798,-1.101 +12799,-1.006 +12800,1.946 +12801,0.555 +12802,-1.711 +12803,2.008 +12804,1.123 +12805,0.138 +12806,-0.726 +12807,-0.171 +12808,-1.911 +12809,-0.947 +12810,-0.814 +12811,-0.285 +12812,-1.532 +12813,-0.958 +12814,0.207 +12815,0.896 +12816,0.961 +12817,-0.657 +12818,-1.014 +12819,-0.217 +12820,-0.301 +12821,0.960 +12822,1.674 +12823,0.439 +12824,0.269 +12825,0.254 +12826,-0.315 +12827,-0.413 +12828,0.107 +12829,-0.513 +12830,0.644 +12831,-0.019 +12832,1.948 +12833,0.510 +12834,-1.505 +12835,1.014 +12836,-0.476 +12837,0.206 +12838,-1.022 +12839,-1.101 +12840,1.752 +12841,1.873 +12842,-0.874 +12843,0.987 +12844,-1.248 +12845,0.881 +12846,-0.368 +12847,1.343 +12848,0.650 +12849,-1.152 +12850,0.446 +12851,1.918 +12852,-1.808 +12853,-0.407 +12854,-1.979 +12855,1.148 +12856,-0.638 +12857,-1.121 +12858,1.212 +12859,1.613 +12860,1.077 +12861,2.573 +12862,-2.271 +12863,0.549 +12864,2.873 +12865,0.593 +12866,-0.186 +12867,-0.074 +12868,-0.060 +12869,1.342 +12870,0.213 +12871,-1.365 +12872,0.166 +12873,1.034 +12874,1.946 +12875,1.026 +12876,-1.432 +12877,0.098 +12878,0.655 +12879,0.216 +12880,0.028 +12881,1.526 +12882,0.911 +12883,-1.446 +12884,1.070 +12885,-1.628 +12886,-0.224 +12887,1.442 +12888,0.613 +12889,0.872 +12890,-0.672 +12891,2.032 +12892,-1.567 +12893,1.540 +12894,-0.391 +12895,-0.387 +12896,0.162 +12897,-0.645 +12898,-0.573 +12899,-0.460 +12900,0.807 +12901,0.177 +12902,0.367 +12903,1.744 +12904,0.241 +12905,-0.235 +12906,-0.851 +12907,-0.255 +12908,1.086 +12909,1.055 +12910,-0.222 +12911,0.527 +12912,-1.015 +12913,-0.748 +12914,-0.778 +12915,-0.159 +12916,0.016 +12917,-1.380 +12918,-0.313 +12919,-1.743 +12920,0.118 +12921,0.071 +12922,0.239 +12923,1.008 +12924,-2.264 +12925,-0.653 +12926,-1.151 +12927,0.171 +12928,0.060 +12929,0.454 +12930,1.844 +12931,1.109 +12932,0.644 +12933,0.147 +12934,0.127 +12935,1.422 +12936,-1.119 +12937,-0.987 +12938,-0.861 +12939,-0.819 +12940,-0.900 +12941,-0.529 +12942,1.262 +12943,-0.801 +12944,-1.142 +12945,0.529 +12946,1.632 +12947,-0.433 +12948,0.789 +12949,1.010 +12950,1.903 +12951,0.608 +12952,0.462 +12953,-0.169 +12954,-1.982 +12955,-0.492 +12956,-1.252 +12957,-0.122 +12958,0.012 +12959,0.733 +12960,0.961 +12961,0.325 +12962,-0.735 +12963,0.876 +12964,-1.119 +12965,0.217 +12966,-0.402 +12967,-1.387 +12968,-0.237 +12969,-0.884 +12970,0.617 +12971,0.716 +12972,-0.307 +12973,-0.074 +12974,-0.824 +12975,0.245 +12976,1.067 +12977,1.105 +12978,1.128 +12979,1.108 +12980,0.852 +12981,0.753 +12982,-0.395 +12983,0.816 +12984,0.514 +12985,-0.015 +12986,-0.304 +12987,-1.694 +12988,-1.633 +12989,-0.129 +12990,-0.343 +12991,-0.676 +12992,1.886 +12993,-1.475 +12994,0.884 +12995,0.755 +12996,-0.649 +12997,0.600 +12998,0.200 +12999,-0.082 +13000,-0.683 +13001,-0.246 +13002,-0.036 +13003,-1.420 +13004,0.833 +13005,0.222 +13006,0.564 +13007,0.253 +13008,0.712 +13009,0.038 +13010,-0.610 +13011,-0.106 +13012,-1.042 +13013,-0.036 +13014,-1.069 +13015,0.979 +13016,1.079 +13017,1.363 +13018,-2.030 +13019,0.496 +13020,-0.456 +13021,-1.439 +13022,0.087 +13023,0.170 +13024,-0.107 +13025,-0.630 +13026,0.650 +13027,0.235 +13028,-1.039 +13029,-0.672 +13030,1.560 +13031,-0.061 +13032,-0.414 +13033,-2.436 +13034,1.368 +13035,-0.056 +13036,-0.969 +13037,-0.303 +13038,-0.088 +13039,0.347 +13040,0.976 +13041,0.620 +13042,-0.180 +13043,-0.212 +13044,-0.920 +13045,0.757 +13046,-0.917 +13047,-0.190 +13048,1.384 +13049,0.020 +13050,-0.112 +13051,0.352 +13052,1.278 +13053,-0.318 +13054,-2.002 +13055,-0.992 +13056,-0.348 +13057,0.682 +13058,0.676 +13059,-1.092 +13060,1.503 +13061,0.014 +13062,1.313 +13063,0.790 +13064,-0.026 +13065,-0.807 +13066,1.534 +13067,-1.248 +13068,0.680 +13069,-0.613 +13070,0.362 +13071,-0.499 +13072,-0.097 +13073,-0.386 +13074,1.020 +13075,-0.185 +13076,-0.509 +13077,0.799 +13078,-0.335 +13079,-0.069 +13080,1.000 +13081,0.877 +13082,0.724 +13083,-1.180 +13084,1.306 +13085,0.106 +13086,-0.551 +13087,0.749 +13088,-0.275 +13089,-0.526 +13090,0.555 +13091,1.465 +13092,-0.775 +13093,0.225 +13094,1.008 +13095,-0.791 +13096,0.662 +13097,-1.459 +13098,0.750 +13099,-0.261 +13100,-0.631 +13101,-0.593 +13102,-0.150 +13103,-0.199 +13104,-0.440 +13105,0.357 +13106,1.721 +13107,-0.280 +13108,0.929 +13109,-3.084 +13110,-0.910 +13111,-0.082 +13112,1.705 +13113,1.396 +13114,0.885 +13115,1.155 +13116,-0.097 +13117,-0.167 +13118,0.011 +13119,-0.210 +13120,0.694 +13121,0.653 +13122,-1.476 +13123,0.972 +13124,0.205 +13125,-0.975 +13126,0.542 +13127,-0.033 +13128,-0.171 +13129,-0.780 +13130,-0.575 +13131,2.183 +13132,0.593 +13133,-0.495 +13134,-0.140 +13135,0.388 +13136,0.144 +13137,-1.912 +13138,-1.470 +13139,1.346 +13140,-1.036 +13141,-1.852 +13142,-1.176 +13143,0.429 +13144,0.313 +13145,0.951 +13146,-0.285 +13147,-0.568 +13148,0.429 +13149,0.651 +13150,-0.447 +13151,-0.817 +13152,1.535 +13153,0.919 +13154,0.884 +13155,0.035 +13156,1.857 +13157,0.751 +13158,-1.598 +13159,0.728 +13160,0.812 +13161,0.468 +13162,-0.849 +13163,-1.246 +13164,-0.686 +13165,1.905 +13166,-0.995 +13167,-1.482 +13168,1.092 +13169,-0.372 +13170,-0.509 +13171,1.786 +13172,0.440 +13173,-0.145 +13174,1.399 +13175,-0.665 +13176,-0.898 +13177,-2.069 +13178,1.453 +13179,-0.589 +13180,-0.890 +13181,-2.088 +13182,-0.761 +13183,0.976 +13184,0.636 +13185,-1.793 +13186,1.070 +13187,1.569 +13188,1.695 +13189,1.082 +13190,-1.913 +13191,-0.098 +13192,0.579 +13193,-0.433 +13194,-2.224 +13195,-0.474 +13196,0.946 +13197,-0.581 +13198,-0.693 +13199,0.803 +13200,2.234 +13201,-1.451 +13202,1.192 +13203,0.410 +13204,0.968 +13205,0.685 +13206,1.197 +13207,0.052 +13208,0.359 +13209,0.103 +13210,-2.919 +13211,-0.321 +13212,-1.073 +13213,-0.281 +13214,1.010 +13215,0.005 +13216,0.026 +13217,-0.001 +13218,-1.431 +13219,-0.030 +13220,0.996 +13221,-0.499 +13222,-0.065 +13223,-0.116 +13224,-0.430 +13225,-0.413 +13226,-0.511 +13227,-1.313 +13228,-0.466 +13229,0.707 +13230,-0.571 +13231,-0.141 +13232,-1.029 +13233,-1.647 +13234,-0.920 +13235,-0.125 +13236,0.374 +13237,-1.287 +13238,-0.549 +13239,-0.902 +13240,0.919 +13241,0.897 +13242,-1.147 +13243,-0.616 +13244,-0.491 +13245,-0.017 +13246,-0.888 +13247,1.337 +13248,-0.584 +13249,-1.319 +13250,-2.620 +13251,0.093 +13252,-1.154 +13253,-0.313 +13254,1.084 +13255,-0.894 +13256,-1.369 +13257,0.822 +13258,0.262 +13259,0.116 +13260,0.073 +13261,1.431 +13262,-1.532 +13263,0.084 +13264,1.495 +13265,-0.486 +13266,-0.598 +13267,-0.034 +13268,0.152 +13269,0.289 +13270,-0.799 +13271,-0.509 +13272,2.233 +13273,-0.585 +13274,2.133 +13275,1.202 +13276,-0.963 +13277,-0.053 +13278,-1.856 +13279,-1.176 +13280,2.323 +13281,-0.364 +13282,-0.604 +13283,0.120 +13284,-0.067 +13285,-0.020 +13286,-2.545 +13287,-0.943 +13288,0.222 +13289,0.421 +13290,0.926 +13291,1.118 +13292,-0.076 +13293,0.546 +13294,-1.174 +13295,-1.319 +13296,1.258 +13297,0.097 +13298,-0.608 +13299,0.042 +13300,-0.468 +13301,-0.838 +13302,0.773 +13303,-0.595 +13304,0.759 +13305,0.137 +13306,0.294 +13307,-1.166 +13308,0.019 +13309,-1.031 +13310,-1.006 +13311,-0.354 +13312,0.787 +13313,-0.390 +13314,-0.020 +13315,0.068 +13316,-0.654 +13317,-0.924 +13318,0.943 +13319,-0.340 +13320,-0.418 +13321,1.046 +13322,1.379 +13323,0.575 +13324,-0.315 +13325,-0.613 +13326,0.732 +13327,-1.642 +13328,2.182 +13329,1.305 +13330,0.072 +13331,-0.011 +13332,-0.183 +13333,-0.668 +13334,-0.173 +13335,0.096 +13336,-0.134 +13337,-1.415 +13338,-0.519 +13339,-1.427 +13340,-1.103 +13341,-0.241 +13342,-3.130 +13343,0.507 +13344,-0.484 +13345,0.395 +13346,-0.307 +13347,0.808 +13348,1.101 +13349,0.961 +13350,-0.824 +13351,-0.588 +13352,2.395 +13353,-0.012 +13354,1.598 +13355,-2.789 +13356,-0.835 +13357,-0.225 +13358,-0.496 +13359,0.242 +13360,0.199 +13361,-0.531 +13362,-0.710 +13363,0.248 +13364,-0.896 +13365,-0.123 +13366,-0.050 +13367,0.174 +13368,-0.983 +13369,1.952 +13370,0.662 +13371,0.461 +13372,0.420 +13373,0.085 +13374,-1.803 +13375,-1.487 +13376,-0.305 +13377,-0.374 +13378,0.791 +13379,-0.863 +13380,1.108 +13381,0.597 +13382,0.254 +13383,0.493 +13384,-0.867 +13385,1.529 +13386,0.087 +13387,0.954 +13388,-1.349 +13389,-0.528 +13390,1.407 +13391,1.739 +13392,0.514 +13393,-0.250 +13394,-0.864 +13395,-0.228 +13396,1.110 +13397,-0.440 +13398,0.099 +13399,-0.995 +13400,-0.589 +13401,0.589 +13402,-0.109 +13403,1.205 +13404,-0.955 +13405,0.008 +13406,0.534 +13407,0.486 +13408,-0.160 +13409,-0.336 +13410,0.143 +13411,0.252 +13412,-0.034 +13413,-0.878 +13414,-1.211 +13415,0.743 +13416,0.556 +13417,-0.339 +13418,0.755 +13419,-1.675 +13420,0.549 +13421,1.393 +13422,1.439 +13423,0.386 +13424,-0.860 +13425,-0.281 +13426,0.787 +13427,0.554 +13428,-0.256 +13429,-0.734 +13430,0.059 +13431,-0.232 +13432,-0.249 +13433,0.175 +13434,-0.564 +13435,1.132 +13436,-0.613 +13437,1.385 +13438,0.645 +13439,0.671 +13440,0.495 +13441,-0.728 +13442,0.929 +13443,0.618 +13444,-0.646 +13445,0.369 +13446,0.226 +13447,-1.721 +13448,1.240 +13449,1.675 +13450,0.649 +13451,0.370 +13452,-1.677 +13453,-0.112 +13454,-1.078 +13455,1.707 +13456,-1.715 +13457,0.265 +13458,0.140 +13459,0.449 +13460,0.255 +13461,-0.167 +13462,-1.497 +13463,0.512 +13464,0.210 +13465,0.354 +13466,0.507 +13467,-0.970 +13468,-1.785 +13469,-0.533 +13470,0.916 +13471,-0.769 +13472,-0.021 +13473,-0.230 +13474,-1.331 +13475,0.723 +13476,-0.212 +13477,1.440 +13478,-0.294 +13479,0.330 +13480,0.504 +13481,-1.462 +13482,-1.862 +13483,0.366 +13484,-0.589 +13485,-0.112 +13486,-0.298 +13487,-0.013 +13488,-0.067 +13489,-0.335 +13490,-1.416 +13491,-1.265 +13492,1.142 +13493,1.093 +13494,-0.946 +13495,1.150 +13496,-0.539 +13497,0.987 +13498,-0.654 +13499,0.164 +13500,0.062 +13501,-1.792 +13502,-2.530 +13503,1.046 +13504,-1.020 +13505,-0.272 +13506,0.926 +13507,-0.982 +13508,0.340 +13509,-1.094 +13510,1.315 +13511,-0.476 +13512,0.614 +13513,1.740 +13514,0.426 +13515,0.296 +13516,-0.731 +13517,0.079 +13518,0.581 +13519,-1.022 +13520,-1.176 +13521,-0.251 +13522,-0.652 +13523,0.881 +13524,-0.443 +13525,-0.609 +13526,1.330 +13527,0.723 +13528,0.954 +13529,-0.386 +13530,-0.881 +13531,-1.031 +13532,1.066 +13533,-1.163 +13534,0.973 +13535,-0.146 +13536,0.545 +13537,-0.863 +13538,1.174 +13539,0.873 +13540,-0.270 +13541,0.065 +13542,1.005 +13543,-0.348 +13544,1.783 +13545,-0.571 +13546,-1.917 +13547,0.694 +13548,0.745 +13549,1.726 +13550,-0.502 +13551,-0.976 +13552,-1.278 +13553,0.325 +13554,-0.028 +13555,2.089 +13556,-0.093 +13557,1.123 +13558,0.145 +13559,-0.098 +13560,-0.740 +13561,-0.037 +13562,-0.787 +13563,-1.490 +13564,0.569 +13565,0.324 +13566,-0.523 +13567,-0.126 +13568,-1.498 +13569,-0.729 +13570,0.190 +13571,0.450 +13572,-0.845 +13573,-0.853 +13574,-0.371 +13575,1.329 +13576,0.090 +13577,1.179 +13578,-0.034 +13579,-0.817 +13580,0.405 +13581,2.112 +13582,-1.053 +13583,-1.079 +13584,-0.419 +13585,-1.015 +13586,0.379 +13587,-0.447 +13588,-0.256 +13589,0.174 +13590,-1.722 +13591,1.389 +13592,-0.574 +13593,1.112 +13594,1.175 +13595,-0.363 +13596,0.944 +13597,-0.961 +13598,-0.116 +13599,-0.039 +13600,1.769 +13601,-1.076 +13602,0.307 +13603,1.066 +13604,-0.496 +13605,-0.657 +13606,-1.763 +13607,0.210 +13608,-0.420 +13609,1.378 +13610,2.014 +13611,0.685 +13612,-0.494 +13613,0.714 +13614,1.302 +13615,-1.310 +13616,0.848 +13617,-0.237 +13618,-0.875 +13619,0.984 +13620,0.025 +13621,0.453 +13622,-0.749 +13623,0.482 +13624,-0.598 +13625,0.452 +13626,-0.451 +13627,1.793 +13628,-0.867 +13629,2.032 +13630,-0.167 +13631,-0.150 +13632,0.180 +13633,0.212 +13634,0.928 +13635,-0.843 +13636,1.153 +13637,-1.122 +13638,0.963 +13639,-0.223 +13640,-0.483 +13641,-0.107 +13642,-0.564 +13643,-0.946 +13644,-0.731 +13645,1.238 +13646,-0.203 +13647,0.206 +13648,-1.616 +13649,-1.528 +13650,-0.392 +13651,1.856 +13652,-0.449 +13653,-0.314 +13654,1.281 +13655,-1.160 +13656,0.654 +13657,1.754 +13658,0.305 +13659,-1.078 +13660,0.168 +13661,-0.852 +13662,0.717 +13663,0.593 +13664,1.432 +13665,-0.758 +13666,1.593 +13667,-0.737 +13668,-0.841 +13669,-0.714 +13670,-0.453 +13671,0.854 +13672,0.163 +13673,1.358 +13674,0.806 +13675,-0.207 +13676,-1.976 +13677,0.489 +13678,-0.034 +13679,0.119 +13680,1.471 +13681,0.956 +13682,0.434 +13683,0.731 +13684,0.098 +13685,-0.983 +13686,0.911 +13687,-0.340 +13688,-2.028 +13689,-0.036 +13690,-0.310 +13691,0.312 +13692,1.032 +13693,1.080 +13694,1.761 +13695,-0.418 +13696,-0.484 +13697,-0.731 +13698,-0.237 +13699,-0.150 +13700,-0.986 +13701,1.093 +13702,0.865 +13703,0.448 +13704,-1.769 +13705,-0.884 +13706,-1.134 +13707,-0.092 +13708,2.422 +13709,-0.154 +13710,-0.942 +13711,-0.302 +13712,0.430 +13713,-0.704 +13714,-0.347 +13715,-0.579 +13716,-0.367 +13717,-0.491 +13718,0.554 +13719,1.286 +13720,1.534 +13721,-0.420 +13722,0.736 +13723,-0.456 +13724,-1.355 +13725,1.215 +13726,0.131 +13727,1.191 +13728,2.018 +13729,-1.022 +13730,-0.159 +13731,1.823 +13732,-0.058 +13733,-0.412 +13734,-0.634 +13735,-0.865 +13736,-0.703 +13737,-0.602 +13738,-1.275 +13739,-0.145 +13740,-1.127 +13741,2.775 +13742,-0.761 +13743,-0.769 +13744,-1.384 +13745,1.262 +13746,-0.312 +13747,-1.032 +13748,-0.111 +13749,0.493 +13750,1.018 +13751,1.491 +13752,-0.080 +13753,-0.445 +13754,0.056 +13755,-1.300 +13756,-0.093 +13757,-0.319 +13758,1.265 +13759,-0.609 +13760,-1.700 +13761,-0.414 +13762,-0.147 +13763,0.932 +13764,-0.881 +13765,0.159 +13766,1.547 +13767,-0.278 +13768,0.267 +13769,0.478 +13770,-0.790 +13771,-0.051 +13772,1.329 +13773,-0.569 +13774,-0.972 +13775,-0.685 +13776,0.730 +13777,-0.403 +13778,-0.016 +13779,1.165 +13780,-0.091 +13781,-0.537 +13782,-1.764 +13783,-0.721 +13784,-1.380 +13785,-1.072 +13786,-0.207 +13787,1.095 +13788,1.702 +13789,-0.057 +13790,-0.357 +13791,-1.081 +13792,1.688 +13793,0.712 +13794,-0.615 +13795,-0.937 +13796,0.592 +13797,0.806 +13798,-0.187 +13799,-0.652 +13800,-0.972 +13801,0.564 +13802,1.164 +13803,-0.332 +13804,-0.458 +13805,-1.471 +13806,1.351 +13807,1.773 +13808,0.931 +13809,0.176 +13810,0.164 +13811,-2.029 +13812,-0.343 +13813,-0.238 +13814,-1.478 +13815,0.170 +13816,0.960 +13817,-1.183 +13818,-0.629 +13819,0.235 +13820,1.194 +13821,0.115 +13822,-2.174 +13823,0.126 +13824,0.294 +13825,-1.384 +13826,-0.438 +13827,0.060 +13828,0.056 +13829,0.485 +13830,0.045 +13831,-0.151 +13832,0.056 +13833,1.513 +13834,-1.080 +13835,-0.985 +13836,-1.305 +13837,0.495 +13838,0.768 +13839,-0.450 +13840,0.061 +13841,-0.191 +13842,-0.288 +13843,-0.312 +13844,0.133 +13845,-1.556 +13846,-0.218 +13847,-1.709 +13848,0.978 +13849,-0.439 +13850,-0.250 +13851,0.095 +13852,1.603 +13853,-0.413 +13854,-0.849 +13855,0.875 +13856,-0.745 +13857,-0.130 +13858,-0.906 +13859,0.652 +13860,1.939 +13861,-0.337 +13862,-0.817 +13863,-1.209 +13864,-1.601 +13865,-0.463 +13866,0.299 +13867,-0.833 +13868,1.281 +13869,1.567 +13870,1.668 +13871,-0.354 +13872,1.722 +13873,-0.800 +13874,0.153 +13875,0.572 +13876,1.994 +13877,1.354 +13878,1.404 +13879,2.237 +13880,-0.814 +13881,-1.050 +13882,-0.559 +13883,0.615 +13884,-0.040 +13885,-0.556 +13886,-0.999 +13887,0.138 +13888,0.191 +13889,-0.093 +13890,-0.217 +13891,0.822 +13892,-0.234 +13893,-1.615 +13894,2.101 +13895,-1.300 +13896,0.339 +13897,-1.032 +13898,-0.793 +13899,-0.241 +13900,0.938 +13901,0.875 +13902,0.350 +13903,0.603 +13904,-0.691 +13905,-1.270 +13906,0.672 +13907,-0.360 +13908,0.707 +13909,-0.323 +13910,-0.419 +13911,-0.763 +13912,1.652 +13913,0.022 +13914,1.324 +13915,0.555 +13916,-0.603 +13917,-0.150 +13918,-0.389 +13919,0.468 +13920,2.529 +13921,-0.457 +13922,0.716 +13923,0.177 +13924,-0.204 +13925,0.520 +13926,-0.736 +13927,-0.097 +13928,0.134 +13929,1.049 +13930,-1.331 +13931,-1.048 +13932,0.081 +13933,-0.557 +13934,1.331 +13935,0.258 +13936,0.883 +13937,-0.487 +13938,-0.220 +13939,0.890 +13940,1.538 +13941,-0.643 +13942,-0.069 +13943,-0.251 +13944,-1.294 +13945,-1.792 +13946,-1.092 +13947,-1.450 +13948,-1.363 +13949,-1.194 +13950,0.913 +13951,0.504 +13952,0.010 +13953,-0.218 +13954,1.542 +13955,0.533 +13956,-0.167 +13957,-0.358 +13958,0.424 +13959,0.424 +13960,-0.946 +13961,0.453 +13962,0.810 +13963,0.124 +13964,-0.969 +13965,1.643 +13966,-0.791 +13967,-0.942 +13968,0.228 +13969,-0.965 +13970,0.185 +13971,-0.928 +13972,-1.038 +13973,-0.272 +13974,-0.428 +13975,-0.724 +13976,-0.623 +13977,0.258 +13978,0.668 +13979,-0.631 +13980,-1.298 +13981,0.114 +13982,0.417 +13983,0.998 +13984,-0.492 +13985,-0.509 +13986,0.695 +13987,0.543 +13988,-0.067 +13989,1.375 +13990,1.298 +13991,0.861 +13992,-0.359 +13993,-0.910 +13994,-1.312 +13995,-1.244 +13996,0.231 +13997,-0.191 +13998,-0.454 +13999,-1.208 +14000,0.040 +14001,0.345 +14002,0.526 +14003,-0.305 +14004,-0.753 +14005,0.174 +14006,1.170 +14007,-0.889 +14008,0.513 +14009,0.640 +14010,-2.504 +14011,0.622 +14012,0.061 +14013,2.004 +14014,0.984 +14015,-1.411 +14016,-0.166 +14017,-1.244 +14018,-0.918 +14019,-1.654 +14020,-1.057 +14021,0.346 +14022,-0.564 +14023,0.012 +14024,0.820 +14025,-1.042 +14026,-1.920 +14027,1.297 +14028,0.883 +14029,-0.559 +14030,0.392 +14031,0.286 +14032,-0.527 +14033,0.076 +14034,0.103 +14035,2.098 +14036,0.456 +14037,-0.244 +14038,0.217 +14039,-0.588 +14040,-0.552 +14041,0.398 +14042,0.181 +14043,-0.653 +14044,0.285 +14045,-2.551 +14046,0.411 +14047,0.626 +14048,1.032 +14049,0.841 +14050,-1.610 +14051,0.576 +14052,0.939 +14053,0.007 +14054,-1.456 +14055,-0.340 +14056,-0.111 +14057,-0.264 +14058,-0.686 +14059,-0.602 +14060,-0.572 +14061,-1.572 +14062,-0.228 +14063,0.853 +14064,0.885 +14065,-0.771 +14066,-0.899 +14067,-0.527 +14068,-0.969 +14069,-0.293 +14070,-0.832 +14071,0.853 +14072,-0.179 +14073,0.203 +14074,0.396 +14075,-0.363 +14076,-0.741 +14077,-1.595 +14078,0.244 +14079,0.783 +14080,0.797 +14081,1.805 +14082,1.078 +14083,0.283 +14084,2.374 +14085,0.787 +14086,-1.260 +14087,-0.103 +14088,0.376 +14089,0.471 +14090,1.047 +14091,-0.416 +14092,-1.409 +14093,-1.073 +14094,0.770 +14095,-1.220 +14096,-1.226 +14097,0.293 +14098,-0.724 +14099,-0.544 +14100,0.387 +14101,0.807 +14102,1.135 +14103,0.261 +14104,-0.241 +14105,-1.272 +14106,0.108 +14107,0.340 +14108,1.841 +14109,-0.420 +14110,-0.874 +14111,-1.079 +14112,-0.331 +14113,0.454 +14114,-1.127 +14115,0.466 +14116,-0.334 +14117,-0.414 +14118,1.183 +14119,-0.935 +14120,1.348 +14121,0.734 +14122,-0.711 +14123,-0.877 +14124,0.314 +14125,0.849 +14126,2.113 +14127,0.993 +14128,-0.627 +14129,0.301 +14130,0.728 +14131,-0.305 +14132,-1.098 +14133,-0.128 +14134,-1.288 +14135,-1.065 +14136,-1.963 +14137,-1.360 +14138,-0.641 +14139,-0.469 +14140,-1.013 +14141,0.665 +14142,-1.229 +14143,-0.643 +14144,-0.171 +14145,0.045 +14146,-0.188 +14147,1.989 +14148,1.032 +14149,1.104 +14150,-1.581 +14151,-0.482 +14152,1.846 +14153,0.170 +14154,-0.835 +14155,-0.820 +14156,0.484 +14157,-0.018 +14158,0.178 +14159,-0.274 +14160,0.207 +14161,-1.272 +14162,-0.091 +14163,1.244 +14164,0.032 +14165,-0.314 +14166,-0.600 +14167,0.730 +14168,0.959 +14169,-0.172 +14170,-2.484 +14171,-1.090 +14172,1.193 +14173,1.306 +14174,0.776 +14175,-1.424 +14176,0.403 +14177,-0.693 +14178,0.152 +14179,-0.452 +14180,1.288 +14181,-2.022 +14182,-0.259 +14183,0.771 +14184,-0.403 +14185,-1.291 +14186,-1.226 +14187,-0.522 +14188,-1.499 +14189,0.314 +14190,-0.009 +14191,-1.813 +14192,-0.316 +14193,-0.422 +14194,-0.103 +14195,-0.218 +14196,0.077 +14197,0.066 +14198,2.692 +14199,-1.615 +14200,0.009 +14201,-1.206 +14202,-1.329 +14203,0.477 +14204,0.624 +14205,-0.523 +14206,1.966 +14207,-0.105 +14208,0.062 +14209,0.623 +14210,-0.482 +14211,-1.516 +14212,-0.422 +14213,-0.179 +14214,0.366 +14215,0.801 +14216,-0.668 +14217,0.719 +14218,0.858 +14219,-0.251 +14220,0.377 +14221,0.469 +14222,-0.320 +14223,-1.002 +14224,0.195 +14225,-0.771 +14226,0.392 +14227,0.217 +14228,1.252 +14229,1.680 +14230,0.175 +14231,0.762 +14232,-1.803 +14233,1.590 +14234,-0.005 +14235,-0.099 +14236,-0.562 +14237,0.427 +14238,-1.207 +14239,0.113 +14240,2.403 +14241,-0.053 +14242,-0.135 +14243,1.569 +14244,-1.761 +14245,-1.258 +14246,0.748 +14247,1.466 +14248,-0.404 +14249,1.653 +14250,-0.224 +14251,0.460 +14252,0.844 +14253,0.705 +14254,1.088 +14255,0.298 +14256,-0.243 +14257,0.349 +14258,0.250 +14259,0.077 +14260,-0.619 +14261,-0.691 +14262,-0.494 +14263,0.205 +14264,0.462 +14265,-0.392 +14266,0.926 +14267,-1.391 +14268,-1.476 +14269,0.798 +14270,-1.905 +14271,1.312 +14272,1.029 +14273,-1.415 +14274,0.987 +14275,0.085 +14276,3.090 +14277,-0.559 +14278,0.102 +14279,2.035 +14280,0.472 +14281,1.713 +14282,0.875 +14283,-0.224 +14284,-1.154 +14285,-0.056 +14286,-1.072 +14287,-0.277 +14288,0.153 +14289,-1.162 +14290,-0.292 +14291,-1.795 +14292,0.619 +14293,-0.291 +14294,0.537 +14295,-0.379 +14296,0.307 +14297,0.166 +14298,0.991 +14299,1.163 +14300,-0.675 +14301,-1.382 +14302,-0.135 +14303,-0.912 +14304,0.021 +14305,0.738 +14306,1.015 +14307,-0.420 +14308,-1.350 +14309,0.303 +14310,0.237 +14311,0.528 +14312,-1.924 +14313,0.263 +14314,-0.633 +14315,-0.151 +14316,-0.184 +14317,0.437 +14318,1.621 +14319,0.481 +14320,1.960 +14321,-0.235 +14322,0.169 +14323,1.203 +14324,-0.436 +14325,-2.466 +14326,-0.628 +14327,-1.255 +14328,-1.131 +14329,0.065 +14330,0.036 +14331,-0.666 +14332,-0.724 +14333,0.537 +14334,0.977 +14335,0.246 +14336,0.055 +14337,-0.149 +14338,0.982 +14339,0.156 +14340,-0.938 +14341,-0.175 +14342,0.032 +14343,-0.365 +14344,-0.139 +14345,0.922 +14346,-1.612 +14347,-0.479 +14348,0.323 +14349,0.253 +14350,1.100 +14351,0.553 +14352,-1.268 +14353,0.064 +14354,0.178 +14355,-1.926 +14356,-1.042 +14357,-0.268 +14358,-0.596 +14359,0.935 +14360,-2.014 +14361,-0.373 +14362,-0.653 +14363,1.431 +14364,-0.319 +14365,0.784 +14366,-2.162 +14367,1.225 +14368,-0.360 +14369,-0.708 +14370,1.139 +14371,-2.054 +14372,0.556 +14373,-0.586 +14374,-0.981 +14375,-0.571 +14376,-1.202 +14377,-0.064 +14378,0.706 +14379,-0.932 +14380,-0.523 +14381,-0.755 +14382,0.338 +14383,1.264 +14384,-0.777 +14385,-1.398 +14386,0.646 +14387,0.930 +14388,1.265 +14389,-2.329 +14390,-0.770 +14391,1.088 +14392,0.510 +14393,0.153 +14394,-0.185 +14395,-0.806 +14396,-0.132 +14397,-0.895 +14398,-0.528 +14399,1.404 +14400,-0.260 +14401,-0.756 +14402,0.050 +14403,-0.509 +14404,0.062 +14405,-0.072 +14406,0.507 +14407,0.830 +14408,-0.469 +14409,0.391 +14410,0.404 +14411,1.015 +14412,-0.283 +14413,0.083 +14414,-1.780 +14415,-0.491 +14416,-0.949 +14417,0.325 +14418,1.355 +14419,-0.492 +14420,-0.156 +14421,0.700 +14422,-0.266 +14423,-0.293 +14424,1.629 +14425,-0.821 +14426,1.166 +14427,-0.850 +14428,1.238 +14429,-0.725 +14430,1.844 +14431,0.533 +14432,0.949 +14433,-1.216 +14434,-0.679 +14435,0.921 +14436,-0.300 +14437,0.646 +14438,0.738 +14439,-0.705 +14440,2.682 +14441,-0.850 +14442,-0.579 +14443,-0.362 +14444,-1.376 +14445,-0.910 +14446,-1.654 +14447,0.881 +14448,-0.452 +14449,-0.149 +14450,-0.296 +14451,-0.548 +14452,1.084 +14453,-0.128 +14454,0.651 +14455,0.499 +14456,0.834 +14457,-1.492 +14458,0.056 +14459,-0.788 +14460,-0.085 +14461,-1.256 +14462,0.521 +14463,1.373 +14464,1.400 +14465,-0.886 +14466,0.057 +14467,-0.481 +14468,0.971 +14469,0.097 +14470,-0.563 +14471,0.952 +14472,0.379 +14473,-0.586 +14474,1.963 +14475,1.042 +14476,0.571 +14477,-0.182 +14478,0.431 +14479,-0.702 +14480,-1.193 +14481,-0.088 +14482,-1.009 +14483,1.554 +14484,0.163 +14485,1.050 +14486,-1.357 +14487,-0.115 +14488,-0.596 +14489,0.528 +14490,1.879 +14491,0.534 +14492,0.238 +14493,0.371 +14494,-0.059 +14495,0.706 +14496,0.305 +14497,-0.460 +14498,0.574 +14499,0.551 +14500,-1.249 +14501,0.906 +14502,-1.475 +14503,-1.182 +14504,0.131 +14505,-0.668 +14506,-1.040 +14507,-0.859 +14508,-0.399 +14509,-0.486 +14510,-0.276 +14511,0.508 +14512,0.798 +14513,-0.282 +14514,1.125 +14515,0.831 +14516,-0.077 +14517,-1.050 +14518,0.500 +14519,-0.742 +14520,0.472 +14521,-0.251 +14522,-0.516 +14523,0.197 +14524,-0.664 +14525,-0.089 +14526,0.299 +14527,-0.083 +14528,0.387 +14529,0.839 +14530,-0.227 +14531,-0.061 +14532,0.707 +14533,-1.028 +14534,-1.117 +14535,1.335 +14536,0.820 +14537,0.066 +14538,1.122 +14539,-0.789 +14540,0.684 +14541,1.288 +14542,1.060 +14543,-0.730 +14544,0.540 +14545,0.815 +14546,-0.326 +14547,-0.625 +14548,-0.059 +14549,-0.827 +14550,-0.874 +14551,-0.548 +14552,0.178 +14553,1.374 +14554,-0.309 +14555,0.322 +14556,0.427 +14557,-0.568 +14558,-0.827 +14559,1.007 +14560,-1.521 +14561,-1.787 +14562,-0.259 +14563,0.132 +14564,1.026 +14565,-2.010 +14566,-0.607 +14567,0.036 +14568,1.734 +14569,1.005 +14570,1.142 +14571,0.062 +14572,-1.097 +14573,-0.129 +14574,0.532 +14575,0.878 +14576,-1.877 +14577,-1.390 +14578,1.125 +14579,0.532 +14580,-0.518 +14581,-1.018 +14582,0.300 +14583,-0.915 +14584,-0.904 +14585,-0.308 +14586,-1.163 +14587,-0.339 +14588,-1.266 +14589,-0.774 +14590,0.494 +14591,-1.303 +14592,1.034 +14593,-0.099 +14594,-0.701 +14595,-1.007 +14596,1.864 +14597,-1.213 +14598,0.594 +14599,0.307 +14600,-0.934 +14601,-1.930 +14602,1.383 +14603,1.035 +14604,0.087 +14605,-0.524 +14606,0.505 +14607,0.144 +14608,-0.024 +14609,-0.119 +14610,0.409 +14611,0.013 +14612,0.292 +14613,-1.259 +14614,-0.771 +14615,-1.491 +14616,0.833 +14617,1.143 +14618,-0.163 +14619,0.874 +14620,-1.188 +14621,-1.255 +14622,-0.880 +14623,1.644 +14624,-1.809 +14625,-1.946 +14626,-0.200 +14627,0.424 +14628,0.442 +14629,-1.990 +14630,-0.737 +14631,0.633 +14632,-0.509 +14633,-0.758 +14634,-0.021 +14635,0.086 +14636,-0.890 +14637,-0.561 +14638,-0.162 +14639,-1.392 +14640,0.413 +14641,-0.119 +14642,0.984 +14643,-0.161 +14644,-0.105 +14645,-0.926 +14646,1.118 +14647,-0.722 +14648,-1.961 +14649,0.117 +14650,-0.732 +14651,-0.506 +14652,1.120 +14653,-0.199 +14654,0.502 +14655,1.283 +14656,0.793 +14657,0.050 +14658,0.179 +14659,1.350 +14660,-1.864 +14661,0.188 +14662,-0.809 +14663,0.816 +14664,-0.834 +14665,0.297 +14666,-0.477 +14667,-1.629 +14668,-1.365 +14669,-0.338 +14670,-0.137 +14671,-0.851 +14672,-0.882 +14673,-0.954 +14674,-0.141 +14675,1.291 +14676,-0.195 +14677,0.076 +14678,-0.080 +14679,-0.392 +14680,0.052 +14681,0.675 +14682,-0.438 +14683,0.786 +14684,1.088 +14685,1.702 +14686,-0.865 +14687,-1.993 +14688,2.874 +14689,-0.765 +14690,0.311 +14691,0.053 +14692,0.349 +14693,1.160 +14694,0.099 +14695,-0.816 +14696,-0.783 +14697,-0.260 +14698,1.113 +14699,0.638 +14700,-0.923 +14701,0.342 +14702,0.886 +14703,0.221 +14704,-0.585 +14705,-0.419 +14706,0.433 +14707,-0.078 +14708,1.513 +14709,0.674 +14710,-0.598 +14711,0.088 +14712,-0.515 +14713,1.014 +14714,-1.142 +14715,-0.620 +14716,-1.482 +14717,-1.117 +14718,0.602 +14719,0.494 +14720,1.143 +14721,-0.127 +14722,1.559 +14723,0.345 +14724,-0.506 +14725,0.311 +14726,-0.867 +14727,-0.748 +14728,-0.960 +14729,0.804 +14730,1.910 +14731,-0.222 +14732,0.958 +14733,0.161 +14734,0.274 +14735,0.022 +14736,1.142 +14737,1.188 +14738,1.589 +14739,1.162 +14740,-1.199 +14741,0.639 +14742,-0.912 +14743,-0.946 +14744,-0.014 +14745,-0.154 +14746,-0.564 +14747,-0.052 +14748,-0.522 +14749,-0.540 +14750,0.471 +14751,-0.584 +14752,0.445 +14753,0.418 +14754,0.654 +14755,-0.892 +14756,-0.096 +14757,0.373 +14758,1.039 +14759,1.159 +14760,-0.385 +14761,0.113 +14762,1.199 +14763,0.458 +14764,-1.325 +14765,0.697 +14766,-0.752 +14767,1.278 +14768,1.327 +14769,-1.049 +14770,0.737 +14771,1.184 +14772,-0.434 +14773,-2.273 +14774,-1.199 +14775,-0.725 +14776,-0.085 +14777,-0.295 +14778,0.886 +14779,-1.589 +14780,-0.476 +14781,-0.270 +14782,0.061 +14783,-0.358 +14784,0.181 +14785,-0.715 +14786,-1.112 +14787,-0.114 +14788,0.519 +14789,-0.141 +14790,0.362 +14791,-0.025 +14792,0.730 +14793,0.885 +14794,-1.172 +14795,0.924 +14796,0.070 +14797,-0.283 +14798,1.273 +14799,0.685 +14800,1.461 +14801,0.031 +14802,-0.817 +14803,-0.438 +14804,-0.946 +14805,-0.463 +14806,0.282 +14807,-1.144 +14808,-0.738 +14809,-0.627 +14810,2.166 +14811,-0.941 +14812,-0.151 +14813,0.033 +14814,1.603 +14815,0.564 +14816,-0.229 +14817,0.859 +14818,-0.251 +14819,-0.231 +14820,0.260 +14821,0.701 +14822,0.569 +14823,0.952 +14824,-0.229 +14825,-2.146 +14826,-0.087 +14827,1.103 +14828,0.384 +14829,-0.027 +14830,0.191 +14831,-1.243 +14832,1.006 +14833,0.256 +14834,-0.035 +14835,-0.177 +14836,1.523 +14837,-1.153 +14838,-0.055 +14839,-0.467 +14840,0.614 +14841,-0.173 +14842,0.025 +14843,-0.854 +14844,-0.148 +14845,1.466 +14846,1.252 +14847,0.647 +14848,-1.656 +14849,1.195 +14850,1.051 +14851,-0.987 +14852,0.004 +14853,0.470 +14854,-0.436 +14855,-0.266 +14856,0.376 +14857,1.210 +14858,0.137 +14859,1.531 +14860,-0.032 +14861,0.680 +14862,-0.513 +14863,0.785 +14864,0.744 +14865,-0.325 +14866,-1.657 +14867,0.437 +14868,0.572 +14869,-1.047 +14870,1.446 +14871,0.423 +14872,2.387 +14873,1.273 +14874,-0.666 +14875,-3.250 +14876,-0.313 +14877,-1.718 +14878,0.331 +14879,-3.058 +14880,1.150 +14881,0.009 +14882,0.811 +14883,-1.130 +14884,1.250 +14885,-2.690 +14886,0.386 +14887,0.281 +14888,0.573 +14889,-1.935 +14890,-0.056 +14891,-0.860 +14892,-1.039 +14893,0.249 +14894,-0.679 +14895,0.124 +14896,-0.148 +14897,0.583 +14898,0.331 +14899,1.125 +14900,1.447 +14901,0.972 +14902,0.311 +14903,-2.959 +14904,-0.963 +14905,-1.177 +14906,0.180 +14907,0.680 +14908,-0.276 +14909,-0.523 +14910,-0.217 +14911,-1.400 +14912,0.582 +14913,0.001 +14914,-1.238 +14915,1.752 +14916,-0.517 +14917,-0.851 +14918,1.539 +14919,-1.033 +14920,0.688 +14921,-0.597 +14922,-1.465 +14923,0.401 +14924,1.409 +14925,-0.680 +14926,0.638 +14927,1.816 +14928,0.199 +14929,-0.321 +14930,0.141 +14931,-2.282 +14932,-0.298 +14933,-0.129 +14934,1.317 +14935,-0.570 +14936,-0.415 +14937,-0.332 +14938,-1.913 +14939,-1.256 +14940,1.597 +14941,-0.674 +14942,-0.602 +14943,-0.606 +14944,-0.263 +14945,1.220 +14946,-0.052 +14947,-0.454 +14948,0.218 +14949,-0.992 +14950,1.099 +14951,0.447 +14952,-1.127 +14953,0.281 +14954,1.803 +14955,1.473 +14956,-0.626 +14957,-1.006 +14958,-1.032 +14959,-1.453 +14960,0.894 +14961,0.206 +14962,-0.756 +14963,0.358 +14964,0.775 +14965,-0.669 +14966,0.525 +14967,-0.290 +14968,0.763 +14969,1.135 +14970,-0.465 +14971,-0.806 +14972,-0.009 +14973,0.844 +14974,-0.048 +14975,-0.061 +14976,-0.931 +14977,-1.126 +14978,-0.422 +14979,0.053 +14980,-0.917 +14981,0.187 +14982,1.043 +14983,-1.630 +14984,1.355 +14985,-0.555 +14986,1.270 +14987,0.107 +14988,-0.602 +14989,-0.259 +14990,1.691 +14991,-2.127 +14992,0.659 +14993,0.276 +14994,0.133 +14995,1.157 +14996,-0.736 +14997,1.336 +14998,0.136 +14999,-1.232 +15000,-0.896 +15001,0.084 +15002,0.367 +15003,-1.275 +15004,-0.696 +15005,0.495 +15006,-2.171 +15007,-0.756 +15008,1.213 +15009,-0.395 +15010,-0.801 +15011,-0.145 +15012,-2.932 +15013,-1.571 +15014,-0.111 +15015,-0.014 +15016,1.511 +15017,0.793 +15018,0.969 +15019,0.883 +15020,1.973 +15021,-0.349 +15022,-0.157 +15023,0.135 +15024,0.411 +15025,-1.908 +15026,0.271 +15027,0.430 +15028,1.231 +15029,-0.752 +15030,0.288 +15031,-0.431 +15032,0.982 +15033,0.350 +15034,-0.994 +15035,-0.613 +15036,0.517 +15037,-0.921 +15038,0.392 +15039,0.001 +15040,0.002 +15041,0.144 +15042,0.951 +15043,0.456 +15044,-0.829 +15045,0.010 +15046,-0.423 +15047,-0.614 +15048,-1.449 +15049,0.638 +15050,0.073 +15051,0.045 +15052,1.069 +15053,-0.499 +15054,0.788 +15055,0.789 +15056,-1.510 +15057,-0.480 +15058,-1.160 +15059,0.592 +15060,0.715 +15061,-0.142 +15062,1.046 +15063,1.079 +15064,-0.724 +15065,0.583 +15066,-1.092 +15067,-0.412 +15068,-0.783 +15069,-0.284 +15070,1.911 +15071,0.243 +15072,-2.105 +15073,0.980 +15074,0.989 +15075,0.108 +15076,-0.087 +15077,0.244 +15078,1.072 +15079,0.753 +15080,1.122 +15081,0.825 +15082,0.909 +15083,-1.721 +15084,0.728 +15085,-0.738 +15086,0.824 +15087,0.431 +15088,-1.528 +15089,-1.588 +15090,0.612 +15091,0.172 +15092,-0.586 +15093,-0.163 +15094,-0.712 +15095,0.155 +15096,-1.678 +15097,-0.922 +15098,-0.439 +15099,-0.042 +15100,0.671 +15101,-1.119 +15102,-0.463 +15103,0.396 +15104,-1.201 +15105,1.110 +15106,1.457 +15107,0.556 +15108,-2.002 +15109,-0.181 +15110,-0.754 +15111,-0.726 +15112,1.075 +15113,-1.294 +15114,0.910 +15115,0.877 +15116,0.575 +15117,0.420 +15118,1.570 +15119,1.372 +15120,1.195 +15121,0.431 +15122,-1.664 +15123,0.178 +15124,0.734 +15125,0.763 +15126,-0.649 +15127,0.839 +15128,-1.434 +15129,1.927 +15130,0.720 +15131,-1.535 +15132,1.023 +15133,0.891 +15134,1.247 +15135,-0.316 +15136,0.547 +15137,-0.634 +15138,0.192 +15139,1.027 +15140,0.370 +15141,-0.506 +15142,-0.172 +15143,0.317 +15144,1.163 +15145,-1.617 +15146,0.971 +15147,0.536 +15148,-0.972 +15149,0.985 +15150,-1.208 +15151,1.545 +15152,-0.328 +15153,0.458 +15154,-0.373 +15155,1.757 +15156,-0.969 +15157,-1.034 +15158,0.408 +15159,-0.156 +15160,-1.389 +15161,-0.090 +15162,0.578 +15163,0.780 +15164,-0.697 +15165,0.319 +15166,0.573 +15167,-0.325 +15168,0.760 +15169,0.826 +15170,0.635 +15171,-1.874 +15172,0.990 +15173,0.706 +15174,-0.136 +15175,-0.811 +15176,-0.136 +15177,0.193 +15178,0.327 +15179,0.481 +15180,0.495 +15181,0.127 +15182,-0.324 +15183,1.144 +15184,-1.255 +15185,-1.725 +15186,0.726 +15187,0.403 +15188,-1.399 +15189,-0.000 +15190,0.002 +15191,-0.288 +15192,0.377 +15193,1.190 +15194,-0.337 +15195,-1.649 +15196,0.857 +15197,-1.645 +15198,-1.282 +15199,-0.727 +15200,0.300 +15201,-0.873 +15202,0.079 +15203,-3.193 +15204,1.551 +15205,-0.937 +15206,-0.178 +15207,0.519 +15208,-0.401 +15209,0.513 +15210,-0.171 +15211,0.454 +15212,0.359 +15213,-0.967 +15214,0.228 +15215,0.740 +15216,-1.334 +15217,-0.401 +15218,0.252 +15219,-0.018 +15220,-1.410 +15221,-0.725 +15222,-0.753 +15223,0.237 +15224,0.622 +15225,0.312 +15226,-0.281 +15227,0.005 +15228,0.035 +15229,-1.149 +15230,-0.428 +15231,-0.612 +15232,-0.302 +15233,-0.385 +15234,-1.260 +15235,0.205 +15236,0.907 +15237,0.983 +15238,-0.570 +15239,0.525 +15240,-1.058 +15241,0.706 +15242,0.714 +15243,0.988 +15244,0.722 +15245,1.129 +15246,2.155 +15247,-1.420 +15248,0.631 +15249,-0.231 +15250,0.103 +15251,0.533 +15252,-0.027 +15253,-1.687 +15254,0.794 +15255,-1.311 +15256,-0.009 +15257,-0.098 +15258,-0.898 +15259,1.602 +15260,0.628 +15261,0.272 +15262,-0.467 +15263,1.106 +15264,-0.060 +15265,-1.236 +15266,1.999 +15267,-0.449 +15268,1.855 +15269,0.456 +15270,0.792 +15271,-0.860 +15272,-1.179 +15273,1.116 +15274,-0.408 +15275,-0.130 +15276,0.469 +15277,-1.085 +15278,-1.187 +15279,2.469 +15280,-0.309 +15281,0.531 +15282,0.503 +15283,-1.105 +15284,2.168 +15285,-1.529 +15286,0.576 +15287,-2.434 +15288,0.720 +15289,1.282 +15290,0.486 +15291,0.153 +15292,0.017 +15293,0.298 +15294,-0.910 +15295,-1.975 +15296,-0.696 +15297,1.380 +15298,-0.353 +15299,-0.262 +15300,-0.117 +15301,1.311 +15302,0.690 +15303,-0.398 +15304,0.915 +15305,-0.723 +15306,0.856 +15307,0.414 +15308,0.440 +15309,-0.453 +15310,0.199 +15311,-0.352 +15312,-2.060 +15313,1.567 +15314,-0.672 +15315,1.718 +15316,1.701 +15317,-0.371 +15318,-2.132 +15319,0.760 +15320,0.055 +15321,0.695 +15322,1.717 +15323,0.288 +15324,1.350 +15325,-2.094 +15326,0.481 +15327,0.711 +15328,0.157 +15329,-0.169 +15330,0.640 +15331,-1.216 +15332,-0.396 +15333,0.303 +15334,0.403 +15335,-0.202 +15336,0.609 +15337,-0.123 +15338,-0.543 +15339,-1.565 +15340,0.087 +15341,-0.986 +15342,0.411 +15343,-0.563 +15344,-0.332 +15345,1.058 +15346,-0.797 +15347,0.609 +15348,-0.177 +15349,1.939 +15350,1.124 +15351,-0.664 +15352,-0.784 +15353,0.238 +15354,-0.700 +15355,0.678 +15356,0.058 +15357,-0.103 +15358,-1.077 +15359,1.039 +15360,0.663 +15361,1.090 +15362,-0.221 +15363,-0.658 +15364,-1.398 +15365,-1.068 +15366,-0.863 +15367,0.475 +15368,-0.530 +15369,-2.133 +15370,-2.229 +15371,-1.781 +15372,-1.075 +15373,0.117 +15374,-0.627 +15375,0.036 +15376,0.468 +15377,-0.982 +15378,-0.568 +15379,-1.442 +15380,1.267 +15381,-0.202 +15382,-0.403 +15383,-1.372 +15384,-0.123 +15385,-0.989 +15386,-0.428 +15387,0.538 +15388,2.112 +15389,0.243 +15390,0.044 +15391,0.863 +15392,0.067 +15393,0.787 +15394,-1.705 +15395,0.026 +15396,-0.386 +15397,-0.467 +15398,-1.959 +15399,-1.053 +15400,1.172 +15401,-0.221 +15402,1.372 +15403,-0.240 +15404,1.592 +15405,-2.320 +15406,0.242 +15407,0.404 +15408,0.147 +15409,-0.366 +15410,-1.095 +15411,-1.194 +15412,-0.235 +15413,-0.005 +15414,-0.305 +15415,-0.498 +15416,0.991 +15417,0.337 +15418,0.771 +15419,1.074 +15420,0.450 +15421,2.023 +15422,2.512 +15423,1.868 +15424,0.130 +15425,-1.534 +15426,-1.387 +15427,-0.850 +15428,-0.478 +15429,0.330 +15430,-0.005 +15431,0.704 +15432,1.069 +15433,-0.058 +15434,-0.863 +15435,-0.217 +15436,0.591 +15437,1.491 +15438,1.666 +15439,-1.507 +15440,0.252 +15441,2.638 +15442,-1.316 +15443,-0.155 +15444,0.885 +15445,0.165 +15446,-1.155 +15447,-0.941 +15448,0.919 +15449,-2.473 +15450,0.924 +15451,-2.664 +15452,-0.971 +15453,-2.091 +15454,-0.864 +15455,1.179 +15456,-1.076 +15457,-1.470 +15458,-0.186 +15459,1.334 +15460,-1.119 +15461,-0.511 +15462,0.291 +15463,0.756 +15464,0.061 +15465,-1.321 +15466,2.157 +15467,0.078 +15468,0.277 +15469,0.741 +15470,-0.582 +15471,0.377 +15472,0.443 +15473,1.176 +15474,-0.883 +15475,0.993 +15476,0.391 +15477,0.903 +15478,0.236 +15479,-0.574 +15480,1.735 +15481,0.163 +15482,0.084 +15483,2.477 +15484,0.099 +15485,0.043 +15486,0.227 +15487,-1.193 +15488,-0.460 +15489,1.375 +15490,1.093 +15491,1.025 +15492,-0.384 +15493,-0.419 +15494,2.328 +15495,0.020 +15496,0.756 +15497,-0.339 +15498,0.343 +15499,0.436 +15500,-1.988 +15501,-0.688 +15502,0.155 +15503,0.034 +15504,2.452 +15505,-0.687 +15506,-1.729 +15507,-0.405 +15508,-0.942 +15509,1.383 +15510,0.563 +15511,1.375 +15512,1.681 +15513,-1.178 +15514,-0.584 +15515,-0.300 +15516,-1.050 +15517,-1.827 +15518,-0.706 +15519,-0.022 +15520,1.037 +15521,0.096 +15522,0.722 +15523,2.113 +15524,-0.627 +15525,-0.747 +15526,-0.932 +15527,0.501 +15528,0.836 +15529,1.574 +15530,0.293 +15531,1.427 +15532,0.031 +15533,-0.310 +15534,0.649 +15535,0.209 +15536,-1.810 +15537,0.303 +15538,-0.710 +15539,-0.623 +15540,-0.047 +15541,0.569 +15542,0.140 +15543,0.811 +15544,-1.150 +15545,-1.961 +15546,-0.692 +15547,0.703 +15548,-0.131 +15549,0.091 +15550,0.106 +15551,0.779 +15552,-2.451 +15553,-0.710 +15554,1.215 +15555,-0.779 +15556,0.644 +15557,-2.031 +15558,-0.746 +15559,-0.104 +15560,1.777 +15561,0.116 +15562,1.123 +15563,0.475 +15564,-0.042 +15565,1.335 +15566,0.129 +15567,0.633 +15568,1.000 +15569,0.259 +15570,-0.714 +15571,-0.013 +15572,-0.070 +15573,0.803 +15574,-0.646 +15575,0.534 +15576,-1.354 +15577,-0.131 +15578,-2.230 +15579,1.933 +15580,-0.168 +15581,-2.641 +15582,-1.215 +15583,0.291 +15584,0.536 +15585,1.526 +15586,-0.690 +15587,-0.835 +15588,0.301 +15589,1.113 +15590,1.043 +15591,0.842 +15592,0.071 +15593,0.091 +15594,-0.991 +15595,-1.418 +15596,0.296 +15597,-0.039 +15598,1.627 +15599,0.125 +15600,1.027 +15601,-1.332 +15602,-0.255 +15603,-1.075 +15604,-0.478 +15605,0.788 +15606,0.101 +15607,-2.007 +15608,0.270 +15609,0.128 +15610,0.403 +15611,-0.095 +15612,0.379 +15613,-0.562 +15614,0.764 +15615,0.679 +15616,1.130 +15617,0.569 +15618,-1.254 +15619,-1.401 +15620,-0.272 +15621,1.314 +15622,0.250 +15623,0.886 +15624,0.061 +15625,1.741 +15626,0.236 +15627,-0.832 +15628,0.169 +15629,-0.038 +15630,-0.031 +15631,0.085 +15632,-0.735 +15633,-1.151 +15634,0.748 +15635,-2.014 +15636,0.643 +15637,-1.198 +15638,0.292 +15639,2.268 +15640,0.143 +15641,1.293 +15642,-0.994 +15643,-0.484 +15644,-0.347 +15645,0.782 +15646,0.541 +15647,0.026 +15648,0.398 +15649,0.370 +15650,-0.219 +15651,-0.866 +15652,-1.324 +15653,-0.469 +15654,-1.084 +15655,1.321 +15656,-0.793 +15657,-0.697 +15658,-0.533 +15659,-0.135 +15660,-0.048 +15661,0.604 +15662,0.492 +15663,1.825 +15664,-0.397 +15665,-1.581 +15666,0.150 +15667,-1.232 +15668,0.080 +15669,-0.264 +15670,-0.732 +15671,-1.514 +15672,-0.552 +15673,-0.708 +15674,-0.041 +15675,1.279 +15676,0.113 +15677,-1.358 +15678,0.211 +15679,-0.732 +15680,1.619 +15681,0.946 +15682,0.179 +15683,0.761 +15684,1.124 +15685,1.004 +15686,1.139 +15687,-1.682 +15688,1.663 +15689,-1.503 +15690,-1.047 +15691,-1.216 +15692,-2.435 +15693,-2.020 +15694,1.038 +15695,1.919 +15696,0.080 +15697,-0.393 +15698,0.474 +15699,0.373 +15700,-1.664 +15701,2.070 +15702,-0.758 +15703,-0.774 +15704,2.059 +15705,0.713 +15706,-0.090 +15707,1.232 +15708,-0.440 +15709,1.017 +15710,-0.175 +15711,-0.141 +15712,1.091 +15713,-1.049 +15714,-0.395 +15715,-0.225 +15716,1.282 +15717,0.257 +15718,0.698 +15719,-2.383 +15720,1.287 +15721,-0.616 +15722,1.036 +15723,-1.258 +15724,-0.061 +15725,1.447 +15726,0.175 +15727,-0.050 +15728,-0.303 +15729,-1.954 +15730,-0.064 +15731,0.935 +15732,-0.551 +15733,0.478 +15734,2.362 +15735,-0.693 +15736,-1.600 +15737,-1.140 +15738,0.433 +15739,0.719 +15740,-0.014 +15741,0.842 +15742,0.148 +15743,-1.466 +15744,0.897 +15745,1.032 +15746,0.452 +15747,1.106 +15748,1.573 +15749,0.355 +15750,-0.084 +15751,-0.108 +15752,0.892 +15753,1.311 +15754,2.056 +15755,0.145 +15756,-0.061 +15757,0.731 +15758,0.413 +15759,0.050 +15760,-0.694 +15761,1.132 +15762,-1.832 +15763,-0.257 +15764,-0.098 +15765,0.078 +15766,0.415 +15767,0.174 +15768,-0.462 +15769,0.956 +15770,0.461 +15771,0.760 +15772,-0.323 +15773,-0.038 +15774,1.163 +15775,1.066 +15776,0.116 +15777,1.203 +15778,0.610 +15779,-0.261 +15780,0.653 +15781,0.904 +15782,-1.719 +15783,0.945 +15784,0.418 +15785,-0.321 +15786,-0.093 +15787,1.858 +15788,2.287 +15789,-0.486 +15790,0.868 +15791,0.464 +15792,-1.506 +15793,-0.460 +15794,0.936 +15795,-0.202 +15796,0.205 +15797,-1.271 +15798,-0.675 +15799,0.683 +15800,0.811 +15801,0.421 +15802,1.106 +15803,0.526 +15804,1.637 +15805,-0.900 +15806,-0.537 +15807,0.527 +15808,0.750 +15809,0.565 +15810,1.550 +15811,0.019 +15812,-0.467 +15813,-1.611 +15814,-0.630 +15815,-1.304 +15816,0.607 +15817,-0.233 +15818,0.633 +15819,0.879 +15820,1.108 +15821,-0.486 +15822,-0.456 +15823,-0.631 +15824,-1.723 +15825,-1.593 +15826,0.915 +15827,1.275 +15828,0.207 +15829,0.476 +15830,0.722 +15831,1.029 +15832,0.227 +15833,0.164 +15834,0.175 +15835,-1.080 +15836,0.749 +15837,0.221 +15838,-1.043 +15839,-1.545 +15840,-1.904 +15841,-1.424 +15842,1.047 +15843,-1.039 +15844,-0.002 +15845,-1.160 +15846,0.367 +15847,0.390 +15848,-0.169 +15849,0.713 +15850,-1.113 +15851,-0.429 +15852,-2.405 +15853,1.093 +15854,0.158 +15855,1.386 +15856,-2.478 +15857,-1.102 +15858,0.466 +15859,-2.270 +15860,0.062 +15861,0.098 +15862,-1.808 +15863,1.575 +15864,0.779 +15865,-0.856 +15866,-1.261 +15867,-1.283 +15868,-0.492 +15869,-0.512 +15870,1.701 +15871,0.723 +15872,-0.725 +15873,1.916 +15874,-0.527 +15875,-1.012 +15876,1.852 +15877,-0.440 +15878,-1.411 +15879,0.791 +15880,-1.680 +15881,-0.256 +15882,1.522 +15883,-0.271 +15884,-0.230 +15885,-0.369 +15886,0.654 +15887,1.706 +15888,-0.410 +15889,-1.444 +15890,0.656 +15891,-1.875 +15892,0.408 +15893,0.308 +15894,-0.209 +15895,-0.161 +15896,-0.077 +15897,1.018 +15898,2.325 +15899,-0.971 +15900,-0.087 +15901,0.024 +15902,-0.159 +15903,0.883 +15904,0.035 +15905,0.540 +15906,-0.587 +15907,-0.742 +15908,0.967 +15909,-0.513 +15910,1.132 +15911,-0.147 +15912,-0.091 +15913,-1.169 +15914,0.894 +15915,0.590 +15916,-1.819 +15917,-0.519 +15918,0.590 +15919,-0.389 +15920,0.060 +15921,0.063 +15922,0.956 +15923,-0.808 +15924,-1.216 +15925,1.113 +15926,2.174 +15927,-0.442 +15928,-0.097 +15929,-0.081 +15930,-0.612 +15931,1.185 +15932,-0.406 +15933,-0.508 +15934,-0.393 +15935,-1.983 +15936,0.005 +15937,-0.743 +15938,0.031 +15939,-0.509 +15940,-0.215 +15941,1.355 +15942,0.455 +15943,0.836 +15944,-0.345 +15945,0.286 +15946,-0.754 +15947,-0.599 +15948,-0.495 +15949,0.252 +15950,-0.983 +15951,-1.855 +15952,1.022 +15953,0.124 +15954,-0.982 +15955,-0.212 +15956,0.566 +15957,1.936 +15958,-0.329 +15959,0.745 +15960,-1.042 +15961,0.390 +15962,0.547 +15963,-0.394 +15964,0.523 +15965,0.389 +15966,-0.360 +15967,0.667 +15968,-0.064 +15969,0.426 +15970,-0.763 +15971,1.378 +15972,1.378 +15973,-1.055 +15974,0.622 +15975,-0.183 +15976,0.812 +15977,-2.077 +15978,1.593 +15979,0.912 +15980,0.153 +15981,-0.199 +15982,0.557 +15983,-0.092 +15984,-0.182 +15985,-0.445 +15986,-1.352 +15987,0.965 +15988,0.101 +15989,-1.137 +15990,0.282 +15991,2.441 +15992,-0.189 +15993,1.231 +15994,1.007 +15995,-1.690 +15996,0.131 +15997,0.028 +15998,1.705 +15999,-1.441 +16000,-0.874 +16001,-0.580 +16002,0.054 +16003,-1.012 +16004,0.042 +16005,0.596 +16006,1.764 +16007,-0.257 +16008,0.044 +16009,0.734 +16010,-1.491 +16011,-0.071 +16012,-0.978 +16013,-1.233 +16014,-0.528 +16015,1.305 +16016,1.390 +16017,-0.818 +16018,-1.525 +16019,-0.397 +16020,-0.385 +16021,0.099 +16022,0.822 +16023,-1.144 +16024,0.344 +16025,-1.608 +16026,0.862 +16027,-0.771 +16028,-1.183 +16029,-1.017 +16030,-0.951 +16031,-0.045 +16032,-0.971 +16033,-0.574 +16034,1.204 +16035,0.080 +16036,-1.245 +16037,-0.262 +16038,1.637 +16039,1.908 +16040,0.670 +16041,0.912 +16042,0.337 +16043,0.653 +16044,1.053 +16045,0.683 +16046,0.533 +16047,1.253 +16048,-1.746 +16049,0.444 +16050,-1.515 +16051,1.248 +16052,-2.109 +16053,-0.332 +16054,-1.001 +16055,-1.152 +16056,0.810 +16057,0.537 +16058,0.708 +16059,0.071 +16060,-0.063 +16061,0.707 +16062,-1.358 +16063,0.584 +16064,-1.302 +16065,-1.069 +16066,-0.010 +16067,0.870 +16068,-0.414 +16069,1.211 +16070,-0.762 +16071,-2.070 +16072,-0.541 +16073,0.355 +16074,-0.924 +16075,0.561 +16076,0.168 +16077,0.033 +16078,-0.847 +16079,-0.369 +16080,-0.328 +16081,2.782 +16082,-1.079 +16083,-1.234 +16084,-1.335 +16085,0.512 +16086,-0.752 +16087,1.300 +16088,0.376 +16089,-1.036 +16090,-0.969 +16091,-0.711 +16092,1.390 +16093,-0.315 +16094,-0.555 +16095,-0.231 +16096,0.511 +16097,-0.389 +16098,1.570 +16099,-2.571 +16100,0.808 +16101,-1.197 +16102,0.155 +16103,-0.826 +16104,0.831 +16105,0.762 +16106,1.468 +16107,0.598 +16108,0.267 +16109,0.961 +16110,-1.117 +16111,1.816 +16112,-0.373 +16113,0.443 +16114,0.418 +16115,1.648 +16116,1.521 +16117,-1.811 +16118,-2.173 +16119,1.223 +16120,1.789 +16121,0.347 +16122,0.739 +16123,0.543 +16124,-1.283 +16125,-0.025 +16126,-0.580 +16127,-1.177 +16128,-0.592 +16129,-0.042 +16130,0.265 +16131,-0.279 +16132,1.233 +16133,-0.346 +16134,1.238 +16135,-0.541 +16136,-1.108 +16137,2.828 +16138,0.370 +16139,0.321 +16140,0.377 +16141,1.776 +16142,-0.720 +16143,-0.085 +16144,-0.988 +16145,-0.086 +16146,1.072 +16147,0.482 +16148,1.161 +16149,0.693 +16150,0.632 +16151,-0.308 +16152,-0.598 +16153,-0.754 +16154,2.362 +16155,-0.644 +16156,0.299 +16157,0.879 +16158,0.476 +16159,-1.441 +16160,-1.344 +16161,0.189 +16162,-0.879 +16163,-0.331 +16164,-1.133 +16165,1.401 +16166,-0.416 +16167,0.841 +16168,-0.036 +16169,-0.481 +16170,-0.907 +16171,-0.553 +16172,0.476 +16173,0.400 +16174,0.423 +16175,0.247 +16176,0.680 +16177,1.051 +16178,-0.134 +16179,0.006 +16180,-1.065 +16181,1.142 +16182,-0.993 +16183,1.554 +16184,0.968 +16185,0.131 +16186,-0.547 +16187,0.332 +16188,-0.340 +16189,-0.274 +16190,0.971 +16191,2.234 +16192,-0.577 +16193,-1.514 +16194,-0.225 +16195,-0.085 +16196,-0.640 +16197,1.920 +16198,0.327 +16199,-0.879 +16200,-0.673 +16201,0.674 +16202,0.946 +16203,0.157 +16204,1.314 +16205,-0.939 +16206,0.994 +16207,1.525 +16208,1.497 +16209,-0.821 +16210,0.554 +16211,1.282 +16212,3.015 +16213,-0.594 +16214,1.560 +16215,-0.855 +16216,0.804 +16217,2.788 +16218,1.603 +16219,-0.450 +16220,-0.710 +16221,0.230 +16222,0.595 +16223,-0.354 +16224,0.999 +16225,0.193 +16226,-0.029 +16227,-0.723 +16228,-0.690 +16229,1.901 +16230,2.061 +16231,-1.524 +16232,-0.908 +16233,0.493 +16234,1.741 +16235,-0.696 +16236,1.050 +16237,1.132 +16238,1.109 +16239,0.752 +16240,0.046 +16241,0.454 +16242,0.732 +16243,0.106 +16244,1.047 +16245,0.030 +16246,-0.381 +16247,-0.580 +16248,0.190 +16249,0.314 +16250,0.756 +16251,-0.357 +16252,-1.377 +16253,0.601 +16254,-0.257 +16255,0.054 +16256,0.593 +16257,-1.186 +16258,-1.488 +16259,-1.478 +16260,0.697 +16261,-0.444 +16262,0.139 +16263,-0.986 +16264,0.032 +16265,-0.492 +16266,0.328 +16267,0.113 +16268,0.223 +16269,-1.489 +16270,0.296 +16271,-0.978 +16272,0.756 +16273,0.120 +16274,-0.516 +16275,0.761 +16276,0.165 +16277,0.244 +16278,1.057 +16279,0.898 +16280,-1.162 +16281,1.352 +16282,2.346 +16283,0.886 +16284,-1.025 +16285,0.486 +16286,-0.314 +16287,-0.330 +16288,0.822 +16289,-0.811 +16290,-1.256 +16291,-0.394 +16292,-0.657 +16293,-0.749 +16294,-1.663 +16295,-0.989 +16296,-0.986 +16297,2.280 +16298,-0.306 +16299,0.476 +16300,0.142 +16301,0.818 +16302,0.540 +16303,0.446 +16304,1.103 +16305,-0.499 +16306,0.392 +16307,-1.014 +16308,0.377 +16309,-0.273 +16310,0.055 +16311,-0.790 +16312,-0.344 +16313,1.177 +16314,-0.031 +16315,1.857 +16316,0.987 +16317,-0.562 +16318,2.173 +16319,-1.340 +16320,-0.934 +16321,0.674 +16322,0.286 +16323,-1.523 +16324,-0.470 +16325,0.299 +16326,0.073 +16327,-1.437 +16328,-0.490 +16329,-0.069 +16330,-1.771 +16331,0.921 +16332,0.414 +16333,0.886 +16334,-0.205 +16335,-0.070 +16336,-1.374 +16337,1.723 +16338,-0.570 +16339,-1.490 +16340,1.006 +16341,-1.986 +16342,-0.856 +16343,1.169 +16344,-0.269 +16345,-0.782 +16346,1.580 +16347,0.157 +16348,0.589 +16349,1.603 +16350,-0.179 +16351,0.417 +16352,-1.299 +16353,-0.892 +16354,0.877 +16355,0.368 +16356,0.894 +16357,0.600 +16358,-0.576 +16359,0.224 +16360,0.686 +16361,-0.684 +16362,0.236 +16363,-0.006 +16364,0.710 +16365,0.064 +16366,-0.260 +16367,-0.440 +16368,-1.113 +16369,-0.702 +16370,-2.174 +16371,-0.379 +16372,-1.802 +16373,-0.704 +16374,-1.927 +16375,-0.116 +16376,0.009 +16377,-1.258 +16378,-0.434 +16379,-0.204 +16380,0.500 +16381,-0.457 +16382,-0.422 +16383,-0.336 +16384,0.023 +16385,-1.736 +16386,-0.072 +16387,-0.668 +16388,-0.617 +16389,-0.906 +16390,-0.377 +16391,-0.797 +16392,-0.098 +16393,1.041 +16394,-0.587 +16395,-1.204 +16396,0.019 +16397,0.962 +16398,0.251 +16399,-1.035 +16400,-1.090 +16401,0.216 +16402,-2.129 +16403,-1.011 +16404,0.181 +16405,-0.193 +16406,0.031 +16407,0.093 +16408,-0.031 +16409,0.461 +16410,1.312 +16411,-0.816 +16412,-0.934 +16413,0.003 +16414,-0.028 +16415,0.143 +16416,-0.819 +16417,-0.882 +16418,-0.228 +16419,1.028 +16420,-0.736 +16421,-0.612 +16422,1.117 +16423,1.058 +16424,0.231 +16425,0.133 +16426,-1.420 +16427,-1.245 +16428,0.475 +16429,0.080 +16430,0.545 +16431,0.873 +16432,-1.317 +16433,0.503 +16434,-0.581 +16435,0.664 +16436,-0.385 +16437,-1.376 +16438,0.746 +16439,-1.512 +16440,1.180 +16441,0.486 +16442,-0.977 +16443,0.233 +16444,0.999 +16445,0.899 +16446,-1.829 +16447,-0.336 +16448,0.379 +16449,0.013 +16450,-0.314 +16451,0.063 +16452,-1.387 +16453,0.657 +16454,-0.750 +16455,1.081 +16456,-1.752 +16457,-1.265 +16458,1.984 +16459,-0.656 +16460,0.817 +16461,1.211 +16462,0.527 +16463,1.329 +16464,-1.121 +16465,0.441 +16466,-0.510 +16467,0.061 +16468,-0.278 +16469,-0.324 +16470,0.934 +16471,0.730 +16472,0.934 +16473,0.399 +16474,-0.600 +16475,0.764 +16476,-0.853 +16477,-1.272 +16478,1.660 +16479,-0.771 +16480,-1.399 +16481,-0.459 +16482,-0.192 +16483,-0.355 +16484,-0.130 +16485,0.023 +16486,0.341 +16487,-1.020 +16488,-0.676 +16489,-1.041 +16490,0.012 +16491,-0.469 +16492,-0.763 +16493,1.492 +16494,-2.112 +16495,-0.569 +16496,-1.349 +16497,-0.309 +16498,0.381 +16499,0.896 +16500,-0.110 +16501,0.134 +16502,-0.912 +16503,0.207 +16504,0.059 +16505,-0.832 +16506,-0.234 +16507,-1.472 +16508,0.052 +16509,0.650 +16510,0.683 +16511,0.541 +16512,-0.171 +16513,-0.003 +16514,0.736 +16515,-0.484 +16516,1.739 +16517,0.825 +16518,1.056 +16519,-1.090 +16520,-0.648 +16521,-0.951 +16522,-2.046 +16523,0.340 +16524,0.027 +16525,0.348 +16526,-1.324 +16527,2.237 +16528,-0.701 +16529,0.453 +16530,1.408 +16531,0.036 +16532,0.803 +16533,0.136 +16534,-0.718 +16535,-1.152 +16536,-0.343 +16537,1.009 +16538,-0.831 +16539,1.548 +16540,-0.909 +16541,-1.174 +16542,-0.007 +16543,-1.083 +16544,0.257 +16545,0.823 +16546,-0.952 +16547,-0.939 +16548,1.173 +16549,-0.556 +16550,0.228 +16551,-0.481 +16552,-0.412 +16553,-0.241 +16554,-0.917 +16555,0.937 +16556,0.136 +16557,0.946 +16558,-0.276 +16559,0.281 +16560,1.423 +16561,-1.536 +16562,-0.058 +16563,0.745 +16564,-2.009 +16565,-1.418 +16566,-0.604 +16567,-0.119 +16568,0.337 +16569,1.621 +16570,0.049 +16571,0.703 +16572,1.702 +16573,2.830 +16574,0.556 +16575,0.647 +16576,0.032 +16577,0.919 +16578,0.388 +16579,0.881 +16580,1.107 +16581,0.369 +16582,-0.441 +16583,0.756 +16584,0.218 +16585,-0.896 +16586,-1.292 +16587,0.530 +16588,0.066 +16589,-1.108 +16590,0.049 +16591,-1.471 +16592,0.779 +16593,0.630 +16594,-0.807 +16595,1.708 +16596,-0.535 +16597,-0.767 +16598,-0.074 +16599,0.379 +16600,0.494 +16601,0.983 +16602,0.184 +16603,1.579 +16604,-0.103 +16605,0.616 +16606,-0.736 +16607,-0.154 +16608,0.661 +16609,0.904 +16610,0.290 +16611,0.695 +16612,0.210 +16613,0.436 +16614,-0.050 +16615,-2.385 +16616,-0.597 +16617,-2.349 +16618,-0.928 +16619,-0.704 +16620,1.313 +16621,0.687 +16622,-0.323 +16623,0.095 +16624,0.035 +16625,-1.327 +16626,0.051 +16627,-1.591 +16628,-0.297 +16629,-0.416 +16630,-1.361 +16631,1.070 +16632,-1.842 +16633,2.691 +16634,0.017 +16635,0.702 +16636,0.155 +16637,0.377 +16638,1.535 +16639,0.777 +16640,-1.701 +16641,-0.978 +16642,0.196 +16643,-1.193 +16644,-1.084 +16645,-0.281 +16646,0.023 +16647,-0.421 +16648,-1.545 +16649,-0.859 +16650,-0.881 +16651,0.935 +16652,1.332 +16653,-0.088 +16654,0.435 +16655,-0.129 +16656,-0.323 +16657,0.020 +16658,-1.407 +16659,0.980 +16660,-1.068 +16661,-0.014 +16662,-0.540 +16663,1.373 +16664,1.496 +16665,-2.423 +16666,0.332 +16667,-0.452 +16668,-0.202 +16669,0.046 +16670,-1.542 +16671,-1.120 +16672,-0.109 +16673,1.419 +16674,-1.176 +16675,1.952 +16676,1.249 +16677,0.018 +16678,1.185 +16679,-0.311 +16680,0.781 +16681,-0.068 +16682,-0.671 +16683,-1.176 +16684,0.156 +16685,-1.566 +16686,1.109 +16687,0.469 +16688,0.331 +16689,0.418 +16690,-1.085 +16691,1.768 +16692,0.516 +16693,-0.533 +16694,-1.219 +16695,1.581 +16696,-0.186 +16697,-0.001 +16698,0.339 +16699,1.046 +16700,-0.470 +16701,0.440 +16702,0.510 +16703,-0.347 +16704,0.585 +16705,0.446 +16706,-0.047 +16707,1.043 +16708,0.788 +16709,0.827 +16710,1.146 +16711,0.064 +16712,0.124 +16713,-0.118 +16714,1.060 +16715,-1.381 +16716,-1.198 +16717,-1.657 +16718,-1.042 +16719,0.509 +16720,0.127 +16721,0.233 +16722,0.461 +16723,0.014 +16724,0.692 +16725,1.108 +16726,0.119 +16727,0.676 +16728,-0.325 +16729,-0.729 +16730,0.227 +16731,-1.278 +16732,0.054 +16733,0.034 +16734,-1.210 +16735,0.832 +16736,2.979 +16737,-0.000 +16738,-1.170 +16739,0.771 +16740,2.158 +16741,-1.114 +16742,-0.788 +16743,1.404 +16744,-0.501 +16745,-0.881 +16746,-0.813 +16747,0.671 +16748,1.091 +16749,-0.588 +16750,-1.712 +16751,1.776 +16752,-0.225 +16753,-0.334 +16754,-0.000 +16755,0.972 +16756,0.337 +16757,0.206 +16758,1.947 +16759,-1.919 +16760,-0.390 +16761,-0.812 +16762,-1.265 +16763,0.828 +16764,-1.156 +16765,1.053 +16766,-0.938 +16767,-0.178 +16768,0.785 +16769,0.654 +16770,-0.754 +16771,0.758 +16772,1.416 +16773,-0.985 +16774,1.382 +16775,-0.508 +16776,-1.058 +16777,-0.445 +16778,-0.836 +16779,1.820 +16780,-0.892 +16781,0.460 +16782,1.268 +16783,-0.399 +16784,0.691 +16785,0.738 +16786,-0.343 +16787,1.027 +16788,-0.542 +16789,0.120 +16790,0.502 +16791,0.788 +16792,0.909 +16793,1.513 +16794,-1.640 +16795,0.471 +16796,0.925 +16797,-1.797 +16798,-1.174 +16799,0.794 +16800,0.390 +16801,-0.363 +16802,-0.511 +16803,-1.134 +16804,1.415 +16805,1.681 +16806,0.857 +16807,0.359 +16808,1.235 +16809,-0.308 +16810,1.778 +16811,-0.848 +16812,1.613 +16813,1.010 +16814,-0.234 +16815,1.593 +16816,0.841 +16817,-0.700 +16818,-0.170 +16819,0.322 +16820,0.474 +16821,-1.241 +16822,-1.141 +16823,1.852 +16824,0.286 +16825,-0.527 +16826,0.343 +16827,0.060 +16828,-0.139 +16829,0.087 +16830,0.754 +16831,-1.603 +16832,-2.090 +16833,1.760 +16834,0.210 +16835,-1.250 +16836,-2.213 +16837,1.481 +16838,-0.389 +16839,0.789 +16840,-1.408 +16841,0.217 +16842,0.245 +16843,1.061 +16844,-1.571 +16845,0.432 +16846,-1.827 +16847,2.020 +16848,-0.991 +16849,-1.114 +16850,0.716 +16851,-1.063 +16852,0.065 +16853,-0.448 +16854,-0.979 +16855,-0.237 +16856,-2.498 +16857,0.505 +16858,-0.407 +16859,-0.044 +16860,-0.404 +16861,-0.720 +16862,0.970 +16863,-1.299 +16864,-2.001 +16865,0.136 +16866,0.225 +16867,-1.478 +16868,-0.693 +16869,-0.550 +16870,-0.537 +16871,0.786 +16872,-2.019 +16873,0.066 +16874,-0.633 +16875,-0.545 +16876,-1.743 +16877,0.192 +16878,0.332 +16879,-0.159 +16880,0.382 +16881,2.014 +16882,-0.260 +16883,-0.871 +16884,-0.545 +16885,0.964 +16886,-0.548 +16887,-0.833 +16888,0.595 +16889,0.945 +16890,-1.304 +16891,-0.732 +16892,0.079 +16893,-1.804 +16894,-0.488 +16895,0.669 +16896,-0.065 +16897,-1.501 +16898,-0.929 +16899,-0.556 +16900,-1.654 +16901,1.551 +16902,-0.163 +16903,-0.021 +16904,0.628 +16905,0.244 +16906,1.577 +16907,-1.746 +16908,-0.375 +16909,-0.861 +16910,-1.155 +16911,0.381 +16912,-0.225 +16913,0.421 +16914,-0.794 +16915,-0.440 +16916,-0.117 +16917,0.507 +16918,-0.995 +16919,0.448 +16920,0.121 +16921,-0.622 +16922,1.093 +16923,-0.445 +16924,-0.018 +16925,-0.090 +16926,0.032 +16927,-0.377 +16928,-0.222 +16929,0.316 +16930,-0.795 +16931,-0.886 +16932,1.269 +16933,1.207 +16934,-0.867 +16935,0.431 +16936,-0.435 +16937,-1.291 +16938,0.323 +16939,-1.047 +16940,-0.067 +16941,0.170 +16942,0.812 +16943,0.895 +16944,0.602 +16945,-1.719 +16946,0.106 +16947,-0.033 +16948,-0.350 +16949,-0.025 +16950,-0.045 +16951,0.076 +16952,1.010 +16953,-1.669 +16954,0.800 +16955,-0.914 +16956,-0.026 +16957,-0.858 +16958,-0.635 +16959,-0.176 +16960,0.642 +16961,-1.240 +16962,1.117 +16963,-0.356 +16964,-0.895 +16965,0.598 +16966,0.311 +16967,-0.428 +16968,-0.089 +16969,-1.483 +16970,0.388 +16971,0.644 +16972,0.412 +16973,0.552 +16974,-0.107 +16975,0.260 +16976,-0.953 +16977,0.502 +16978,0.563 +16979,-1.142 +16980,-0.829 +16981,0.385 +16982,0.708 +16983,-0.471 +16984,0.641 +16985,-0.155 +16986,0.783 +16987,-0.346 +16988,-0.387 +16989,-0.799 +16990,0.255 +16991,2.457 +16992,-0.845 +16993,0.408 +16994,-1.185 +16995,-1.233 +16996,-0.859 +16997,-1.534 +16998,0.616 +16999,-0.538 +17000,0.681 +17001,0.355 +17002,-0.978 +17003,-1.052 +17004,-0.234 +17005,1.086 +17006,1.401 +17007,0.005 +17008,0.147 +17009,-0.247 +17010,-0.612 +17011,-0.158 +17012,0.886 +17013,0.032 +17014,0.611 +17015,-0.788 +17016,1.234 +17017,-0.421 +17018,-1.516 +17019,-0.505 +17020,0.096 +17021,-0.714 +17022,-0.320 +17023,-1.483 +17024,1.548 +17025,1.003 +17026,0.160 +17027,-0.810 +17028,1.371 +17029,1.464 +17030,-0.037 +17031,0.079 +17032,-1.597 +17033,-2.239 +17034,0.786 +17035,-0.730 +17036,-0.355 +17037,-1.776 +17038,1.773 +17039,0.512 +17040,-0.730 +17041,0.490 +17042,-0.821 +17043,-0.588 +17044,-0.441 +17045,0.904 +17046,0.819 +17047,0.931 +17048,-0.121 +17049,-2.669 +17050,-0.191 +17051,0.573 +17052,1.119 +17053,1.145 +17054,-0.495 +17055,-0.330 +17056,1.113 +17057,-0.713 +17058,-1.169 +17059,-0.295 +17060,0.415 +17061,1.441 +17062,0.730 +17063,-0.762 +17064,-1.474 +17065,0.082 +17066,-0.379 +17067,-1.103 +17068,-1.249 +17069,0.147 +17070,0.193 +17071,-0.486 +17072,0.051 +17073,1.535 +17074,-1.929 +17075,0.537 +17076,0.308 +17077,0.388 +17078,-0.840 +17079,0.569 +17080,-0.005 +17081,-0.651 +17082,0.587 +17083,0.075 +17084,1.434 +17085,0.229 +17086,0.785 +17087,0.235 +17088,1.080 +17089,0.017 +17090,0.522 +17091,-0.257 +17092,0.565 +17093,-0.641 +17094,-0.698 +17095,0.537 +17096,0.651 +17097,-0.514 +17098,-1.728 +17099,0.329 +17100,0.817 +17101,-0.423 +17102,0.887 +17103,0.785 +17104,-0.429 +17105,-3.110 +17106,-0.425 +17107,0.192 +17108,-0.444 +17109,0.537 +17110,1.315 +17111,-1.042 +17112,-0.012 +17113,0.057 +17114,-1.345 +17115,0.668 +17116,0.703 +17117,3.199 +17118,1.345 +17119,1.134 +17120,-1.202 +17121,-1.536 +17122,0.479 +17123,0.317 +17124,0.044 +17125,0.884 +17126,0.780 +17127,-0.561 +17128,0.299 +17129,0.493 +17130,0.149 +17131,0.529 +17132,-0.772 +17133,1.820 +17134,-0.950 +17135,0.324 +17136,-1.221 +17137,-1.081 +17138,0.517 +17139,1.107 +17140,-0.505 +17141,-0.983 +17142,-0.200 +17143,1.252 +17144,-1.578 +17145,0.919 +17146,0.027 +17147,1.332 +17148,0.902 +17149,-0.142 +17150,0.200 +17151,-0.258 +17152,-0.650 +17153,1.637 +17154,0.026 +17155,0.313 +17156,-0.392 +17157,2.178 +17158,1.190 +17159,0.101 +17160,-1.487 +17161,-0.732 +17162,-0.533 +17163,0.829 +17164,0.027 +17165,0.759 +17166,0.323 +17167,-0.487 +17168,0.197 +17169,0.150 +17170,-0.774 +17171,0.548 +17172,0.913 +17173,-1.361 +17174,0.543 +17175,1.233 +17176,-0.429 +17177,-0.529 +17178,-0.677 +17179,-0.017 +17180,-1.783 +17181,0.066 +17182,0.255 +17183,-0.070 +17184,-1.704 +17185,0.897 +17186,-0.583 +17187,-1.592 +17188,-0.542 +17189,0.805 +17190,2.042 +17191,1.172 +17192,0.770 +17193,1.946 +17194,-0.066 +17195,1.168 +17196,-0.511 +17197,2.600 +17198,1.135 +17199,0.716 +17200,0.754 +17201,-0.949 +17202,-1.628 +17203,-0.717 +17204,-0.963 +17205,0.093 +17206,0.436 +17207,-0.964 +17208,-0.643 +17209,1.709 +17210,-0.024 +17211,0.464 +17212,0.296 +17213,0.135 +17214,-1.028 +17215,-0.614 +17216,-0.703 +17217,0.406 +17218,2.842 +17219,-1.166 +17220,-0.231 +17221,1.499 +17222,0.609 +17223,0.715 +17224,0.119 +17225,0.532 +17226,-0.876 +17227,-0.923 +17228,0.489 +17229,-0.286 +17230,-0.398 +17231,0.579 +17232,-1.258 +17233,0.839 +17234,-1.777 +17235,0.644 +17236,-1.420 +17237,0.590 +17238,-0.964 +17239,-0.408 +17240,1.099 +17241,-0.433 +17242,-2.337 +17243,0.105 +17244,0.270 +17245,-1.559 +17246,-1.165 +17247,-0.426 +17248,0.958 +17249,0.697 +17250,-0.488 +17251,-0.960 +17252,-0.468 +17253,0.579 +17254,-1.619 +17255,-0.114 +17256,-0.423 +17257,0.364 +17258,-0.455 +17259,0.896 +17260,-0.438 +17261,-0.187 +17262,-1.180 +17263,1.347 +17264,-0.210 +17265,1.843 +17266,0.718 +17267,0.012 +17268,1.331 +17269,-0.133 +17270,0.786 +17271,0.324 +17272,-0.683 +17273,0.063 +17274,1.139 +17275,0.262 +17276,-1.485 +17277,-1.407 +17278,1.196 +17279,0.861 +17280,1.485 +17281,0.796 +17282,0.143 +17283,1.235 +17284,1.927 +17285,-1.546 +17286,1.892 +17287,0.005 +17288,-0.537 +17289,2.078 +17290,1.468 +17291,-1.394 +17292,0.242 +17293,-0.486 +17294,-0.539 +17295,-0.483 +17296,-0.637 +17297,1.290 +17298,2.161 +17299,0.329 +17300,-1.727 +17301,0.809 +17302,1.526 +17303,-0.936 +17304,0.666 +17305,0.703 +17306,0.649 +17307,-0.541 +17308,-0.316 +17309,0.279 +17310,-0.108 +17311,-0.697 +17312,0.194 +17313,-0.064 +17314,-1.410 +17315,-1.029 +17316,-0.052 +17317,1.308 +17318,0.830 +17319,-1.224 +17320,1.074 +17321,-0.002 +17322,1.700 +17323,-0.428 +17324,-1.102 +17325,0.760 +17326,-0.595 +17327,-0.444 +17328,1.136 +17329,-1.154 +17330,-1.601 +17331,1.216 +17332,0.355 +17333,2.436 +17334,-1.108 +17335,0.954 +17336,-1.890 +17337,0.690 +17338,0.018 +17339,-1.437 +17340,-0.687 +17341,-1.033 +17342,0.462 +17343,0.290 +17344,0.292 +17345,0.043 +17346,0.657 +17347,-1.035 +17348,0.239 +17349,0.128 +17350,-0.677 +17351,1.642 +17352,0.632 +17353,-0.080 +17354,-0.606 +17355,-1.760 +17356,0.167 +17357,1.034 +17358,-0.789 +17359,0.928 +17360,-0.886 +17361,2.029 +17362,0.469 +17363,-0.240 +17364,-0.620 +17365,0.145 +17366,-0.308 +17367,-2.036 +17368,-0.455 +17369,-1.341 +17370,-0.457 +17371,-0.712 +17372,-0.971 +17373,-0.343 +17374,0.054 +17375,-0.011 +17376,-0.248 +17377,-0.528 +17378,1.610 +17379,0.460 +17380,-0.133 +17381,0.322 +17382,-0.365 +17383,0.745 +17384,-0.135 +17385,0.096 +17386,2.224 +17387,-0.466 +17388,-0.291 +17389,-0.284 +17390,0.846 +17391,-0.363 +17392,-1.111 +17393,0.666 +17394,-0.185 +17395,-1.419 +17396,0.044 +17397,-0.665 +17398,0.391 +17399,0.233 +17400,-0.256 +17401,0.138 +17402,-0.842 +17403,-2.996 +17404,-0.263 +17405,-2.628 +17406,-0.675 +17407,0.319 +17408,-0.353 +17409,-1.069 +17410,0.514 +17411,1.241 +17412,-0.862 +17413,1.224 +17414,0.204 +17415,-0.810 +17416,0.012 +17417,0.330 +17418,-1.535 +17419,-0.903 +17420,0.627 +17421,0.767 +17422,1.188 +17423,-0.105 +17424,0.114 +17425,-0.195 +17426,0.793 +17427,0.966 +17428,-0.300 +17429,0.100 +17430,-0.818 +17431,-0.659 +17432,-0.114 +17433,0.404 +17434,2.335 +17435,-0.838 +17436,0.019 +17437,0.057 +17438,-0.681 +17439,-0.694 +17440,-1.338 +17441,-0.984 +17442,0.182 +17443,0.303 +17444,-1.456 +17445,1.936 +17446,-1.953 +17447,0.264 +17448,-0.219 +17449,-0.578 +17450,0.069 +17451,0.070 +17452,0.241 +17453,2.233 +17454,0.833 +17455,0.930 +17456,-1.114 +17457,0.387 +17458,-1.488 +17459,-0.476 +17460,-0.455 +17461,-0.604 +17462,0.415 +17463,-0.187 +17464,-0.803 +17465,-0.425 +17466,1.151 +17467,-0.767 +17468,-0.188 +17469,1.114 +17470,-0.389 +17471,-0.424 +17472,1.099 +17473,0.673 +17474,0.616 +17475,0.843 +17476,0.082 +17477,0.442 +17478,0.842 +17479,-1.192 +17480,-2.843 +17481,-0.050 +17482,0.700 +17483,0.862 +17484,0.178 +17485,1.576 +17486,0.121 +17487,-1.339 +17488,-1.605 +17489,0.494 +17490,1.486 +17491,0.526 +17492,0.280 +17493,-0.180 +17494,0.780 +17495,-0.328 +17496,0.043 +17497,0.756 +17498,-0.066 +17499,-1.860 +17500,-0.556 +17501,0.768 +17502,1.520 +17503,-1.068 +17504,-0.358 +17505,0.745 +17506,0.211 +17507,0.511 +17508,-0.018 +17509,0.389 +17510,-0.272 +17511,1.120 +17512,0.376 +17513,-0.236 +17514,0.094 +17515,0.087 +17516,-2.024 +17517,-0.754 +17518,-0.147 +17519,0.473 +17520,0.084 +17521,-0.879 +17522,-1.342 +17523,-1.325 +17524,-0.318 +17525,1.316 +17526,-0.679 +17527,0.043 +17528,0.113 +17529,-0.874 +17530,1.253 +17531,1.554 +17532,0.850 +17533,1.011 +17534,-1.373 +17535,0.463 +17536,-0.497 +17537,-1.090 +17538,2.033 +17539,0.678 +17540,-1.073 +17541,-1.043 +17542,0.994 +17543,-0.418 +17544,0.271 +17545,0.658 +17546,-0.004 +17547,-1.741 +17548,-1.120 +17549,-0.483 +17550,-0.006 +17551,1.139 +17552,1.114 +17553,0.323 +17554,0.919 +17555,-1.774 +17556,0.896 +17557,-0.827 +17558,0.393 +17559,-1.079 +17560,0.217 +17561,-0.383 +17562,1.106 +17563,0.098 +17564,1.167 +17565,-0.476 +17566,-1.594 +17567,0.521 +17568,1.417 +17569,-0.435 +17570,1.109 +17571,-1.833 +17572,0.307 +17573,0.548 +17574,-0.286 +17575,-1.622 +17576,1.553 +17577,-0.697 +17578,-0.206 +17579,1.091 +17580,0.710 +17581,-0.129 +17582,-0.306 +17583,-1.612 +17584,-1.345 +17585,1.969 +17586,-0.670 +17587,0.140 +17588,1.363 +17589,1.596 +17590,1.806 +17591,1.447 +17592,-1.194 +17593,-1.757 +17594,-1.028 +17595,0.632 +17596,-1.314 +17597,-0.137 +17598,-1.044 +17599,-0.263 +17600,-0.084 +17601,-0.753 +17602,2.141 +17603,0.471 +17604,0.146 +17605,-0.100 +17606,1.123 +17607,-0.023 +17608,-0.988 +17609,-0.347 +17610,0.238 +17611,-1.611 +17612,-0.192 +17613,0.100 +17614,0.885 +17615,-0.565 +17616,-1.544 +17617,-0.304 +17618,-1.941 +17619,-0.843 +17620,-1.500 +17621,-0.931 +17622,0.390 +17623,-0.657 +17624,0.755 +17625,-0.529 +17626,-1.554 +17627,1.344 +17628,-0.700 +17629,0.151 +17630,-0.957 +17631,0.120 +17632,-0.533 +17633,0.569 +17634,0.151 +17635,1.688 +17636,-0.267 +17637,-0.700 +17638,0.831 +17639,-0.032 +17640,-0.156 +17641,-1.519 +17642,1.897 +17643,1.173 +17644,-1.173 +17645,-0.900 +17646,1.499 +17647,-0.818 +17648,0.731 +17649,0.867 +17650,-0.623 +17651,0.342 +17652,-0.417 +17653,0.862 +17654,1.332 +17655,0.431 +17656,0.142 +17657,-1.153 +17658,2.017 +17659,1.096 +17660,0.949 +17661,1.534 +17662,2.688 +17663,-0.280 +17664,0.748 +17665,1.815 +17666,1.072 +17667,-0.183 +17668,-1.002 +17669,-1.365 +17670,-0.122 +17671,0.339 +17672,0.440 +17673,-1.030 +17674,-0.643 +17675,0.618 +17676,0.866 +17677,2.206 +17678,0.097 +17679,-0.307 +17680,-0.167 +17681,0.817 +17682,-1.092 +17683,-0.226 +17684,1.250 +17685,-1.929 +17686,-0.849 +17687,-0.953 +17688,0.176 +17689,-0.433 +17690,0.287 +17691,1.038 +17692,0.808 +17693,-1.057 +17694,-0.153 +17695,2.184 +17696,-0.269 +17697,0.489 +17698,-1.601 +17699,0.390 +17700,-0.370 +17701,0.535 +17702,-0.201 +17703,-1.131 +17704,0.965 +17705,1.366 +17706,0.719 +17707,0.454 +17708,0.599 +17709,-1.071 +17710,-1.788 +17711,0.180 +17712,-1.279 +17713,-0.308 +17714,1.761 +17715,0.438 +17716,-0.214 +17717,-0.304 +17718,-1.506 +17719,0.747 +17720,-1.040 +17721,-1.256 +17722,0.260 +17723,-1.259 +17724,-0.614 +17725,-0.231 +17726,0.261 +17727,0.918 +17728,0.469 +17729,0.197 +17730,-1.737 +17731,-0.193 +17732,-0.284 +17733,1.208 +17734,-1.463 +17735,-1.146 +17736,0.659 +17737,0.619 +17738,-1.270 +17739,-0.108 +17740,0.198 +17741,1.724 +17742,-0.689 +17743,1.982 +17744,1.086 +17745,-1.732 +17746,-1.181 +17747,0.355 +17748,1.763 +17749,1.851 +17750,-0.007 +17751,-0.538 +17752,-0.057 +17753,-0.514 +17754,-0.254 +17755,0.062 +17756,-0.550 +17757,-0.432 +17758,-1.089 +17759,1.149 +17760,0.532 +17761,-1.972 +17762,-1.856 +17763,-0.262 +17764,0.992 +17765,0.848 +17766,-0.139 +17767,-1.092 +17768,1.473 +17769,-0.885 +17770,-1.313 +17771,-1.033 +17772,0.371 +17773,-1.379 +17774,0.607 +17775,0.129 +17776,-0.849 +17777,0.995 +17778,-0.851 +17779,0.164 +17780,0.591 +17781,0.967 +17782,-0.426 +17783,0.175 +17784,0.316 +17785,0.095 +17786,-1.629 +17787,0.243 +17788,-0.142 +17789,1.277 +17790,-0.697 +17791,0.751 +17792,-0.912 +17793,-0.268 +17794,0.835 +17795,0.114 +17796,-0.571 +17797,-1.080 +17798,-2.236 +17799,-0.337 +17800,-0.176 +17801,0.095 +17802,-0.516 +17803,0.331 +17804,0.045 +17805,0.017 +17806,-1.547 +17807,-0.218 +17808,-0.295 +17809,0.295 +17810,-1.002 +17811,1.634 +17812,0.453 +17813,0.691 +17814,-0.815 +17815,-1.469 +17816,-1.268 +17817,0.339 +17818,-0.615 +17819,-0.926 +17820,1.063 +17821,-0.185 +17822,-0.034 +17823,2.345 +17824,0.431 +17825,1.089 +17826,0.347 +17827,0.498 +17828,-0.865 +17829,2.141 +17830,-1.165 +17831,-1.580 +17832,-0.701 +17833,-0.349 +17834,-1.126 +17835,0.592 +17836,2.169 +17837,-1.035 +17838,-0.319 +17839,-0.541 +17840,-0.034 +17841,0.607 +17842,0.973 +17843,-0.274 +17844,0.152 +17845,-0.026 +17846,1.307 +17847,0.815 +17848,0.331 +17849,1.310 +17850,1.025 +17851,0.189 +17852,-0.506 +17853,-0.359 +17854,1.086 +17855,-0.689 +17856,1.272 +17857,-1.201 +17858,-0.099 +17859,1.289 +17860,0.983 +17861,1.098 +17862,0.852 +17863,-1.832 +17864,1.281 +17865,-0.812 +17866,1.535 +17867,-0.480 +17868,-0.835 +17869,-0.933 +17870,0.447 +17871,0.258 +17872,-0.410 +17873,0.890 +17874,0.453 +17875,-1.478 +17876,0.479 +17877,-1.325 +17878,-0.173 +17879,-0.118 +17880,0.713 +17881,0.149 +17882,0.303 +17883,-2.740 +17884,0.531 +17885,-0.028 +17886,-0.293 +17887,0.439 +17888,0.102 +17889,-0.031 +17890,-0.753 +17891,-0.204 +17892,-0.265 +17893,-0.344 +17894,0.539 +17895,0.867 +17896,1.061 +17897,0.661 +17898,-0.103 +17899,-0.323 +17900,-1.103 +17901,0.490 +17902,0.378 +17903,-0.018 +17904,0.449 +17905,0.083 +17906,0.502 +17907,2.062 +17908,2.308 +17909,-0.577 +17910,-0.598 +17911,-2.372 +17912,-2.031 +17913,0.412 +17914,-0.260 +17915,-0.495 +17916,0.453 +17917,0.764 +17918,0.355 +17919,0.454 +17920,1.001 +17921,1.292 +17922,0.749 +17923,-1.737 +17924,-0.554 +17925,-1.224 +17926,0.588 +17927,0.105 +17928,-0.638 +17929,-0.515 +17930,-0.162 +17931,2.191 +17932,0.121 +17933,-0.652 +17934,-0.115 +17935,0.437 +17936,-0.822 +17937,0.492 +17938,0.197 +17939,-0.582 +17940,0.286 +17941,1.137 +17942,1.114 +17943,-0.334 +17944,1.584 +17945,-0.899 +17946,1.300 +17947,-1.592 +17948,-1.020 +17949,0.625 +17950,-0.331 +17951,-0.537 +17952,0.319 +17953,0.013 +17954,-0.900 +17955,2.948 +17956,-1.246 +17957,-0.202 +17958,-0.278 +17959,1.174 +17960,0.740 +17961,0.074 +17962,-0.830 +17963,0.923 +17964,1.309 +17965,-0.739 +17966,-0.640 +17967,0.454 +17968,0.487 +17969,0.654 +17970,0.081 +17971,0.632 +17972,0.791 +17973,0.077 +17974,-0.074 +17975,0.203 +17976,1.635 +17977,0.215 +17978,-0.743 +17979,0.532 +17980,-0.565 +17981,-0.498 +17982,-1.357 +17983,0.433 +17984,-0.063 +17985,0.467 +17986,0.657 +17987,0.016 +17988,-0.909 +17989,1.175 +17990,1.238 +17991,0.300 +17992,0.654 +17993,1.282 +17994,0.293 +17995,-0.308 +17996,1.881 +17997,-1.056 +17998,0.152 +17999,-1.168 +18000,-0.886 +18001,-0.256 +18002,0.178 +18003,-0.504 +18004,0.909 +18005,0.665 +18006,1.111 +18007,-1.256 +18008,-0.308 +18009,0.038 +18010,0.339 +18011,0.060 +18012,-0.440 +18013,-0.326 +18014,-0.930 +18015,-0.813 +18016,1.009 +18017,1.289 +18018,-1.552 +18019,-1.265 +18020,-0.928 +18021,0.640 +18022,-0.806 +18023,-0.443 +18024,1.926 +18025,-0.429 +18026,1.340 +18027,0.261 +18028,-0.401 +18029,1.736 +18030,0.270 +18031,-0.587 +18032,-0.321 +18033,0.155 +18034,-0.367 +18035,1.105 +18036,1.583 +18037,-0.537 +18038,-1.972 +18039,-0.458 +18040,-1.172 +18041,0.349 +18042,0.127 +18043,0.448 +18044,-0.191 +18045,1.210 +18046,0.146 +18047,0.880 +18048,-0.108 +18049,0.814 +18050,1.428 +18051,-0.488 +18052,-0.672 +18053,-0.733 +18054,0.204 +18055,-0.442 +18056,0.295 +18057,-1.008 +18058,-1.677 +18059,-0.087 +18060,-0.465 +18061,-0.137 +18062,-0.207 +18063,1.150 +18064,-2.668 +18065,0.266 +18066,2.360 +18067,-0.715 +18068,2.290 +18069,-1.052 +18070,-0.406 +18071,-0.759 +18072,0.255 +18073,2.019 +18074,-0.840 +18075,0.825 +18076,-1.441 +18077,0.463 +18078,-0.648 +18079,-1.176 +18080,-0.898 +18081,0.586 +18082,-0.496 +18083,1.790 +18084,-1.453 +18085,0.936 +18086,-1.411 +18087,0.074 +18088,-0.647 +18089,1.148 +18090,0.884 +18091,0.153 +18092,0.173 +18093,-0.837 +18094,-0.264 +18095,1.533 +18096,-0.335 +18097,-0.021 +18098,-0.826 +18099,0.001 +18100,1.896 +18101,-0.371 +18102,2.225 +18103,-0.289 +18104,0.245 +18105,0.436 +18106,1.112 +18107,0.233 +18108,-1.781 +18109,-0.699 +18110,-0.605 +18111,-1.366 +18112,-1.451 +18113,-0.807 +18114,0.503 +18115,-1.958 +18116,1.575 +18117,2.221 +18118,1.716 +18119,-0.049 +18120,0.502 +18121,1.205 +18122,1.663 +18123,0.346 +18124,-0.231 +18125,-0.539 +18126,-0.668 +18127,1.215 +18128,0.473 +18129,-1.021 +18130,0.089 +18131,1.813 +18132,0.587 +18133,0.125 +18134,-0.006 +18135,0.101 +18136,-0.144 +18137,-0.717 +18138,1.561 +18139,0.599 +18140,0.285 +18141,-1.150 +18142,0.076 +18143,-0.498 +18144,0.236 +18145,-0.405 +18146,-1.134 +18147,0.388 +18148,1.867 +18149,-0.120 +18150,0.935 +18151,-0.806 +18152,-0.537 +18153,-0.049 +18154,-0.682 +18155,-0.326 +18156,0.644 +18157,0.539 +18158,0.822 +18159,1.636 +18160,0.746 +18161,0.136 +18162,-0.210 +18163,0.339 +18164,-0.615 +18165,1.182 +18166,-1.009 +18167,-0.865 +18168,0.381 +18169,-0.445 +18170,1.024 +18171,2.031 +18172,0.561 +18173,0.199 +18174,0.855 +18175,0.744 +18176,1.542 +18177,-0.471 +18178,0.094 +18179,1.457 +18180,0.058 +18181,-0.269 +18182,-0.179 +18183,0.233 +18184,0.966 +18185,0.779 +18186,0.262 +18187,-1.003 +18188,-1.120 +18189,0.658 +18190,0.723 +18191,-0.220 +18192,0.628 +18193,-0.388 +18194,0.459 +18195,0.800 +18196,1.168 +18197,-1.618 +18198,-0.558 +18199,0.877 +18200,-0.073 +18201,1.138 +18202,-1.171 +18203,-0.341 +18204,1.048 +18205,-0.732 +18206,-0.172 +18207,-1.953 +18208,0.178 +18209,-0.037 +18210,2.068 +18211,-0.298 +18212,-0.562 +18213,0.450 +18214,-0.035 +18215,0.859 +18216,0.096 +18217,-0.173 +18218,0.004 +18219,-0.451 +18220,1.229 +18221,1.223 +18222,2.432 +18223,0.262 +18224,0.620 +18225,-0.449 +18226,-0.495 +18227,0.078 +18228,0.490 +18229,0.114 +18230,-1.235 +18231,1.085 +18232,1.390 +18233,0.332 +18234,-0.415 +18235,-0.424 +18236,0.100 +18237,-0.709 +18238,-0.949 +18239,0.098 +18240,0.066 +18241,-1.615 +18242,0.646 +18243,-0.195 +18244,-0.196 +18245,0.005 +18246,2.026 +18247,-0.757 +18248,0.157 +18249,2.125 +18250,-0.031 +18251,-0.965 +18252,0.290 +18253,-0.185 +18254,1.520 +18255,-0.696 +18256,1.778 +18257,0.147 +18258,-0.964 +18259,-2.501 +18260,0.297 +18261,1.890 +18262,0.147 +18263,1.417 +18264,0.066 +18265,-2.000 +18266,0.751 +18267,1.435 +18268,-0.682 +18269,0.219 +18270,-0.558 +18271,-0.601 +18272,0.322 +18273,0.029 +18274,-0.446 +18275,-0.567 +18276,-0.606 +18277,-1.396 +18278,0.346 +18279,-0.625 +18280,-0.082 +18281,-1.047 +18282,1.263 +18283,0.817 +18284,1.503 +18285,1.393 +18286,-1.235 +18287,-1.191 +18288,-0.536 +18289,0.397 +18290,-0.984 +18291,-1.266 +18292,0.427 +18293,-0.094 +18294,-0.832 +18295,-0.660 +18296,0.568 +18297,0.299 +18298,-0.819 +18299,0.926 +18300,0.644 +18301,-0.516 +18302,-1.777 +18303,-1.137 +18304,-0.482 +18305,-0.051 +18306,0.601 +18307,1.221 +18308,0.393 +18309,1.098 +18310,1.535 +18311,0.741 +18312,-0.655 +18313,0.517 +18314,0.315 +18315,-0.571 +18316,-1.346 +18317,0.781 +18318,-1.857 +18319,-0.368 +18320,-0.696 +18321,0.522 +18322,-1.248 +18323,0.257 +18324,1.339 +18325,0.424 +18326,-1.372 +18327,-0.296 +18328,-1.311 +18329,-0.366 +18330,-1.699 +18331,0.970 +18332,-0.778 +18333,-1.072 +18334,-1.124 +18335,1.393 +18336,0.721 +18337,-0.097 +18338,-2.442 +18339,-1.152 +18340,-0.891 +18341,-0.883 +18342,0.912 +18343,0.122 +18344,-0.531 +18345,1.001 +18346,0.398 +18347,0.032 +18348,0.098 +18349,-0.129 +18350,-0.178 +18351,0.783 +18352,1.274 +18353,-0.509 +18354,-0.480 +18355,-0.967 +18356,-1.376 +18357,0.238 +18358,1.610 +18359,-0.496 +18360,0.772 +18361,0.008 +18362,-0.618 +18363,1.320 +18364,1.678 +18365,-1.608 +18366,-0.186 +18367,0.419 +18368,0.830 +18369,-0.375 +18370,0.542 +18371,-0.906 +18372,0.540 +18373,-0.167 +18374,0.620 +18375,-1.402 +18376,1.013 +18377,0.379 +18378,-0.353 +18379,-1.638 +18380,1.429 +18381,2.325 +18382,-0.342 +18383,0.524 +18384,-0.541 +18385,0.563 +18386,0.859 +18387,-0.615 +18388,-0.665 +18389,-0.057 +18390,0.123 +18391,0.459 +18392,-0.762 +18393,0.439 +18394,-1.267 +18395,-2.529 +18396,-1.204 +18397,-1.205 +18398,0.054 +18399,0.143 +18400,1.061 +18401,0.928 +18402,0.436 +18403,-0.498 +18404,0.156 +18405,0.314 +18406,2.690 +18407,0.429 +18408,-0.175 +18409,0.741 +18410,-0.664 +18411,2.047 +18412,-1.321 +18413,-0.611 +18414,-0.693 +18415,0.122 +18416,-0.112 +18417,0.298 +18418,-0.409 +18419,-0.900 +18420,-1.161 +18421,-1.016 +18422,-1.323 +18423,-0.276 +18424,0.380 +18425,0.648 +18426,0.581 +18427,0.303 +18428,-1.501 +18429,0.621 +18430,-0.722 +18431,-0.033 +18432,-0.156 +18433,-1.215 +18434,1.627 +18435,0.479 +18436,0.165 +18437,0.508 +18438,0.762 +18439,0.393 +18440,-1.109 +18441,-0.160 +18442,0.878 +18443,0.935 +18444,1.832 +18445,0.186 +18446,0.271 +18447,0.868 +18448,1.947 +18449,-0.706 +18450,-1.548 +18451,-0.051 +18452,0.176 +18453,0.156 +18454,-1.288 +18455,-0.384 +18456,0.949 +18457,0.362 +18458,-0.610 +18459,-0.487 +18460,0.049 +18461,-0.603 +18462,-1.030 +18463,-0.694 +18464,2.245 +18465,0.850 +18466,-0.437 +18467,0.628 +18468,-0.464 +18469,-1.088 +18470,1.966 +18471,0.311 +18472,-1.633 +18473,0.633 +18474,-0.569 +18475,1.802 +18476,0.382 +18477,0.705 +18478,0.916 +18479,-1.463 +18480,1.551 +18481,0.752 +18482,0.062 +18483,0.179 +18484,0.677 +18485,0.348 +18486,-0.637 +18487,-0.997 +18488,0.897 +18489,-1.444 +18490,0.020 +18491,-1.078 +18492,1.346 +18493,0.512 +18494,0.062 +18495,0.937 +18496,0.443 +18497,-1.415 +18498,-1.237 +18499,-0.192 +18500,0.904 +18501,0.244 +18502,-1.163 +18503,-0.771 +18504,-0.480 +18505,0.066 +18506,0.895 +18507,-0.739 +18508,0.069 +18509,1.134 +18510,-1.081 +18511,0.948 +18512,0.262 +18513,-0.014 +18514,0.219 +18515,-0.335 +18516,-0.081 +18517,-1.478 +18518,0.768 +18519,-1.196 +18520,-0.838 +18521,-1.358 +18522,-0.539 +18523,0.567 +18524,0.370 +18525,-1.024 +18526,-1.544 +18527,0.350 +18528,0.189 +18529,0.426 +18530,1.471 +18531,0.649 +18532,-2.235 +18533,0.788 +18534,0.576 +18535,-0.711 +18536,0.002 +18537,0.776 +18538,0.363 +18539,0.493 +18540,-0.387 +18541,1.087 +18542,-0.452 +18543,0.721 +18544,0.867 +18545,-0.750 +18546,0.376 +18547,0.737 +18548,1.307 +18549,-0.811 +18550,0.213 +18551,1.198 +18552,-1.646 +18553,1.588 +18554,0.640 +18555,0.561 +18556,-0.020 +18557,-0.670 +18558,0.814 +18559,-0.235 +18560,-0.479 +18561,-1.756 +18562,0.030 +18563,0.927 +18564,-0.264 +18565,0.698 +18566,0.902 +18567,-1.066 +18568,-0.700 +18569,0.676 +18570,-0.081 +18571,1.386 +18572,-0.531 +18573,-1.053 +18574,1.252 +18575,-1.051 +18576,2.150 +18577,-0.110 +18578,0.154 +18579,-0.310 +18580,-0.298 +18581,0.420 +18582,1.253 +18583,-0.848 +18584,-2.360 +18585,-0.589 +18586,-0.110 +18587,-1.382 +18588,0.896 +18589,-0.579 +18590,0.059 +18591,-0.443 +18592,-1.232 +18593,0.357 +18594,-2.026 +18595,0.440 +18596,-1.721 +18597,0.183 +18598,0.184 +18599,-0.453 +18600,-1.558 +18601,-0.197 +18602,1.076 +18603,0.455 +18604,-0.635 +18605,2.013 +18606,-0.711 +18607,1.114 +18608,-2.523 +18609,1.113 +18610,-0.099 +18611,-0.755 +18612,0.312 +18613,-0.621 +18614,0.161 +18615,-3.333 +18616,-0.308 +18617,-0.927 +18618,1.017 +18619,-0.025 +18620,-1.776 +18621,0.698 +18622,0.542 +18623,0.713 +18624,1.078 +18625,-1.925 +18626,-0.286 +18627,0.816 +18628,-0.414 +18629,0.161 +18630,1.416 +18631,0.318 +18632,-0.288 +18633,-0.043 +18634,-0.125 +18635,0.133 +18636,1.238 +18637,-1.567 +18638,-0.427 +18639,-1.157 +18640,-0.168 +18641,0.588 +18642,0.171 +18643,0.069 +18644,-1.206 +18645,0.508 +18646,0.111 +18647,-1.600 +18648,1.208 +18649,0.739 +18650,-1.854 +18651,0.131 +18652,0.520 +18653,0.102 +18654,-0.814 +18655,1.107 +18656,0.658 +18657,2.524 +18658,-0.147 +18659,3.072 +18660,-0.945 +18661,0.659 +18662,0.694 +18663,0.323 +18664,1.098 +18665,0.088 +18666,-0.160 +18667,-0.204 +18668,-0.008 +18669,-0.459 +18670,-0.989 +18671,0.395 +18672,-0.065 +18673,0.395 +18674,0.919 +18675,-0.941 +18676,-0.810 +18677,-0.512 +18678,-0.615 +18679,0.791 +18680,-0.772 +18681,0.848 +18682,-0.227 +18683,-0.130 +18684,1.393 +18685,-0.543 +18686,0.130 +18687,-0.623 +18688,-0.593 +18689,-0.038 +18690,-0.921 +18691,0.260 +18692,-0.855 +18693,1.398 +18694,0.400 +18695,0.396 +18696,-0.525 +18697,0.407 +18698,-0.835 +18699,-0.002 +18700,1.077 +18701,0.220 +18702,0.470 +18703,1.177 +18704,0.669 +18705,0.231 +18706,0.708 +18707,-0.484 +18708,-0.256 +18709,-0.017 +18710,0.695 +18711,-0.746 +18712,-2.799 +18713,-0.289 +18714,1.464 +18715,-0.916 +18716,-0.330 +18717,-1.451 +18718,-0.497 +18719,1.096 +18720,-0.403 +18721,-0.330 +18722,-0.175 +18723,-1.317 +18724,-0.740 +18725,0.315 +18726,-0.870 +18727,-1.066 +18728,-0.137 +18729,1.174 +18730,-1.046 +18731,1.417 +18732,0.645 +18733,-1.547 +18734,0.334 +18735,-1.269 +18736,0.480 +18737,-0.673 +18738,-0.015 +18739,-1.297 +18740,-0.286 +18741,0.248 +18742,0.232 +18743,0.266 +18744,0.950 +18745,-0.495 +18746,-0.222 +18747,-0.825 +18748,-1.738 +18749,0.467 +18750,1.309 +18751,-0.232 +18752,-0.635 +18753,0.865 +18754,0.211 +18755,1.600 +18756,0.274 +18757,-0.427 +18758,0.943 +18759,-1.414 +18760,-0.859 +18761,-0.098 +18762,0.537 +18763,-1.098 +18764,0.403 +18765,-0.689 +18766,-2.291 +18767,1.175 +18768,0.478 +18769,-0.122 +18770,1.347 +18771,0.925 +18772,0.675 +18773,0.368 +18774,0.032 +18775,0.902 +18776,-0.500 +18777,-1.677 +18778,0.781 +18779,-0.849 +18780,1.314 +18781,1.913 +18782,0.257 +18783,-0.898 +18784,0.452 +18785,0.675 +18786,-0.740 +18787,-0.550 +18788,0.292 +18789,1.638 +18790,-1.343 +18791,-0.383 +18792,1.090 +18793,-0.498 +18794,-1.487 +18795,0.437 +18796,-0.225 +18797,0.067 +18798,-1.314 +18799,-0.562 +18800,1.831 +18801,0.845 +18802,0.426 +18803,0.597 +18804,0.277 +18805,-0.063 +18806,-0.975 +18807,1.168 +18808,-0.900 +18809,-1.272 +18810,-0.969 +18811,1.850 +18812,2.560 +18813,-0.419 +18814,0.365 +18815,0.114 +18816,1.088 +18817,-1.595 +18818,-0.579 +18819,-1.937 +18820,0.052 +18821,1.418 +18822,1.430 +18823,-1.119 +18824,0.502 +18825,0.164 +18826,-0.221 +18827,-1.866 +18828,0.891 +18829,0.308 +18830,-0.801 +18831,1.748 +18832,0.067 +18833,0.629 +18834,-0.418 +18835,0.701 +18836,0.833 +18837,-0.583 +18838,0.340 +18839,1.297 +18840,0.712 +18841,0.526 +18842,0.245 +18843,0.053 +18844,0.530 +18845,-0.853 +18846,-0.809 +18847,0.982 +18848,-1.206 +18849,-0.617 +18850,0.346 +18851,0.025 +18852,1.188 +18853,-0.117 +18854,-0.328 +18855,-0.011 +18856,0.147 +18857,1.018 +18858,-0.825 +18859,-0.494 +18860,0.550 +18861,0.108 +18862,-1.183 +18863,2.553 +18864,-0.001 +18865,-0.246 +18866,-1.434 +18867,0.045 +18868,-0.692 +18869,1.524 +18870,0.757 +18871,-0.569 +18872,0.177 +18873,-0.403 +18874,0.204 +18875,1.832 +18876,-1.563 +18877,-0.718 +18878,-0.948 +18879,-0.588 +18880,-0.853 +18881,1.012 +18882,-0.662 +18883,0.274 +18884,-0.929 +18885,0.596 +18886,0.780 +18887,1.048 +18888,-0.383 +18889,-0.150 +18890,2.076 +18891,-1.035 +18892,-1.199 +18893,-0.917 +18894,-1.373 +18895,-1.601 +18896,0.278 +18897,1.001 +18898,-0.125 +18899,-1.047 +18900,-1.657 +18901,0.591 +18902,0.537 +18903,0.045 +18904,-0.643 +18905,-0.652 +18906,-0.376 +18907,0.831 +18908,0.662 +18909,0.027 +18910,1.379 +18911,0.086 +18912,-1.285 +18913,-1.392 +18914,1.752 +18915,0.537 +18916,-2.085 +18917,-0.590 +18918,0.405 +18919,1.918 +18920,0.374 +18921,0.002 +18922,0.478 +18923,0.138 +18924,-1.283 +18925,2.270 +18926,-1.320 +18927,-0.476 +18928,-1.034 +18929,-1.315 +18930,-0.523 +18931,-0.533 +18932,1.600 +18933,-1.445 +18934,0.060 +18935,1.045 +18936,-0.644 +18937,-0.316 +18938,1.142 +18939,-0.195 +18940,0.200 +18941,-0.557 +18942,1.843 +18943,0.040 +18944,0.979 +18945,-0.216 +18946,-0.649 +18947,0.620 +18948,0.967 +18949,1.039 +18950,-0.894 +18951,1.981 +18952,0.155 +18953,-1.401 +18954,-1.576 +18955,-1.163 +18956,-0.099 +18957,1.261 +18958,1.037 +18959,-0.077 +18960,-1.403 +18961,2.004 +18962,-0.164 +18963,0.641 +18964,-0.330 +18965,-0.210 +18966,0.163 +18967,-0.853 +18968,0.858 +18969,0.494 +18970,0.413 +18971,-0.221 +18972,-1.561 +18973,-0.699 +18974,-0.590 +18975,-1.035 +18976,1.237 +18977,1.020 +18978,-0.593 +18979,-1.055 +18980,-0.257 +18981,0.799 +18982,-0.206 +18983,-0.761 +18984,-0.111 +18985,-0.192 +18986,1.359 +18987,-0.058 +18988,0.314 +18989,1.719 +18990,0.150 +18991,-0.345 +18992,1.772 +18993,0.819 +18994,-0.090 +18995,-0.501 +18996,0.518 +18997,-0.225 +18998,1.930 +18999,0.506 +19000,2.337 +19001,0.368 +19002,0.080 +19003,-0.230 +19004,0.084 +19005,0.363 +19006,0.217 +19007,-0.529 +19008,-0.272 +19009,0.959 +19010,-0.379 +19011,-0.318 +19012,-0.329 +19013,-0.114 +19014,1.538 +19015,-0.330 +19016,-0.914 +19017,0.632 +19018,0.413 +19019,-0.559 +19020,-0.627 +19021,-0.145 +19022,-0.174 +19023,-0.491 +19024,-1.649 +19025,0.360 +19026,-0.172 +19027,-0.269 +19028,0.663 +19029,-0.514 +19030,1.707 +19031,-0.197 +19032,-0.037 +19033,-0.052 +19034,-0.059 +19035,-0.366 +19036,0.023 +19037,0.979 +19038,-0.578 +19039,0.141 +19040,-0.151 +19041,-0.740 +19042,-0.414 +19043,-0.766 +19044,-0.370 +19045,-0.332 +19046,-0.777 +19047,1.208 +19048,-0.657 +19049,0.242 +19050,0.659 +19051,1.257 +19052,0.894 +19053,1.232 +19054,-0.052 +19055,-0.994 +19056,-1.064 +19057,2.491 +19058,-0.776 +19059,0.785 +19060,-1.409 +19061,-0.040 +19062,0.028 +19063,0.371 +19064,-2.343 +19065,-0.399 +19066,-0.434 +19067,-0.192 +19068,1.727 +19069,2.126 +19070,-0.396 +19071,1.323 +19072,0.046 +19073,0.002 +19074,2.479 +19075,-1.471 +19076,-0.804 +19077,-1.380 +19078,0.731 +19079,-0.217 +19080,-0.996 +19081,-0.649 +19082,1.366 +19083,1.544 +19084,0.475 +19085,0.320 +19086,-0.049 +19087,-1.313 +19088,1.243 +19089,2.567 +19090,-0.137 +19091,-1.508 +19092,0.007 +19093,-0.013 +19094,2.262 +19095,0.495 +19096,0.183 +19097,-0.465 +19098,-1.631 +19099,-0.065 +19100,-0.278 +19101,0.179 +19102,0.249 +19103,0.998 +19104,-1.436 +19105,0.126 +19106,0.136 +19107,0.390 +19108,1.121 +19109,0.754 +19110,-1.867 +19111,0.739 +19112,-0.374 +19113,-3.246 +19114,-1.499 +19115,-0.424 +19116,0.718 +19117,-0.188 +19118,-1.214 +19119,2.491 +19120,-0.269 +19121,-1.292 +19122,-0.619 +19123,-0.216 +19124,0.086 +19125,1.231 +19126,-0.399 +19127,-0.623 +19128,-0.821 +19129,0.260 +19130,-0.904 +19131,0.177 +19132,-1.327 +19133,-1.355 +19134,-2.170 +19135,-2.306 +19136,-0.273 +19137,0.190 +19138,-0.798 +19139,-0.233 +19140,-0.366 +19141,2.655 +19142,0.690 +19143,-0.803 +19144,-1.737 +19145,-0.294 +19146,1.600 +19147,-0.402 +19148,-0.813 +19149,0.650 +19150,-1.522 +19151,-0.475 +19152,-0.409 +19153,1.697 +19154,-0.343 +19155,1.545 +19156,2.125 +19157,1.128 +19158,0.034 +19159,0.404 +19160,0.027 +19161,-0.922 +19162,-1.916 +19163,-1.063 +19164,-0.485 +19165,1.295 +19166,-0.041 +19167,1.130 +19168,-0.826 +19169,1.750 +19170,1.449 +19171,0.949 +19172,-1.518 +19173,-1.993 +19174,0.664 +19175,-0.335 +19176,1.246 +19177,0.150 +19178,0.422 +19179,-0.765 +19180,-1.320 +19181,-1.588 +19182,-0.078 +19183,-0.644 +19184,-0.471 +19185,-0.603 +19186,0.807 +19187,-0.015 +19188,0.166 +19189,0.655 +19190,0.975 +19191,-0.420 +19192,-0.680 +19193,-1.140 +19194,2.661 +19195,1.555 +19196,-1.745 +19197,-0.878 +19198,0.939 +19199,-1.349 +19200,0.040 +19201,0.599 +19202,0.677 +19203,0.571 +19204,-0.682 +19205,-1.704 +19206,-0.632 +19207,0.515 +19208,0.897 +19209,1.586 +19210,0.403 +19211,1.474 +19212,0.259 +19213,-0.101 +19214,1.570 +19215,-0.939 +19216,2.164 +19217,0.243 +19218,-0.970 +19219,0.957 +19220,-0.554 +19221,-0.492 +19222,-1.479 +19223,0.385 +19224,-1.141 +19225,-0.135 +19226,-0.187 +19227,-0.127 +19228,0.884 +19229,0.445 +19230,0.023 +19231,1.590 +19232,-0.577 +19233,-0.240 +19234,-0.775 +19235,0.637 +19236,-0.910 +19237,-0.038 +19238,-1.561 +19239,-0.052 +19240,-2.254 +19241,-0.603 +19242,-0.625 +19243,-0.482 +19244,-0.484 +19245,-0.227 +19246,0.302 +19247,-0.393 +19248,-2.225 +19249,2.056 +19250,-0.051 +19251,-1.667 +19252,-0.793 +19253,-0.129 +19254,-2.021 +19255,0.690 +19256,-1.247 +19257,-0.598 +19258,-1.808 +19259,0.429 +19260,0.559 +19261,-0.261 +19262,1.102 +19263,0.770 +19264,0.785 +19265,-1.739 +19266,-0.122 +19267,-0.206 +19268,0.800 +19269,0.552 +19270,-0.582 +19271,-0.671 +19272,-0.442 +19273,-0.289 +19274,0.380 +19275,-0.863 +19276,0.899 +19277,0.083 +19278,0.891 +19279,-0.074 +19280,-0.127 +19281,-0.069 +19282,-2.883 +19283,1.060 +19284,0.952 +19285,-1.043 +19286,0.683 +19287,-2.080 +19288,0.897 +19289,-0.692 +19290,0.738 +19291,1.748 +19292,1.537 +19293,0.275 +19294,0.485 +19295,-0.370 +19296,-0.953 +19297,-0.377 +19298,-0.952 +19299,-0.096 +19300,-1.725 +19301,0.506 +19302,-0.319 +19303,-1.036 +19304,-0.814 +19305,0.223 +19306,2.382 +19307,0.122 +19308,0.486 +19309,0.880 +19310,2.014 +19311,0.900 +19312,0.304 +19313,0.214 +19314,0.216 +19315,0.833 +19316,-0.424 +19317,-0.342 +19318,-0.245 +19319,0.059 +19320,-0.289 +19321,-0.777 +19322,-0.151 +19323,-0.911 +19324,2.200 +19325,-0.316 +19326,0.662 +19327,-0.021 +19328,0.018 +19329,-0.521 +19330,-0.524 +19331,-0.604 +19332,0.960 +19333,1.281 +19334,2.698 +19335,0.778 +19336,-1.634 +19337,0.947 +19338,-0.733 +19339,0.156 +19340,-0.403 +19341,0.206 +19342,-2.231 +19343,-0.501 +19344,-0.809 +19345,-0.042 +19346,0.594 +19347,0.976 +19348,-1.074 +19349,0.214 +19350,0.196 +19351,1.445 +19352,0.764 +19353,-0.281 +19354,-0.528 +19355,1.529 +19356,-0.059 +19357,1.715 +19358,-1.202 +19359,0.294 +19360,-1.578 +19361,-1.070 +19362,0.780 +19363,0.699 +19364,0.630 +19365,0.467 +19366,-0.051 +19367,-0.606 +19368,0.225 +19369,0.765 +19370,-0.041 +19371,-1.065 +19372,1.683 +19373,0.797 +19374,-0.117 +19375,0.478 +19376,-0.417 +19377,2.192 +19378,0.404 +19379,1.666 +19380,-0.200 +19381,-0.006 +19382,0.056 +19383,-0.690 +19384,-0.224 +19385,0.389 +19386,0.142 +19387,1.171 +19388,0.917 +19389,-0.983 +19390,-1.652 +19391,1.100 +19392,-0.112 +19393,0.083 +19394,-1.133 +19395,-0.192 +19396,1.210 +19397,-0.183 +19398,-1.276 +19399,-0.253 +19400,-1.502 +19401,-0.154 +19402,-1.754 +19403,-0.292 +19404,-1.273 +19405,0.109 +19406,-0.915 +19407,0.088 +19408,-0.115 +19409,-2.625 +19410,1.289 +19411,2.554 +19412,0.375 +19413,1.854 +19414,0.979 +19415,-3.111 +19416,-1.156 +19417,0.561 +19418,0.174 +19419,0.210 +19420,-1.599 +19421,-1.900 +19422,0.231 +19423,-0.369 +19424,1.254 +19425,1.168 +19426,-0.824 +19427,-0.206 +19428,-0.179 +19429,-0.878 +19430,-0.292 +19431,-0.960 +19432,-2.137 +19433,1.161 +19434,1.191 +19435,-2.221 +19436,0.549 +19437,1.446 +19438,0.922 +19439,0.785 +19440,-1.102 +19441,-1.728 +19442,1.250 +19443,0.725 +19444,-0.928 +19445,-0.884 +19446,-1.834 +19447,0.316 +19448,-0.279 +19449,-0.277 +19450,0.566 +19451,-1.519 +19452,-0.071 +19453,-0.583 +19454,2.315 +19455,-0.982 +19456,-0.266 +19457,-0.210 +19458,0.768 +19459,-1.023 +19460,-0.946 +19461,1.586 +19462,-0.718 +19463,-0.677 +19464,-0.996 +19465,-1.424 +19466,0.689 +19467,-0.680 +19468,0.129 +19469,0.534 +19470,-1.084 +19471,-0.893 +19472,-2.806 +19473,0.702 +19474,-0.105 +19475,0.865 +19476,-0.481 +19477,0.254 +19478,0.212 +19479,0.880 +19480,1.463 +19481,0.085 +19482,-1.041 +19483,1.939 +19484,0.206 +19485,1.232 +19486,0.156 +19487,-0.481 +19488,0.356 +19489,-0.101 +19490,1.390 +19491,-1.089 +19492,0.641 +19493,-1.795 +19494,-0.029 +19495,-0.344 +19496,0.218 +19497,-0.994 +19498,-0.282 +19499,1.214 +19500,-0.101 +19501,0.132 +19502,0.832 +19503,0.300 +19504,0.572 +19505,-0.530 +19506,-1.273 +19507,0.691 +19508,-0.813 +19509,0.535 +19510,1.086 +19511,0.514 +19512,1.428 +19513,-0.680 +19514,-2.104 +19515,-0.084 +19516,0.146 +19517,-1.191 +19518,0.025 +19519,-0.037 +19520,1.088 +19521,-0.562 +19522,1.510 +19523,-0.487 +19524,1.465 +19525,-0.336 +19526,-0.406 +19527,-0.855 +19528,-0.473 +19529,-0.976 +19530,-0.609 +19531,1.027 +19532,0.036 +19533,1.330 +19534,0.569 +19535,0.393 +19536,-1.444 +19537,0.142 +19538,-0.551 +19539,-0.409 +19540,1.102 +19541,-0.607 +19542,-1.305 +19543,0.683 +19544,-2.590 +19545,1.844 +19546,0.757 +19547,-0.145 +19548,0.706 +19549,0.343 +19550,0.897 +19551,2.782 +19552,0.095 +19553,-0.986 +19554,0.682 +19555,2.579 +19556,-0.601 +19557,-0.043 +19558,-0.596 +19559,-2.374 +19560,1.168 +19561,0.749 +19562,-0.826 +19563,-0.858 +19564,1.157 +19565,1.928 +19566,-0.508 +19567,0.657 +19568,-0.552 +19569,0.432 +19570,0.231 +19571,0.950 +19572,-0.953 +19573,0.236 +19574,1.101 +19575,0.229 +19576,0.954 +19577,-2.690 +19578,-0.711 +19579,0.491 +19580,1.203 +19581,-0.876 +19582,-1.104 +19583,0.741 +19584,-0.170 +19585,0.487 +19586,-1.832 +19587,-0.055 +19588,0.414 +19589,0.784 +19590,0.738 +19591,0.739 +19592,0.808 +19593,0.768 +19594,1.273 +19595,-0.538 +19596,-0.167 +19597,-1.057 +19598,-0.728 +19599,0.868 +19600,-0.005 +19601,-0.229 +19602,0.223 +19603,0.498 +19604,-0.567 +19605,-0.223 +19606,0.729 +19607,-1.217 +19608,-1.320 +19609,-0.856 +19610,0.840 +19611,0.053 +19612,0.947 +19613,0.674 +19614,1.076 +19615,-1.910 +19616,1.511 +19617,-1.122 +19618,-0.219 +19619,0.091 +19620,-0.941 +19621,-0.220 +19622,0.801 +19623,0.618 +19624,0.110 +19625,-0.324 +19626,-0.442 +19627,-0.149 +19628,1.217 +19629,0.823 +19630,0.474 +19631,-0.272 +19632,-1.123 +19633,0.856 +19634,0.842 +19635,-0.965 +19636,1.507 +19637,1.477 +19638,0.619 +19639,-1.969 +19640,0.067 +19641,1.398 +19642,0.136 +19643,0.403 +19644,2.027 +19645,0.941 +19646,0.464 +19647,2.019 +19648,-0.106 +19649,0.199 +19650,1.428 +19651,-1.330 +19652,1.489 +19653,-0.432 +19654,-0.399 +19655,0.092 +19656,2.061 +19657,2.449 +19658,1.296 +19659,-0.243 +19660,-0.361 +19661,1.392 +19662,-0.792 +19663,-1.235 +19664,-0.738 +19665,-1.181 +19666,-0.039 +19667,0.684 +19668,-1.534 +19669,-0.808 +19670,-0.371 +19671,-0.247 +19672,0.564 +19673,-0.365 +19674,-0.540 +19675,0.142 +19676,1.971 +19677,1.113 +19678,0.546 +19679,-0.745 +19680,1.107 +19681,0.282 +19682,0.063 +19683,1.589 +19684,0.138 +19685,0.452 +19686,-0.119 +19687,0.087 +19688,2.519 +19689,0.765 +19690,0.351 +19691,0.955 +19692,-0.759 +19693,-1.018 +19694,-0.438 +19695,0.141 +19696,0.244 +19697,-0.025 +19698,0.117 +19699,-0.143 +19700,-0.973 +19701,-0.416 +19702,-0.819 +19703,2.275 +19704,0.847 +19705,0.406 +19706,0.355 +19707,-1.699 +19708,-0.430 +19709,0.244 +19710,-0.134 +19711,-0.492 +19712,0.717 +19713,-1.875 +19714,0.396 +19715,-0.804 +19716,-0.352 +19717,-0.018 +19718,-3.082 +19719,0.666 +19720,-0.920 +19721,1.956 +19722,0.417 +19723,1.239 +19724,-0.845 +19725,-0.924 +19726,-0.101 +19727,0.634 +19728,0.702 +19729,-0.363 +19730,1.470 +19731,-0.253 +19732,0.490 +19733,0.000 +19734,0.336 +19735,0.530 +19736,0.492 +19737,-2.759 +19738,0.149 +19739,-1.177 +19740,-1.083 +19741,0.758 +19742,-0.065 +19743,-1.152 +19744,-1.455 +19745,-0.758 +19746,0.352 +19747,-0.098 +19748,0.554 +19749,0.272 +19750,-0.884 +19751,-1.170 +19752,0.242 +19753,-2.471 +19754,-1.281 +19755,0.562 +19756,0.978 +19757,0.157 +19758,1.308 +19759,0.315 +19760,0.614 +19761,-1.426 +19762,0.429 +19763,-1.362 +19764,-0.760 +19765,-0.278 +19766,-0.315 +19767,0.894 +19768,0.501 +19769,-0.538 +19770,-1.638 +19771,1.235 +19772,2.270 +19773,-0.117 +19774,-1.036 +19775,-0.196 +19776,-0.884 +19777,-0.580 +19778,1.030 +19779,-0.458 +19780,2.158 +19781,-0.200 +19782,1.730 +19783,0.724 +19784,-0.711 +19785,-0.369 +19786,0.379 +19787,0.541 +19788,0.789 +19789,0.698 +19790,-1.138 +19791,-0.125 +19792,0.785 +19793,1.210 +19794,1.020 +19795,0.954 +19796,-0.699 +19797,1.049 +19798,0.391 +19799,-0.659 +19800,0.300 +19801,2.009 +19802,-0.761 +19803,1.291 +19804,1.060 +19805,1.387 +19806,1.627 +19807,1.751 +19808,0.440 +19809,-0.314 +19810,1.865 +19811,1.279 +19812,1.309 +19813,-0.339 +19814,1.301 +19815,-0.606 +19816,-0.021 +19817,-0.395 +19818,1.046 +19819,-0.082 +19820,-0.125 +19821,0.071 +19822,0.223 +19823,-1.086 +19824,1.012 +19825,0.345 +19826,-0.544 +19827,0.460 +19828,0.055 +19829,0.171 +19830,-1.628 +19831,-0.444 +19832,-1.788 +19833,-0.546 +19834,1.732 +19835,-0.607 +19836,-0.389 +19837,-0.476 +19838,0.836 +19839,-0.658 +19840,1.818 +19841,-0.716 +19842,0.914 +19843,-0.595 +19844,0.668 +19845,-0.488 +19846,0.140 +19847,-0.314 +19848,-1.221 +19849,-1.455 +19850,-0.868 +19851,-0.588 +19852,-0.668 +19853,0.526 +19854,-2.362 +19855,-0.139 +19856,1.359 +19857,-1.651 +19858,-0.934 +19859,-0.018 +19860,0.592 +19861,0.565 +19862,0.939 +19863,1.401 +19864,0.341 +19865,0.742 +19866,0.564 +19867,-0.224 +19868,-0.198 +19869,0.902 +19870,0.691 +19871,0.273 +19872,0.533 +19873,-0.880 +19874,0.131 +19875,-2.101 +19876,0.377 +19877,-0.698 +19878,0.079 +19879,-1.181 +19880,-0.073 +19881,-0.161 +19882,0.137 +19883,0.416 +19884,1.168 +19885,-0.688 +19886,-0.067 +19887,0.107 +19888,0.264 +19889,0.037 +19890,-0.619 +19891,-0.307 +19892,0.056 +19893,0.739 +19894,-0.599 +19895,0.716 +19896,0.588 +19897,-0.298 +19898,-0.513 +19899,0.359 +19900,0.580 +19901,-1.451 +19902,-0.664 +19903,-1.173 +19904,1.785 +19905,-0.123 +19906,-0.221 +19907,0.106 +19908,1.044 +19909,-1.019 +19910,-0.123 +19911,-1.208 +19912,-0.420 +19913,-0.054 +19914,-1.117 +19915,-1.192 +19916,-0.220 +19917,-0.265 +19918,0.742 +19919,-1.999 +19920,1.526 +19921,0.495 +19922,1.175 +19923,-0.036 +19924,0.194 +19925,2.178 +19926,-0.179 +19927,1.234 +19928,-2.562 +19929,0.244 +19930,0.183 +19931,0.336 +19932,0.800 +19933,-1.888 +19934,-0.760 +19935,0.144 +19936,-0.547 +19937,0.454 +19938,1.597 +19939,-0.774 +19940,0.444 +19941,-0.247 +19942,1.327 +19943,3.188 +19944,-1.767 +19945,-0.378 +19946,0.004 +19947,-1.229 +19948,2.402 +19949,1.341 +19950,0.298 +19951,0.350 +19952,-1.384 +19953,0.906 +19954,1.678 +19955,-0.604 +19956,-0.940 +19957,-0.585 +19958,-0.055 +19959,-0.142 +19960,1.853 +19961,-0.310 +19962,-0.487 +19963,1.755 +19964,-0.204 +19965,-0.212 +19966,0.103 +19967,0.694 +19968,0.455 +19969,-0.504 +19970,-0.046 +19971,0.296 +19972,0.562 +19973,2.060 +19974,-1.570 +19975,-0.347 +19976,1.355 +19977,1.119 +19978,-0.843 +19979,0.397 +19980,-0.396 +19981,-0.164 +19982,-0.949 +19983,-0.758 +19984,-1.097 +19985,1.035 +19986,0.095 +19987,1.157 +19988,0.837 +19989,0.393 +19990,-0.503 +19991,-0.248 +19992,-0.343 +19993,0.648 +19994,0.166 +19995,-0.133 +19996,-1.269 +19997,1.324 +19998,-1.044 +19999,0.375 +20000,-1.194 +20001,0.356 +20002,0.930 +20003,-1.054 +20004,0.963 +20005,-1.153 +20006,1.117 +20007,0.255 +20008,-0.185 +20009,0.225 +20010,-1.608 +20011,1.847 +20012,0.106 +20013,-1.674 +20014,1.817 +20015,0.804 +20016,0.098 +20017,1.309 +20018,-1.479 +20019,-0.063 +20020,1.190 +20021,-1.169 +20022,-1.174 +20023,1.124 +20024,0.392 +20025,-1.112 +20026,-1.129 +20027,-0.383 +20028,1.583 +20029,0.113 +20030,-0.258 +20031,-0.115 +20032,2.717 +20033,0.470 +20034,2.433 +20035,0.119 +20036,-1.353 +20037,-0.250 +20038,-1.187 +20039,0.234 +20040,-1.033 +20041,-0.218 +20042,0.115 +20043,-1.723 +20044,0.640 +20045,1.460 +20046,0.701 +20047,-1.743 +20048,0.214 +20049,0.917 +20050,-1.156 +20051,0.137 +20052,-0.014 +20053,-0.447 +20054,-0.562 +20055,-0.915 +20056,-0.782 +20057,-0.461 +20058,0.399 +20059,-0.565 +20060,-0.807 +20061,-0.134 +20062,-0.679 +20063,-1.194 +20064,0.139 +20065,-1.047 +20066,-1.446 +20067,-0.999 +20068,0.164 +20069,1.129 +20070,-1.464 +20071,0.713 +20072,0.533 +20073,0.081 +20074,0.268 +20075,1.342 +20076,-0.253 +20077,0.782 +20078,0.883 +20079,0.195 +20080,1.500 +20081,0.442 +20082,-2.103 +20083,0.948 +20084,-0.225 +20085,0.100 +20086,0.832 +20087,-0.116 +20088,-0.712 +20089,0.802 +20090,-0.597 +20091,-0.033 +20092,-0.159 +20093,0.253 +20094,1.237 +20095,0.103 +20096,-1.211 +20097,-0.298 +20098,-0.573 +20099,-0.657 +20100,-1.054 +20101,-1.180 +20102,0.259 +20103,-0.961 +20104,1.264 +20105,-2.333 +20106,-0.303 +20107,0.621 +20108,-1.029 +20109,0.372 +20110,-0.679 +20111,1.304 +20112,0.111 +20113,-1.321 +20114,0.972 +20115,1.984 +20116,0.619 +20117,-0.189 +20118,-2.508 +20119,0.311 +20120,-1.708 +20121,0.564 +20122,1.023 +20123,-0.333 +20124,0.561 +20125,0.579 +20126,1.355 +20127,-1.592 +20128,1.419 +20129,0.423 +20130,-0.158 +20131,-1.749 +20132,0.131 +20133,-0.761 +20134,0.498 +20135,0.803 +20136,-0.195 +20137,1.489 +20138,-1.314 +20139,0.118 +20140,-0.877 +20141,1.601 +20142,-0.768 +20143,0.746 +20144,-2.042 +20145,0.636 +20146,0.584 +20147,0.194 +20148,0.528 +20149,-1.419 +20150,-1.121 +20151,-2.483 +20152,-0.934 +20153,0.553 +20154,0.071 +20155,0.722 +20156,0.621 +20157,0.796 +20158,-1.403 +20159,-1.819 +20160,0.100 +20161,-1.698 +20162,1.543 +20163,-1.480 +20164,0.898 +20165,1.776 +20166,-0.047 +20167,1.614 +20168,-1.289 +20169,-0.380 +20170,-0.419 +20171,0.056 +20172,0.915 +20173,-0.091 +20174,2.456 +20175,1.317 +20176,-0.635 +20177,-0.340 +20178,-0.423 +20179,0.536 +20180,-0.684 +20181,0.766 +20182,-0.466 +20183,0.854 +20184,-0.003 +20185,0.276 +20186,1.907 +20187,-0.979 +20188,0.547 +20189,-0.087 +20190,-0.056 +20191,1.166 +20192,0.088 +20193,-0.037 +20194,-0.625 +20195,-0.146 +20196,0.896 +20197,1.491 +20198,-0.951 +20199,-0.162 +20200,-0.198 +20201,0.448 +20202,2.556 +20203,-1.428 +20204,-1.106 +20205,-0.105 +20206,-0.677 +20207,1.357 +20208,-1.977 +20209,0.597 +20210,-2.035 +20211,-1.682 +20212,-2.134 +20213,-1.392 +20214,0.559 +20215,0.116 +20216,0.835 +20217,-0.361 +20218,-1.017 +20219,0.956 +20220,-0.417 +20221,0.793 +20222,0.650 +20223,1.804 +20224,0.670 +20225,0.239 +20226,0.880 +20227,0.290 +20228,0.397 +20229,0.010 +20230,-2.432 +20231,-1.164 +20232,1.592 +20233,1.789 +20234,0.310 +20235,0.055 +20236,-0.259 +20237,0.697 +20238,-0.496 +20239,-0.201 +20240,-1.151 +20241,0.525 +20242,0.607 +20243,0.249 +20244,-2.570 +20245,-0.500 +20246,0.068 +20247,0.613 +20248,0.759 +20249,0.868 +20250,-0.210 +20251,-0.633 +20252,0.147 +20253,-1.254 +20254,0.946 +20255,2.995 +20256,-1.184 +20257,1.236 +20258,1.734 +20259,-0.300 +20260,1.534 +20261,0.940 +20262,0.441 +20263,-1.504 +20264,0.149 +20265,-0.560 +20266,0.094 +20267,1.239 +20268,1.708 +20269,1.662 +20270,1.821 +20271,-1.770 +20272,-0.289 +20273,0.797 +20274,0.087 +20275,1.149 +20276,0.715 +20277,-0.026 +20278,-0.717 +20279,2.224 +20280,0.473 +20281,0.134 +20282,1.663 +20283,1.900 +20284,1.364 +20285,-0.728 +20286,-1.055 +20287,0.630 +20288,1.885 +20289,-0.153 +20290,-0.992 +20291,0.255 +20292,0.194 +20293,0.320 +20294,-1.359 +20295,1.758 +20296,0.617 +20297,-0.606 +20298,1.007 +20299,-0.449 +20300,-0.002 +20301,-1.055 +20302,1.590 +20303,-0.911 +20304,0.846 +20305,-0.669 +20306,-1.519 +20307,-0.200 +20308,-0.463 +20309,0.446 +20310,-0.224 +20311,2.113 +20312,1.206 +20313,-0.403 +20314,-1.616 +20315,0.160 +20316,0.723 +20317,1.076 +20318,-0.684 +20319,-1.801 +20320,1.974 +20321,0.418 +20322,-0.018 +20323,-0.542 +20324,0.229 +20325,1.488 +20326,-0.638 +20327,-0.367 +20328,0.787 +20329,-2.090 +20330,1.230 +20331,0.174 +20332,1.020 +20333,-1.672 +20334,-0.661 +20335,-0.621 +20336,0.976 +20337,0.253 +20338,-0.656 +20339,0.575 +20340,0.620 +20341,-1.289 +20342,0.558 +20343,-1.161 +20344,1.420 +20345,-0.040 +20346,0.295 +20347,1.178 +20348,-0.979 +20349,-0.135 +20350,-0.547 +20351,-2.136 +20352,0.814 +20353,0.347 +20354,-0.186 +20355,0.254 +20356,1.722 +20357,0.666 +20358,0.266 +20359,1.194 +20360,-0.858 +20361,-0.257 +20362,0.273 +20363,-1.362 +20364,0.366 +20365,-0.783 +20366,0.608 +20367,-1.744 +20368,-0.997 +20369,1.323 +20370,-1.435 +20371,-1.857 +20372,-1.349 +20373,1.200 +20374,-0.303 +20375,1.528 +20376,0.431 +20377,0.494 +20378,0.747 +20379,0.308 +20380,-1.173 +20381,1.452 +20382,-0.319 +20383,-0.777 +20384,-0.605 +20385,0.279 +20386,-0.955 +20387,-1.034 +20388,-1.333 +20389,-0.514 +20390,-0.708 +20391,-0.143 +20392,2.081 +20393,0.078 +20394,-0.388 +20395,-0.397 +20396,0.007 +20397,1.140 +20398,0.538 +20399,-0.432 +20400,-0.662 +20401,0.019 +20402,-0.771 +20403,-1.608 +20404,0.907 +20405,-1.793 +20406,0.593 +20407,-1.668 +20408,0.411 +20409,0.473 +20410,-1.063 +20411,0.789 +20412,-0.586 +20413,0.609 +20414,-0.917 +20415,-1.241 +20416,0.193 +20417,0.563 +20418,-1.526 +20419,0.288 +20420,0.201 +20421,-1.275 +20422,0.692 +20423,0.220 +20424,-0.210 +20425,-0.163 +20426,0.102 +20427,0.792 +20428,-0.076 +20429,-0.194 +20430,0.017 +20431,-0.857 +20432,-1.622 +20433,0.876 +20434,0.486 +20435,1.426 +20436,-1.146 +20437,-0.015 +20438,-0.830 +20439,0.124 +20440,0.732 +20441,-0.505 +20442,-0.640 +20443,-0.116 +20444,-0.389 +20445,-1.859 +20446,-0.219 +20447,0.006 +20448,1.152 +20449,0.346 +20450,1.195 +20451,1.601 +20452,-0.211 +20453,-0.731 +20454,0.288 +20455,-1.047 +20456,1.293 +20457,2.415 +20458,-1.054 +20459,1.337 +20460,-0.709 +20461,0.881 +20462,1.054 +20463,0.783 +20464,0.825 +20465,-0.071 +20466,2.821 +20467,0.198 +20468,0.120 +20469,-0.669 +20470,0.001 +20471,0.876 +20472,-0.871 +20473,-1.107 +20474,-0.521 +20475,0.416 +20476,0.114 +20477,-0.733 +20478,0.762 +20479,0.244 +20480,1.750 +20481,-1.309 +20482,-0.040 +20483,-0.739 +20484,-0.960 +20485,0.247 +20486,1.734 +20487,0.380 +20488,-0.880 +20489,0.280 +20490,-0.795 +20491,0.279 +20492,0.321 +20493,-0.693 +20494,-0.629 +20495,-1.483 +20496,0.524 +20497,0.201 +20498,-0.404 +20499,0.415 +20500,1.349 +20501,0.460 +20502,-0.202 +20503,-0.666 +20504,-0.544 +20505,-0.511 +20506,-0.255 +20507,-0.896 +20508,1.294 +20509,0.109 +20510,0.032 +20511,1.139 +20512,-1.105 +20513,0.272 +20514,0.628 +20515,-1.041 +20516,1.312 +20517,1.128 +20518,0.276 +20519,1.271 +20520,-1.518 +20521,-1.019 +20522,0.436 +20523,-1.079 +20524,-0.104 +20525,-1.486 +20526,-0.123 +20527,0.406 +20528,1.094 +20529,-0.541 +20530,-1.011 +20531,-0.532 +20532,-1.135 +20533,-1.300 +20534,0.288 +20535,0.060 +20536,0.086 +20537,1.165 +20538,1.813 +20539,0.908 +20540,1.112 +20541,0.237 +20542,1.063 +20543,-0.909 +20544,-0.610 +20545,0.515 +20546,1.062 +20547,-0.435 +20548,-2.509 +20549,0.920 +20550,-0.711 +20551,1.053 +20552,-0.195 +20553,0.313 +20554,2.276 +20555,-0.759 +20556,-0.206 +20557,-0.446 +20558,-1.329 +20559,1.174 +20560,1.063 +20561,-2.039 +20562,0.403 +20563,-0.707 +20564,-0.401 +20565,-0.773 +20566,0.861 +20567,0.081 +20568,1.166 +20569,-0.773 +20570,-0.425 +20571,0.694 +20572,2.276 +20573,-0.288 +20574,2.511 +20575,-0.006 +20576,1.570 +20577,1.243 +20578,-1.162 +20579,-0.182 +20580,-0.548 +20581,-0.883 +20582,-1.941 +20583,-0.655 +20584,-0.343 +20585,1.848 +20586,0.715 +20587,-0.384 +20588,0.661 +20589,0.204 +20590,0.892 +20591,-2.596 +20592,0.585 +20593,0.096 +20594,1.970 +20595,0.818 +20596,0.015 +20597,0.474 +20598,0.527 +20599,-0.318 +20600,0.360 +20601,-0.605 +20602,0.177 +20603,-1.962 +20604,2.022 +20605,-1.160 +20606,-0.308 +20607,0.800 +20608,-0.546 +20609,-0.040 +20610,0.541 +20611,0.776 +20612,-2.584 +20613,1.870 +20614,1.823 +20615,0.866 +20616,-1.534 +20617,-0.181 +20618,-0.353 +20619,-1.310 +20620,0.104 +20621,0.176 +20622,2.151 +20623,0.941 +20624,-0.594 +20625,-1.287 +20626,-0.107 +20627,0.641 +20628,1.138 +20629,0.848 +20630,-1.130 +20631,0.279 +20632,-0.587 +20633,0.024 +20634,1.009 +20635,-1.182 +20636,-1.194 +20637,0.318 +20638,-0.403 +20639,0.962 +20640,1.850 +20641,-1.254 +20642,0.684 +20643,0.850 +20644,-1.359 +20645,1.527 +20646,0.501 +20647,-1.325 +20648,-1.700 +20649,-0.401 +20650,1.220 +20651,1.288 +20652,-0.699 +20653,0.277 +20654,-1.164 +20655,-1.136 +20656,-0.358 +20657,0.083 +20658,-0.532 +20659,-0.064 +20660,0.208 +20661,1.008 +20662,-0.097 +20663,-0.535 +20664,0.427 +20665,-1.573 +20666,2.003 +20667,0.571 +20668,0.630 +20669,0.284 +20670,0.815 +20671,-0.176 +20672,1.085 +20673,-0.357 +20674,-0.671 +20675,0.629 +20676,1.611 +20677,0.374 +20678,1.417 +20679,0.849 +20680,0.566 +20681,-1.542 +20682,-1.615 +20683,0.779 +20684,0.122 +20685,1.154 +20686,0.934 +20687,-0.175 +20688,0.558 +20689,0.577 +20690,-0.001 +20691,-0.279 +20692,-1.740 +20693,-0.545 +20694,0.573 +20695,0.712 +20696,0.002 +20697,-0.691 +20698,-0.157 +20699,-0.764 +20700,-0.507 +20701,1.987 +20702,1.393 +20703,0.628 +20704,0.271 +20705,0.150 +20706,-0.971 +20707,-0.606 +20708,0.036 +20709,0.284 +20710,0.034 +20711,0.162 +20712,0.674 +20713,0.081 +20714,-0.715 +20715,-0.762 +20716,0.500 +20717,-0.003 +20718,0.000 +20719,-0.399 +20720,-0.930 +20721,0.326 +20722,-1.181 +20723,0.969 +20724,-0.740 +20725,-0.256 +20726,-2.155 +20727,1.005 +20728,-0.611 +20729,-0.089 +20730,-0.037 +20731,-0.612 +20732,-1.515 +20733,-1.196 +20734,-0.706 +20735,-1.434 +20736,-0.004 +20737,0.330 +20738,0.444 +20739,-0.070 +20740,1.424 +20741,0.646 +20742,0.711 +20743,-0.406 +20744,-0.802 +20745,0.385 +20746,2.002 +20747,1.906 +20748,0.834 +20749,1.639 +20750,-0.362 +20751,0.792 +20752,-0.076 +20753,0.248 +20754,0.687 +20755,-1.113 +20756,0.162 +20757,1.495 +20758,-1.275 +20759,1.373 +20760,-1.053 +20761,1.004 +20762,-0.772 +20763,0.497 +20764,0.708 +20765,-0.952 +20766,-0.542 +20767,-0.151 +20768,0.517 +20769,-1.432 +20770,-0.550 +20771,0.378 +20772,0.185 +20773,-0.227 +20774,0.070 +20775,1.101 +20776,-0.687 +20777,-0.681 +20778,-0.473 +20779,0.277 +20780,1.802 +20781,0.733 +20782,-1.708 +20783,1.408 +20784,0.395 +20785,0.196 +20786,-1.798 +20787,0.564 +20788,-0.249 +20789,-1.230 +20790,0.560 +20791,-2.898 +20792,-0.777 +20793,0.589 +20794,0.365 +20795,-0.337 +20796,-0.432 +20797,0.035 +20798,0.118 +20799,-0.009 +20800,0.543 +20801,0.026 +20802,-1.632 +20803,1.391 +20804,-0.698 +20805,-0.104 +20806,1.121 +20807,1.943 +20808,1.283 +20809,-0.465 +20810,-0.535 +20811,-1.925 +20812,0.437 +20813,-0.528 +20814,0.174 +20815,-1.298 +20816,0.957 +20817,-0.446 +20818,-0.473 +20819,-0.702 +20820,0.649 +20821,-0.738 +20822,1.510 +20823,-1.068 +20824,1.627 +20825,1.805 +20826,2.108 +20827,0.102 +20828,-1.683 +20829,-1.007 +20830,0.501 +20831,-1.382 +20832,0.255 +20833,0.642 +20834,-0.612 +20835,-1.567 +20836,-1.335 +20837,-0.585 +20838,-0.722 +20839,-1.302 +20840,-2.565 +20841,-0.659 +20842,0.713 +20843,-0.097 +20844,-0.707 +20845,-0.501 +20846,1.583 +20847,-1.663 +20848,0.149 +20849,-0.641 +20850,0.076 +20851,-0.708 +20852,2.313 +20853,1.675 +20854,0.110 +20855,-1.431 +20856,1.520 +20857,0.035 +20858,-0.776 +20859,-3.136 +20860,0.642 +20861,0.696 +20862,-0.622 +20863,0.666 +20864,-0.096 +20865,-2.120 +20866,1.650 +20867,-1.087 +20868,-0.911 +20869,0.674 +20870,1.421 +20871,-1.240 +20872,-0.267 +20873,2.014 +20874,2.199 +20875,-0.155 +20876,1.174 +20877,-0.059 +20878,0.359 +20879,-1.736 +20880,0.072 +20881,-1.341 +20882,0.301 +20883,-0.170 +20884,-1.151 +20885,0.003 +20886,1.013 +20887,1.195 +20888,-0.281 +20889,-1.790 +20890,1.093 +20891,-1.008 +20892,-0.190 +20893,-0.882 +20894,-1.790 +20895,-1.301 +20896,0.138 +20897,2.297 +20898,-1.921 +20899,2.197 +20900,1.093 +20901,0.006 +20902,1.071 +20903,-0.758 +20904,0.856 +20905,-1.128 +20906,-0.356 +20907,-0.605 +20908,-0.572 +20909,0.843 +20910,0.480 +20911,-0.579 +20912,-0.047 +20913,1.118 +20914,1.322 +20915,-0.302 +20916,-0.650 +20917,-0.126 +20918,-1.820 +20919,-1.484 +20920,0.438 +20921,0.837 +20922,-0.738 +20923,-0.961 +20924,-0.950 +20925,1.438 +20926,-0.252 +20927,-0.999 +20928,-0.320 +20929,1.111 +20930,0.240 +20931,0.711 +20932,0.745 +20933,-0.884 +20934,0.565 +20935,0.803 +20936,1.379 +20937,0.205 +20938,0.041 +20939,1.376 +20940,1.956 +20941,-2.619 +20942,-0.046 +20943,1.043 +20944,0.228 +20945,0.744 +20946,0.091 +20947,0.406 +20948,1.288 +20949,-0.651 +20950,1.431 +20951,0.389 +20952,-0.341 +20953,-0.155 +20954,-1.266 +20955,0.073 +20956,-0.425 +20957,-0.923 +20958,-0.179 +20959,-0.996 +20960,-0.003 +20961,-0.256 +20962,1.957 +20963,-1.047 +20964,0.823 +20965,0.488 +20966,-1.313 +20967,-0.079 +20968,0.248 +20969,-1.099 +20970,-0.380 +20971,1.215 +20972,0.200 +20973,0.159 +20974,2.244 +20975,0.015 +20976,0.532 +20977,-0.034 +20978,1.693 +20979,-0.355 +20980,0.968 +20981,-1.469 +20982,-0.273 +20983,-0.328 +20984,2.033 +20985,-1.857 +20986,-0.780 +20987,1.605 +20988,-0.727 +20989,0.409 +20990,-0.693 +20991,-0.064 +20992,-0.810 +20993,0.023 +20994,1.566 +20995,-0.095 +20996,-0.393 +20997,1.359 +20998,-0.369 +20999,0.806 +21000,1.130 +21001,0.028 +21002,-0.078 +21003,0.664 +21004,1.814 +21005,0.479 +21006,-3.111 +21007,0.415 +21008,0.881 +21009,0.607 +21010,1.014 +21011,1.342 +21012,-0.255 +21013,1.435 +21014,-2.092 +21015,0.894 +21016,0.586 +21017,-0.586 +21018,0.322 +21019,-1.621 +21020,0.163 +21021,1.260 +21022,-2.223 +21023,-1.092 +21024,-1.033 +21025,-0.898 +21026,0.112 +21027,0.577 +21028,1.670 +21029,-0.096 +21030,-0.410 +21031,-2.212 +21032,-0.604 +21033,-1.676 +21034,-0.464 +21035,-1.003 +21036,0.160 +21037,-0.216 +21038,-0.719 +21039,-0.788 +21040,-0.278 +21041,2.737 +21042,0.398 +21043,-0.557 +21044,-0.337 +21045,0.265 +21046,-0.309 +21047,-0.508 +21048,0.340 +21049,-1.065 +21050,2.718 +21051,-0.861 +21052,0.052 +21053,1.309 +21054,0.470 +21055,0.578 +21056,0.446 +21057,0.948 +21058,1.165 +21059,1.158 +21060,-0.003 +21061,1.139 +21062,1.481 +21063,-1.311 +21064,0.368 +21065,-0.571 +21066,-0.842 +21067,1.187 +21068,-0.211 +21069,0.653 +21070,2.007 +21071,0.669 +21072,0.450 +21073,-1.135 +21074,-0.588 +21075,1.590 +21076,-0.852 +21077,0.533 +21078,-0.460 +21079,0.652 +21080,0.082 +21081,-0.907 +21082,-0.649 +21083,-0.435 +21084,0.797 +21085,0.861 +21086,-2.785 +21087,-1.113 +21088,-0.943 +21089,1.372 +21090,1.851 +21091,-0.486 +21092,-0.842 +21093,0.276 +21094,-0.493 +21095,-0.544 +21096,0.502 +21097,0.466 +21098,-1.094 +21099,0.299 +21100,-0.000 +21101,-0.471 +21102,2.106 +21103,0.848 +21104,-0.519 +21105,0.115 +21106,-0.380 +21107,1.437 +21108,2.026 +21109,2.102 +21110,-1.415 +21111,-0.386 +21112,0.992 +21113,0.658 +21114,0.601 +21115,0.900 +21116,-0.406 +21117,0.420 +21118,1.507 +21119,1.933 +21120,-0.768 +21121,-1.375 +21122,1.023 +21123,-0.999 +21124,1.161 +21125,-0.135 +21126,0.783 +21127,-0.763 +21128,1.446 +21129,-0.870 +21130,0.503 +21131,0.311 +21132,-0.616 +21133,-0.803 +21134,0.355 +21135,1.565 +21136,0.740 +21137,-0.616 +21138,-0.175 +21139,0.585 +21140,-0.671 +21141,0.126 +21142,1.241 +21143,0.060 +21144,1.502 +21145,1.337 +21146,-0.591 +21147,0.236 +21148,0.651 +21149,-0.208 +21150,-0.895 +21151,-1.661 +21152,0.008 +21153,0.111 +21154,-0.858 +21155,-0.952 +21156,1.714 +21157,-2.002 +21158,-1.512 +21159,0.557 +21160,-0.152 +21161,-0.507 +21162,0.964 +21163,0.832 +21164,0.376 +21165,-0.514 +21166,-1.258 +21167,0.273 +21168,-1.218 +21169,0.983 +21170,-1.687 +21171,1.330 +21172,-0.254 +21173,2.157 +21174,-0.530 +21175,0.222 +21176,1.022 +21177,-0.017 +21178,1.840 +21179,0.623 +21180,-0.268 +21181,-0.259 +21182,-2.022 +21183,-0.957 +21184,-1.288 +21185,0.229 +21186,-0.835 +21187,-1.254 +21188,0.413 +21189,-0.574 +21190,-1.278 +21191,0.393 +21192,-0.496 +21193,0.296 +21194,-1.283 +21195,0.536 +21196,0.594 +21197,-0.514 +21198,0.310 +21199,1.853 +21200,2.421 +21201,0.264 +21202,1.186 +21203,0.741 +21204,0.357 +21205,0.804 +21206,0.410 +21207,-0.135 +21208,-1.329 +21209,-1.073 +21210,0.523 +21211,0.638 +21212,-0.565 +21213,-0.244 +21214,0.845 +21215,-1.500 +21216,-1.400 +21217,-2.214 +21218,-0.368 +21219,0.020 +21220,1.799 +21221,-0.840 +21222,-0.797 +21223,0.359 +21224,-0.836 +21225,-0.556 +21226,0.068 +21227,0.289 +21228,-1.632 +21229,-0.015 +21230,-1.089 +21231,-0.451 +21232,-0.111 +21233,0.954 +21234,-0.124 +21235,0.228 +21236,1.044 +21237,1.428 +21238,-0.889 +21239,-0.184 +21240,1.754 +21241,0.444 +21242,1.676 +21243,-0.982 +21244,0.237 +21245,-0.247 +21246,-0.197 +21247,-0.553 +21248,0.462 +21249,1.979 +21250,-0.124 +21251,-0.563 +21252,1.473 +21253,0.964 +21254,-0.735 +21255,0.793 +21256,-0.442 +21257,1.415 +21258,-1.338 +21259,-1.585 +21260,3.201 +21261,-0.070 +21262,-0.859 +21263,-0.681 +21264,1.105 +21265,-0.369 +21266,-1.320 +21267,1.316 +21268,0.506 +21269,-0.044 +21270,0.034 +21271,-1.644 +21272,-1.046 +21273,-0.315 +21274,0.028 +21275,1.185 +21276,-2.611 +21277,0.834 +21278,-1.702 +21279,0.558 +21280,1.225 +21281,-0.044 +21282,-0.437 +21283,0.624 +21284,-0.765 +21285,-1.083 +21286,1.626 +21287,0.852 +21288,0.728 +21289,-0.227 +21290,-1.456 +21291,-0.468 +21292,-1.153 +21293,1.093 +21294,0.175 +21295,-0.175 +21296,-0.096 +21297,2.034 +21298,-0.600 +21299,0.447 +21300,-1.812 +21301,-1.276 +21302,-0.489 +21303,-0.287 +21304,-0.623 +21305,0.147 +21306,-0.945 +21307,0.061 +21308,-1.881 +21309,-1.502 +21310,-0.160 +21311,0.747 +21312,-0.337 +21313,-1.146 +21314,0.660 +21315,0.190 +21316,-0.820 +21317,-0.957 +21318,0.483 +21319,0.315 +21320,0.396 +21321,0.184 +21322,-0.895 +21323,-0.677 +21324,0.045 +21325,-1.013 +21326,-1.616 +21327,-0.504 +21328,-0.166 +21329,0.090 +21330,0.755 +21331,-0.855 +21332,0.489 +21333,-0.333 +21334,0.625 +21335,1.110 +21336,0.475 +21337,-1.609 +21338,0.212 +21339,-0.516 +21340,0.122 +21341,-0.608 +21342,-0.373 +21343,-0.301 +21344,2.214 +21345,0.722 +21346,0.472 +21347,1.372 +21348,0.328 +21349,-0.451 +21350,-0.530 +21351,1.495 +21352,1.164 +21353,-1.184 +21354,-1.611 +21355,-3.627 +21356,-1.103 +21357,1.092 +21358,-0.724 +21359,0.225 +21360,0.778 +21361,1.084 +21362,-1.142 +21363,0.032 +21364,-0.267 +21365,1.215 +21366,-0.292 +21367,0.518 +21368,0.182 +21369,0.710 +21370,0.963 +21371,-1.058 +21372,0.764 +21373,-0.305 +21374,0.467 +21375,1.665 +21376,0.531 +21377,-0.554 +21378,1.530 +21379,1.153 +21380,0.470 +21381,0.214 +21382,-0.367 +21383,-1.397 +21384,-0.567 +21385,0.331 +21386,0.638 +21387,1.085 +21388,0.442 +21389,0.212 +21390,0.414 +21391,-1.141 +21392,2.658 +21393,-0.418 +21394,-0.866 +21395,0.281 +21396,-0.294 +21397,0.044 +21398,-0.930 +21399,0.047 +21400,1.192 +21401,0.333 +21402,-0.941 +21403,-1.345 +21404,0.019 +21405,-0.668 +21406,0.102 +21407,0.039 +21408,-0.212 +21409,0.605 +21410,0.073 +21411,-0.554 +21412,-0.105 +21413,-1.008 +21414,-0.382 +21415,0.399 +21416,-0.455 +21417,0.564 +21418,-0.939 +21419,-1.322 +21420,-1.565 +21421,-0.052 +21422,-0.580 +21423,0.063 +21424,0.343 +21425,-0.666 +21426,0.524 +21427,1.586 +21428,-1.432 +21429,0.132 +21430,1.534 +21431,0.724 +21432,0.054 +21433,-1.040 +21434,-0.474 +21435,1.246 +21436,1.105 +21437,0.415 +21438,0.506 +21439,2.550 +21440,0.503 +21441,-0.752 +21442,0.097 +21443,0.862 +21444,0.479 +21445,0.660 +21446,-0.638 +21447,0.619 +21448,-0.873 +21449,0.162 +21450,-0.701 +21451,-1.053 +21452,1.103 +21453,1.207 +21454,0.180 +21455,0.703 +21456,-2.337 +21457,-1.418 +21458,0.423 +21459,-0.471 +21460,-0.141 +21461,-0.084 +21462,0.333 +21463,-2.144 +21464,-0.434 +21465,0.055 +21466,-0.062 +21467,-0.091 +21468,0.140 +21469,2.241 +21470,-0.673 +21471,0.044 +21472,-0.802 +21473,0.666 +21474,1.849 +21475,0.249 +21476,-0.736 +21477,-0.956 +21478,-1.671 +21479,-1.456 +21480,0.283 +21481,1.092 +21482,-1.079 +21483,-0.025 +21484,0.332 +21485,1.394 +21486,0.380 +21487,-2.532 +21488,-1.787 +21489,-1.211 +21490,2.343 +21491,0.604 +21492,-0.462 +21493,1.153 +21494,0.670 +21495,1.226 +21496,0.210 +21497,-1.712 +21498,1.525 +21499,1.687 +21500,-0.314 +21501,0.984 +21502,-0.534 +21503,-0.879 +21504,0.111 +21505,-1.078 +21506,0.954 +21507,-0.935 +21508,1.907 +21509,2.143 +21510,-0.108 +21511,1.815 +21512,-1.252 +21513,0.636 +21514,-0.113 +21515,1.898 +21516,-0.001 +21517,-0.542 +21518,0.711 +21519,0.268 +21520,0.931 +21521,0.597 +21522,-1.456 +21523,0.977 +21524,0.489 +21525,-1.772 +21526,0.429 +21527,0.363 +21528,-0.881 +21529,1.167 +21530,-0.443 +21531,0.385 +21532,-0.064 +21533,-0.085 +21534,0.840 +21535,0.540 +21536,0.168 +21537,1.963 +21538,-0.852 +21539,0.908 +21540,1.431 +21541,1.040 +21542,-1.377 +21543,2.234 +21544,-0.155 +21545,-0.707 +21546,0.098 +21547,-0.062 +21548,0.128 +21549,1.649 +21550,1.281 +21551,1.465 +21552,-0.032 +21553,0.112 +21554,0.991 +21555,-1.008 +21556,-0.147 +21557,0.156 +21558,-1.067 +21559,-0.336 +21560,-1.327 +21561,0.574 +21562,-1.234 +21563,-1.123 +21564,-1.068 +21565,0.478 +21566,2.379 +21567,0.202 +21568,-1.064 +21569,-0.852 +21570,0.373 +21571,-0.269 +21572,-1.900 +21573,-0.538 +21574,0.613 +21575,0.400 +21576,-0.540 +21577,0.783 +21578,0.466 +21579,1.274 +21580,-1.612 +21581,0.759 +21582,0.705 +21583,-1.452 +21584,0.382 +21585,-0.924 +21586,0.001 +21587,-0.063 +21588,0.455 +21589,-1.044 +21590,0.983 +21591,0.893 +21592,-0.001 +21593,0.704 +21594,0.722 +21595,-1.725 +21596,-1.063 +21597,-1.130 +21598,0.442 +21599,-0.171 +21600,0.892 +21601,0.272 +21602,-1.951 +21603,-1.222 +21604,0.215 +21605,-0.381 +21606,2.085 +21607,-1.151 +21608,0.463 +21609,0.613 +21610,-1.311 +21611,-0.295 +21612,0.120 +21613,1.695 +21614,-0.887 +21615,-1.202 +21616,0.997 +21617,-1.169 +21618,0.609 +21619,0.599 +21620,-0.362 +21621,-1.711 +21622,0.846 +21623,-0.274 +21624,0.120 +21625,-0.232 +21626,-2.897 +21627,1.131 +21628,1.252 +21629,0.209 +21630,0.170 +21631,-1.288 +21632,1.335 +21633,1.576 +21634,-0.486 +21635,-0.914 +21636,2.357 +21637,1.308 +21638,0.559 +21639,-0.497 +21640,0.881 +21641,1.010 +21642,-0.893 +21643,-0.137 +21644,-1.009 +21645,-0.402 +21646,1.222 +21647,1.295 +21648,-0.126 +21649,-0.193 +21650,0.686 +21651,-1.247 +21652,0.513 +21653,0.096 +21654,1.279 +21655,0.651 +21656,-1.386 +21657,0.090 +21658,0.421 +21659,0.090 +21660,-2.113 +21661,1.014 +21662,-0.738 +21663,1.002 +21664,0.445 +21665,2.400 +21666,0.476 +21667,-0.202 +21668,0.123 +21669,-1.124 +21670,-0.582 +21671,0.453 +21672,-1.116 +21673,-0.875 +21674,1.483 +21675,0.366 +21676,1.602 +21677,-0.800 +21678,0.423 +21679,1.406 +21680,1.742 +21681,-0.564 +21682,-0.714 +21683,0.346 +21684,2.204 +21685,-0.513 +21686,-1.531 +21687,0.211 +21688,1.378 +21689,1.199 +21690,0.133 +21691,1.210 +21692,1.086 +21693,-2.190 +21694,0.413 +21695,-0.366 +21696,-0.379 +21697,0.534 +21698,-0.365 +21699,-0.071 +21700,1.033 +21701,0.694 +21702,-0.340 +21703,-0.130 +21704,0.146 +21705,-1.278 +21706,-0.112 +21707,-0.083 +21708,0.394 +21709,0.525 +21710,-1.937 +21711,1.015 +21712,-0.705 +21713,-0.763 +21714,-0.221 +21715,0.937 +21716,-0.129 +21717,-0.849 +21718,-0.560 +21719,0.620 +21720,1.763 +21721,0.444 +21722,0.987 +21723,-0.002 +21724,0.715 +21725,1.140 +21726,-0.645 +21727,0.045 +21728,0.010 +21729,1.020 +21730,-0.753 +21731,0.860 +21732,0.919 +21733,-1.175 +21734,-0.070 +21735,0.000 +21736,1.275 +21737,-1.218 +21738,0.636 +21739,0.574 +21740,-0.707 +21741,-0.364 +21742,1.836 +21743,0.921 +21744,-0.048 +21745,-2.231 +21746,-0.631 +21747,0.421 +21748,0.189 +21749,-0.217 +21750,-0.710 +21751,0.052 +21752,0.500 +21753,-0.279 +21754,0.719 +21755,1.745 +21756,-0.883 +21757,0.904 +21758,-1.026 +21759,-0.506 +21760,-1.282 +21761,0.755 +21762,0.469 +21763,-0.880 +21764,-0.017 +21765,-0.899 +21766,0.689 +21767,-0.696 +21768,0.089 +21769,1.333 +21770,-1.065 +21771,-1.349 +21772,0.369 +21773,0.634 +21774,-0.435 +21775,0.688 +21776,-1.394 +21777,-1.755 +21778,-0.840 +21779,0.995 +21780,-0.263 +21781,-0.998 +21782,-1.550 +21783,-0.019 +21784,-1.497 +21785,0.023 +21786,-0.216 +21787,0.033 +21788,-1.099 +21789,0.243 +21790,0.720 +21791,0.210 +21792,-0.726 +21793,-0.389 +21794,-0.263 +21795,0.211 +21796,0.932 +21797,-0.249 +21798,0.284 +21799,-0.136 +21800,0.748 +21801,-1.651 +21802,0.254 +21803,0.083 +21804,-1.240 +21805,0.503 +21806,-0.742 +21807,-0.669 +21808,-0.133 +21809,0.590 +21810,0.132 +21811,0.347 +21812,0.859 +21813,0.411 +21814,0.232 +21815,-0.873 +21816,0.786 +21817,0.813 +21818,-0.563 +21819,-0.726 +21820,-0.886 +21821,-1.249 +21822,0.504 +21823,-0.270 +21824,-0.856 +21825,-0.665 +21826,1.280 +21827,0.142 +21828,-0.943 +21829,0.068 +21830,0.691 +21831,0.949 +21832,-1.857 +21833,-0.399 +21834,-1.412 +21835,-0.467 +21836,-2.121 +21837,0.064 +21838,0.005 +21839,0.153 +21840,-0.278 +21841,1.065 +21842,-0.736 +21843,-0.060 +21844,-1.080 +21845,1.003 +21846,1.676 +21847,0.404 +21848,0.659 +21849,0.868 +21850,-0.111 +21851,0.747 +21852,-1.620 +21853,0.577 +21854,-0.720 +21855,-0.298 +21856,0.486 +21857,-1.648 +21858,0.770 +21859,-0.857 +21860,-0.365 +21861,-0.006 +21862,0.066 +21863,-1.880 +21864,-1.347 +21865,-0.109 +21866,-1.965 +21867,0.908 +21868,0.791 +21869,-1.272 +21870,-1.238 +21871,1.405 +21872,1.171 +21873,-1.103 +21874,-0.624 +21875,-0.125 +21876,1.159 +21877,-0.604 +21878,0.213 +21879,-0.266 +21880,-0.272 +21881,-0.546 +21882,-0.446 +21883,0.966 +21884,0.157 +21885,0.546 +21886,-0.392 +21887,0.469 +21888,0.298 +21889,-0.012 +21890,1.975 +21891,-1.815 +21892,-1.393 +21893,-2.483 +21894,0.561 +21895,0.585 +21896,-0.939 +21897,-0.502 +21898,1.256 +21899,-0.750 +21900,1.292 +21901,-2.649 +21902,1.535 +21903,-0.506 +21904,-0.719 +21905,0.774 +21906,-0.770 +21907,-0.074 +21908,1.007 +21909,0.656 +21910,-1.041 +21911,-0.444 +21912,-0.908 +21913,-0.178 +21914,0.376 +21915,0.561 +21916,-0.709 +21917,-0.912 +21918,-1.388 +21919,-0.102 +21920,0.015 +21921,-0.276 +21922,1.342 +21923,-0.210 +21924,-1.148 +21925,-0.529 +21926,0.530 +21927,0.675 +21928,-0.191 +21929,-0.727 +21930,1.102 +21931,0.574 +21932,0.945 +21933,-1.263 +21934,-0.075 +21935,-0.458 +21936,-0.050 +21937,-0.791 +21938,-0.031 +21939,1.001 +21940,0.012 +21941,-0.754 +21942,-0.406 +21943,-0.476 +21944,0.347 +21945,0.002 +21946,0.230 +21947,-0.633 +21948,1.759 +21949,-0.800 +21950,-1.084 +21951,1.585 +21952,1.539 +21953,0.008 +21954,1.509 +21955,0.118 +21956,0.731 +21957,0.789 +21958,0.046 +21959,0.476 +21960,1.663 +21961,-1.504 +21962,-0.176 +21963,-0.875 +21964,-0.786 +21965,0.786 +21966,-1.049 +21967,0.338 +21968,-0.250 +21969,-1.402 +21970,0.257 +21971,0.600 +21972,-0.034 +21973,0.391 +21974,0.114 +21975,-0.637 +21976,-0.281 +21977,-2.903 +21978,-0.868 +21979,-1.074 +21980,-0.452 +21981,0.804 +21982,0.419 +21983,1.109 +21984,-1.483 +21985,0.267 +21986,-1.461 +21987,-0.798 +21988,0.031 +21989,-0.891 +21990,0.648 +21991,0.660 +21992,-0.011 +21993,-1.795 +21994,0.922 +21995,1.378 +21996,0.290 +21997,0.614 +21998,0.085 +21999,-0.344 +22000,1.666 +22001,-2.696 +22002,-1.459 +22003,0.825 +22004,1.484 +22005,-0.088 +22006,0.175 +22007,-0.420 +22008,-0.112 +22009,0.748 +22010,0.601 +22011,0.568 +22012,1.108 +22013,-0.838 +22014,-0.030 +22015,-0.640 diff --git a/CRVConditions/data/time_wideband4modules.txt b/CRVConditions/data/time_wideband4modules.txt new file mode 100644 index 0000000000..7478060ba4 --- /dev/null +++ b/CRVConditions/data/time_wideband4modules.txt @@ -0,0 +1,1026 @@ +TABLE CRVTime +#channel,timeOffset +0,0.358 +1,0.031 +2,0.444 +3,0.958 +4,2.147 +5,-0.212 +6,0.479 +7,-0.855 +8,0.262 +9,0.128 +10,-1.259 +11,-0.621 +12,0.051 +13,-0.041 +14,0.093 +15,-1.568 +16,-1.368 +17,-0.241 +18,0.056 +19,0.633 +20,-1.725 +21,0.471 +22,0.081 +23,-0.132 +24,-0.304 +25,0.035 +26,-0.587 +27,0.716 +28,-0.884 +29,-0.243 +30,-0.788 +31,-0.762 +32,1.586 +33,0.083 +34,0.015 +35,-2.170 +36,1.006 +37,-0.005 +38,-0.636 +39,-0.044 +40,-0.132 +41,-0.685 +42,0.039 +43,0.422 +44,-0.727 +45,0.104 +46,1.443 +47,0.886 +48,1.011 +49,0.527 +50,0.462 +51,-0.433 +52,-1.914 +53,0.301 +54,1.815 +55,1.217 +56,-0.115 +57,-1.060 +58,0.229 +59,-0.760 +60,-0.449 +61,0.357 +62,0.796 +63,-0.364 +64,2.562 +65,-0.869 +66,-0.096 +67,-0.306 +68,-0.477 +69,-1.320 +70,-0.042 +71,0.333 +72,-1.048 +73,0.647 +74,-1.036 +75,0.301 +76,-1.407 +77,0.994 +78,0.990 +79,0.099 +80,2.955 +81,-0.666 +82,1.038 +83,-0.439 +84,-0.005 +85,0.289 +86,-0.335 +87,0.730 +88,1.049 +89,0.526 +90,-1.530 +91,0.917 +92,-0.689 +93,-0.793 +94,0.474 +95,-0.420 +96,-0.837 +97,-0.016 +98,-0.557 +99,-0.008 +100,-0.966 +101,-0.432 +102,-0.183 +103,-0.120 +104,-1.155 +105,-0.635 +106,0.134 +107,1.861 +108,0.555 +109,1.179 +110,0.452 +111,0.460 +112,0.990 +113,1.008 +114,-0.706 +115,0.498 +116,1.337 +117,-0.366 +118,1.992 +119,-0.531 +120,-0.694 +121,-0.765 +122,-0.451 +123,-1.281 +124,-1.219 +125,-0.046 +126,0.097 +127,-2.935 +128,-2.311 +129,0.045 +130,0.016 +131,0.245 +132,-0.380 +133,-0.766 +134,-1.039 +135,0.868 +136,0.298 +137,-0.189 +138,0.392 +139,0.131 +140,-1.785 +141,0.737 +142,-1.448 +143,1.123 +144,-0.909 +145,-0.660 +146,-0.638 +147,-1.099 +148,-0.879 +149,1.536 +150,-0.180 +151,-0.628 +152,2.692 +153,-0.304 +154,-1.045 +155,0.820 +156,-1.333 +157,2.270 +158,-1.008 +159,2.608 +160,0.418 +161,-0.603 +162,-0.362 +163,-0.809 +164,-0.551 +165,-0.933 +166,0.574 +167,-1.764 +168,0.904 +169,1.198 +170,-0.584 +171,-1.470 +172,-0.119 +173,-1.664 +174,0.685 +175,-0.650 +176,1.600 +177,0.358 +178,0.735 +179,-0.931 +180,0.986 +181,-0.190 +182,0.854 +183,0.905 +184,0.695 +185,0.060 +186,-0.618 +187,0.688 +188,-1.383 +189,0.058 +190,-0.603 +191,-1.218 +192,-1.540 +193,-0.008 +194,0.510 +195,0.744 +196,0.678 +197,0.572 +198,-0.165 +199,-0.450 +200,2.141 +201,-2.271 +202,-1.551 +203,-0.130 +204,-2.008 +205,-0.711 +206,0.730 +207,-0.090 +208,0.317 +209,-0.493 +210,-0.485 +211,-0.780 +212,-0.617 +213,-0.849 +214,-1.003 +215,-1.163 +216,-1.206 +217,-0.761 +218,0.952 +219,0.115 +220,0.528 +221,1.192 +222,-0.291 +223,0.499 +224,-0.611 +225,-0.688 +226,0.718 +227,-1.049 +228,1.310 +229,-2.257 +230,-0.617 +231,1.853 +232,-0.184 +233,-0.193 +234,0.758 +235,0.969 +236,1.172 +237,-0.118 +238,-0.516 +239,0.382 +240,0.500 +241,0.218 +242,-1.436 +243,-1.878 +244,-1.911 +245,-0.315 +246,0.198 +247,0.339 +248,0.350 +249,0.701 +250,-0.967 +251,0.299 +252,1.117 +253,0.851 +254,-0.446 +255,-0.796 +256,-1.409 +257,0.794 +258,1.060 +259,0.147 +260,-1.221 +261,-1.098 +262,0.226 +263,-0.124 +264,0.056 +265,0.147 +266,-1.043 +267,-1.660 +268,0.457 +269,0.981 +270,-1.734 +271,-0.198 +272,1.350 +273,-1.448 +274,0.032 +275,-0.048 +276,0.707 +277,-1.022 +278,-0.111 +279,0.456 +280,-1.592 +281,-0.710 +282,-0.708 +283,-1.175 +284,-0.002 +285,-1.368 +286,1.338 +287,-0.623 +288,0.693 +289,-0.605 +290,0.072 +291,-1.486 +292,-0.304 +293,-1.145 +294,0.613 +295,0.931 +296,-0.200 +297,1.687 +298,0.103 +299,-0.270 +300,-0.901 +301,0.977 +302,-0.846 +303,-0.747 +304,0.682 +305,-0.988 +306,-0.749 +307,1.374 +308,0.592 +309,-0.625 +310,0.277 +311,-0.826 +312,1.694 +313,0.114 +314,-0.504 +315,0.765 +316,0.792 +317,-2.622 +318,1.347 +319,-0.973 +320,-0.791 +321,-0.643 +322,-0.883 +323,-0.272 +324,-0.613 +325,0.579 +326,0.070 +327,-1.330 +328,0.848 +329,-0.593 +330,-0.070 +331,-1.864 +332,0.256 +333,1.218 +334,0.454 +335,0.490 +336,-1.565 +337,0.258 +338,-2.182 +339,1.401 +340,0.594 +341,-0.208 +342,-0.356 +343,-0.127 +344,0.975 +345,-1.403 +346,0.848 +347,1.885 +348,-0.912 +349,0.974 +350,1.947 +351,-0.739 +352,0.594 +353,0.677 +354,0.729 +355,-0.973 +356,0.869 +357,-0.092 +358,0.655 +359,-0.257 +360,0.329 +361,2.396 +362,-1.787 +363,-0.943 +364,-0.561 +365,-0.135 +366,0.835 +367,0.732 +368,-0.203 +369,0.648 +370,0.369 +371,2.454 +372,-1.888 +373,1.157 +374,-0.174 +375,-0.700 +376,0.074 +377,-1.195 +378,0.966 +379,-0.548 +380,1.142 +381,0.772 +382,0.463 +383,0.231 +384,0.014 +385,0.498 +386,0.302 +387,0.049 +388,0.829 +389,-0.855 +390,-1.735 +391,0.725 +392,-0.124 +393,-0.225 +394,1.570 +395,2.067 +396,-0.499 +397,1.686 +398,1.006 +399,0.213 +400,-0.175 +401,0.492 +402,-1.396 +403,-0.715 +404,0.398 +405,0.360 +406,-1.442 +407,-0.308 +408,-1.236 +409,-0.606 +410,-0.376 +411,0.669 +412,-1.056 +413,-0.432 +414,1.001 +415,0.409 +416,0.282 +417,-0.912 +418,-0.969 +419,1.631 +420,-0.786 +421,-0.438 +422,-1.133 +423,-0.508 +424,1.573 +425,-0.607 +426,-0.412 +427,-1.617 +428,-0.316 +429,-0.374 +430,-1.240 +431,0.913 +432,-0.099 +433,1.301 +434,-0.335 +435,-0.575 +436,-0.428 +437,-0.049 +438,0.825 +439,0.202 +440,-1.757 +441,-0.628 +442,-0.930 +443,0.400 +444,-0.328 +445,-0.595 +446,-0.396 +447,0.352 +448,0.070 +449,-1.184 +450,-0.010 +451,0.401 +452,1.245 +453,0.472 +454,0.998 +455,-0.037 +456,-0.349 +457,-1.302 +458,-0.032 +459,0.352 +460,0.508 +461,-1.558 +462,0.652 +463,1.534 +464,0.781 +465,0.332 +466,-1.455 +467,-0.600 +468,-1.690 +469,1.585 +470,-1.369 +471,-1.312 +472,-0.242 +473,-0.479 +474,-0.869 +475,0.010 +476,-0.550 +477,-1.705 +478,-1.412 +479,-0.896 +480,0.518 +481,1.178 +482,-0.908 +483,0.304 +484,-0.704 +485,-1.059 +486,-2.201 +487,1.103 +488,0.952 +489,1.381 +490,0.205 +491,0.092 +492,-1.273 +493,0.845 +494,1.110 +495,0.334 +496,-0.301 +497,-1.725 +498,1.013 +499,-0.468 +500,3.060 +501,-0.654 +502,1.546 +503,0.913 +504,1.281 +505,0.446 +506,-0.114 +507,-1.410 +508,0.593 +509,-2.125 +510,-0.812 +511,0.314 +512,-0.620 +513,-1.468 +514,-1.545 +515,-0.374 +516,-0.868 +517,0.457 +518,1.019 +519,-1.115 +520,0.675 +521,-0.069 +522,-0.853 +523,-1.406 +524,0.558 +525,-1.451 +526,-0.063 +527,1.018 +528,-0.436 +529,1.724 +530,-1.324 +531,-1.230 +532,-1.628 +533,0.524 +534,0.839 +535,0.484 +536,-0.542 +537,-0.277 +538,0.698 +539,0.824 +540,-1.002 +541,-1.530 +542,1.241 +543,-0.236 +544,0.867 +545,0.534 +546,2.034 +547,1.207 +548,-0.265 +549,0.737 +550,0.543 +551,0.451 +552,-0.332 +553,0.405 +554,0.894 +555,0.126 +556,1.300 +557,-0.547 +558,-0.166 +559,-0.930 +560,0.475 +561,1.257 +562,1.084 +563,-0.292 +564,1.027 +565,3.345 +566,0.280 +567,0.398 +568,-0.447 +569,0.387 +570,0.903 +571,0.640 +572,-1.580 +573,-1.507 +574,-0.324 +575,-0.315 +576,2.593 +577,0.355 +578,0.415 +579,0.424 +580,-2.144 +581,1.097 +582,1.286 +583,0.392 +584,-1.234 +585,-1.252 +586,2.504 +587,0.051 +588,2.169 +589,1.451 +590,0.993 +591,0.910 +592,0.769 +593,-0.641 +594,-0.060 +595,0.196 +596,0.702 +597,0.386 +598,-0.247 +599,-0.245 +600,1.253 +601,-0.044 +602,0.309 +603,-0.326 +604,1.023 +605,-0.276 +606,-0.430 +607,-1.434 +608,-0.299 +609,0.109 +610,0.657 +611,0.107 +612,-0.282 +613,-0.097 +614,-0.463 +615,0.247 +616,-1.608 +617,0.004 +618,-2.471 +619,1.060 +620,0.458 +621,-0.013 +622,1.068 +623,-0.746 +624,0.384 +625,1.091 +626,-0.219 +627,-0.430 +628,0.825 +629,1.188 +630,-0.023 +631,1.323 +632,0.516 +633,-1.026 +634,-1.114 +635,-0.318 +636,0.899 +637,-0.720 +638,-0.136 +639,0.682 +640,-1.422 +641,0.688 +642,-0.287 +643,1.500 +644,-0.846 +645,0.207 +646,1.596 +647,-0.199 +648,0.737 +649,-1.728 +650,0.533 +651,-1.188 +652,-0.466 +653,-1.741 +654,-1.430 +655,-0.555 +656,0.302 +657,-0.480 +658,-0.480 +659,0.274 +660,0.319 +661,-1.099 +662,-1.211 +663,-0.339 +664,-0.607 +665,1.006 +666,-1.736 +667,-0.783 +668,-1.377 +669,0.674 +670,-0.585 +671,-0.205 +672,-0.135 +673,0.055 +674,1.516 +675,-0.356 +676,1.119 +677,1.031 +678,0.753 +679,-0.623 +680,0.134 +681,0.655 +682,1.153 +683,0.039 +684,-0.394 +685,1.313 +686,-1.502 +687,0.563 +688,-0.323 +689,-0.052 +690,-1.220 +691,0.086 +692,1.187 +693,0.834 +694,-0.033 +695,0.235 +696,0.703 +697,0.350 +698,0.835 +699,-0.583 +700,-0.428 +701,0.550 +702,-0.966 +703,-0.056 +704,1.552 +705,-1.071 +706,-0.187 +707,-0.088 +708,-0.079 +709,1.417 +710,-0.454 +711,-2.220 +712,-1.404 +713,0.267 +714,0.064 +715,1.262 +716,0.882 +717,-0.254 +718,-0.153 +719,0.131 +720,1.061 +721,-1.577 +722,1.141 +723,-0.840 +724,-0.479 +725,-1.027 +726,-1.016 +727,1.178 +728,0.001 +729,0.192 +730,0.252 +731,-0.024 +732,0.136 +733,-1.473 +734,0.416 +735,0.828 +736,0.597 +737,0.732 +738,-1.587 +739,1.081 +740,0.811 +741,0.136 +742,0.140 +743,-0.508 +744,0.195 +745,-0.559 +746,-1.385 +747,2.002 +748,-0.243 +749,0.534 +750,-1.411 +751,1.154 +752,-1.425 +753,0.882 +754,-0.317 +755,0.513 +756,1.204 +757,-1.722 +758,-0.625 +759,2.186 +760,-0.818 +761,0.630 +762,-2.164 +763,0.420 +764,-0.366 +765,-0.709 +766,-0.237 +767,0.893 +768,0.165 +769,-0.084 +770,-0.922 +771,0.759 +772,-1.236 +773,0.550 +774,1.212 +775,1.033 +776,0.184 +777,1.560 +778,-0.094 +779,0.318 +780,0.528 +781,-1.321 +782,0.563 +783,2.731 +784,0.356 +785,0.849 +786,-0.787 +787,1.484 +788,0.888 +789,-0.514 +790,1.565 +791,2.129 +792,0.885 +793,0.734 +794,-0.008 +795,-0.050 +796,-0.382 +797,1.542 +798,-0.842 +799,0.856 +800,-0.676 +801,1.253 +802,0.432 +803,1.364 +804,3.029 +805,-0.054 +806,-1.195 +807,0.014 +808,-1.670 +809,-0.570 +810,-1.971 +811,0.075 +812,-0.396 +813,1.270 +814,1.871 +815,-1.122 +816,-1.863 +817,0.536 +818,1.009 +819,0.293 +820,-0.150 +821,0.513 +822,-1.078 +823,-1.232 +824,-0.142 +825,-0.745 +826,-0.116 +827,0.665 +828,-1.512 +829,1.362 +830,-0.242 +831,0.238 +832,-0.798 +833,0.869 +834,0.982 +835,1.286 +836,-0.049 +837,-0.428 +838,0.944 +839,0.236 +840,0.153 +841,-1.260 +842,-1.495 +843,2.064 +844,-0.589 +845,-0.171 +846,0.292 +847,-0.099 +848,-0.680 +849,-0.458 +850,1.448 +851,0.466 +852,0.443 +853,0.652 +854,-0.093 +855,0.005 +856,0.518 +857,-0.331 +858,-0.224 +859,-0.165 +860,0.177 +861,-0.533 +862,-0.761 +863,1.077 +864,-1.684 +865,1.545 +866,1.159 +867,-1.965 +868,-1.431 +869,0.911 +870,1.489 +871,1.967 +872,1.092 +873,1.949 +874,0.766 +875,0.584 +876,-0.845 +877,-0.361 +878,-0.548 +879,0.615 +880,-0.149 +881,0.852 +882,-1.474 +883,-0.508 +884,-0.422 +885,-1.251 +886,1.956 +887,-0.445 +888,-0.653 +889,-1.050 +890,0.372 +891,-0.510 +892,-0.327 +893,-0.493 +894,1.168 +895,-0.504 +896,1.296 +897,-1.061 +898,-0.132 +899,0.574 +900,-0.023 +901,-0.674 +902,-0.307 +903,1.442 +904,-0.400 +905,0.199 +906,-1.176 +907,-0.422 +908,-1.345 +909,1.497 +910,-1.470 +911,0.801 +912,0.586 +913,-0.659 +914,2.355 +915,0.101 +916,0.121 +917,-0.495 +918,-0.488 +919,-1.502 +920,1.737 +921,-0.617 +922,1.465 +923,0.057 +924,-0.104 +925,0.464 +926,0.109 +927,0.303 +928,0.483 +929,1.349 +930,-0.709 +931,-0.933 +932,-0.312 +933,-1.815 +934,-1.130 +935,0.376 +936,-0.509 +937,-0.221 +938,-0.023 +939,-0.023 +940,0.630 +941,-0.106 +942,-0.666 +943,0.719 +944,-1.396 +945,-0.513 +946,-0.511 +947,-1.655 +948,-1.423 +949,-0.113 +950,1.726 +951,0.688 +952,1.680 +953,0.327 +954,0.504 +955,-0.290 +956,0.577 +957,0.036 +958,0.628 +959,1.836 +960,-0.246 +961,0.223 +962,-1.252 +963,-1.119 +964,0.277 +965,0.081 +966,0.875 +967,-0.027 +968,1.104 +969,0.628 +970,-0.506 +971,0.314 +972,-2.234 +973,0.374 +974,-1.509 +975,-2.263 +976,2.164 +977,-0.131 +978,-0.419 +979,1.525 +980,-0.934 +981,-0.097 +982,0.559 +983,0.548 +984,-0.893 +985,-1.011 +986,-1.778 +987,1.636 +988,-0.623 +989,1.787 +990,0.152 +991,0.121 +992,0.608 +993,1.572 +994,-0.150 +995,1.294 +996,1.482 +997,-0.055 +998,-1.248 +999,0.162 +1000,2.266 +1001,0.640 +1002,1.259 +1003,2.287 +1004,-0.642 +1005,-0.116 +1006,1.002 +1007,0.186 +1008,0.304 +1009,-1.412 +1010,0.994 +1011,0.159 +1012,1.695 +1013,-0.066 +1014,-0.262 +1015,-0.670 +1016,0.058 +1017,0.674 +1018,-0.293 +1019,-0.887 +1020,1.271 +1021,0.992 +1022,-0.204 +1023,0.765 diff --git a/CRVConditions/test/randomTimeOffsets.py b/CRVConditions/test/randomTimeOffsets.py new file mode 100644 index 0000000000..32d188c782 --- /dev/null +++ b/CRVConditions/test/randomTimeOffsets.py @@ -0,0 +1,14 @@ +import random +import sys + +if len(sys.argv) != 2: + print("usage \"randomTimeOffsets nChannels\"") + print("nChannels=22016 when using the full CRV\"") + sys.exit() + +nChannels=int(sys.argv[1]) + +print("TABLE CRVTime") +print("#channel,timeOffset") +for channel in range(nChannels): + print("{},{:.3f}".format(channel,random.gauss(0, 1))) diff --git a/CRVResponse/fcl/prolog_v11.fcl b/CRVResponse/fcl/prolog_v11.fcl index 123102534a..e2b9ecc53d 100644 --- a/CRVResponse/fcl/prolog_v11.fcl +++ b/CRVResponse/fcl/prolog_v11.fcl @@ -62,12 +62,19 @@ BEGIN_PROLOG 39400,39400,39400,39400, //D1...4 0,0,39400,39400] //C1...4 - photonYieldScaleFactor : 0.42 //scale factor applied to scintillation yields to mimic aging + photonYieldScaleFactor : 0.42 //scale factor applied to photon yields to mimic aging //0.42 results in 28.6 PE/SiPM @ 1 m away from SiPM (expected in 2025) //used in SU2020 - photonYieldVariationSigma : 0.05 //gaussian distribution with sigma equal to 5% of the mean - photonYieldVariationCutoffLow :-0.2 //the scintillation yield variation is cut off at 20% below the mean - photonYieldVariationCutoffHigh : 0.2 //the scintillation yield variation is cut off at 20% above the mean + photonYieldVariationScale : 0.05 //scale factor for the photon yield variation + //examples: + //-if a database table of measured deviations from a nominal photon yield is used, + // the scale factor should be set to 1.0 (i.e. no scaling) + //-if a database table of a random gaussian distribution + // with a sigma equal to 100% of the nominal photon yied is used + // and one wants to run a simulation with a sigma of 5% of the nominal photon yield, + // then the scale factor should be set to 0.05 (i.e. scaled to a sigma of 5%) + photonYieldVariationCutoffLow :-0.2 //the photon yield variation is cut off at 20% below the mean + photonYieldVariationCutoffHigh : 0.2 //the photon yield variation is cut off at 20% above the mean digitizationStart : 400.0 //400ns digitizationEnd : 1750.0 //1750ns digitizationStartMargin : 50.0 //50ns diff --git a/CRVResponse/src/CrvPhotonGenerator_module.cc b/CRVResponse/src/CrvPhotonGenerator_module.cc index 9fe335fc67..d3f13ccfed 100644 --- a/CRVResponse/src/CrvPhotonGenerator_module.cc +++ b/CRVResponse/src/CrvPhotonGenerator_module.cc @@ -65,8 +65,8 @@ namespace mu2e fhicl::Sequence reflectors{ Name("reflectors"), Comment("location of reflectors at Crv sectors")}; fhicl::Sequence lookupTableFileNames{ Name("lookupTableFileNames"), Comment("lookup tables for Crv sectors")}; fhicl::Sequence scintillationYields{ Name("scintillationYields"), Comment("scintillation yields at Crv sectors")}; - fhicl::Atom photonYieldScaleFactor{ Name("photonYieldScaleFactor"), Comment("scale factor for light yield")}; - fhicl::Atom photonYieldVariationSigma{ Name("photonYieldVariationSigma"),Comment("sigma of gaussian variation of scintillation yield")}; + fhicl::Atom photonYieldScaleFactor{ Name("photonYieldScaleFactor"), Comment("global scale factor for the photon yield")}; + fhicl::Atom photonYieldVariationScale{ Name("photonYieldVariationScale"),Comment("scale factor of the photon yield variation")}; fhicl::Atom photonYieldVariationCutoffLow{ Name("photonYieldVariationCutoffLow"),Comment("lower cutoff at photon yield variation")}; fhicl::Atom photonYieldVariationCutoffHigh{ Name("photonYieldVariationCutoffHigh"),Comment("upper cutoff at photon yield variation")}; fhicl::Atom digitizationStart{ Name("digitizationStart"), Comment("start of digitization")}; @@ -97,7 +97,7 @@ namespace mu2e double _photonYieldScaleFactor; mu2e::ProditionsHandle _photonYieldVariationVector; - double _photonYieldVariationSigma; + double _photonYieldVariationScale; double _photonYieldVariationCutoffLow; double _photonYieldVariationCutoffHigh; @@ -156,7 +156,7 @@ namespace mu2e _lookupTableFileNames(conf().lookupTableFileNames()), _scintillationYields(conf().scintillationYields()), _photonYieldScaleFactor(conf().photonYieldScaleFactor()), - _photonYieldVariationSigma(conf().photonYieldVariationSigma()), + _photonYieldVariationScale(conf().photonYieldVariationScale()), _photonYieldVariationCutoffLow(conf().photonYieldVariationCutoffLow()), _photonYieldVariationCutoffHigh(conf().photonYieldVariationCutoffHigh()), _digitizationStart(conf().digitizationStart()), @@ -325,7 +325,7 @@ namespace mu2e for(size_t SiPM=0; SiPM_photonYieldVariationCutoffHigh) photonYieldDeviation=_photonYieldVariationCutoffHigh; photonYieldDeviation = (photonYieldDeviation+1.0)*_photonYieldScaleFactor; //global photon yield scale factor for e.g. aging diff --git a/CRVResponse/test/wideband/wideband4modules.fcl b/CRVResponse/test/wideband/wideband4modules.fcl index bfd9ca79d7..5b8ddf1122 100644 --- a/CRVResponse/test/wideband/wideband4modules.fcl +++ b/CRVResponse/test/wideband/wideband4modules.fcl @@ -96,7 +96,7 @@ physics.producers.EWMProducer.SpillType : 0 physics.producers.CrvSteps.stepPointsModuleLabels : ["g4run"] physics.producers.CrvPhotons.crvStepModuleLabels : ["CrvSteps"] physics.producers.CrvPhotons.crvStepProcessNames : ["CrvWideband4ModulesSim"] -physics.producers.CrvPhotons.photonYieldVariationSigma : 0.02 //gaussian distribution with sigma equal to 2.0% of the mean +physics.producers.CrvPhotons.photonYieldVariationScale : 0.02 //gaussian distribution with sigma equal to 2.0% of the nominal photon yield physics.producers.CrvPhotons.photonYieldScaleFactor : 1.01 //1.0 works with cross talk of 0.05 physics.producers.CrvPhotons.CRVSectors : [ "W1", "W2", "W3", "W4"] physics.producers.CrvPhotons.reflectors : [ 0, 0, 0, 0] From 91845d7dd1974aab240083c1680d041a57322af4 Mon Sep 17 00:00:00 2001 From: GIANANTONIO PEZZULLO Date: Wed, 17 Jan 2024 11:16:53 -0600 Subject: [PATCH 069/213] now copying also the fcl and data files --- CMakeLists.txt | 4 +- CRVConditions/CMakeLists.txt | 2 + CRVReco/CMakeLists.txt | 2 + CRVResponse/CMakeLists.txt | 17 + CalPatRec/CMakeLists.txt | 14 + CaloCluster/CMakeLists.txt | 2 + CaloConditions/CMakeLists.txt | 3 + CaloFilters/CMakeLists.txt | 4 + CaloMC/CMakeLists.txt | 2 + CaloReco/CMakeLists.txt | 4 + CommonMC/CMakeLists.txt | 2 + Compression/CMakeLists.txt | 2 + ConditionsService/CMakeLists.txt | 32 ++ CosmicReco/CMakeLists.txt | 2 + DAQConditions/CMakeLists.txt | 2 + DbService/CMakeLists.txt | 4 + EventGenerator/CMakeLists.txt | 11 + EventMixing/CMakeLists.txt | 2 + ExtinctionMonitorFNAL/CMakeLists.txt | 2 + Filters/CMakeLists.txt | 2 + GlobalConstantsService/CMakeLists.txt | 3 + Mu2eG4/CMakeLists.txt | 700 ++++++++++++++++++++++++++ Mu2eKinKal/CMakeLists.txt | 13 + Mu2eReco/CMakeLists.txt | 1 + Mu2eUtilities/CMakeLists.txt | 8 + ParticleID/CMakeLists.txt | 3 + Print/CMakeLists.txt | 20 + ProditionsService/CMakeLists.txt | 2 + STMConditions/CMakeLists.txt | 2 + STMReco/CMakeLists.txt | 13 + SimulationConditions/CMakeLists.txt | 2 + TEveEventDisplay/CMakeLists.txt | 3 + TrackCaloMatching/CMakeLists.txt | 2 + TrackerConditions/CMakeLists.txt | 14 + TrackerMC/CMakeLists.txt | 3 + Trigger/CMakeLists.txt | 2 + TrkDiag/CMakeLists.txt | 5 + TrkFilters/CMakeLists.txt | 2 + TrkHitReco/CMakeLists.txt | 18 + TrkPatRec/CMakeLists.txt | 15 + TrkReco/CMakeLists.txt | 4 + Validation/CMakeLists.txt | 2 + fcl/CMakeLists.txt | 10 + ups_install/CMakeLists.txt | 12 + 44 files changed, 972 insertions(+), 2 deletions(-) create mode 100644 fcl/CMakeLists.txt diff --git a/CMakeLists.txt b/CMakeLists.txt index a40808b58d..9fb6420b78 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -84,6 +84,7 @@ add_subdirectory(EventMixing) add_subdirectory(ExternalShieldingGeom) add_subdirectory(ExtinctionMonitorFNAL) add_subdirectory(Filters) +add_subdirectory(fcl) add_subdirectory(GeneralUtilities) add_subdirectory(GeometryService) add_subdirectory(GeomPrimitives) @@ -140,6 +141,5 @@ add_subdirectory(ups_install) add_subdirectory(UtilityModules) add_subdirectory(Validation) -install_fhicl(SUBDIRS fcl SUBDIRNAME Offline/fcl) -cet_cmake_config() \ No newline at end of file +cet_cmake_config() diff --git a/CRVConditions/CMakeLists.txt b/CRVConditions/CMakeLists.txt index ec1f537c51..bf81dd1926 100644 --- a/CRVConditions/CMakeLists.txt +++ b/CRVConditions/CMakeLists.txt @@ -13,6 +13,8 @@ cet_make_library( Offline::GeometryService Offline::Mu2eInterfaces ) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/fcl/prolog.fcl ${CURRENT_BINARY_DIR} fcl/prolog.fcl) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/data/nominal.txt ${CURRENT_BINARY_DIR} data/nominal.txt) install_source(SUBDIRS src) install_headers(USE_PROJECT_NAME SUBDIRS inc) diff --git a/CRVReco/CMakeLists.txt b/CRVReco/CMakeLists.txt index df4336f683..ea2d64990a 100644 --- a/CRVReco/CMakeLists.txt +++ b/CRVReco/CMakeLists.txt @@ -35,6 +35,8 @@ cet_build_plugin(CrvRecoPulsesFinder art::module Offline::RecoDataProducts ) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/fcl/prolog_v11.fcl ${CURRENT_BINARY_DIR} fcl/prolog_v11.fcl) + install_source(SUBDIRS src) install_headers(USE_PROJECT_NAME SUBDIRS inc) install_fhicl(SUBDIRS fcl SUBDIRNAME Offline/CRVReco/fcl) diff --git a/CRVResponse/CMakeLists.txt b/CRVResponse/CMakeLists.txt index 7526845fe6..f223aff00d 100644 --- a/CRVResponse/CMakeLists.txt +++ b/CRVResponse/CMakeLists.txt @@ -162,6 +162,23 @@ cet_build_plugin(MakeCrvCoincidenceClusterMCAssns art::module Offline::MCDataProducts ) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/fcl/prolog.fcl ${CURRENT_BINARY_DIR} fcl/prolog.fcl) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/fcl/epilog_extracted.fcl ${CURRENT_BINARY_DIR} fcl/epilog_extracted.fcl ) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/fcl/epilog_extracted_v02.fcl ${CURRENT_BINARY_DIR} fcl/epilog_extracted_v02.fcl ) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/fcl/epilog_extracted_v03.fcl ${CURRENT_BINARY_DIR} fcl/epilog_extracted_v03.fcl ) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/fcl/prolog_extracted_v01.fcl ${CURRENT_BINARY_DIR} fcl/prolog_extracted_v01.fcl ) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/fcl/prolog_v03.fcl ${CURRENT_BINARY_DIR} fcl/prolog_v03.fcl ) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/fcl/prolog_v05.fcl ${CURRENT_BINARY_DIR} fcl/prolog_v05.fcl ) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/fcl/prolog_v06.fcl ${CURRENT_BINARY_DIR} fcl/prolog_v06.fcl ) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/fcl/prolog_v07.fcl ${CURRENT_BINARY_DIR} fcl/prolog_v07.fcl ) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/fcl/prolog_v08.fcl ${CURRENT_BINARY_DIR} fcl/prolog_v08.fcl ) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/fcl/prolog_v09.fcl ${CURRENT_BINARY_DIR} fcl/prolog_v09.fcl ) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/fcl/prolog_v10.fcl ${CURRENT_BINARY_DIR} fcl/prolog_v10.fcl ) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/fcl/prolog_v11.fcl ${CURRENT_BINARY_DIR} fcl/prolog_v11.fcl ) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/fcl/singlePEWaveform.txt ${CURRENT_BINARY_DIR} fcl/singlePEWaveform.txt ) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/fcl/singlePEWaveform_v2.txt ${CURRENT_BINARY_DIR} fcl/singlePEWaveform_v2.txt ) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/fcl/singlePEWaveform_v3.txt ${CURRENT_BINARY_DIR} fcl/singlePEWaveform_v3.txt ) + install_source(SUBDIRS src) install_headers(USE_PROJECT_NAME SUBDIRS inc) install_fhicl(SUBDIRS fcl SUBDIRNAME Offline/CRVResponse/fcl) diff --git a/CalPatRec/CMakeLists.txt b/CalPatRec/CMakeLists.txt index 624a893c29..2e82fd12cf 100644 --- a/CalPatRec/CMakeLists.txt +++ b/CalPatRec/CMakeLists.txt @@ -208,6 +208,20 @@ art_dictionary( NO_CHECK_CLASS_VERSION # For some reason this segfaults DICTIONARY_LIBRARIES Offline::CalPatRec ) + +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/fcl/prolog.fcl ${CURRENT_BINARY_DIR} fcl/prolog.fcl) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/fcl/prolog_common.fcl ${CURRENT_BINARY_DIR} fcl/prolog_common.fcl) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/data/v5_7_7/cpr_qual_logfcons_1_lin.tab ${CURRENT_BINARY_DIR} data/v5_7_7/cpr_qual_logfcons_1_lin.tab) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/data/v5_7_7/MLP_weights_chi2d_1_lin.xml ${CURRENT_BINARY_DIR} data/v5_7_7/MLP_weights_chi2d_1_lin.xml) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/data/v5_7_7/MLP_weights_chi2d_2_exp.xml ${CURRENT_BINARY_DIR} data/v5_7_7/MLP_weights_chi2d_2_exp.xml) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/data/v5_7_7/MLP_weights_logfcons_0_uni.xml ${CURRENT_BINARY_DIR} data/v5_7_7/MLP_weights_logfcons_0_uni.xml) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/data/v5_7_7/MLP_weights_logfcons_1_lin.xml ${CURRENT_BINARY_DIR} data/v5_7_7/MLP_weights_logfcons_1_lin.xml) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/data/v5_7_7/MLP_weights_logfcons_2_exp.xml ${CURRENT_BINARY_DIR} data/v5_7_7/MLP_weights_logfcons_2_exp.xml) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/data/v5_7_7/MLP_weights_logfcons_3_pol.xml ${CURRENT_BINARY_DIR} data/v5_7_7/MLP_weights_logfcons_3_pol.xml) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/data/v5_7_7/MLP_weights_logfcons_4_exp.xml ${CURRENT_BINARY_DIR} data/v5_7_7/MLP_weights_logfcons_4_exp.xml) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/data/v5_7_7/MLP_weights_trkpatrec_logfcons_1_uni.xml ${CURRENT_BINARY_DIR} data/v5_7_7/MLP_weights_trkpatrec_logfcons_1_uni.xml) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/data/v5_7_7/tpr_qual_logfcons_2_exp.tab ${CURRENT_BINARY_DIR} data/v5_7_7/tpr_qual_logfcons_2_exp.tab) + install_source(SUBDIRS src) install_headers(USE_PROJECT_NAME SUBDIRS inc) install_fhicl(SUBDIRS fcl SUBDIRNAME Offline/CalPatRec/fcl) diff --git a/CaloCluster/CMakeLists.txt b/CaloCluster/CMakeLists.txt index 5c96c694b7..3e7b635ff5 100644 --- a/CaloCluster/CMakeLists.txt +++ b/CaloCluster/CMakeLists.txt @@ -53,6 +53,8 @@ cet_build_plugin(CaloTrigger art::module Offline::RecoDataProducts ) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/fcl/prolog.fcl ${CURRENT_BINARY_DIR} fcl/prolog.fcl) + install_source(SUBDIRS src) install_headers(USE_PROJECT_NAME SUBDIRS inc) install_fhicl(SUBDIRS fcl SUBDIRNAME Offline/CaloCluster/fcl) diff --git a/CaloConditions/CMakeLists.txt b/CaloConditions/CMakeLists.txt index 9978399aab..580f8bfd9e 100644 --- a/CaloConditions/CMakeLists.txt +++ b/CaloConditions/CMakeLists.txt @@ -16,6 +16,9 @@ cet_make_library( Offline::ProditionsService ) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/fcl/prolog.fcl ${CURRENT_BINARY_DIR} fcl/prolog.fcl) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/data/nominal.txt ${CURRENT_BINARY_DIR} data/nominal.txt) + install_source(SUBDIRS src) install_headers(USE_PROJECT_NAME SUBDIRS inc) install_fhicl(SUBDIRS fcl SUBDIRNAME Offline/CaloConditions/fcl) diff --git a/CaloFilters/CMakeLists.txt b/CaloFilters/CMakeLists.txt index ebe2e6830a..5efa4a8a52 100644 --- a/CaloFilters/CMakeLists.txt +++ b/CaloFilters/CMakeLists.txt @@ -71,5 +71,9 @@ cet_build_plugin(FilterEcalNNTrigger art::module Offline::RecoDataProducts ) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/data/ce_bkg_20_BDT.weights.xml ${CURRENT_BINARY_DIR} data/ce_bkg_20_BDT.weights.xml) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/data/ce_bkg_ecal_20_BDT.weights.xml ${CURRENT_BINARY_DIR} data/ce_bkg_ecal_20_BDT.weights.xml) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/data/CE_NN_ReLU.weights.xml ${CURRENT_BINARY_DIR} data/CE_NN_ReLU.weights.xml) + install_source(SUBDIRS src) install_fhicl(SUBDIRS fcl SUBDIRNAME Offline/CaloFilters/fcl) diff --git a/CaloMC/CMakeLists.txt b/CaloMC/CMakeLists.txt index c360e61e5b..a631ff4e95 100644 --- a/CaloMC/CMakeLists.txt +++ b/CaloMC/CMakeLists.txt @@ -85,6 +85,8 @@ cet_build_plugin(CaloShowerUpdater art::module Offline::MCDataProducts ) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/fcl/prolog.fcl ${CURRENT_BINARY_DIR} fcl/prolog.fcl) + install_source(SUBDIRS src) install_headers(USE_PROJECT_NAME SUBDIRS inc) install_fhicl(SUBDIRS fcl SUBDIRNAME Offline/CaloMC/fcl) diff --git a/CaloReco/CMakeLists.txt b/CaloReco/CMakeLists.txt index 1e1ff5c0d6..02202528d7 100644 --- a/CaloReco/CMakeLists.txt +++ b/CaloReco/CMakeLists.txt @@ -42,6 +42,10 @@ cet_build_plugin(CaloRecoDigiMaker art::module Offline::RecoDataProducts ) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/fcl/prolog.fcl ${CURRENT_BINARY_DIR} fcl/prolog.fcl) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/fcl/common.fcl ${CURRENT_BINARY_DIR} fcl/common.fcl) + + install_source(SUBDIRS src) install_headers(USE_PROJECT_NAME SUBDIRS inc) install_fhicl(SUBDIRS fcl SUBDIRNAME Offline/CaloReco/fcl) diff --git a/CommonMC/CMakeLists.txt b/CommonMC/CMakeLists.txt index 7dee19a0cf..4acb8c664e 100644 --- a/CommonMC/CMakeLists.txt +++ b/CommonMC/CMakeLists.txt @@ -81,5 +81,7 @@ cet_build_plugin(StoppedParticlesFinder art::module Offline::Mu2eUtilities ) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/fcl/prolog.fcl ${CURRENT_BINARY_DIR} fcl/prolog.fcl) + install_source(SUBDIRS src) install_fhicl(SUBDIRS fcl SUBDIRNAME Offline/CommonMC/fcl) diff --git a/Compression/CMakeLists.txt b/Compression/CMakeLists.txt index 743a523400..9eb04b1a0c 100644 --- a/Compression/CMakeLists.txt +++ b/Compression/CMakeLists.txt @@ -35,6 +35,8 @@ cet_build_plugin(CompressDigiMCs art::module Offline::Mu2eUtilities ) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/fcl/prolog.fcl ${CURRENT_BINARY_DIR} fcl/prolog.fcl) + install_source(SUBDIRS src) install_headers(USE_PROJECT_NAME SUBDIRS inc) install_fhicl(SUBDIRS fcl SUBDIRNAME Offline/Compression/fcl) diff --git a/ConditionsService/CMakeLists.txt b/ConditionsService/CMakeLists.txt index 0030a745aa..5171b97517 100644 --- a/ConditionsService/CMakeLists.txt +++ b/ConditionsService/CMakeLists.txt @@ -18,5 +18,37 @@ cet_build_plugin(ConditionsService art::service ) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/data/acDipoleTransmissionFunction.txt ${CURRENT_BINARY_DIR} data/acDipoleTransmissionFunction.txt ) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/data/conditions_01.txt ${CURRENT_BINARY_DIR} data/conditions_01.txt ) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/data/czarnecki_Al.tbl ${CURRENT_BINARY_DIR} data/czarnecki_Al.tbl ) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/data/czarnecki_szafron_Al_2016_tail.tbl ${CURRENT_BINARY_DIR} data/czarnecki_szafron_Al_2016_tail.tbl ) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/data/czarnecki_szafron_Al_2016.tbl ${CURRENT_BINARY_DIR} data/czarnecki_szafron_Al_2016.tbl ) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/data/czarnecki_Ti.tbl ${CURRENT_BINARY_DIR} data/czarnecki_Ti.tbl ) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/data/heeck_finer_binning_2016_szafron.tbl ${CURRENT_BINARY_DIR} data/heeck_finer_binning_2016_szafron.tbl ) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/data/Micheltbl.tbl ${CURRENT_BINARY_DIR} data/Micheltbl.tbl ) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/data/neutronSpectrum.txt ${CURRENT_BINARY_DIR} data/neutronSpectrum.txt ) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/data/neutSpectrumDocdb1619.txt ${CURRENT_BINARY_DIR} data/neutSpectrumDocdb1619.txt ) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/data/photonSpectrumMuonicAlCapture_v1.txt ${CURRENT_BINARY_DIR} data/photonSpectrumMuonicAlCapture_v1.txt ) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/data/pid_ele_dt_v4_2_4.tab ${CURRENT_BINARY_DIR} data/pid_ele_dt_v4_2_4.tab ) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/data/pid_ele_ep_vs_path_v4_2_4.tab ${CURRENT_BINARY_DIR} data/pid_ele_ep_vs_path_v4_2_4.tab ) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/data/pid_ele_xs_v4_2_4.tab ${CURRENT_BINARY_DIR} data/pid_ele_xs_v4_2_4.tab ) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/data/pid_muo_dt_v4_2_4.tab ${CURRENT_BINARY_DIR} data/pid_muo_dt_v4_2_4.tab ) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/data/pid_muo_ep_vs_path_v4_2_4.tab ${CURRENT_BINARY_DIR} data/pid_muo_ep_vs_path_v4_2_4.tab ) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/data/pid_muo_xs_v4_2_4.tab ${CURRENT_BINARY_DIR} data/pid_muo_xs_v4_2_4.tab ) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/data/PlettNeutronSpectrum.txt ${CURRENT_BINARY_DIR} data/PlettNeutronSpectrum.txt ) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/data/SchroederNeutronSpectrum.txt ${CURRENT_BINARY_DIR} data/SchroederNeutronSpectrum.txt ) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/data/StoppedMuons.txt ${CURRENT_BINARY_DIR} data/StoppedMuons.txt ) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/data/szafron_mu2e_7615.tbl ${CURRENT_BINARY_DIR} data/szafron_mu2e_7615.tbl ) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/data/timeDelayDist.txt ${CURRENT_BINARY_DIR} data/timeDelayDist.txt ) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/data/watanabe.tbl ${CURRENT_BINARY_DIR} data/watanabe.tbl) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/data/v5_7_9/pid_ele_dedx.rtbl ${CURRENT_BINARY_DIR} data/v5_7_9/pid_ele_dedx.rtbl ) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/data/v5_7_9/pid_ele_dt.tbl ${CURRENT_BINARY_DIR} data/v5_7_9/pid_ele_dt.tbl ) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/data/v5_7_9/pid_ele_ep_vs_path.tbl ${CURRENT_BINARY_DIR} data/v5_7_9/pid_ele_ep_vs_path.tbl ) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/data/v5_7_9/pid_ele_xdrds.tbl ${CURRENT_BINARY_DIR} data/v5_7_9/pid_ele_xdrds.tbl ) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/data/v5_7_9/pid_muo_dedx.rtbl ${CURRENT_BINARY_DIR} data/v5_7_9/pid_muo_dedx.rtbl ) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/data/v5_7_9/pid_muo_dt.tbl ${CURRENT_BINARY_DIR} data/v5_7_9/pid_muo_dt.tbl ) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/data/v5_7_9/pid_muo_ep_vs_path.tbl ${CURRENT_BINARY_DIR} data/v5_7_9/pid_muo_ep_vs_path.tbl ) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/data/v5_7_9/pid_muo_xdrds.tbl ${CURRENT_BINARY_DIR} data/v5_7_9/pid_muo_xdrds.tbl ) + install_source(SUBDIRS src) install_headers(USE_PROJECT_NAME SUBDIRS inc) diff --git a/CosmicReco/CMakeLists.txt b/CosmicReco/CMakeLists.txt index b4b1ce8c61..2efc7cfb0e 100644 --- a/CosmicReco/CMakeLists.txt +++ b/CosmicReco/CMakeLists.txt @@ -163,6 +163,8 @@ cet_build_plugin(SimpleTimeCluster art::module Offline::TrkReco ) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/fcl/prolog.fcl ${CURRENT_BINARY_DIR} fcl/prolog.fcl) + install_source(SUBDIRS src) install_headers(USE_PROJECT_NAME SUBDIRS inc) install_fhicl(SUBDIRS fcl SUBDIRNAME Offline/CosmicReco/fcl) diff --git a/DAQConditions/CMakeLists.txt b/DAQConditions/CMakeLists.txt index 17e1f2e53e..c130c72081 100644 --- a/DAQConditions/CMakeLists.txt +++ b/DAQConditions/CMakeLists.txt @@ -10,6 +10,8 @@ cet_make_library( Offline::TrackerGeom ) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/fcl/prolog.fcl ${CURRENT_BINARY_DIR} fcl/prolog.fcl) + install_source(SUBDIRS src) install_headers(USE_PROJECT_NAME SUBDIRS inc) install_fhicl(SUBDIRS fcl SUBDIRNAME Offline/DAQConditions/fcl) diff --git a/DbService/CMakeLists.txt b/DbService/CMakeLists.txt index 4abebcbb48..a1c91fbc9d 100644 --- a/DbService/CMakeLists.txt +++ b/DbService/CMakeLists.txt @@ -49,6 +49,10 @@ cet_build_plugin(DbServiceTest art::module Offline::DbTables ) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/fcl/prolog.fcl ${CURRENT_BINARY_DIR} fcl/prolog.fcl) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/data/connections.txt ${CURRENT_BINARY_DIR} data/connections.txt) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/data/create.sql ${CURRENT_BINARY_DIR} data/create.sql) + install_source(SUBDIRS src) install_headers(USE_PROJECT_NAME SUBDIRS inc) install_fhicl(SUBDIRS fcl SUBDIRNAME Offline/DbService/fcl) diff --git a/EventGenerator/CMakeLists.txt b/EventGenerator/CMakeLists.txt index 12e1b97f3d..32d42b7664 100644 --- a/EventGenerator/CMakeLists.txt +++ b/EventGenerator/CMakeLists.txt @@ -569,6 +569,17 @@ cet_build_plugin(MuplusMichelGenerator art::tool Offline::Mu2eUtilities ) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/fcl/prolog.fcl ${CURRENT_BINARY_DIR} fcl/prolog.fcl) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/defaultConfigs/cosmicDYB.txt ${CURRENT_BINARY_DIR} defaultConfigs/cosmicDYB.txt ) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/defaultConfigs/defaultCRYconfig.txt ${CURRENT_BINARY_DIR} defaultConfigs/defaultCRYconfig.txt ) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/defaultConfigs/extractedCRYconfig.txt ${CURRENT_BINARY_DIR} defaultConfigs/extractedCRYconfig.txt) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/defaultConfigs/fromG4BLFile.txt ${CURRENT_BINARY_DIR} defaultConfigs/fromG4BLFile.txt ) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/defaultConfigs/muCRYconfig.txt ${CURRENT_BINARY_DIR} defaultConfigs/muCRYconfig.txt ) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/defaultConfigs/othersCRYconfig.txt ${CURRENT_BINARY_DIR} defaultConfigs/othersCRYconfig.txt ) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/defaultConfigs/particleGun.txt ${CURRENT_BINARY_DIR} defaultConfigs/particleGun.txt ) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/defaultConfigs/primaryProtonGun.txt ${CURRENT_BINARY_DIR} defaultConfigs/primaryProtonGun.txt ) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/defaultConfigs/surfaceCheck.txt ${CURRENT_BINARY_DIR} defaultConfigs/surfaceCheck.txt ) + install_source(SUBDIRS src) install_headers(USE_PROJECT_NAME SUBDIRS inc) install_fhicl(SUBDIRS fcl SUBDIRNAME Offline/EventGenerator/fcl) diff --git a/EventMixing/CMakeLists.txt b/EventMixing/CMakeLists.txt index 8bea5a5899..e1f432b256 100644 --- a/EventMixing/CMakeLists.txt +++ b/EventMixing/CMakeLists.txt @@ -51,6 +51,8 @@ cet_build_plugin(ResamplingMixer art::module Offline::SeedService ) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/fcl/prolog.fcl ${CURRENT_BINARY_DIR} fcl/prolog.fcl) + install_source(SUBDIRS src) install_headers(USE_PROJECT_NAME SUBDIRS inc) install_fhicl(SUBDIRS fcl SUBDIRNAME Offline/EventMixing/fcl) diff --git a/ExtinctionMonitorFNAL/CMakeLists.txt b/ExtinctionMonitorFNAL/CMakeLists.txt index 4c15b77427..845ae7f28a 100644 --- a/ExtinctionMonitorFNAL/CMakeLists.txt +++ b/ExtinctionMonitorFNAL/CMakeLists.txt @@ -7,4 +7,6 @@ add_subdirectory(Reconstruction) add_subdirectory(TruthAlgs) add_subdirectory(Utilities) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/fcl/prolog.fcl ${CURRENT_BINARY_DIR} fcl/prolog.fcl) + install_fhicl(SUBDIRS fcl SUBDIRNAME Offline/ExtinctionMonitorFNAL/fcl) diff --git a/Filters/CMakeLists.txt b/Filters/CMakeLists.txt index 8d6a7e790f..92b6beae5b 100644 --- a/Filters/CMakeLists.txt +++ b/Filters/CMakeLists.txt @@ -283,5 +283,7 @@ cet_build_plugin(WeightSamplingFilter art::module Offline::SeedService ) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/fcl/prolog.fcl ${CURRENT_BINARY_DIR} fcl/prolog.fcl) + install_source(SUBDIRS src) install_fhicl(SUBDIRS fcl SUBDIRNAME Offline/Filters/fcl) diff --git a/GlobalConstantsService/CMakeLists.txt b/GlobalConstantsService/CMakeLists.txt index 6c6152fefa..006ea3546b 100644 --- a/GlobalConstantsService/CMakeLists.txt +++ b/GlobalConstantsService/CMakeLists.txt @@ -20,5 +20,8 @@ cet_build_plugin(GlobalConstantsService art::service ) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/data/globalConstants_01.txt ${CURRENT_BINARY_DIR} data/globalConstants_01.txt) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/data/ParticleList.txt ${CURRENT_BINARY_DIR} data/ParticleList.txt) + install_source(SUBDIRS src) install_headers(USE_PROJECT_NAME SUBDIRS inc) diff --git a/Mu2eG4/CMakeLists.txt b/Mu2eG4/CMakeLists.txt index f523b076a3..b3a97e7480 100644 --- a/Mu2eG4/CMakeLists.txt +++ b/Mu2eG4/CMakeLists.txt @@ -236,6 +236,706 @@ cet_build_plugin(ConstructEnvTube art::tool Offline::Mu2eG4Helper ) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/fcl/g4test_03.fcl ${CURRENT_BINARY_DIR} fcl/g4test_03.fcl COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/fcl/g4test_03MT.fcl ${CURRENT_BINARY_DIR} fcl/g4test_03MT.fcl COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/fcl/g4test_mix1MT.fcl ${CURRENT_BINARY_DIR} fcl/g4test_mix1MT.fcl COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/fcl/g4test_mix1ST.fcl ${CURRENT_BINARY_DIR} fcl/g4test_mix1ST.fcl COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/fcl/g4test_mustops.fcl ${CURRENT_BINARY_DIR} fcl/g4test_mustops.fcl COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/fcl/g4test_stage0MT.fcl ${CURRENT_BINARY_DIR} fcl/g4test_stage0MT.fcl COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/fcl/g4test_stage0ST.fcl ${CURRENT_BINARY_DIR} fcl/g4test_stage0ST.fcl COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/fcl/g4test_stage1MT.fcl ${CURRENT_BINARY_DIR} fcl/g4test_stage1MT.fcl COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/fcl/g4test_stage1ST.fcl ${CURRENT_BINARY_DIR} fcl/g4test_stage1ST.fcl COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/fcl/gdmldump.fcl ${CURRENT_BINARY_DIR} fcl/gdmldump.fcl COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/fcl/prolog.fcl ${CURRENT_BINARY_DIR} fcl/prolog.fcl COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/fcl/rantest.fcl ${CURRENT_BINARY_DIR} fcl/rantest.fcl COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/fcl/replayAll.fcl ${CURRENT_BINARY_DIR} fcl/replayAll.fcl COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/fcl/replayWithSkip.fcl ${CURRENT_BINARY_DIR} fcl/replayWithSkip.fcl COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/fcl/surfaceCheck.fcl ${CURRENT_BINARY_DIR} fcl/surfaceCheck.fcl COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/fcl/transportOnly.fcl ${CURRENT_BINARY_DIR} fcl/transportOnly.fcl COPYONLY) + +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/g4study/g4study_Box.fcl ${CURRENT_BINARY_DIR} g4study/g4study_Box.fcl COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/g4study/g4study_Box_geom.txt ${CURRENT_BINARY_DIR} g4study/g4study_Box_geom.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/g4study/g4study_Calo01.fcl ${CURRENT_BINARY_DIR} g4study/g4study_Calo01.fcl COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/g4study/g4study_Calo01_geom.txt ${CURRENT_BINARY_DIR} g4study/g4study_Calo01_geom.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/g4study/g4studyCalo01helper.C ${CURRENT_BINARY_DIR} g4study/g4studyCalo01helper.C COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/g4study/g4studyCalo_01ParticleGun.txt ${CURRENT_BINARY_DIR} g4study/g4studyCalo_01ParticleGun.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/g4study/g4studyCalo01Selector.C ${CURRENT_BINARY_DIR} g4study/g4studyCalo01Selector.C COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/g4study/g4studyCalo01Selector.h ${CURRENT_BINARY_DIR} g4study/g4studyCalo01Selector.h COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/g4study/g4study.fcl ${CURRENT_BINARY_DIR} g4study/g4study.fcl COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/g4study/g4study_MuCapture.fcl ${CURRENT_BINARY_DIR} g4study/g4study_MuCapture.fcl COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/g4study/g4study_MuCapture_geom.txt ${CURRENT_BINARY_DIR} g4study/g4study_MuCapture_geom.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/g4study/g4studyMuonGun.txt ${CURRENT_BINARY_DIR} g4study/g4studyMuonGun.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/g4study/g4study_NBoxes.fcl ${CURRENT_BINARY_DIR} g4study/g4study_NBoxes.fcl COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/g4study/g4study_NBoxes_geom.txt ${CURRENT_BINARY_DIR} g4study/g4study_NBoxes_geom.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/g4study/g4studyParticleGunMuCapture.txt ${CURRENT_BINARY_DIR} g4study/g4studyParticleGunMuCapture.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/g4study/g4studyParticleGun.txt ${CURRENT_BINARY_DIR} g4study/g4studyParticleGun.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/g4study/g4study_Tube.fcl ${CURRENT_BINARY_DIR} g4study/g4study_Tube.fcl COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/g4study/g4study_Tube_geom.txt ${CURRENT_BINARY_DIR} g4study/g4study_Tube_geom.txt COPYONLY) + +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bfgeom_altDS11_helical_v01.txt ${CURRENT_BINARY_DIR} geom/bfgeom_altDS11_helical_v01.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bfgeom_constant.txt ${CURRENT_BINARY_DIR} geom/bfgeom_constant.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bfgeom_DS50_no_ds_v01.txt ${CURRENT_BINARY_DIR} geom/bfgeom_DS50_no_ds_v01.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bfgeom_DS50_no_tsu_ps_v01.txt ${CURRENT_BINARY_DIR} geom/bfgeom_DS50_no_tsu_ps_v01.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bfgeom_DS50_reco_v01.txt ${CURRENT_BINARY_DIR} geom/bfgeom_DS50_reco_v01.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bfgeom_DS50_v01.txt ${CURRENT_BINARY_DIR} geom/bfgeom_DS50_v01.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bfgeom_DS70_no_tsu_ps_v01.txt ${CURRENT_BINARY_DIR} geom/bfgeom_DS70_no_tsu_ps_v01.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bfgeom_DSMap_DS8_DS9_split_dZ_3mm.txt ${CURRENT_BINARY_DIR} geom/bfgeom_DSMap_DS8_DS9_split_dZ_3mm.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bfgeom_DSMap_dXYZ_ensemble_v01_exp_17.txt ${CURRENT_BINARY_DIR} geom/bfgeom_DSMap_dXYZ_ensemble_v01_exp_17.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bfgeom_DSMap_dXYZ_ensemble_v01_exp_8.txt ${CURRENT_BINARY_DIR} geom/bfgeom_DSMap_dXYZ_ensemble_v01_exp_8.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bfgeom_DSMap_yaw_10mm.txt ${CURRENT_BINARY_DIR} geom/bfgeom_DSMap_yaw_10mm.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bfgeom_DSMap_Z_scale_dZ_5mm.txt ${CURRENT_BINARY_DIR} geom/bfgeom_DSMap_Z_scale_dZ_5mm.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bfgeom_no_ds_v01.txt ${CURRENT_BINARY_DIR} geom/bfgeom_no_ds_v01.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bfgeom_no_field.txt ${CURRENT_BINARY_DIR} geom/bfgeom_no_field.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bfgeom_no_tsu_ps_altDS11_helical_v01.txt ${CURRENT_BINARY_DIR} geom/bfgeom_no_tsu_ps_altDS11_helical_v01.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bfgeom_no_tsu_ps_v01.txt ${CURRENT_BINARY_DIR} geom/bfgeom_no_tsu_ps_v01.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bfgeom_reco_altDS11_helical_v01.txt ${CURRENT_BINARY_DIR} geom/bfgeom_reco_altDS11_helical_v01.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bfgeom_reco_v01.txt ${CURRENT_BINARY_DIR} geom/bfgeom_reco_v01.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bfgeom_v01.txt ${CURRENT_BINARY_DIR} geom/bfgeom_v01.txt COPYONLY) + +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/backfillBeamlineFoundationS01.txt ${CURRENT_BINARY_DIR} geom/bldg/backfillBeamlineFoundationS01.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/backfillBeamlineFoundationS02.txt ${CURRENT_BINARY_DIR} geom/bldg/backfillBeamlineFoundationS02.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/backfillBeamlineFoundationS03.txt ${CURRENT_BINARY_DIR} geom/bldg/backfillBeamlineFoundationS03.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/backfillBeamlineFoundationS04.txt ${CURRENT_BINARY_DIR} geom/bldg/backfillBeamlineFoundationS04.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/backfillBeamlineFoundationS05.txt ${CURRENT_BINARY_DIR} geom/bldg/backfillBeamlineFoundationS05.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/backfillBeamlineFoundationS06.txt ${CURRENT_BINARY_DIR} geom/bldg/backfillBeamlineFoundationS06.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/backfillBeamlineNorth.txt ${CURRENT_BINARY_DIR} geom/bldg/backfillBeamlineNorth.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/backfillBeamlineSouth.txt ${CURRENT_BINARY_DIR} geom/bldg/backfillBeamlineSouth.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/backfillBeamline.txt ${CURRENT_BINARY_DIR} geom/bldg/backfillBeamline.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/backfillEscapeInner01.txt ${CURRENT_BINARY_DIR} geom/bldg/backfillEscapeInner01.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/backfillEscapeInner02.txt ${CURRENT_BINARY_DIR} geom/bldg/backfillEscapeInner02.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/backfillEscapeInner03.txt ${CURRENT_BINARY_DIR} geom/bldg/backfillEscapeInner03.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/backfillEscapeStair01.txt ${CURRENT_BINARY_DIR} geom/bldg/backfillEscapeStair01.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/backfillEscapeStair02.txt ${CURRENT_BINARY_DIR} geom/bldg/backfillEscapeStair02.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/backfillEscapeStair03.txt ${CURRENT_BINARY_DIR} geom/bldg/backfillEscapeStair03.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/backfillEscapeStairE01.txt ${CURRENT_BINARY_DIR} geom/bldg/backfillEscapeStairE01.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/backfillEscapeStairE02.txt ${CURRENT_BINARY_DIR} geom/bldg/backfillEscapeStairE02.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/backfillEscapeStairE03.txt ${CURRENT_BINARY_DIR} geom/bldg/backfillEscapeStairE03.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/backfillEscapeStairE04.txt ${CURRENT_BINARY_DIR} geom/bldg/backfillEscapeStairE04.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/backfillEscapeStairW01.txt ${CURRENT_BINARY_DIR} geom/bldg/backfillEscapeStairW01.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/backfillEscapeStairW02.txt ${CURRENT_BINARY_DIR} geom/bldg/backfillEscapeStairW02.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/backfillEscapeStairW03.txt ${CURRENT_BINARY_DIR} geom/bldg/backfillEscapeStairW03.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/backfillEscapeStairW04.txt ${CURRENT_BINARY_DIR} geom/bldg/backfillEscapeStairW04.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/backfillFoundationN.txt ${CURRENT_BINARY_DIR} geom/bldg/backfillFoundationN.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/backfillPsAreaBaselevel.txt ${CURRENT_BINARY_DIR} geom/bldg/backfillPsAreaBaselevel.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/backfillPsAreaBaselevel_v02.txt ${CURRENT_BINARY_DIR} geom/bldg/backfillPsAreaBaselevel_v02.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/backfillPsAreaInter.txt ${CURRENT_BINARY_DIR} geom/bldg/backfillPsAreaInter.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/backfillPsAreaInter_v02.txt ${CURRENT_BINARY_DIR} geom/bldg/backfillPsAreaInter_v02.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/backfillPsAreaLower.txt ${CURRENT_BINARY_DIR} geom/bldg/backfillPsAreaLower.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/backfillPsAreaLower_v02.txt ${CURRENT_BINARY_DIR} geom/bldg/backfillPsAreaLower_v02.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/backfillPsAreaRWallFootLevel.txt ${CURRENT_BINARY_DIR} geom/bldg/backfillPsAreaRWallFootLevel.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/backfillPsAreaRWallFootLevel_v02.txt ${CURRENT_BINARY_DIR} geom/bldg/backfillPsAreaRWallFootLevel_v02.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/backfillPsAreaTopLayer.txt ${CURRENT_BINARY_DIR} geom/bldg/backfillPsAreaTopLayer.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/backfillPsAreaTopLayer_v02.txt ${CURRENT_BINARY_DIR} geom/bldg/backfillPsAreaTopLayer_v02.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/backfillPsHatchE.txt ${CURRENT_BINARY_DIR} geom/bldg/backfillPsHatchE.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/backfillPsHatchS.txt ${CURRENT_BINARY_DIR} geom/bldg/backfillPsHatchS.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/backfillTSarea-W1Lower.txt ${CURRENT_BINARY_DIR} geom/bldg/backfillTSarea-W1Lower.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/backfillTSarea-W1.txt ${CURRENT_BINARY_DIR} geom/bldg/backfillTSarea-W1.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/backfillTSarea-W1UpperNotch2.txt ${CURRENT_BINARY_DIR} geom/bldg/backfillTSarea-W1UpperNotch2.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/backfillTSarea-W1UpperNotchLower.txt ${CURRENT_BINARY_DIR} geom/bldg/backfillTSarea-W1UpperNotchLower.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/backfillTSarea-W1UpperNotchUpper1.txt ${CURRENT_BINARY_DIR} geom/bldg/backfillTSarea-W1UpperNotchUpper1.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/backfillTSarea-W1UpperNotchUpper2.txt ${CURRENT_BINARY_DIR} geom/bldg/backfillTSarea-W1UpperNotchUpper2.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/backfillTSarea-W1UpperNotchUpper3.txt ${CURRENT_BINARY_DIR} geom/bldg/backfillTSarea-W1UpperNotchUpper3.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/backfillTSarea-W2.txt ${CURRENT_BINARY_DIR} geom/bldg/backfillTSarea-W2.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/backfillTSarea-W2Upper.txt ${CURRENT_BINARY_DIR} geom/bldg/backfillTSarea-W2Upper.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/beamlineBlockWallE.txt ${CURRENT_BINARY_DIR} geom/bldg/beamlineBlockWallE.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/beamlineBlockWallS.txt ${CURRENT_BINARY_DIR} geom/bldg/beamlineBlockWallS.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/beamlineBlockWallTop.txt ${CURRENT_BINARY_DIR} geom/bldg/beamlineBlockWallTop.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/beamlineCeilingE.txt ${CURRENT_BINARY_DIR} geom/bldg/beamlineCeilingE.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/beamlineCeiling.txt ${CURRENT_BINARY_DIR} geom/bldg/beamlineCeiling.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/beamlineCeiling_v02.txt ${CURRENT_BINARY_DIR} geom/bldg/beamlineCeiling_v02.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/beamlineEscapeDoorHeader.txt ${CURRENT_BINARY_DIR} geom/bldg/beamlineEscapeDoorHeader.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/beamlineFoundationS01.txt ${CURRENT_BINARY_DIR} geom/bldg/beamlineFoundationS01.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/beamlineFoundationS02.txt ${CURRENT_BINARY_DIR} geom/bldg/beamlineFoundationS02.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/beamlineFoundationS03.txt ${CURRENT_BINARY_DIR} geom/bldg/beamlineFoundationS03.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/beamlineFoundationS04.txt ${CURRENT_BINARY_DIR} geom/bldg/beamlineFoundationS04.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/beamlineFoundationS05.txt ${CURRENT_BINARY_DIR} geom/bldg/beamlineFoundationS05.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/beamlineFoundationS06.txt ${CURRENT_BINARY_DIR} geom/bldg/beamlineFoundationS06.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/beamlineFoundationUpper.txt ${CURRENT_BINARY_DIR} geom/bldg/beamlineFoundationUpper.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/beamlineLowerSouth.txt ${CURRENT_BINARY_DIR} geom/bldg/beamlineLowerSouth.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/beamlineNW.txt ${CURRENT_BINARY_DIR} geom/bldg/beamlineNW.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/beamline.txt ${CURRENT_BINARY_DIR} geom/bldg/beamline.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/beamlineUpperE.txt ${CURRENT_BINARY_DIR} geom/bldg/beamlineUpperE.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/beamlineUpperN.txt ${CURRENT_BINARY_DIR} geom/bldg/beamlineUpperN.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/beamlineUpperNW.txt ${CURRENT_BINARY_DIR} geom/bldg/beamlineUpperNW.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/beamlineUpperS.txt ${CURRENT_BINARY_DIR} geom/bldg/beamlineUpperS.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/beamlineUpper.txt ${CURRENT_BINARY_DIR} geom/bldg/beamlineUpper.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/beamlineUpper_v02.txt ${CURRENT_BINARY_DIR} geom/bldg/beamlineUpper_v02.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/beamline_v02.txt ${CURRENT_BINARY_DIR} geom/bldg/beamline_v02.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/dirtBeamlineBermSW.txt ${CURRENT_BINARY_DIR} geom/bldg/dirtBeamlineBermSW.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/dirtBeamlineBerm.txt ${CURRENT_BINARY_DIR} geom/bldg/dirtBeamlineBerm.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/dirtBeamlineBerm_v02.txt ${CURRENT_BINARY_DIR} geom/bldg/dirtBeamlineBerm_v02.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/dirtBeamlineBerm_v03.txt ${CURRENT_BINARY_DIR} geom/bldg/dirtBeamlineBerm_v03.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/dirtBeamlineBermWest.txt ${CURRENT_BINARY_DIR} geom/bldg/dirtBeamlineBermWest.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/dirtBeamlineCeilingE.txt ${CURRENT_BINARY_DIR} geom/bldg/dirtBeamlineCeilingE.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/dirtBeamlineCeilingW.txt ${CURRENT_BINARY_DIR} geom/bldg/dirtBeamlineCeilingW.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/dirtBeamlineSlab2NC.txt ${CURRENT_BINARY_DIR} geom/bldg/dirtBeamlineSlab2NC.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/dirtBeamlineSlab2NE.txt ${CURRENT_BINARY_DIR} geom/bldg/dirtBeamlineSlab2NE.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/dirtBeamlineSlab2N.txt ${CURRENT_BINARY_DIR} geom/bldg/dirtBeamlineSlab2N.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/dirtBeamlineSlab2N_v02.txt ${CURRENT_BINARY_DIR} geom/bldg/dirtBeamlineSlab2N_v02.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/dirtBeamlineSlab2NW.txt ${CURRENT_BINARY_DIR} geom/bldg/dirtBeamlineSlab2NW.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/dirtBeamlineSlabE.txt ${CURRENT_BINARY_DIR} geom/bldg/dirtBeamlineSlabE.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/dirtBeamlineSlabNC.txt ${CURRENT_BINARY_DIR} geom/bldg/dirtBeamlineSlabNC.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/dirtBeamlineSlab.txt ${CURRENT_BINARY_DIR} geom/bldg/dirtBeamlineSlab.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/dirtBeamlineSlab_v02.txt ${CURRENT_BINARY_DIR} geom/bldg/dirtBeamlineSlab_v02.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/dirtBeamlineSlabW.txt ${CURRENT_BINARY_DIR} geom/bldg/dirtBeamlineSlabW.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/dirtBeamline.txt ${CURRENT_BINARY_DIR} geom/bldg/dirtBeamline.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/dirtBeamlineUpper.txt ${CURRENT_BINARY_DIR} geom/bldg/dirtBeamlineUpper.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/dirtBeamlineUpper_v02.txt ${CURRENT_BINARY_DIR} geom/bldg/dirtBeamlineUpper_v02.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/dirtBeamline_v02.txt ${CURRENT_BINARY_DIR} geom/bldg/dirtBeamline_v02.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/dirtDsAreaAlcove1.txt ${CURRENT_BINARY_DIR} geom/bldg/dirtDsAreaAlcove1.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/dirtDsAreaAlcove2.txt ${CURRENT_BINARY_DIR} geom/bldg/dirtDsAreaAlcove2.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/dirtDsAreaAlcove3.txt ${CURRENT_BINARY_DIR} geom/bldg/dirtDsAreaAlcove3.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/dirtDsAreaDownstreamCeilingVslab1.txt ${CURRENT_BINARY_DIR} geom/bldg/dirtDsAreaDownstreamCeilingVslab1.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/dirtDsAreaDownstreamCeilingVslab2.txt ${CURRENT_BINARY_DIR} geom/bldg/dirtDsAreaDownstreamCeilingVslab2.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/dirtDsAreaDownstreamCeilingVslab3.txt ${CURRENT_BINARY_DIR} geom/bldg/dirtDsAreaDownstreamCeilingVslab3.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/dirtDsAreaDownstreamCeilingVslab4.txt ${CURRENT_BINARY_DIR} geom/bldg/dirtDsAreaDownstreamCeilingVslab4.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/dirtDsAreaDownstreamCeilingVslab5.txt ${CURRENT_BINARY_DIR} geom/bldg/dirtDsAreaDownstreamCeilingVslab5.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/dirtDsAreaDownstreamCeilingVslab6.txt ${CURRENT_BINARY_DIR} geom/bldg/dirtDsAreaDownstreamCeilingVslab6.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/dirtDsAreaElevator.txt ${CURRENT_BINARY_DIR} geom/bldg/dirtDsAreaElevator.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/dirtDsAreaElevatorUpper.txt ${CURRENT_BINARY_DIR} geom/bldg/dirtDsAreaElevatorUpper.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/dirtDsAreaFirstFloorS.txt ${CURRENT_BINARY_DIR} geom/bldg/dirtDsAreaFirstFloorS.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/dirtDsArea.txt ${CURRENT_BINARY_DIR} geom/bldg/dirtDsArea.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/dirtDsAreaUpperSE.txt ${CURRENT_BINARY_DIR} geom/bldg/dirtDsAreaUpperSE.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/dirtDsAreaUpper.txt ${CURRENT_BINARY_DIR} geom/bldg/dirtDsAreaUpper.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/dirtEscapeCeiling.txt ${CURRENT_BINARY_DIR} geom/bldg/dirtEscapeCeiling.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/dirtEscapeStair04.txt ${CURRENT_BINARY_DIR} geom/bldg/dirtEscapeStair04.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/dirtEscapeStair07.txt ${CURRENT_BINARY_DIR} geom/bldg/dirtEscapeStair07.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/dirtEscapeStair11.txt ${CURRENT_BINARY_DIR} geom/bldg/dirtEscapeStair11.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/dirtExtMonCeiling.txt ${CURRENT_BINARY_DIR} geom/bldg/dirtExtMonCeiling.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/dirtExtMonCeiling_v02.txt ${CURRENT_BINARY_DIR} geom/bldg/dirtExtMonCeiling_v02.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/dirtExtMon.txt ${CURRENT_BINARY_DIR} geom/bldg/dirtExtMon.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/dirtExtMonUpper.txt ${CURRENT_BINARY_DIR} geom/bldg/dirtExtMonUpper.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/dirtExtMonUpper_v02.txt ${CURRENT_BINARY_DIR} geom/bldg/dirtExtMonUpper_v02.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/dirtExtMon_v02.txt ${CURRENT_BINARY_DIR} geom/bldg/dirtExtMon_v02.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/dirtFoundationE.txt ${CURRENT_BINARY_DIR} geom/bldg/dirtFoundationE.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/dirtFoundationExtMonPSarea10.txt ${CURRENT_BINARY_DIR} geom/bldg/dirtFoundationExtMonPSarea10.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/dirtFoundationExtMonPSarea11.txt ${CURRENT_BINARY_DIR} geom/bldg/dirtFoundationExtMonPSarea11.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/dirtFoundationExtMonPSarea1.txt ${CURRENT_BINARY_DIR} geom/bldg/dirtFoundationExtMonPSarea1.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/dirtFoundationExtMonPSarea2.txt ${CURRENT_BINARY_DIR} geom/bldg/dirtFoundationExtMonPSarea2.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/dirtFoundationExtMonPSarea3.txt ${CURRENT_BINARY_DIR} geom/bldg/dirtFoundationExtMonPSarea3.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/dirtFoundationExtMonPSarea4.txt ${CURRENT_BINARY_DIR} geom/bldg/dirtFoundationExtMonPSarea4.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/dirtFoundationExtMonPSarea5.txt ${CURRENT_BINARY_DIR} geom/bldg/dirtFoundationExtMonPSarea5.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/dirtFoundationExtMonPSarea6.txt ${CURRENT_BINARY_DIR} geom/bldg/dirtFoundationExtMonPSarea6.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/dirtFoundationExtMonPSarea7.txt ${CURRENT_BINARY_DIR} geom/bldg/dirtFoundationExtMonPSarea7.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/dirtFoundationExtMonPSarea8.txt ${CURRENT_BINARY_DIR} geom/bldg/dirtFoundationExtMonPSarea8.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/dirtFoundationExtMonPSarea9.txt ${CURRENT_BINARY_DIR} geom/bldg/dirtFoundationExtMonPSarea9.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/dirtFoundationExtMonPSarea.txt ${CURRENT_BINARY_DIR} geom/bldg/dirtFoundationExtMonPSarea.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/dirtFoundationExtMonPSarea_v02.txt ${CURRENT_BINARY_DIR} geom/bldg/dirtFoundationExtMonPSarea_v02.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/dirtFoundationExtMon.txt ${CURRENT_BINARY_DIR} geom/bldg/dirtFoundationExtMon.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/dirtFoundationExtMon_v02.txt ${CURRENT_BINARY_DIR} geom/bldg/dirtFoundationExtMon_v02.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/dirtFoundationIsland.txt ${CURRENT_BINARY_DIR} geom/bldg/dirtFoundationIsland.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/dirtFoundationN.txt ${CURRENT_BINARY_DIR} geom/bldg/dirtFoundationN.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/dirtFoundationN_v02.txt ${CURRENT_BINARY_DIR} geom/bldg/dirtFoundationN_v02.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/dirtFoundationSd.txt ${CURRENT_BINARY_DIR} geom/bldg/dirtFoundationSd.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/dirtFoundationSmid.txt ${CURRENT_BINARY_DIR} geom/bldg/dirtFoundationSmid.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/dirtFoundationSu.txt ${CURRENT_BINARY_DIR} geom/bldg/dirtFoundationSu.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/dirtIsland.txt ${CURRENT_BINARY_DIR} geom/bldg/dirtIsland.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/dirtIslandUpper.txt ${CURRENT_BINARY_DIR} geom/bldg/dirtIslandUpper.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/dirtIslandUpper_v02.txt ${CURRENT_BINARY_DIR} geom/bldg/dirtIslandUpper_v02.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/dirtPassageE.txt ${CURRENT_BINARY_DIR} geom/bldg/dirtPassageE.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/dirtPsAreaDirtSlab2NBeyond.txt ${CURRENT_BINARY_DIR} geom/bldg/dirtPsAreaDirtSlab2NBeyond.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/dirtPsAreaDirtSlab2N.txt ${CURRENT_BINARY_DIR} geom/bldg/dirtPsAreaDirtSlab2N.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/dirtPsAreaDirtSlab2N_v02.txt ${CURRENT_BINARY_DIR} geom/bldg/dirtPsAreaDirtSlab2N_v02.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/dirtPsAreaDirtSlab2S.txt ${CURRENT_BINARY_DIR} geom/bldg/dirtPsAreaDirtSlab2S.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/dirtPsAreaDirtSlabN.txt ${CURRENT_BINARY_DIR} geom/bldg/dirtPsAreaDirtSlabN.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/dirtPsAreaDirtSlabN_v02.txt ${CURRENT_BINARY_DIR} geom/bldg/dirtPsAreaDirtSlabN_v02.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/dirtPsAreaDirtSlabS.txt ${CURRENT_BINARY_DIR} geom/bldg/dirtPsAreaDirtSlabS.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/dirtPsArea.txt ${CURRENT_BINARY_DIR} geom/bldg/dirtPsArea.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/dirtPsAreaUpper2N.txt ${CURRENT_BINARY_DIR} geom/bldg/dirtPsAreaUpper2N.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/dirtPsAreaUpper2N_v02.txt ${CURRENT_BINARY_DIR} geom/bldg/dirtPsAreaUpper2N_v02.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/dirtPsAreaUpper2SliverN.txt ${CURRENT_BINARY_DIR} geom/bldg/dirtPsAreaUpper2SliverN.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/dirtPsAreaUpper2SliverN_v02.txt ${CURRENT_BINARY_DIR} geom/bldg/dirtPsAreaUpper2SliverN_v02.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/dirtPsAreaUpperN.txt ${CURRENT_BINARY_DIR} geom/bldg/dirtPsAreaUpperN.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/dirtPsAreaUpperN_v02.txt ${CURRENT_BINARY_DIR} geom/bldg/dirtPsAreaUpperN_v02.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/dirtPsAreaUpperSliverS.txt ${CURRENT_BINARY_DIR} geom/bldg/dirtPsAreaUpperSliverS.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/dirtPsAreaUpperS.txt ${CURRENT_BINARY_DIR} geom/bldg/dirtPsAreaUpperS.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/dirtPsAreaWLower.txt ${CURRENT_BINARY_DIR} geom/bldg/dirtPsAreaWLower.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/dirtPsAreaW.txt ${CURRENT_BINARY_DIR} geom/bldg/dirtPsAreaW.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/dirtPsAreaW_v02.txt ${CURRENT_BINARY_DIR} geom/bldg/dirtPsAreaW_v02.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/dirtPsWallUpperSliver.txt ${CURRENT_BINARY_DIR} geom/bldg/dirtPsWallUpperSliver.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/dirtPsWallUpper.txt ${CURRENT_BINARY_DIR} geom/bldg/dirtPsWallUpper.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/dirtRemoteHandlingCeiling.txt ${CURRENT_BINARY_DIR} geom/bldg/dirtRemoteHandlingCeiling.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/dirtRemoteHandling.txt ${CURRENT_BINARY_DIR} geom/bldg/dirtRemoteHandling.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/dirtRemoteHandling_v02.txt ${CURRENT_BINARY_DIR} geom/bldg/dirtRemoteHandling_v02.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/dirtRetainingWallBermEast.txt ${CURRENT_BINARY_DIR} geom/bldg/dirtRetainingWallBermEast.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/dirtRetainingWallBermWest.txt ${CURRENT_BINARY_DIR} geom/bldg/dirtRetainingWallBermWest.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/dirtSRetainingWallFoot.txt ${CURRENT_BINARY_DIR} geom/bldg/dirtSRetainingWallFoot.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/dirtTempDirtBackfillPsAreaBaselevel.txt ${CURRENT_BINARY_DIR} geom/bldg/dirtTempDirtBackfillPsAreaBaselevel.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/dirtTempDirtBackfillPsAreaBaselevel_v02.txt ${CURRENT_BINARY_DIR} geom/bldg/dirtTempDirtBackfillPsAreaBaselevel_v02.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/dirtTempDirtBackfillPsAreaInter.txt ${CURRENT_BINARY_DIR} geom/bldg/dirtTempDirtBackfillPsAreaInter.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/dirtTempDirtBackfillPsAreaInter_v02.txt ${CURRENT_BINARY_DIR} geom/bldg/dirtTempDirtBackfillPsAreaInter_v02.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/dirtTempDirtBackfillPsAreaLower.txt ${CURRENT_BINARY_DIR} geom/bldg/dirtTempDirtBackfillPsAreaLower.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/dirtTempDirtBackfillPsAreaLower_v02.txt ${CURRENT_BINARY_DIR} geom/bldg/dirtTempDirtBackfillPsAreaLower_v02.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/dirtTempDirtBackfillPsAreaRWallFootLevel.txt ${CURRENT_BINARY_DIR} geom/bldg/dirtTempDirtBackfillPsAreaRWallFootLevel.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/dirtTempDirtBackfillPsAreaRWallFootLevel_v02.txt ${CURRENT_BINARY_DIR} geom/bldg/dirtTempDirtBackfillPsAreaRWallFootLevel_v02.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/dirtTempSofRetWallTop.txt ${CURRENT_BINARY_DIR} geom/bldg/dirtTempSofRetWallTop.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/dirtTempSofRetWallTop_v02.txt ${CURRENT_BINARY_DIR} geom/bldg/dirtTempSofRetWallTop_v02.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/dirtTsAreaAlcove.txt ${CURRENT_BINARY_DIR} geom/bldg/dirtTsAreaAlcove.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/dirtTsAreaStairwell.txt ${CURRENT_BINARY_DIR} geom/bldg/dirtTsAreaStairwell.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/dirtTsAreaUpper2W.txt ${CURRENT_BINARY_DIR} geom/bldg/dirtTsAreaUpper2W.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/dirtTsAreaUpperW.txt ${CURRENT_BINARY_DIR} geom/bldg/dirtTsAreaUpperW.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/dirtTsAreaW.txt ${CURRENT_BINARY_DIR} geom/bldg/dirtTsAreaW.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/dirtTsDsAreaFirstFloorEdgeN.txt ${CURRENT_BINARY_DIR} geom/bldg/dirtTsDsAreaFirstFloorEdgeN.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/dirtTsDsAreaFirstFloorEdgeN_v02.txt ${CURRENT_BINARY_DIR} geom/bldg/dirtTsDsAreaFirstFloorEdgeN_v02.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/dirtUpToGradeLevelW.txt ${CURRENT_BINARY_DIR} geom/bldg/dirtUpToGradeLevelW.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/dirtUpToGradeLevelW_v02.txt ${CURRENT_BINARY_DIR} geom/bldg/dirtUpToGradeLevelW_v02.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/dirtWallFill1.txt ${CURRENT_BINARY_DIR} geom/bldg/dirtWallFill1.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/dirtWallFill2.txt ${CURRENT_BINARY_DIR} geom/bldg/dirtWallFill2.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/dirtWTSareaCF2notch.txt ${CURRENT_BINARY_DIR} geom/bldg/dirtWTSareaCF2notch.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/dirtWTSareaCF2.txt ${CURRENT_BINARY_DIR} geom/bldg/dirtWTSareaCF2.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/dirtWTSareaCFbeam.txt ${CURRENT_BINARY_DIR} geom/bldg/dirtWTSareaCFbeam.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/dsAreaAlcove1Ceiling.txt ${CURRENT_BINARY_DIR} geom/bldg/dsAreaAlcove1Ceiling.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/dsAreaAlcove2Ceiling.txt ${CURRENT_BINARY_DIR} geom/bldg/dsAreaAlcove2Ceiling.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/dsAreaAlcove3Ceiling.txt ${CURRENT_BINARY_DIR} geom/bldg/dsAreaAlcove3Ceiling.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/dsAreaAlcove4Ceiling.txt ${CURRENT_BINARY_DIR} geom/bldg/dsAreaAlcove4Ceiling.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/dsAreaAlcove5Ceiling.txt ${CURRENT_BINARY_DIR} geom/bldg/dsAreaAlcove5Ceiling.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/dsAreaDownstreamCeiling.txt ${CURRENT_BINARY_DIR} geom/bldg/dsAreaDownstreamCeiling.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/dsAreaDownstreamCeilingVslab1.txt ${CURRENT_BINARY_DIR} geom/bldg/dsAreaDownstreamCeilingVslab1.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/dsAreaDownstreamCeilingVslab2.txt ${CURRENT_BINARY_DIR} geom/bldg/dsAreaDownstreamCeilingVslab2.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/dsAreaDownstreamCeilingVslab3.txt ${CURRENT_BINARY_DIR} geom/bldg/dsAreaDownstreamCeilingVslab3.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/dsAreaDownstreamCeilingVslab4.txt ${CURRENT_BINARY_DIR} geom/bldg/dsAreaDownstreamCeilingVslab4.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/dsAreaDownstreamCeilingVslab5.txt ${CURRENT_BINARY_DIR} geom/bldg/dsAreaDownstreamCeilingVslab5.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/dsAreaDownstreamCeilingVslab6.txt ${CURRENT_BINARY_DIR} geom/bldg/dsAreaDownstreamCeilingVslab6.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/dsAreaDownstreamUpstairsFloor.txt ${CURRENT_BINARY_DIR} geom/bldg/dsAreaDownstreamUpstairsFloor.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/dsAreaElevatorCeiling.txt ${CURRENT_BINARY_DIR} geom/bldg/dsAreaElevatorCeiling.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/dsAreaElevatorInteriorLower.txt ${CURRENT_BINARY_DIR} geom/bldg/dsAreaElevatorInteriorLower.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/dsAreaElevatorInterior.txt ${CURRENT_BINARY_DIR} geom/bldg/dsAreaElevatorInterior.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/dsAreaElevatorUpper.txt ${CURRENT_BINARY_DIR} geom/bldg/dsAreaElevatorUpper.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/dsAreaFirstFloorHatchGap.txt ${CURRENT_BINARY_DIR} geom/bldg/dsAreaFirstFloorHatchGap.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/dsAreaFirstFloorS.txt ${CURRENT_BINARY_DIR} geom/bldg/dsAreaFirstFloorS.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/dsAreaHatchBlock.txt ${CURRENT_BINARY_DIR} geom/bldg/dsAreaHatchBlock.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/dsAreaHatchELedge.txt ${CURRENT_BINARY_DIR} geom/bldg/dsAreaHatchELedge.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/dsAreaHatchNEdge.txt ${CURRENT_BINARY_DIR} geom/bldg/dsAreaHatchNEdge.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/dsAreaHatchNLedge.txt ${CURRENT_BINARY_DIR} geom/bldg/dsAreaHatchNLedge.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/dsAreaHatchSEdge.txt ${CURRENT_BINARY_DIR} geom/bldg/dsAreaHatchSEdge.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/dsAreaHatchSLedge.txt ${CURRENT_BINARY_DIR} geom/bldg/dsAreaHatchSLedge.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/dsAreaHatchWLedge.txt ${CURRENT_BINARY_DIR} geom/bldg/dsAreaHatchWLedge.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/dsAreaTrenchCover.txt ${CURRENT_BINARY_DIR} geom/bldg/dsAreaTrenchCover.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/dsAreaTrenchFloor.txt ${CURRENT_BINARY_DIR} geom/bldg/dsAreaTrenchFloor.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/dsArea.txt ${CURRENT_BINARY_DIR} geom/bldg/dsArea.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/dsAreaUpper.txt ${CURRENT_BINARY_DIR} geom/bldg/dsAreaUpper.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/dsAreaUpstreamCeiling.txt ${CURRENT_BINARY_DIR} geom/bldg/dsAreaUpstreamCeiling.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/escapeCeilingE.txt ${CURRENT_BINARY_DIR} geom/bldg/escapeCeilingE.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/escapeCeilingW.txt ${CURRENT_BINARY_DIR} geom/bldg/escapeCeilingW.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/escapeHatchLid.txt ${CURRENT_BINARY_DIR} geom/bldg/escapeHatchLid.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/escapeHatchN.txt ${CURRENT_BINARY_DIR} geom/bldg/escapeHatchN.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/escapeHatchS.txt ${CURRENT_BINARY_DIR} geom/bldg/escapeHatchS.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/escapeStair01.txt ${CURRENT_BINARY_DIR} geom/bldg/escapeStair01.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/escapeStair02.txt ${CURRENT_BINARY_DIR} geom/bldg/escapeStair02.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/escapeStair03.txt ${CURRENT_BINARY_DIR} geom/bldg/escapeStair03.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/escapeStair04.txt ${CURRENT_BINARY_DIR} geom/bldg/escapeStair04.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/escapeStair05.txt ${CURRENT_BINARY_DIR} geom/bldg/escapeStair05.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/escapeStair06.txt ${CURRENT_BINARY_DIR} geom/bldg/escapeStair06.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/escapeStair07.txt ${CURRENT_BINARY_DIR} geom/bldg/escapeStair07.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/escapeStair08.txt ${CURRENT_BINARY_DIR} geom/bldg/escapeStair08.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/escapeStair09.txt ${CURRENT_BINARY_DIR} geom/bldg/escapeStair09.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/escapeStair10.txt ${CURRENT_BINARY_DIR} geom/bldg/escapeStair10.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/escapeStair11.txt ${CURRENT_BINARY_DIR} geom/bldg/escapeStair11.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/escapeStair12.txt ${CURRENT_BINARY_DIR} geom/bldg/escapeStair12.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/escapeStair13.txt ${CURRENT_BINARY_DIR} geom/bldg/escapeStair13.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/escapeStairBrick.txt ${CURRENT_BINARY_DIR} geom/bldg/escapeStairBrick.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/escapeStairFoundation01.txt ${CURRENT_BINARY_DIR} geom/bldg/escapeStairFoundation01.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/escapeStairFoundation02.txt ${CURRENT_BINARY_DIR} geom/bldg/escapeStairFoundation02.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/escapeStairFoundation03.txt ${CURRENT_BINARY_DIR} geom/bldg/escapeStairFoundation03.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/escapeStairFoundation04.txt ${CURRENT_BINARY_DIR} geom/bldg/escapeStairFoundation04.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/escapeStairWallE01.txt ${CURRENT_BINARY_DIR} geom/bldg/escapeStairWallE01.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/escapeStairWallE02.txt ${CURRENT_BINARY_DIR} geom/bldg/escapeStairWallE02.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/escapeStairWallE03.txt ${CURRENT_BINARY_DIR} geom/bldg/escapeStairWallE03.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/escapeStairWallE04.txt ${CURRENT_BINARY_DIR} geom/bldg/escapeStairWallE04.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/escapeStairWallW01.txt ${CURRENT_BINARY_DIR} geom/bldg/escapeStairWallW01.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/escapeStairWallW02.txt ${CURRENT_BINARY_DIR} geom/bldg/escapeStairWallW02.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/escapeStairWallW03.txt ${CURRENT_BINARY_DIR} geom/bldg/escapeStairWallW03.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/escapeStairWallW04.txt ${CURRENT_BINARY_DIR} geom/bldg/escapeStairWallW04.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/escapeWallE.txt ${CURRENT_BINARY_DIR} geom/bldg/escapeWallE.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/exteriorWallE.txt ${CURRENT_BINARY_DIR} geom/bldg/exteriorWallE.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/exteriorWallN.txt ${CURRENT_BINARY_DIR} geom/bldg/exteriorWallN.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/exteriorWallN_v02.txt ${CURRENT_BINARY_DIR} geom/bldg/exteriorWallN_v02.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/exteriorWallS.txt ${CURRENT_BINARY_DIR} geom/bldg/exteriorWallS.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/extMonBitN.txt ${CURRENT_BINARY_DIR} geom/bldg/extMonBitN.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/extMonBitS.txt ${CURRENT_BINARY_DIR} geom/bldg/extMonBitS.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/extMonCeiling.txt ${CURRENT_BINARY_DIR} geom/bldg/extMonCeiling.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/extMonCeiling_v02.txt ${CURRENT_BINARY_DIR} geom/bldg/extMonCeiling_v02.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/extMonExteriorWall.txt ${CURRENT_BINARY_DIR} geom/bldg/extMonExteriorWall.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/extMonExteriorWall_v02.txt ${CURRENT_BINARY_DIR} geom/bldg/extMonExteriorWall_v02.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/extMonUpper.txt ${CURRENT_BINARY_DIR} geom/bldg/extMonUpper.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/extMonUpper_v02.txt ${CURRENT_BINARY_DIR} geom/bldg/extMonUpper_v02.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/firstFloorWallExtension.txt ${CURRENT_BINARY_DIR} geom/bldg/firstFloorWallExtension.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/firstFloorWall.txt ${CURRENT_BINARY_DIR} geom/bldg/firstFloorWall.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/firstFloorWall_v02.txt ${CURRENT_BINARY_DIR} geom/bldg/firstFloorWall_v02.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/floorN.txt ${CURRENT_BINARY_DIR} geom/bldg/floorN.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/floorN_v02.txt ${CURRENT_BINARY_DIR} geom/bldg/floorN_v02.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/floorPassage.txt ${CURRENT_BINARY_DIR} geom/bldg/floorPassage.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/floorRemote.txt ${CURRENT_BINARY_DIR} geom/bldg/floorRemote.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/floorRemote_v02.txt ${CURRENT_BINARY_DIR} geom/bldg/floorRemote_v02.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/floorSd.txt ${CURRENT_BINARY_DIR} geom/bldg/floorSd.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/floorSd_v02.txt ${CURRENT_BINARY_DIR} geom/bldg/floorSd_v02.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/floorSu.txt ${CURRENT_BINARY_DIR} geom/bldg/floorSu.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/foundationExtMonPSarea10.txt ${CURRENT_BINARY_DIR} geom/bldg/foundationExtMonPSarea10.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/foundationExtMonPSarea11.txt ${CURRENT_BINARY_DIR} geom/bldg/foundationExtMonPSarea11.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/foundationExtMonPSarea1.txt ${CURRENT_BINARY_DIR} geom/bldg/foundationExtMonPSarea1.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/foundationExtMonPSarea2.txt ${CURRENT_BINARY_DIR} geom/bldg/foundationExtMonPSarea2.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/foundationExtMonPSarea3.txt ${CURRENT_BINARY_DIR} geom/bldg/foundationExtMonPSarea3.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/foundationExtMonPSarea4.txt ${CURRENT_BINARY_DIR} geom/bldg/foundationExtMonPSarea4.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/foundationExtMonPSarea5.txt ${CURRENT_BINARY_DIR} geom/bldg/foundationExtMonPSarea5.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/foundationExtMonPSarea6.txt ${CURRENT_BINARY_DIR} geom/bldg/foundationExtMonPSarea6.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/foundationExtMonPSarea7.txt ${CURRENT_BINARY_DIR} geom/bldg/foundationExtMonPSarea7.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/foundationExtMonPSarea8.txt ${CURRENT_BINARY_DIR} geom/bldg/foundationExtMonPSarea8.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/foundationExtMonPSarea9.txt ${CURRENT_BINARY_DIR} geom/bldg/foundationExtMonPSarea9.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/foundationExtMonPSarea.txt ${CURRENT_BINARY_DIR} geom/bldg/foundationExtMonPSarea.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/foundationExtMon.txt ${CURRENT_BINARY_DIR} geom/bldg/foundationExtMon.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/foundationExtMon_v02.txt ${CURRENT_BINARY_DIR} geom/bldg/foundationExtMon_v02.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/foundationN.txt ${CURRENT_BINARY_DIR} geom/bldg/foundationN.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/foundationN_v02.txt ${CURRENT_BINARY_DIR} geom/bldg/foundationN_v02.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/foundationSd.txt ${CURRENT_BINARY_DIR} geom/bldg/foundationSd.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/foundationSmid.txt ${CURRENT_BINARY_DIR} geom/bldg/foundationSmid.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/foundationSu.txt ${CURRENT_BINARY_DIR} geom/bldg/foundationSu.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/islandN.txt ${CURRENT_BINARY_DIR} geom/bldg/islandN.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/islandNUpper.txt ${CURRENT_BINARY_DIR} geom/bldg/islandNUpper.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/islandNUpper_v02.txt ${CURRENT_BINARY_DIR} geom/bldg/islandNUpper_v02.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/islandS.txt ${CURRENT_BINARY_DIR} geom/bldg/islandS.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/islandSUpper.txt ${CURRENT_BINARY_DIR} geom/bldg/islandSUpper.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/NRetainingWallAboveRH.txt ${CURRENT_BINARY_DIR} geom/bldg/NRetainingWallAboveRH.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/NRetainingWallExtensionFoot1.txt ${CURRENT_BINARY_DIR} geom/bldg/NRetainingWallExtensionFoot1.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/NRetainingWallWExtension.txt ${CURRENT_BINARY_DIR} geom/bldg/NRetainingWallWExtension.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/NRetainingWallWExtension_v02.txt ${CURRENT_BINARY_DIR} geom/bldg/NRetainingWallWExtension_v02.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/passageCeiling.txt ${CURRENT_BINARY_DIR} geom/bldg/passageCeiling.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/passageE.txt ${CURRENT_BINARY_DIR} geom/bldg/passageE.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/passageW.txt ${CURRENT_BINARY_DIR} geom/bldg/passageW.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/psAreaCeilingE.txt ${CURRENT_BINARY_DIR} geom/bldg/psAreaCeilingE.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/psAreaCeilingN.txt ${CURRENT_BINARY_DIR} geom/bldg/psAreaCeilingN.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/psAreaCeilingSW.txt ${CURRENT_BINARY_DIR} geom/bldg/psAreaCeilingSW.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/psAreaCeiling.txt ${CURRENT_BINARY_DIR} geom/bldg/psAreaCeiling.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/psAreaCeiling_v02.txt ${CURRENT_BINARY_DIR} geom/bldg/psAreaCeiling_v02.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/psAreaCeiling_v03.txt ${CURRENT_BINARY_DIR} geom/bldg/psAreaCeiling_v03.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/psAreaCF1.txt ${CURRENT_BINARY_DIR} geom/bldg/psAreaCF1.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/psAreaCF1_v02.txt ${CURRENT_BINARY_DIR} geom/bldg/psAreaCF1_v02.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/psAreaCF2.txt ${CURRENT_BINARY_DIR} geom/bldg/psAreaCF2.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/psAreaCF2_v02.txt ${CURRENT_BINARY_DIR} geom/bldg/psAreaCF2_v02.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/psAreaCF3.txt ${CURRENT_BINARY_DIR} geom/bldg/psAreaCF3.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/psAreaCF4.txt ${CURRENT_BINARY_DIR} geom/bldg/psAreaCF4.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/psAreaHatchBlock.txt ${CURRENT_BINARY_DIR} geom/bldg/psAreaHatchBlock.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/psAreaHatchBlock_v02.txt ${CURRENT_BINARY_DIR} geom/bldg/psAreaHatchBlock_v02.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/psAreaHatchBlock_v03.txt ${CURRENT_BINARY_DIR} geom/bldg/psAreaHatchBlock_v03.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/psAreaHatchLid.txt ${CURRENT_BINARY_DIR} geom/bldg/psAreaHatchLid.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/psAreaHatchLid_v02.txt ${CURRENT_BINARY_DIR} geom/bldg/psAreaHatchLid_v02.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/psAreaHatchLipN.txt ${CURRENT_BINARY_DIR} geom/bldg/psAreaHatchLipN.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/psAreaHatchLipS.txt ${CURRENT_BINARY_DIR} geom/bldg/psAreaHatchLipS.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/psAreaHatchLower.txt ${CURRENT_BINARY_DIR} geom/bldg/psAreaHatchLower.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/psAreaHatchUpper.txt ${CURRENT_BINARY_DIR} geom/bldg/psAreaHatchUpper.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/psAreaRemoteHandlingWall.txt ${CURRENT_BINARY_DIR} geom/bldg/psAreaRemoteHandlingWall.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/psAreaShieldingBlock.txt ${CURRENT_BINARY_DIR} geom/bldg/psAreaShieldingBlock.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/psAreaShieldingBlock_v02.txt ${CURRENT_BINARY_DIR} geom/bldg/psAreaShieldingBlock_v02.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/psArea.txt ${CURRENT_BINARY_DIR} geom/bldg/psArea.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/psAreaUpper2N.txt ${CURRENT_BINARY_DIR} geom/bldg/psAreaUpper2N.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/psAreaUpperNotch.txt ${CURRENT_BINARY_DIR} geom/bldg/psAreaUpperNotch.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/psAreaUpperN.txt ${CURRENT_BINARY_DIR} geom/bldg/psAreaUpperN.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/psAreaUpperN_v02.txt ${CURRENT_BINARY_DIR} geom/bldg/psAreaUpperN_v02.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/psAreaUpperS.txt ${CURRENT_BINARY_DIR} geom/bldg/psAreaUpperS.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/psAreaUpperS_v02.txt ${CURRENT_BINARY_DIR} geom/bldg/psAreaUpperS_v02.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/psArea_v02.txt ${CURRENT_BINARY_DIR} geom/bldg/psArea_v02.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/psWallUpper.txt ${CURRENT_BINARY_DIR} geom/bldg/psWallUpper.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/psWallUpper_v02.txt ${CURRENT_BINARY_DIR} geom/bldg/psWallUpper_v02.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/radiationSlab1.txt ${CURRENT_BINARY_DIR} geom/bldg/radiationSlab1.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/radiationSlab1_v02.txt ${CURRENT_BINARY_DIR} geom/bldg/radiationSlab1_v02.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/radiationSlab2.txt ${CURRENT_BINARY_DIR} geom/bldg/radiationSlab2.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/radiationSlab2_v02.txt ${CURRENT_BINARY_DIR} geom/bldg/radiationSlab2_v02.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/radiationSlab3.txt ${CURRENT_BINARY_DIR} geom/bldg/radiationSlab3.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/radiationSlab3_v02.txt ${CURRENT_BINARY_DIR} geom/bldg/radiationSlab3_v02.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/radiationSlab4.txt ${CURRENT_BINARY_DIR} geom/bldg/radiationSlab4.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/radiationSlabNE1.txt ${CURRENT_BINARY_DIR} geom/bldg/radiationSlabNE1.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/radiationSlabNE2.txt ${CURRENT_BINARY_DIR} geom/bldg/radiationSlabNE2.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/radiationSlabNE3.txt ${CURRENT_BINARY_DIR} geom/bldg/radiationSlabNE3.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/radiationSlabNE4.txt ${CURRENT_BINARY_DIR} geom/bldg/radiationSlabNE4.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/radiationSlabNE5.txt ${CURRENT_BINARY_DIR} geom/bldg/radiationSlabNE5.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/remoteHandlingCeilingSliver.txt ${CURRENT_BINARY_DIR} geom/bldg/remoteHandlingCeilingSliver.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/remoteHandlingCeilingSliver_v02.txt ${CURRENT_BINARY_DIR} geom/bldg/remoteHandlingCeilingSliver_v02.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/remoteHandlingCeilingStrip.txt ${CURRENT_BINARY_DIR} geom/bldg/remoteHandlingCeilingStrip.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/remoteHandlingCeiling.txt ${CURRENT_BINARY_DIR} geom/bldg/remoteHandlingCeiling.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/remoteHandlingCeiling_v02.txt ${CURRENT_BINARY_DIR} geom/bldg/remoteHandlingCeiling_v02.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/remoteHandlingCeiling_v03.txt ${CURRENT_BINARY_DIR} geom/bldg/remoteHandlingCeiling_v03.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/remoteHandlingDoorFrame.txt ${CURRENT_BINARY_DIR} geom/bldg/remoteHandlingDoorFrame.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/remoteHandlingHatchBlock.txt ${CURRENT_BINARY_DIR} geom/bldg/remoteHandlingHatchBlock.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/remoteHandlingHatchBlock_v02.txt ${CURRENT_BINARY_DIR} geom/bldg/remoteHandlingHatchBlock_v02.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/remoteHandlingHatchLid.txt ${CURRENT_BINARY_DIR} geom/bldg/remoteHandlingHatchLid.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/remoteHandlingHatchLid_v02.txt ${CURRENT_BINARY_DIR} geom/bldg/remoteHandlingHatchLid_v02.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/remoteHandlingHatchLower.txt ${CURRENT_BINARY_DIR} geom/bldg/remoteHandlingHatchLower.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/remoteHandlingHatchUpper.txt ${CURRENT_BINARY_DIR} geom/bldg/remoteHandlingHatchUpper.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/remoteHandlingInteriorBeam.txt ${CURRENT_BINARY_DIR} geom/bldg/remoteHandlingInteriorBeam.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/remoteHandlingInteriorWall1.txt ${CURRENT_BINARY_DIR} geom/bldg/remoteHandlingInteriorWall1.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/remoteHandlingInteriorWall2.txt ${CURRENT_BINARY_DIR} geom/bldg/remoteHandlingInteriorWall2.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/remoteHandlingInteriorWall3.txt ${CURRENT_BINARY_DIR} geom/bldg/remoteHandlingInteriorWall3.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/remoteHandlingInteriorWall4.txt ${CURRENT_BINARY_DIR} geom/bldg/remoteHandlingInteriorWall4.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/remoteHandlingInteriorWall5.txt ${CURRENT_BINARY_DIR} geom/bldg/remoteHandlingInteriorWall5.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/remoteHandlingInteriorWall6.txt ${CURRENT_BINARY_DIR} geom/bldg/remoteHandlingInteriorWall6.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/remoteHandlingInteriorWall7.txt ${CURRENT_BINARY_DIR} geom/bldg/remoteHandlingInteriorWall7.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/remoteHandlingInteriorWallNotch1.txt ${CURRENT_BINARY_DIR} geom/bldg/remoteHandlingInteriorWallNotch1.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/remoteHandlingInteriorWallNotch2.txt ${CURRENT_BINARY_DIR} geom/bldg/remoteHandlingInteriorWallNotch2.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/remoteHandlingSteelDoor1.txt ${CURRENT_BINARY_DIR} geom/bldg/remoteHandlingSteelDoor1.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/remoteHandlingSteelDoor2.txt ${CURRENT_BINARY_DIR} geom/bldg/remoteHandlingSteelDoor2.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/remoteHandling.txt ${CURRENT_BINARY_DIR} geom/bldg/remoteHandling.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/remoteHandling_v02.txt ${CURRENT_BINARY_DIR} geom/bldg/remoteHandling_v02.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/SRetainingWallFoot.txt ${CURRENT_BINARY_DIR} geom/bldg/SRetainingWallFoot.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/SRetainingWall.txt ${CURRENT_BINARY_DIR} geom/bldg/SRetainingWall.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/tempDirtBackfillPsAreaBaselevel.txt ${CURRENT_BINARY_DIR} geom/bldg/tempDirtBackfillPsAreaBaselevel.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/tempDirtBackfillPsAreaInter.txt ${CURRENT_BINARY_DIR} geom/bldg/tempDirtBackfillPsAreaInter.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/tempDirtBackfillPsAreaLower.txt ${CURRENT_BINARY_DIR} geom/bldg/tempDirtBackfillPsAreaLower.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/tempDirtBackfillPsAreaRWallFootLevel.txt ${CURRENT_BINARY_DIR} geom/bldg/tempDirtBackfillPsAreaRWallFootLevel.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/tempDirtBackfillPsAreaTopLayer.txt ${CURRENT_BINARY_DIR} geom/bldg/tempDirtBackfillPsAreaTopLayer.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/tsAreaAlcoveLowerRoof.txt ${CURRENT_BINARY_DIR} geom/bldg/tsAreaAlcoveLowerRoof.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/tsAreaAlcoveVerticalN.txt ${CURRENT_BINARY_DIR} geom/bldg/tsAreaAlcoveVerticalN.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/tsAreaAlcoveVerticalS.txt ${CURRENT_BINARY_DIR} geom/bldg/tsAreaAlcoveVerticalS.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/tsAreaHatchBlockNBot.txt ${CURRENT_BINARY_DIR} geom/bldg/tsAreaHatchBlockNBot.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/tsAreaHatchBlockNTop.txt ${CURRENT_BINARY_DIR} geom/bldg/tsAreaHatchBlockNTop.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/tsAreaHatchBlockSBot.txt ${CURRENT_BINARY_DIR} geom/bldg/tsAreaHatchBlockSBot.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/tsAreaHatchBlockSTop.txt ${CURRENT_BINARY_DIR} geom/bldg/tsAreaHatchBlockSTop.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/tsAreaHatchELedge.txt ${CURRENT_BINARY_DIR} geom/bldg/tsAreaHatchELedge.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/tsAreaHatchWEdge.txt ${CURRENT_BINARY_DIR} geom/bldg/tsAreaHatchWEdge.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/tsAreaHatchWLedge.txt ${CURRENT_BINARY_DIR} geom/bldg/tsAreaHatchWLedge.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/tsAreaStairwellCeiling.txt ${CURRENT_BINARY_DIR} geom/bldg/tsAreaStairwellCeiling.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/tsAreaStairwell.txt ${CURRENT_BINARY_DIR} geom/bldg/tsAreaStairwell.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/tsAreaTrenchFloor.txt ${CURRENT_BINARY_DIR} geom/bldg/tsAreaTrenchFloor.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/tsAreaUpper2W.txt ${CURRENT_BINARY_DIR} geom/bldg/tsAreaUpper2W.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/tsAreaUpper2W_v02.txt ${CURRENT_BINARY_DIR} geom/bldg/tsAreaUpper2W_v02.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/tsAreaUpperW.txt ${CURRENT_BINARY_DIR} geom/bldg/tsAreaUpperW.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/tsAreaW.txt ${CURRENT_BINARY_DIR} geom/bldg/tsAreaW.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/tsDsAreaFirstFloorEdgeN.txt ${CURRENT_BINARY_DIR} geom/bldg/tsDsAreaFirstFloorEdgeN.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/tsDsAreaFirstFloorEdgeN_v02.txt ${CURRENT_BINARY_DIR} geom/bldg/tsDsAreaFirstFloorEdgeN_v02.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/tsDsAreaWallinsertN.txt ${CURRENT_BINARY_DIR} geom/bldg/tsDsAreaWallinsertN.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/tsDsAreaWallinsertN_v02.txt ${CURRENT_BINARY_DIR} geom/bldg/tsDsAreaWallinsertN_v02.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/WTSareaCF1notch.txt ${CURRENT_BINARY_DIR} geom/bldg/WTSareaCF1notch.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/WTSareaCF1.txt ${CURRENT_BINARY_DIR} geom/bldg/WTSareaCF1.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/WTSareaCF2notch.txt ${CURRENT_BINARY_DIR} geom/bldg/WTSareaCF2notch.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/WTSareaCF2.txt ${CURRENT_BINARY_DIR} geom/bldg/WTSareaCF2.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/WTSareaCFbeam.txt ${CURRENT_BINARY_DIR} geom/bldg/WTSareaCFbeam.txt COPYONLY) + + + +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/calorimeter_BaF2.txt ${CURRENT_BINARY_DIR} geom/calorimeter_BaF2.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/calorimeter_CsI.txt ${CURRENT_BINARY_DIR} geom/calorimeter_CsI.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/crv_counters_extracted_v01.txt ${CURRENT_BINARY_DIR} geom/crv_counters_extracted_v01.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/crv_counters.txt ${CURRENT_BINARY_DIR} geom/crv_counters.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/crv_counters_v02.txt ${CURRENT_BINARY_DIR} geom/crv_counters_v02.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/crv_counters_v03_split_top.txt ${CURRENT_BINARY_DIR} geom/crv_counters_v03_split_top.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/crv_counters_v03.txt ${CURRENT_BINARY_DIR} geom/crv_counters_v03.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/crv_counters_v07.txt ${CURRENT_BINARY_DIR} geom/crv_counters_v07.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/crv_counters_v08.txt ${CURRENT_BINARY_DIR} geom/crv_counters_v08.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/crv_counters_v09.txt ${CURRENT_BINARY_DIR} geom/crv_counters_v09.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/degrader_v01.txt ${CURRENT_BINARY_DIR} geom/degrader_v01.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/degrader_v02.txt ${CURRENT_BINARY_DIR} geom/degrader_v02.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/DetectorSolenoid_v02.txt ${CURRENT_BINARY_DIR} geom/DetectorSolenoid_v02.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/DetectorSolenoid_v03.txt ${CURRENT_BINARY_DIR} geom/DetectorSolenoid_v03.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/DetectorSolenoid_v04.txt ${CURRENT_BINARY_DIR} geom/DetectorSolenoid_v04.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/DetectorSolenoid_v05.txt ${CURRENT_BINARY_DIR} geom/DetectorSolenoid_v05.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/DSShielding_STM.txt ${CURRENT_BINARY_DIR} geom/DSShielding_STM.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/DSShielding_v01.txt ${CURRENT_BINARY_DIR} geom/DSShielding_v01.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/DSShielding_v02.txt ${CURRENT_BINARY_DIR} geom/DSShielding_v02.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/DSShielding_v03.txt ${CURRENT_BINARY_DIR} geom/DSShielding_v03.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/ElectronicRack_v01.txt ${CURRENT_BINARY_DIR} geom/ElectronicRack_v01.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/ElectronicRack_v02.txt ${CURRENT_BINARY_DIR} geom/ElectronicRack_v02.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/extmon_fnal_v02.txt ${CURRENT_BINARY_DIR} geom/extmon_fnal_v02.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/ExtShieldDownstream_cd3.txt ${CURRENT_BINARY_DIR} geom/ExtShieldDownstream_cd3.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/ExtShieldDownstream_NoShields.txt ${CURRENT_BINARY_DIR} geom/ExtShieldDownstream_NoShields.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/ExtShieldDownstream_v01.txt ${CURRENT_BINARY_DIR} geom/ExtShieldDownstream_v01.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/ExtShieldDownstream_v02.txt ${CURRENT_BINARY_DIR} geom/ExtShieldDownstream_v02.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/ExtShieldDownstream_v03.txt ${CURRENT_BINARY_DIR} geom/ExtShieldDownstream_v03.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/ExtShieldDownstream_v04.txt ${CURRENT_BINARY_DIR} geom/ExtShieldDownstream_v04.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/ExtShieldDownstream_v05.txt ${CURRENT_BINARY_DIR} geom/ExtShieldDownstream_v05.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/ExtShieldDownstream_v06.txt ${CURRENT_BINARY_DIR} geom/ExtShieldDownstream_v06.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/ExtShieldUpstream_cd3.txt ${CURRENT_BINARY_DIR} geom/ExtShieldUpstream_cd3.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/ExtShieldUpstream_NoShields.txt ${CURRENT_BINARY_DIR} geom/ExtShieldUpstream_NoShields.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/ExtShieldUpstream_v01.txt ${CURRENT_BINARY_DIR} geom/ExtShieldUpstream_v01.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/ExtShieldUpstream_v02.txt ${CURRENT_BINARY_DIR} geom/ExtShieldUpstream_v02.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/ExtShieldUpstream_v03.txt ${CURRENT_BINARY_DIR} geom/ExtShieldUpstream_v03.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/ExtShieldUpstream_v04.txt ${CURRENT_BINARY_DIR} geom/ExtShieldUpstream_v04.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/ExtShieldUpstream_v05.txt ${CURRENT_BINARY_DIR} geom/ExtShieldUpstream_v05.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/ExtShieldUpstream_v06.txt ${CURRENT_BINARY_DIR} geom/ExtShieldUpstream_v06.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/g4_visOptions.txt ${CURRENT_BINARY_DIR} geom/g4_visOptions.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/geom_2019_PhaseI_hayman_v2.txt ${CURRENT_BINARY_DIR} geom/geom_2019_PhaseI_hayman_v2.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/geom_2019_PhaseII.txt ${CURRENT_BINARY_DIR} geom/geom_2019_PhaseII.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/geom_2019_PhaseI.txt ${CURRENT_BINARY_DIR} geom/geom_2019_PhaseI.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/geom_2021_PhaseI.txt ${CURRENT_BINARY_DIR} geom/geom_2021_PhaseI.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/geom_2021_PhaseI_v02.txt ${CURRENT_BINARY_DIR} geom/geom_2021_PhaseI_v02.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/geom_2021_PhaseI_v03.txt ${CURRENT_BINARY_DIR} geom/geom_2021_PhaseI_v03.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/geom_common_cd3_s3p2.txt ${CURRENT_BINARY_DIR} geom/geom_common_cd3_s3p2.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/geom_common_cd3_s4p2_backgroundSim.txt ${CURRENT_BINARY_DIR} geom/geom_common_cd3_s4p2_backgroundSim.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/geom_common_cd3_s4p2.txt ${CURRENT_BINARY_DIR} geom/geom_common_cd3_s4p2.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/geom_common_crv_v07.txt ${CURRENT_BINARY_DIR} geom/geom_common_crv_v07.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/geom_common_current_ExtendedDiffusionPump.txt ${CURRENT_BINARY_DIR} geom/geom_common_current_ExtendedDiffusionPump.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/geom_common_current.txt ${CURRENT_BINARY_DIR} geom/geom_common_current.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/geom_common_DOE_review_2017.txt ${CURRENT_BINARY_DIR} geom/geom_common_DOE_review_2017.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/geom_common_extracted.txt ${CURRENT_BINARY_DIR} geom/geom_common_extracted.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/geom_common_haymanLowerDensity.txt ${CURRENT_BINARY_DIR} geom/geom_common_haymanLowerDensity.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/geom_common_hayman_v2_TS06.txt ${CURRENT_BINARY_DIR} geom/geom_common_hayman_v2_TS06.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/geom_common_hayman_v2.txt ${CURRENT_BINARY_DIR} geom/geom_common_hayman_v2.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/geom_common_MARSrunMay17.txt ${CURRENT_BINARY_DIR} geom/geom_common_MARSrunMay17.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/geom_common_muplus.txt ${CURRENT_BINARY_DIR} geom/geom_common_muplus.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/geom_common_newTargPS.txt ${CURRENT_BINARY_DIR} geom/geom_common_newTargPS.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/geom_common_newTargPS_v3.txt ${CURRENT_BINARY_DIR} geom/geom_common_newTargPS_v3.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/geom_common_TrackerShldStdyJun17.txt ${CURRENT_BINARY_DIR} geom/geom_common_TrackerShldStdyJun17.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/geom_common_trackerVST.txt ${CURRENT_BINARY_DIR} geom/geom_common_trackerVST.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/geom_common.txt ${CURRENT_BINARY_DIR} geom/geom_common.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/geom_CRY_Summer2020.txt ${CURRENT_BINARY_DIR} geom/geom_CRY_Summer2020.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/geom_MARS_2019.txt ${CURRENT_BINARY_DIR} geom/geom_MARS_2019.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/geom_SurfaceCheck_Select.txt ${CURRENT_BINARY_DIR} geom/geom_SurfaceCheck_Select.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/geom_SurfaceCheck.txt ${CURRENT_BINARY_DIR} geom/geom_SurfaceCheck.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/geom_Wideband_1CrvModule.txt ${CURRENT_BINARY_DIR} geom/geom_Wideband_1CrvModule.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/MSTM_v01.txt ${CURRENT_BINARY_DIR} geom/MSTM_v01.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/mu2eBuilding.txt ${CURRENT_BINARY_DIR} geom/mu2eBuilding.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/mu2eHall.txt ${CURRENT_BINARY_DIR} geom/mu2eHall.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/mu2eHall_v02.txt ${CURRENT_BINARY_DIR} geom/mu2eHall_v02.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/mu2eHall_v03.txt ${CURRENT_BINARY_DIR} geom/mu2eHall_v03.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/mu2eHall_v04.txt ${CURRENT_BINARY_DIR} geom/mu2eHall_v04.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/mu2eWorld.txt ${CURRENT_BINARY_DIR} geom/mu2eWorld.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/muonBeamStop.txt ${CURRENT_BINARY_DIR} geom/muonBeamStop.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/muonBeamStop_v02.txt ${CURRENT_BINARY_DIR} geom/muonBeamStop_v02.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/muonBeamStop_v03.txt ${CURRENT_BINARY_DIR} geom/muonBeamStop_v03.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/muonBeamStop_v04.txt ${CURRENT_BINARY_DIR} geom/muonBeamStop_v04.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/muonBeamStop_v05.txt ${CURRENT_BINARY_DIR} geom/muonBeamStop_v05.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/muonBeamStop_v06.txt ${CURRENT_BINARY_DIR} geom/muonBeamStop_v06.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/muonBeamStop_v07.txt ${CURRENT_BINARY_DIR} geom/muonBeamStop_v07.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/muonBeamStop_v08.txt ${CURRENT_BINARY_DIR} geom/muonBeamStop_v08.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/pionDegrader.txt ${CURRENT_BINARY_DIR} geom/pionDegrader.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/Pipe_v01.txt ${CURRENT_BINARY_DIR} geom/Pipe_v01.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/Pipe_v02.txt ${CURRENT_BINARY_DIR} geom/Pipe_v02.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/Pipe_v03.txt ${CURRENT_BINARY_DIR} geom/Pipe_v03.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/Pipe_v04.txt ${CURRENT_BINARY_DIR} geom/Pipe_v04.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/ProductionSolenoid_v01.txt ${CURRENT_BINARY_DIR} geom/ProductionSolenoid_v01.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/ProductionSolenoid_v02.txt ${CURRENT_BINARY_DIR} geom/ProductionSolenoid_v02.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/ProductionTarget_HaymanLowerDensity.txt ${CURRENT_BINARY_DIR} geom/ProductionTarget_HaymanLowerDensity.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/ProductionTarget_Hayman_v2_0.txt ${CURRENT_BINARY_DIR} geom/ProductionTarget_Hayman_v2_0.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/ProductionTarget_Hayman_v2_1.txt ${CURRENT_BINARY_DIR} geom/ProductionTarget_Hayman_v2_1.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/ProductionTarget_Hayman_v2.txt ${CURRENT_BINARY_DIR} geom/ProductionTarget_Hayman_v2.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/ProductionTargetInPS.txt ${CURRENT_BINARY_DIR} geom/ProductionTargetInPS.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/protonAbsorber_conical_v2.txt ${CURRENT_BINARY_DIR} geom/protonAbsorber_conical_v2.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/protonAbsorber_cylindrical.txt ${CURRENT_BINARY_DIR} geom/protonAbsorber_cylindrical.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/protonAbsorber_cylindrical_v02.txt ${CURRENT_BINARY_DIR} geom/protonAbsorber_cylindrical_v02.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/protonAbsorber_cylindrical_v03.txt ${CURRENT_BINARY_DIR} geom/protonAbsorber_cylindrical_v03.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/protonAbsorber_cylindrical_v04.txt ${CURRENT_BINARY_DIR} geom/protonAbsorber_cylindrical_v04.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/protonBeamDump_v02.txt ${CURRENT_BINARY_DIR} geom/protonBeamDump_v02.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/protonBeamDump_v03.txt ${CURRENT_BINARY_DIR} geom/protonBeamDump_v03.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/psEnclosure_v01.txt ${CURRENT_BINARY_DIR} geom/psEnclosure_v01.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/psEnclosure_v03.txt ${CURRENT_BINARY_DIR} geom/psEnclosure_v03.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/psEnclosure_v04.txt ${CURRENT_BINARY_DIR} geom/psEnclosure_v04.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/psEnclosure_v05.txt ${CURRENT_BINARY_DIR} geom/psEnclosure_v05.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/PSExternalShielding_v01.txt ${CURRENT_BINARY_DIR} geom/PSExternalShielding_v01.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/PSShield_v05.txt ${CURRENT_BINARY_DIR} geom/PSShield_v05.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/PSShield_v06.txt ${CURRENT_BINARY_DIR} geom/PSShield_v06.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/PTM.txt ${CURRENT_BINARY_DIR} geom/PTM.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/PTM_v02.txt ${CURRENT_BINARY_DIR} geom/PTM_v02.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/RotatedColl3.txt ${CURRENT_BINARY_DIR} geom/RotatedColl3.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/Saddle_cd3a.txt ${CURRENT_BINARY_DIR} geom/Saddle_cd3a.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/Saddle_cd3.txt ${CURRENT_BINARY_DIR} geom/Saddle_cd3.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/Saddle_v01.txt ${CURRENT_BINARY_DIR} geom/Saddle_v01.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/Saddle_v02.txt ${CURRENT_BINARY_DIR} geom/Saddle_v02.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/Saddle_v03.txt ${CURRENT_BINARY_DIR} geom/Saddle_v03.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/STM_v01.txt ${CURRENT_BINARY_DIR} geom/STM_v01.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/STM_v02.txt ${CURRENT_BINARY_DIR} geom/STM_v02.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/STM_v03.txt ${CURRENT_BINARY_DIR} geom/STM_v03.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/STM_v04.txt ${CURRENT_BINARY_DIR} geom/STM_v04.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/STM_v05.txt ${CURRENT_BINARY_DIR} geom/STM_v05.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/STM_v06.txt ${CURRENT_BINARY_DIR} geom/STM_v06.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/STM_v07.txt ${CURRENT_BINARY_DIR} geom/STM_v07.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/STM_v08.txt ${CURRENT_BINARY_DIR} geom/STM_v08.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/stoppingTarget_CD3C_34foils.txt ${CURRENT_BINARY_DIR} geom/stoppingTarget_CD3C_34foils.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/stoppingTargetHoles_DOE_review_2017.txt ${CURRENT_BINARY_DIR} geom/stoppingTargetHoles_DOE_review_2017.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/stoppingTargetHoles_v02.txt ${CURRENT_BINARY_DIR} geom/stoppingTargetHoles_v02.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/stoppingTarget_TDR.txt ${CURRENT_BINARY_DIR} geom/stoppingTarget_TDR.txt COPYONLY) + +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/studies/crv_counters_v03_no_CRV_D4.txt ${CURRENT_BINARY_DIR} geom/studies/crv_counters_v03_no_CRV_D4.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/studies/crv_counters_v05.txt ${CURRENT_BINARY_DIR} geom/studies/crv_counters_v05.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/studies/crv_counters_v06.txt ${CURRENT_BINARY_DIR} geom/studies/crv_counters_v06.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/studies/geom_cosmic_v05.txt ${CURRENT_BINARY_DIR} geom/studies/geom_cosmic_v05.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/studies/stoppingTarget_hole-r-18mm_two-extra-disks_forBkgFrames.txt ${CURRENT_BINARY_DIR} geom/studies/stoppingTarget_hole-r-18mm_two-extra-disks_forBkgFrames.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/studies/stoppingTarget_hole-r-18mm_two-extra-disks.txt ${CURRENT_BINARY_DIR} geom/studies/stoppingTarget_hole-r-18mm_two-extra-disks.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/studies/stoppingTarget_hole-r-20mm_forBkgFrames.txt ${CURRENT_BINARY_DIR} geom/studies/stoppingTarget_hole-r-20mm_forBkgFrames.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/studies/stoppingTarget_hole-r-20mm_offset-x--5mm.txt ${CURRENT_BINARY_DIR} geom/studies/stoppingTarget_hole-r-20mm_offset-x--5mm.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/studies/stoppingTarget_hole-r-20mm_offset-x-5mm.txt ${CURRENT_BINARY_DIR} geom/studies/stoppingTarget_hole-r-20mm_offset-x-5mm.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/studies/stoppingTarget_hole-r-20mm_offset-y--5mm.txt ${CURRENT_BINARY_DIR} geom/studies/stoppingTarget_hole-r-20mm_offset-y--5mm.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/studies/stoppingTarget_hole-r-20mm_offset-y-5mm.txt ${CURRENT_BINARY_DIR} geom/studies/stoppingTarget_hole-r-20mm_offset-y-5mm.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/studies/stoppingTarget_hole-r-20mm_two-extra-disks.txt ${CURRENT_BINARY_DIR} geom/studies/stoppingTarget_hole-r-20mm_two-extra-disks.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/studies/stoppingTarget_hole-r-20mm.txt ${CURRENT_BINARY_DIR} geom/studies/stoppingTarget_hole-r-20mm.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/studies/stoppingTarget_hole-r-21-5mm_three-extra-disks_forBkgFrames.txt ${CURRENT_BINARY_DIR} geom/studies/stoppingTarget_hole-r-21-5mm_three-extra-disks_forBkgFrames.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/studies/stoppingTarget_hole-r-21-5mm_three-extra-disks.txt ${CURRENT_BINARY_DIR} geom/studies/stoppingTarget_hole-r-21-5mm_three-extra-disks.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/studies/studyCOL3FlashBlock.txt ${CURRENT_BINARY_DIR} geom/studies/studyCOL3FlashBlock.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/studies/studyTrackerShielding.txt ${CURRENT_BINARY_DIR} geom/studies/studyTrackerShielding.txt COPYONLY) + +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/tracker_cd3_s4p2.txt ${CURRENT_BINARY_DIR} geom/tracker_cd3_s4p2.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/tracker_cd3.txt ${CURRENT_BINARY_DIR} geom/tracker_cd3.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/tracker_v0.txt ${CURRENT_BINARY_DIR} geom/tracker_v0.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/tracker_v3.txt ${CURRENT_BINARY_DIR} geom/tracker_v3.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/tracker_v4.txt ${CURRENT_BINARY_DIR} geom/tracker_v4.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/tracker_v5.txt ${CURRENT_BINARY_DIR} geom/tracker_v5.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/tracker_v6.txt ${CURRENT_BINARY_DIR} geom/tracker_v6.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/TransportSolenoid_DOErev2017.txt ${CURRENT_BINARY_DIR} geom/TransportSolenoid_DOErev2017.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/TransportSolenoid_v01.txt ${CURRENT_BINARY_DIR} geom/TransportSolenoid_v01.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/TransportSolenoid_v02.txt ${CURRENT_BINARY_DIR} geom/TransportSolenoid_v02.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/TransportSolenoid_v03.txt ${CURRENT_BINARY_DIR} geom/TransportSolenoid_v03.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/TransportSolenoid_v04.txt ${CURRENT_BINARY_DIR} geom/TransportSolenoid_v04.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/TransportSolenoid_v05.txt ${CURRENT_BINARY_DIR} geom/TransportSolenoid_v05.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/TransportSolenoid_v06.txt ${CURRENT_BINARY_DIR} geom/TransportSolenoid_v06.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/TransportSolenoid_v07.txt ${CURRENT_BINARY_DIR} geom/TransportSolenoid_v07.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/TransportSolenoid_v08.txt ${CURRENT_BINARY_DIR} geom/TransportSolenoid_v08.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/TSdA_v01.txt ${CURRENT_BINARY_DIR} geom/TSdA_v01.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/TSdA_v02.txt ${CURRENT_BINARY_DIR} geom/TSdA_v02.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/visualization_regions.txt ${CURRENT_BINARY_DIR} geom/visualization_regions.txt COPYONLY) + +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/test/beamline_genconfig.txt ${CURRENT_BINARY_DIR} test/beamline_genconfig.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/test/beamline_geom.txt ${CURRENT_BINARY_DIR} test/beamline_geom.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/test/beamline_xz.mac ${CURRENT_BINARY_DIR} test/beamline_xz.mac COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/test/cosmicconfig_01.txt ${CURRENT_BINARY_DIR} test/cosmicconfig_01.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/test/display_03.C ${CURRENT_BINARY_DIR} test/display_03.C COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/test/g4test_03.C ${CURRENT_BINARY_DIR} test/g4test_03.C COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/test/g4test_03g.C ${CURRENT_BINARY_DIR} test/g4test_03g.C COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/test/g4validate_01.C ${CURRENT_BINARY_DIR} test/g4validate_01.C COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/test/genBrem_01.txt ${CURRENT_BINARY_DIR} test/genBrem_01.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/test/genconfig_01.txt ${CURRENT_BINARY_DIR} test/genconfig_01.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/test/genconfig_02.txt ${CURRENT_BINARY_DIR} test/genconfig_02.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/test/genconfig_03.txt ${CURRENT_BINARY_DIR} test/genconfig_03.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/test/genconfig_04.txt ${CURRENT_BINARY_DIR} test/genconfig_04.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/test/genconfig_05.txt ${CURRENT_BINARY_DIR} test/genconfig_05.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/test/genconfig_DownstreameMinus.txt ${CURRENT_BINARY_DIR} test/genconfig_DownstreameMinus.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/test/genconfig_example.txt ${CURRENT_BINARY_DIR} test/genconfig_example.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/test/genconfig_extMonCommon.txt ${CURRENT_BINARY_DIR} test/genconfig_extMonCommon.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/test/genconfig_mucapture.txt ${CURRENT_BINARY_DIR} test/genconfig_mucapture.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/test/geom_01_LowDetailGraphics.txt ${CURRENT_BINARY_DIR} test/geom_01_LowDetailGraphics.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/test/geom_01.txt ${CURRENT_BINARY_DIR} test/geom_01.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/test/geom_cd3.txt ${CURRENT_BINARY_DIR} test/geom_cd3.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/test/geom_cosmic.txt ${CURRENT_BINARY_DIR} test/geom_cosmic.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/test/geom_DifferentTTrackerRadius.txt ${CURRENT_BINARY_DIR} test/geom_DifferentTTrackerRadius.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/test/geom_dsfield.txt ${CURRENT_BINARY_DIR} test/geom_dsfield.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/test/geom_extMonCommon.txt ${CURRENT_BINARY_DIR} test/geom_extMonCommon.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/test/geom_ga03.txt ${CURRENT_BINARY_DIR} test/geom_ga03.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/test/geom_ga04.txt ${CURRENT_BINARY_DIR} test/geom_ga04.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/test/geom_ga05_custom.txt ${CURRENT_BINARY_DIR} test/geom_ga05_custom.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/test/geom_ga05.txt ${CURRENT_BINARY_DIR} test/geom_ga05.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/test/geom_mau10_custom.txt ${CURRENT_BINARY_DIR} test/geom_mau10_custom.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/test/geom_mucapture.txt ${CURRENT_BINARY_DIR} test/geom_mucapture.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/test/geom_tdr.txt ${CURRENT_BINARY_DIR} test/geom_tdr.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/test/geom_writeBF.txt ${CURRENT_BINARY_DIR} test/geom_writeBF.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/test/iontest.fcl ${CURRENT_BINARY_DIR} test/iontest.fcl COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/test/iontest_g4s1.fcl ${CURRENT_BINARY_DIR} test/iontest_g4s1.fcl COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/test/iontest_g4s2.fcl ${CURRENT_BINARY_DIR} test/iontest_g4s2.fcl COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/test/mu2e_gdml.C ${CURRENT_BINARY_DIR} test/mu2e_gdml.C COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/test/multiDIO.txt ${CURRENT_BINARY_DIR} test/multiDIO.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/test/pi_e_nu_genconfig.txt ${CURRENT_BINARY_DIR} test/pi_e_nu_genconfig.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/test/pi_e_nu_geom.txt ${CURRENT_BINARY_DIR} test/pi_e_nu_geom.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/test/protonBeamDump_v01.txt ${CURRENT_BINARY_DIR} test/protonBeamDump_v01.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/test/StepsDiag.C ${CURRENT_BINARY_DIR} test/StepsDiag.C COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/test/sthktfO.C ${CURRENT_BINARY_DIR} test/sthktfO.C COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/test/strawHits.C ${CURRENT_BINARY_DIR} test/strawHits.C COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/test/strawHitsO.C ${CURRENT_BINARY_DIR} test/strawHitsO.C COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/test/visualization_regions.txt ${CURRENT_BINARY_DIR} test/visualization_regions.txt COPYONLY) + +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/vis/vis4530.mac ${CURRENT_BINARY_DIR} vis/vis4530.mac COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/vis/vis45.mac ${CURRENT_BINARY_DIR} vis/vis45.mac COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/vis/vismqt.mac ${CURRENT_BINARY_DIR} vis/vismqt.mac COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/vis/vismqtm.mac ${CURRENT_BINARY_DIR} vis/vismqtm.mac COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/vis/visqtGUI.mac ${CURRENT_BINARY_DIR} vis/visqtGUI.mac COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/vis/visTree.mac ${CURRENT_BINARY_DIR} vis/visTree.mac COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/vis/visxy.mac ${CURRENT_BINARY_DIR} vis/visxy.mac COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/vis/visxz.mac ${CURRENT_BINARY_DIR} vis/visxz.mac COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/vis/visyz.mac ${CURRENT_BINARY_DIR} vis/visyz.mac COPYONLY) + install_source(SUBDIRS src) install_headers(USE_PROJECT_NAME SUBDIRS inc) install_fhicl(SUBDIRS fcl SUBDIRNAME Offline/Mu2eG4/fcl) diff --git a/Mu2eKinKal/CMakeLists.txt b/Mu2eKinKal/CMakeLists.txt index 9f6737eed4..411ed12e34 100644 --- a/Mu2eKinKal/CMakeLists.txt +++ b/Mu2eKinKal/CMakeLists.txt @@ -80,6 +80,19 @@ cet_build_plugin(LoopHelixFit art::module ) + +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/data/TrainBkgFinal.dat ${CURRENT_BINARY_DIR} data/TrainBkgFinal.dat COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/data/TrainBkgSeed.dat ${CURRENT_BINARY_DIR} data/TrainBkgSeed.dat COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/data/TrainBkgTrigger.dat ${CURRENT_BINARY_DIR} data/TrainBkgTrigger.dat COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/data/TrainCluster_Stage0.dat ${CURRENT_BINARY_DIR} data/TrainCluster_Stage0.dat COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/data/TrainCluster_Stage1.dat ${CURRENT_BINARY_DIR} data/TrainCluster_Stage1.dat COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/data/TrainSign_Stage0.dat ${CURRENT_BINARY_DIR} data/TrainSign_Stage0.dat COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/data/TrainSign_Stage1.dat ${CURRENT_BINARY_DIR} data/TrainSign_Stage1.dat COPYONLY) + +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/fcl/prolog.fcl ${CURRENT_BINARY_DIR} fcl/prolog.fcl COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/fcl/prolog_trigger.fcl ${CURRENT_BINARY_DIR} fcl/prolog_trigger.fcl COPYONLY) + install_source(SUBDIRS src) install_headers(USE_PROJECT_NAME SUBDIRS inc) install_fhicl(SUBDIRS fcl SUBDIRNAME Offline/Mu2eKinKal/fcl) + diff --git a/Mu2eReco/CMakeLists.txt b/Mu2eReco/CMakeLists.txt index e69de29bb2..ab20bd7b79 100644 --- a/Mu2eReco/CMakeLists.txt +++ b/Mu2eReco/CMakeLists.txt @@ -0,0 +1 @@ +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/recoGeom_common_current.txt ${CURRENT_BINARY_DIR} geom/recoGeom_common_current.txt COPYONLY) diff --git a/Mu2eUtilities/CMakeLists.txt b/Mu2eUtilities/CMakeLists.txt index 656be1661f..e34d3d3144 100644 --- a/Mu2eUtilities/CMakeLists.txt +++ b/Mu2eUtilities/CMakeLists.txt @@ -73,5 +73,13 @@ cet_make_library( XercesC::XercesC ) + +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/data/acDipoleTransmissionFunction_20160511.txt ${CURRENT_BINARY_DIR} data/acDipoleTransmissionFunction_20160511.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/data/potTimingDistribution_20160511.txt ${CURRENT_BINARY_DIR} data/potTimingDistribution_20160511.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/data/potTimingDistribution_38ms.txt ${CURRENT_BINARY_DIR} data/potTimingDistribution_38ms.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/data/potTimingDistribution_avg.txt ${CURRENT_BINARY_DIR} data/potTimingDistribution_avg.txt COPYONLY) + + + install_source(SUBDIRS src) install_headers(USE_PROJECT_NAME SUBDIRS inc) diff --git a/ParticleID/CMakeLists.txt b/ParticleID/CMakeLists.txt index 711e74bed7..cd564dde56 100644 --- a/ParticleID/CMakeLists.txt +++ b/ParticleID/CMakeLists.txt @@ -34,6 +34,9 @@ cet_build_plugin(ParticleIDRead art::module Offline::RecoDataProducts ) + +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/fcl/prolog.fcl ${CURRENT_BINARY_DIR} fcl/prolog.fcl COPYONLY) + install_source(SUBDIRS src) install_headers(USE_PROJECT_NAME SUBDIRS inc) install_fhicl(SUBDIRS fcl SUBDIRNAME Offline/ParticleID/fcl) diff --git a/Print/CMakeLists.txt b/Print/CMakeLists.txt index 1061786d82..27ee117fd0 100644 --- a/Print/CMakeLists.txt +++ b/Print/CMakeLists.txt @@ -103,6 +103,26 @@ cet_build_plugin(RunSubrunEvent art::module ) + +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/fcl/count.fcl ${CURRENT_BINARY_DIR} fcl/count.fcl COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/fcl/dumpDataProducts.fcl ${CURRENT_BINARY_DIR} fcl/dumpDataProducts.fcl COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/fcl/events.fcl ${CURRENT_BINARY_DIR} fcl/events.fcl COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/fcl/fileDumper.fcl ${CURRENT_BINARY_DIR} fcl/fileDumper.fcl COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/fcl/printCosmicLivetime.fcl ${CURRENT_BINARY_DIR} fcl/printCosmicLivetime.fcl COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/fcl/printCrvCoincidenceCluster.fcl ${CURRENT_BINARY_DIR} fcl/printCrvCoincidenceCluster.fcl COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/fcl/printEventWindowMarker.fcl ${CURRENT_BINARY_DIR} fcl/printEventWindowMarker.fcl COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/fcl/print.fcl ${CURRENT_BINARY_DIR} fcl/print.fcl COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/fcl/printGenParticle.fcl ${CURRENT_BINARY_DIR} fcl/printGenParticle.fcl COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/fcl/printLong.fcl ${CURRENT_BINARY_DIR} fcl/printLong.fcl COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/fcl/printMCTrajectory.fcl ${CURRENT_BINARY_DIR} fcl/printMCTrajectory.fcl COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/fcl/printMetadata.fcl ${CURRENT_BINARY_DIR} fcl/printMetadata.fcl COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/fcl/printMetadataSim.fcl ${CURRENT_BINARY_DIR} fcl/printMetadataSim.fcl COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/fcl/printPrimaryParticle.fcl ${CURRENT_BINARY_DIR} fcl/printPrimaryParticle.fcl COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/fcl/printSimParticle.fcl ${CURRENT_BINARY_DIR} fcl/printSimParticle.fcl COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/fcl/printStepPointMC.fcl ${CURRENT_BINARY_DIR} fcl/printStepPointMC.fcl COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/fcl/printStrawDigiMC.fcl ${CURRENT_BINARY_DIR} fcl/printStrawDigiMC.fcl COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/fcl/printStrawGasStep.fcl ${CURRENT_BINARY_DIR} fcl/printStrawGasStep.fcl COPYONLY) + install_source(SUBDIRS src) install_headers(USE_PROJECT_NAME SUBDIRS inc) install_fhicl(SUBDIRS fcl SUBDIRNAME Offline/Print/fcl) diff --git a/ProditionsService/CMakeLists.txt b/ProditionsService/CMakeLists.txt index 07dd66ad6f..6d789567ac 100644 --- a/ProditionsService/CMakeLists.txt +++ b/ProditionsService/CMakeLists.txt @@ -43,6 +43,8 @@ cet_build_plugin(ProditionsTest art::module Offline::CRVConditions ) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/fcl/prolog.fcl ${CURRENT_BINARY_DIR} fcl/prolog.fcl COPYONLY) + install_source(SUBDIRS src) install_headers(USE_PROJECT_NAME SUBDIRS inc) install_fhicl(SUBDIRS fcl SUBDIRNAME Offline/ProditionsService/fcl) diff --git a/STMConditions/CMakeLists.txt b/STMConditions/CMakeLists.txt index 9eb0aa61d3..1817f6def0 100644 --- a/STMConditions/CMakeLists.txt +++ b/STMConditions/CMakeLists.txt @@ -9,6 +9,8 @@ cet_make_library( Offline::STMConfig ) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/fcl/prolog.fcl ${CURRENT_BINARY_DIR} fcl/prolog.fcl COPYONLY) + install_source(SUBDIRS src) install_headers(USE_PROJECT_NAME SUBDIRS inc) install_fhicl(SUBDIRS fcl SUBDIRNAME Offline/STMConditions/fcl) diff --git a/STMReco/CMakeLists.txt b/STMReco/CMakeLists.txt index 041f64cd3b..4d73903830 100644 --- a/STMReco/CMakeLists.txt +++ b/STMReco/CMakeLists.txt @@ -55,5 +55,18 @@ cet_build_plugin(STMZeroSuppression art::module Offline::STMConditions ) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/fcl/makeSTMHits.fcl ${CURRENT_BINARY_DIR} fcl/makeSTMHits.fcl COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/fcl/makeSTMHits_testbeam.fcl ${CURRENT_BINARY_DIR} fcl/makeSTMHits_testbeam.fcl COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/fcl/mwd.fcl ${CURRENT_BINARY_DIR} fcl/mwd.fcl COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/fcl/mwd_testbeam.fcl ${CURRENT_BINARY_DIR} fcl/mwd_testbeam.fcl COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/fcl/plotSTMEnergySpectrum.fcl ${CURRENT_BINARY_DIR} fcl/plotSTMEnergySpectrum.fcl COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/fcl/plotSTMMWDSpectrum.fcl ${CURRENT_BINARY_DIR} fcl/plotSTMMWDSpectrum.fcl COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/fcl/plotSTMWaveformDigis.fcl ${CURRENT_BINARY_DIR} fcl/plotSTMWaveformDigis.fcl COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/fcl/prolog.fcl ${CURRENT_BINARY_DIR} fcl/prolog.fcl COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/fcl/prolog_testbeam.fcl ${CURRENT_BINARY_DIR} fcl/prolog_testbeam.fcl COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/fcl/zeroSuppression.fcl ${CURRENT_BINARY_DIR} fcl/zeroSuppression.fcl COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/fcl/zeroSuppression_testbeam.fcl ${CURRENT_BINARY_DIR} fcl/zeroSuppression_testbeam.fcl COPYONLY) + + install_source(SUBDIRS src) install_fhicl(SUBDIRS fcl SUBDIRNAME Offline/STMReco/fcl) diff --git a/SimulationConditions/CMakeLists.txt b/SimulationConditions/CMakeLists.txt index 204027e1a4..4c0ea9e3cd 100644 --- a/SimulationConditions/CMakeLists.txt +++ b/SimulationConditions/CMakeLists.txt @@ -11,6 +11,8 @@ cet_make_library( Offline::SimulationConfig ) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/fcl/prolog.fcl ${CURRENT_BINARY_DIR} fcl/prolog.fcl COPYONLY) + install_source(SUBDIRS src) install_headers(USE_PROJECT_NAME SUBDIRS inc) install_fhicl(SUBDIRS fcl SUBDIRNAME Offline/SimulationConditions/fcl) diff --git a/TEveEventDisplay/CMakeLists.txt b/TEveEventDisplay/CMakeLists.txt index ad67938a4d..22622b9872 100644 --- a/TEveEventDisplay/CMakeLists.txt +++ b/TEveEventDisplay/CMakeLists.txt @@ -58,5 +58,8 @@ art_dictionary( NO_CHECK_CLASS_VERSION # For some reason this segfaults DICTIONARY_LIBRARIES Offline::TEveEventDisplay ) + +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/fcl/prolog.fcl ${CURRENT_BINARY_DIR} fcl/prolog.fcl COPYONLY) + install_source(SUBDIRS src) install_fhicl(SUBDIRS fcl SUBDIRNAME Offline/TEveEventDisplay/fcl) diff --git a/TrackCaloMatching/CMakeLists.txt b/TrackCaloMatching/CMakeLists.txt index 750d05a449..f32f60fdd0 100644 --- a/TrackCaloMatching/CMakeLists.txt +++ b/TrackCaloMatching/CMakeLists.txt @@ -57,5 +57,7 @@ cet_build_plugin(TrkExtrapol art::module Offline::TrackerGeom ) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/fcl/prolog.fcl ${CURRENT_BINARY_DIR} fcl/prolog.fcl COPYONLY) + install_source(SUBDIRS src) install_fhicl(SUBDIRS fcl SUBDIRNAME Offline/TrackCaloMatching/fcl) diff --git a/TrackerConditions/CMakeLists.txt b/TrackerConditions/CMakeLists.txt index 412eeea5e7..9f6ca543ee 100644 --- a/TrackerConditions/CMakeLists.txt +++ b/TrackerConditions/CMakeLists.txt @@ -34,6 +34,20 @@ cet_make_library( Offline::TrackerGeom ) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/data/E2v.tbl ${CURRENT_BINARY_DIR} data/E2v.tbl COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/data/ElementsList.data ${CURRENT_BINARY_DIR} data/ElementsList.data COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/data/IsotopesList.data ${CURRENT_BINARY_DIR} data/IsotopesList.data COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/data/MaterialsList.data ${CURRENT_BINARY_DIR} data/MaterialsList.data COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/data/MisalignTracker.txt ${CURRENT_BINARY_DIR} data/MisalignTracker.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/data/NoMisalignTracker.txt ${CURRENT_BINARY_DIR} data/NoMisalignTracker.txt COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/data/TrackerStatusTest.txt ${CURRENT_BINARY_DIR} data/TrackerStatusTest.txt COPYONLY) + +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/fcl/MDCThresholds.fcl ${CURRENT_BINARY_DIR} fcl/MDCThresholds.fcl COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/fcl/prolog.fcl ${CURRENT_BINARY_DIR} fcl/prolog.fcl COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/fcl/testProditions.fcl ${CURRENT_BINARY_DIR} fcl/testProditions.fcl COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/fcl/testTrackerAlignment.fcl ${CURRENT_BINARY_DIR} fcl/testTrackerAlignment.fcl COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/fcl/testTrackerStatus.fcl ${CURRENT_BINARY_DIR} fcl/testTrackerStatus.fcl COPYONLY) + install_source(SUBDIRS src) install_headers(USE_PROJECT_NAME SUBDIRS inc) install_fhicl(SUBDIRS fcl SUBDIRNAME Offline/TrackerConditions/fcl) diff --git a/TrackerMC/CMakeLists.txt b/TrackerMC/CMakeLists.txt index b71eda98df..20720373cd 100644 --- a/TrackerMC/CMakeLists.txt +++ b/TrackerMC/CMakeLists.txt @@ -69,6 +69,9 @@ art_dictionary( NO_CHECK_CLASS_VERSION # For some reason this segfaults DICTIONARY_LIBRARIES Offline::TrackerMC ) + +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/fcl/prolog.fcl ${CURRENT_BINARY_DIR} fcl/prolog.fcl COPYONLY) + install_source(SUBDIRS src) install_headers(USE_PROJECT_NAME SUBDIRS inc) install_fhicl(SUBDIRS fcl SUBDIRNAME Offline/TrackerMC/fcl) diff --git a/Trigger/CMakeLists.txt b/Trigger/CMakeLists.txt index 180b240de7..2c597cf56b 100644 --- a/Trigger/CMakeLists.txt +++ b/Trigger/CMakeLists.txt @@ -38,5 +38,7 @@ cet_build_plugin(ReadTriggerInfo art::module Offline::TrackerGeom ) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/fcl/prolog_trigger.fcl ${CURRENT_BINARY_DIR} fcl/prolog_trigger.fcl COPYONLY) + install_source(SUBDIRS src) install_fhicl(SUBDIRS fcl SUBDIRNAME Offline/Trigger/fcl) diff --git a/TrkDiag/CMakeLists.txt b/TrkDiag/CMakeLists.txt index d9327c9b71..b6953253dd 100644 --- a/TrkDiag/CMakeLists.txt +++ b/TrkDiag/CMakeLists.txt @@ -187,6 +187,11 @@ art_dictionary( NO_CHECK_CLASS_VERSION # For some reason this segfaults DICTIONARY_LIBRARIES Offline::TrkDiag ) + +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/data/TrkCaloHitPID.weights.xml ${CURRENT_BINARY_DIR} data/TrkCaloHitPID.weights.xml COPYONLY) + +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/fcl/prolog.fcl ${CURRENT_BINARY_DIR} fcl/prolog.fcl COPYONLY) + install_source(SUBDIRS src) install_headers(USE_PROJECT_NAME SUBDIRS inc) install_fhicl(SUBDIRS fcl SUBDIRNAME Offline/TrkDiag/fcl) diff --git a/TrkFilters/CMakeLists.txt b/TrkFilters/CMakeLists.txt index 94cf97f7c0..946f309be1 100644 --- a/TrkFilters/CMakeLists.txt +++ b/TrkFilters/CMakeLists.txt @@ -22,5 +22,7 @@ cet_build_plugin(TimeClusterFilter art::module Offline::RecoDataProducts ) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/fcl/prolog_trigger.fcl ${CURRENT_BINARY_DIR} fcl/prolog_trigger.fcl COPYONLY) + install_source(SUBDIRS src) install_fhicl(SUBDIRS fcl SUBDIRNAME Offline/TrkFilters/fcl) diff --git a/TrkHitReco/CMakeLists.txt b/TrkHitReco/CMakeLists.txt index bc52b3681c..012210838e 100644 --- a/TrkHitReco/CMakeLists.txt +++ b/TrkHitReco/CMakeLists.txt @@ -85,6 +85,24 @@ cet_build_plugin(StrawHitReco art::module Offline::TrackerGeom ) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/data/BkgMVAPanel.weights.xml ${CURRENT_BINARY_DIR} data/BkgMVAPanel.weights.xml COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/data/BkgMVA.weights.xml ${CURRENT_BINARY_DIR} data/BkgMVA.weights.xml COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/data/TrainBkgDiagPanelSpatial.dat ${CURRENT_BINARY_DIR} data/TrainBkgDiagPanelSpatial.dat COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/data/TrainBkgDiagPlaneSpatial.dat ${CURRENT_BINARY_DIR} data/TrainBkgDiagPlaneSpatial.dat COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/data/TrainBkgDiagStationChi2.dat ${CURRENT_BINARY_DIR} data/TrainBkgDiagStationChi2.dat COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/data/TrainBkgDiagStationSpatial.dat ${CURRENT_BINARY_DIR} data/TrainBkgDiagStationSpatial.dat COPYONLY) + +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/fcl/epilog_FBH_panel.fcl ${CURRENT_BINARY_DIR} fcl/epilog_FBH_panel.fcl COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/fcl/epilog_FBH_plane.fcl ${CURRENT_BINARY_DIR} fcl/epilog_FBH_plane.fcl COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/fcl/epilog_FBH_station.fcl ${CURRENT_BINARY_DIR} fcl/epilog_FBH_station.fcl COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/fcl/epilog_panel.fcl ${CURRENT_BINARY_DIR} fcl/epilog_panel.fcl COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/fcl/epilog_plane.fcl ${CURRENT_BINARY_DIR} fcl/epilog_plane.fcl COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/fcl/epilog_station.fcl ${CURRENT_BINARY_DIR} fcl/epilog_station.fcl COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/fcl/epilog_stereo.fcl ${CURRENT_BINARY_DIR} fcl/epilog_stereo.fcl COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/fcl/prolog.fcl ${CURRENT_BINARY_DIR} fcl/prolog.fcl COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/fcl/prolog_trigger.fcl ${CURRENT_BINARY_DIR} fcl/prolog_trigger.fcl COPYONLY) + + install_source(SUBDIRS src inc) install_headers(USE_PROJECT_NAME SUBDIRS inc) install_fhicl(SUBDIRS fcl SUBDIRNAME Offline/TrkHitReco/fcl) diff --git a/TrkPatRec/CMakeLists.txt b/TrkPatRec/CMakeLists.txt index ac31992044..204b12811c 100644 --- a/TrkPatRec/CMakeLists.txt +++ b/TrkPatRec/CMakeLists.txt @@ -156,6 +156,21 @@ cet_build_plugin(TimeAndPhiClusterFinderDiag art::tool Offline::RecoDataProducts ) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/data/HelixHitMVA.weights.xml ${CURRENT_BINARY_DIR} data/HelixHitMVA.weights.xml COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/data/HelixNonStereoHitMVA.weights.xml ${CURRENT_BINARY_DIR} data/HelixNonStereoHitMVA.weights.xml COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/data/HelixStereoHitMVA.weights.xml ${CURRENT_BINARY_DIR} data/HelixStereoHitMVA.weights.xml COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/data/TimeCluster3.weights.xml ${CURRENT_BINARY_DIR} data/TimeCluster3.weights.xml COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/data/TimeClusterCalo.weights.xml ${CURRENT_BINARY_DIR} data/TimeClusterCalo.weights.xml COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/data/TimeCluster.weights.xml ${CURRENT_BINARY_DIR} data/TimeCluster.weights.xml COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/data/TimePhiCluster.weights.xml ${CURRENT_BINARY_DIR} data/TimePhiCluster.weights.xml COPYONLY) + +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/fcl/AmbigResolver.fcl ${CURRENT_BINARY_DIR} fcl/AmbigResolver.fcl COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/fcl/DoubletAmbigResolver.fcl ${CURRENT_BINARY_DIR} fcl/DoubletAmbigResolver.fcl COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/fcl/PanelAmbigResolver.fcl ${CURRENT_BINARY_DIR} fcl/PanelAmbigResolver.fcl COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/fcl/Particle.fcl ${CURRENT_BINARY_DIR} fcl/Particle.fcl COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/fcl/prolog.fcl ${CURRENT_BINARY_DIR} fcl/prolog.fcl COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/fcl/prolog_trigger.fcl ${CURRENT_BINARY_DIR} fcl/prolog_trigger.fcl COPYONLY) + install_source(SUBDIRS src) install_headers(USE_PROJECT_NAME SUBDIRS inc) install_fhicl(SUBDIRS fcl SUBDIRNAME Offline/TrkPatRec/fcl) diff --git a/TrkReco/CMakeLists.txt b/TrkReco/CMakeLists.txt index 60b67d0cd1..a3b0d546a3 100644 --- a/TrkReco/CMakeLists.txt +++ b/TrkReco/CMakeLists.txt @@ -61,6 +61,10 @@ art_dictionary( NO_CHECK_CLASS_VERSION # For some reason this segfaults DICTIONARY_LIBRARIES Offline::TrkReco ) + +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/fcl/prolog.fcl ${CURRENT_BINARY_DIR} fcl/prolog.fcl COPYONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/fcl/prolog_trigger.fcl ${CURRENT_BINARY_DIR} fcl/prolog_trigger.fcl COPYONLY) + install_source(SUBDIRS src) install_headers(USE_PROJECT_NAME SUBDIRS inc) install_fhicl(SUBDIRS fcl SUBDIRNAME Offline/TrkReco/fcl) diff --git a/Validation/CMakeLists.txt b/Validation/CMakeLists.txt index 68884e662b..5e8021b7d3 100644 --- a/Validation/CMakeLists.txt +++ b/Validation/CMakeLists.txt @@ -89,6 +89,8 @@ art_dictionary( Offline::Validation_Root ) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/fcl/val.fcl ${CURRENT_BINARY_DIR} fcl/val.fcl COPYONLY) + install_source(SUBDIRS src root) install_headers(USE_PROJECT_NAME SUBDIRS inc) install_fhicl(SUBDIRS fcl SUBDIRNAME Offline/Validation/fcl) diff --git a/fcl/CMakeLists.txt b/fcl/CMakeLists.txt new file mode 100644 index 0000000000..c2f698f539 --- /dev/null +++ b/fcl/CMakeLists.txt @@ -0,0 +1,10 @@ +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/customizingMessageFacilityFcl.txt ${CURRENT_BINARY_DIR} customizingMessageFacilityFcl.txt ) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/messageService.fcl ${CURRENT_BINARY_DIR} messageService.fcl ) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/minimalMessageService.fcl ${CURRENT_BINARY_DIR} minimalMessageService.fcl ) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/standardInputs.fcl ${CURRENT_BINARY_DIR} standardInputs.fcl ) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/standardMessageDestinations.fcl ${CURRENT_BINARY_DIR} standardMessageDestinations.fcl ) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/standardProducers.fcl ${CURRENT_BINARY_DIR} standardProducers.fcl ) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/standardServices.fcl ${CURRENT_BINARY_DIR} standardServices.fcl ) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/TrkCaloDt.fcl ${CURRENT_BINARY_DIR} TrkCaloDt.fcl ) + + diff --git a/ups_install/CMakeLists.txt b/ups_install/CMakeLists.txt index e69de29bb2..1d736d5089 100644 --- a/ups_install/CMakeLists.txt +++ b/ups_install/CMakeLists.txt @@ -0,0 +1,12 @@ +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/installFQFile.sh ${CURRENT_BINARY_DIR} installFQFile.sh COPYONLY) + +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/install.sh ${CURRENT_BINARY_DIR} install.sh COPYONLY) + +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/installTableFile.sh ${CURRENT_BINARY_DIR} installTableFile.sh COPYONLY) + +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/tar_exclude_for_config.txt ${CURRENT_BINARY_DIR} tar_exclude_for_config.txt COPYONLY) + +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/tar_exclude_for_include.txt ${CURRENT_BINARY_DIR} tar_exclude_for_include.txt COPYONLY) + +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/tar_exclude_for_source.txt ${CURRENT_BINARY_DIR} tar_exclude_for_source.txt COPYONLY) + From 2abe4fbb0f193b064e5368ef3b4666e1b04e1a1a Mon Sep 17 00:00:00 2001 From: Andrew Edmonds Date: Wed, 17 Jan 2024 18:05:35 -0600 Subject: [PATCH 070/213] Add wrapper for a single MVAResult --- RecoDataProducts/src/classes_def.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/RecoDataProducts/src/classes_def.xml b/RecoDataProducts/src/classes_def.xml index e356a90ea6..e9bea6546e 100644 --- a/RecoDataProducts/src/classes_def.xml +++ b/RecoDataProducts/src/classes_def.xml @@ -246,6 +246,7 @@ + From ca6f7db1534e56813e9bb48dff4e1d9a07dcbbd5 Mon Sep 17 00:00:00 2001 From: David Nathan Brown Date: Thu, 18 Jan 2024 17:24:59 -0800 Subject: [PATCH 071/213] Intermediate commit to support extrapolation --- Mu2eKinKal/fcl/prolog.fcl | 28 +++++++++----- Mu2eKinKal/fcl/prolog_trigger.fcl | 2 +- Mu2eKinKal/inc/HelixFit_module.hh | 57 +++++++++++++++++++++++++++-- Mu2eKinKal/inc/KKFit.hh | 61 ++++++++++++++----------------- Mu2eKinKal/inc/KKFitSettings.hh | 12 ++++-- 5 files changed, 109 insertions(+), 51 deletions(-) diff --git a/Mu2eKinKal/fcl/prolog.fcl b/Mu2eKinKal/fcl/prolog.fcl index 377322e93c..0253f80753 100644 --- a/Mu2eKinKal/fcl/prolog.fcl +++ b/Mu2eKinKal/fcl/prolog.fcl @@ -35,7 +35,10 @@ Mu2eKinKal : { MaxDStraw : 2 # integer (straw) MaxStrawDOCA : 5.0 # mm MaxStrawDOCAConsistency : 1.0 # units of chi - SampleTimeBuffer : 10.0 # time buffer on trajectory ends for finding intersections with sample surfaces + SampleTimeBuffer : 10.0 # time buffer for intersections + SampleTolerance : 5 # tolerance for intersection sample (mm) + SampleInRange : true # require sample be in time range + SampleInBounds : true # require sample be in surface bounds } CHSEEDFIT: { @@ -110,8 +113,6 @@ Mu2eKinKal : { ] } - - SEEDFIT: { PrintLevel : 0 MinNDOF : 1 @@ -121,8 +122,10 @@ Mu2eKinKal : { DivergenceDeltaChisq : 10.0 DivergenceDeltaParams : 1e6 DivergenceGap : 10 # mm - BFieldCorrection : false + BFieldCorrection : true +# BFieldCorrection : false BCorrTolerance : 1e-2 # momemntum fraction +# ProcessEnds : true ProcessEnds : false MetaIterationSettings : [ # annealing temp, strawhit updater algorithm @@ -272,6 +275,10 @@ Mu2eKinKal : { LOOPHELIX : { SeedErrors : [5.0, 5.0, 5.0, 5.0, 0.02, 5.0] # R(mm), Lambda(mm), Cx(mm), Cy(mm), phi0, t0 (ns) SeedFlags : [ "HelixOK" ] +# ExtrapolateSurfaces : ["TT_Front","TT_Back"] + ExtrapolateSurfaces : [] + ExtrapolationTolerance : 1.0e-3 + ExtrapolationMaxDt : 10.0 } CENTRALHELIX : { @@ -282,6 +289,9 @@ Mu2eKinKal : { SeedFlags : [ "HelixOK" ] TimeClusterCollection : "SimpleTimeCluster" PanelHitCollection : "makePH" + ExtrapolateSurfaces : ["TT_Front","TT_Back","TT_Outer"] + ExtrapolationTolerance : 1.0e-3 + ExtrapolationMaxDt : 10.0 } KINEMATICLINE : { @@ -292,7 +302,10 @@ Mu2eKinKal : { ComboHitCollection : "makeSH" CaloClusterCollection : "CaloClusterMaker" SeedFlags : [ "HelixOK" ] - } + ExtrapolateSurfaces : ["TT_Front","TT_Back","TT_Outer"] + ExtrapolationTolerance : 1.0e-3 + ExtrapolationMaxDt : 10.0 +} } Mu2eKinKal : { @@ -304,7 +317,6 @@ Mu2eKinKal : { KKFitSettings: { @table::Mu2eKinKal.KKFIT SampleSurfaces : ["TT_Front","TT_Mid","TT_Back"] - ExtendSurfaces : ["TT_Front","TT_Back"] } FitSettings : @local::Mu2eKinKal.SEEDFIT ExtensionSettings : @local::Mu2eKinKal.SEEDEXT @@ -318,7 +330,6 @@ Mu2eKinKal : { KKFitSettings: { @table::Mu2eKinKal.KKFIT SampleSurfaces : ["TT_Front","TT_Mid","TT_Back"] - ExtendSurfaces : ["TT_Front","TT_Back"] } FitSettings : @local::Mu2eKinKal.SEEDFIT ExtensionSettings : @local::Mu2eKinKal.DRIFTEXT @@ -341,7 +352,6 @@ Mu2eKinKal : { KKFitSettings: { @table::Mu2eKinKal.KKFIT SampleSurfaces : ["TT_Front","TT_Back","TT_Outer","TCRV"] - ExtendSurfaces : ["TT_Front","TT_Back","TT_Outer"] SampleTimeBuffer : 100 } FitSettings : @local::Mu2eKinKal.SEEDFIT @@ -370,7 +380,6 @@ Mu2eKinKal : { KKFitSettings: { @table::Mu2eKinKal.KKFIT SampleSurfaces : ["TT_Front","TT_Back","TT_Outer"] - ExtendSurfaces : ["TT_Front","TT_Back","TT_Outer"] SampleTimeBuffer : 100 } FitSettings : @local::Mu2eKinKal.CHSEEDFIT @@ -384,7 +393,6 @@ Mu2eKinKal : { KKFitSettings: { @table::Mu2eKinKal.KKFIT SampleSurfaces : ["TT_Front","TT_Back","TT_Outer"] - ExtendSurfaces : ["TT_Front","TT_Back","TT_Outer"] SampleTimeBuffer : 100 } FitSettings : @local::Mu2eKinKal.CHSEEDFIT diff --git a/Mu2eKinKal/fcl/prolog_trigger.fcl b/Mu2eKinKal/fcl/prolog_trigger.fcl index e8ce240d46..cb98057ae3 100644 --- a/Mu2eKinKal/fcl/prolog_trigger.fcl +++ b/Mu2eKinKal/fcl/prolog_trigger.fcl @@ -12,11 +12,11 @@ Mu2eKinKalTrigger : { @table::Mu2eKinKal.KKFIT AddHits : false AddMaterial : false + ProcessEnds : false MaterialCorrection : true MaxCaloClusterDt : 10.0 MaxCaloClusterDOCA : 150.0 # mm SampleSurfaces : ["TT_Mid"] - ExtendSurfaces : ["TT_Mid"] } SEEDFIT: { diff --git a/Mu2eKinKal/inc/HelixFit_module.hh b/Mu2eKinKal/inc/HelixFit_module.hh index 419b54540b..d1be1b9684 100644 --- a/Mu2eKinKal/inc/HelixFit_module.hh +++ b/Mu2eKinKal/inc/HelixFit_module.hh @@ -19,6 +19,8 @@ #include "Offline/TrackerConditions/inc/StrawResponse.hh" #include "Offline/BFieldGeom/inc/BFieldManager.hh" #include "Offline/GlobalConstantsService/inc/ParticleDataList.hh" +#include "Offline/KinKalGeom/inc/SurfaceId.hh" +#include "Offline/KinKalGeom/inc/SurfaceMap.hh" // utiliites #include "Offline/GeometryService/inc/GeomHandle.hh" #include "Offline/TrackerGeom/inc/Tracker.hh" @@ -39,6 +41,7 @@ // KinKal #include "KinKal/Fit/Track.hh" #include "KinKal/Fit/Config.hh" +#include "KinKal/Fit/ExtraConfig.hh" #include "KinKal/Trajectory/ParticleTrajectory.hh" #include "KinKal/Trajectory/PiecewiseClosestApproach.hh" // Mu2eKinKal @@ -79,6 +82,8 @@ namespace mu2e { using KKFIT = KKFit; using KinKal::VEC3; using KinKal::DMAT; + using KinKal::TimeDir; + using KinKal::ExtraConfig; using HPtr = art::Ptr; using CCPtr = art::Ptr; using CCHandle = art::ValidHandle; @@ -109,6 +114,19 @@ namespace mu2e { fhicl::Atom pdgCharge { Name("UsePDGCharge"), Comment("Use particle charge from fitParticle")}; }; + // predicate for extrapolation to a given Z position in a given direction + template struct ExtrapolateToZ { + using KKTRK = KKTrack; + ExtrapolateToZ(KKTRK const& kktrk, TimeDir tdir, double zval) : kktrk_(kktrk), tdir_(tdir), zval_(zval) {} + bool needsExtrapolation(double time) const { + double zend = kktrk_.fitTraj().position3(time).Z(); + return tdir_ == TimeDir::forwards ? zend < zval_ : zend > zval_; + } + KKTRK const& kktrk_; // reference to track + TimeDir tdir_; // time direction + double zval_; // z value required + }; + class HelixFit : public art::EDProducer { public: using Parameters = art::EDProducer::Table; @@ -141,7 +159,9 @@ namespace mu2e { std::unique_ptr kkbf_; Config config_; // initial fit configuration object Config exconfig_; // extension configuration object - bool fixedfield_; // + KinKal::ExtraConfig xconfig_; // tolerance and maximum Dt when extrapolating + bool fixedfield_; // special case usage for seed fits, if no BField corrections are needed + SurfaceMap::SurfacePairCollection extrap_; // surfaces to extrapolate the fit to }; HelixFit::HelixFit(const Parameters& settings,TrkFitFlag fitflag) : art::EDProducer{settings}, @@ -158,7 +178,7 @@ namespace mu2e { kkmat_(settings().matSettings()), config_(Mu2eKinKal::makeConfig(settings().fitSettings())), exconfig_(Mu2eKinKal::makeConfig(settings().extSettings())), - fixedfield_(false) + fixedfield_(false) { // collection handling for(const auto& hseedtag : settings().modSettings().seedCollections()) { hseedCols_.emplace_back(consumes(hseedtag)); } @@ -178,6 +198,16 @@ namespace mu2e { fixedfield_ = true; kkbf_ = std::move(std::make_unique(VEC3(0.0,0.0,bz))); } + // configure extrapolation + SurfaceIdCollection esids; + for(auto const& sidname : settings().modSettings().extrapSurfs()) { + esids.push_back(SurfaceId(sidname,-1)); // match all elements + } + SurfaceMap smap; + smap.surfaces(esids,extrap_); + // configuration for extrapolation + xconfig_.tol_ = settings().modSettings().extrapTol(); + xconfig_.maxdt_ = settings().modSettings().extrapMaxDt(); } void HelixFit::beginRun(art::Run& run) { @@ -259,7 +289,7 @@ namespace mu2e { // verify the cluster looks physically reasonable before adding it TODO! Or, let the KKCaloHit updater do it TODO KKCALOHITCOL calohits; if (kkfit_.useCalo() && hseed.caloCluster().isNonnull())kkfit_.makeCaloHit(hseed.caloCluster(),*calo_h, pseedtraj, calohits); - // extend the seed range given the hits and xings + // set the seed range given the hits and xings seedtraj.range() = kkfit_.range(strawhits,calohits,strawxings); // create and fit the track auto kktrk = make_unique(config_,*kkbf_,seedtraj,fitpart,kkfit_.strawHitClusterer(),strawhits,strawxings,calohits); @@ -270,6 +300,27 @@ namespace mu2e { kkfit_.extendTrack(exconfig_,*kkbf_, *tracker,*strawresponse, kkmat_.strawMaterial(), chcol, *calo_h, cc_H, *kktrk ); goodfit = goodFit(*kktrk); } +// extrapolate as required + if(goodfit && extrap_.size()>0) { + // test the drection of this fit + auto const& ftraj = kktrk->fitTraj(); + bool downstream = ftraj.momentum3(ftraj.range().mid()).Z() > 0.0; + const static VEC3 opos(0.0,0.0,0.0); + for(auto const& surf : extrap_){ + // configure the extrapolation time direction according to the surface and the track momentum direction + if(surf.first.id() == SurfaceIdEnum::TT_Front){ + xconfig_.xdir_ = downstream ? TimeDir::backwards : TimeDir::forwards; + double zpos = surf.second->tangentPlane(opos).center().Z(); + ExtrapolateToZ xtoz(*kktrk,xconfig_.xdir_,zpos); + kktrk->extrapolate(xconfig_,xtoz); + } else if(surf.first.id() == SurfaceIdEnum::TT_Back){ + xconfig_.xdir_ = downstream ? TimeDir::forwards : TimeDir::backwards; + } else if(surf.first.id() == SurfaceIdEnum::TT_Outer){ + // extrapolate in both time directions + } + } + } + if(print_>0)kktrk->printFit(std::cout,print_); if(goodfit || saveall_){ TrkFitFlag fitflag(hptr->status()); diff --git a/Mu2eKinKal/inc/KKFit.hh b/Mu2eKinKal/inc/KKFit.hh index b381744f1d..1ac5673161 100644 --- a/Mu2eKinKal/inc/KKFit.hh +++ b/Mu2eKinKal/inc/KKFit.hh @@ -113,13 +113,14 @@ namespace mu2e { void addCaloHit(Calorimeter const& calo, KKTRK& kktrk, CCHandle cchandle, KKCALOHITCOL& hits) const; void sampleFit(KKTRK const& kktrk,KalIntersectionCollection& inters) const; // sample fit at the surfaces specified in the config void extendFit(KKTRK& kktrk) const; + int printLevel_; bool matcorr_, addhits_, addmat_, usecalo_; // flags KKSTRAWHITCLUSTERER shclusterer_; // functor to cluster KKStrawHits // CaloHit configuration - double caloDt_; // calo time offset; should come from proditions FIXME! - double caloPosRes_; // calo cluster transverse position resolution; should come from proditions or CaloCluster FIXME! - double caloTimeRes_; // calo cluster time resolution; should come from proditions or CaloCluster FIXME! - double caloPropSpeed_; // effective light propagation speed in a crystal (including reflections). Should come from prodtions FIXME + double caloDt_; // calo time offset; should come from proditions TODO! + double caloPosRes_; // calo cluster transverse position resolution; should come from proditions or CaloCluster TODO! + double caloTimeRes_; // calo cluster time resolution; should come from proditions or CaloCluster TODO! + double caloPropSpeed_; // effective light propagation speed in a crystal (including reflections). Should come from prodtions TODO double minCaloEnergy_; // minimum CaloCluster energy double maxCaloDt_; // maximum track-calo time difference double maxCaloDoca_; // maximum track-calo DOCA @@ -129,20 +130,21 @@ namespace mu2e { // parameters controlling adding hits float maxStrawHitDoca_, maxStrawHitDt_, maxStrawDoca_, maxStrawDocaCon_; int maxDStraw_; // maximum distance from the track a strawhit can be to consider it for adding. - float stbuff_; // time buffer to fit trajectory when finding surface intersections (fit samples) - int printLevel_; // cached info computed from the tracker, used in hit adding; these must be lazy-evaluated as the tracker doesn't exist on construction mutable double strawradius_; mutable double ymin_, ymax_, umax_; // panel-level info mutable double rmin_, rmax_; // plane-level info mutable double spitch_; - mutable bool needstrackerinfo_; - SurfaceMap smap_, emap_; + mutable bool needstrackerinfo_ = true; + + double sampletol_; // surface intersection tolerance (mm) + double sampletbuff_; // simple time buffer; replace this with extrapolation TODO + bool sampleinrange_, sampleinbounds_; // require samples to be in range or on surface SurfaceMap::SurfacePairCollection sample_; // surfaces to sample the fit - SurfaceMap::SurfacePairCollection extend_; // surfaces to extend the fit to }; template KKFit::KKFit(KKFitConfig const& fitconfig) : + printLevel_(fitconfig.printLevel()), matcorr_(fitconfig.matCorr()), addhits_(fitconfig.addHits()), addmat_(fitconfig.addMaterial()), @@ -163,22 +165,19 @@ namespace mu2e { maxStrawDoca_(fitconfig.maxStrawDOCA()), maxStrawDocaCon_(fitconfig.maxStrawDOCAConsistency()), maxDStraw_(fitconfig.maxDStraw()), - stbuff_(fitconfig.sampleTBuff()), - printLevel_(fitconfig.printLevel()), - needstrackerinfo_(true) + sampletol_(fitconfig.sampleTol()), + sampletbuff_(fitconfig.sampleTBuff()), + sampleinrange_(fitconfig.sampleInRange()), + sampleinbounds_(fitconfig.sampleInBounds()) { - // translate the sample and extend surface names to actual surfaces using the SurfaceMap. This should come from the - // geometry service eventually, TODO SurfaceIdCollection ssids; for(auto const& sidname : fitconfig.sampleSurfaces()) { ssids.push_back(SurfaceId(sidname,-1)); // match all elements } - smap_.surfaces(ssids,sample_); - SurfaceIdCollection esids; - for(auto const& sidname : fitconfig.extendSurfaces()) { - esids.push_back(SurfaceId(sidname,-1)); // match all elements - } - emap_.surfaces(esids,extend_); + // translate the sample and extend surface names to actual surfaces using the SurfaceMap. This should come from the + // geometry service eventually, TODO + SurfaceMap smap; + smap.surfaces(ssids,sample_); } template void KKFit::makeStrawHits(Tracker const& tracker,StrawResponse const& strawresponse,BFieldMap const& kkbf, KKStrawMaterial const& smat, @@ -561,8 +560,7 @@ namespace mu2e { dm.R(), sxing->active() ); } - - // save the fit segments + // save the fit segments fseed._segments.reserve(fittraj.pieces().size()); for (auto const& traj : fittraj.pieces() ){ // skip zero-range segments. By convention, sample the state at the mid-time @@ -573,26 +571,21 @@ namespace mu2e { } template void KKFit::sampleFit(KKTRK const& kktrk,KalIntersectionCollection& inters) const { - // translate time precision to distance precision for surfaces - auto speed = kktrk.fitTraj().front().speed(); - double tol = tprec_*speed; auto const& ftraj = kktrk.fitTraj(); for(auto const& surf : sample_){ - // Intersect the fit trajectory with this surface, including a time buffer - double tstart = ftraj.range().begin() - stbuff_; - double tend =ftraj.range().end() + stbuff_; + double tstart = ftraj.range().begin() - sampletbuff_; bool hasinter(true); - // check for multiple intersections - while(hasinter && tend > tstart){ - TimeRange irange(tstart,tend); - auto surfinter = KinKal::intersect(ftraj,*surf.second,irange,tol); - hasinter = surfinter.onsurface_ && irange.inRange(surfinter.time_); + // loop to find multiple intersections + while(hasinter) { + TimeRange irange(tstart,ftraj.range().end()+ sampletbuff_); + auto surfinter = KinKal::intersect(ftraj,*surf.second,irange,sampletol_); + hasinter = surfinter.onsurface_ && ( (! sampleinbounds_) || surfinter.inbounds_ ) && ( (!sampleinrange_) || irange.inRange(surfinter.time_)); if(hasinter) { // save the intersection information auto const& ktraj = ftraj.nearestPiece(surfinter.time_); inters.emplace_back(ktraj.stateEstimate(surfinter.time_),XYZVectorF(ktraj.bnom()),surf.first,surfinter); // update for the next intersection - tstart = surfinter.time_ + tol; + tstart = surfinter.time_ + 1e-8;// move psst existing intersection to avoid repeating } } } diff --git a/Mu2eKinKal/inc/KKFitSettings.hh b/Mu2eKinKal/inc/KKFitSettings.hh index 2671dd92b8..db285c89f4 100644 --- a/Mu2eKinKal/inc/KKFitSettings.hh +++ b/Mu2eKinKal/inc/KKFitSettings.hh @@ -73,14 +73,17 @@ namespace mu2e { fhicl::Atom maxCaloDoca { Name("MaxCaloClusterDOCA"), Comment("Max DOCA to add a CaloCluster (mm)") }; fhicl::Sequence addHitSelect { Name("AddHitSelect"), Comment("Flags required to be present to add a hit") }; fhicl::Sequence addHitReject { Name("AddHitReject"), Comment("Flags required not to be present to add a hit") }; - fhicl::Sequence sampleSurfaces { Name("SampleSurfaces"), Comment("When creating the KalSeed, sample the fit at these surfaces") }; - fhicl::Sequence extendSurfaces { Name("ExtendSurfaces"), Comment("Extend the fit to reach these surfaces") }; fhicl::Atom maxStrawHitDOCA { Name("MaxStrawHitDOCA"), Comment("Max DOCA to add a hit (mm)") }; fhicl::Atom maxStrawHitDt { Name("MaxStrawHitDt"), Comment("Max Detla time to add a hit (ns)") }; fhicl::Atom maxDStraw { Name("MaxDStraw"), Comment("Maximum (integer) straw separation when adding straw hits") }; fhicl::Atom maxStrawDOCA { Name("MaxStrawDOCA"), Comment("Max DOCA to add straw material (mm)") }; fhicl::Atom maxStrawDOCAConsistency { Name("MaxStrawDOCAConsistency"), Comment("Max DOCA chi-consistency to add straw material") }; - fhicl::Atom sampleTBuff { Name("SampleTimeBuffer"), Comment("Buffer to add to the trajectory when sampling the fit (mm)") }; + // extension and sampling + fhicl::Atom sampleInRange { Name("SampleInRange"), Comment("Require sample times to be inside the fit trajectory time range") }; + fhicl::Atom sampleInBounds { Name("SampleInBounds"), Comment("Require sample intersection point be inside surface bounds (within tolerance)") }; + fhicl::Atom sampleTol { Name("SampleTolerance"), Comment("Tolerance for sample surface intersections (mm)") }; + fhicl::Atom sampleTBuff { Name("SampleTimeBuffer"), Comment("Time buffer for sample intersections (nsec)") }; + fhicl::Sequence sampleSurfaces { Name("SampleSurfaces"), Comment("When creating the KalSeed, sample the fit at these surfaces") }; }; // struct for configuring a KinKal fit module struct KKModuleConfig { @@ -91,6 +94,9 @@ namespace mu2e { fhicl::Atom printLevel { Name("PrintLevel"), Comment("Diagnostic printout Level"), 0 }; fhicl::Sequence seederrors { Name("SeedErrors"), Comment("Initial value of seed parameter errors (rms, various units)") }; fhicl::Atom saveAll { Name("SaveAllFits"), Comment("Save all fits, whether they suceed or not"),false }; + fhicl::Sequence extrapSurfs { Name("ExtrapolateSurfaces"), Comment("Extrapolate successful fits to these surfaces") }; + fhicl::Atom extrapTol { Name("ExtrapolationTolerance"), Comment("Tolerance on fractional momemtum precision when extrapolating fits") }; + fhicl::Atom extrapMaxDt { Name("ExtrapolationMaxDt"), Comment("Maximum time to extrapolate a fit") }; }; } } From a7e3e3cdb571ece904606e57c6a6c0dbe01fbc8d Mon Sep 17 00:00:00 2001 From: Mete Yucel Date: Fri, 19 Jan 2024 13:46:36 -0600 Subject: [PATCH 072/213] chi2 clusterer and associated changes --- RecoDataProducts/inc/BkgCluster.hh | 29 ++- TrkDiag/fcl/BkgDiag_station.fcl | 10 + TrkDiag/fcl/CHDiag_panel.fcl | 5 +- TrkDiag/src/BkgDiag_module.cc | 15 +- TrkHitReco/data/TrainBkgDiagPanelSpatial.dat | 16 +- TrkHitReco/data/TrainBkgDiagPlaneSpatial.dat | 16 +- TrkHitReco/data/TrainBkgDiagStationChi2.dat | 24 +-- .../data/TrainBkgDiagStationSpatial.dat | 24 +-- TrkHitReco/fcl/prolog.fcl | 13 +- TrkHitReco/inc/Chi2Clusterer.hh | 79 ++++++++ TrkHitReco/inc/TNTClusterer.hh | 5 +- TrkHitReco/inc/TrainBkgDiag.hxx | 110 +++++------ TrkHitReco/src/Chi2Clusterer.cc | 180 ++++++++++++++++++ TrkHitReco/src/FlagBkgHits_module.cc | 11 +- TrkHitReco/src/TNTClusterer.cc | 65 +++---- 15 files changed, 444 insertions(+), 158 deletions(-) create mode 100644 TrkDiag/fcl/BkgDiag_station.fcl create mode 100644 TrkHitReco/inc/Chi2Clusterer.hh create mode 100644 TrkHitReco/src/Chi2Clusterer.cc diff --git a/RecoDataProducts/inc/BkgCluster.hh b/RecoDataProducts/inc/BkgCluster.hh index d3a285eccc..bbea92f7e7 100644 --- a/RecoDataProducts/inc/BkgCluster.hh +++ b/RecoDataProducts/inc/BkgCluster.hh @@ -17,7 +17,8 @@ namespace mu2e { //Default hit count chosen for compuational efficiency BkgCluster() {_hits.reserve(16);} - BkgCluster(TwoDPoint point, float time) : _point(point), _time(time) {_hits.reserve(16);_cpoints.addPoint(_point,0);_pos = point.pos3();} + BkgCluster(TwoDPoint point, float time, float weight) : _point(point), _time(time), _weight(weight){_hits.reserve(16);_cpoints.addPoint(_point,0);_pos = point.pos3();_wtime = _time*_weight;} + BkgCluster(XYZVectorF const& pos, float time) : _pos(pos), _time(time) {_hits.reserve(16);} enum distMethod {spatial,chi2}; float getKerasQ() const {return _kerasQ; } @@ -30,21 +31,31 @@ namespace mu2e auto const& hits() const {return _hits; } auto & hits() {return _hits; } - void pos(XYZVectorF const& pos) {_pos = pos;} - void time(float time) {_time = time;} - void addHit(unsigned val) {_hits.emplace_back(val);} - void clearHits() {_hits.clear();} - void setKerasQ(float kerasQ) {_kerasQ = kerasQ;} - void setDistanceMethod(distMethod method) {_distMethod = method;} + void pos(XYZVectorF const& pos) {_pos = pos;} + void time(float time) {_time = time;} + void clearHits() {_hits.clear();} + void setKerasQ(float kerasQ) {_kerasQ = kerasQ;} + void setDistanceMethod(distMethod method) {_distMethod = method;} + void addHit(unsigned val) {_hits.emplace_back(val);} + void addHit(unsigned val, TwoDPoint point, float time, float weight) { + _hits.push_back(val); + _cpoints.addPoint(point,_cpoints.nPoints()); + _pos = _cpoints.point().pos3(); + _weight += weight; + _wtime += time*weight; + _time = _wtime/_weight; + } XYZVectorF _pos;// ideally should be a 2d vec - FIXME TwoDPoint _point;//initial point CombineTwoDPoints _cpoints;//combined points - float _time = 0.0; + float _time = 0.0;//cluster time + float _wtime;//weighted time + float _weight;//weighted by nStrawHits std::vector _hits; BkgClusterFlag _flag = BkgClusterFlag(BkgClusterFlag::update); float _kerasQ = -0.5; //result of keras result for the cluster - distMethod _distMethod;//which distMethod used in clusterer to create the cluster + distMethod _distMethod;//which distMethod used to create the cluster }; typedef std::vector BkgClusterCollection; diff --git a/TrkDiag/fcl/BkgDiag_station.fcl b/TrkDiag/fcl/BkgDiag_station.fcl new file mode 100644 index 0000000000..7ae576f63e --- /dev/null +++ b/TrkDiag/fcl/BkgDiag_station.fcl @@ -0,0 +1,10 @@ +#include "Offline/TrkDiag/fcl/BkgDiag.fcl" +#include "Offline/TrkHitReco/fcl/epilog_station.fcl" +#include "Offline/TrkHitReco/fcl/epilog_FBH_station.fcl" +physics.producers.makePH.TestFlag : true +physics.producers.makeSTH.TestFlag : true +physics.producers.FlagBkgHits.OutputLevel : "station" +physics.analyzers.BD.ExpectedCHLevel : "station" +physics.producers.makeSTH.DebugLevel : 0 +services.DbService.purpose: MDC2020_best +services.DbService.version: v1_1 diff --git a/TrkDiag/fcl/CHDiag_panel.fcl b/TrkDiag/fcl/CHDiag_panel.fcl index 8c5c3e0dc5..48053306cf 100644 --- a/TrkDiag/fcl/CHDiag_panel.fcl +++ b/TrkDiag/fcl/CHDiag_panel.fcl @@ -1,3 +1,6 @@ -#include "Offline/TrkDiag/test/ComboDiag.fcl" +#include "Offline/TrkDiag/fcl/CHD.fcl" +#include "Offline/TrkHitReco/fcl/epilog_panel.fcl" +#include "Offline/TrkHitReco/fcl/epilog_FBH_panel.fcl" +physics.producers.makePH.TestFlag : true services.DbService.purpose: MDC2020_best services.DbService.version: v1_1 diff --git a/TrkDiag/src/BkgDiag_module.cc b/TrkDiag/src/BkgDiag_module.cc index 7a69f53570..f5a420ff69 100644 --- a/TrkDiag/src/BkgDiag_module.cc +++ b/TrkDiag/src/BkgDiag_module.cc @@ -101,6 +101,7 @@ namespace mu2e float _rmscposy = 0; float _rmscrho = 0; float _cchi2 = 0; + float _ccons = 0; float _ctime = 0; float _rmsctime = 0; float _avecedep = 0; @@ -111,7 +112,8 @@ namespace mu2e bool _isref = false; bool _isolated = false; bool _stereo = false; - int _cluIdx, _nactive, _nch, _nsh, _nsha, _nbkg, _ncpoints; + int _cluIdx, _nactive, _nch, _nsh, _nsha, _nbkg; + int _cndof; float _crho; float _zmin; float _zmax; @@ -167,6 +169,7 @@ namespace mu2e _bcdiag->Branch("rmscposy",&_rmscposy,"rmscposy/F"); _bcdiag->Branch("rmscrho",&_rmscrho,"rmscrho/F"); _bcdiag->Branch("cchi2",&_cchi2,"cchi2/F"); + _bcdiag->Branch("ccons",&_ccons,"ccons/F"); _bcdiag->Branch("ctime",&_ctime,"ctime/F"); _bcdiag->Branch("rmsctime",&_rmsctime,"rmsctime/F"); _bcdiag->Branch("avecedep",&_avecedep,"avecedep/F"); @@ -182,7 +185,7 @@ namespace mu2e _bcdiag->Branch("nactive",&_nactive,"nactive/I"); _bcdiag->Branch("nsha",&_nsha,"nsha/I"); _bcdiag->Branch("nbkg",&_nbkg,"nbkg/I"); - _bcdiag->Branch("ncpoints",&_ncpoints,"ncpoints/I"); + _bcdiag->Branch("cndof",&_cndof,"cndof/I"); _bcdiag->Branch("cluIdx",&_cluIdx,"cluIdx/I"); // cluster hit info branch if(_diag > 0) @@ -271,8 +274,11 @@ namespace mu2e _crho = sqrtf(cluster.pos().perp2()); _cpos = cluster.pos(); _ctime = cluster.time(); - _cchi2 = cluster.points().chisquared(); - _ncpoints = cluster.points().nPoints(); + if(cluster.getDistMethod() == BkgCluster::chi2){ + _cchi2 = cluster.points().chisquared(); + _ccons = cluster.points().consistency(); + _cndof = cluster.points().nDOF(); + } _isinit = cluster.flag().hasAllProperties(BkgClusterFlag::init); _isbkg = cluster.flag().hasAllProperties(BkgClusterFlag::bkg); _isref = cluster.flag().hasAllProperties(BkgClusterFlag::refined); @@ -285,7 +291,6 @@ namespace mu2e BkgCluster const& ocluster = _bkgccol->at(jbkg); double dt = fabs(ocluster.time() - cluster.time()); double drho = sqrt((ocluster.pos()-cluster.pos()).Perp2()); -// // only look at differences whtn the other dimension difference is small if(dt < _mindt) _mindt = dt; if(drho < _mindrho) _mindrho = drho; } diff --git a/TrkHitReco/data/TrainBkgDiagPanelSpatial.dat b/TrkHitReco/data/TrainBkgDiagPanelSpatial.dat index 7fbf57af2a..c0cade75ba 100644 --- a/TrkHitReco/data/TrainBkgDiagPanelSpatial.dat +++ b/TrkHitReco/data/TrainBkgDiagPanelSpatial.dat @@ -1,16 +1,16 @@ +tensor_dense3bias0 1 +-0.0451157875 tensor_dense3kernel0 18 -0.150521353 -0.261501878 -0.206272587 0.393035144 -0.256599575 0.12629886 -0.172986284 0.361994028 -0.252124846 -0.117722422 0.298670024 0.190567344 0.0507114641 -0.0142969182 0.216024309 2.08279562 0.154689446 0.292915255 tensor_dense2bias0 18 -0.146539763 -1.77803314 0.0166341309 0.575022042 0.327489942 -0.216181621 0.597376943 -1.56983364 -0.00544023793 -0.0380116925 1.05300367 -0.174980238 -0.66802752 -0.332790673 -0.0950039625 -3.62123013 0.974011123 -1.20613801 +tensor_dense2kernel0 324 +-0.0326158293 -0.0214606635 -0.147380427 0.260059774 -0.272593558 -0.357100874 -0.489883542 0.181158081 -0.292910069 -0.0382927954 0.385302782 0.0841034725 -0.515747845 -0.0366827361 -0.41696766 -0.136859626 0.560083032 -0.877815783 -0.198815316 -0.071410276 -0.119702853 0.194164768 -0.663946688 0.203079388 -0.661458552 0.0283672903 0.0312127955 -0.793490767 -0.175637379 0.0129228048 -0.078098163 -0.0065675755 0.107588314 -0.0700756088 -0.0307945814 -0.393786758 -0.397494853 -0.447578669 0.00166100264 0.176444545 0.223876506 0.314781606 -0.148332044 0.37956053 -0.292000055 -0.315586269 -0.767495334 0.0300642755 -0.0316957645 -0.114400581 -0.397911936 0.0416087657 -0.441442788 -0.179116845 -0.0691933632 0.281821012 0.179414943 0.170366213 -0.287315071 -0.0968943164 -0.834237337 0.377477676 0.0039617219 0.0889093354 0.157027498 -0.444697887 0.0286771171 0.186597362 0.141293392 -0.103611745 -0.280898541 0.258475125 -0.366162539 0.393138081 -0.409053087 -0.37111178 0.330109179 -0.252574742 0.101193488 0.290777713 0.638947129 -0.560665727 -0.404144883 -0.503008664 -0.358144909 -0.141276598 -0.386720717 0.328924596 0.265295684 0.17597574 -0.265047133 -0.256134629 0.0326958485 0.108936138 -0.318903357 0.239903271 0.0441775769 -0.15720129 0.121812008 0.112970851 0.0300272666 -0.120011538 0.207462579 -0.226947814 -0.252967507 -0.0173487812 0.113770716 -0.00765861431 -0.386898875 -0.273671359 0.322261423 -0.0730545893 -0.0345935896 0.361966401 -0.305979669 0.196086809 0.237485275 0.145209908 0.337185442 -0.284427434 0.338367254 0.0145493988 -0.0667599142 -0.0333889127 0.235080287 -0.16273123 -0.137464404 0.133096561 -0.282593697 0.349115998 0.0478930883 -0.1300423 0.221431211 -0.755773067 -0.0295607522 -0.444253117 0.455138743 -0.440997809 0.068454653 -0.345567048 -0.0314863622 -0.00710728904 0.00686156424 -0.235272437 -0.132157132 -0.573762536 -0.169393331 0.226024494 0.0276884064 -0.0186517537 -0.114920363 -0.087619327 0.15204291 -0.155371502 -0.156148314 -0.275233805 0.248487055 -0.173548684 -0.396200269 0.0538709313 0.181223661 0.26170826 0.25423938 -0.292572677 0.406721413 0.171206042 0.462159932 0.173379421 -0.357626319 -0.0628680661 -0.101932786 -0.367589772 -0.155828491 -0.0158654284 0.181940198 -0.290369451 -0.219032705 0.168755487 -0.364006639 -0.0838576257 -0.0495029092 0.164797157 0.401931405 -0.185772434 -0.470714986 -0.259718716 0.151264787 -0.355638713 -0.0274338163 -0.0445246398 -0.363112628 0.0637958944 0.230095699 -0.319374502 -0.177356243 0.186115965 0.00376251177 0.310085833 -0.0840077996 0.0207857341 0.372401476 -0.088926211 0.461762756 0.44390583 0.0832194835 -0.0527081341 -0.263354778 0.360482752 -0.0964892805 0.141883373 -0.206007272 -0.231929556 -0.0922410786 0.0874458402 -0.163428232 0.0415216237 0.285924286 0.425971031 -0.177229896 0.0112448065 -0.344616681 0.131998301 -0.00544981193 0.381109178 0.00316478941 -0.0103405574 0.218600646 0.278505147 -0.0311694033 -0.0969366059 0.016073823 -0.162525415 0.110866435 -0.13220942 -0.327007145 -0.256160319 0.309774518 -0.260783821 0.0928290114 -0.199047819 -0.0981284827 0.457926184 0.116957642 0.303967118 0.10286703 0.00751838088 -0.189568073 0.244091809 -0.182571292 0.0404732972 -0.114508398 0.185837954 0.140939251 0.148204267 0.13045907 -0.0311368257 0.407806993 0.202125058 -0.76503098 -1.2059505 0.354308307 -0.165411279 0.254802406 -0.309738517 0.0147923231 -0.42722699 0.273618937 -0.00213857903 -0.661950648 -0.11774125 -0.121417731 0.131325066 -0.266724139 0.0382939428 0.0304451305 -0.173829958 -0.297702312 -0.0350169875 0.132566139 -0.641611457 -0.419360518 -0.110152349 -0.36184147 -0.260720879 0.301546812 -0.152658522 -0.281799912 0.38348937 0.233813092 0.0313779525 0.0538714528 0.152991876 -0.516138613 -0.0236546379 -0.272414327 -0.811290383 -0.170065671 -0.269182652 -0.057427641 0.391452312 -0.281101584 -0.409297436 0.296410561 0.0449393354 0.301495105 -0.417284042 -0.383383662 -0.130773708 -0.365457088 -0.041190654 0.431167424 -0.209479824 0.190645412 0.287688553 0.306342244 -0.368990362 -0.0779836699 -0.0366391391 0.0369122662 -0.367377281 -0.361935526 0.0569181964 -0.278449833 0.177742794 +tensor_dense1bias0 18 +3.76501417 2.73554301 -2.60870385 0.107781395 -4.37820244 0.507640719 0.519423902 3.38447642 1.03161252 -0.188384086 -0.160914943 -0.134798273 0.210564345 -0.111250617 -0.041059725 0.11066065 -0.362806678 -1.21268153 +tensor_dense1kernel0 324 +-0.0263914503 -0.176089928 -0.66779393 0.392864287 0.0328721851 0.563790321 -0.0688074976 -0.0225699935 -0.414621741 0.261523336 -0.367159843 0.132370532 0.43103531 -0.816531897 -0.466969997 0.735987067 -1.22630703 0.342667967 -0.294000894 0.135101974 -0.0378326476 0.0824823678 0.147694707 -0.255042374 0.252311587 -0.0832058489 0.115387499 0.0383432508 0.311978757 -0.35476163 -0.251133919 -0.127390802 -0.278798878 -0.0658633709 -0.169710755 0.10472095 -0.413409442 0.266024083 0.219783545 -0.571934044 -0.0991370752 -0.378903538 -0.205926999 -0.118760422 0.356318653 0.282674253 -0.284242719 -0.0233479347 -0.660858035 -0.337441504 -0.397672445 -0.224471644 -0.0194229782 -0.0566895641 0.0918207914 -0.722848296 -0.422334075 0.156972796 0.105659269 -0.218875751 -0.183258414 -0.289870888 -0.627925158 0.00232395483 -0.272777468 -0.206908002 0.140285686 -1.39786661 -0.244131804 0.0973545313 -0.384232223 0.782722712 -0.0683798194 0.00587336207 0.0630170032 0.00475218426 -0.275831044 -0.262175262 0.5411098 -0.143385649 0.105981715 0.290706843 -0.275909126 -0.322913945 -0.158212081 0.178924516 -0.374232709 0.253573924 0.495505601 -0.000507302117 -0.0134187778 0.0149430363 -0.359306127 -0.0214154068 -0.0436305627 0.218818977 -0.284728497 -0.105987884 0.387490004 -0.257458538 -0.532553136 -0.489784628 0.00797009096 0.034348134 0.0592828915 -0.264737159 -0.00419930881 -0.166225985 -0.514227509 0.054569304 0.720892966 -0.945666254 -0.101841524 -0.738022685 0.263073087 0.00315307919 -0.174990952 0.160896376 0.158635333 0.212532192 -0.675349474 0.154023632 -0.790928781 -0.097451441 -0.328761786 -0.432847708 -0.167734772 0.320907891 -0.395865083 -0.127672791 -0.361533642 -0.326063871 0.00723570585 0.301655114 0.38336426 -0.138432086 0.0267968178 -0.341245532 0.198763013 -0.156549156 -0.168991446 0.109807789 0.147832334 0.230539024 0.339356005 0.0258529875 0.0701860115 -0.260305405 0.0765791759 0.124691404 0.446766138 -0.0525965169 -0.0872352198 -0.314742565 0.118622243 -0.0410029888 -0.300252944 -0.443260282 0.356091917 0.0998460427 0.196927428 0.283606917 -0.114201158 -0.275869876 0.140024886 0.274953276 0.213213205 0.0333612375 -0.419680864 0.256921679 -0.0288509149 0.142487884 -0.320221335 0.107287265 -0.0764313936 0.19931443 0.168925151 0.102179654 -0.0394653752 0.0944156721 -0.234162107 -0.199536413 0.041542232 -0.0424650609 -0.241035342 -0.038616091 0.383313894 0.183405042 -0.0879974961 -0.266196191 0.120996475 -0.072591871 0.0741231441 -0.259029686 0.139336109 -0.280518383 -0.120514363 0.089187324 0.0281807184 0.0937157869 -0.0292318165 0.39451009 -0.0676919818 -0.183766067 0.0561964512 0.386999249 -0.333873868 -0.191797003 0.405677915 -0.220024928 -0.254955947 -0.228693873 -0.301927477 0.205376327 -0.236423552 -0.137719303 -0.0549848713 0.12109825 -0.153873354 0.1249668 0.125228718 0.256292999 -0.104651891 0.221602827 0.0408095643 -0.371450037 0.226722091 -0.22828345 -0.51871413 0.109118208 -0.274272949 0.0653151274 -0.334184229 -0.271082699 0.257067382 0.335549295 0.0171961971 -0.640244186 0.316120058 0.0228819512 0.177242637 0.126317352 -0.0191921834 -0.558197916 -0.445990294 0.0745763555 -0.146548942 -0.408743292 0.132611856 -0.412264019 0.028413849 -0.270771503 0.35646075 -0.091095686 0.383120537 -0.675663769 0.0772888884 -0.426999152 0.20765081 -0.33676222 -0.0586808808 -0.552221239 0.0580451302 -0.420519203 -0.185565904 -0.305164546 0.44701913 -0.384883195 0.465490639 0.249964133 0.387973845 -0.246443212 0.211551309 0.194330812 0.316599607 -0.402114421 -0.0389004052 -0.309160352 0.0662557185 0.128859997 -0.0520181954 0.0879987776 -0.0292927623 0.149965107 0.330759287 0.135521889 -0.363044173 0.0441586673 0.289290011 0.0732520819 -0.262773335 -0.341754317 0.0670925975 -0.322930515 0.359452903 -0.0553938448 0.163117468 0.232382417 0.170554221 0.194954038 0.181320965 0.0249615014 -0.396878719 0.286537349 -0.332395345 0.30539906 0.0414740928 -0.119748816 0.123458222 -0.170596451 -0.0497980118 0.00563279539 -0.712898672 0.198785663 -0.0138059622 -0.149870306 -0.0615664646 -0.415389121 -0.0380925722 0.25146085 -0.0359715745 -0.242960826 -0.313209027 0.380550474 tensor_densebias0 18 -0.765830636 0 -2.22788048 -3.68073654 0.0771816447 1.29698884 -3.24655819 0 0.960737824 -3.24917698 0 0 1.751598 1.87120247 -3.39656305 0 0 0.637763739 tensor_densekernel0 162 0.00410030317 -0.251877546 0.0752192661 -0.0165741164 -0.0360634923 0.0980413929 0.0321347266 -0.31677863 0.048453521 0.120889112 -0.378578722 -0.385638952 0.0671059564 -0.0242416728 0.0542870201 -0.17180866 -0.186368644 0.034994252 0.548609793 0.313572913 0.289979935 0.219010249 0.0654966235 -0.118508138 0.319039732 -0.198461652 -0.854973733 -0.0754994825 -0.461179346 -0.34174788 0.623324513 0.121664703 -1.31588912 -0.011667937 0.328584045 0.252034217 -0.476458609 -0.381720871 -0.800810575 -0.220728636 0.0811574236 -0.785986185 -0.397896767 -0.465779543 0.971165359 -0.421148866 0.306656867 -0.112013519 -0.748001277 0.609203935 0.686903059 0.390887529 -0.445505351 -0.0948646814 1.81211233 0.39611879 -0.218298838 1.89018214 -0.196536109 -0.487700462 0.862431467 0.255100936 -0.483936131 -0.616066515 -0.257072181 -0.419562995 0.0582817309 0.0054119667 -0.0372121781 0.438982219 -0.0673293173 -0.927422941 -1.51743543 0.367863864 2.60507059 -0.143773764 -0.0023456302 -1.06768024 2.50358272 0.0790764987 -1.20727885 -0.925471008 0.182917744 0.0869391859 1.53707588 2.009027 -0.352342278 -0.0942674279 0.222299367 -2.60185504 -0.717510462 -0.396887541 -2.15814281 -2.47405815 0.476093709 -0.881801009 -2.12758303 0.0345440209 1.34031808 2.24885631 0.000410348177 -0.405666113 -3.23774004 -2.7347796 2.07542539 -0.298507154 0.199764162 2.48347616 0.772245765 -0.464488387 -0.126589477 0.737949669 0.924435496 1.26508319 -1.92618942 -0.4407323 -0.663278282 -0.516723216 -0.0935911834 0.180106729 0.0797955841 0.169798598 -1.20076728 0.441997916 0.339854985 -0.372726202 -0.042867586 -0.321796119 -0.295695961 0.033209078 -0.258785099 -0.244913846 -0.025661882 0.21984008 -0.502650797 0.0331971198 0.0877541006 -0.0945754051 -0.262866855 0.0555101335 0.00938382186 0.263166636 -0.185153127 -0.0786966234 -0.0924948677 -0.308316886 0.254486978 -0.23404485 -0.10045673 -0.48339048 -0.062144503 0.397630483 0.0521859676 -0.0800913423 -0.0493279994 0.0678057373 -0.303487033 0.267953157 -0.406177253 -0.200283408 -0.315842867 0.26891467 -tensor_dense1kernel0 324 --0.0263914503 -0.176089928 -0.66779393 0.392864287 0.0328721851 0.563790321 -0.0688074976 -0.0225699935 -0.414621741 0.261523336 -0.367159843 0.132370532 0.43103531 -0.816531897 -0.466969997 0.735987067 -1.22630703 0.342667967 -0.294000894 0.135101974 -0.0378326476 0.0824823678 0.147694707 -0.255042374 0.252311587 -0.0832058489 0.115387499 0.0383432508 0.311978757 -0.35476163 -0.251133919 -0.127390802 -0.278798878 -0.0658633709 -0.169710755 0.10472095 -0.413409442 0.266024083 0.219783545 -0.571934044 -0.0991370752 -0.378903538 -0.205926999 -0.118760422 0.356318653 0.282674253 -0.284242719 -0.0233479347 -0.660858035 -0.337441504 -0.397672445 -0.224471644 -0.0194229782 -0.0566895641 0.0918207914 -0.722848296 -0.422334075 0.156972796 0.105659269 -0.218875751 -0.183258414 -0.289870888 -0.627925158 0.00232395483 -0.272777468 -0.206908002 0.140285686 -1.39786661 -0.244131804 0.0973545313 -0.384232223 0.782722712 -0.0683798194 0.00587336207 0.0630170032 0.00475218426 -0.275831044 -0.262175262 0.5411098 -0.143385649 0.105981715 0.290706843 -0.275909126 -0.322913945 -0.158212081 0.178924516 -0.374232709 0.253573924 0.495505601 -0.000507302117 -0.0134187778 0.0149430363 -0.359306127 -0.0214154068 -0.0436305627 0.218818977 -0.284728497 -0.105987884 0.387490004 -0.257458538 -0.532553136 -0.489784628 0.00797009096 0.034348134 0.0592828915 -0.264737159 -0.00419930881 -0.166225985 -0.514227509 0.054569304 0.720892966 -0.945666254 -0.101841524 -0.738022685 0.263073087 0.00315307919 -0.174990952 0.160896376 0.158635333 0.212532192 -0.675349474 0.154023632 -0.790928781 -0.097451441 -0.328761786 -0.432847708 -0.167734772 0.320907891 -0.395865083 -0.127672791 -0.361533642 -0.326063871 0.00723570585 0.301655114 0.38336426 -0.138432086 0.0267968178 -0.341245532 0.198763013 -0.156549156 -0.168991446 0.109807789 0.147832334 0.230539024 0.339356005 0.0258529875 0.0701860115 -0.260305405 0.0765791759 0.124691404 0.446766138 -0.0525965169 -0.0872352198 -0.314742565 0.118622243 -0.0410029888 -0.300252944 -0.443260282 0.356091917 0.0998460427 0.196927428 0.283606917 -0.114201158 -0.275869876 0.140024886 0.274953276 0.213213205 0.0333612375 -0.419680864 0.256921679 -0.0288509149 0.142487884 -0.320221335 0.107287265 -0.0764313936 0.19931443 0.168925151 0.102179654 -0.0394653752 0.0944156721 -0.234162107 -0.199536413 0.041542232 -0.0424650609 -0.241035342 -0.038616091 0.383313894 0.183405042 -0.0879974961 -0.266196191 0.120996475 -0.072591871 0.0741231441 -0.259029686 0.139336109 -0.280518383 -0.120514363 0.089187324 0.0281807184 0.0937157869 -0.0292318165 0.39451009 -0.0676919818 -0.183766067 0.0561964512 0.386999249 -0.333873868 -0.191797003 0.405677915 -0.220024928 -0.254955947 -0.228693873 -0.301927477 0.205376327 -0.236423552 -0.137719303 -0.0549848713 0.12109825 -0.153873354 0.1249668 0.125228718 0.256292999 -0.104651891 0.221602827 0.0408095643 -0.371450037 0.226722091 -0.22828345 -0.51871413 0.109118208 -0.274272949 0.0653151274 -0.334184229 -0.271082699 0.257067382 0.335549295 0.0171961971 -0.640244186 0.316120058 0.0228819512 0.177242637 0.126317352 -0.0191921834 -0.558197916 -0.445990294 0.0745763555 -0.146548942 -0.408743292 0.132611856 -0.412264019 0.028413849 -0.270771503 0.35646075 -0.091095686 0.383120537 -0.675663769 0.0772888884 -0.426999152 0.20765081 -0.33676222 -0.0586808808 -0.552221239 0.0580451302 -0.420519203 -0.185565904 -0.305164546 0.44701913 -0.384883195 0.465490639 0.249964133 0.387973845 -0.246443212 0.211551309 0.194330812 0.316599607 -0.402114421 -0.0389004052 -0.309160352 0.0662557185 0.128859997 -0.0520181954 0.0879987776 -0.0292927623 0.149965107 0.330759287 0.135521889 -0.363044173 0.0441586673 0.289290011 0.0732520819 -0.262773335 -0.341754317 0.0670925975 -0.322930515 0.359452903 -0.0553938448 0.163117468 0.232382417 0.170554221 0.194954038 0.181320965 0.0249615014 -0.396878719 0.286537349 -0.332395345 0.30539906 0.0414740928 -0.119748816 0.123458222 -0.170596451 -0.0497980118 0.00563279539 -0.712898672 0.198785663 -0.0138059622 -0.149870306 -0.0615664646 -0.415389121 -0.0380925722 0.25146085 -0.0359715745 -0.242960826 -0.313209027 0.380550474 -tensor_dense3bias0 1 --0.0451157875 -tensor_dense1bias0 18 -3.76501417 2.73554301 -2.60870385 0.107781395 -4.37820244 0.507640719 0.519423902 3.38447642 1.03161252 -0.188384086 -0.160914943 -0.134798273 0.210564345 -0.111250617 -0.041059725 0.11066065 -0.362806678 -1.21268153 -tensor_dense2kernel0 324 --0.0326158293 -0.0214606635 -0.147380427 0.260059774 -0.272593558 -0.357100874 -0.489883542 0.181158081 -0.292910069 -0.0382927954 0.385302782 0.0841034725 -0.515747845 -0.0366827361 -0.41696766 -0.136859626 0.560083032 -0.877815783 -0.198815316 -0.071410276 -0.119702853 0.194164768 -0.663946688 0.203079388 -0.661458552 0.0283672903 0.0312127955 -0.793490767 -0.175637379 0.0129228048 -0.078098163 -0.0065675755 0.107588314 -0.0700756088 -0.0307945814 -0.393786758 -0.397494853 -0.447578669 0.00166100264 0.176444545 0.223876506 0.314781606 -0.148332044 0.37956053 -0.292000055 -0.315586269 -0.767495334 0.0300642755 -0.0316957645 -0.114400581 -0.397911936 0.0416087657 -0.441442788 -0.179116845 -0.0691933632 0.281821012 0.179414943 0.170366213 -0.287315071 -0.0968943164 -0.834237337 0.377477676 0.0039617219 0.0889093354 0.157027498 -0.444697887 0.0286771171 0.186597362 0.141293392 -0.103611745 -0.280898541 0.258475125 -0.366162539 0.393138081 -0.409053087 -0.37111178 0.330109179 -0.252574742 0.101193488 0.290777713 0.638947129 -0.560665727 -0.404144883 -0.503008664 -0.358144909 -0.141276598 -0.386720717 0.328924596 0.265295684 0.17597574 -0.265047133 -0.256134629 0.0326958485 0.108936138 -0.318903357 0.239903271 0.0441775769 -0.15720129 0.121812008 0.112970851 0.0300272666 -0.120011538 0.207462579 -0.226947814 -0.252967507 -0.0173487812 0.113770716 -0.00765861431 -0.386898875 -0.273671359 0.322261423 -0.0730545893 -0.0345935896 0.361966401 -0.305979669 0.196086809 0.237485275 0.145209908 0.337185442 -0.284427434 0.338367254 0.0145493988 -0.0667599142 -0.0333889127 0.235080287 -0.16273123 -0.137464404 0.133096561 -0.282593697 0.349115998 0.0478930883 -0.1300423 0.221431211 -0.755773067 -0.0295607522 -0.444253117 0.455138743 -0.440997809 0.068454653 -0.345567048 -0.0314863622 -0.00710728904 0.00686156424 -0.235272437 -0.132157132 -0.573762536 -0.169393331 0.226024494 0.0276884064 -0.0186517537 -0.114920363 -0.087619327 0.15204291 -0.155371502 -0.156148314 -0.275233805 0.248487055 -0.173548684 -0.396200269 0.0538709313 0.181223661 0.26170826 0.25423938 -0.292572677 0.406721413 0.171206042 0.462159932 0.173379421 -0.357626319 -0.0628680661 -0.101932786 -0.367589772 -0.155828491 -0.0158654284 0.181940198 -0.290369451 -0.219032705 0.168755487 -0.364006639 -0.0838576257 -0.0495029092 0.164797157 0.401931405 -0.185772434 -0.470714986 -0.259718716 0.151264787 -0.355638713 -0.0274338163 -0.0445246398 -0.363112628 0.0637958944 0.230095699 -0.319374502 -0.177356243 0.186115965 0.00376251177 0.310085833 -0.0840077996 0.0207857341 0.372401476 -0.088926211 0.461762756 0.44390583 0.0832194835 -0.0527081341 -0.263354778 0.360482752 -0.0964892805 0.141883373 -0.206007272 -0.231929556 -0.0922410786 0.0874458402 -0.163428232 0.0415216237 0.285924286 0.425971031 -0.177229896 0.0112448065 -0.344616681 0.131998301 -0.00544981193 0.381109178 0.00316478941 -0.0103405574 0.218600646 0.278505147 -0.0311694033 -0.0969366059 0.016073823 -0.162525415 0.110866435 -0.13220942 -0.327007145 -0.256160319 0.309774518 -0.260783821 0.0928290114 -0.199047819 -0.0981284827 0.457926184 0.116957642 0.303967118 0.10286703 0.00751838088 -0.189568073 0.244091809 -0.182571292 0.0404732972 -0.114508398 0.185837954 0.140939251 0.148204267 0.13045907 -0.0311368257 0.407806993 0.202125058 -0.76503098 -1.2059505 0.354308307 -0.165411279 0.254802406 -0.309738517 0.0147923231 -0.42722699 0.273618937 -0.00213857903 -0.661950648 -0.11774125 -0.121417731 0.131325066 -0.266724139 0.0382939428 0.0304451305 -0.173829958 -0.297702312 -0.0350169875 0.132566139 -0.641611457 -0.419360518 -0.110152349 -0.36184147 -0.260720879 0.301546812 -0.152658522 -0.281799912 0.38348937 0.233813092 0.0313779525 0.0538714528 0.152991876 -0.516138613 -0.0236546379 -0.272414327 -0.811290383 -0.170065671 -0.269182652 -0.057427641 0.391452312 -0.281101584 -0.409297436 0.296410561 0.0449393354 0.301495105 -0.417284042 -0.383383662 -0.130773708 -0.365457088 -0.041190654 0.431167424 -0.209479824 0.190645412 0.287688553 0.306342244 -0.368990362 -0.0779836699 -0.0366391391 0.0369122662 -0.367377281 -0.361935526 0.0569181964 -0.278449833 0.177742794 diff --git a/TrkHitReco/data/TrainBkgDiagPlaneSpatial.dat b/TrkHitReco/data/TrainBkgDiagPlaneSpatial.dat index 4f1694b91e..0cb05fd978 100644 --- a/TrkHitReco/data/TrainBkgDiagPlaneSpatial.dat +++ b/TrkHitReco/data/TrainBkgDiagPlaneSpatial.dat @@ -1,16 +1,16 @@ +tensor_dense3bias0 1 +-0.0912241414 tensor_dense3kernel0 18 -0.49923563 -0.284033954 0.527208149 0.366717249 -0.0240253881 -0.00670103123 0.255839348 -0.213168636 -0.0279598236 0.473420501 -0.0786570236 0.468737394 0.0573656075 0.318944722 -0.346582144 0.0935496688 0.465786874 -0.470276743 tensor_dense2bias0 18 0.0909378007 0 0 -0.0914332792 0.0707397759 0.0309092831 -0.013775548 0.0892747194 0 -0.0902339146 0.0931028873 -0.0913385302 -0.129863232 -0.0161500182 -0.000453821587 0 -0.0917760581 0.0903066695 +tensor_dense2kernel0 324 +0.082810238 -0.176566854 -0.325975388 -0.272701621 0.309253722 0.290908307 -0.396143407 0.102859288 -0.302887499 0.0532708541 -0.114524618 -0.0963798016 -0.0674799755 -0.23995553 -0.232547283 -0.338266253 0.219544545 0.204885438 0.405594081 0.333141327 -0.335743725 -0.236744255 -0.230340049 0.0780092254 -0.103040561 -0.318279266 0.164360583 -0.00702600926 -0.0360747688 0.376960695 -0.195979491 0.32165727 -0.24974218 -0.139436275 0.204825729 -0.300515145 -0.349133372 -0.142887264 -0.205085814 -0.35063827 -0.268238902 -0.19149293 0.122089505 -0.13539809 0.103910148 -0.0662255585 0.192534328 0.263743579 -0.156653702 -0.283774972 0.282843113 0.0522403121 0.0958935618 -0.211404055 -0.0111173987 0.321826041 0.225298107 -0.130390257 0.267179728 -0.342118919 -0.305151165 -0.219819933 0.20961076 0.176683247 -0.215486139 0.246192396 -0.24401103 0.377924383 0.312923014 0.301350355 0.213441908 -0.0119836628 0.0102025336 -0.0564164221 -0.266696095 0.0428714044 0.357691437 -0.269780785 -0.148280516 0.380046487 0.174362242 0.301345915 0.297007352 -0.147787631 0.387221247 0.00547888549 0.406351864 -0.330680132 0.198596641 -0.315114409 0.0318014696 -0.264674664 -0.370256037 0.331597894 0.040265929 0.169283211 0.141130447 -0.173329264 0.147268534 -0.11657086 -0.262908131 0.335767835 0.358950019 -0.0495753661 0.388055414 0.367348969 -0.13750124 0.336553514 -0.35848251 0.0155874491 0.361515343 0.0545571446 -0.249751404 -0.280478477 0.150899291 0.163843751 0.198185623 0.330369055 -0.221643299 -0.144520432 0.376201987 0.293933034 -0.110676914 -0.259290427 0.229890287 0.171320736 -0.412386119 -0.359963924 -0.183979526 0.153671935 -0.326049238 -0.43077305 0.149233326 0.118902415 -0.250204593 -0.329829603 0.104890034 -0.132739171 -0.110028617 -0.0979827642 0.179797947 0.0284928679 0.226779297 0.253813684 0.0347214639 0.166841328 0.0103777349 0.0108613968 -0.0147683024 0.123033583 -0.143809974 -0.220113307 -0.359460831 0.231076539 -0.360279977 0.0128234625 0.189258695 -0.0324128866 0.354571044 0.161994994 0.0285461247 -0.375634134 -0.318084449 0.0983518958 -0.23012206 0.0595188364 -0.228104234 -0.194912717 0.248177603 -0.159052566 -0.101722866 0.143185437 -0.350634158 0.0774365216 0.332862288 0.270487517 -0.284936458 -0.388512284 -0.304489285 0.00728440378 0.00959548354 0.193390369 0.164109766 0.00910043716 -0.352418005 -0.136353433 0.345181704 0.346057534 0.0486492813 -0.372839183 0.0996884704 -0.366785973 0.179013848 -0.272728264 0.162253797 -0.138225555 0.152498782 -0.0123464167 -0.00715793483 -0.137236148 -0.35470137 0.019653324 0.119426101 -0.279477596 -0.375067294 0.173431307 -0.046202302 -0.278275609 -0.102022551 -0.186091185 0.208305225 -0.396186918 0.251442999 -0.344932854 -0.0187661443 -0.244534925 0.15821135 -0.248219073 -0.00735369325 0.401295066 0.382265687 0.12031883 0.299932301 0.00936070085 -0.337295443 0.274828732 0.331279695 -0.186784878 0.390990615 -0.249032393 -0.294125974 -0.328150809 -0.0450885892 0.149381757 0.234476015 -0.135326833 -0.364499032 0.359109551 -0.14390184 -0.19313693 0.219110489 0.125738218 -0.312737584 0.24577783 0.368192732 0.22869271 -0.0781142041 0.220714167 -0.110441357 -0.351381034 0.214203238 0.216892987 -0.339707762 0.364352345 -0.195287585 -0.370702416 0.171139836 0.172463477 0.174296856 -0.362536848 -0.0942681432 0.226483643 0.274785578 0.0104376972 -0.234068751 -0.136622638 0.315758944 -0.293878257 -0.128108352 -0.363852322 0.0608328581 -0.00887599587 0.129625022 0.124039292 0.232850134 0.0397102237 0.119207144 -0.254070997 -0.00708922744 0.368817449 0.348613799 -0.159995064 -0.331655324 -0.338255346 0.0500045419 0.19238925 -0.406494051 -0.0800584555 -0.389995754 0.258289218 -0.148137838 0.0284831226 0.364967465 0.133636951 -0.250763088 0.0537726581 0.201634169 -0.357472569 0.306880832 -0.39801684 -0.180240735 0.281214118 0.310374618 0.286409616 -0.196789548 -0.287609369 0.230510235 0.302433312 0.193969488 -0.124719471 0.263330281 -0.217365369 0.0553530455 -0.250049055 0.353301525 -0.346318483 0.0775150359 -0.202018619 0.0814929605 0.0110867321 0.296535194 -0.184014753 -0.228003979 -0.143651128 +tensor_dense1bias0 18 +0.0835441053 -0.0233544391 0 0 -0.0312504955 -0.113087058 0 0.0184594151 0 -0.0688046217 0 0.0639159828 0 -0.0834235474 0 0 0 0 +tensor_dense1kernel0 324 +0.247507185 -0.374164015 0.18388617 0.147181511 -0.376836598 0.00715914601 0.111596227 0.110605523 0.229094207 -0.406916887 0.138442695 0.350413531 -0.229618743 -0.0347062498 0.391099989 -0.0808981657 -0.1491431 0.0203613043 0.391502708 -0.121209443 -0.136559784 0.196898282 0.218374446 0.361614496 0.369804025 0.118301786 0.178149819 0.313564956 -0.327144384 0.195112795 -0.406025976 0.303786069 0.119072437 -0.343437701 -0.369521439 -0.134506404 0.364843071 -0.0134108663 -0.16571033 -0.338997602 -0.337787747 -0.396911919 -0.275546372 -0.374325573 0.222404361 -0.311259866 -0.184218764 -0.0108383298 -0.216896519 -0.330774724 -0.037093401 -0.0372204185 0.212131798 0.308585346 -0.26001966 -0.0867864788 0.0729959011 0.21268779 -0.00163248181 -0.40796566 0.0724838376 0.358314216 0.30299437 0.125292182 0.328989446 -0.386031628 -0.25703764 0.363892019 -0.391360581 0.0154024065 -0.0279175341 -0.158578083 -0.364545107 -0.0760065243 0.249849498 -0.139750272 0.207574815 -0.149768904 -0.387142509 0.121873565 0.19070065 -0.118282922 0.197196007 0.146270379 -0.0855668783 0.279734522 -0.0225435197 0.346718132 0.34485954 0.103398681 -0.232785061 0.183857143 -0.0447723567 -0.354038924 0.111505136 0.0928013772 -0.184741154 -0.320552677 -0.143292755 -0.181996077 0.322964847 0.318309218 -0.319590092 0.171787143 0.350407958 -0.18371439 0.273332238 0.232768655 -0.420559436 -0.39701888 -0.386915922 0.308427811 0.330634356 0.161441669 -0.209408507 0.0534273386 -0.250059754 0.00965514127 0.0750333071 -0.0036419204 -0.406915814 0.408664107 -0.0451715291 -0.0588026643 -0.156872481 -0.0361219943 0.303965837 0.00184230786 -0.386882812 0.181934655 -0.175739482 0.0723275915 0.0575032532 0.0695576593 0.259797513 -0.201868206 -0.356015295 -0.3167786 0.38496989 0.0173768047 -0.261314213 -0.370961696 -0.207044557 -0.098567605 -0.336987764 0.131794572 -0.314377666 -0.171784356 -0.19724822 -0.240534112 0.112560809 -0.167968258 0.0552406311 -0.00507960375 -0.341743588 -0.135332167 -0.226001322 0.174664766 0.206398487 0.0411049128 0.136407912 0.227215111 0.137946665 -0.175838798 -0.384847939 -0.214071587 0.155375332 -0.260869533 -0.0958104134 0.185114011 -0.180848002 0.179856122 0.251278579 0.00145318476 -0.151259631 0.102508217 -0.342980236 -0.22182259 -0.249169827 -0.142893195 0.14096947 0.199755549 -0.208522871 -0.335011601 0.0849774927 0.156856239 -0.235071197 0.393354326 -0.282950848 0.344265074 -0.372696787 -0.0409674756 -0.392247468 0.220563814 -0.0202352405 -0.130950511 -0.384616494 0.0979605913 0.206095278 -0.236384317 0.0113648176 -0.144687265 -0.276152849 0.162736893 0.168941319 -0.361037105 0.389443099 0.349489927 -0.400239676 0.299275756 0.135023057 -0.239390507 0.340909541 0.0531375408 0.0685512424 -0.356989592 0.261479259 0.312693775 -0.375647247 -0.234239385 -0.321790725 0.122568429 -0.222505286 -0.0968836248 -0.0257885456 -0.0708942711 -0.0562367439 0.0567439497 -0.00612005591 -0.155184537 0.145660281 0.372560918 -0.108341485 -0.0172801912 0.428247392 -0.0121117355 0.00467455387 0.188069522 0.131744757 -0.318478197 -0.335353822 -0.1474507 0.0974400043 -0.216058344 -0.112113357 0.38855201 0.286982059 0.132208377 -0.162651405 -0.0656467974 0.03015396 -0.249817401 0.0507923663 0.374235511 -0.00762650371 -0.130447298 -0.156746015 0.0783307776 0.12237072 -0.246275663 -0.0616826713 -0.343400002 0.134777069 0.1679786 0.253923237 0.0542273372 -0.215958118 -0.0260731578 0.306089103 0.16368556 0.374859601 0.147867903 -0.264927506 -0.320762664 -0.335860163 0.234967217 -0.0580170751 -0.300065428 0.359117329 0.169213012 -0.376421273 0.283923715 0.358114302 0.209728345 -0.263195366 -0.052423507 0.39912492 -0.381863117 0.112902492 0.00287738373 -0.218895659 -0.212840989 -0.0334280021 -0.00571503397 0.010019362 -0.235459745 -0.245213985 -0.155761585 0.086517632 -0.267062008 0.194820464 0.0170618445 -0.36757955 0.32172811 0.0704824626 -0.274176776 -0.142071903 0.0518184602 0.334832907 -0.279493749 0.128533125 -0.358558059 -0.266375363 -0.0105703771 0.341759741 0.0253640711 0.35503602 0.20487082 0.382509589 0.131708741 0.214949667 -0.371945262 0.172899425 0.105886042 tensor_densebias0 18 0.0629199743 -0.109868109 0 0 -0.0799504519 -0.0643623173 -0.0964867249 0.0694528371 -0.0646585152 -0.040373493 -0.0804753676 0.0545519367 0 0.0881884843 0.0894297734 0.00229221326 0.00578629179 0 tensor_densekernel0 162 0.255545586 0.233219191 -0.468821079 -0.253446102 0.00548689067 0.207030952 0.0650164708 0.280484974 0.117374033 0.121084653 0.429237127 0.0998938233 -0.23231411 0.0104321912 0.014690578 0.0603859425 0.430282891 -0.0291293263 -0.334117681 -0.471948922 -0.250924706 0.0207818747 -0.247099385 -0.54980278 -0.11746484 -0.324515194 -0.145120919 0.266828179 -0.140082002 -0.0258186646 -0.0758785009 -0.0802008808 -0.247363999 -0.0661908612 0.164244711 -0.365021378 -0.244696602 -0.109149836 0.429235667 -0.263868272 -0.0498967953 -0.107055873 0.0988786593 0.170211151 -0.08584553 0.215698794 -0.392210841 -0.257127911 0.117904395 0.346699834 0.23093541 0.0969962105 -0.0877152383 -0.405619264 0.097097531 -0.388186157 0.370691448 -0.367373735 -0.0203147903 -0.385144025 -0.499596328 0.564691007 0.243740857 0.0778565183 -0.609458089 -0.142377824 -0.3757613 0.365494013 -0.0351900011 0.272758901 0.473482102 -0.0878048241 -0.374022961 0.00331774936 -0.335211992 -0.316788852 0.56314069 -0.23597613 0.38842991 0.19061093 0.0718853772 0.318351299 0.391029269 -0.140710548 -0.467617035 -0.112617314 -0.595653474 -0.409435749 -0.208863527 -0.309089124 0.393719226 -0.652424991 0.314730972 -0.320463061 -0.601469636 0.056894172 -0.394238621 0.170260251 -0.109770864 -0.380320936 -0.0521266982 0.136328712 0.225111395 -0.154760584 0.231845796 -0.271383166 0.210005373 0.406867236 -0.354488522 -0.0517787002 -0.470699728 -0.0341172516 0.350739926 0.173670739 -0.572333097 0.0182319265 -0.0350507945 0.337798387 0.193393096 0.167721689 0.0985344946 -0.0097090397 0.205834359 -0.324763268 -0.23260124 -0.0740352571 -0.37374115 -0.411190391 -0.265211344 0.30099389 0.264273494 -0.218448892 0.0865245983 -0.344054222 -0.0560543686 0.22312738 0.260852724 -0.21138145 -0.418154627 0.556002438 0.46050626 0.380940884 0.0159798507 0.0558987558 0.439387649 0.283625484 0.205953866 -0.310205758 0.372804761 -0.0596882589 0.370457351 -0.0157625731 0.437949657 0.388307661 0.0557162426 0.406684905 -0.34582454 0.314096779 -0.296174586 -0.343478143 -0.13323839 0.23462984 -tensor_dense1kernel0 324 -0.247507185 -0.374164015 0.18388617 0.147181511 -0.376836598 0.00715914601 0.111596227 0.110605523 0.229094207 -0.406916887 0.138442695 0.350413531 -0.229618743 -0.0347062498 0.391099989 -0.0808981657 -0.1491431 0.0203613043 0.391502708 -0.121209443 -0.136559784 0.196898282 0.218374446 0.361614496 0.369804025 0.118301786 0.178149819 0.313564956 -0.327144384 0.195112795 -0.406025976 0.303786069 0.119072437 -0.343437701 -0.369521439 -0.134506404 0.364843071 -0.0134108663 -0.16571033 -0.338997602 -0.337787747 -0.396911919 -0.275546372 -0.374325573 0.222404361 -0.311259866 -0.184218764 -0.0108383298 -0.216896519 -0.330774724 -0.037093401 -0.0372204185 0.212131798 0.308585346 -0.26001966 -0.0867864788 0.0729959011 0.21268779 -0.00163248181 -0.40796566 0.0724838376 0.358314216 0.30299437 0.125292182 0.328989446 -0.386031628 -0.25703764 0.363892019 -0.391360581 0.0154024065 -0.0279175341 -0.158578083 -0.364545107 -0.0760065243 0.249849498 -0.139750272 0.207574815 -0.149768904 -0.387142509 0.121873565 0.19070065 -0.118282922 0.197196007 0.146270379 -0.0855668783 0.279734522 -0.0225435197 0.346718132 0.34485954 0.103398681 -0.232785061 0.183857143 -0.0447723567 -0.354038924 0.111505136 0.0928013772 -0.184741154 -0.320552677 -0.143292755 -0.181996077 0.322964847 0.318309218 -0.319590092 0.171787143 0.350407958 -0.18371439 0.273332238 0.232768655 -0.420559436 -0.39701888 -0.386915922 0.308427811 0.330634356 0.161441669 -0.209408507 0.0534273386 -0.250059754 0.00965514127 0.0750333071 -0.0036419204 -0.406915814 0.408664107 -0.0451715291 -0.0588026643 -0.156872481 -0.0361219943 0.303965837 0.00184230786 -0.386882812 0.181934655 -0.175739482 0.0723275915 0.0575032532 0.0695576593 0.259797513 -0.201868206 -0.356015295 -0.3167786 0.38496989 0.0173768047 -0.261314213 -0.370961696 -0.207044557 -0.098567605 -0.336987764 0.131794572 -0.314377666 -0.171784356 -0.19724822 -0.240534112 0.112560809 -0.167968258 0.0552406311 -0.00507960375 -0.341743588 -0.135332167 -0.226001322 0.174664766 0.206398487 0.0411049128 0.136407912 0.227215111 0.137946665 -0.175838798 -0.384847939 -0.214071587 0.155375332 -0.260869533 -0.0958104134 0.185114011 -0.180848002 0.179856122 0.251278579 0.00145318476 -0.151259631 0.102508217 -0.342980236 -0.22182259 -0.249169827 -0.142893195 0.14096947 0.199755549 -0.208522871 -0.335011601 0.0849774927 0.156856239 -0.235071197 0.393354326 -0.282950848 0.344265074 -0.372696787 -0.0409674756 -0.392247468 0.220563814 -0.0202352405 -0.130950511 -0.384616494 0.0979605913 0.206095278 -0.236384317 0.0113648176 -0.144687265 -0.276152849 0.162736893 0.168941319 -0.361037105 0.389443099 0.349489927 -0.400239676 0.299275756 0.135023057 -0.239390507 0.340909541 0.0531375408 0.0685512424 -0.356989592 0.261479259 0.312693775 -0.375647247 -0.234239385 -0.321790725 0.122568429 -0.222505286 -0.0968836248 -0.0257885456 -0.0708942711 -0.0562367439 0.0567439497 -0.00612005591 -0.155184537 0.145660281 0.372560918 -0.108341485 -0.0172801912 0.428247392 -0.0121117355 0.00467455387 0.188069522 0.131744757 -0.318478197 -0.335353822 -0.1474507 0.0974400043 -0.216058344 -0.112113357 0.38855201 0.286982059 0.132208377 -0.162651405 -0.0656467974 0.03015396 -0.249817401 0.0507923663 0.374235511 -0.00762650371 -0.130447298 -0.156746015 0.0783307776 0.12237072 -0.246275663 -0.0616826713 -0.343400002 0.134777069 0.1679786 0.253923237 0.0542273372 -0.215958118 -0.0260731578 0.306089103 0.16368556 0.374859601 0.147867903 -0.264927506 -0.320762664 -0.335860163 0.234967217 -0.0580170751 -0.300065428 0.359117329 0.169213012 -0.376421273 0.283923715 0.358114302 0.209728345 -0.263195366 -0.052423507 0.39912492 -0.381863117 0.112902492 0.00287738373 -0.218895659 -0.212840989 -0.0334280021 -0.00571503397 0.010019362 -0.235459745 -0.245213985 -0.155761585 0.086517632 -0.267062008 0.194820464 0.0170618445 -0.36757955 0.32172811 0.0704824626 -0.274176776 -0.142071903 0.0518184602 0.334832907 -0.279493749 0.128533125 -0.358558059 -0.266375363 -0.0105703771 0.341759741 0.0253640711 0.35503602 0.20487082 0.382509589 0.131708741 0.214949667 -0.371945262 0.172899425 0.105886042 -tensor_dense3bias0 1 --0.0912241414 -tensor_dense1bias0 18 -0.0835441053 -0.0233544391 0 0 -0.0312504955 -0.113087058 0 0.0184594151 0 -0.0688046217 0 0.0639159828 0 -0.0834235474 0 0 0 0 -tensor_dense2kernel0 324 -0.082810238 -0.176566854 -0.325975388 -0.272701621 0.309253722 0.290908307 -0.396143407 0.102859288 -0.302887499 0.0532708541 -0.114524618 -0.0963798016 -0.0674799755 -0.23995553 -0.232547283 -0.338266253 0.219544545 0.204885438 0.405594081 0.333141327 -0.335743725 -0.236744255 -0.230340049 0.0780092254 -0.103040561 -0.318279266 0.164360583 -0.00702600926 -0.0360747688 0.376960695 -0.195979491 0.32165727 -0.24974218 -0.139436275 0.204825729 -0.300515145 -0.349133372 -0.142887264 -0.205085814 -0.35063827 -0.268238902 -0.19149293 0.122089505 -0.13539809 0.103910148 -0.0662255585 0.192534328 0.263743579 -0.156653702 -0.283774972 0.282843113 0.0522403121 0.0958935618 -0.211404055 -0.0111173987 0.321826041 0.225298107 -0.130390257 0.267179728 -0.342118919 -0.305151165 -0.219819933 0.20961076 0.176683247 -0.215486139 0.246192396 -0.24401103 0.377924383 0.312923014 0.301350355 0.213441908 -0.0119836628 0.0102025336 -0.0564164221 -0.266696095 0.0428714044 0.357691437 -0.269780785 -0.148280516 0.380046487 0.174362242 0.301345915 0.297007352 -0.147787631 0.387221247 0.00547888549 0.406351864 -0.330680132 0.198596641 -0.315114409 0.0318014696 -0.264674664 -0.370256037 0.331597894 0.040265929 0.169283211 0.141130447 -0.173329264 0.147268534 -0.11657086 -0.262908131 0.335767835 0.358950019 -0.0495753661 0.388055414 0.367348969 -0.13750124 0.336553514 -0.35848251 0.0155874491 0.361515343 0.0545571446 -0.249751404 -0.280478477 0.150899291 0.163843751 0.198185623 0.330369055 -0.221643299 -0.144520432 0.376201987 0.293933034 -0.110676914 -0.259290427 0.229890287 0.171320736 -0.412386119 -0.359963924 -0.183979526 0.153671935 -0.326049238 -0.43077305 0.149233326 0.118902415 -0.250204593 -0.329829603 0.104890034 -0.132739171 -0.110028617 -0.0979827642 0.179797947 0.0284928679 0.226779297 0.253813684 0.0347214639 0.166841328 0.0103777349 0.0108613968 -0.0147683024 0.123033583 -0.143809974 -0.220113307 -0.359460831 0.231076539 -0.360279977 0.0128234625 0.189258695 -0.0324128866 0.354571044 0.161994994 0.0285461247 -0.375634134 -0.318084449 0.0983518958 -0.23012206 0.0595188364 -0.228104234 -0.194912717 0.248177603 -0.159052566 -0.101722866 0.143185437 -0.350634158 0.0774365216 0.332862288 0.270487517 -0.284936458 -0.388512284 -0.304489285 0.00728440378 0.00959548354 0.193390369 0.164109766 0.00910043716 -0.352418005 -0.136353433 0.345181704 0.346057534 0.0486492813 -0.372839183 0.0996884704 -0.366785973 0.179013848 -0.272728264 0.162253797 -0.138225555 0.152498782 -0.0123464167 -0.00715793483 -0.137236148 -0.35470137 0.019653324 0.119426101 -0.279477596 -0.375067294 0.173431307 -0.046202302 -0.278275609 -0.102022551 -0.186091185 0.208305225 -0.396186918 0.251442999 -0.344932854 -0.0187661443 -0.244534925 0.15821135 -0.248219073 -0.00735369325 0.401295066 0.382265687 0.12031883 0.299932301 0.00936070085 -0.337295443 0.274828732 0.331279695 -0.186784878 0.390990615 -0.249032393 -0.294125974 -0.328150809 -0.0450885892 0.149381757 0.234476015 -0.135326833 -0.364499032 0.359109551 -0.14390184 -0.19313693 0.219110489 0.125738218 -0.312737584 0.24577783 0.368192732 0.22869271 -0.0781142041 0.220714167 -0.110441357 -0.351381034 0.214203238 0.216892987 -0.339707762 0.364352345 -0.195287585 -0.370702416 0.171139836 0.172463477 0.174296856 -0.362536848 -0.0942681432 0.226483643 0.274785578 0.0104376972 -0.234068751 -0.136622638 0.315758944 -0.293878257 -0.128108352 -0.363852322 0.0608328581 -0.00887599587 0.129625022 0.124039292 0.232850134 0.0397102237 0.119207144 -0.254070997 -0.00708922744 0.368817449 0.348613799 -0.159995064 -0.331655324 -0.338255346 0.0500045419 0.19238925 -0.406494051 -0.0800584555 -0.389995754 0.258289218 -0.148137838 0.0284831226 0.364967465 0.133636951 -0.250763088 0.0537726581 0.201634169 -0.357472569 0.306880832 -0.39801684 -0.180240735 0.281214118 0.310374618 0.286409616 -0.196789548 -0.287609369 0.230510235 0.302433312 0.193969488 -0.124719471 0.263330281 -0.217365369 0.0553530455 -0.250049055 0.353301525 -0.346318483 0.0775150359 -0.202018619 0.0814929605 0.0110867321 0.296535194 -0.184014753 -0.228003979 -0.143651128 diff --git a/TrkHitReco/data/TrainBkgDiagStationChi2.dat b/TrkHitReco/data/TrainBkgDiagStationChi2.dat index 520b6b1b6e..1deae2c28d 100644 --- a/TrkHitReco/data/TrainBkgDiagStationChi2.dat +++ b/TrkHitReco/data/TrainBkgDiagStationChi2.dat @@ -1,16 +1,16 @@ +tensor_dense3bias0 1 +-1.63389969 tensor_dense3kernel0 18 -0.329461396 -0.0918437168 -0.415010124 0.196665943 0.214378178 -0.341047645 -0.445964158 0.59192884 0.198812008 -0.631003439 0.225765407 -0.473205805 -0.0195806921 -0.120483942 0.0831672549 0.34762758 0.415001273 0.43630141 +-0.709759355 0.0563208051 -0.225166515 -0.190098584 -0.177250177 0.0095418049 0.189551488 0.542317033 0.152806416 0.380279303 -0.467316985 -0.163102582 -0.412221551 0.246252656 0.26906243 0.337161928 -0.379186243 0.0977794081 tensor_dense2bias0 18 --1.1907407 -0.0510684885 1.05853903 0 0 1.11331272 -0.865414202 -0.686512351 -0.0668596178 0.31876263 0.0310804565 1.06436265 -0.186328501 1.08396423 -0.194860533 -1.07495141 -1.07804012 0.104909763 +2.09017062 -0.0575405136 -0.00427772896 -0.617424369 1.84810615 -0.0940980762 -0.0756672546 -1.66767812 0.246911123 -1.81066215 1.66669095 -0.214812949 -0.106521957 -0.0244851783 0.154795155 0.405586362 1.73539305 -0.115131207 +tensor_dense2kernel0 324 +0.348335385 -0.348026305 -0.395226181 0.111029625 0.15079847 -0.00390863419 0.0168602765 -0.0562158078 0.242443264 -0.1943537 0.139130503 0.0785441399 -0.179161489 -0.379623264 0.193778336 0.0608148575 -0.390570432 -0.0132528841 -0.205662295 -0.0270168688 -0.246891096 -0.39260149 -0.0840581134 -0.425600559 -0.173144221 0.403771073 -0.320695639 0.198643684 0.330192417 -0.264085203 -0.32699737 -0.145521641 -0.238456219 -0.137905911 -0.334777564 0.25073868 0.0419689417 0.0253154933 -0.0776607394 0.0588137805 -0.263948262 0.277296722 -0.179949209 0.103922009 -0.265914857 0.389252603 -0.407456309 0.13724637 -0.318989158 0.222505987 0.344879508 0.113516808 -0.312107146 -0.368973851 0.123899199 -0.0384278595 0.201987267 -0.228064716 0.204607382 0.069260627 0.000261425972 -0.125011295 0.0631269217 0.123710185 -0.261224389 -0.252968788 0.380143821 -0.259605706 0.0179320276 -0.262747049 0.210939944 0.150154769 0.363543868 0.00695947558 0.0548243448 0.092981495 0.00788326561 0.052550938 -0.032512892 0.280582398 0.37929818 0.178262606 0.293788075 -0.0783005506 -0.334042758 -0.354262531 0.211429164 -0.0969034508 0.217321783 -0.331060112 0.258773267 -0.209426522 0.151669979 0.0561493784 -0.274973482 0.0178803504 0.248536274 0.195527375 -0.411211103 0.119627304 0.0348387621 -0.260425448 -0.0127555132 -0.0318073928 -0.0627733842 0.36200887 -0.14693515 0.225585878 -0.111775383 0.0648799911 0.212877959 0.27780956 0.368135661 0.257473946 -0.199414417 -0.095453456 0.223553404 0.04344742 0.212489367 0.536977351 -0.132789075 0.113787852 -0.223942593 0.121503592 0.226700768 -0.248774692 -0.047852993 0.196074426 0.338017285 0.220776141 -0.310058564 0.384644508 -0.180623308 0.227348357 -0.146249563 0.148366004 -0.297627002 -0.111632049 -0.168742478 -0.254471302 0.107807815 0.195642769 -0.241009489 0.137110591 -0.955601931 0.29097113 0.0602338612 -0.451114029 -0.184736356 0.15387702 0.09634763 0.282040864 -0.0425396115 -0.0842109323 0.242259279 -0.246349171 0.183256283 -0.222045973 0.0726832002 -0.304075688 0.0619588755 -0.180641592 -0.10984382 0.0968388319 -0.339003444 -0.268653452 -0.362772495 -0.0304816067 0.199040592 -0.367952615 -0.168888673 -0.250520945 -0.150399685 -0.331943929 -0.132134378 -0.373921156 0.356183648 0.0702860355 0.317050338 0.224939108 -0.461922735 -0.0104995277 -0.158109874 0.242520735 0.0483250543 -0.0449433103 -0.885327578 0.167289123 -0.0586782768 0.0169676971 -0.0114231491 -0.360884488 0.266189963 -0.0595661066 -0.267688692 -0.498930246 -0.12918435 -0.00749823591 0.0114489412 -0.491887927 -0.237985566 0.173155412 0.152779683 0.0521043018 -0.100951254 0.345843554 -0.20080255 -0.221277893 -0.448454201 -0.286474794 -0.45890066 -0.338852763 -0.431523621 0.213808328 0.0911962539 -0.199366331 -0.832066298 0.227857187 0.087824136 0.464577824 0.275142461 -0.454495341 0.285434872 -0.200625762 -0.0879096687 0.109471343 0.0498060584 -0.302960396 0.398914307 0.00316631771 -0.247271404 0.307575822 -0.106879205 -0.490939349 0.289895803 -0.546950281 -0.0258721001 -0.160251945 0.213988826 -0.0122133046 -0.242352307 0.197881624 -0.163107008 0.172830939 0.198348805 -0.120020017 -0.0822188109 0.198845759 -0.0685581714 -0.336232543 0.291799426 -0.298543543 -0.460347384 -0.273566008 -0.188938722 -0.0983397737 -0.00529251201 -0.173683047 -0.253906012 0.194451913 0.046725478 -0.0358129889 -0.115434282 0.267004728 0.107518472 -0.0841246843 -0.430899352 -0.0440077744 0.36580795 0.233117446 -0.490227968 0.284699291 -0.389678389 -0.181136012 -0.292209089 -0.167761505 -0.395639628 -0.313576281 0.174525827 0.256749541 -0.301402956 0.118251637 0.108480863 0.0863566399 0.0284677204 0.139969289 -0.41060245 0.165858045 0.162358522 -0.082307294 -0.0588928685 -0.181628585 -0.236683235 -0.175049067 0.0310883168 0.342689842 0.0697372854 0.260981321 0.175746918 0.154997915 -0.234750718 -0.283760875 -0.387107193 -0.458783925 -0.00870260596 -0.140168622 -0.0106656095 -0.415704042 0.286717623 0.33998403 0.0884242505 0.0754497424 -0.164579719 0.377656072 -0.479131848 -0.164317206 0.240176022 0.337728679 0.411996007 0.0228540394 -0.196003973 -0.201244682 -0.0444593839 0.312540591 +tensor_dense1bias0 18 +-0.125726476 -2.01206589 0 -0.0742830187 2.26509929 0.170289636 -0.0494788215 -0.0317567922 0.671116889 0 -0.878998697 -1.82974195 -2.71522641 1.99821305 0.439312607 -2.21763515 -1.58917403 -0.152975559 +tensor_dense1kernel0 324 +0.355445087 0.343248367 0.120070398 0.0152796805 -0.310164869 -0.0137952566 -0.144438565 -0.265765965 0.335521519 0.0786986053 0.37837106 -0.0483175516 -0.154887646 -0.395661354 0.253268957 0.12787497 -0.337763995 0.402207196 0.231594265 0.104080379 0.130808473 0.0593317747 -0.305612266 0.376142502 0.104566395 0.335813165 -0.0516422987 0.203740478 0.189324915 -0.329336524 0.3424052 0.214182556 -0.174257904 0.232814491 0.271743357 -0.288072467 -0.261056125 -0.492533684 -0.244220003 0.18830061 0.337242961 -0.0947121531 -0.295182198 -0.434170634 -0.951779902 -0.235393375 1.05117166 -0.695186079 0.193155944 0.814606369 0.099046573 -0.465709984 -0.328408957 0.106260002 -0.0767863691 0.282957703 -0.291975856 -0.114470452 -0.201601774 0.00954660214 -0.0507626384 0.28588438 0.222794116 -0.277955472 -0.451708049 0.259675652 -0.179728955 -0.405101031 -0.176231891 -0.24412851 -0.0425478928 -0.0724397376 -0.249029577 -0.139984488 0.239886403 -0.233337104 0.0814884976 -0.0633849502 0.221679464 0.134217918 -0.110201024 0.0618011355 0.259484589 -0.0698341727 -0.181882501 0.130913585 0.244536996 -0.156754836 0.140195072 -0.00415166607 0.0201325715 -0.267158985 -0.347968787 -0.1331691 0.109796368 -0.9080441 0.0224037729 -0.24086529 -0.15820761 -0.0111623704 0.373155504 -0.37497279 -0.0321860872 0.119532697 -0.096981585 0.170276761 0.195772186 -0.080433391 0.139938891 -0.365202069 -0.0480400622 0.00281539559 -0.252948821 0.271933258 -0.0680518448 -0.382190824 0.302923799 -0.346025914 -0.389366478 0.310008228 -0.0381526947 0.199527144 -0.407722712 0.204087853 0.0827215314 -0.310581833 -0.306841046 -0.0987130702 -0.311183929 -0.471332759 0.23353368 -0.0120469574 -0.255902082 -0.438782781 -0.425510496 -0.322095275 -0.223627195 0.300680578 0.301129162 -0.397778124 -0.0271878522 0.206097752 -0.077571094 0.0643967241 0.393939793 0.389442027 0.310715735 -0.0229718983 -0.176660195 0.0141748488 0.167245269 0.321797252 0.0994696021 0.221660912 -0.386274189 0.406674802 0.184831977 -0.119121134 -0.369612932 0.267778337 -0.281429708 -0.0423130393 -0.362221986 -0.0612341538 0.123243093 -0.167109594 0.163505211 0.0883724391 0.772387207 0.295556843 -0.426042169 0.1084764 0.133472815 0.223656282 0.139054611 0.351850539 -0.335214853 -0.11404217 0.304878891 0.455898046 -0.501121283 0.157776251 0.104169846 -0.300853342 0.232827738 -0.139282003 -0.00425278069 -0.423769355 -0.202633798 -0.271136642 0.113716662 0.201071978 0.420542002 0.0926158801 0.188933566 -0.0803680122 -0.351294309 0.163848847 0.0192010142 -0.120029978 0.148644567 0.0803187564 -0.319430143 0.121932082 -0.152295172 0.360830754 -0.0510057621 0.112763047 0.156450763 0.0140100541 0.124587446 0.238982975 -0.279913515 -0.417771548 0.399023116 -0.327112347 -0.323609114 -0.230686784 0.00743591785 0.150144756 -0.294973642 -0.288715273 0.368409187 -0.0765253305 0.00851396751 -0.175064892 0.132148817 -0.455205172 -0.217760846 0.391749531 -0.367872179 0.133571699 0.205855533 0.234029219 0.0787032843 -0.169576228 0.313720644 -0.130509973 -0.0608781278 0.28188163 -0.288998127 0.134906828 0.397400737 0.207917035 -0.28215009 0.107311606 0.368589103 -0.119722545 0.247930467 0.235734224 -0.280494034 -0.329820871 -0.0243437905 0.227256671 -0.228081256 -0.0703773871 0.107785799 0.0380905792 -0.166929722 -0.352462709 0.353565663 -0.121710002 0.0569414981 0.0536933728 -0.194730386 0.274765551 -0.154327124 0.28474918 0.0436078012 -0.554887533 0.137411654 -0.0845832229 -0.156812549 -0.406625271 0.0840675533 0.13136518 -0.0173282623 -0.12869665 -0.244593292 -0.121334881 0.0890993178 0.0881712437 -0.139164239 0.0692511797 -0.328508705 -0.202421203 0.364461839 -0.376909494 0.178037107 -0.396143466 0.152374566 -0.273503542 0.073129952 -0.327234209 -0.162278324 -0.34232837 -0.02470541 0.338343799 0.202105939 0.169651568 0.155856729 -0.0139847398 -0.0842545331 -0.0117928982 -0.166887581 0.00961387157 -0.238327116 0.239608824 -0.0307661891 0.279161841 -0.228623375 0.00726292981 -0.137888357 -0.381802559 -0.436250448 -0.0688979626 -0.28248474 0.385668129 0.362419546 -0.0370228551 0.0304678772 -0.126717389 0.0855804831 0.0058867028 tensor_densebias0 18 -0 0 -0.03072129 0 -0.691838145 0 0 0 -1.42339337 0 0 -0.945431888 0 0 0 -0.014923376 0 1.0417701 +0 0 2.24054861 -1.22210479 0.0750174671 1.37214887 0 -2.67651463 0 -0.0296320114 -2.11971021 1.84887588 -0.0318848677 0 -1.81677604 0 0 -2.10385656 tensor_densekernel0 162 --0.312210023 -0.449001402 -0.219295397 -0.292229503 0.0269140303 -0.338967681 -0.208557993 -0.435903728 0.0243738256 -0.102374822 -0.364330947 0.0701001287 -0.444249243 -0.194894344 -0.403647661 -0.026400147 -0.1283032 0.0548345447 -0.245491013 0.0847795904 0.264319241 0.187656552 0.0733157843 -0.454083294 -0.282014012 -0.0760278702 0.378013521 -0.0835337043 0.206876725 0.144960359 0.399023443 0.206203312 0.249409407 -0.201488867 0.168731123 0.352501422 0.412933797 -0.174859643 -0.0929056928 -0.3104918 -0.486229837 -0.345291615 0.469253689 0.0991041958 0.0109655913 0.398588032 0.270455092 -0.059901841 -0.310993612 -0.405314565 0.018287003 -0.08304777 -0.440841198 0.0748301744 0.220587045 0.193532735 0.557178617 -0.0191510916 1.54755223 -0.422881693 0.244789571 -0.204116076 0.500136375 0.42949 -0.366016954 -0.711515486 0.445318907 0.46409449 -0.335858583 0.0864983723 -0.043538928 0.429679096 -0.455723435 0.411046535 0.245435551 0.22423628 0.1931559 0.0692755878 0.136640221 0.213581234 2.29658318 -0.0190110505 0.224110395 1.61504877 -0.0517534018 0.31658408 0.0973505676 -0.141245514 0.0966365635 -2.61346126 0.390216678 0.115215868 -0.132322147 0.00469651818 -0.823969543 0.251592427 -0.0294530094 -0.431516528 1.08531106 0.0748665035 0.402399808 1.23806453 0.38902685 -0.389371812 0.118719667 -0.344713122 -0.191621721 -1.21894455 -0.160556912 -0.141824037 -0.256035239 -0.233437002 -0.431574583 0.0557942092 0.359473854 0.045556277 0.126846224 0.0212549269 0.243384212 -0.319174826 -0.257090032 0.240472168 0.278561324 0.217784718 0.467535228 -0.144715101 -0.106733918 0.228126734 0.403806299 0.00764858723 0.0438024811 -0.0373654962 0.119889706 0.337502986 -0.117746197 -0.0473950803 0.200345665 -0.0949523374 -0.0556337237 0.229105979 0.145708531 -0.274797916 -0.24065423 -0.150160223 0.445151299 0.0877912343 -0.204219639 -0.434461623 0.126993537 -0.290941834 0.210367948 0.219679505 -0.363766223 0.449702352 -0.248957276 0.040559426 0.179132968 0.311827332 -0.31388399 -0.0426811464 -0.135652155 -0.448611885 -tensor_dense1kernel0 324 -0.0758019388 -0.0916832685 -0.235455871 0.217794418 0.298586488 -0.335430235 -0.197374046 -0.138277143 0.288848221 -0.0327331126 -0.0610544086 -0.0171248317 -0.266926855 -0.17147395 -0.380521178 -0.0735571384 -0.234911188 0.296020567 0.210932553 0.240623891 -0.252487063 -0.36146152 -0.0540058613 0.200251341 -0.351249903 0.333947718 0.313943446 -0.124685913 0.158194959 -0.0222945511 0.396605313 -0.166472942 0.249303579 -0.366288215 -0.0550173521 -0.232377097 -0.416595608 0.00631570816 0.050605841 0.516094148 -0.0149099473 -0.363004655 -0.113029346 0.366709113 0.301950574 0.399501085 0.195350066 -0.342030495 -0.149762839 0.0372553281 -0.195004538 -0.167036861 0.234646305 -0.220841751 0.175619781 -0.0709727407 0.17386508 -0.153525174 -0.172373325 -0.364956081 0.170905232 -0.238586903 -0.0123235583 0.0208040774 -0.0221045613 0.110807359 0.273873985 -0.339682639 -0.190787151 0.332982183 0.390612245 0.0523649156 -0.147629008 -0.2013731 0.279822111 0.209964544 0.128469229 -0.0899797976 0.124424025 0.176817581 0.285842776 0.145072326 -0.0799401551 0.364005387 -0.118571274 -0.0140836872 -0.251626551 0.0574410036 0.327436626 -0.35448733 -0.288799942 0.250521779 0.306673765 -0.0292066038 0.148268282 0.135808825 0.26339674 0.0633863211 0.200453222 0.222039819 0.118549407 0.17060554 -0.0250637829 -0.0499127805 -0.209724948 0.387978137 0.328148961 0.0736531019 0.296516418 -0.284705877 -0.166072011 0.0998204947 0.275414765 0.124949276 -0.146388561 -0.319076478 0.0679086447 -0.142882109 0.110530436 -0.293751121 -0.303445488 -0.271196127 0.102833033 -0.208856538 0.0983454585 0.297366023 0.279380083 0.357086837 0.0828796029 -0.0257309079 0.366774499 0.0421692729 0.0468492806 0.250566661 -0.353236407 0.0769415498 0.228705049 -0.377941728 -0.151883155 -0.389235586 -0.0227681696 0.300799787 0.369711339 -0.335338056 -0.116937935 -0.136089057 -0.130881399 0.0389506966 -0.324547172 -0.083334446 0.271305531 -0.540058494 0.296716839 0.0304308739 -0.303186148 0.0346472971 0.214906842 0.297878116 -0.190517157 -0.363323212 -0.0883034617 -0.2474989 0.349464536 -0.0919562876 -0.27685523 -0.28680411 -0.23794499 -0.131404966 -0.100492775 -0.363108605 0.0365313888 -0.389486194 -0.316895902 -0.193177685 -0.0339006484 0.134306967 0.407699227 -0.158101737 0.236150324 0.00220704079 0.245076478 0.287214279 -0.398987174 -0.295938015 0.385810971 0.349678576 0.00317755342 0.385502219 0.0702605247 -0.0724098682 0.339599311 0.0306462944 0.00572255254 0.402694643 -0.284382463 0.332232237 0.104342878 0.0872000456 0.154731318 -0.165449753 0.120684244 -0.0577001981 0.269058466 -0.000962525781 0.129624203 -0.336873889 -0.102695793 0.229009762 0.288400799 -0.452883035 0.249865755 -0.0507232547 -0.353600919 0.14013648 0.0384655818 -0.211497501 0.167885125 -0.283688754 0.0135273933 0.330591083 0.28939718 -0.381958097 -0.392866999 0.311157346 0.355306327 -0.028886497 -0.338838875 0.309379637 -0.357416987 -0.233841479 0.00645238161 0.205213308 0.340034425 -0.402380049 -0.30115962 -0.00952392817 0.227130294 0.116262794 -0.20111604 -0.233307511 -0.265507251 0.297994196 0.00027602911 0.0470494032 0.213952243 -0.362531692 -0.383135647 -0.145616412 -0.111760736 -0.044319272 -0.0710092187 0.0758713484 -0.0853904188 0.095797658 -0.140796721 -0.175506011 -0.141219258 0.32221216 0.302660704 0.147811651 0.316407681 0.237485647 0.252249956 -0.387209266 0.14206773 0.242706537 0.365916967 -0.0954327583 -0.368925661 -0.277891636 0.206502974 0.336648762 0.184671968 -0.0585047752 -0.0318031497 -0.154057994 0.167512253 -0.0421537757 0.0795540884 -0.031635128 -0.0242445208 0.154753283 0.271626651 0.0506431051 -0.132678866 0.355759889 0.364573449 -0.202066422 0.292336941 0.371531367 -0.238162726 -0.20987533 -0.189816356 0.235928535 0.281805933 -0.0207725167 0.0666920841 0.248096704 -0.175844058 -0.17684105 0.0724563897 -0.284278214 -0.355329663 0.0373232067 0.214063287 -0.365914166 -0.490856022 -0.192195579 0.204263702 -0.329059809 -0.167009383 -0.218946397 -0.448436826 -0.444279373 0.142232567 -0.0992906839 0.197482213 0.366708249 -0.326387167 -0.290515214 0.235650241 0.158617049 -0.142480955 0.134417534 -tensor_dense3bias0 1 --1.08278227 -tensor_dense1bias0 18 --0.55536443 0 1.21337557 0.0303575881 1.17887771 -0.105406143 -1.22054219 0.00246197358 -0.990136206 -1.15652847 -0.484057516 0.686276197 -0.480812937 -0.709402263 0 1.168975 -1.20837569 0 -tensor_dense2kernel0 324 -0.0601355284 0.103895709 -0.176317304 0.237077951 -0.368305951 0.0857116431 0.319103301 0.103679359 -0.136912614 -0.192860782 0.105548427 0.393782467 0.121138893 -0.209810376 -0.204443395 0.0345969126 0.0935985819 -0.297733158 0.111477792 -0.0484274626 0.286591351 -0.339947879 0.0758359134 -0.138670653 -0.270552337 0.0106127262 0.245277762 0.212352574 0.3526299 -0.128348202 -0.182889774 0.0377962589 -0.360877812 -0.355559289 0.337247252 0.279506683 0.073311381 0.102627546 0.339735806 -0.00600793958 -0.360681772 0.31661287 -0.37280333 0.203218326 0.187903956 -0.298189342 -0.16793029 0.361228079 -0.471795142 0.318240881 -0.409730911 0.000674488256 0.29773289 -0.216247082 0.274615049 -0.138253614 0.206028894 -0.209795609 0.223691523 -0.368025899 -0.413323373 -0.0731196776 0.301271439 0.493621349 -0.576047957 0.062501587 0.146703422 0.217919722 -0.124672197 0.335757792 0.300613672 0.380370945 0.285644472 -0.411454767 0.213420719 -0.34434253 -0.0770067573 0.237275451 -0.552990794 0.377588928 -0.373171866 -0.00544786407 -0.661761761 0.419679493 0.15460819 0.276018232 0.172490522 0.0789495334 -0.0106357196 -0.178871319 -0.0231611338 -0.145160019 0.249547035 -0.285714269 -0.201923728 -0.122546159 -0.0585571826 0.222279415 -0.0396873355 -0.257602692 0.228241682 0.222013101 0.35045284 -0.343557417 0.148292899 -0.126057565 0.178801328 -0.245706886 -0.28110382 0.0465739556 -0.285080701 -0.384858847 -0.22510381 0.0674664974 -0.0398826823 -0.317277879 -0.386804551 -0.0380067676 -0.442011297 -0.119695127 0.0531270802 -0.136674583 0.130890489 0.342347205 0.28553012 -0.291408896 -0.0108221183 0.221971914 0.107837878 -0.141279399 -0.264308572 -0.461427987 -0.384183913 0.238162935 -0.0468141437 0.249120057 -0.22219488 -0.0345794968 -0.425027162 -0.539979875 -0.225583479 -0.0970217437 0.532777548 0.286035508 0.26125282 -0.39360255 0.146771178 -0.395519167 -0.324084193 -0.381997079 0.129540488 -0.0182026885 -0.0668412521 -0.492150843 0.253573686 0.0376238525 0.273804665 -0.0287918448 -0.0683792084 0.281256884 0.22884056 0.336179823 -0.0228090417 0.155668437 -0.300460607 -0.0392232537 0.0344942808 -0.189785197 -0.285728037 0.167656571 -0.306435376 0.278874278 -0.0139391711 -0.235188976 -0.53334552 -0.181872532 -0.637119174 0.15505752 0.312316179 -0.295171618 0.0221013464 -0.15694949 0.189075828 -0.0299219191 0.0951148868 0.0196873136 -0.438704818 0.455786765 -0.0818365961 0.321287155 -0.508979678 -0.271876127 -0.462487161 0.364336014 -0.125007823 0.0761246383 -0.309347302 -0.03540105 0.10471788 0.176312342 0.366621494 0.393206298 -0.40636149 0.340564102 0.368828893 -0.793944359 -0.34349227 -0.285215378 0.140684217 -0.26126352 0.274790585 -0.288900375 -0.327324063 0.101510838 -0.385715991 -0.210208386 -0.184758514 -0.299199045 0.0453848168 0.0914461613 -0.230775073 -0.40371263 -0.0464904942 0.138912871 -0.147589207 0.215935484 -0.114627182 -0.117625646 0.181893602 -0.166861817 0.178178191 -0.0264126956 0.292244047 -0.121828608 -0.0976696685 0.215154409 0.321345419 0.335424364 -0.364218026 -0.347983241 -0.094047457 -0.0635470226 -0.425746411 0.152209282 0.708053887 0.10412062 -0.419614404 0.29968214 0.126368105 -0.324008673 0.146924451 0.181444556 -0.386484027 0.0500864089 -0.324499726 -0.328729361 0.322294295 0.328553498 0.225142717 0.26645714 0.303250909 0.157875717 0.366916895 -0.0993981361 -0.0459093153 0.215543687 -0.371909916 0.316233456 0.0469518602 0.0820645094 0.0271684192 0.0894863904 0.35725224 -0.0646223724 0.166583002 0.451734483 -0.124334082 0.0495983921 -0.360229611 -0.13357158 -0.543372154 -0.13013202 0.0608841367 -0.231330052 -0.298522323 -0.155281559 -0.268967837 -0.245929211 0.240333989 -0.387101352 0.0743440762 -0.320554376 -0.257578731 0.184937432 0.398239553 -0.35450995 -0.226011872 -0.553995192 -0.169215456 -0.299900979 -0.405734152 -0.170978293 -0.0604243167 0.274302632 0.109027311 0.185141295 -0.210775375 -0.236935824 0.0492274463 0.303305507 -0.159484848 0.053221941 0.105457842 -0.153895646 -0.304702073 0.156105399 0.382559359 -0.159128308 -0.266793609 0.285512507 0.179003119 0.263515234 -0.3670443 0.258262873 +-0.306031644 -0.423400044 0.012099063 0.0380996838 -0.194396183 0.0345712639 -0.343816221 0.0171108432 -0.103108048 -0.225346401 0.00957465451 0.0793422386 -0.27515614 -0.376964897 0.112929754 -0.235022634 -0.347105592 0.0169877708 -0.349852234 -0.405783117 -0.244122609 0.360908359 0.388667315 -0.487678975 0.445454448 -0.414980173 0.355579227 -0.276030421 -0.781841516 -0.406258762 -0.123000011 0.345222563 0.17184262 0.114065319 -0.439008087 -0.706083119 0.436501771 -0.259993136 0.241404817 -0.369571894 -0.0471171066 0.069481805 -0.457102925 0.57288456 -0.405915171 0.197606146 0.679319739 0.105139449 -0.189341456 0.45634672 -0.392927706 0.463569909 0.209276944 0.442389339 -0.112818897 -0.380391836 0.111494742 0.00149676274 0.463702023 -0.07187327 -0.269126505 0.119101442 -0.346858114 0.326839954 -0.260460317 -0.398131669 0.454970509 -0.441192776 -0.161157325 0.00520113111 -0.148847371 0.165561482 0.43007198 0.267832011 -3.31868458 2.68513155 0.074548848 -2.60493398 -0.0510529876 2.29329085 0.151530296 -0.0003459453 0.316629589 -2.40201116 0.221269161 0.458917052 1.41587245 0.191225439 0.215183824 1.96253896 -0.371673614 0.0782749951 0.191071391 -0.128617451 0.466454655 0.0823339522 -0.395393401 -1.76892877 0.470755488 -0.18354401 -0.906417191 0.938531816 -0.508203089 0.294368416 -0.550758421 0.15126887 0.175063938 -0.434123635 -0.348028004 -0.0771443546 -0.129716158 -1.35438657 0.789875865 0.496858388 -0.00197023153 0.489849448 -0.271852672 -0.213446707 -0.738711298 -0.796157062 0.371352792 0.183821529 -0.139898151 -0.101841062 0.116562575 -0.732890606 0.307291538 -0.0584444106 0.068698056 0.359433323 0.26625067 0.18672727 -0.308147848 -0.136811852 -0.468477398 0.309544653 0.135336742 -0.179412544 0.432985038 0.261378914 -0.136852682 0.179508835 -0.262809992 -0.00236768695 0.42924127 0.361023754 -0.048732169 0.0826601982 -0.388436258 -0.192836791 0.291429371 -0.319520533 0.390624732 0.327600241 -0.0585626364 -0.368373126 -0.436663687 -0.115330398 -0.0452572666 0.0114085376 -0.26418823 0.0774466768 diff --git a/TrkHitReco/data/TrainBkgDiagStationSpatial.dat b/TrkHitReco/data/TrainBkgDiagStationSpatial.dat index b4aefcaa9d..052d4d9499 100644 --- a/TrkHitReco/data/TrainBkgDiagStationSpatial.dat +++ b/TrkHitReco/data/TrainBkgDiagStationSpatial.dat @@ -1,16 +1,16 @@ +tensor_dense3bias0 1 +-1.04080796 tensor_dense3kernel0 18 --0.350281268 0.218550831 -0.411419898 -0.300366908 0.184227929 0.0752565116 -0.256499738 0.535252273 -0.0077774683 -0.486905128 0.0803557262 -0.243019655 0.249146104 0.215368941 0.0910018086 0.535921514 0.509403706 0.0881991535 +-0.073272787 0.0978089198 -0.104029208 -0.29485476 -0.124046102 0.334590226 0.388348192 -0.136069655 -0.511074543 -0.105709903 0.000908014015 -0.453948945 0.244288489 -0.375525028 -0.219088212 -0.0706026629 0.0952798203 0.0248482823 tensor_dense2bias0 18 --0.210091487 -0.473145038 -0.159325793 1.37870586 -1.21936464 -0.290500939 -1.41723478 -1.87270725 -0.868933678 2.13269281 -0.291247725 0.541649878 -1.06645977 -0.536179841 0 0 0.134293005 -0.220699221 +-0.0608826727 -0.173605815 0.0151254544 -0.107946783 -0.160998687 -1.0553726 -0.858537674 0.0343997292 0 1.07617927 -1.14818835 0.355332226 -1.10271871 -0.141217217 0.99751997 1.00591958 0.133207262 0 +tensor_dense2kernel0 324 +-0.278805107 -0.02553159 0.419758528 0.0316974819 0.331600815 -0.252318472 -0.0575456172 -0.0256447792 0.396894276 -0.137493044 0.024723975 -0.367198765 0.0405150279 0.197597802 0.100301996 -0.325175703 0.363137394 0.0634557307 -0.405074447 0.0282097068 0.255843997 -0.328221202 0.328950703 0.0889994949 -0.530417979 0.172746241 0.0237902701 0.238332987 -0.151499182 0.0469378978 0.18915695 0.097231634 0.310367733 0.084304966 0.272161812 -0.0674240291 0.246650487 0.0926702917 0.312669486 -0.330225378 -0.0229215585 -0.0634295642 0.0291303359 0.218149006 0.183407485 0.0801383853 -0.358243704 0.301057428 -0.0317772515 -0.0469029397 0.503890872 0.117889993 0.322446734 -0.268181801 -0.0214086305 0.26816377 -0.129492417 -0.18372786 -0.476562202 -0.0124217086 0.216907769 0.274182171 -0.360720605 0.0344108865 -0.197753161 0.193419933 -0.129559457 -0.198689297 0.0561916046 -0.288481951 -0.328372926 -0.340355694 -0.194900692 -0.24345535 0.0304820836 -0.195243105 -0.0674996674 0.239546716 0.00876393914 -0.0399485826 0.0116732717 -0.0929856896 0.250921547 0.192966104 -0.0269827247 0.109571874 0.31913358 0.213441372 0.205549002 -0.126630545 -0.322146475 0.236982644 -0.186307356 -0.272782266 -0.0662263334 -0.105624318 -0.39786461 0.342791498 0.16085422 0.315785289 0.319146633 0.238508761 0.328333914 -0.200381666 0.318356872 0.00735631585 0.216403902 -0.0426596403 -0.197576389 -0.160815239 -0.526712477 0.162161067 -0.638297021 -0.221142426 0.319907665 -0.138952017 -0.143697947 -0.397462875 -0.492459863 -0.0691770688 -0.357488662 -0.279351383 0.122759953 -0.331822395 -0.438922822 -0.14781177 -0.283971786 0.0911063552 -0.0196602046 0.126570702 -0.15650633 0.089731425 -0.314277112 0.244750261 0.31551832 -0.342379093 0.26803571 0.051966697 0.205251276 -0.299434185 -0.357271582 0.250412285 0.191059411 0.347313046 -0.375173628 -0.0644958168 -0.0259857271 -0.0596879125 0.174731836 -0.299138427 -0.166583508 0.0974591374 -0.229742169 -0.138317898 0.19959113 -0.164071307 0.272657722 -0.15569222 0.190350041 -0.111013696 -0.631922245 0.109600902 -0.141283303 -0.10052672 -0.170393497 -0.343746245 0.0445401371 -0.0221132506 -0.21375224 -0.406430602 0.381767511 0.199660569 0.34756273 0.264422059 0.10497506 0.236455679 -0.362880409 0.306964338 -0.0451193191 0.120129585 -0.297097296 -0.260639012 -0.110448234 -0.227098063 -0.0252628159 0.344424307 -0.0162354354 -0.374590218 -0.351974845 0.12335299 0.14214021 -0.160378784 0.302752942 -0.0943992659 0.341502815 0.180975601 -0.318568289 -0.375406444 0.264434814 0.0855814815 -0.0579609424 0.0541094244 -0.243454486 0.253005296 0.0562459677 -0.451382428 -0.394860983 0.241207376 0.00578531204 -0.0478218198 0.22410877 -0.272149324 0.244601279 0.27665025 0.300410211 -0.160692275 -0.0113714254 0.181466296 -0.243084028 -0.0626065284 -0.146455511 -0.253220469 0.274903327 -0.114240319 -0.0450842381 0.197886541 -0.446484387 -0.188193947 -0.25115028 -0.265383691 -0.157036811 0.143857405 0.204778373 0.209899247 -0.366365492 -0.393422693 0.093793869 -0.176353693 -0.393235624 -0.0648327172 0.304717481 0.105196893 0.337502062 -0.320254087 -0.0653326213 -0.39839372 0.0585657656 -0.337453693 -0.374582708 0.333527267 -0.117036521 -0.127605438 0.334097445 0.0929544345 -0.0282137096 0.296254009 -0.493108213 -0.184789494 0.36978659 0.013386935 0.189683855 0.306415886 0.0626352802 -0.420681149 0.0402796492 -0.364071459 0.22430034 0.100215636 0.120582186 -0.356043994 -0.385984331 -0.014264971 0.000578641891 0.374631584 -0.398081183 -0.0724616349 0.240082145 0.234708607 -0.0356780589 -0.38605985 -0.136482477 0.350837886 0.40657717 0.135588646 -0.360465497 0.315894544 0.289385915 -0.292017519 0.0262624398 0.399054468 0.367937118 -0.173044339 -0.376592606 0.121605888 0.209835276 0.14982827 -0.203795552 -0.445402831 0.27194947 -0.543711185 0.162537217 -0.256446034 0.243643522 0.0930218175 -0.219607189 0.40135473 -0.27177155 -0.347262055 0.0373212695 -0.369010746 0.380417526 -0.0214197934 0.400712907 -0.313281983 0.288750708 -0.0915758908 -0.321726859 -0.240639582 0.0438744724 0.199300885 0.274990022 0.00221949816 -0.311299562 0.312379479 +tensor_dense1bias0 18 +-0.0525381789 1.15266132 1.09361911 1.48139083 0 0 1.38354731 0 0.51004535 -0.348183036 -1.35194218 -0.86442858 -0.576754868 0 0.619490921 0 -0.780703843 0 +tensor_dense1kernel0 324 +-0.205005005 0.140734956 0.310978234 0.182784036 -0.069365263 -0.404529363 -0.365451515 -0.0228298903 0.116743684 -0.313772768 0.0692059249 -0.249846935 -0.318941712 0.0922697783 -0.150004208 -0.244321629 -0.226229802 -0.0262513757 0.226985872 -0.395366639 -0.0333246291 0.0813309252 0.17320025 -0.287894845 -0.316546261 -0.199333176 -0.0774299502 0.0904967487 0.0638242364 0.177930236 -0.155815542 0.223292708 0.295013249 0.0169744492 -0.0356493592 0.38119328 -0.348898947 -0.929331541 -0.0674283206 -0.0387933813 -0.159590453 0.326727808 -0.0781253651 -0.261545837 0.565432429 -0.317547023 0.213937074 0.405067235 0.204790369 -0.0364037752 -0.301062435 0.0414654315 -0.165056586 -0.332698941 -0.185643107 -0.309144557 0.343083173 0.286258548 -0.303955048 0.121857345 0.238854676 -0.189732343 -0.255411297 0.0801578611 -0.0066538807 0.270449221 -0.159728378 -0.328722268 -0.326680988 -0.280370831 0.457631409 0.25291729 0.0519016981 0.230772436 -0.154503673 -0.383465528 -0.29624638 0.190506935 0.0553899407 0.0705386102 -0.104590327 0.346268475 -0.380987883 -0.197345227 -0.294914961 0.00457304716 -0.335101128 0.240878344 0.341112494 0.36594981 -0.224263623 -0.29713583 0.128412127 -0.375223279 0.0036971271 0.311718524 -0.255717874 0.218686283 0.374656379 0.197907805 -0.0726987422 -0.164763063 -0.344200611 -0.108971328 -0.108485937 -0.307326317 0.367442131 0.0915782452 -0.395517111 -0.377660036 0.0798842311 -0.377440065 0.382091939 -0.320500851 -0.262684762 -0.317281038 -0.371804416 0.385086715 0.156147838 -0.155829757 -0.285376132 0.206952751 0.0189986229 -0.0977791846 0.38637358 -0.135388345 0.322065771 0.336253077 0.401966512 -0.225724891 -0.278620839 -0.219117671 0.337905824 -0.224636212 -0.73541373 -0.0993211642 0.133828804 -0.237747446 0.0653230622 -0.0109936893 -0.0710237101 -0.306756705 -0.0228586048 0.0234235227 -0.0499965698 -0.180722684 -0.530621231 -0.285125732 -0.320313662 -0.114269793 -0.252939343 0.312673271 -0.263101399 -0.377859473 0.226296917 -0.196721643 0.322763801 -0.299177021 -0.182135135 0.00063598156 0.0139431832 0.369646013 -0.206468984 -0.195390999 -0.320697129 0.0798059851 -0.107455254 -0.0356816649 -0.159540087 -0.150166571 -0.199622974 0.125742316 0.2578713 0.247550189 0.128494427 -0.0599073172 0.100935817 -0.394471258 0.0999470875 -0.330660671 -0.323102772 0.228631839 -0.456789464 0.232891366 -0.0734387934 -0.14948836 -0.102452874 -0.058150053 0.214003667 -0.470484793 0.0186967142 0.337450415 0.244545355 -0.175367311 0.00252651749 0.130408823 0.227972195 -0.254775196 0.401957035 0.168204427 0.15517509 -0.257649064 0.214580238 0.312456012 0.191427529 -0.33080405 0.215468943 0.0812260807 0.336325526 -0.170630455 -0.341049701 -0.352353394 0.259355366 -0.134992391 0.0464166403 0.163887382 -0.192957789 -0.344841272 0.083393462 0.263362497 0.062218219 0.307836413 -0.0936445743 0.126904309 -0.124799065 -0.12712276 -0.315318048 -0.11203225 -0.370777071 0.377043605 0.0551990904 -0.399407178 -0.234565333 0.276249826 -0.393211961 -0.896009505 -0.891659141 -0.82550025 -0.349671543 0.287009001 -1.05421448 0.380967259 0.299229741 0.013231731 1.51716423 1.0066148 0.408260971 0.280097723 -0.731692553 -0.0932860672 -0.1653703 0.181166112 -0.0478743911 -0.380016595 0.344198167 0.160526693 0.338709891 -0.114311546 0.395919502 -0.05304721 -0.384483814 0.0310989022 0.0832063556 0.0201545656 -0.370850921 -0.0446012616 -0.387604535 -0.406283528 0.169260204 -0.114071637 0.0817638636 0.241184473 -0.240458831 0.311901391 0.291323245 -0.175064892 -0.21232006 -0.111585438 0.124622703 0.173502386 -0.00603500009 0.056725651 0.238428712 0.0429034531 0.380455434 0.37637347 -0.357751638 0.153228879 0.19238773 0.0170852281 0.013503206 -0.229724064 -0.235314041 0.178479791 0.326171339 -0.08346048 0.000966760388 0.0692466721 -0.238825396 -0.166895285 -0.179939434 -0.15281862 0.0152956266 0.201009631 -0.190651536 0.0413598418 -0.256234646 0.24359709 -0.372821271 0.276614428 0.355332911 -0.236930564 -0.0568404198 -0.398604363 0.0283097923 -0.333044767 0.0461567342 0.389699876 -0.297717094 0.373115718 0.371414721 -0.180682719 0.331674695 0.282705188 tensor_densebias0 18 -1.58754563 1.71734822 -0.791790962 0 0 -2.01056218 0 -2.08757305 0 -1.36385667 0.809092283 1.76684237 -0.0258317702 0 0 0 -2.15186167 0 +0.996250391 0 -0.953353226 -0.118971065 0 0 0 0.907661736 -1.91521752 -1.40880477 -1.31188631 0 1.02157688 -1.19246352 0 0 0.94493407 0 tensor_densekernel0 162 -0.060725227 0.101116888 0.0137422923 -0.176243395 -0.427904606 0.223935962 -0.218143672 0.150167763 -0.22208479 -0.0174102504 0.022836756 0.154554993 -0.0213300698 -0.415220082 -0.107128531 -0.383472145 0.0838251784 -0.098793 -0.198749155 -0.164386243 0.721121848 0.0902272165 -0.145379543 0.306566179 -0.167008281 0.0474713035 -0.45277369 0.612479687 -1.1089263 0.592104912 -0.455435455 -0.0876548886 -0.130640388 0.305511504 -0.0845237747 0.255446404 0.301458418 0.254066885 -0.663694382 0.0127853453 0.15238288 -0.516663074 0.0748471916 0.120348826 0.270050257 -0.091756165 0.881109476 -0.65720433 -0.168569639 -0.0841063261 -0.166801393 0.0177263916 -0.768571854 0.222718567 0.407040477 -0.171667174 0.400246143 -0.386691272 0.248941571 -0.446455598 -0.429359615 -0.161719427 -0.265293598 0.00975335855 1.030321 -0.559689581 0.0508435369 -0.167746931 0.0779184997 -0.238823041 -0.225436136 0.410193831 -3.20903945 -3.15579939 2.65391588 0.384175807 -0.234473929 2.76960111 0.28202185 2.22055745 -0.132882714 3.49626374 -1.780846 -3.39762998 0.0774668306 -0.0369854867 0.111470431 -0.126742423 2.33900213 -0.213864923 0.690471947 0.7275123 -1.82792497 -0.350444525 0.267350942 -1.2897135 -0.44411248 -0.673503101 -0.0635436177 -0.862354696 1.48995781 -0.349633276 0.401951432 -0.0805836618 -0.32760489 0.0358729064 -1.55955505 0.110867649 -0.104753919 1.03566122 1.25205684 0.0553807318 -0.192986041 -1.51364946 -0.0630976558 -1.91583717 -0.453825116 0.0310982447 -0.134285495 0.766589582 -0.407026231 -0.183972567 -0.195709497 0.00599035621 -0.506122649 -0.271670401 0.26352331 -0.0100423424 -0.0891791508 0.209571749 -0.391839355 0.0539698713 0.370319515 -0.09728387 0.179969937 0.343420804 0.340989977 -0.192488164 -0.356192559 0.170231551 0.146021158 0.375589341 -0.239729211 -0.191106617 -0.384224534 -0.334642589 -0.0438547619 0.30164513 0.439262897 -0.247857288 -0.253468215 -0.151817039 0.204557866 0.176671907 0.0300294869 0.287278563 0.241133049 0.158837408 0.39870742 0.442373544 -0.538133383 0.0990794599 -tensor_dense1kernel0 324 -0.060371194 0.0387930311 -0.508849204 -0.382768422 -0.0622189939 -0.164432094 -0.107079446 0.34626627 -0.0232687518 0.0959621668 -0.370173603 -0.254269928 -0.0937674567 0.294370592 0.0276874993 -0.53614521 0.391157985 0.0997653753 0.139666662 0.283325762 -0.132875457 -0.0867963135 0.115787327 -0.34517321 -0.355923027 0.0626582727 -0.120340765 0.0737588108 -0.373336732 -0.0225761421 -0.081860438 0.265963912 -0.123848796 0.0572111756 0.338837117 -0.232150704 0.102968901 -0.38483128 0.169679165 -0.152932405 -0.208541751 -0.18862398 -0.364791125 -0.954178452 0.0406156033 0.0199760497 -0.197573096 0.248334154 -0.285267293 -0.0630966648 -0.307475537 0.169490501 -0.127323702 0.0629081056 -0.109960347 -0.20106037 0.36753875 0.110222578 -0.339412451 -0.275820673 -0.295091629 -0.00147372484 -0.1542252 0.344808817 -0.24416472 -0.0701267123 0.293943942 -0.00873395801 -0.222863868 -0.0724476278 0.363218665 -0.081894964 -0.199768946 -0.35574615 0.192973793 -0.0539096892 0.0550265908 -0.302728832 -0.102628559 -0.229228437 0.37489903 0.179188251 -0.362429708 -0.0857105553 -0.234400079 -0.272885144 0.266352415 0.368763804 0.0239328742 -0.150817543 0.300985545 0.182911873 0.189638972 0.0688603818 -0.0754035711 0.211756617 0.0249345303 0.0810587853 0.0501279719 -0.142966598 0.387988657 -0.0772848874 -0.0475689061 -0.324837446 0.138016582 0.317082793 -0.23082912 0.167859614 0.299919844 -0.151075661 -0.374343663 0.143701851 -0.0164649189 -0.14706862 -0.0411428809 -0.268187732 -0.15743801 -0.31736356 -0.250802606 -0.0422543287 -0.403688312 -0.0662581623 -0.133840442 0.068018645 -0.223988757 -0.292407632 -0.453896224 -0.349602818 -0.335854828 -0.150465876 -0.0917401016 -0.34812355 -0.0686493516 0.186458081 -0.250325948 0.177697778 0.399840355 -0.342315882 0.0293582454 0.208450139 -0.344247937 0.0246171895 -0.125034198 0.126316324 -0.115270972 -0.361355603 0.191870213 0.405125737 0.102051973 -0.21034506 -0.0835688114 0.0776624084 -0.113212854 -0.144417733 -0.0030489862 -0.161047339 0.0838161409 0.284224272 -0.0944207609 0.0960035324 -0.0327865481 -0.128385961 -0.348062783 0.157362759 0.105914213 -0.342659593 -0.0597599447 0.153578773 0.228266656 -0.132161602 -0.65421474 -0.108632505 0.213277057 -0.644785523 -0.327192008 0.0360088721 -0.110062517 0.474553794 -0.14620015 -0.507570863 -0.260656267 -0.180410117 -0.137363374 -0.334750921 -0.199200898 0.0927930996 -0.00558716059 -0.0544781052 0.0744109824 -0.13570565 0.359784812 -0.0486632027 0.0853537023 -0.287609369 0.240376502 -0.560085595 0.50292933 -0.25073871 -0.340569258 -0.197577849 -0.565240979 -0.346382529 -0.311307162 -0.185339287 -0.247487992 0.0654379651 0.287283003 -0.209000096 -0.540372372 -0.213946402 0.0453047603 -0.414493442 -0.310068667 0.145490363 0.142323077 0.168284059 -0.0382657945 -0.391803801 0.174834877 -0.32778123 0.248901844 -0.319555551 -0.357661217 0.209835216 -0.260043293 0.255037427 0.203238189 0.356751353 0.386635125 -0.105437815 0.207568705 0.0275096521 0.362929165 -0.0321007185 -0.283427417 0.337193429 0.287666321 -0.292537659 0.197470903 -0.284044981 -0.0800191462 0.0229197145 0.0838884711 0.115720272 -0.137822181 0.266922355 0.237692595 0.161757767 0.00528261065 -0.180813923 -0.0441034734 0.0725227594 0.377519488 0.0767432749 -0.378492445 -0.385275453 -0.309207857 -0.0753061473 0.194222927 -0.256723523 -0.292590916 -0.0488377213 -0.383003652 0.139694393 -0.21492666 -0.0607998669 0.207465708 0.406559765 -0.0214804411 0.303522468 0.277563512 0.104444146 0.320648909 -0.331564903 0.258875072 -0.39825803 -0.109570324 0.322365642 -0.20917958 -0.25485462 -0.301182985 -0.306980193 0.0561021268 -0.116057545 0.304033399 -0.0928795934 -0.243162081 0.167008102 0.158747241 0.0114307581 0.122006088 0.143028498 -0.348955274 -0.221918121 0.170203745 -0.47740823 -0.180344522 0.0325989127 0.0760289803 -0.0169414114 0.0428812169 -0.146579981 -0.426633716 0.142431945 -0.156301707 0.255213797 0.0412037969 -0.349564761 -0.219559282 -0.34659335 0.158836007 -0.00303643942 0.361903787 -0.0688724518 0.276771605 -0.087181747 -0.389553964 0.232129693 0.0525428355 -0.225148872 0.0137380064 0.0558380783 -0.139892966 -0.379118085 -tensor_dense3bias0 1 --1.14005351 -tensor_dense1bias0 18 --0.130680293 0.467881262 -0.338774592 0 0 -0.21847935 0 1.14888859 0.0530992933 0 -1.70098734 -0.72969681 -0.332536876 -0.0310807675 -0.0648567006 -1.01079047 1.87723947 -0.764902174 -tensor_dense2kernel0 324 -0.27039963 -0.1817251 -0.291839778 0.0769765526 0.17273362 -0.020876959 0.0167654883 -0.00358149409 0.268858731 0.00366681186 -0.238447711 -0.0728130341 0.275916398 0.314147979 0.163685977 -0.117209107 -0.185671166 -0.38901639 0.252195776 0.0929428115 -0.129391149 0.0106871435 -0.180554777 -0.300717801 -0.430116206 -0.252942204 -0.351565957 0.027171392 0.146546602 0.0417641066 -0.0497741513 0.438860297 -0.0882041454 -0.0810563266 -0.369948298 -0.075352177 0.0498936474 0.286194503 0.0806057155 0.175276339 0.376956522 0.164906919 0.260180801 -0.204432607 -0.621020019 0.0692752227 0.0313247666 -0.152832538 0.105793819 -0.0173808727 -0.0662184358 0.187935352 0.144465923 -0.00224527158 0.0541216731 -0.393471241 -0.35873431 0.372339189 -0.370686054 -0.059422195 -0.212229833 -0.0806488097 0.256042957 0.0887027979 0.235826313 0.230364144 -0.200084895 -0.103753537 -0.279842585 0.0594577193 -0.248152882 -0.350448549 -0.320484579 -0.00327754021 -0.321255386 -0.27310884 0.306218028 0.159490764 -0.0438417494 0.350069761 0.402939141 -0.000600069761 0.187286615 0.25188148 0.102421045 0.0994974375 0.152716696 0.128074944 0.348942339 -0.14814961 -0.0595405698 0.384598732 -0.325085342 -0.124730423 -0.303205371 -0.356299222 0.297544926 -0.205039486 0.403156132 -0.261135727 -0.0992551446 0.325428843 -0.291224658 -0.366569221 0.283588767 0.2802068 -0.257067144 0.232353643 0.0740517974 -0.0495981872 0.136640668 -0.159146503 0.176204205 0.405374408 0.320641994 -0.249633536 0.228560507 0.127565801 -0.169338256 -0.323517919 -0.340829343 -0.108552217 0.238978088 0.368091643 0.139046252 0.198474586 -0.29839474 -0.229406893 -0.206292123 0.151140392 -0.0959157869 0.193748206 -2.78922462 0.287529349 0.0180783533 0.101317212 -0.301014453 0.155430451 0.209007755 0.273300856 -0.244649842 -0.15875572 -0.291320413 0.0764311925 0.0379872024 0.434511274 0.215785563 0.205641866 0.330426753 0.270668656 -0.584224463 0.00480609061 -0.140333205 0.108340807 0.334620416 0.287474573 -0.252189368 -0.130423605 -0.384156406 -0.088809669 -0.289566457 -0.191586465 -0.252989113 0.0023394227 -0.199207917 0.182552218 0.343905985 0.00964871049 -0.297047645 -0.095759213 -0.0848670602 -0.391148001 0.379372537 -0.103591293 -0.108524382 -0.0854044259 -0.014515698 -0.239519164 0.330665827 0.265246391 -0.382618099 -0.242477924 0.0169380885 -0.271963418 0.176642522 -0.167592227 0.212233543 -0.166957974 -0.486481488 -0.356802076 -0.421863109 -0.457864165 0.451644748 -0.345448941 -0.271698833 -0.0171067417 -0.294939429 -0.0341410339 -0.230402693 0.214524284 0.393824279 0.11038278 0.340756148 -0.364909708 -0.0700738505 -0.287790775 -0.473314196 -0.0508904271 -0.0594830923 -0.266248643 0.0921673551 0.282414615 0.211390316 0.323521912 0.389985174 -0.1172745 -0.338801116 -0.248108745 -0.368186623 -0.000977915712 -0.0862396657 -0.514621794 -0.192365795 -0.125033304 -0.356861621 0.139450878 -0.473673016 -0.296890616 0.231948838 -0.0897524208 -0.108068943 -0.262568533 -0.0669268668 -0.121991627 -0.181127936 -0.153257012 -0.351852596 0.203179806 -0.246175334 0.401075989 -0.108464114 0.0463157892 0.401990533 -0.21850729 0.279043794 -0.322127581 0.256537437 0.260883391 -0.134775251 -0.0668371022 -0.0464482605 0.000605612993 -0.271583319 0.359008193 -0.403015643 -0.112857558 -0.245714292 0.0825808644 0.136080682 0.188659921 0.0214566886 0.16474773 -0.26216501 0.345338345 0.340386361 0.38751626 0.309455216 -0.40389514 0.119553499 -0.328281134 -0.110470913 0.283556193 -0.203000799 -0.00652524037 0.0894319415 0.0565693416 0.191753447 -0.61134547 0.0091007622 -0.320429951 -0.0879443064 -0.250200272 0.177432537 -0.100201607 -0.310569584 -0.121489942 -0.40506959 -0.00108291081 -0.523685873 0.0847647414 -0.371884942 0.192494348 0.231527776 -0.391961575 -0.462979645 -0.0364595838 -0.467610568 0.149600655 -0.613774598 0.0187029205 -0.432038277 -0.497748673 -0.130242586 -0.273416102 0.24179399 -0.327645451 0.0957957357 0.0534106307 0.152498916 -0.0655847117 -0.0130441757 0.0241602734 -1.11802387 0.395821124 -0.63678962 0.164164618 0.275739163 0.172154322 0.123249359 0.280000478 -0.398396641 -0.0153793395 0.00281976513 -0.466970682 +0.237582907 -0.338114142 -0.000987342326 0.18030037 -0.0544456244 -0.150726676 -0.392378747 0.198864698 0.0219259057 0.321132571 0.17300266 -0.160468221 0.0565257296 0.0120839076 -0.0596049726 -0.154166311 0.247620329 -0.250395894 -1.2578485 -0.383267134 0.037854977 0.670674622 0.000494748354 0.159648865 0.306595176 -0.188943446 -0.481506914 0.108944878 0.272550166 -0.120880872 -0.706038237 -0.172178179 -0.232811332 0.254093796 -0.323794842 -0.168923885 0.577651322 -0.243460089 0.0687387437 -0.672371209 -0.250133574 -0.115869999 -0.288632631 -0.0429469049 -0.571347117 -0.329337806 -0.551994503 0.113058954 0.145634055 0.118817583 -0.179108381 0.424469203 0.685199678 -0.147629857 0.443984985 0.12521717 -1.12148011 -1.37973905 0.337865978 -0.291082561 -0.468009293 0.0227235872 0.416201681 0.0398242474 -0.39945519 0.371359497 -0.94106847 -0.0361566059 0.0436781943 -0.113875151 -0.0391744785 -0.0201506913 -1.86140811 0.466106147 1.91868913 0.268382221 0.264378399 -0.0349995196 0.0792139471 -2.87181711 2.41427064 1.65877414 1.83149564 -0.366973639 -1.24701619 2.08745885 -0.183281809 -0.347004771 -2.16105652 -0.0750851035 0.89319241 -0.405291408 -1.22111082 -2.15270352 -0.33656776 0.0970840752 -0.154896855 1.95982409 -0.178261608 -1.40112567 -1.96888196 -0.0413707793 1.1193037 -0.978088677 0.0634376109 0.0718326271 1.36185789 -0.182117552 -0.0190352239 -0.409866989 0.216486007 -0.739376545 0.11504212 -0.245147198 -0.309642434 -0.265233368 0.379894704 -0.183324441 0.0971908495 0.210021347 0.332819194 -1.34440303 -0.0931295753 0.445452303 -0.00677574519 0.0469819605 -0.487212539 0.447737128 -0.0322357118 -0.352792144 0.123024374 -0.29872191 -0.146769822 0.0905542448 -0.101906136 0.0715721995 -0.612879276 0.455553621 -0.266217113 0.0511021204 0.244313508 -0.255902171 0.048614312 -0.320337176 -0.0358749479 -0.158284456 0.40615046 0.11524009 0.224121898 -0.360729247 -0.0677277446 -0.0379912183 -0.375006616 0.450368762 -0.0593438856 -0.07786569 0.129689306 -0.0306660999 -0.378324389 -0.302997857 0.119612508 -0.0319931805 diff --git a/TrkHitReco/fcl/prolog.fcl b/TrkHitReco/fcl/prolog.fcl index e367e1e713..47ed3f304c 100644 --- a/TrkHitReco/fcl/prolog.fcl +++ b/TrkHitReco/fcl/prolog.fcl @@ -109,9 +109,19 @@ TNTClusterer : { TestFlag : true BackgroundMask : [] SignalMask : ["TimeSelection", "EnergySelection", "RadiusSelection"] - DistanceMethod : 0 } +Chi2Clusterer : { + HitDistance : 2 + SeedDistance : 4 + MinClusterHits : 1 + MaxHitTimeDiff : 30.0 + MaxCluIterations : 5 + TestFlag : true + BackgroundMask : [] + SignalMask : ["TimeSelection", "EnergySelection", "RadiusSelection"] + Diag : 0 +} # Background hit flagging FlagBkgHits : { @@ -119,6 +129,7 @@ FlagBkgHits : { ComboHitCollection : "makeSTH" ClusterAlgorithm : 1 TNTClustering : {@table::TNTClusterer} + Chi2Clustering : {@table::Chi2Clusterer} MinActiveHits : 3 MinNPlanes : 2 ClusterPositionError : 10 diff --git a/TrkHitReco/inc/Chi2Clusterer.hh b/TrkHitReco/inc/Chi2Clusterer.hh new file mode 100644 index 0000000000..02be3cefda --- /dev/null +++ b/TrkHitReco/inc/Chi2Clusterer.hh @@ -0,0 +1,79 @@ +// Clustering using Chi2 distance calculation method - Mete Yucel 2024 +// Based on TNTClusterer + +#ifndef Chi2Clusterer_HH +#define Chi2Clusterer_HH + +#include "fhiclcpp/types/Atom.h" +#include "Offline/RecoDataProducts/inc/StrawDigi.hh" +#include "Offline/TrkHitReco/inc/BkgClusterer.hh" +#include "Offline/GeneralUtilities/inc/CombineTwoDPoints.hh" +#include "fhiclcpp/types/Sequence.h" + +#include + + + +namespace mu2e { + + struct Chi2BkgHit + { + Chi2BkgHit(unsigned chidx): chidx_(chidx),clusterIdx_(-1) {}; + + unsigned chidx_; + int clusterIdx_; + + }; + + + class Chi2Clusterer : public BkgClusterer + { + public: + + struct Config + { + using Name = fhicl::Name; + using Comment = fhicl::Comment; + fhicl::Atom hitDistance{ Name("HitDistance"), Comment("Minimum cluster hit distance") }; + fhicl::Atom seedDistance{ Name("SeedDistance"), Comment("Minimum distance for cluster seed") }; + fhicl::Atom minClusterHits{ Name("MinClusterHits"), Comment("Cut for minimum cluster hit size"),1 }; + fhicl::Atom maxHitTimeDiff{ Name("MaxHitTimeDiff"), Comment("Maximum hit cluster time difference") }; + fhicl::Atom maxCluIterations{ Name("MaxCluIterations"), Comment("Maximum number of cluster algo iterations") }; + fhicl::Sequence bkgmsk{ Name("BackgroundMask"), Comment("Bkg hit selection mask") }; + fhicl::Sequence sigmsk{ Name("SignalMask"), Comment("Signal hit selection mask") }; + fhicl::Atom testflag{ Name("TestFlag"), Comment("Test hit flags") }; + fhicl::Atom diag{ Name("Diag"), Comment("Diagnosis level"),0 }; + }; + + explicit Chi2Clusterer(const Config& config); + virtual ~Chi2Clusterer() {}; + + void init(); + virtual void findClusters(BkgClusterCollection& clusters, const ComboHitCollection& shcol, int iev); + virtual float distance (const BkgCluster& cluster, const ComboHit& hit) const; + + + private: + static constexpr int numBuckets_ =256; //number of buckets to store the cluster ids vs time + + void initClustering (const ComboHitCollection& chcol, std::vector& hinfo); + void doClustering (const ComboHitCollection& chcol, std::vector& clusters, std::vector& hinfo); + unsigned formClusters (const ComboHitCollection& chcol, std::vector& clusters, std::vector& hinfo); + void dump (const std::vector& clusters, const std::vector& hinfo); + + float tbin_; + float dhit_; + float dseed_; + float dt_; + float chi2Cut_; + int minClusterHits_; + float maxHitdt_; + unsigned maxNiter_; + StrawHitFlag bkgmask_; + StrawHitFlag sigmask_; + bool testflag_; + int diag_; + BkgCluster::distMethod distMethodFlag_; + }; +} +#endif diff --git a/TrkHitReco/inc/TNTClusterer.hh b/TrkHitReco/inc/TNTClusterer.hh index eff1cc409e..43e90dd0d3 100644 --- a/TrkHitReco/inc/TNTClusterer.hh +++ b/TrkHitReco/inc/TNTClusterer.hh @@ -10,7 +10,7 @@ #include "fhiclcpp/types/Atom.h" #include "Offline/RecoDataProducts/inc/StrawDigi.hh" #include "Offline/TrkHitReco/inc/BkgClusterer.hh" -#include "Offline/GeneralUtilities/inc/CombineTwoDPoints.hh" +//#include "Offline/GeneralUtilities/inc/CombineTwoDPoints.hh" #include "fhiclcpp/types/Sequence.h" #include @@ -54,7 +54,6 @@ namespace mu2e { fhicl::Sequence sigmsk{ Name("SignalMask"), Comment("Signal hit selection mask") }; fhicl::Atom testflag{ Name("TestFlag"), Comment("Test hit flags") }; fhicl::Atom diag{ Name("Diag"), Comment("Diagnosis level"),0 }; - fhicl::Atom distMethod{ Name("DistanceMethod"), Comment("Distance method") }; }; @@ -64,7 +63,6 @@ namespace mu2e { void init (); virtual void findClusters(BkgClusterCollection& clusters, const ComboHitCollection& shcol, int iev); virtual float distance (const BkgCluster& cluster, const ComboHit& hit) const; - enum mode {useSpatial,useChi2}; private: @@ -98,7 +96,6 @@ namespace mu2e { StrawHitFlag sigmask_; bool testflag_; int diag_; - int distMethod_; BkgCluster::distMethod distMethodFlag_; }; } diff --git a/TrkHitReco/inc/TrainBkgDiag.hxx b/TrkHitReco/inc/TrainBkgDiag.hxx index 7f3afffda0..4a5450b1b8 100644 --- a/TrkHitReco/inc/TrainBkgDiag.hxx +++ b/TrkHitReco/inc/TrainBkgDiag.hxx @@ -1,11 +1,11 @@ -//Code generated automatically by TMVA for Inference of Model file [TrainBkgDiag.h5] at [Tue Jun 20 01:37:03 2023] +//Code generated automatically by TMVA for Inference of Model file [TrainBkgDiagStationChi2NEW.h5] at [Thu Jan 18 16:48:55 2024] #ifndef TMVA_SOFIE_TRAINBKGDIAG #define TMVA_SOFIE_TRAINBKGDIAG #include -#include #include +#include #include "TMVA/SOFIE_common.hxx" #include @@ -18,46 +18,46 @@ namespace BLAS{ const float * beta, float * C, const int * ldc); }//BLAS struct Session { +std::vector fTensor_dense3bias0 = std::vector(1); +float * tensor_dense3bias0 = fTensor_dense3bias0.data(); std::vector fTensor_dense3kernel0 = std::vector(18); float * tensor_dense3kernel0 = fTensor_dense3kernel0.data(); std::vector fTensor_dense2bias0 = std::vector(18); float * tensor_dense2bias0 = fTensor_dense2bias0.data(); +std::vector fTensor_dense2kernel0 = std::vector(324); +float * tensor_dense2kernel0 = fTensor_dense2kernel0.data(); +std::vector fTensor_dense1bias0 = std::vector(18); +float * tensor_dense1bias0 = fTensor_dense1bias0.data(); +std::vector fTensor_dense1kernel0 = std::vector(324); +float * tensor_dense1kernel0 = fTensor_dense1kernel0.data(); std::vector fTensor_densebias0 = std::vector(18); float * tensor_densebias0 = fTensor_densebias0.data(); std::vector fTensor_densekernel0 = std::vector(162); float * tensor_densekernel0 = fTensor_densekernel0.data(); -std::vector fTensor_dense1kernel0 = std::vector(324); -float * tensor_dense1kernel0 = fTensor_dense1kernel0.data(); -std::vector fTensor_dense3bias0 = std::vector(1); -float * tensor_dense3bias0 = fTensor_dense3bias0.data(); -std::vector fTensor_dense1bias0 = std::vector(18); -float * tensor_dense1bias0 = fTensor_dense1bias0.data(); -std::vector fTensor_dense2kernel0 = std::vector(324); -float * tensor_dense2kernel0 = fTensor_dense2kernel0.data(); +std::vector fTensor_dense3Dense = std::vector(1); +float * tensor_dense3Dense = fTensor_dense3Dense.data(); +std::vector fTensor_dense2Dense = std::vector(18); +float * tensor_dense2Dense = fTensor_dense2Dense.data(); +std::vector fTensor_dense3bias0bcast = std::vector(1); +float * tensor_dense3bias0bcast = fTensor_dense3bias0bcast.data(); +std::vector fTensor_dense1Relu0 = std::vector(18); +float * tensor_dense1Relu0 = fTensor_dense1Relu0.data(); std::vector fTensor_dense3Sigmoid0 = std::vector(1); float * tensor_dense3Sigmoid0 = fTensor_dense3Sigmoid0.data(); +std::vector fTensor_dense2Relu0 = std::vector(18); +float * tensor_dense2Relu0 = fTensor_dense2Relu0.data(); std::vector fTensor_dense1Dense = std::vector(18); float * tensor_dense1Dense = fTensor_dense1Dense.data(); +std::vector fTensor_dense1bias0bcast = std::vector(18); +float * tensor_dense1bias0bcast = fTensor_dense1bias0bcast.data(); std::vector fTensor_denseRelu0 = std::vector(18); float * tensor_denseRelu0 = fTensor_denseRelu0.data(); -std::vector fTensor_dense1Relu0 = std::vector(18); -float * tensor_dense1Relu0 = fTensor_dense1Relu0.data(); -std::vector fTensor_dense3Dense = std::vector(1); -float * tensor_dense3Dense = fTensor_dense3Dense.data(); -std::vector fTensor_densebias0bcast = std::vector(18); -float * tensor_densebias0bcast = fTensor_densebias0bcast.data(); std::vector fTensor_denseDense = std::vector(18); float * tensor_denseDense = fTensor_denseDense.data(); std::vector fTensor_dense2bias0bcast = std::vector(18); float * tensor_dense2bias0bcast = fTensor_dense2bias0bcast.data(); -std::vector fTensor_dense2Dense = std::vector(18); -float * tensor_dense2Dense = fTensor_dense2Dense.data(); -std::vector fTensor_dense1bias0bcast = std::vector(18); -float * tensor_dense1bias0bcast = fTensor_dense1bias0bcast.data(); -std::vector fTensor_dense2Relu0 = std::vector(18); -float * tensor_dense2Relu0 = fTensor_dense2Relu0.data(); -std::vector fTensor_dense3bias0bcast = std::vector(1); -float * tensor_dense3bias0bcast = fTensor_dense3bias0bcast.data(); +std::vector fTensor_densebias0bcast = std::vector(18); +float * tensor_densebias0bcast = fTensor_densebias0bcast.data(); Session(std::string filename ="") { @@ -70,6 +70,17 @@ Session(std::string filename ="") { std::string tensor_name; int length; f >> tensor_name >> length; + if (tensor_name != "tensor_dense3bias0" ) { + std::string err_msg = "TMVA-SOFIE failed to read the correct tensor name; expected name is tensor_dense3bias0 , read " + tensor_name; + throw std::runtime_error(err_msg); + } + if (length != 1) { + std::string err_msg = "TMVA-SOFIE failed to read the correct tensor size; expected size is 1 , read " + std::to_string(length) ; + throw std::runtime_error(err_msg); + } + for (int i =0; i < length; ++i) + f >> tensor_dense3bias0[i]; + f >> tensor_name >> length; if (tensor_name != "tensor_dense3kernel0" ) { std::string err_msg = "TMVA-SOFIE failed to read the correct tensor name; expected name is tensor_dense3kernel0 , read " + tensor_name; throw std::runtime_error(err_msg); @@ -92,27 +103,27 @@ Session(std::string filename ="") { for (int i =0; i < length; ++i) f >> tensor_dense2bias0[i]; f >> tensor_name >> length; - if (tensor_name != "tensor_densebias0" ) { - std::string err_msg = "TMVA-SOFIE failed to read the correct tensor name; expected name is tensor_densebias0 , read " + tensor_name; + if (tensor_name != "tensor_dense2kernel0" ) { + std::string err_msg = "TMVA-SOFIE failed to read the correct tensor name; expected name is tensor_dense2kernel0 , read " + tensor_name; throw std::runtime_error(err_msg); } - if (length != 18) { - std::string err_msg = "TMVA-SOFIE failed to read the correct tensor size; expected size is 18 , read " + std::to_string(length) ; + if (length != 324) { + std::string err_msg = "TMVA-SOFIE failed to read the correct tensor size; expected size is 324 , read " + std::to_string(length) ; throw std::runtime_error(err_msg); } for (int i =0; i < length; ++i) - f >> tensor_densebias0[i]; + f >> tensor_dense2kernel0[i]; f >> tensor_name >> length; - if (tensor_name != "tensor_densekernel0" ) { - std::string err_msg = "TMVA-SOFIE failed to read the correct tensor name; expected name is tensor_densekernel0 , read " + tensor_name; + if (tensor_name != "tensor_dense1bias0" ) { + std::string err_msg = "TMVA-SOFIE failed to read the correct tensor name; expected name is tensor_dense1bias0 , read " + tensor_name; throw std::runtime_error(err_msg); } - if (length != 162) { - std::string err_msg = "TMVA-SOFIE failed to read the correct tensor size; expected size is 162 , read " + std::to_string(length) ; + if (length != 18) { + std::string err_msg = "TMVA-SOFIE failed to read the correct tensor size; expected size is 18 , read " + std::to_string(length) ; throw std::runtime_error(err_msg); } for (int i =0; i < length; ++i) - f >> tensor_densekernel0[i]; + f >> tensor_dense1bias0[i]; f >> tensor_name >> length; if (tensor_name != "tensor_dense1kernel0" ) { std::string err_msg = "TMVA-SOFIE failed to read the correct tensor name; expected name is tensor_dense1kernel0 , read " + tensor_name; @@ -125,19 +136,8 @@ Session(std::string filename ="") { for (int i =0; i < length; ++i) f >> tensor_dense1kernel0[i]; f >> tensor_name >> length; - if (tensor_name != "tensor_dense3bias0" ) { - std::string err_msg = "TMVA-SOFIE failed to read the correct tensor name; expected name is tensor_dense3bias0 , read " + tensor_name; - throw std::runtime_error(err_msg); - } - if (length != 1) { - std::string err_msg = "TMVA-SOFIE failed to read the correct tensor size; expected size is 1 , read " + std::to_string(length) ; - throw std::runtime_error(err_msg); - } - for (int i =0; i < length; ++i) - f >> tensor_dense3bias0[i]; - f >> tensor_name >> length; - if (tensor_name != "tensor_dense1bias0" ) { - std::string err_msg = "TMVA-SOFIE failed to read the correct tensor name; expected name is tensor_dense1bias0 , read " + tensor_name; + if (tensor_name != "tensor_densebias0" ) { + std::string err_msg = "TMVA-SOFIE failed to read the correct tensor name; expected name is tensor_densebias0 , read " + tensor_name; throw std::runtime_error(err_msg); } if (length != 18) { @@ -145,18 +145,18 @@ Session(std::string filename ="") { throw std::runtime_error(err_msg); } for (int i =0; i < length; ++i) - f >> tensor_dense1bias0[i]; + f >> tensor_densebias0[i]; f >> tensor_name >> length; - if (tensor_name != "tensor_dense2kernel0" ) { - std::string err_msg = "TMVA-SOFIE failed to read the correct tensor name; expected name is tensor_dense2kernel0 , read " + tensor_name; + if (tensor_name != "tensor_densekernel0" ) { + std::string err_msg = "TMVA-SOFIE failed to read the correct tensor name; expected name is tensor_densekernel0 , read " + tensor_name; throw std::runtime_error(err_msg); } - if (length != 324) { - std::string err_msg = "TMVA-SOFIE failed to read the correct tensor size; expected size is 324 , read " + std::to_string(length) ; + if (length != 162) { + std::string err_msg = "TMVA-SOFIE failed to read the correct tensor size; expected size is 162 , read " + std::to_string(length) ; throw std::runtime_error(err_msg); } for (int i =0; i < length; ++i) - f >> tensor_dense2kernel0[i]; + f >> tensor_densekernel0[i]; f.close(); { float * data = TMVA::Experimental::SOFIE::UTILITY::UnidirectionalBroadcast(tensor_densebias0,{ 18 }, { 1 , 18 }); @@ -180,7 +180,7 @@ Session(std::string filename ="") { } } -std::vector infer(float* tensor_input1){ +std::vector infer(float* tensor_input3){ //--------- Gemm char op_0_transA = 'n'; @@ -193,7 +193,7 @@ std::vector infer(float* tensor_input1){ int op_0_lda = 9; int op_0_ldb = 18; std::copy(tensor_densebias0bcast, tensor_densebias0bcast + 18, tensor_denseDense); - BLAS::sgemm_(&op_0_transB, &op_0_transA, &op_0_n, &op_0_m, &op_0_k, &op_0_alpha, tensor_densekernel0, &op_0_ldb, tensor_input1, &op_0_lda, &op_0_beta, tensor_denseDense, &op_0_n); + BLAS::sgemm_(&op_0_transB, &op_0_transA, &op_0_n, &op_0_m, &op_0_k, &op_0_alpha, tensor_densekernel0, &op_0_ldb, tensor_input3, &op_0_lda, &op_0_beta, tensor_denseDense, &op_0_n); //------ RELU for (int id = 0; id < 18 ; id++){ diff --git a/TrkHitReco/src/Chi2Clusterer.cc b/TrkHitReco/src/Chi2Clusterer.cc new file mode 100644 index 0000000000..d162e0df1e --- /dev/null +++ b/TrkHitReco/src/Chi2Clusterer.cc @@ -0,0 +1,180 @@ +#include "Offline/TrkHitReco/inc/Chi2Clusterer.hh" +#include +#include +#include + +namespace mu2e +{ + Chi2Clusterer::Chi2Clusterer(const Config& config) : + dhit_ (config.hitDistance()), + dseed_ (config.seedDistance()), + minClusterHits_ (config.minClusterHits()), + maxHitdt_ (config.maxHitTimeDiff()), + maxNiter_ (config.maxCluIterations()), + bkgmask_ (config.bkgmsk()), + sigmask_ (config.sigmsk()), + testflag_ (config.testflag()), + diag_ (config.diag()) + { + + tbin_ = 1.0; + chi2Cut_ = std::pow(((dseed_+dhit_)/2),2); + distMethodFlag_ = BkgCluster::chi2; + + } + + //--------------------------------------------------------------------------------------- + void Chi2Clusterer::init() {} + + + //---------------------------------------------------------------------------------------------------------- + void Chi2Clusterer::findClusters(BkgClusterCollection& clusters, const ComboHitCollection& chcol, int iev) + { + + std::vector BkgHits; + BkgHits.reserve(chcol.size()); + if (chcol.empty()) return; + + initClustering(chcol, BkgHits); + doClustering(chcol, clusters, BkgHits); + + long unsigned int minchits = minClusterHits_; + auto removePred = [minchits](auto& cluster) {return cluster.hits().size() < minchits;}; + clusters.erase(std::remove_if(clusters.begin(),clusters.end(),removePred),clusters.end()); + + auto transPred = [&BkgHits] (const int i) {return BkgHits[i].chidx_;}; + for (auto& cluster: clusters) std::transform(cluster.hits().begin(),cluster.hits().end(),cluster.hits().begin(),transPred); + + if(diag_>1) dump(clusters,BkgHits); + + } + + + //---------------------------------------------------------------------------------------------------------------------- + void Chi2Clusterer::initClustering(const ComboHitCollection& chcol, std::vector& BkgHits) + { + float maxTime(0); + for (size_t ich=0;ich& clusters, std::vector& BkgHits) + { + unsigned niter(0); + float startChi2(0); + float deltaChi2(0); + //Check average Chi2 change. This is set to middle point of hit and seed radii(dhit_+dseed_/2)^2 + while ( deltaChi2 < chi2Cut_ && niter < maxNiter_ ) { + ++niter; + formClusters(chcol, clusters, BkgHits); + + float aveChi2(0); + float sumChi2(0); + unsigned nofCl(0); + for (const auto& cluster: clusters) { + if(cluster.hits().size() > 1) { + sumChi2 += cluster.points().chisquared(); + ++nofCl; + } + } + aveChi2 = sumChi2/nofCl; + if(niter == 1) startChi2 = aveChi2; + deltaChi2 = aveChi2 - startChi2; + } + if(diag_>0) std::cout<<"Nof_iter\t"<& clusters, std::vector& BkgHits) + { + std::array, numBuckets_> clusterIndices; + for (size_t ic=0;ic dseed_) { + minc = clusters.size(); + clusters.emplace_back(BkgCluster(TwoDPoint(chit.pos(),chit.uDir(),chit.uVar(),chit.vVar()),chit.correctedTime(),chit.nStrawHits())); + clusters[minc].addHit(ihit); + int itime = int(chit.correctedTime()/tbin_); + clusterIndices[itime].emplace_back(minc); + clusters[minc].setDistanceMethod(distMethodFlag_); + } + else minc = -1; + } + } + + for(auto cluster = clusters.begin(); cluster != clusters.end();){ + if((*cluster).hits().size() <= 1){ + BkgHits[(*cluster).hits().at(0)].clusterIdx_ = -1; + cluster = clusters.erase(cluster); + } + else{ + for (auto& hit : (*cluster).hits()){ + BkgHits[hit].clusterIdx_ = std::distance(clusters.begin(),cluster); + } + ++cluster; + } + } + return clusters.size(); + } + + //--------------------------------------------------------------------------------------- + float Chi2Clusterer::distance(const BkgCluster& cluster, const ComboHit& hit) const + { + return std::sqrt(cluster.points().dChi2(TwoDPoint(hit.pos(),hit.uDir(),hit.uVar(),hit.vVar()))) - std::sqrt(cluster.points().chisquared()); + } + + //------------------------------------------------------------------------------------------- + void Chi2Clusterer::dump(const std::vector& clusters, const std::vector& BkgHits) + { + int iclu(0); + for (auto& cluster: clusters) { + std::cout<<"Cluster "< @@ -48,11 +49,13 @@ namespace mu2e fhicl::Atom outputLevel{ Name("OutputLevel"), Comment("Level of the output ComboHitCollection") }; fhicl::Atom debugLevel{ Name("DebugLevel"), Comment("Debug"),0 }; fhicl::Table TNTClustering{ Name("TNTClustering"), Comment("TNT Clusterer config") }; + fhicl::Table Chi2Clustering{ Name("Chi2Clustering"), Comment("Chi2 Clusterer config") }; fhicl::Atom kerasWeights{ Name("KerasWeights"), Comment("Weights for keras model") }; fhicl::Atom kerasQuality{ Name("KerasQuality"), Comment("Keras quality cut") }; }; - enum clusterer {TwoNiveauThreshold=1}; + //enum clusterer {TwoNiveauThreshold=1}; + enum clusterer {TNT=1,Chi2=2}; explicit FlagBkgHits(const art::EDProducer::Table& config); void beginJob() override; void produce(art::Event& event) override; @@ -108,9 +111,13 @@ namespace mu2e clusterer ctype = static_cast(config().clusterAlgorithm()); switch ( ctype ) { - case TwoNiveauThreshold: + //case TwoNiveauThreshold: + case TNT: clusterer_ = std::make_unique(config().TNTClustering()); break; + case Chi2: + clusterer_ = std::make_unique(config().Chi2Clustering()); + break; default: throw cet::exception("RECO")<< "Unknown clusterer" << ctype << std::endl; } diff --git a/TrkHitReco/src/TNTClusterer.cc b/TrkHitReco/src/TNTClusterer.cc index 214f0ef380..87a16a8815 100644 --- a/TrkHitReco/src/TNTClusterer.cc +++ b/TrkHitReco/src/TNTClusterer.cc @@ -19,8 +19,7 @@ namespace mu2e bkgmask_ (config.bkgmsk()), sigmask_ (config.sigmsk()), testflag_ (config.testflag()), - diag_ (config.diag()), - distMethod_ (config.distMethod()) + diag_ (config.diag()) { float minerr (config.minHitError()); float maxdist(config.maxDistance()); @@ -31,15 +30,8 @@ namespace mu2e maxwt_ = 1.0f/minerr; md2_ = maxdist*maxdist; trms2inv_ = 1.0f/trms/trms; + distMethodFlag_ = BkgCluster::spatial; - switch(distMethod_) { - case TNTClusterer::useSpatial: - distMethodFlag_ = BkgCluster::spatial; - break; - case TNTClusterer::useChi2: - distMethodFlag_ = BkgCluster::chi2; - break; - } } @@ -125,7 +117,6 @@ namespace mu2e // -- if hit is ok, reassign it right away if (hit.distance_ < dhit_) { clusters[hit.clusterIdx_].addHit(ihit); - clusters[hit.clusterIdx_].points().addPoint(TwoDPoint(chit.pos(),chit.uDir(),chit.uVar(),chit.vVar()),clusters[hit.clusterIdx_].points().nPoints()); continue; } @@ -146,11 +137,10 @@ namespace mu2e // -- either add hit to existing cluster, form new cluster, or do nothing if hit is "in between" if (mindist < dhit_) { clusters[minc].addHit(ihit); - clusters[minc].points().addPoint(TwoDPoint(chit.pos(),chit.uDir(),chit.uVar(),chit.vVar()),clusters[minc].points().nPoints()); } else if (mindist > dseed_) { minc = clusters.size(); - clusters.emplace_back(BkgCluster(TwoDPoint(chit.pos(),chit.uDir(),chit.uVar(),chit.vVar()),chit.correctedTime())); + clusters.emplace_back(chit.pos(),chit.correctedTime()); clusters[minc].addHit(ihit); int itime = int(chit.correctedTime()/tbin_); clusterIndices[itime].emplace_back(minc); @@ -236,34 +226,27 @@ namespace mu2e float TNTClusterer::distance(const BkgCluster& cluster, const ComboHit& hit) const { float retval(0.0f); - if(distMethod_ == TNTClusterer::useSpatial) - { - float psep_x = hit.pos().x()-cluster.pos().x(); - float psep_y = hit.pos().y()-cluster.pos().y(); - float d2 = psep_x*psep_x+psep_y*psep_y; - - if (d2 > md2_) {return dseed_+1.0f;} - - float dt = std::abs(hit.correctedTime()-cluster.time()); - if (dt > maxHitdt_) {return dseed_+1.0f;} - - - if (dt > dt_) {float tdist = dt -dt_;retval = tdist*tdist*trms2inv_;} - if (d2 > dd2_) { - //This is equivalent to but faster than the commented lines - //XYZVectorF that(-hit.uDir2D().y(),hit.uDir2D().x(),0.0); - //float dw = std::max(0.0f,hit.uDir2D().Dot(psep)-dd_)/hit.posRes(ComboHit::wire); - //float dp = std::max(0.0f,that.Dot(psep)-dd_)*maxwt_;//maxwt = 1/minerr - float hwx = hit.uDir2D().x(); - float hwy = hit.uDir2D().y(); - float dw = std::max(0.0f,(psep_x*hwx+psep_y*hwy-dd_)/hit.posRes(ComboHit::wire)); - float dp = std::max(0.0f,(hwx*psep_y-hwy*psep_x-dd_)*maxwt_); - retval += dw*dw + dp*dp; - } - } - if(distMethod_ == TNTClusterer::useChi2) - { - retval = cluster.points().dChi2(TwoDPoint(hit.pos(),hit.uDir(),hit.uVar(),hit.vVar())); + float psep_x = hit.pos().x()-cluster.pos().x(); + float psep_y = hit.pos().y()-cluster.pos().y(); + float d2 = psep_x*psep_x+psep_y*psep_y; + + if (d2 > md2_) {return dseed_+1.0f;} + + float dt = std::abs(hit.correctedTime()-cluster.time()); + if (dt > maxHitdt_) {return dseed_+1.0f;} + + + if (dt > dt_) {float tdist = dt -dt_;retval = tdist*tdist*trms2inv_;} + if (d2 > dd2_) { + //This is equivalent to but faster than the commented lines + //XYZVectorF that(-hit.uDir2D().y(),hit.uDir2D().x(),0.0); + //float dw = std::max(0.0f,hit.uDir2D().Dot(psep)-dd_)/hit.posRes(ComboHit::wire); + //float dp = std::max(0.0f,that.Dot(psep)-dd_)*maxwt_;//maxwt = 1/minerr + float hwx = hit.uDir2D().x(); + float hwy = hit.uDir2D().y(); + float dw = std::max(0.0f,(psep_x*hwx+psep_y*hwy-dd_)/hit.posRes(ComboHit::wire)); + float dp = std::max(0.0f,(hwx*psep_y-hwy*psep_x-dd_)*maxwt_); + retval += dw*dw + dp*dp; } return retval; } From a87209df1264a98004bb79e6ce2434d6e84f8d1b Mon Sep 17 00:00:00 2001 From: GIANANTONIO PEZZULLO Date: Sat, 20 Jan 2024 15:13:10 -0600 Subject: [PATCH 073/213] fixed bug --- ConditionsService/CMakeLists.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/ConditionsService/CMakeLists.txt b/ConditionsService/CMakeLists.txt index 5171b97517..a221152594 100644 --- a/ConditionsService/CMakeLists.txt +++ b/ConditionsService/CMakeLists.txt @@ -2,7 +2,6 @@ cet_make_library( SOURCE src/ConditionsService.cc src/CalorimeterCalibrations.cc - src/ExtMonFNALConditions.cc LIBRARIES PUBLIC Offline::ConfigTools From a47752e67e75bf899293bccd12601af6b5a644dd Mon Sep 17 00:00:00 2001 From: David Nathan Brown Date: Sat, 20 Jan 2024 15:07:28 -0800 Subject: [PATCH 074/213] Tweaks for extrapolation --- Mu2eKinKal/fcl/prolog.fcl | 17 ++++++++--------- Mu2eKinKal/inc/HelixFit_module.hh | 7 +++++-- Mu2eKinKal/inc/KKFit.hh | 2 +- 3 files changed, 14 insertions(+), 12 deletions(-) diff --git a/Mu2eKinKal/fcl/prolog.fcl b/Mu2eKinKal/fcl/prolog.fcl index 0253f80753..28f00cc83c 100644 --- a/Mu2eKinKal/fcl/prolog.fcl +++ b/Mu2eKinKal/fcl/prolog.fcl @@ -35,10 +35,10 @@ Mu2eKinKal : { MaxDStraw : 2 # integer (straw) MaxStrawDOCA : 5.0 # mm MaxStrawDOCAConsistency : 1.0 # units of chi - SampleTimeBuffer : 10.0 # time buffer for intersections - SampleTolerance : 5 # tolerance for intersection sample (mm) + SampleTimeBuffer : 0.1 # time buffer for intersections (ns) + SampleTolerance : 0.1 # tolerance for intersection sample (mm) SampleInRange : true # require sample be in time range - SampleInBounds : true # require sample be in surface bounds + SampleInBounds : false # require sample be in surface bounds } CHSEEDFIT: { @@ -275,10 +275,9 @@ Mu2eKinKal : { LOOPHELIX : { SeedErrors : [5.0, 5.0, 5.0, 5.0, 0.02, 5.0] # R(mm), Lambda(mm), Cx(mm), Cy(mm), phi0, t0 (ns) SeedFlags : [ "HelixOK" ] -# ExtrapolateSurfaces : ["TT_Front","TT_Back"] - ExtrapolateSurfaces : [] + ExtrapolateSurfaces : ["TT_Front","TT_Back"] ExtrapolationTolerance : 1.0e-3 - ExtrapolationMaxDt : 10.0 + ExtrapolationMaxDt : 100.0 # (ns) } CENTRALHELIX : { @@ -291,7 +290,7 @@ Mu2eKinKal : { PanelHitCollection : "makePH" ExtrapolateSurfaces : ["TT_Front","TT_Back","TT_Outer"] ExtrapolationTolerance : 1.0e-3 - ExtrapolationMaxDt : 10.0 + ExtrapolationMaxDt : 100.0 } KINEMATICLINE : { @@ -304,8 +303,8 @@ Mu2eKinKal : { SeedFlags : [ "HelixOK" ] ExtrapolateSurfaces : ["TT_Front","TT_Back","TT_Outer"] ExtrapolationTolerance : 1.0e-3 - ExtrapolationMaxDt : 10.0 -} + ExtrapolationMaxDt : 100.0 + } } Mu2eKinKal : { diff --git a/Mu2eKinKal/inc/HelixFit_module.hh b/Mu2eKinKal/inc/HelixFit_module.hh index d1be1b9684..0f0513778b 100644 --- a/Mu2eKinKal/inc/HelixFit_module.hh +++ b/Mu2eKinKal/inc/HelixFit_module.hh @@ -304,17 +304,20 @@ namespace mu2e { if(goodfit && extrap_.size()>0) { // test the drection of this fit auto const& ftraj = kktrk->fitTraj(); - bool downstream = ftraj.momentum3(ftraj.range().mid()).Z() > 0.0; + bool downstream = ftraj.momentum3(ftraj.range().mid()).Z() > 0.0; // replace with momentum at tracker middle TODO const static VEC3 opos(0.0,0.0,0.0); for(auto const& surf : extrap_){ // configure the extrapolation time direction according to the surface and the track momentum direction if(surf.first.id() == SurfaceIdEnum::TT_Front){ xconfig_.xdir_ = downstream ? TimeDir::backwards : TimeDir::forwards; - double zpos = surf.second->tangentPlane(opos).center().Z(); + double zpos = surf.second->tangentPlane(opos).center().Z(); // this is crude: I need an accessor that knows the TT_Front is a plane TODO ExtrapolateToZ xtoz(*kktrk,xconfig_.xdir_,zpos); kktrk->extrapolate(xconfig_,xtoz); } else if(surf.first.id() == SurfaceIdEnum::TT_Back){ xconfig_.xdir_ = downstream ? TimeDir::forwards : TimeDir::backwards; + double zpos = surf.second->tangentPlane(opos).center().Z(); + ExtrapolateToZ xtoz(*kktrk,xconfig_.xdir_,zpos); + kktrk->extrapolate(xconfig_,xtoz); } else if(surf.first.id() == SurfaceIdEnum::TT_Outer){ // extrapolate in both time directions } diff --git a/Mu2eKinKal/inc/KKFit.hh b/Mu2eKinKal/inc/KKFit.hh index 1ac5673161..9d900c4854 100644 --- a/Mu2eKinKal/inc/KKFit.hh +++ b/Mu2eKinKal/inc/KKFit.hh @@ -577,7 +577,7 @@ namespace mu2e { bool hasinter(true); // loop to find multiple intersections while(hasinter) { - TimeRange irange(tstart,ftraj.range().end()+ sampletbuff_); + TimeRange irange(tstart,std::max(ftraj.range().end(),tstart)+sampletbuff_); auto surfinter = KinKal::intersect(ftraj,*surf.second,irange,sampletol_); hasinter = surfinter.onsurface_ && ( (! sampleinbounds_) || surfinter.inbounds_ ) && ( (!sampleinrange_) || irange.inRange(surfinter.time_)); if(hasinter) { From 78ebeb680026222d6fb36f8364c27c4a539be8b7 Mon Sep 17 00:00:00 2001 From: Eric Flumerfelt Date: Mon, 22 Jan 2024 07:48:35 -0600 Subject: [PATCH 075/213] Fix whitespace errors (removing make_cmake.sh as it is no longer useful) --- Mu2eUtilities/src/TriggerResultsNavigator.cc | 2 +- make_cmake.sh | 181 ------------------- 2 files changed, 1 insertion(+), 182 deletions(-) delete mode 100755 make_cmake.sh diff --git a/Mu2eUtilities/src/TriggerResultsNavigator.cc b/Mu2eUtilities/src/TriggerResultsNavigator.cc index 2312b66dd5..ae903ac357 100644 --- a/Mu2eUtilities/src/TriggerResultsNavigator.cc +++ b/Mu2eUtilities/src/TriggerResultsNavigator.cc @@ -61,7 +61,7 @@ namespace mu2e { return _trigPathsNames[i].substr(pos+1, _trigPathsNames[i].length()); } - size_t + size_t TriggerResultsNavigator::getTrigBit(unsigned int const i) const { if (i>_trigPathsNames.size()) { diff --git a/make_cmake.sh b/make_cmake.sh deleted file mode 100755 index d312b1e102..0000000000 --- a/make_cmake.sh +++ /dev/null @@ -1,181 +0,0 @@ -for dir in */;do - cd $dir - dirname=`echo $dir|sed 's|/||g'` - - if [ -f CMakeLists.txt ];then - mv CMakeLists.txt{,.bak} - fi - - lib_list='' - for file in src/*.cc inc/*.hh;do - if ! [ -f $file ]; then continue; fi - if [[ $file =~ _.*\.cc ]]; then - continue - fi - if [[ $file =~ _.*\.hh ]]; then - continue - fi - lib_list="$lib_list`grep Offline/ $file|grep -v $dir|sed 's|.*Offline/|offline::|g;s|/.*||g'|uniq|tr '\n' ','`" - done - lib_list=`echo $lib_list|tr ',' '\n'|sort|uniq|awk '{print " "$1}'` - - make_lib=0 - make_ilib=0 - for file in src/*.cc;do - if ! [ -f $file ]; then continue; fi - if [[ $file =~ _.*\.cc ]]; then - continue - fi - make_lib=1 - break - done - for file in inc/*.hh;do - if ! [ -f $file ]; then continue; fi - make_ilib=1 - break - done - - if [ $make_lib -eq 1 ];then - echo 'cet_make_library( - SOURCE' >CMakeLists.txt - - for file in src/*.cc;do - if [[ $file =~ _.*\.cc ]]; then - continue - fi - echo " $file" >>CMakeLists.txt - done - - echo " LIBRARIES PUBLIC" >>CMakeLists.txt - echo "$lib_list" >>CMakeLists.txt - echo ")" >>CMakeLists.txt - echo >>CMakeLists.txt - - elif [ $make_ilib -eq 1 ];then - echo 'cet_make_library(INTERFACE - SOURCE' >>CMakeLists.txt - - for file in inc/*.hh;do - echo " $file" >>CMakeLists.txt - done - - echo " LIBRARIES INTERFACE" >>CMakeLists.txt - echo "$lib_list" >>CMakeLists.txt - echo ")" >>CMakeLists.txt - echo >>CMakeLists.txt - - fi - - execcount=`ls src/*_main.cc 2>/dev/null|wc -l` - if [ $execcount -gt 0 ]; then - for file in src/*_main.cc;do - execname=`echo $file|sed 's|src/||g;s/_main.cc//g'` - echo "cet_make_exec(NAME $execname - SOURCE $file - LIBRARIES" >>CMakeLists.txt - if [ $make_lib -eq 1 ] || [ $make_ilib -eq 1 ]; then - echo " offline::$dirname" >>CMakeLists.txt - fi - file_lib_list="`grep Offline/ $file|grep -v $dir|sed 's|.*Offline/|offline::|g;s|/.*||g'|uniq|tr '\n' ','`" - file_lib_list=`echo $file_lib_list|tr ',' '\n'|sort|uniq|awk '{print " "$1}'` - echo "$file_lib_list" >>CMakeLists.txt - echo ")" >>CMakeLists.txt - echo >> CMakeLists.txt - done - fi - - svccount=`ls src/*_service.cc 2>/dev/null|wc -l` - if [ $svccount -gt 0 ]; then - for file in src/*_service.cc;do - svcname=`echo $file|sed 's|src/||g;s/_service.cc//g'` - echo "cet_build_plugin($svcname art::service - REG_SOURCE $file - LIBRARIES REG" >>CMakeLists.txt - if [ $make_lib -eq 1 ] || [ $make_ilib -eq 1 ]; then - echo " offline::$dirname" >>CMakeLists.txt - fi - file_lib_list="`grep Offline/ $file|grep -v $dir|sed 's|.*Offline/|offline::|g;s|/.*||g'|uniq|tr '\n' ','`" - file_lib_list=`echo $file_lib_list|tr ',' '\n'|sort|uniq|awk '{print " "$1}'` - echo "$file_lib_list" >>CMakeLists.txt - echo ")" >>CMakeLists.txt - echo >> CMakeLists.txt - done - fi - - srccount=`ls src/*_source.cc 2>/dev/null |wc -l` - if [ $srccount -gt 0 ]; then - for file in src/*_module.cc;do - srcname=`echo $file|sed 's|src/||g;s/_source.cc//g'` - echo "cet_build_plugin($modname art::source - REG_SOURCE $file - LIBRARIES REG" >>CMakeLists.txt - if [ $make_lib -eq 1 ] || [ $make_ilib -eq 1 ]; then - echo " offline::$dirname" >>CMakeLists.txt - fi - file_lib_list="`grep Offline/ $file|grep -v $dir|sed 's|.*Offline/|offline::|g;s|/.*||g'|uniq|tr '\n' ','`" - file_lib_list=`echo $file_lib_list|tr ',' '\n'|sort|uniq|awk '{print " "$1}'` - echo "$file_lib_list" >>CMakeLists.txt - echo ")" >>CMakeLists.txt - echo >> CMakeLists.txt - done - fi - - modcount=`ls src/*_module.cc 2>/dev/null |wc -l` - if [ $modcount -gt 0 ]; then - for file in src/*_module.cc;do - modname=`echo $file|sed 's|src/||g;s/_module.cc//g'` - echo "cet_build_plugin($modname art::module - REG_SOURCE $file - LIBRARIES REG" >>CMakeLists.txt - if [ $make_lib -eq 1 ] || [ $make_ilib -eq 1 ]; then - echo " offline::$dirname" >>CMakeLists.txt - fi - file_lib_list="`grep Offline/ $file|grep -v $dir|sed 's|.*Offline/|offline::|g;s|/.*||g'|uniq|tr '\n' ','`" - file_lib_list=`echo $file_lib_list|tr ',' '\n'|sort|uniq|awk '{print " "$1}'` - echo "$file_lib_list" >>CMakeLists.txt - echo ")" >>CMakeLists.txt - echo >> CMakeLists.txt - done - fi - - toolcount=`ls src/*_tool.cc 2>/dev/null |wc -l` - if [ $toolcount -gt 0 ]; then - for file in src/*_tool.cc;do - toolname=`echo $file|sed 's|src/||g;s/_tool.cc//g'` - echo "cet_build_plugin($toolname art::tool - REG_SOURCE $file - LIBRARIES REG" >>CMakeLists.txt - if [ $make_lib -eq 1 ] || [ $make_ilib -eq 1 ]; then - echo " offline::$dirname" >>CMakeLists.txt - fi - file_lib_list="`grep Offline/ $file|grep -v $dir|sed 's|.*Offline/|offline::|g;s|/.*||g'|uniq|tr '\n' ','`" - file_lib_list=`echo $file_lib_list|tr ',' '\n'|sort|uniq|awk '{print " "$1}'` - echo "$file_lib_list" >>CMakeLists.txt - echo ")" >>CMakeLists.txt - echo >> CMakeLists.txt - done - fi - - if [ -f src/classes.h ]; then - echo 'art_dictionary( NO_CHECK_CLASS_VERSION # For some reason this segfaults' >>CMakeLists.txt - echo ' CLASSES_DEF_XML ${CMAKE_CURRENT_SOURCE_DIR}/src/classes_def.xml' >>CMakeLists.txt - echo ' CLASSES_H ${CMAKE_CURRENT_SOURCE_DIR}/src/classes.h' >>CMakeLists.txt - echo ' DICTIONARY_LIBRARIES' >>CMakeLists.txt - if [ $make_lib -eq 1 ] || [ $make_ilib -eq 1 ]; then - echo " offline::$dirname" >>CMakeLists.txt - fi - echo ')' >>CMakeLists.txt - fi - - if [ -d src ]; then - echo "install_source(SUBDIRS src)" >> CMakeLists.txt - fi - if [ -d inc ]; then - echo "install_headers(USE_PROJECT_NAME SUBDIRS inc)" >> CMakeLists.txt - fi - if [ -d fcl ]; then - echo "install_fhicl(SUBDIRS fcl SUBDIRNAME Offline/$dirname/fcl)" >> CMakeLists.txt - fi - - cd .. -done From 1c570619a6eaecee642e3beedd37eba753d19e29 Mon Sep 17 00:00:00 2001 From: GIANANTONIO PEZZULLO Date: Mon, 22 Jan 2024 06:27:03 -0600 Subject: [PATCH 076/213] fixed CMake files --- Mu2eUtilities/CMakeLists.txt | 1 + TrkHitReco/CMakeLists.txt | 4 ++++ TrkHitReco/src/CombineStereoPoints.cc | 2 +- 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/Mu2eUtilities/CMakeLists.txt b/Mu2eUtilities/CMakeLists.txt index e34d3d3144..a5a14f3e7e 100644 --- a/Mu2eUtilities/CMakeLists.txt +++ b/Mu2eUtilities/CMakeLists.txt @@ -33,6 +33,7 @@ cet_make_library( src/ProtonPulseRandPDF.cc src/RandomLimitedExpo.cc src/RandomUnitSphere.cc + src/ReSeedByEventID.cc src/rm48.cc src/ShankerWatanabeSpectrum.cc src/SimParticleCollectionPrinter.cc diff --git a/TrkHitReco/CMakeLists.txt b/TrkHitReco/CMakeLists.txt index 012210838e..a282ae4e51 100644 --- a/TrkHitReco/CMakeLists.txt +++ b/TrkHitReco/CMakeLists.txt @@ -1,15 +1,19 @@ cet_make_library( SOURCE + src/CombineStereoPoints.cc src/ComboPeakFitRoot.cc src/PeakFit.cc src/PeakFitFunction.cc src/PeakFitParams.cc src/PeakFitRoot.cc + src/StereoLine.cc + src/StereoPoint.cc src/StrawHitRecoUtils.cc src/TNTClusterer.cc LIBRARIES PUBLIC Offline::DataProducts + Offline::GeneralUtilities Offline::RecoDataProducts Offline::TrackerConditions Offline::TrackerGeom diff --git a/TrkHitReco/src/CombineStereoPoints.cc b/TrkHitReco/src/CombineStereoPoints.cc index 357ff2b31f..22e103c51d 100644 --- a/TrkHitReco/src/CombineStereoPoints.cc +++ b/TrkHitReco/src/CombineStereoPoints.cc @@ -134,6 +134,6 @@ namespace mu2e { } void CombineStereoPoints::print(std::ostream& os) const { - os << "CombineStereoPoints with " << nPoints() << " points, " << point() << " chisquared " << chisquared() << std::endl; + //os << "CombineStereoPoints with " << nPoints() << " points, " << point().print() << " chisquared " << chisquared() << std::endl; } } From bf05841ceba263bb798f4502909a17b760b6425f Mon Sep 17 00:00:00 2001 From: GIANANTONIO PEZZULLO Date: Mon, 22 Jan 2024 06:27:41 -0600 Subject: [PATCH 077/213] added flag to exclude Mu2eG4, Mu2eG4Helper and GEANT4 packages --- CMakeLists.txt | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 9fb6420b78..6463bc4e82 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -15,6 +15,8 @@ cet_set_compiler_flags(DIAGS VIGILANT -Wno-unused-parameter -Wno-type-limits -Wno-ignored-qualifiers -Wno-unused-but-set-parameter -Wno-extra -Wno-non-virtual-dtor -Wno-implicit-fallthrough -Wno-deprecated-copy ) +message("EXCLUDE_G4 SET TO ${MY_VARIABLE}") + include_directories(${CMAKE_CURRENT_SOURCE_DIR}/..) find_package(art_root_io REQUIRED EXPORT) @@ -25,7 +27,10 @@ find_package(Boost COMPONENTS iostreams program_options REQUIRED EXPORT) find_package(XercesC REQUIRED EXPORT) find_package(BLAS REQUIRED EXPORT) find_package(artdaq_core_mu2e REQUIRED EXPORT) -find_package(Geant4 REQUIRED EXPORT) +if( NOT ${MY_VARIABLE} ) + message("--> ADDING G4 LIBS") + find_package(Geant4 REQUIRED EXPORT) +endif() # TODO: Find or implement FindCRY.cmake include_directories($ENV{CRYHOME}/src) @@ -97,8 +102,11 @@ add_subdirectory(MCDataProducts) add_subdirectory(MECOStyleProtonAbsorberGeom) add_subdirectory(Mu2e) add_subdirectory(Mu2eBTrk) -add_subdirectory(Mu2eG4) -add_subdirectory(Mu2eG4Helper) +if( !EXCLUDE_G4 ) + message("ADDING G4 DIRS") + add_subdirectory(Mu2eG4) + add_subdirectory(Mu2eG4Helper) +endif() add_subdirectory(Mu2eHallGeom) add_subdirectory(Mu2eInterfaces) add_subdirectory(Mu2eKinKal) From 0bd6f83dee806a6dee7e56a613f2318751f9183e Mon Sep 17 00:00:00 2001 From: GIANANTONIO PEZZULLO Date: Mon, 22 Jan 2024 10:10:07 -0600 Subject: [PATCH 078/213] uncommented line --- TrkHitReco/src/CombineStereoPoints.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/TrkHitReco/src/CombineStereoPoints.cc b/TrkHitReco/src/CombineStereoPoints.cc index 22e103c51d..357ff2b31f 100644 --- a/TrkHitReco/src/CombineStereoPoints.cc +++ b/TrkHitReco/src/CombineStereoPoints.cc @@ -134,6 +134,6 @@ namespace mu2e { } void CombineStereoPoints::print(std::ostream& os) const { - //os << "CombineStereoPoints with " << nPoints() << " points, " << point().print() << " chisquared " << chisquared() << std::endl; + os << "CombineStereoPoints with " << nPoints() << " points, " << point() << " chisquared " << chisquared() << std::endl; } } From ca77710cb4bfbf84c68d4f1cb6fb25214ca5157c Mon Sep 17 00:00:00 2001 From: GIANANTONIO PEZZULLO Date: Mon, 22 Jan 2024 10:32:44 -0600 Subject: [PATCH 079/213] fixed var name --- CMakeLists.txt | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 6463bc4e82..75522d46e9 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -15,7 +15,7 @@ cet_set_compiler_flags(DIAGS VIGILANT -Wno-unused-parameter -Wno-type-limits -Wno-ignored-qualifiers -Wno-unused-but-set-parameter -Wno-extra -Wno-non-virtual-dtor -Wno-implicit-fallthrough -Wno-deprecated-copy ) -message("EXCLUDE_G4 SET TO ${MY_VARIABLE}") +message("WITH_G4 SET TO ${WITH_G4}") include_directories(${CMAKE_CURRENT_SOURCE_DIR}/..) @@ -27,8 +27,8 @@ find_package(Boost COMPONENTS iostreams program_options REQUIRED EXPORT) find_package(XercesC REQUIRED EXPORT) find_package(BLAS REQUIRED EXPORT) find_package(artdaq_core_mu2e REQUIRED EXPORT) -if( NOT ${MY_VARIABLE} ) - message("--> ADDING G4 LIBS") +if( ${WITH_G4} ) + message("--> ADDING G4 LIBS") find_package(Geant4 REQUIRED EXPORT) endif() @@ -102,8 +102,8 @@ add_subdirectory(MCDataProducts) add_subdirectory(MECOStyleProtonAbsorberGeom) add_subdirectory(Mu2e) add_subdirectory(Mu2eBTrk) -if( !EXCLUDE_G4 ) - message("ADDING G4 DIRS") +if( ${WITH_G4} ) + message("---> ADDING G4 DIRS") add_subdirectory(Mu2eG4) add_subdirectory(Mu2eG4Helper) endif() From 159933ce1fa47174594da30b09679f5f3733b94f Mon Sep 17 00:00:00 2001 From: Eric Flumerfelt Date: Tue, 23 Jan 2024 12:47:27 -0600 Subject: [PATCH 080/213] Add ignore rule for Spack build artifacts --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index e3c98a49b0..4f83a42bac 100644 --- a/.gitignore +++ b/.gitignore @@ -43,3 +43,4 @@ EMFCAnalysis tags .clangd/* compile_commands.json +spack-* From 67f7904d549ff89a8eba3664aced74fc4df15328 Mon Sep 17 00:00:00 2001 From: Eric Flumerfelt Date: Wed, 24 Jan 2024 13:42:57 -0600 Subject: [PATCH 081/213] Use "trig" qualifier to disable Geant4-related build items. Add install of data directories --- CMakeLists.txt | 15 ++++++++++-- CRVConditions/CMakeLists.txt | 2 ++ CalPatRec/CMakeLists.txt | 2 ++ CaloConditions/CMakeLists.txt | 2 ++ CaloFilters/CMakeLists.txt | 2 ++ ConditionsService/CMakeLists.txt | 2 ++ DbService/CMakeLists.txt | 2 ++ GlobalConstantsService/CMakeLists.txt | 2 ++ Mu2eKinKal/CMakeLists.txt | 2 ++ Mu2eUtilities/CMakeLists.txt | 2 +- TrackerConditions/CMakeLists.txt | 2 ++ Trigger/CMakeLists.txt | 2 ++ TrkDiag/CMakeLists.txt | 2 ++ TrkHitReco/CMakeLists.txt | 1 + TrkPatRec/CMakeLists.txt | 2 ++ ups/product_deps | 33 +++++++++++---------------- 16 files changed, 52 insertions(+), 23 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 75522d46e9..6869548c62 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -15,6 +15,16 @@ cet_set_compiler_flags(DIAGS VIGILANT -Wno-unused-parameter -Wno-type-limits -Wno-ignored-qualifiers -Wno-unused-but-set-parameter -Wno-extra -Wno-non-virtual-dtor -Wno-implicit-fallthrough -Wno-deprecated-copy ) +if(DEFINED Offline_UPS_QUALIFIER_STRING) + string(FIND ${Offline_UPS_QUALIFIER_STRING} "trig" TRIG_BUILD) + # TRIG_BUILD will be -1 if trig qualifier not found + if(${TRIG_BUILD} GREATER_EQUAL 0) + set(WITH_G4 FALSE) + else() + set(WITH_G4 TRUE) + endif() +endif() + message("WITH_G4 SET TO ${WITH_G4}") include_directories(${CMAKE_CURRENT_SOURCE_DIR}/..) @@ -30,11 +40,12 @@ find_package(artdaq_core_mu2e REQUIRED EXPORT) if( ${WITH_G4} ) message("--> ADDING G4 LIBS") find_package(Geant4 REQUIRED EXPORT) -endif() # TODO: Find or implement FindCRY.cmake include_directories($ENV{CRYHOME}/src) link_directories($ENV{CRYHOME}/lib) +endif() + # BTrk and KinKal have non-standard Find*.cmake... include_directories($ENV{KINKAL_INC}) @@ -84,7 +95,6 @@ add_subdirectory(DbService) add_subdirectory(DbTables) add_subdirectory(DetectorSolenoidGeom) add_subdirectory(EventDisplay) -add_subdirectory(EventGenerator) add_subdirectory(EventMixing) add_subdirectory(ExternalShieldingGeom) add_subdirectory(ExtinctionMonitorFNAL) @@ -104,6 +114,7 @@ add_subdirectory(Mu2e) add_subdirectory(Mu2eBTrk) if( ${WITH_G4} ) message("---> ADDING G4 DIRS") + add_subdirectory(EventGenerator) add_subdirectory(Mu2eG4) add_subdirectory(Mu2eG4Helper) endif() diff --git a/CRVConditions/CMakeLists.txt b/CRVConditions/CMakeLists.txt index bf81dd1926..d5e7bc1fa6 100644 --- a/CRVConditions/CMakeLists.txt +++ b/CRVConditions/CMakeLists.txt @@ -16,6 +16,8 @@ cet_make_library( configure_file(${CMAKE_CURRENT_SOURCE_DIR}/fcl/prolog.fcl ${CURRENT_BINARY_DIR} fcl/prolog.fcl) configure_file(${CMAKE_CURRENT_SOURCE_DIR}/data/nominal.txt ${CURRENT_BINARY_DIR} data/nominal.txt) +install(DIRECTORY data DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/Offline/CRVConditions) + install_source(SUBDIRS src) install_headers(USE_PROJECT_NAME SUBDIRS inc) install_fhicl(SUBDIRS fcl SUBDIRNAME Offline/CRVConditions/fcl) diff --git a/CalPatRec/CMakeLists.txt b/CalPatRec/CMakeLists.txt index 2e82fd12cf..50de48e302 100644 --- a/CalPatRec/CMakeLists.txt +++ b/CalPatRec/CMakeLists.txt @@ -222,6 +222,8 @@ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/data/v5_7_7/MLP_weights_logfcons_4_ex configure_file(${CMAKE_CURRENT_SOURCE_DIR}/data/v5_7_7/MLP_weights_trkpatrec_logfcons_1_uni.xml ${CURRENT_BINARY_DIR} data/v5_7_7/MLP_weights_trkpatrec_logfcons_1_uni.xml) configure_file(${CMAKE_CURRENT_SOURCE_DIR}/data/v5_7_7/tpr_qual_logfcons_2_exp.tab ${CURRENT_BINARY_DIR} data/v5_7_7/tpr_qual_logfcons_2_exp.tab) +install(DIRECTORY data DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/Offline/CalPatRec) + install_source(SUBDIRS src) install_headers(USE_PROJECT_NAME SUBDIRS inc) install_fhicl(SUBDIRS fcl SUBDIRNAME Offline/CalPatRec/fcl) diff --git a/CaloConditions/CMakeLists.txt b/CaloConditions/CMakeLists.txt index 580f8bfd9e..bf75c1502e 100644 --- a/CaloConditions/CMakeLists.txt +++ b/CaloConditions/CMakeLists.txt @@ -19,6 +19,8 @@ cet_make_library( configure_file(${CMAKE_CURRENT_SOURCE_DIR}/fcl/prolog.fcl ${CURRENT_BINARY_DIR} fcl/prolog.fcl) configure_file(${CMAKE_CURRENT_SOURCE_DIR}/data/nominal.txt ${CURRENT_BINARY_DIR} data/nominal.txt) +install(DIRECTORY data DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/Offline/CaloConditions) + install_source(SUBDIRS src) install_headers(USE_PROJECT_NAME SUBDIRS inc) install_fhicl(SUBDIRS fcl SUBDIRNAME Offline/CaloConditions/fcl) diff --git a/CaloFilters/CMakeLists.txt b/CaloFilters/CMakeLists.txt index 5efa4a8a52..60b8b5e1b0 100644 --- a/CaloFilters/CMakeLists.txt +++ b/CaloFilters/CMakeLists.txt @@ -75,5 +75,7 @@ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/data/ce_bkg_20_BDT.weights.xml ${CURR configure_file(${CMAKE_CURRENT_SOURCE_DIR}/data/ce_bkg_ecal_20_BDT.weights.xml ${CURRENT_BINARY_DIR} data/ce_bkg_ecal_20_BDT.weights.xml) configure_file(${CMAKE_CURRENT_SOURCE_DIR}/data/CE_NN_ReLU.weights.xml ${CURRENT_BINARY_DIR} data/CE_NN_ReLU.weights.xml) +install(DIRECTORY data DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/Offline/CaloFilters) + install_source(SUBDIRS src) install_fhicl(SUBDIRS fcl SUBDIRNAME Offline/CaloFilters/fcl) diff --git a/ConditionsService/CMakeLists.txt b/ConditionsService/CMakeLists.txt index a221152594..274b485939 100644 --- a/ConditionsService/CMakeLists.txt +++ b/ConditionsService/CMakeLists.txt @@ -49,5 +49,7 @@ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/data/v5_7_9/pid_muo_dt.tbl ${C configure_file(${CMAKE_CURRENT_SOURCE_DIR}/data/v5_7_9/pid_muo_ep_vs_path.tbl ${CURRENT_BINARY_DIR} data/v5_7_9/pid_muo_ep_vs_path.tbl ) configure_file(${CMAKE_CURRENT_SOURCE_DIR}/data/v5_7_9/pid_muo_xdrds.tbl ${CURRENT_BINARY_DIR} data/v5_7_9/pid_muo_xdrds.tbl ) +install(DIRECTORY data DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/Offline/ConditionsService) + install_source(SUBDIRS src) install_headers(USE_PROJECT_NAME SUBDIRS inc) diff --git a/DbService/CMakeLists.txt b/DbService/CMakeLists.txt index a1c91fbc9d..f8bd63f082 100644 --- a/DbService/CMakeLists.txt +++ b/DbService/CMakeLists.txt @@ -53,6 +53,8 @@ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/fcl/prolog.fcl ${CURRENT_BINARY_DIR} configure_file(${CMAKE_CURRENT_SOURCE_DIR}/data/connections.txt ${CURRENT_BINARY_DIR} data/connections.txt) configure_file(${CMAKE_CURRENT_SOURCE_DIR}/data/create.sql ${CURRENT_BINARY_DIR} data/create.sql) +install(DIRECTORY data DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/Offline/DbService) + install_source(SUBDIRS src) install_headers(USE_PROJECT_NAME SUBDIRS inc) install_fhicl(SUBDIRS fcl SUBDIRNAME Offline/DbService/fcl) diff --git a/GlobalConstantsService/CMakeLists.txt b/GlobalConstantsService/CMakeLists.txt index 006ea3546b..f1e0f428e5 100644 --- a/GlobalConstantsService/CMakeLists.txt +++ b/GlobalConstantsService/CMakeLists.txt @@ -23,5 +23,7 @@ cet_build_plugin(GlobalConstantsService art::service configure_file(${CMAKE_CURRENT_SOURCE_DIR}/data/globalConstants_01.txt ${CURRENT_BINARY_DIR} data/globalConstants_01.txt) configure_file(${CMAKE_CURRENT_SOURCE_DIR}/data/ParticleList.txt ${CURRENT_BINARY_DIR} data/ParticleList.txt) +install(DIRECTORY data DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/Offline/GlobalConstantsService) + install_source(SUBDIRS src) install_headers(USE_PROJECT_NAME SUBDIRS inc) diff --git a/Mu2eKinKal/CMakeLists.txt b/Mu2eKinKal/CMakeLists.txt index 411ed12e34..e4d9f214bc 100644 --- a/Mu2eKinKal/CMakeLists.txt +++ b/Mu2eKinKal/CMakeLists.txt @@ -92,6 +92,8 @@ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/data/TrainSign_Stage1.dat ${CURRENT configure_file(${CMAKE_CURRENT_SOURCE_DIR}/fcl/prolog.fcl ${CURRENT_BINARY_DIR} fcl/prolog.fcl COPYONLY) configure_file(${CMAKE_CURRENT_SOURCE_DIR}/fcl/prolog_trigger.fcl ${CURRENT_BINARY_DIR} fcl/prolog_trigger.fcl COPYONLY) +install(DIRECTORY data DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/Offline/Mu2eKinKal) + install_source(SUBDIRS src) install_headers(USE_PROJECT_NAME SUBDIRS inc) install_fhicl(SUBDIRS fcl SUBDIRNAME Offline/Mu2eKinKal/fcl) diff --git a/Mu2eUtilities/CMakeLists.txt b/Mu2eUtilities/CMakeLists.txt index a5a14f3e7e..be586a2285 100644 --- a/Mu2eUtilities/CMakeLists.txt +++ b/Mu2eUtilities/CMakeLists.txt @@ -80,7 +80,7 @@ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/data/potTimingDistribution_20160511.t configure_file(${CMAKE_CURRENT_SOURCE_DIR}/data/potTimingDistribution_38ms.txt ${CURRENT_BINARY_DIR} data/potTimingDistribution_38ms.txt COPYONLY) configure_file(${CMAKE_CURRENT_SOURCE_DIR}/data/potTimingDistribution_avg.txt ${CURRENT_BINARY_DIR} data/potTimingDistribution_avg.txt COPYONLY) - +install(DIRECTORY data DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/Offline/Mu2eUtilities) install_source(SUBDIRS src) install_headers(USE_PROJECT_NAME SUBDIRS inc) diff --git a/TrackerConditions/CMakeLists.txt b/TrackerConditions/CMakeLists.txt index 9f6ca543ee..86e777771d 100644 --- a/TrackerConditions/CMakeLists.txt +++ b/TrackerConditions/CMakeLists.txt @@ -48,6 +48,8 @@ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/fcl/testProditions.fcl ${CURRENT_BI configure_file(${CMAKE_CURRENT_SOURCE_DIR}/fcl/testTrackerAlignment.fcl ${CURRENT_BINARY_DIR} fcl/testTrackerAlignment.fcl COPYONLY) configure_file(${CMAKE_CURRENT_SOURCE_DIR}/fcl/testTrackerStatus.fcl ${CURRENT_BINARY_DIR} fcl/testTrackerStatus.fcl COPYONLY) +install(DIRECTORY data DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/Offline/TrackerConditions) + install_source(SUBDIRS src) install_headers(USE_PROJECT_NAME SUBDIRS inc) install_fhicl(SUBDIRS fcl SUBDIRNAME Offline/TrackerConditions/fcl) diff --git a/Trigger/CMakeLists.txt b/Trigger/CMakeLists.txt index 2c597cf56b..9e40ef2db9 100644 --- a/Trigger/CMakeLists.txt +++ b/Trigger/CMakeLists.txt @@ -40,5 +40,7 @@ cet_build_plugin(ReadTriggerInfo art::module configure_file(${CMAKE_CURRENT_SOURCE_DIR}/fcl/prolog_trigger.fcl ${CURRENT_BINARY_DIR} fcl/prolog_trigger.fcl COPYONLY) +install(DIRECTORY data DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/Offline/Trigger) + install_source(SUBDIRS src) install_fhicl(SUBDIRS fcl SUBDIRNAME Offline/Trigger/fcl) diff --git a/TrkDiag/CMakeLists.txt b/TrkDiag/CMakeLists.txt index b6953253dd..60162f33d1 100644 --- a/TrkDiag/CMakeLists.txt +++ b/TrkDiag/CMakeLists.txt @@ -192,6 +192,8 @@ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/data/TrkCaloHitPID.weights.xml ${CU configure_file(${CMAKE_CURRENT_SOURCE_DIR}/fcl/prolog.fcl ${CURRENT_BINARY_DIR} fcl/prolog.fcl COPYONLY) +install(DIRECTORY data DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/Offline/TrkDiag) + install_source(SUBDIRS src) install_headers(USE_PROJECT_NAME SUBDIRS inc) install_fhicl(SUBDIRS fcl SUBDIRNAME Offline/TrkDiag/fcl) diff --git a/TrkHitReco/CMakeLists.txt b/TrkHitReco/CMakeLists.txt index a282ae4e51..0e13d87f1c 100644 --- a/TrkHitReco/CMakeLists.txt +++ b/TrkHitReco/CMakeLists.txt @@ -106,6 +106,7 @@ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/fcl/epilog_stereo.fcl ${CURRENT_BIN configure_file(${CMAKE_CURRENT_SOURCE_DIR}/fcl/prolog.fcl ${CURRENT_BINARY_DIR} fcl/prolog.fcl COPYONLY) configure_file(${CMAKE_CURRENT_SOURCE_DIR}/fcl/prolog_trigger.fcl ${CURRENT_BINARY_DIR} fcl/prolog_trigger.fcl COPYONLY) +install(DIRECTORY data DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/Offline/TrkHitReco) install_source(SUBDIRS src inc) install_headers(USE_PROJECT_NAME SUBDIRS inc) diff --git a/TrkPatRec/CMakeLists.txt b/TrkPatRec/CMakeLists.txt index 204b12811c..6ed685eae0 100644 --- a/TrkPatRec/CMakeLists.txt +++ b/TrkPatRec/CMakeLists.txt @@ -171,6 +171,8 @@ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/fcl/Particle.fcl ${CURRENT_BINARY_D configure_file(${CMAKE_CURRENT_SOURCE_DIR}/fcl/prolog.fcl ${CURRENT_BINARY_DIR} fcl/prolog.fcl COPYONLY) configure_file(${CMAKE_CURRENT_SOURCE_DIR}/fcl/prolog_trigger.fcl ${CURRENT_BINARY_DIR} fcl/prolog_trigger.fcl COPYONLY) +install(DIRECTORY data DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/Offline/TrkPatRec) + install_source(SUBDIRS src) install_headers(USE_PROJECT_NAME SUBDIRS inc) install_fhicl(SUBDIRS fcl SUBDIRNAME Offline/TrkPatRec/fcl) diff --git a/ups/product_deps b/ups/product_deps index 62fb02bce0..691e1e3709 100644 --- a/ups/product_deps +++ b/ups/product_deps @@ -311,11 +311,17 @@ end_product_list # case it is optional. # qualifier art_root_io gallery geant4 xerces_c artdaq_core_mu2e BTrk KinKal cry gsl -e28:s126:trig:debug e28:debug e28:debug e28:mt:debug e28 e28:s126:debug e28:p3915:debug e28:p3915:debug e28:debug -nq- -e28:s126:trig:prof e28:prof e28:prof e28:mt:prof e28 e28:s126:prof e28:p3915:prof e28:p3915:prof e28:prof -nq- +e28:s126:trig:debug e28:debug e28:debug - e28 e28:s126:debug e28:p3915:debug e28:p3915:debug - -nq- +e28:s126:trig:prof e28:prof e28:prof - e28 e28:s126:prof e28:p3915:prof e28:p3915:prof - -nq- -e28:s124:trig:debug e28:debug e28:debug e28:mt:debug e28 e28:s124:debug e28:p3915:debug e28:p3915:debug e28:debug -nq- -e28:s124:trig:prof e28:prof e28:prof e28:mt:prof e28 e28:s124:prof e28:p3915:prof e28:p3915:prof e28:prof -nq- +e28:s124:trig:debug e28:debug e28:debug - e28 e28:s124:debug e28:p3915:debug e28:p3915:debug - -nq- +e28:s124:trig:prof e28:prof e28:prof - e28 e28:s124:prof e28:p3915:prof e28:p3915:prof - -nq- + +e28:s126:debug e28:debug e28:debug e28:mt:debug e28 e28:s126:debug e28:p3915:debug e28:p3915:debug e28:debug -nq- +e28:s126:prof e28:prof e28:prof e28:mt:prof e28 e28:s126:prof e28:p3915:prof e28:p3915:prof e28:prof -nq- + +e28:s124:debug e28:debug e28:debug e28:mt:debug e28 e28:s124:debug e28:p3915:debug e28:p3915:debug e28:debug -nq- +e28:s124:prof e28:prof e28:prof e28:mt:prof e28 e28:s124:prof e28:p3915:prof e28:p3915:prof e28:prof -nq- end_qualifier_list #################################### @@ -326,22 +332,9 @@ end_qualifier_list # be copied to the table file verbatim. table_fragment_begin -# envSet (MU2E_BASE_RELEASE, \${OFFLINE_DIR} ) -# envSet (MU2E_SEARCH_PATH, \${OFFLINE_DIR}/config:\${MU2E_DATA_PATH}:/cvmfs/mu2e.opensciencegrid.org/DataFiles ) -# envSet (FHICL_FILE_PATH, \${OFFLINE_DIR}/config:\${OFFLINE_DIR}/config/Offline/fcl ) -# envSet (OFFLINE_VERSION, \${UPS_PROD_VERSION} ) -# pathAppend( ROOT_INCLUDE_PATH, \${OFFLINE_INC}) - -# exeActionRequired(GetFQDir) -# envSet (OFFLINE_LIB, \${OFFLINE_DIR}/\${OFFLINE_FQ}/lib ) -# pathAppend( CET_PLUGIN_PATH, \${OFFLINE_LIB} ) -# pathPrepend(PATH, "\${OFFLINE_DIR}/\${OFFLINE_FQ}/bin") - -# if ( test \`uname\` = "Darwin" ) -# pathPrepend(DYLD_LIBRARY_PATH, \${\${UPS_PROD_NAME_UC}_LIB}) -# else() -# pathPrepend(LD_LIBRARY_PATH, \${\${UPS_PROD_NAME_UC}_LIB}) -# endif ( test \`uname\` = "Darwin" ) +envSet (MU2E_BASE_RELEASE, \${OFFLINE_DIR} ) +envPrepend(MU2E_DATA_PATH, \${OFFLINE_DIR}/share:/cvmfs/mu2e.opensciencegrid.org/DataFiles) +envPrepend (MU2E_SEARCH_PATH, \${OFFLINE_DIR}/fcl:\${MU2E_DATA_PATH} ) table_fragment_end #################################### From 3d25abbd1c224aae95f00b4cedb9f00fc37b483a Mon Sep 17 00:00:00 2001 From: Eric Flumerfelt Date: Thu, 25 Jan 2024 14:31:00 -0600 Subject: [PATCH 082/213] Just symlink Offline dir, don't hope that users have named the parent directory correctly (Spack doesn't, we get 'spack-src' instead) --- CMakeLists.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 6869548c62..b3410a2a2d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -27,7 +27,8 @@ endif() message("WITH_G4 SET TO ${WITH_G4}") -include_directories(${CMAKE_CURRENT_SOURCE_DIR}/..) +message("Creating link from ${CMAKE_CURRENT_SOURCE_DIR} to ${CMAKE_CURRENT_SOURCE_DIR}/Offline to satisfy includes") +file(CREATE_LINK ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/Offline SYMBOLIC) find_package(art_root_io REQUIRED EXPORT) find_package(GSL REQUIRED EXPORT) From 206c20c915ebb5b827f9e345ead3d0b06a7a55a9 Mon Sep 17 00:00:00 2001 From: eflumerf <61473357+eflumerf@users.noreply.github.com> Date: Fri, 26 Jan 2024 10:59:10 -0600 Subject: [PATCH 083/213] Remove MU2E_BASE_PATH definition --- ups/product_deps | 1 - 1 file changed, 1 deletion(-) diff --git a/ups/product_deps b/ups/product_deps index 691e1e3709..042258a5c7 100644 --- a/ups/product_deps +++ b/ups/product_deps @@ -332,7 +332,6 @@ end_qualifier_list # be copied to the table file verbatim. table_fragment_begin -envSet (MU2E_BASE_RELEASE, \${OFFLINE_DIR} ) envPrepend(MU2E_DATA_PATH, \${OFFLINE_DIR}/share:/cvmfs/mu2e.opensciencegrid.org/DataFiles) envPrepend (MU2E_SEARCH_PATH, \${OFFLINE_DIR}/fcl:\${MU2E_DATA_PATH} ) From 8cd1ac9dadd2d1a384e8e60181399319cbd4fe8a Mon Sep 17 00:00:00 2001 From: sophieMu2e Date: Tue, 30 Jan 2024 08:29:10 -0600 Subject: [PATCH 084/213] DIO tail study --- EventGenerator/src/DIOGenerator_tool.cc | 20 +++-- EventGenerator/src/SConscript | 16 ++++ .../src/SingleProcessGenerator_module.cc | 81 ++++++++++++++++--- 3 files changed, 98 insertions(+), 19 deletions(-) diff --git a/EventGenerator/src/DIOGenerator_tool.cc b/EventGenerator/src/DIOGenerator_tool.cc index 2fbb0028bf..01a2b47cb8 100644 --- a/EventGenerator/src/DIOGenerator_tool.cc +++ b/EventGenerator/src/DIOGenerator_tool.cc @@ -14,6 +14,7 @@ #include "Offline/GlobalConstantsService/inc/PhysicsParams.hh" #include "fhiclcpp/types/DelegatedParameter.h" +#include "fhiclcpp/types/Atom.h" namespace mu2e { class DIOGenerator : public ParticleGeneratorTool { @@ -23,13 +24,15 @@ namespace mu2e { using Comment=fhicl::Comment; fhicl::DelegatedParameter spectrum{Name("spectrum"), Comment("Parameters for BinnedSpectrum)")}; + fhicl::Atom rad_min{Name("rad_min"),0}; }; typedef art::ToolConfigTable Parameters; explicit DIOGenerator(Parameters const& conf) : _pdgId(PDGCode::e_minus), _mass(GlobalConstantsHandle()->particle(_pdgId).mass()), - _spectrum(BinnedSpectrum(conf().spectrum.get())) + _spectrum(BinnedSpectrum(conf().spectrum.get())), + _rad_min(conf().rad_min()) {} std::vector generate() override; @@ -43,8 +46,10 @@ namespace mu2e { private: PDGCode::type _pdgId; double _mass; - BinnedSpectrum _spectrum; + double _rad_min; + + RandomUnitSphere* _randomUnitSphere; CLHEP::RandGeneral* _randSpectrum; @@ -53,7 +58,7 @@ namespace mu2e { std::vector DIOGenerator::generate() { std::vector res; - + double energy = _spectrum.sample(_randSpectrum->fire()); const double p = energy * sqrt(1 - std::pow(_mass/energy,2)); @@ -61,19 +66,22 @@ namespace mu2e { CLHEP::HepLorentzVector fourmom(p3, energy); ParticleGeneratorTool::Kinematic k{_pdgId, ProcessCode::mu2eMuonDecayAtRest, fourmom}; + res.emplace_back(k); - return res; } void DIOGenerator::generate(std::unique_ptr& out, const IO::StoppedParticleF& stop) { - const CLHEP::Hep3Vector pos(stop.x, stop.y, stop.z); + const CLHEP::Hep3Vector pos(stop.x, stop.y, stop.z);//position from stopped muon const auto daughters = generate(); + std::cout<<"In DIO Tools Generator "<emplace_back(d.pdgId, GenId::DIOGenTool, pos, - d.fourmom, + d.fourmom, //CLHEP::HepLorentzVector type stop.t); } } diff --git a/EventGenerator/src/SConscript b/EventGenerator/src/SConscript index c50018304a..7f0a3846c9 100644 --- a/EventGenerator/src/SConscript +++ b/EventGenerator/src/SConscript @@ -26,6 +26,14 @@ mainlib = helper.make_mainlib ( [ 'mu2e_GeomPrimitives', 'mu2e_ConfigTools', 'mu2e_GeneralUtilities', + 'mu2e_BFieldGeom', + 'mu2e_KinKalGeom', + 'KinKal_Fit', + 'KinKal_Trajectory', + 'KinKal_Detector', + 'KinKal_MatEnv', + 'KinKal_Geometry', + 'KinKal_General', 'mu2e_GlobalConstantsService', 'mu2e_Mu2eUtilities', 'mu2e_ExtinctionMonitorFNAL_Geometry', @@ -70,6 +78,7 @@ helper.make_plugins( [ mainlib, 'mu2e_ProductionTargetGeom', 'mu2e_ProtonBeamDumpGeom', 'mu2e_MCDataProducts', + 'mu2e_BFieldGeom', 'mu2e_CalorimeterGeom', 'mu2e_DataProducts', 'mu2e_ConfigTools', @@ -91,6 +100,13 @@ helper.make_plugins( [ mainlib, 'cetlib', 'cetlib_except', 'CLHEP', + 'mu2e_KinKalGeom', + 'KinKal_Fit', + 'KinKal_Trajectory', + 'KinKal_Detector', + 'KinKal_MatEnv', + 'KinKal_Geometry', + 'KinKal_General', rootlibs, 'boost_filesystem', 'gsl', diff --git a/EventGenerator/src/SingleProcessGenerator_module.cc b/EventGenerator/src/SingleProcessGenerator_module.cc index a5bbc4da10..a1f1b797ea 100644 --- a/EventGenerator/src/SingleProcessGenerator_module.cc +++ b/EventGenerator/src/SingleProcessGenerator_module.cc @@ -15,7 +15,7 @@ #include "fhiclcpp/types/Atom.h" #include "fhiclcpp/types/DelegatedParameter.h" #include "fhiclcpp/ParameterSet.h" - +#include "art_root_io/TFileService.h" #include "messagefacility/MessageLogger/MessageLogger.h" #include "art/Framework/Core/EDProducer.h" @@ -30,7 +30,13 @@ #include "Offline/MCDataProducts/inc/StageParticle.hh" #include "Offline/Mu2eUtilities/inc/simParticleList.hh" #include "Offline/EventGenerator/inc/ParticleGeneratorTool.hh" +#include "Offline/GeometryService/inc/DetectorSystem.hh" + +#include "KinKal/Trajectory/LoopHelix.hh" +#include "Offline/BFieldGeom/inc/BFieldManager.hh" +#include "Offline/GeometryService/inc/GeomHandle.hh" +#include "TTree.h" namespace mu2e { //================================================================ class SingleProcessGenerator : public art::EDProducer { @@ -45,15 +51,15 @@ namespace mu2e { Comment("Material determines muon life time, capture fraction, and particle spectra.\n" "Only aluminum (Al) is supported, emisson spectra for other materials are not implemented.\n"),"Al" }; fhicl::Atom pdgId{Name("pdgId"),Comment("pdg id of daughter particle"),PDGCode::e_minus}; - fhicl::DelegatedParameter decayProducts{Name("decayProducts"), Comment("spectrum (and variables) to be generated")}; fhicl::Atom verbosity{Name("verbosity"),0}; - + fhicl::Atom time_min{Name("time_min"),350}; + fhicl::Atom time_max{Name("time_max"),1700}; }; using Parameters= art::EDProducer::Table; explicit SingleProcessGenerator(const Parameters& conf); - + virtual void beginJob(); virtual void produce(art::Event& event) override; //---------------------------------------------------------------- @@ -61,6 +67,8 @@ namespace mu2e { double muonLifeTime_; art::ProductToken const simsToken_; unsigned verbosity_; + double time_min_; + double time_max_; int pdgId_; @@ -70,14 +78,32 @@ namespace mu2e { std::unique_ptr Generator_; void addParticles(StageParticleCollection* output, art::Ptr mustop, double time, ParticleGeneratorTool* gen); + TTree* genTree; + Float_t _maxr; + Float_t _momT; + Float_t _posT; + Float_t _cosTheta; + Float_t _time; }; + void SingleProcessGenerator::beginJob(){ + art::ServiceHandle tfs; + genTree = tfs->make("GenAna", "GenAna"); + genTree->Branch("maxr", &_maxr, "maxr/F"); + genTree->Branch("momT", &_momT, "momT/F"); + genTree->Branch("posT", &_posT, "posT/F"); + genTree->Branch("cosTheta", &_cosTheta, "cosTheta/F"); + genTree->Branch("time", &_time, "time/F"); + } + //================================================================ SingleProcessGenerator::SingleProcessGenerator(const Parameters& conf) : EDProducer{conf} , muonLifeTime_{GlobalConstantsHandle()->getDecayTime(conf().stoppingTargetMaterial())} , simsToken_{consumes(conf().inputSimParticles())} , verbosity_{conf().verbosity()} + , time_min_{conf().time_min()} + , time_max_{conf().time_max()} , pdgId_{conf().pdgId()} , eng_{createEngine(art::ServiceHandle()->getSeed())} , randExp_{eng_} @@ -97,6 +123,7 @@ namespace mu2e { if(pdgId_==PDGCode::e_plus) { muonLifeTime_=0; //decay time already included for stopped muon(+) FIXME!!! } + } //================================================================ @@ -122,15 +149,43 @@ namespace mu2e { { auto daughters = gen->generate(); for(const auto& d: daughters) { - - output->emplace_back(mustop, - d.creationCode, - d.pdgId, - mustop->endPosition(), - d.fourmom, - time - ); - + + if(time > time_min_ and time < time_max_){ + + // make momentum and position vectors + GeomHandle det; + ROOT::Math::XYZVectorF pos = XYZVectorF(det->toDetector(mustop->endPosition())); + ROOT::Math::XYZTVector pos0(pos.x(), pos.y(), pos.z(), time); + ROOT::Math::PxPyPzMVector mom0(d.fourmom.x(), d.fourmom.y(), d.fourmom.z(), d.fourmom.t()); + + // extract charge + int charge = -1; + if(pdgId_==PDGCode::e_plus) charge = 1; + + // extact field + GeomHandle bfmgr; + XYZVectorF pos3Vec = XYZVectorF(mustop->endPosition().x(),mustop->endPosition().y(),mustop->endPosition().z()); + ROOT::Math::XYZVector bnom(bfmgr->getBField(pos3Vec).x(),bfmgr->getBField(pos3Vec).y(),bfmgr->getBField(pos3Vec).z()); + + // make the loophelix + KinKal::LoopHelix lh(pos0, mom0, charge, bnom); + // calculate rmax and add maxr to siminfo + _maxr =sqrt(lh.cx()*lh.cx()+lh.cy()*lh.cy())+fabs(lh.rad()); + + _momT = sqrt(mom0.x()*mom0.x() + mom0.y()*mom0.y()); + _posT = sqrt(pos.x()*pos.x() + pos.y()*pos.y()); + _cosTheta = cos(atan2(_momT,mom0.z())); + _time = time; + + output->emplace_back(mustop, + d.creationCode, + d.pdgId, + mustop->endPosition(), + d.fourmom, + time + ); + } + genTree->Fill(); } } From 81a944930f89ebd36b877e0aa5866341accbcf98 Mon Sep 17 00:00:00 2001 From: Ray Culbertson Date: Tue, 30 Jan 2024 09:17:26 -0600 Subject: [PATCH 085/213] create sim version of tracker alignment prodition and db tables --- DbTables/inc/TrkAlignElement.hh | 7 +++- DbTables/inc/TrkAlignElementSim.hh | 36 ++++++++++++++++++++ DbTables/inc/TrkAlignStraw.hh | 5 +-- DbTables/inc/TrkAlignStrawSim.hh | 21 ++++++++++++ DbTables/src/DbTableFactory.cc | 10 ++++++ ProditionsService/fcl/prolog.fcl | 1 + ProditionsService/inc/ProditionsHandle.hh | 4 +-- ProditionsService/inc/ProditionsService.hh | 2 ++ ProditionsService/src/ProditionsService.cc | 6 +++- TrackerConditions/fcl/prolog.fcl | 5 +++ TrackerConditions/inc/AlignedTrackerCache.hh | 27 ++++++++++----- 11 files changed, 109 insertions(+), 15 deletions(-) create mode 100644 DbTables/inc/TrkAlignElementSim.hh create mode 100644 DbTables/inc/TrkAlignStrawSim.hh diff --git a/DbTables/inc/TrkAlignElement.hh b/DbTables/inc/TrkAlignElement.hh index 0bd5de70f7..6094655861 100644 --- a/DbTables/inc/TrkAlignElement.hh +++ b/DbTables/inc/TrkAlignElement.hh @@ -80,6 +80,8 @@ class TrkAlignPanel : public TrkAlignElement { constexpr static const char* cxname = "TrkAlignPanel"; TrkAlignPanel() : TrkAlignElement(cxname, "trk.alignpanel", StrawId::_nupanels) {} + TrkAlignPanel(const char* name, const char* dbname) : + TrkAlignElement(name, dbname, StrawId::_nupanels) {} }; class TrkAlignPlane : public TrkAlignElement { @@ -87,12 +89,15 @@ class TrkAlignPlane : public TrkAlignElement { constexpr static const char* cxname = "TrkAlignPlane"; TrkAlignPlane() : TrkAlignElement(cxname, "trk.alignplane", StrawId::_nplanes) {} + TrkAlignPlane(const char* name, const char* dbname) : + TrkAlignElement(name, dbname, StrawId::_nplanes) {} }; class TrkAlignTracker : public TrkAlignElement { public: constexpr static const char* cxname = "TrkAlignTracker"; - TrkAlignTracker() : TrkAlignElement(cxname, "trk.aligntracker", size_t(1)) {} + TrkAlignTracker() : TrkAlignElement(cxname, "trk.aligntracker", size_t(1)) {} TrkAlignTracker(const char* name, const char* dbname) : + TrkAlignElement(name, dbname, size_t(1)) {} }; } // namespace mu2e diff --git a/DbTables/inc/TrkAlignElementSim.hh b/DbTables/inc/TrkAlignElementSim.hh new file mode 100644 index 0000000000..2729266731 --- /dev/null +++ b/DbTables/inc/TrkAlignElementSim.hh @@ -0,0 +1,36 @@ +// +// Alignment tables for tracker elements for simulation +// derived from the reco version of the tables, and have the same structure +// + +#ifndef DbTables_TrkAlignElementSim_hh +#define DbTables_TrkAlignElementSim_hh + +#include "Offline/DbTables/inc/TrkAlignElement.hh" + +namespace mu2e { + + +// unique classes for Db usage: not sure why this is needed +class TrkAlignPanelSim : public TrkAlignPanel { + public: + constexpr static const char* cxname = "TrkAlignPanelSim"; + TrkAlignPanelSim() : + TrkAlignPanel(cxname, "trk.alignpanelsim") {} +}; + +class TrkAlignPlaneSim : public TrkAlignPlane { + public: + constexpr static const char* cxname = "TrkAlignPlaneSim"; + TrkAlignPlaneSim() : + TrkAlignPlane(cxname, "trk.alignplanesim") {} +}; + +class TrkAlignTrackerSim : public TrkAlignTracker { + public: + constexpr static const char* cxname = "TrkAlignTrackerSim"; + TrkAlignTrackerSim() : TrkAlignTracker(cxname, "trk.aligntrackersim") {} +}; + +} // namespace mu2e +#endif diff --git a/DbTables/inc/TrkAlignStraw.hh b/DbTables/inc/TrkAlignStraw.hh index adf4b97ba5..716c0d5238 100644 --- a/DbTables/inc/TrkAlignStraw.hh +++ b/DbTables/inc/TrkAlignStraw.hh @@ -19,8 +19,9 @@ class TrkAlignStraw : public DbTable { typedef std::shared_ptr cptr_t; constexpr static const char* cxname = "TrkAlignStraw"; - TrkAlignStraw() : - DbTable(cxname, "trk.alignstraw", + TrkAlignStraw() : TrkAlignStraw(cxname, "trk.alignstraw") {} + TrkAlignStraw(const char* name, const char* dbname) : + DbTable(name, dbname, "index,StrawId,wire_cal_dV,wire_cal_dW,wire_hv_dV,wire_hv_dW," "straw_cal_dV,straw_cal_dW,straw_hv_dV,straw_hv_dW") { } // this last should come from the Row class FIXME! diff --git a/DbTables/inc/TrkAlignStrawSim.hh b/DbTables/inc/TrkAlignStrawSim.hh new file mode 100644 index 0000000000..9aa9e4abf5 --- /dev/null +++ b/DbTables/inc/TrkAlignStrawSim.hh @@ -0,0 +1,21 @@ +#ifndef DbTables_TrkAlignStrawSim_hh +#define DbTables_TrkAlignStrawSim_hh + +#include "Offline/DbTables/inc/DbTable.hh" +#include "Offline/DbTables/inc/TrkStrawEndAlign.hh" +#include "CLHEP/Vector/ThreeVector.h" +#include +#include +#include +#include + +namespace mu2e { + +class TrkAlignStrawSim : public TrkAlignStraw { + public: + constexpr static const char* cxname = "TrkAlignStrawSim"; + TrkAlignStrawSim() : TrkAlignStraw(cxname,"trk.alignstrawsim") {} +}; + +} // namespace mu2e +#endif diff --git a/DbTables/src/DbTableFactory.cc b/DbTables/src/DbTableFactory.cc index e94f8d9c0c..3f201f2913 100644 --- a/DbTables/src/DbTableFactory.cc +++ b/DbTables/src/DbTableFactory.cc @@ -18,7 +18,9 @@ #include "Offline/DbTables/inc/CalCosmicT0Align.hh" #include "Offline/DbTables/inc/TrkAlignElement.hh" +#include "Offline/DbTables/inc/TrkAlignElementSim.hh" #include "Offline/DbTables/inc/TrkAlignStraw.hh" +#include "Offline/DbTables/inc/TrkAlignStrawSim.hh" #include "Offline/DbTables/inc/TrkDelayPanel.hh" #include "Offline/DbTables/inc/TrkDelayRStraw.hh" #include "Offline/DbTables/inc/TrkElementStatus.hh" @@ -50,6 +52,14 @@ mu2e::DbTable::ptr_t mu2e::DbTableFactory::newTable(std::string const& name) { return std::shared_ptr(new mu2e::TrkAlignPanel()); } else if (name == "TrkAlignStraw") { return std::shared_ptr(new mu2e::TrkAlignStraw()); + } else if (name == "TrkAlignTrackerSim") { + return std::shared_ptr(new mu2e::TrkAlignTrackerSim()); + } else if (name == "TrkAlignPlaneSim") { + return std::shared_ptr(new mu2e::TrkAlignPlaneSim()); + } else if (name == "TrkAlignPanelSim") { + return std::shared_ptr(new mu2e::TrkAlignPanelSim()); + } else if (name == "TrkAlignStrawSim") { + return std::shared_ptr(new mu2e::TrkAlignStrawSim()); } else if (name == "TrkPlaneStatus") { return std::shared_ptr(new mu2e::TrkPlaneStatus()); } else if (name == "TrkPanelStatus") { diff --git a/ProditionsService/fcl/prolog.fcl b/ProditionsService/fcl/prolog.fcl index 2dbf3a7eaf..4043ffb2fc 100644 --- a/ProditionsService/fcl/prolog.fcl +++ b/ProditionsService/fcl/prolog.fcl @@ -18,6 +18,7 @@ Proditions : { strawElectronics : @local::StrawElectronics strawResponse : @local::StrawResponse alignedTracker : @local::AlignedTracker + alignedTrackerSim : @local::AlignedTrackerSim mu2eMaterial : @local::Mu2eMaterial mu2eDetector : @local::Mu2eDetector caloDAQConditions : @local::CaloDAQConditions diff --git a/ProditionsService/inc/ProditionsHandle.hh b/ProditionsService/inc/ProditionsHandle.hh index 6ad94ffb74..2d125fa220 100644 --- a/ProditionsService/inc/ProditionsHandle.hh +++ b/ProditionsService/inc/ProditionsHandle.hh @@ -17,9 +17,9 @@ class ProditionsHandle { typedef std::shared_ptr ptr_t; typedef std::shared_ptr cptr_t; - ProditionsHandle() : ptr(nullptr) { + ProditionsHandle(const std::string& tag = std::string()) : ptr(nullptr) { // find the name of the ENTITY - _name = std::string(ENTITY::cxname); + _name = std::string(ENTITY::cxname) + tag; // connect to the service cache of this type art::ServiceHandle sg; _cptr = sg->getCache(_name); diff --git a/ProditionsService/inc/ProditionsService.hh b/ProditionsService/inc/ProditionsService.hh index 14632ef721..6b317d5cdb 100644 --- a/ProditionsService/inc/ProditionsService.hh +++ b/ProditionsService/inc/ProditionsService.hh @@ -78,6 +78,8 @@ class ProditionsService { Name("strawResponse"), Comment("Straw response model")}; fhicl::Table alignedTracker{ Name("alignedTracker"), Comment("Tracker alignment in reco code")}; + fhicl::Table alignedTrackerSim{ + Name("alignedTrackerSim"), Comment("Tracker alignment in sim code")}; fhicl::Table mu2eMaterial{ Name("mu2eMaterial"), Comment("Mu2e material for BTrk")}; fhicl::Table mu2eDetector{ diff --git a/ProditionsService/src/ProditionsService.cc b/ProditionsService/src/ProditionsService.cc index a72673866e..27b722f34e 100644 --- a/ProditionsService/src/ProditionsService.cc +++ b/ProditionsService/src/ProditionsService.cc @@ -75,9 +75,13 @@ ProditionsService::ProditionsService(Parameters const& sTable, auto src = std::make_shared(_config.strawResponse()); _caches[src->name()] = src; + // tracker alignment has two templated variants, for reco and simulation auto atc = - std::make_shared(_config.alignedTracker()); + std::make_shared(_config.alignedTracker()); _caches[atc->name()] = atc; + auto atcs = + std::make_shared(_config.alignedTrackerSim()); + _caches[atcs->name()+"Sim"] = atcs; auto mmc = std::make_shared(_config.mu2eMaterial()); _caches[mmc->name()] = mmc; auto mdc = std::make_shared(_config.mu2eDetector()); diff --git a/TrackerConditions/fcl/prolog.fcl b/TrackerConditions/fcl/prolog.fcl index 268c159a92..4a0d4ccbcd 100644 --- a/TrackerConditions/fcl/prolog.fcl +++ b/TrackerConditions/fcl/prolog.fcl @@ -24,6 +24,11 @@ AlignedTracker : { useDb : false } +AlignedTrackerSim : { + verbose : 0 + useDb : false +} + FullReadoutStraw : { verbose : 0 useDb : false diff --git a/TrackerConditions/inc/AlignedTrackerCache.hh b/TrackerConditions/inc/AlignedTrackerCache.hh index c5652183e0..7adb0a75e8 100644 --- a/TrackerConditions/inc/AlignedTrackerCache.hh +++ b/TrackerConditions/inc/AlignedTrackerCache.hh @@ -4,28 +4,33 @@ // // hold a set of run-dependent conditions objects // and update them when needed +// this cache is templated so it can be instianted for reco or sim, +// which are a different set of tables // #include "Offline/Mu2eInterfaces/inc/ProditionsCache.hh" #include "Offline/DbService/inc/DbHandle.hh" #include "Offline/DbTables/inc/TrkAlignElement.hh" +#include "Offline/DbTables/inc/TrkAlignElementSim.hh" #include "Offline/DbTables/inc/TrkAlignStraw.hh" +#include "Offline/DbTables/inc/TrkAlignStrawSim.hh" #include "Offline/TrackerConditions/inc/AlignedTrackerMaker.hh" namespace mu2e { + template class AlignedTrackerCache : public ProditionsCache { public: - AlignedTrackerCache(AlignedTrackerConfig const& config): + AlignedTrackerCache(AlignedTrackerConfig const& config): ProditionsCache(Tracker::cxname,config.verbose()), _useDb(config.useDb()),_maker(config) {} void initialize() { if(_useDb) { - _tatr_p = std::make_unique>(); - _tapl_p = std::make_unique>(); - _tapa_p = std::make_unique>(); - _tast_p = std::make_unique>(); + _tatr_p = std::make_unique>(); + _tapl_p = std::make_unique>(); + _tapa_p = std::make_unique>(); + _tast_p = std::make_unique>(); } } @@ -72,12 +77,16 @@ namespace mu2e { bool _useDb; AlignedTrackerMaker _maker; - std::unique_ptr> _tatr_p; - std::unique_ptr> _tapl_p; - std::unique_ptr> _tapa_p; - std::unique_ptr> _tast_p; + std::unique_ptr> _tatr_p; + std::unique_ptr> _tapl_p; + std::unique_ptr> _tapa_p; + std::unique_ptr> _tast_p; }; + + typedef AlignedTrackerCache AlignedTrackerCacheReco; + typedef AlignedTrackerCache AlignedTrackerCacheSim; + } #endif From 40c81e8d12a5fecd3011964afd95459059910b01 Mon Sep 17 00:00:00 2001 From: sophieMu2e Date: Sat, 3 Feb 2024 13:03:07 -0600 Subject: [PATCH 086/213] DIOtail filter works --- EventGenerator/fcl/prolog.fcl | 16 +++ EventGenerator/src/DIOGenerator_tool.cc | 4 +- EventGenerator/src/GenFilter_module.cc | 111 ++++++++++++++++++ .../src/SingleProcessGenerator_module.cc | 59 ++-------- 4 files changed, 135 insertions(+), 55 deletions(-) create mode 100644 EventGenerator/src/GenFilter_module.cc diff --git a/EventGenerator/fcl/prolog.fcl b/EventGenerator/fcl/prolog.fcl index fc91fca69c..20841794ea 100644 --- a/EventGenerator/fcl/prolog.fcl +++ b/EventGenerator/fcl/prolog.fcl @@ -165,6 +165,22 @@ EventGenerator : { } } +GenFilter : { + module_type : GenFilter + StageParticleCollection : "generate" + maxr_min: 320 + maxr_max : 500 + makeplots : true +} + +genFilters : # in case we want to add more here +{ + filters : { + GenFilter: @local::GenFilter + } +} + + EventGenerator : { @table::EventGenerator producers : { CeEndpointGun : { @table::CeEndpointGun } diff --git a/EventGenerator/src/DIOGenerator_tool.cc b/EventGenerator/src/DIOGenerator_tool.cc index 01a2b47cb8..61e3768b2d 100644 --- a/EventGenerator/src/DIOGenerator_tool.cc +++ b/EventGenerator/src/DIOGenerator_tool.cc @@ -49,8 +49,6 @@ namespace mu2e { BinnedSpectrum _spectrum; double _rad_min; - - RandomUnitSphere* _randomUnitSphere; CLHEP::RandGeneral* _randSpectrum; }; @@ -74,7 +72,7 @@ namespace mu2e { void DIOGenerator::generate(std::unique_ptr& out, const IO::StoppedParticleF& stop) { const CLHEP::Hep3Vector pos(stop.x, stop.y, stop.z);//position from stopped muon const auto daughters = generate(); - std::cout<<"In DIO Tools Generator "< +#include + +#include "TTree.h" +using namespace std; +namespace mu2e { + + class GenFilter : public art::EDFilter { + public: + struct Config { + using Name=fhicl::Name; + using Comment=fhicl::Comment; + fhicl::Atom SimToken{Name("StageParticleCollection"),Comment("")}; + fhicl::AtomSimTag{Name("StageParticleCollection"),Comment("SimTag")}; + fhicl::Atom maxr_min{Name("maxr_min"),0}; + fhicl::Atom maxr_max{Name("maxr_max"),1e7}; + fhicl::Atom makeplots{Name("makeplots"),false}; + }; + explicit GenFilter(const art::EDFilter::Table& config); + virtual bool filter(art::Event& event) override; + + private: + art::InputTag _SimToken; + const StageParticleCollection* _SimCol; + double maxr_min_; + double maxr_max_; + bool makeplots_; + TTree* genTree; + Float_t _maxr; + Float_t _momT; + Float_t _posT; + Float_t _cosTheta; + Float_t _time; + }; + + GenFilter::GenFilter(const art::EDFilter::Table& config) : + EDFilter{config} + , _SimToken(config().SimToken()) + , maxr_min_(config().maxr_min()) + , maxr_max_(config().maxr_max()) + , makeplots_{config().makeplots()} + { + art::ServiceHandle tfs; + genTree = tfs->make("GenAna", "GenAna"); + genTree->Branch("maxr", &_maxr, "maxr/F"); + genTree->Branch("momT", &_momT, "momT/F"); + genTree->Branch("posT", &_posT, "posT/F"); + genTree->Branch("cosTheta", &_cosTheta, "cosTheta/F"); + genTree->Branch("time", &_time, "time/F"); + } + + bool GenFilter::filter(art::Event& event) { + bool passed = false; + auto sim = event.getValidHandle(_SimToken); + _SimCol = sim.product(); + + for(const auto& aParticle : *_SimCol){ + //const StageParticle &aParticle = p.second; + // make momentum and position vectors + GeomHandle det; + ROOT::Math::XYZVectorF pos = XYZVectorF(det->toDetector(aParticle.position())); + ROOT::Math::XYZTVector pos0(pos.x(), pos.y(), pos.z(), aParticle.time()); + ROOT::Math::PxPyPzMVector mom0(aParticle.momentum().x(), aParticle.momentum().y(), aParticle.momentum().z(), aParticle.momentum().t()); + + // extract charge + int charge = -1; + if(aParticle.pdgId()==PDGCode::e_plus) charge = 1; + + // extact field + GeomHandle bfmgr; + XYZVectorF pos3Vec = XYZVectorF(aParticle.position().x(),aParticle.position().y(),aParticle.position().z()); + ROOT::Math::XYZVector bnom(bfmgr->getBField(pos3Vec).x(),bfmgr->getBField(pos3Vec).y(),bfmgr->getBField(pos3Vec).z()); + + // make the loophelix + KinKal::LoopHelix lh(pos0, mom0, charge, bnom); + // calculate rmax and add maxr to siminfo + _maxr =sqrt(lh.cx()*lh.cx()+lh.cy()*lh.cy())+fabs(lh.rad()); + + // fill other branches for plots + _momT = sqrt(mom0.x()*mom0.x() + mom0.y()*mom0.y()); + _posT = sqrt(pos.x()*pos.x() + pos.y()*pos.y()); + _cosTheta = cos(atan2(_momT,mom0.z())); + _time = aParticle.time(); + genTree->Fill(); + + if((_maxr < maxr_max_ and _maxr > maxr_min_ )){ passed = true; } + } + + return passed; + } +} + +using mu2e::GenFilter; +DEFINE_ART_MODULE(GenFilter) diff --git a/EventGenerator/src/SingleProcessGenerator_module.cc b/EventGenerator/src/SingleProcessGenerator_module.cc index a1f1b797ea..c09f1ac775 100644 --- a/EventGenerator/src/SingleProcessGenerator_module.cc +++ b/EventGenerator/src/SingleProcessGenerator_module.cc @@ -53,8 +53,6 @@ namespace mu2e { fhicl::Atom pdgId{Name("pdgId"),Comment("pdg id of daughter particle"),PDGCode::e_minus}; fhicl::DelegatedParameter decayProducts{Name("decayProducts"), Comment("spectrum (and variables) to be generated")}; fhicl::Atom verbosity{Name("verbosity"),0}; - fhicl::Atom time_min{Name("time_min"),350}; - fhicl::Atom time_max{Name("time_max"),1700}; }; using Parameters= art::EDProducer::Table; @@ -67,8 +65,6 @@ namespace mu2e { double muonLifeTime_; art::ProductToken const simsToken_; unsigned verbosity_; - double time_min_; - double time_max_; int pdgId_; @@ -78,32 +74,15 @@ namespace mu2e { std::unique_ptr Generator_; void addParticles(StageParticleCollection* output, art::Ptr mustop, double time, ParticleGeneratorTool* gen); - TTree* genTree; - Float_t _maxr; - Float_t _momT; - Float_t _posT; - Float_t _cosTheta; - Float_t _time; + }; - void SingleProcessGenerator::beginJob(){ - art::ServiceHandle tfs; - genTree = tfs->make("GenAna", "GenAna"); - genTree->Branch("maxr", &_maxr, "maxr/F"); - genTree->Branch("momT", &_momT, "momT/F"); - genTree->Branch("posT", &_posT, "posT/F"); - genTree->Branch("cosTheta", &_cosTheta, "cosTheta/F"); - genTree->Branch("time", &_time, "time/F"); - } - //================================================================ SingleProcessGenerator::SingleProcessGenerator(const Parameters& conf) : EDProducer{conf} , muonLifeTime_{GlobalConstantsHandle()->getDecayTime(conf().stoppingTargetMaterial())} , simsToken_{consumes(conf().inputSimParticles())} , verbosity_{conf().verbosity()} - , time_min_{conf().time_min()} - , time_max_{conf().time_max()} , pdgId_{conf().pdgId()} , eng_{createEngine(art::ServiceHandle()->getSeed())} , randExp_{eng_} @@ -125,6 +104,11 @@ namespace mu2e { } } + + + void SingleProcessGenerator::beginJob(){ + } + //================================================================ void SingleProcessGenerator::produce(art::Event& event) { @@ -149,34 +133,7 @@ namespace mu2e { { auto daughters = gen->generate(); for(const auto& d: daughters) { - - if(time > time_min_ and time < time_max_){ - - // make momentum and position vectors - GeomHandle det; - ROOT::Math::XYZVectorF pos = XYZVectorF(det->toDetector(mustop->endPosition())); - ROOT::Math::XYZTVector pos0(pos.x(), pos.y(), pos.z(), time); - ROOT::Math::PxPyPzMVector mom0(d.fourmom.x(), d.fourmom.y(), d.fourmom.z(), d.fourmom.t()); - - // extract charge - int charge = -1; - if(pdgId_==PDGCode::e_plus) charge = 1; - - // extact field - GeomHandle bfmgr; - XYZVectorF pos3Vec = XYZVectorF(mustop->endPosition().x(),mustop->endPosition().y(),mustop->endPosition().z()); - ROOT::Math::XYZVector bnom(bfmgr->getBField(pos3Vec).x(),bfmgr->getBField(pos3Vec).y(),bfmgr->getBField(pos3Vec).z()); - - // make the loophelix - KinKal::LoopHelix lh(pos0, mom0, charge, bnom); - // calculate rmax and add maxr to siminfo - _maxr =sqrt(lh.cx()*lh.cx()+lh.cy()*lh.cy())+fabs(lh.rad()); - - _momT = sqrt(mom0.x()*mom0.x() + mom0.y()*mom0.y()); - _posT = sqrt(pos.x()*pos.x() + pos.y()*pos.y()); - _cosTheta = cos(atan2(_momT,mom0.z())); - _time = time; - + output->emplace_back(mustop, d.creationCode, d.pdgId, @@ -184,8 +141,6 @@ namespace mu2e { d.fourmom, time ); - } - genTree->Fill(); } } From d78e784dbb5393831fae381e51534330855a6e22 Mon Sep 17 00:00:00 2001 From: sophieMu2e Date: Sat, 3 Feb 2024 13:10:02 -0600 Subject: [PATCH 087/213] set defaults in prolog --- EventGenerator/fcl/prolog.fcl | 4 ++-- EventGenerator/src/GenFilter_module.cc | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/EventGenerator/fcl/prolog.fcl b/EventGenerator/fcl/prolog.fcl index 20841794ea..3909ba7d78 100644 --- a/EventGenerator/fcl/prolog.fcl +++ b/EventGenerator/fcl/prolog.fcl @@ -168,8 +168,8 @@ EventGenerator : { GenFilter : { module_type : GenFilter StageParticleCollection : "generate" - maxr_min: 320 - maxr_max : 500 + maxr_min: 0 + maxr_max : 1e7 makeplots : true } diff --git a/EventGenerator/src/GenFilter_module.cc b/EventGenerator/src/GenFilter_module.cc index 8b58808218..a1f0e04410 100644 --- a/EventGenerator/src/GenFilter_module.cc +++ b/EventGenerator/src/GenFilter_module.cc @@ -72,7 +72,6 @@ namespace mu2e { _SimCol = sim.product(); for(const auto& aParticle : *_SimCol){ - //const StageParticle &aParticle = p.second; // make momentum and position vectors GeomHandle det; ROOT::Math::XYZVectorF pos = XYZVectorF(det->toDetector(aParticle.position())); From 5cd08193eac0c0ab5ef7e794f61f24d54ab8e600 Mon Sep 17 00:00:00 2001 From: sophieMu2e Date: Sat, 3 Feb 2024 13:37:47 -0600 Subject: [PATCH 088/213] plot optional --- EventGenerator/src/GenFilter_module.cc | 31 ++++++++++++++------------ 1 file changed, 17 insertions(+), 14 deletions(-) diff --git a/EventGenerator/src/GenFilter_module.cc b/EventGenerator/src/GenFilter_module.cc index a1f0e04410..ecb23ff4d7 100644 --- a/EventGenerator/src/GenFilter_module.cc +++ b/EventGenerator/src/GenFilter_module.cc @@ -57,13 +57,15 @@ namespace mu2e { , maxr_max_(config().maxr_max()) , makeplots_{config().makeplots()} { - art::ServiceHandle tfs; - genTree = tfs->make("GenAna", "GenAna"); - genTree->Branch("maxr", &_maxr, "maxr/F"); - genTree->Branch("momT", &_momT, "momT/F"); - genTree->Branch("posT", &_posT, "posT/F"); - genTree->Branch("cosTheta", &_cosTheta, "cosTheta/F"); - genTree->Branch("time", &_time, "time/F"); + if(makeplots_){ + art::ServiceHandle tfs; + genTree = tfs->make("GenAna", "GenAna"); + genTree->Branch("maxr", &_maxr, "maxr/F"); + genTree->Branch("momT", &_momT, "momT/F"); + genTree->Branch("posT", &_posT, "posT/F"); + genTree->Branch("cosTheta", &_cosTheta, "cosTheta/F"); + genTree->Branch("time", &_time, "time/F"); + } } bool GenFilter::filter(art::Event& event) { @@ -92,13 +94,14 @@ namespace mu2e { // calculate rmax and add maxr to siminfo _maxr =sqrt(lh.cx()*lh.cx()+lh.cy()*lh.cy())+fabs(lh.rad()); - // fill other branches for plots - _momT = sqrt(mom0.x()*mom0.x() + mom0.y()*mom0.y()); - _posT = sqrt(pos.x()*pos.x() + pos.y()*pos.y()); - _cosTheta = cos(atan2(_momT,mom0.z())); - _time = aParticle.time(); - genTree->Fill(); - + if(makeplots_){ + // fill other branches for plots + _momT = sqrt(mom0.x()*mom0.x() + mom0.y()*mom0.y()); + _posT = sqrt(pos.x()*pos.x() + pos.y()*pos.y()); + _cosTheta = cos(atan2(_momT,mom0.z())); + _time = aParticle.time(); + genTree->Fill(); + } if((_maxr < maxr_max_ and _maxr > maxr_min_ )){ passed = true; } } From 2a79aa2752b533b68d34b31fb7495e8b86f1e1bd Mon Sep 17 00:00:00 2001 From: sophieMu2e Date: Sat, 3 Feb 2024 15:37:00 -0600 Subject: [PATCH 089/213] updated KalSeedMC --- EventGenerator/src/GenFilter_module.cc | 7 ++++--- MCDataProducts/inc/KalSeedMC.hh | 6 ++++-- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/EventGenerator/src/GenFilter_module.cc b/EventGenerator/src/GenFilter_module.cc index ecb23ff4d7..05d119ca2b 100644 --- a/EventGenerator/src/GenFilter_module.cc +++ b/EventGenerator/src/GenFilter_module.cc @@ -14,7 +14,8 @@ #include "KinKal/Trajectory/LoopHelix.hh" #include "Offline/BFieldGeom/inc/BFieldManager.hh" #include "Offline/GeometryService/inc/GeomHandle.hh" - +#include "Offline/GlobalConstantsService/inc/GlobalConstantsHandle.hh" +#include "Offline/GlobalConstantsService/inc/ParticleDataList.hh" #include #include @@ -81,8 +82,8 @@ namespace mu2e { ROOT::Math::PxPyPzMVector mom0(aParticle.momentum().x(), aParticle.momentum().y(), aParticle.momentum().z(), aParticle.momentum().t()); // extract charge - int charge = -1; - if(aParticle.pdgId()==PDGCode::e_plus) charge = 1; + static GlobalConstantsHandle pdt; + auto charge = pdt->particle(aParticle.pdgId()).charge(); // extact field GeomHandle bfmgr; diff --git a/MCDataProducts/inc/KalSeedMC.hh b/MCDataProducts/inc/KalSeedMC.hh index f2d6901c60..c101b2ee8d 100644 --- a/MCDataProducts/inc/KalSeedMC.hh +++ b/MCDataProducts/inc/KalSeedMC.hh @@ -34,7 +34,9 @@ namespace mu2e { MCRelationship _rel; // relationship of this particle to its primary uint16_t _nhits; // number of associated StrawHits uint16_t _nactive; // number of associated active hits - XYZVectorF _mom; // initial momentum + CLHEP::HepLorentzVector _mom; // initial momentum + CLHEP::Hep3Vector _pos; // initial position + double _time; //global start time cet::map_vector_key _spkey; // key to the SimParticle // construct a Ptr from Handle and key SPPtr simParticle(SPCH spcH) const { return SPPtr(spcH,_spkey.asUint()); } @@ -42,7 +44,7 @@ namespace mu2e { // partial constructor from a SimParticle; SimPartStub(SPPtr const& spp) : _pdg(spp->pdgId()), _proc(spp->creationCode()), _gid(GenId::unknown), _rel(MCRelationship::none), - _nhits(0), _nactive(0), _mom(XYZVectorF(spp->startMomentum())), _spkey(spp.key()){ + _nhits(0), _nactive(0), _mom(CLHEP::HepLorentzVector(spp->startMomentum())), _pos(CLHEP::Hep3Vector(spp->startPosition())), _time(spp->startGlobalTime()), _spkey(spp.key()){ // dig down to the GenParticle auto simPtr = spp; while (simPtr->genParticle().isNull() && simPtr->parent().isNonnull()) { From 3fe5abb56c0ad714da9d53d99b80c47c12e4d845 Mon Sep 17 00:00:00 2001 From: sophieMu2e Date: Mon, 5 Feb 2024 10:06:14 -0600 Subject: [PATCH 090/213] added null option --- EventGenerator/fcl/prolog.fcl | 4 +--- EventGenerator/src/GenFilter_module.cc | 4 ++++ 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/EventGenerator/fcl/prolog.fcl b/EventGenerator/fcl/prolog.fcl index 3909ba7d78..0cc488747a 100644 --- a/EventGenerator/fcl/prolog.fcl +++ b/EventGenerator/fcl/prolog.fcl @@ -168,9 +168,7 @@ EventGenerator : { GenFilter : { module_type : GenFilter StageParticleCollection : "generate" - maxr_min: 0 - maxr_max : 1e7 - makeplots : true + isNull : true } genFilters : # in case we want to add more here diff --git a/EventGenerator/src/GenFilter_module.cc b/EventGenerator/src/GenFilter_module.cc index 05d119ca2b..82baade2aa 100644 --- a/EventGenerator/src/GenFilter_module.cc +++ b/EventGenerator/src/GenFilter_module.cc @@ -33,6 +33,7 @@ namespace mu2e { fhicl::Atom maxr_min{Name("maxr_min"),0}; fhicl::Atom maxr_max{Name("maxr_max"),1e7}; fhicl::Atom makeplots{Name("makeplots"),false}; + fhicl::Atom isNull{Name("isNull"),true}; }; explicit GenFilter(const art::EDFilter::Table& config); virtual bool filter(art::Event& event) override; @@ -43,6 +44,7 @@ namespace mu2e { double maxr_min_; double maxr_max_; bool makeplots_; + bool isNull_; TTree* genTree; Float_t _maxr; Float_t _momT; @@ -57,6 +59,7 @@ namespace mu2e { , maxr_min_(config().maxr_min()) , maxr_max_(config().maxr_max()) , makeplots_{config().makeplots()} + , isNull_{config().isNull()} { if(makeplots_){ art::ServiceHandle tfs; @@ -70,6 +73,7 @@ namespace mu2e { } bool GenFilter::filter(art::Event& event) { + if(isNull_) return true; bool passed = false; auto sim = event.getValidHandle(_SimToken); _SimCol = sim.product(); From b34fcf70d13fb2bbcafed790cabc8567017420b9 Mon Sep 17 00:00:00 2001 From: sophieMu2e Date: Tue, 6 Feb 2024 07:46:34 -0600 Subject: [PATCH 091/213] removed all these files --- Analyses/fcl/runCRYDigi.fcl | 22 -- Analyses/fcl/runCRYGen.fcl | 21 -- Analyses/src/PhotonAna_module.cc | 389 -------------------------- Analyses/src/PhotonGenPlots_module.cc | 252 ----------------- 4 files changed, 684 deletions(-) delete mode 100644 Analyses/fcl/runCRYDigi.fcl delete mode 100644 Analyses/fcl/runCRYGen.fcl delete mode 100644 Analyses/src/PhotonAna_module.cc delete mode 100644 Analyses/src/PhotonGenPlots_module.cc diff --git a/Analyses/fcl/runCRYDigi.fcl b/Analyses/fcl/runCRYDigi.fcl deleted file mode 100644 index a3b01ad02b..0000000000 --- a/Analyses/fcl/runCRYDigi.fcl +++ /dev/null @@ -1,22 +0,0 @@ -# author : Sophie Middleton -# purpose : example for cry analysis -#include "Offline/fcl/minimalMessageService.fcl" -#include "Offline/fcl/standardProducers.fcl" -#include "Offline/fcl/standardServices.fcl" -#include "Offline/Analyses/fcl/prolog.fcl" - -services : @local::Services.Reco - -process_name : CRYGenPlots - -source : { module_type : RootInput } - -physics : -{ - analyzers : { @table::CRYAnalysis.analyzers} -} -physics.EndPath : [ @sequence::CRYAnalysis.Analysis] - -physics.analyzers.CRYAnalysis.CRYModuleLabel : "compressDigiMCs" -services.TFileService.fileName: "nts.owner.CRYAnalysisDigi.version.sequencer.root" -services.GeometryService.inputFile: "Offline/Mu2eG4/geom/geom_common_extracted.txt" diff --git a/Analyses/fcl/runCRYGen.fcl b/Analyses/fcl/runCRYGen.fcl deleted file mode 100644 index 0e2f9742bd..0000000000 --- a/Analyses/fcl/runCRYGen.fcl +++ /dev/null @@ -1,21 +0,0 @@ -# author : Sophie Middleton -# purpose : example for cry analysis -#include "Offline/fcl/minimalMessageService.fcl" -#include "Offline/fcl/standardProducers.fcl" -#include "Offline/fcl/standardServices.fcl" -#include "Offline/Analyses/fcl/prolog.fcl" - -services : @local::Services.Reco - -process_name : CRYGenPlots - -source : { module_type : RootInput } - -physics : -{ - analyzers : { @table::CRYAnalysis.analyzers} -} -physics.EndPath : [ @sequence::CRYAnalysis.Analysis] - -services.TFileService.fileName: "nts.owner.CRYAnalysis.version.sequencer.root" -services.GeometryService.inputFile: "Offline/Mu2eG4/geom/geom_common_extracted.txt" diff --git a/Analyses/src/PhotonAna_module.cc b/Analyses/src/PhotonAna_module.cc deleted file mode 100644 index 7706583121..0000000000 --- a/Analyses/src/PhotonAna_module.cc +++ /dev/null @@ -1,389 +0,0 @@ -// -// TODO: This file will analyze the outgoing photons energy, momentum and position by looking at the indicent electron/positron -// Original author S. Middleton -// - -#include "fhiclcpp/ParameterSet.h" -#include "art/Framework/Core/EDAnalyzer.h" -#include "art/Framework/Principal/Event.h" -#include "art/Framework/Principal/Handle.h" -#include "art_root_io/TFileService.h" -#include "canvas/Utilities/InputTag.h" - -#include "Offline/ProditionsService/inc/ProditionsHandle.hh" - -#include "Offline/GeometryService/inc/GeomHandle.hh" -#include "Offline/GeometryService/inc/DetectorSystem.hh" -#include "Offline/TrackerGeom/inc/Tracker.hh" -#include "Offline/RecoDataProducts/inc/KalSeed.hh" -#include "Offline/MCDataProducts/inc/SimParticle.hh" -#include "Offline/MCDataProducts/inc/StrawGasStep.hh" -#include "Offline/MCDataProducts/inc/MCTrajectoryPoint.hh" -#include "Offline/MCDataProducts/inc/MCTrajectoryCollection.hh" - -#include "CLHEP/Units/PhysicalConstants.h" -#include "CLHEP/Matrix/Vector.h" -#include "CLHEP/Matrix/SymMatrix.h" - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -//ROOT -#include "TStyle.h" -#include "Rtypes.h" -#include "TH1F.h" -#include "TCanvas.h" -#include "TH2F.h" -#include "TH3F.h" -#include "TLegend.h" -#include "TTree.h" -#include "TLatex.h" -#include "TGraph.h" -#include "TProfile.h" -using namespace std; -namespace mu2e{ - - class PhotonAna : public art::EDAnalyzer { - public: - struct Config { - using Name=fhicl::Name; - using Comment=fhicl::Comment; - fhicl::Atom diag{Name("diag"), Comment("Create diag histograms"),0}; - fhicl::Atom StrawToken{Name("StrawGasStepCollection"),Comment("tag for straw gas step collection")}; - fhicl::Atom MCToken{Name("MCTrajectoryCollection"),Comment("tag for MC trajectory collection")}; - fhicl::Atom SimToken{Name("SimParticleCollection"),Comment("tag for Sim collection")}; - }; - typedef art::EDAnalyzer::Table Parameters; - explicit PhotonAna(const Parameters& conf); - virtual void beginJob() override; - virtual void analyze(const art::Event& e); - - private: - Config _conf; - int _diagLevel; - art::InputTag _StrawToken; - art::InputTag _MCToken; - art::InputTag _SimToken; - const StrawGasStepCollection* _StrawCol; - const MCTrajectoryCollection* _TrajCol; - const SimParticleCollection* _SimCol; - - //Declaring variables: Daughter particles - Float_t _pdgid; - //TTree *_photon_analyzer; - TTree *_simpart_analyzer; - //StrawId strawid; - Int_t nparts; - - Float_t ElecPairMom; - Float_t PosPairMom; - Float_t TotalPairMom; - - Float_t ElecStartMomx; - Float_t ElecStartMomy; - Float_t ElecStartMomz; - - Float_t ElecStartPosx; - Float_t ElecStartPosy; - Float_t ElecStartPosz; - - Float_t ElecTheta; - Float_t ElecPhi; - Float_t ElecTransMom; - Float_t ElecPhotDirMom; - - Float_t PosStartMomx; - Float_t PosStartMomy; - Float_t PosStartMomz; - - Float_t PosTheta; - Float_t PosPhi; - Float_t PosTransMom; - Float_t PosPhotDirMom; - - Float_t PosStartPosx; - Float_t PosStartPosy; - Float_t PosStartPosz; - - Float_t PhotStartMomx; - Float_t PhotStartMomy; - Float_t PhotStartMomz; - Float_t PhotTotMom; - - Float_t PhotTheta; - Float_t PhotPhi; - - Int_t nParts; - - unsigned int nConv = 0; - unsigned int nConvParticles = 0; - unsigned int nBoth = 0; - unsigned int nSameMother = 0; - unsigned int nSameMotherPhoton = 0; - }; - - PhotonAna::PhotonAna(const Parameters& conf) : - art::EDAnalyzer(conf), - _diagLevel(conf().diag()), - _StrawToken(conf().StrawToken()), - _MCToken(conf().MCToken()), - _SimToken(conf().SimToken()) - {} - - void PhotonAna::beginJob() { //TODO - can add TTree and THistograms here if required - art::ServiceHandle tfs; - //1D Historgrams - - _simpart_analyzer = tfs->make("simpart_analyzer"," Diagnostics for Photon Conversion Track Fitting"); - _simpart_analyzer->Branch("ElecPairMom",&ElecPairMom,"elecPairMom/F"); - _simpart_analyzer->Branch("PosPairMom",&PosPairMom,"posPairMom/F"); - _simpart_analyzer->Branch("TotalPairMom",&TotalPairMom,"totalPairMom/F"); - _simpart_analyzer->Branch("Particles", &nParts, "nParts/I"); - - _simpart_analyzer->Branch("ElecStartMomx",&ElecStartMomx,"ElecStartMomx/F"); - _simpart_analyzer->Branch("ElecStartMomy",&ElecStartMomy,"ElecStartMomy/F"); - _simpart_analyzer->Branch("ElecStartMomz",&ElecStartMomz,"ElecStartMomz/F"); - - _simpart_analyzer->Branch("ElecStartPosx",&ElecStartPosx,"ElecStartPosx/F"); - _simpart_analyzer->Branch("ElecStartPosy",&ElecStartPosy,"ElecStartPosy/F"); - _simpart_analyzer->Branch("ElecStartPosz",&ElecStartPosz,"ElecStartPosz/F"); - - _simpart_analyzer->Branch("PosStartMomx",&PosStartMomx,"PosStartMomx/F"); - _simpart_analyzer->Branch("PosStartMomy",&PosStartMomy,"PosStartMomy/F"); - _simpart_analyzer->Branch("PosStartMomz",&PosStartMomz,"PosStartMomz/F"); - - _simpart_analyzer->Branch("PosStartPosx",&PosStartPosx,"PosStartPosx/F"); - _simpart_analyzer->Branch("PosStartPosy",&PosStartPosy,"PosStartPosy/F"); - _simpart_analyzer->Branch("PosStartPosz",&PosStartPosz,"PosStartPosz/F"); - - _simpart_analyzer->Branch("PhotStartMomx",&PhotStartMomx,"PhotStartMomx/F"); - _simpart_analyzer->Branch("PhotStartMomy",&PhotStartMomy,"PhotStartMomy/F"); - _simpart_analyzer->Branch("PhotStartMomz",&PhotStartMomz,"PhotStartMomz/F"); - _simpart_analyzer->Branch("PhotTotMom",&PhotTotMom,"PhotTotMom/F"); - - _simpart_analyzer->Branch("ElecTheta",&ElecTheta,"ElecTheta/F"); - _simpart_analyzer->Branch("ElecPhi",&ElecPhi,"ElecPhi/F"); - _simpart_analyzer->Branch("ElecTransMom",&ElecTransMom,"ElecTransMom/F"); - _simpart_analyzer->Branch("ElecPhotDirMom",&ElecPhotDirMom,"ElecPhotDirMom/F"); - - _simpart_analyzer->Branch("PosTheta",&PosTheta,"PosTheta/F"); - _simpart_analyzer->Branch("PosPhi",&PosPhi,"PosPhi/F"); - _simpart_analyzer->Branch("PosTransMom",&PosTransMom,"PosTransMom/F"); - _simpart_analyzer->Branch("PosPhotDirMom",&PosPhotDirMom,"PosPhotDirMom/F"); - - _simpart_analyzer->Branch("PhotTheta",&PhotTheta,"PhotTheta/F"); - _simpart_analyzer->Branch("PhotPhi",&PhotPhi,"PhotPhi/F"); - } - void PhotonAna::analyze(const art::Event& event) { - - int eventid_ = event.id().event(); - int runid_ = event.run(); - int subrunid_ = event.subRun(); - if(_diagLevel > 1){ - std::cout<<"+=======================================================+"<(_SimToken); - _SimCol = sH.product(); - - //std::cout<<"SimCol Size : "<<_SimCol->size()< ElecMotherPos; //TODO update plots to use these positions - std::vector PosMotherPos; - - bool hasBoth = false; - //loop over Simparticles: - for ( SimParticleCollection::const_iterator i=_SimCol->begin(); i!=_SimCol->end(); ++i ){ - SimParticle const& sim = i->second; - - //check the particle is e-/e+ and created by conversion - if(abs(sim.pdgId()) == 11 and sim.creationCode()==13){//(sim.creationCode()==173 or sim.creationCode()==174) - - double TotalMomentum = sim.startMomentum().rho(); - - // fill counters - if(isConv ==false) nConv ++; // avoids double counting for each of the pair - isConv = true; - nConvParticles ++; - - //print information on daughter: - if(_diagLevel > 1){ - std::cout<<"Daughter PDG ID : "< const& parent = sim.parent(); - - PhotStartMomx = parent->startMomentum().x(); - PhotStartMomy = parent->startMomentum().y(); - PhotStartMomz = parent->startMomentum().z(); - PhotTotMom = parent->startMomentum().rho(); - PhotTheta = parent->startMomentum().theta(); - PhotPhi = parent->startMomentum().phi() ; - - // information on grandmother - /*art::Ptr grandparent = parent->parent(); - if(_diagLevel > 1) std::cout<<"ancestor id "<parent()->pdgId()<isPrimary() and abs(grandparent->pdgId()!=13)){ - int id = grandparent->parent()->pdgId(); - std::vector ancestors; - ancestors.push_back(id); - while(abs(id) !=13){ - id = grandparent->parent()->pdgId(); - grandparent = grandparent->parent(); - if(_diagLevel > 1) std::cout<<"ancestor id "< 1){ - std::cout<<"Mother PDG ID : "<pdgId()<endPosition().x()<<" , "<endPosition().y()<<" , "<endPosition().z()<pdgId() == 22 and parent->creationCode()==175) hasMotherPhoton = true; //TODO keep this at ==13? - - // check electron and positrons and save parent positions for later checks - if(sim.pdgId() == 11) { - hasElectron = true; - ElectronMom = TotalMomentum; //TODO - add these to the TTree - ElecMotherPos.push_back(parent->endPosition().x()); - ElecMotherPos.push_back(parent->endPosition().y()); - ElecMotherPos.push_back(parent->endPosition().z()); - - ElecStartMomx = sim.startMomentum().x(); - ElecStartMomy = sim.startMomentum().y(); - ElecStartMomz = sim.startMomentum().z(); - - ElecStartPosx = sim.startPosition().x(); - ElecStartPosy = sim.startPosition().y(); - ElecStartPosz = sim.startPosition().z(); - - ElecTheta = sim.startMomentum().theta(); - ElecPhi = sim.startMomentum().phi(); - ElecTransMom = TotalMomentum*(sin(ElecTheta)); - - ElecPhotDirMom = sim.startMomentum().dot(parent->startMomentum());//(ElecMom[0]*ElecMotherMom[0]+ElecMom[1]*ElecMotherMom[1]+ElecMom[2]*ElecMotherMom[2])/ElecMotherAbsMom; - - } - if(sim.pdgId() == -11){ - hasPositron = true; - PositronMom = TotalMomentum; - PosMotherPos.push_back(parent->endPosition().x()); - PosMotherPos.push_back(parent->endPosition().y()); - PosMotherPos.push_back(parent->endPosition().z()); - - PosStartMomx = sim.startMomentum().x(); - PosStartMomy = sim.startMomentum().y(); - PosStartMomz = sim.startMomentum().z(); - - PosStartPosx = sim.startPosition().x(); - PosStartPosy = sim.startPosition().y(); - PosStartPosz = sim.startPosition().z(); - - PosTheta = sim.startMomentum().theta(); - PosPhi = sim.startMomentum().phi(); - PosTransMom = TotalMomentum*(sin(PosTheta)); - - PosPhotDirMom = sim.startMomentum().dot(parent->startMomentum()); - - } - - } - } - - // fill counters - if(hasElectron and hasPositron) hasBoth = true; - if(isConv and hasBoth) nBoth ++; - if(ElecMotherPos.size() !=0 and PosMotherPos.size() != 0 and ElecMotherPos[0] == PosMotherPos[0] and ElecMotherPos[1] == PosMotherPos[1] and ElecMotherPos[2] == PosMotherPos[2]) nSameMother++; - if(ElecMotherPos.size() !=0 and PosMotherPos.size() != 0 and ElecMotherPos[0] == PosMotherPos[0] and ElecMotherPos[1] == PosMotherPos[1] and ElecMotherPos[2] == PosMotherPos[2] and hasMotherPhoton) nSameMotherPhoton++; - - // only print if its an interesting event but iterate without printing others - if(_diagLevel > 0 and isConv and hasBoth and ElecMotherPos.size() !=0 and PosMotherPos.size() != 0 and ElecMotherPos[0] == PosMotherPos[0] and ElecMotherPos[1] == PosMotherPos[1] and ElecMotherPos[2] == PosMotherPos[2] and hasMotherPhoton and nConvParticles==2){ //nConv == 2 - if(_diagLevel == 1){ std::cout<<"+=======================================================+"<Fill(); - } - - - - //------------ MC Trajectory --------------------// - /*auto chH = event.getValidHandle(_MCToken); - _TrajCol = chH.product(); - std::map,mu2e::MCTrajectory>::const_iterator trajectoryIter; - for(unsigned int k = 0; k < _TrajCol->size(); k++){ - for(trajectoryIter=_TrajCol->begin(); trajectoryIter!=_TrajCol->end(); trajectoryIter++){ - _pdgid = trajectoryIter->first->pdgId(); - art::Ptr const& _parent = trajectoryIter->first->parent(); - ProcessCode _creationCode = trajectoryIter->first->creationCode(); - - //initialsation of variables - theta = atan((trajectoryIter->first->startMomentum().y())/trajectoryIter->first->startMomentum().x()); - nparts = _TrajCol->size(); - startmomentum = trajectoryIter->first->startMomentum().rho(); - transmomentum = startmomentum*(sin(theta)); - //Fill for e+e- pairs origination from same parent particle - if (_TrajCol->size()==2 && _creationCode==13 && (_pdgid==11 || _pdgid==-11) && _parent->pdgId()==22 && (transmomentum>5 || transmomentum <-5) ) { - cout << "********************************" << k << "/ " << _TrajCol->size() << "*************************" << endl; - - startmomentum_D = trajectoryIter->first->startMomentum().rho(); - transmomentum_D = startmomentum_D*(sin(theta)); - endmomentum_D = trajectoryIter->first->endMomentum().rho(); - startposx_D = (trajectoryIter->first->startPosition().x())+3903; - startposy_D = trajectoryIter->first->startPosition().y(); - startposz_D = trajectoryIter->first->startPosition().z(); - startposr_D = sqrt(((startposx_D)*(startposx_D))+startposy_D*startposy_D); - endposx_D = (trajectoryIter->first->endPosition().x())+3903; - endposy_D = trajectoryIter->first->endPosition().y(); - endposz_D = trajectoryIter->first->endPosition().z(); - endposr_D = sqrt(((endposx_D)*(endposx_D))+endposy_D*endposy_D); - time_D = trajectoryIter->first->startGlobalTime(); - - - std::cout << "Code: "<< _creationCode << " ID: " << _pdgid << " Parent: " << _parent->pdgId() <pdgId() <<" Start Pos X: "<< startposx_P <<" end Pos X: "<< endposx_P <first->id() << endl; - std::cout << "ID parent particle: " << trajectoryIter->first->parent()->id() << endl; - - //_photon_analyzer->Fill(); - }; - } - }*/ - - } -}//end mu2e namespace -using mu2e::PhotonAna; -DEFINE_ART_MODULE(PhotonAna) diff --git a/Analyses/src/PhotonGenPlots_module.cc b/Analyses/src/PhotonGenPlots_module.cc deleted file mode 100644 index 940b897b7f..0000000000 --- a/Analyses/src/PhotonGenPlots_module.cc +++ /dev/null @@ -1,252 +0,0 @@ - -#include "art/Framework/Core/EDAnalyzer.h" -#include "art/Framework/Principal/Event.h" -#include "art/Framework/Principal/Handle.h" -#include "art/Framework/Principal/Run.h" -#include "art/Framework/Principal/SubRun.h" -#include "art_root_io/TFileService.h" -#include "art/Framework/Services/Registry/ServiceHandle.h" -#include "art/Framework/Services/Registry/ServiceDefinitionMacros.h" - -#include "canvas/Utilities/InputTag.h" -#include "fhiclcpp/ParameterSet.h" -#include "messagefacility/MessageLogger/MessageLogger.h" - -#include "Offline/GlobalConstantsService/inc/GlobalConstantsHandle.hh" -#include "Offline/GlobalConstantsService/inc/PhysicsParams.hh" -#include "Offline/GlobalConstantsService/inc/ParticleDataList.hh" -#include "Offline/MCDataProducts/inc/GenParticle.hh" -#include "Offline/Mu2eUtilities/inc/TwoLinePCA.hh" -#include "Offline/Mu2eUtilities/inc/compressPdgId.hh" -#include "Offline/DataProducts/inc/PDGCode.hh" - -#include "TH1F.h" -#include "TH2F.h" -#include "TTree.h" -namespace mu2e { - class PhotonGenPlots; -} - -using CLHEP::Hep3Vector; -using CLHEP::HepLorentzVector; - - -class mu2e::PhotonGenPlots : public art::EDAnalyzer { - public: - explicit PhotonGenPlots(fhicl::ParameterSet const & p); - // The compiler-generated destructor is fine for non-base - // classes without bare pointers or other resource use. - - // Plugins should not be copied or assigned. - PhotonGenPlots(PhotonGenPlots const &) = delete; - PhotonGenPlots(PhotonGenPlots &&) = delete; - PhotonGenPlots & operator = (PhotonGenPlots const &) = delete; - PhotonGenPlots & operator = (PhotonGenPlots &&) = delete; - - // Required functions. - void analyze(art::Event const & e) override; - - // Selected optional functions. - void beginJob() override; - void endJob() override; - - private: - std::string processName_; - std::string CRYModuleLabel_; - std::string CRYInstanceName_; - float _keMax = std::numeric_limits::max(); - - // histograms - TH2F *_hXZ = nullptr; - TH1F *_hY = nullptr; - TH1F *_hKE = nullptr; - TH1F *_hTheta = nullptr; - TH1F *_hPhi = nullptr; - TH1F *_hPmag = nullptr; - TH1F *_hPyOverPmag = nullptr; - TH1F *_hTime = nullptr; - TH2F *_hPtypeKE = nullptr; - TH1F *_hNSecondaries = nullptr; - - TTree *_cosmicTree = nullptr; - TTree *_eventTree = nullptr; - - float _x = std::numeric_limits::lowest(); - float _y = std::numeric_limits::lowest(); - float _z = std::numeric_limits::lowest(); - float _px = std::numeric_limits::lowest(); - float _py = std::numeric_limits::lowest(); - float _pz = std::numeric_limits::lowest(); - float _theta = std::numeric_limits::lowest(); - float _phi = std::numeric_limits::lowest(); - float _KE = std::numeric_limits::lowest(); - float _p = std::numeric_limits::lowest(); - float _t = std::numeric_limits::lowest(); - std::vector _dca; - PDGCode::type _pdgId; - - void bookHists(art::ServiceHandle &); - GlobalConstantsHandle pdt; -}; - -mu2e::PhotonGenPlots::PhotonGenPlots(fhicl::ParameterSet const &p) - : EDAnalyzer(p), - processName_(p.get("processName", "")), - CRYModuleLabel_(p.get("CRYModuleLabel", "FromCRYBinary")), - CRYInstanceName_(p.get("CRYInstanceName", "")), - _keMax(p.get("keMax", 10E3)) -{ - art::ServiceHandle tfs; - - bookHists(tfs); - - _cosmicTree = tfs->make("cosmicTree", "TTree with cosmic ray info"); - - _cosmicTree->Branch("x", &_x, "x/F"); - _cosmicTree->Branch("y", &_y, "y/F"); - _cosmicTree->Branch("z", &_z, "z/F"); - _cosmicTree->Branch("px", &_px, "px/F"); - _cosmicTree->Branch("py", &_py, "py/F"); - _cosmicTree->Branch("pz", &_pz, "pz/F"); - _cosmicTree->Branch("theta", &_theta, "theta/F"); - _cosmicTree->Branch("phi", &_phi, "phi/F"); - _cosmicTree->Branch("KE", &_KE, "KE/F"); - _cosmicTree->Branch("p", &_p, "p/F"); - _cosmicTree->Branch("t", &_t, "t/F"); - _cosmicTree->Branch("pdgId", &_pdgId, "pdgId/I"); - - _eventTree = tfs->make("eventTree", "TTree with cosmic ray info per shower"); - _eventTree->Branch("dca", &_dca); -} - - -void mu2e::PhotonGenPlots::analyze(art::Event const & e) -{ - art::Handle gpHandle; - bool success; - - if (processName_.length() > 0) - success = e.getByLabel(CRYModuleLabel_, CRYInstanceName_, processName_, - gpHandle); - else - success = e.getByLabel(CRYModuleLabel_, gpHandle); - - if (!success) - return; - - const auto & particles = *gpHandle; - - // Store the point of closest approach between target box and roof for - // events with more than one particle - _dca.clear(); - for (GenParticleCollection::const_iterator i = particles.begin(); i != particles.end(); ++i) - { - for (GenParticleCollection::const_iterator j = i+1; j != particles.end(); ++j) - { - GenParticle const &particle1 = *i; - GenParticle const &particle2 = *j; - - TwoLinePCA twoLine(particle1.position(), -particle1.momentum().vect(), particle2.position(), -particle2.momentum().vect()); - const CLHEP::Hep3Vector point1 = twoLine.point1(); - const CLHEP::Hep3Vector point2 = twoLine.point2(); - - - if (point1.y() > 5000 && - point1.y() < 15365.4 && - point2.y() > 5000 && - point2.y() < 15365.4) - { - _dca.push_back(twoLine.dca()); - } - } - } - _eventTree->Fill(); - - _hNSecondaries->Fill(particles.size()); - - for(const auto & p : particles) - { - _hXZ->Fill(p.position().x(), p.position().z()); - _hY->Fill(p.position().y()); - - const ParticleData& p_data = pdt->particle(p.pdgId()); - double mass = p_data.mass(); // in MeV - - HepLorentzVector mom4 = p.momentum(); - Hep3Vector mom3(mom4.px(), mom4.py(), mom4.pz()); - Hep3Vector yMom3(mom4.pz(), mom4.px(), -mom4.py()); // for theta, phi - - _hKE->Fill(mom4.e() - mass); - _hTheta->Fill(yMom3.theta()); - _hPhi->Fill(yMom3.phi()); - - _hPmag->Fill(mom3.mag()); - _hTime->Fill(p.time()); - _hPyOverPmag->Fill(mom4.py() / mom3.mag()); - - _x = p.position().x(); - _y = p.position().y(); - _z = p.position().z(); - - _px = mom4.px(); - _py = mom4.py(); - _pz = mom4.pz(); - - _theta = yMom3.theta(); - _phi = yMom3.phi(); - _KE = mom4.e() - mass; - _p = mom3.mag(); - - _t = p.time(); - - _pdgId = p.pdgId(); - _cosmicTree->Fill(); - - int pbin = compressPdgIdCosmic(p.pdgId()); - _hPtypeKE->Fill(mom4.e(), pbin); - } - -} - -void mu2e::PhotonGenPlots::beginJob() -{ - // Implementation of optional member function here. -} - -void mu2e::PhotonGenPlots::endJob() -{ - // Implementation of optional member function here. -} - -void mu2e::PhotonGenPlots::bookHists(art::ServiceHandle &tfs) -{ - - _hXZ = tfs->make("XZ", "XZ", 500, -2.0e5, 2.0e5, 500, -2.0e5, 2.0e5 ); - _hY = tfs->make("Y", "Y", 500, -15.0e3, 21.0e3 ); - - _hKE = tfs->make("E", "E", 2000, 0, _keMax); - _hTheta = tfs->make("Theta", "Theta", - 200, -M_PI - 0.5, M_PI + 0.5); - _hPhi = tfs->make("Phi", "Phi", - 200, -M_PI - 0.5, M_PI + 0.5); - - _hPmag = tfs->make("Pmag", "Momentum modulus", 500, 0., 2E6); - _hPyOverPmag = tfs->make("PyOverPmag", "Py/Pmag", 200, -20., 20.); - _hTime = tfs->make("Time", "Timing of secondary particles", - 1000, -1.E-3, 1E0); - - _hNSecondaries = tfs->make("nSecondaries", "Number of secondaries", - 1000, 0, 1000); - - _hPtypeKE = tfs->make("PtypeKE", "Particle type vs energy", - 2000, 0., 2E6, 8, 0, 8); - _hPtypeKE->GetYaxis()->SetBinLabel(1, "mu"); - _hPtypeKE->GetYaxis()->SetBinLabel(2, "gamma"); - _hPtypeKE->GetYaxis()->SetBinLabel(3, "electron"); - _hPtypeKE->GetYaxis()->SetBinLabel(4, "neutron"); - _hPtypeKE->GetYaxis()->SetBinLabel(5, "proton"); - _hPtypeKE->GetYaxis()->SetBinLabel(6, "pion"); - _hPtypeKE->GetYaxis()->SetBinLabel(7, "kaon"); - _hPtypeKE->GetYaxis()->SetBinLabel(8, "others"); -} -DEFINE_ART_MODULE(mu2e::PhotonGenPlots) From b77d7f6911feeeb68861daf40363ee11e91b2a98 Mon Sep 17 00:00:00 2001 From: sophieMu2e Date: Tue, 6 Feb 2024 07:49:19 -0600 Subject: [PATCH 092/213] reverted prolog --- Analyses/fcl/prolog.fcl | 29 ------------- Analyses/src/PairConvFilter_module.cc | 60 --------------------------- 2 files changed, 89 deletions(-) delete mode 100644 Analyses/src/PairConvFilter_module.cc diff --git a/Analyses/fcl/prolog.fcl b/Analyses/fcl/prolog.fcl index 9d56a5df92..50d0e65c8c 100644 --- a/Analyses/fcl/prolog.fcl +++ b/Analyses/fcl/prolog.fcl @@ -22,24 +22,11 @@ TrackSummaryMaker: { trackInput : "TrkPatRec:DeM" } -CRYGenPlots : { - module_type : CRYGenPlots - CRYModuleLabel : "compressDetStepMCs" - CRYInstanceName : "Primary" -} - CaloClusterCompareNew : { module_type : CaloClusterCompare CaloClusterCollection : CaloClusterOnline } -PhotonAna : { - module_type : PhotonAna - diag : 1 - StrawGasStepCollection : compressDigiMCs -MCTrajectoryCollection : compressDigiMCs -SimParticleCollection : compressDigiMCs #compressDetStepMCs# -} CaloClusterCompareOld : { module_type : CaloClusterCompare CaloClusterCollection : CaloClusterFast @@ -95,22 +82,6 @@ ClusterCompareNew : Analysis : [CaloClusterCompareNew] } -PhotonAnalysis : -{ - analyzers : { - PhotonAna : @local::PhotonAna - } - Analysis : [PhotonAna] -} - -CRYAnalysis : -{ - analyzers : { - CRYGenPlots : @local::CRYGenPlots - } - Analysis : [CRYGenPlots] -} - ClusterCompareOld : { analyzers : { diff --git a/Analyses/src/PairConvFilter_module.cc b/Analyses/src/PairConvFilter_module.cc deleted file mode 100644 index 820618dac6..0000000000 --- a/Analyses/src/PairConvFilter_module.cc +++ /dev/null @@ -1,60 +0,0 @@ -// Purpose: Event filter for pair converions that make it through the tracker -// author: S Middleton and H Jafree, 2023 -#include "art/Framework/Core/EDFilter.h" -#include "art/Framework/Principal/Event.h" -#include "art/Framework/Services/Registry/ServiceHandle.h" -#include "fhiclcpp/ParameterSet.h" - -#include "art/Framework/Principal/Handle.h" - -// Mu2e includes. -#include "Offline/MCDataProducts/inc/StrawGasStep.hh" -#include -#include - -using namespace std; -namespace mu2e { - - class PairConvFilter : public art::EDFilter { - public: - struct Config { - using Name=fhicl::Name; - using Comment=fhicl::Comment; - fhicl::Atom StrawToken{Name("StrawGasStepCollection"),Comment("tag for straw gas step collection")}; - }; - explicit PairConvFilter(const art::EDFilter::Table& config); - virtual bool filter(art::Event& event) override; - //virtual bool beginRun(art::Run& run ); - //virtual bool endRun( art::Run& run ) override; - private: - art::InputTag _StrawToken; - const StrawGasStepCollection* _StrawCol; - }; - - PairConvFilter::PairConvFilter(const art::EDFilter::Table& config) : - EDFilter{config}, - _StrawToken(config().StrawToken()) - {} - - bool PairConvFilter::filter(art::Event& event) { - - bool pass = false; - //------------ Straw Gas Collection --------------------// - auto strawH = event.getValidHandle(_StrawToken); - _StrawCol = strawH.product(); - unsigned int nElectronSteps = 0; - unsigned int nPositronSteps = 0; - for (size_t k = 0; k < _StrawCol->size(); k++){ - StrawGasStep strawgas = (*_StrawCol)[k]; - art::Ptr const& simpart = strawgas.simParticle(); - if (simpart->pdgId()==11) ++nElectronSteps; - else if (simpart->pdgId()==-11) ++nPositronSteps; - } - - if (nElectronSteps>=10 and nPositronSteps>=10) pass=true; - return pass; - } -} - -using mu2e::PairConvFilter; -DEFINE_ART_MODULE(PairConvFilter) From e1fc0d1d61106729b54538c841c15cc5ec83472f Mon Sep 17 00:00:00 2001 From: sophieMu2e Date: Tue, 6 Feb 2024 07:52:07 -0600 Subject: [PATCH 093/213] trkpatrec --- TrkPatRec/fcl/prolog.fcl | 7 ------- 1 file changed, 7 deletions(-) diff --git a/TrkPatRec/fcl/prolog.fcl b/TrkPatRec/fcl/prolog.fcl index 4566a52bbf..1ef622277e 100644 --- a/TrkPatRec/fcl/prolog.fcl +++ b/TrkPatRec/fcl/prolog.fcl @@ -16,13 +16,6 @@ TimeCalculator : { # define flag bits for pat rec and final fit PatRecBackground : ["Background","Noisy","Dead"] TrkFitBackground : ["Dead"] - -PhotonConversionFinder : { # TODO - add parameters - module_type : PhotonConversionFinder - diag : 0 - ComboHitCollection : "makeSH" - TimeClusterCollection : "TimeClusterFinder" - } TimeClusterFinder : { module_type : TimeClusterFinder From e5ee514d87f424c45ddd73532dcde6bbef3b0f54 Mon Sep 17 00:00:00 2001 From: sophieMu2e Date: Tue, 6 Feb 2024 07:53:40 -0600 Subject: [PATCH 094/213] trkpatrec --- TrkPatRec/fcl/prolog.fcl | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/TrkPatRec/fcl/prolog.fcl b/TrkPatRec/fcl/prolog.fcl index 1ef622277e..8a7bb32d42 100644 --- a/TrkPatRec/fcl/prolog.fcl +++ b/TrkPatRec/fcl/prolog.fcl @@ -16,7 +16,8 @@ TimeCalculator : { # define flag bits for pat rec and final fit PatRecBackground : ["Background","Noisy","Dead"] TrkFitBackground : ["Dead"] - + + TimeClusterFinder : { module_type : TimeClusterFinder From a14b77d3ca60eacebb91743816891978a058382b Mon Sep 17 00:00:00 2001 From: sophieMu2e Date: Tue, 6 Feb 2024 08:08:08 -0600 Subject: [PATCH 095/213] fixed line --- TrackerConditions/inc/DriftInfo.hh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/TrackerConditions/inc/DriftInfo.hh b/TrackerConditions/inc/DriftInfo.hh index 664aa77b11..0b604b9ba0 100644 --- a/TrackerConditions/inc/DriftInfo.hh +++ b/TrackerConditions/inc/DriftInfo.hh @@ -7,8 +7,7 @@ namespace mu2e { struct DriftInfo { double LorentzAngle_ =0; // angle for EXB effects double rDrift_ =0; // calibrated drift distance - double cDrift_ =0 - ; // single cluster drift distance + double cDrift_ =0; // single cluster drift distance double signedDriftError_ =0; // estimated error on signed drift distance (includes LR ambiguity error effects) double unsignedDriftError_ =0; // estimated error on unsigned drift distance double driftVelocity_; // instantaneous drift velocity From 95010322960d53ac9f2db8dbfc7c0ed54c079f89 Mon Sep 17 00:00:00 2001 From: sophieMu2e Date: Tue, 6 Feb 2024 08:09:57 -0600 Subject: [PATCH 096/213] fixed space --- Filters/fcl/prolog.fcl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Filters/fcl/prolog.fcl b/Filters/fcl/prolog.fcl index 2ed61607b9..3d516d4a8e 100644 --- a/Filters/fcl/prolog.fcl +++ b/Filters/fcl/prolog.fcl @@ -1,4 +1,4 @@ -## -*- mode: tcl -*- +# -*- mode: tcl -*- #------------------------------------------------------------------------------ # this file is included by fcl/standardProducers.fcl inside the PROLOG section #------------------------------------------------------------------------------ From 1fbc9ec2cdd8ab18dfbbe54c7b5acf133281d8e6 Mon Sep 17 00:00:00 2001 From: sophieMu2e Date: Tue, 6 Feb 2024 08:11:00 -0600 Subject: [PATCH 097/213] fixed DIO gen --- EventGenerator/src/DIOGenerator_tool.cc | 4 ---- 1 file changed, 4 deletions(-) diff --git a/EventGenerator/src/DIOGenerator_tool.cc b/EventGenerator/src/DIOGenerator_tool.cc index 61e3768b2d..1a1d3644dc 100644 --- a/EventGenerator/src/DIOGenerator_tool.cc +++ b/EventGenerator/src/DIOGenerator_tool.cc @@ -22,9 +22,7 @@ namespace mu2e { struct PhysConfig { using Name=fhicl::Name; using Comment=fhicl::Comment; - fhicl::DelegatedParameter spectrum{Name("spectrum"), Comment("Parameters for BinnedSpectrum)")}; - fhicl::Atom rad_min{Name("rad_min"),0}; }; typedef art::ToolConfigTable Parameters; @@ -32,7 +30,6 @@ namespace mu2e { _pdgId(PDGCode::e_minus), _mass(GlobalConstantsHandle()->particle(_pdgId).mass()), _spectrum(BinnedSpectrum(conf().spectrum.get())), - _rad_min(conf().rad_min()) {} std::vector generate() override; @@ -47,7 +44,6 @@ namespace mu2e { PDGCode::type _pdgId; double _mass; BinnedSpectrum _spectrum; - double _rad_min; RandomUnitSphere* _randomUnitSphere; CLHEP::RandGeneral* _randSpectrum; From 392f35153883bc0b37916468d40d3a661fb95c22 Mon Sep 17 00:00:00 2001 From: sophieMu2e Date: Tue, 6 Feb 2024 08:12:03 -0600 Subject: [PATCH 098/213] DIOtail --- EventGenerator/src/DIOGenerator_tool.cc | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/EventGenerator/src/DIOGenerator_tool.cc b/EventGenerator/src/DIOGenerator_tool.cc index 1a1d3644dc..2fbb0028bf 100644 --- a/EventGenerator/src/DIOGenerator_tool.cc +++ b/EventGenerator/src/DIOGenerator_tool.cc @@ -14,7 +14,6 @@ #include "Offline/GlobalConstantsService/inc/PhysicsParams.hh" #include "fhiclcpp/types/DelegatedParameter.h" -#include "fhiclcpp/types/Atom.h" namespace mu2e { class DIOGenerator : public ParticleGeneratorTool { @@ -22,6 +21,7 @@ namespace mu2e { struct PhysConfig { using Name=fhicl::Name; using Comment=fhicl::Comment; + fhicl::DelegatedParameter spectrum{Name("spectrum"), Comment("Parameters for BinnedSpectrum)")}; }; typedef art::ToolConfigTable Parameters; @@ -29,7 +29,7 @@ namespace mu2e { explicit DIOGenerator(Parameters const& conf) : _pdgId(PDGCode::e_minus), _mass(GlobalConstantsHandle()->particle(_pdgId).mass()), - _spectrum(BinnedSpectrum(conf().spectrum.get())), + _spectrum(BinnedSpectrum(conf().spectrum.get())) {} std::vector generate() override; @@ -43,6 +43,7 @@ namespace mu2e { private: PDGCode::type _pdgId; double _mass; + BinnedSpectrum _spectrum; RandomUnitSphere* _randomUnitSphere; @@ -52,7 +53,7 @@ namespace mu2e { std::vector DIOGenerator::generate() { std::vector res; - + double energy = _spectrum.sample(_randSpectrum->fire()); const double p = energy * sqrt(1 - std::pow(_mass/energy,2)); @@ -60,22 +61,19 @@ namespace mu2e { CLHEP::HepLorentzVector fourmom(p3, energy); ParticleGeneratorTool::Kinematic k{_pdgId, ProcessCode::mu2eMuonDecayAtRest, fourmom}; - res.emplace_back(k); + return res; } void DIOGenerator::generate(std::unique_ptr& out, const IO::StoppedParticleF& stop) { - const CLHEP::Hep3Vector pos(stop.x, stop.y, stop.z);//position from stopped muon + const CLHEP::Hep3Vector pos(stop.x, stop.y, stop.z); const auto daughters = generate(); - for(const auto& d: daughters) { - - out->emplace_back(d.pdgId, GenId::DIOGenTool, pos, - d.fourmom, //CLHEP::HepLorentzVector type + d.fourmom, stop.t); } } From e873210fd0848b9cfb8b84dc27007a23b8224aad Mon Sep 17 00:00:00 2001 From: sophieMu2e Date: Wed, 7 Feb 2024 08:49:38 -0600 Subject: [PATCH 099/213] removed issues --- .../src/SingleProcessGenerator_module.cc | 34 +++++++------------ MCDataProducts/inc/KalSeedMC.hh | 4 +-- 2 files changed, 14 insertions(+), 24 deletions(-) diff --git a/EventGenerator/src/SingleProcessGenerator_module.cc b/EventGenerator/src/SingleProcessGenerator_module.cc index c09f1ac775..a5bbc4da10 100644 --- a/EventGenerator/src/SingleProcessGenerator_module.cc +++ b/EventGenerator/src/SingleProcessGenerator_module.cc @@ -15,7 +15,7 @@ #include "fhiclcpp/types/Atom.h" #include "fhiclcpp/types/DelegatedParameter.h" #include "fhiclcpp/ParameterSet.h" -#include "art_root_io/TFileService.h" + #include "messagefacility/MessageLogger/MessageLogger.h" #include "art/Framework/Core/EDProducer.h" @@ -30,13 +30,7 @@ #include "Offline/MCDataProducts/inc/StageParticle.hh" #include "Offline/Mu2eUtilities/inc/simParticleList.hh" #include "Offline/EventGenerator/inc/ParticleGeneratorTool.hh" -#include "Offline/GeometryService/inc/DetectorSystem.hh" - -#include "KinKal/Trajectory/LoopHelix.hh" -#include "Offline/BFieldGeom/inc/BFieldManager.hh" -#include "Offline/GeometryService/inc/GeomHandle.hh" -#include "TTree.h" namespace mu2e { //================================================================ class SingleProcessGenerator : public art::EDProducer { @@ -51,13 +45,15 @@ namespace mu2e { Comment("Material determines muon life time, capture fraction, and particle spectra.\n" "Only aluminum (Al) is supported, emisson spectra for other materials are not implemented.\n"),"Al" }; fhicl::Atom pdgId{Name("pdgId"),Comment("pdg id of daughter particle"),PDGCode::e_minus}; + fhicl::DelegatedParameter decayProducts{Name("decayProducts"), Comment("spectrum (and variables) to be generated")}; fhicl::Atom verbosity{Name("verbosity"),0}; + }; using Parameters= art::EDProducer::Table; explicit SingleProcessGenerator(const Parameters& conf); - virtual void beginJob(); + virtual void produce(art::Event& event) override; //---------------------------------------------------------------- @@ -74,7 +70,6 @@ namespace mu2e { std::unique_ptr Generator_; void addParticles(StageParticleCollection* output, art::Ptr mustop, double time, ParticleGeneratorTool* gen); - }; //================================================================ @@ -102,13 +97,7 @@ namespace mu2e { if(pdgId_==PDGCode::e_plus) { muonLifeTime_=0; //decay time already included for stopped muon(+) FIXME!!! } - } - - - void SingleProcessGenerator::beginJob(){ - } - //================================================================ void SingleProcessGenerator::produce(art::Event& event) { @@ -134,13 +123,14 @@ namespace mu2e { auto daughters = gen->generate(); for(const auto& d: daughters) { - output->emplace_back(mustop, - d.creationCode, - d.pdgId, - mustop->endPosition(), - d.fourmom, - time - ); + output->emplace_back(mustop, + d.creationCode, + d.pdgId, + mustop->endPosition(), + d.fourmom, + time + ); + } } diff --git a/MCDataProducts/inc/KalSeedMC.hh b/MCDataProducts/inc/KalSeedMC.hh index c101b2ee8d..3b4cab60b9 100644 --- a/MCDataProducts/inc/KalSeedMC.hh +++ b/MCDataProducts/inc/KalSeedMC.hh @@ -34,7 +34,7 @@ namespace mu2e { MCRelationship _rel; // relationship of this particle to its primary uint16_t _nhits; // number of associated StrawHits uint16_t _nactive; // number of associated active hits - CLHEP::HepLorentzVector _mom; // initial momentum + XYZTVectorF _mom; // initial momentum CLHEP::Hep3Vector _pos; // initial position double _time; //global start time cet::map_vector_key _spkey; // key to the SimParticle @@ -44,7 +44,7 @@ namespace mu2e { // partial constructor from a SimParticle; SimPartStub(SPPtr const& spp) : _pdg(spp->pdgId()), _proc(spp->creationCode()), _gid(GenId::unknown), _rel(MCRelationship::none), - _nhits(0), _nactive(0), _mom(CLHEP::HepLorentzVector(spp->startMomentum())), _pos(CLHEP::Hep3Vector(spp->startPosition())), _time(spp->startGlobalTime()), _spkey(spp.key()){ + _nhits(0), _nactive(0), _mom(XYZTVectorF(spp->startMomentum())), _pos(CLHEP::Hep3Vector(spp->startPosition())), _time(spp->startGlobalTime()), _spkey(spp.key()){ // dig down to the GenParticle auto simPtr = spp; while (simPtr->genParticle().isNull() && simPtr->parent().isNonnull()) { From 14c60deff1345850c36115ebdb3563adb58bdf23 Mon Sep 17 00:00:00 2001 From: sophieMu2e Date: Wed, 7 Feb 2024 10:46:16 -0600 Subject: [PATCH 100/213] files --- Analyses/src/DIFAna_module.cc | 96 ++++++++++++++++++++++++++ EventGenerator/src/GenFilter_module.cc | 7 +- 2 files changed, 101 insertions(+), 2 deletions(-) create mode 100644 Analyses/src/DIFAna_module.cc diff --git a/Analyses/src/DIFAna_module.cc b/Analyses/src/DIFAna_module.cc new file mode 100644 index 0000000000..f191ba20ab --- /dev/null +++ b/Analyses/src/DIFAna_module.cc @@ -0,0 +1,96 @@ +// +// TODO: This file will analyze the outgoing photons energy, momentum and position by looking at the indicent electron/positron +// Original author S. Middleton +// + +#include "fhiclcpp/ParameterSet.h" +#include "art/Framework/Core/EDAnalyzer.h" +#include "art/Framework/Principal/Event.h" +#include "art/Framework/Principal/Handle.h" +#include "art_root_io/TFileService.h" +#include "canvas/Utilities/InputTag.h" + +#include "Offline/ProditionsService/inc/ProditionsHandle.hh" + +#include "Offline/GeometryService/inc/GeomHandle.hh" +#include "Offline/GeometryService/inc/DetectorSystem.hh" +#include "Offline/TrackerGeom/inc/Tracker.hh" +#include "Offline/MCDataProducts/inc/SimParticle.hh" + + +#include "CLHEP/Units/PhysicalConstants.h" +#include "CLHEP/Matrix/Vector.h" +#include "CLHEP/Matrix/SymMatrix.h" + +#include +#include +#include + +//ROOT +#include "TTree.h" + +using namespace std; +namespace mu2e{ + + class DIFAna : public art::EDAnalyzer { + public: + struct Config { + using Name=fhicl::Name; + using Comment=fhicl::Comment; + fhicl::Atom diag{Name("diag"), Comment("Create diag histograms"),0}; + fhicl::Atom SimToken{Name("SimParticleCollection"),Comment("tag for Sim collection")}; + }; + typedef art::EDAnalyzer::Table Parameters; + explicit DIFAna(const Parameters& conf); + virtual void beginJob() override; + virtual void analyze(const art::Event& e); + + private: + Config _conf; + int _diagLevel; + art::InputTag _SimToken; + const SimParticleCollection* _SimCol; + + TTree* genTree; + //Float_t _maxr; + Float_t _momT; + Float_t _posT; + Float_t _cosTheta; + Float_t _time; + + }; + + DIFAna::DIFAna(const Parameters& conf) : + art::EDAnalyzer(conf), + _diagLevel(conf().diag()), + _SimToken(conf().SimToken()) + {} + + void DIFAna::beginJob() { + art::ServiceHandle tfs; + genTree = tfs->make("GenAna", "GenAna"); + //genTree->Branch("maxr", &_maxr, "maxr/F"); + genTree->Branch("momT", &_momT, "momT/F"); + genTree->Branch("posT", &_posT, "posT/F"); + genTree->Branch("cosTheta", &_cosTheta, "cosTheta/F"); + genTree->Branch("time", &_time, "time/F"); + } + void DIFAna::analyze(const art::Event& event) { + + //------------SimParticles-------------// + auto sH = event.getValidHandle(_SimToken); + _SimCol = sH.product(); + + for ( SimParticleCollection::const_iterator i=_SimCol->begin(); i!=_SimCol->end(); ++i ){ + SimParticle const& sim = i->second; + _momT = sim.startMomentum().rho(); + _posT = sim.startPosition().rho(); + _cosTheta = cos(atan2(_momT,sim.startMomentum().z())); + _time = sim.time(); + genTree->Fill(); + } + + } +}//end mu2e namespace +using mu2e::DIFAna; +DEFINE_ART_MODULE(DIFAna) diff --git a/EventGenerator/src/GenFilter_module.cc b/EventGenerator/src/GenFilter_module.cc index 82baade2aa..3ef1068a64 100644 --- a/EventGenerator/src/GenFilter_module.cc +++ b/EventGenerator/src/GenFilter_module.cc @@ -16,6 +16,7 @@ #include "Offline/GeometryService/inc/GeomHandle.hh" #include "Offline/GlobalConstantsService/inc/GlobalConstantsHandle.hh" #include "Offline/GlobalConstantsService/inc/ParticleDataList.hh" +#include "Offline/TrackerGeom/inc/Tracker.hh" #include #include @@ -91,14 +92,16 @@ namespace mu2e { // extact field GeomHandle bfmgr; - XYZVectorF pos3Vec = XYZVectorF(aParticle.position().x(),aParticle.position().y(),aParticle.position().z()); + mu2e::GeomHandle tracker; + auto tracker_origin = det->toMu2e(tracker->origin()); + //XYZVectorF pos3Vec = XYZVectorF(aParticle.position().x(),aParticle.position().y(),aParticle.position().z()); + XYZVectorF pos3Vec = XYZVectorF(tracker_origin.x(),tracker_origin.y(),tracker_origin.z()); ROOT::Math::XYZVector bnom(bfmgr->getBField(pos3Vec).x(),bfmgr->getBField(pos3Vec).y(),bfmgr->getBField(pos3Vec).z()); // make the loophelix KinKal::LoopHelix lh(pos0, mom0, charge, bnom); // calculate rmax and add maxr to siminfo _maxr =sqrt(lh.cx()*lh.cx()+lh.cy()*lh.cy())+fabs(lh.rad()); - if(makeplots_){ // fill other branches for plots _momT = sqrt(mom0.x()*mom0.x() + mom0.y()*mom0.y()); From f64f6c44cf5b051aafc13c7bd9a145e7b5dd7283 Mon Sep 17 00:00:00 2001 From: sophieMu2e Date: Wed, 7 Feb 2024 10:46:29 -0600 Subject: [PATCH 101/213] added track origin --- Analyses/src/DIFAna_module.cc | 96 ----------------------------------- 1 file changed, 96 deletions(-) delete mode 100644 Analyses/src/DIFAna_module.cc diff --git a/Analyses/src/DIFAna_module.cc b/Analyses/src/DIFAna_module.cc deleted file mode 100644 index f191ba20ab..0000000000 --- a/Analyses/src/DIFAna_module.cc +++ /dev/null @@ -1,96 +0,0 @@ -// -// TODO: This file will analyze the outgoing photons energy, momentum and position by looking at the indicent electron/positron -// Original author S. Middleton -// - -#include "fhiclcpp/ParameterSet.h" -#include "art/Framework/Core/EDAnalyzer.h" -#include "art/Framework/Principal/Event.h" -#include "art/Framework/Principal/Handle.h" -#include "art_root_io/TFileService.h" -#include "canvas/Utilities/InputTag.h" - -#include "Offline/ProditionsService/inc/ProditionsHandle.hh" - -#include "Offline/GeometryService/inc/GeomHandle.hh" -#include "Offline/GeometryService/inc/DetectorSystem.hh" -#include "Offline/TrackerGeom/inc/Tracker.hh" -#include "Offline/MCDataProducts/inc/SimParticle.hh" - - -#include "CLHEP/Units/PhysicalConstants.h" -#include "CLHEP/Matrix/Vector.h" -#include "CLHEP/Matrix/SymMatrix.h" - -#include -#include -#include - -//ROOT -#include "TTree.h" - -using namespace std; -namespace mu2e{ - - class DIFAna : public art::EDAnalyzer { - public: - struct Config { - using Name=fhicl::Name; - using Comment=fhicl::Comment; - fhicl::Atom diag{Name("diag"), Comment("Create diag histograms"),0}; - fhicl::Atom SimToken{Name("SimParticleCollection"),Comment("tag for Sim collection")}; - }; - typedef art::EDAnalyzer::Table Parameters; - explicit DIFAna(const Parameters& conf); - virtual void beginJob() override; - virtual void analyze(const art::Event& e); - - private: - Config _conf; - int _diagLevel; - art::InputTag _SimToken; - const SimParticleCollection* _SimCol; - - TTree* genTree; - //Float_t _maxr; - Float_t _momT; - Float_t _posT; - Float_t _cosTheta; - Float_t _time; - - }; - - DIFAna::DIFAna(const Parameters& conf) : - art::EDAnalyzer(conf), - _diagLevel(conf().diag()), - _SimToken(conf().SimToken()) - {} - - void DIFAna::beginJob() { - art::ServiceHandle tfs; - genTree = tfs->make("GenAna", "GenAna"); - //genTree->Branch("maxr", &_maxr, "maxr/F"); - genTree->Branch("momT", &_momT, "momT/F"); - genTree->Branch("posT", &_posT, "posT/F"); - genTree->Branch("cosTheta", &_cosTheta, "cosTheta/F"); - genTree->Branch("time", &_time, "time/F"); - } - void DIFAna::analyze(const art::Event& event) { - - //------------SimParticles-------------// - auto sH = event.getValidHandle(_SimToken); - _SimCol = sH.product(); - - for ( SimParticleCollection::const_iterator i=_SimCol->begin(); i!=_SimCol->end(); ++i ){ - SimParticle const& sim = i->second; - _momT = sim.startMomentum().rho(); - _posT = sim.startPosition().rho(); - _cosTheta = cos(atan2(_momT,sim.startMomentum().z())); - _time = sim.time(); - genTree->Fill(); - } - - } -}//end mu2e namespace -using mu2e::DIFAna; -DEFINE_ART_MODULE(DIFAna) From c99180ba5665734501331f2332f044935adf84be Mon Sep 17 00:00:00 2001 From: David Nathan Brown Date: Wed, 7 Feb 2024 12:01:56 -0600 Subject: [PATCH 102/213] Change default --- TrackerConditions/fcl/prolog.fcl | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/TrackerConditions/fcl/prolog.fcl b/TrackerConditions/fcl/prolog.fcl index 268c159a92..2c38353e20 100644 --- a/TrackerConditions/fcl/prolog.fcl +++ b/TrackerConditions/fcl/prolog.fcl @@ -21,7 +21,7 @@ Mu2eDetector : { AlignedTracker : { verbose : 0 - useDb : false + useDb : true } FullReadoutStraw : { @@ -34,7 +34,7 @@ FullReadoutStraw : { TrackerStatus : { Settings : { verbose : 0 - useDb : false + useDb : true } Status : [ # [ "20_2_0", "uniquepanel", "Absent" ], # single panel is physically absent @@ -87,7 +87,7 @@ StrawPhysics : { StrawElectronics : { verbose : 0 - useDb : false + useDb : true overrideDbTimeOffsets : false defaultThresholddVdI : 8.43e6 From 19103914b4744cc04c94bd54ea27f2f30e3d5bf9 Mon Sep 17 00:00:00 2001 From: Mete Yucel Date: Wed, 7 Feb 2024 17:29:56 -0600 Subject: [PATCH 103/213] changes adressing comments --- RecoDataProducts/inc/BkgCluster.hh | 8 +-- TrkDiag/fcl/BkgDiag_station.fcl | 2 - TrkDiag/fcl/CHDiag_panel.fcl | 2 - TrkHitReco/fcl/prolog.fcl | 2 - TrkHitReco/inc/BkgClusterer.hh | 2 +- TrkHitReco/inc/Chi2Clusterer.hh | 10 ++-- TrkHitReco/inc/TNTClusterer.hh | 3 +- TrkHitReco/inc/TrainBkgDiag.hxx | 2 +- TrkHitReco/src/Chi2Clusterer.cc | 76 ++++++++++++++-------------- TrkHitReco/src/FlagBkgHits_module.cc | 32 ++++++------ TrkHitReco/src/TNTClusterer.cc | 39 +++++++------- 11 files changed, 87 insertions(+), 91 deletions(-) diff --git a/RecoDataProducts/inc/BkgCluster.hh b/RecoDataProducts/inc/BkgCluster.hh index bbea92f7e7..b6a628cbdb 100644 --- a/RecoDataProducts/inc/BkgCluster.hh +++ b/RecoDataProducts/inc/BkgCluster.hh @@ -15,11 +15,12 @@ namespace mu2e { struct BkgCluster { + enum distMethod {spatial,chi2}; + //Default hit count chosen for compuational efficiency BkgCluster() {_hits.reserve(16);} - BkgCluster(TwoDPoint point, float time, float weight) : _point(point), _time(time), _weight(weight){_hits.reserve(16);_cpoints.addPoint(_point,0);_pos = point.pos3();_wtime = _time*_weight;} - BkgCluster(XYZVectorF const& pos, float time) : _pos(pos), _time(time) {_hits.reserve(16);} - enum distMethod {spatial,chi2}; + BkgCluster(TwoDPoint point, float time, float weight, distMethod method) : _point(point), _time(time), _weight(weight), _distMethod(method){_hits.reserve(16);_cpoints.addPoint(_point,0);_pos = point.pos3();_wtime = _time*_weight;} + BkgCluster(XYZVectorF const& pos, float time, distMethod method) : _pos(pos), _time(time), _distMethod(method) {_hits.reserve(16);} float getKerasQ() const {return _kerasQ; } auto const& getDistMethod() const {return _distMethod; } @@ -35,7 +36,6 @@ namespace mu2e void time(float time) {_time = time;} void clearHits() {_hits.clear();} void setKerasQ(float kerasQ) {_kerasQ = kerasQ;} - void setDistanceMethod(distMethod method) {_distMethod = method;} void addHit(unsigned val) {_hits.emplace_back(val);} void addHit(unsigned val, TwoDPoint point, float time, float weight) { _hits.push_back(val); diff --git a/TrkDiag/fcl/BkgDiag_station.fcl b/TrkDiag/fcl/BkgDiag_station.fcl index 7ae576f63e..a64e74cd32 100644 --- a/TrkDiag/fcl/BkgDiag_station.fcl +++ b/TrkDiag/fcl/BkgDiag_station.fcl @@ -6,5 +6,3 @@ physics.producers.makeSTH.TestFlag : true physics.producers.FlagBkgHits.OutputLevel : "station" physics.analyzers.BD.ExpectedCHLevel : "station" physics.producers.makeSTH.DebugLevel : 0 -services.DbService.purpose: MDC2020_best -services.DbService.version: v1_1 diff --git a/TrkDiag/fcl/CHDiag_panel.fcl b/TrkDiag/fcl/CHDiag_panel.fcl index 48053306cf..e75d9d6295 100644 --- a/TrkDiag/fcl/CHDiag_panel.fcl +++ b/TrkDiag/fcl/CHDiag_panel.fcl @@ -2,5 +2,3 @@ #include "Offline/TrkHitReco/fcl/epilog_panel.fcl" #include "Offline/TrkHitReco/fcl/epilog_FBH_panel.fcl" physics.producers.makePH.TestFlag : true -services.DbService.purpose: MDC2020_best -services.DbService.version: v1_1 diff --git a/TrkHitReco/fcl/prolog.fcl b/TrkHitReco/fcl/prolog.fcl index 47ed3f304c..acca70f4c9 100644 --- a/TrkHitReco/fcl/prolog.fcl +++ b/TrkHitReco/fcl/prolog.fcl @@ -128,8 +128,6 @@ FlagBkgHits : { module_type : FlagBkgHits ComboHitCollection : "makeSTH" ClusterAlgorithm : 1 - TNTClustering : {@table::TNTClusterer} - Chi2Clustering : {@table::Chi2Clusterer} MinActiveHits : 3 MinNPlanes : 2 ClusterPositionError : 10 diff --git a/TrkHitReco/inc/BkgClusterer.hh b/TrkHitReco/inc/BkgClusterer.hh index 2ae0bf9aaf..900290a3da 100644 --- a/TrkHitReco/inc/BkgClusterer.hh +++ b/TrkHitReco/inc/BkgClusterer.hh @@ -9,7 +9,7 @@ namespace mu2e class BkgClusterer { public: - virtual ~BkgClusterer() {} + virtual ~BkgClusterer() {}; virtual void init () = 0; virtual void findClusters(BkgClusterCollection& clusters, const ComboHitCollection& shcol, int iev) = 0; virtual float distance (const BkgCluster& cluster, const ComboHit& hit) const = 0; diff --git a/TrkHitReco/inc/Chi2Clusterer.hh b/TrkHitReco/inc/Chi2Clusterer.hh index 02be3cefda..e84d100dd9 100644 --- a/TrkHitReco/inc/Chi2Clusterer.hh +++ b/TrkHitReco/inc/Chi2Clusterer.hh @@ -36,7 +36,7 @@ namespace mu2e { using Comment = fhicl::Comment; fhicl::Atom hitDistance{ Name("HitDistance"), Comment("Minimum cluster hit distance") }; fhicl::Atom seedDistance{ Name("SeedDistance"), Comment("Minimum distance for cluster seed") }; - fhicl::Atom minClusterHits{ Name("MinClusterHits"), Comment("Cut for minimum cluster hit size"),1 }; + fhicl::Atom minClusterHits{ Name("MinClusterHits"), Comment("Cut for minimum cluster hit size"),1 }; fhicl::Atom maxHitTimeDiff{ Name("MaxHitTimeDiff"), Comment("Maximum hit cluster time difference") }; fhicl::Atom maxCluIterations{ Name("MaxCluIterations"), Comment("Maximum number of cluster algo iterations") }; fhicl::Sequence bkgmsk{ Name("BackgroundMask"), Comment("Bkg hit selection mask") }; @@ -45,7 +45,7 @@ namespace mu2e { fhicl::Atom diag{ Name("Diag"), Comment("Diagnosis level"),0 }; }; - explicit Chi2Clusterer(const Config& config); + Chi2Clusterer(const std::optional config); virtual ~Chi2Clusterer() {}; void init(); @@ -54,7 +54,7 @@ namespace mu2e { private: - static constexpr int numBuckets_ =256; //number of buckets to store the cluster ids vs time + size_t numBuckets_; //number of buckets to store the cluster ids vs time void initClustering (const ComboHitCollection& chcol, std::vector& hinfo); void doClustering (const ComboHitCollection& chcol, std::vector& clusters, std::vector& hinfo); @@ -62,11 +62,13 @@ namespace mu2e { void dump (const std::vector& clusters, const std::vector& hinfo); float tbin_; + float tmin_; + float tmax_; float dhit_; float dseed_; float dt_; float chi2Cut_; - int minClusterHits_; + unsigned minClusterHits_; float maxHitdt_; unsigned maxNiter_; StrawHitFlag bkgmask_; diff --git a/TrkHitReco/inc/TNTClusterer.hh b/TrkHitReco/inc/TNTClusterer.hh index 43e90dd0d3..f1371c712d 100644 --- a/TrkHitReco/inc/TNTClusterer.hh +++ b/TrkHitReco/inc/TNTClusterer.hh @@ -10,7 +10,6 @@ #include "fhiclcpp/types/Atom.h" #include "Offline/RecoDataProducts/inc/StrawDigi.hh" #include "Offline/TrkHitReco/inc/BkgClusterer.hh" -//#include "Offline/GeneralUtilities/inc/CombineTwoDPoints.hh" #include "fhiclcpp/types/Sequence.h" #include @@ -57,7 +56,7 @@ namespace mu2e { }; - explicit TNTClusterer(const Config& config); + TNTClusterer(const std::optional config); virtual ~TNTClusterer() {}; void init (); diff --git a/TrkHitReco/inc/TrainBkgDiag.hxx b/TrkHitReco/inc/TrainBkgDiag.hxx index 4a5450b1b8..fbab209c59 100644 --- a/TrkHitReco/inc/TrainBkgDiag.hxx +++ b/TrkHitReco/inc/TrainBkgDiag.hxx @@ -1,4 +1,4 @@ -//Code generated automatically by TMVA for Inference of Model file [TrainBkgDiagStationChi2NEW.h5] at [Thu Jan 18 16:48:55 2024] +//Code generated automatically by TMVA for Inference of Model file [TrainBkgDiag.h5] at [Thu Jan 18 16:48:55 2024] #ifndef TMVA_SOFIE_TRAINBKGDIAG #define TMVA_SOFIE_TRAINBKGDIAG diff --git a/TrkHitReco/src/Chi2Clusterer.cc b/TrkHitReco/src/Chi2Clusterer.cc index d162e0df1e..f4ceca7f55 100644 --- a/TrkHitReco/src/Chi2Clusterer.cc +++ b/TrkHitReco/src/Chi2Clusterer.cc @@ -5,20 +5,22 @@ namespace mu2e { - Chi2Clusterer::Chi2Clusterer(const Config& config) : - dhit_ (config.hitDistance()), - dseed_ (config.seedDistance()), - minClusterHits_ (config.minClusterHits()), - maxHitdt_ (config.maxHitTimeDiff()), - maxNiter_ (config.maxCluIterations()), - bkgmask_ (config.bkgmsk()), - sigmask_ (config.sigmsk()), - testflag_ (config.testflag()), - diag_ (config.diag()) + Chi2Clusterer::Chi2Clusterer(const std::optional config) : + dhit_ (config.value().hitDistance()), + dseed_ (config.value().seedDistance()), + minClusterHits_ (config.value().minClusterHits()), + maxHitdt_ (config.value().maxHitTimeDiff()), + maxNiter_ (config.value().maxCluIterations()), + bkgmask_ (config.value().bkgmsk()), + sigmask_ (config.value().sigmsk()), + testflag_ (config.value().testflag()), + diag_ (config.value().diag()) { - tbin_ = 1.0; - chi2Cut_ = std::pow(((dseed_+dhit_)/2),2); + tbin_ = 0.; + tmin_ = 1800.; + tmax_ = 0.; + chi2Cut_ = 1.; distMethodFlag_ = BkgCluster::chi2; } @@ -38,10 +40,6 @@ namespace mu2e initClustering(chcol, BkgHits); doClustering(chcol, clusters, BkgHits); - long unsigned int minchits = minClusterHits_; - auto removePred = [minchits](auto& cluster) {return cluster.hits().size() < minchits;}; - clusters.erase(std::remove_if(clusters.begin(),clusters.end(),removePred),clusters.end()); - auto transPred = [&BkgHits] (const int i) {return BkgHits[i].chidx_;}; for (auto& cluster: clusters) std::transform(cluster.hits().begin(),cluster.hits().end(),cluster.hits().begin(),transPred); @@ -53,13 +51,16 @@ namespace mu2e //---------------------------------------------------------------------------------------------------------------------- void Chi2Clusterer::initClustering(const ComboHitCollection& chcol, std::vector& BkgHits) { - float maxTime(0); + float sumDriftTime(0); for (size_t ich=0;ich& clusters, std::vector& BkgHits) { unsigned niter(0); - float startChi2(0); - float deltaChi2(0); - //Check average Chi2 change. This is set to middle point of hit and seed radii(dhit_+dseed_/2)^2 - while ( deltaChi2 < chi2Cut_ && niter < maxNiter_ ) { + float prevChi2(0); + float deltaChi2(1000); + //Check average Chi2 change. + while ( deltaChi2 > chi2Cut_ && niter < maxNiter_ ) { ++niter; formClusters(chcol, clusters, BkgHits); @@ -87,8 +88,8 @@ namespace mu2e } } aveChi2 = sumChi2/nofCl; - if(niter == 1) startChi2 = aveChi2; - deltaChi2 = aveChi2 - startChi2; + deltaChi2 = aveChi2 - prevChi2; + prevChi2 = aveChi2; } if(diag_>0) std::cout<<"Nof_iter\t"<& clusters, std::vector& BkgHits) { - std::array, numBuckets_> clusterIndices; + std::vector> clusterIndices; + clusterIndices.resize(numBuckets_); for (size_t ic=0;ic dseed_) { minc = clusters.size(); - clusters.emplace_back(BkgCluster(TwoDPoint(chit.pos(),chit.uDir(),chit.uVar(),chit.vVar()),chit.correctedTime(),chit.nStrawHits())); + clusters.emplace_back(BkgCluster(TwoDPoint(chit.pos(),chit.uDir(),chit.uVar(),chit.vVar()),chit.correctedTime(),chit.nStrawHits(),distMethodFlag_)); clusters[minc].addHit(ihit); - int itime = int(chit.correctedTime()/tbin_); + size_t itime = size_t((chit.correctedTime()-tmin_)/tbin_); clusterIndices[itime].emplace_back(minc); - clusters[minc].setDistanceMethod(distMethodFlag_); } else minc = -1; } } for(auto cluster = clusters.begin(); cluster != clusters.end();){ - if((*cluster).hits().size() <= 1){ + if((*cluster).hits().size() <= minClusterHits_){ BkgHits[(*cluster).hits().at(0)].clusterIdx_ = -1; cluster = clusters.erase(cluster); } @@ -167,7 +169,7 @@ namespace mu2e //------------------------------------------------------------------------------------------- void Chi2Clusterer::dump(const std::vector& clusters, const std::vector& BkgHits) { - int iclu(0); + size_t iclu(0); for (auto& cluster: clusters) { std::cout<<"Cluster "< comboHitCollection{ Name("ComboHitCollection"), Comment("ComboHit collection name") }; - fhicl::Atom minActiveHits{ Name("MinActiveHits"), Comment("Minumim number of active hits in a cluster") }; - fhicl::Atom minNPlanes{ Name("MinNPlanes"), Comment("Minumim number of planes in a cluster") }; - fhicl::Atom clusterPositionError{ Name("ClusterPositionError"), Comment("Cluster poisiton error") }; - fhicl::Atom clusterAlgorithm{ Name("ClusterAlgorithm"), Comment("Clusterer algorithm") }; - fhicl::Atom filterHits{ Name("FilterHits"), Comment("Produce filtered ComboHit collection") }; - fhicl::Sequence backgroundMask{ Name("BackgroundMask"), Comment("Bkg hit selection mask") }; - fhicl::Atom saveBkgClusters{ Name("SaveBkgClusters"), Comment("Save bkg clusters") }; - fhicl::Atom outputLevel{ Name("OutputLevel"), Comment("Level of the output ComboHitCollection") }; - fhicl::Atom debugLevel{ Name("DebugLevel"), Comment("Debug"),0 }; - fhicl::Table TNTClustering{ Name("TNTClustering"), Comment("TNT Clusterer config") }; - fhicl::Table Chi2Clustering{ Name("Chi2Clustering"), Comment("Chi2 Clusterer config") }; - fhicl::Atom kerasWeights{ Name("KerasWeights"), Comment("Weights for keras model") }; - fhicl::Atom kerasQuality{ Name("KerasQuality"), Comment("Keras quality cut") }; + fhicl::Atom comboHitCollection{ Name("ComboHitCollection"), Comment("ComboHit collection name") }; + fhicl::Atom minActiveHits{ Name("MinActiveHits"), Comment("Minumim number of active hits in a cluster") }; + fhicl::Atom minNPlanes{ Name("MinNPlanes"), Comment("Minumim number of planes in a cluster") }; + fhicl::Atom clusterPositionError{ Name("ClusterPositionError"), Comment("Cluster poisiton error") }; + fhicl::Atom clusterAlgorithm{ Name("ClusterAlgorithm"), Comment("Clusterer algorithm") }; + fhicl::Atom filterHits{ Name("FilterHits"), Comment("Produce filtered ComboHit collection") }; + fhicl::Sequence backgroundMask{ Name("BackgroundMask"), Comment("Bkg hit selection mask") }; + fhicl::Atom saveBkgClusters{ Name("SaveBkgClusters"), Comment("Save bkg clusters") }; + fhicl::Atom outputLevel{ Name("OutputLevel"), Comment("Level of the output ComboHitCollection") }; + fhicl::Atom debugLevel{ Name("DebugLevel"), Comment("Debug"),0 }; + fhicl::OptionalTable TNTClustering{ Name("TNTClustering"), Comment("TNT Clusterer config") }; + fhicl::OptionalTable Chi2Clustering{ Name("Chi2Clustering"), Comment("Chi2 Clusterer config") }; + fhicl::Atom kerasWeights{ Name("KerasWeights"), Comment("Weights for keras model") }; + fhicl::Atom kerasQuality{ Name("KerasQuality"), Comment("Keras quality cut") }; }; - //enum clusterer {TwoNiveauThreshold=1}; enum clusterer {TNT=1,Chi2=2}; explicit FlagBkgHits(const art::EDProducer::Table& config); void beginJob() override; void produce(art::Event& event) override; private: + using BkgClustererRef = std::reference_wrapper; const art::ProductToken chtoken_; unsigned minnhits_; unsigned minnp_; @@ -111,7 +112,6 @@ namespace mu2e clusterer ctype = static_cast(config().clusterAlgorithm()); switch ( ctype ) { - //case TwoNiveauThreshold: case TNT: clusterer_ = std::make_unique(config().TNTClustering()); break; diff --git a/TrkHitReco/src/TNTClusterer.cc b/TrkHitReco/src/TNTClusterer.cc index 87a16a8815..6a017dfe07 100644 --- a/TrkHitReco/src/TNTClusterer.cc +++ b/TrkHitReco/src/TNTClusterer.cc @@ -5,25 +5,25 @@ namespace mu2e { - TNTClusterer::TNTClusterer(const Config& config) : - dhit_ (config.hitDistance()), - dseed_ (config.seedDistance()), - dd_ (config.clusterDiameter()), - dt_ (config.clusterTime()), - minClusterHits_ (config.minClusterHits()), - maxHitdt_ (config.maxHitTimeDiff()), - maxDistSum_ (config.maxSumDistance()), - maxNiter_ (config.maxCluIterations()), - useMedian_ (config.medianCentroid()), - comboInit_ (config.comboInit()), - bkgmask_ (config.bkgmsk()), - sigmask_ (config.sigmsk()), - testflag_ (config.testflag()), - diag_ (config.diag()) + TNTClusterer::TNTClusterer(const std::optional config) : + dhit_ (config.value().hitDistance()), + dseed_ (config.value().seedDistance()), + dd_ (config.value().clusterDiameter()), + dt_ (config.value().clusterTime()), + minClusterHits_ (config.value().minClusterHits()), + maxHitdt_ (config.value().maxHitTimeDiff()), + maxDistSum_ (config.value().maxSumDistance()), + maxNiter_ (config.value().maxCluIterations()), + useMedian_ (config.value().medianCentroid()), + comboInit_ (config.value().comboInit()), + bkgmask_ (config.value().bkgmsk()), + sigmask_ (config.value().sigmsk()), + testflag_ (config.value().testflag()), + diag_ (config.value().diag()) { - float minerr (config.minHitError()); - float maxdist(config.maxDistance()); - float trms (config.timeRMS()); + float minerr (config.value().minHitError()); + float maxdist(config.value().maxDistance()); + float trms (config.value().timeRMS()); tbin_ =1.0; dd2_ = dd_*dd_; @@ -140,11 +140,10 @@ namespace mu2e } else if (mindist > dseed_) { minc = clusters.size(); - clusters.emplace_back(chit.pos(),chit.correctedTime()); + clusters.emplace_back(chit.pos(),chit.correctedTime(),distMethodFlag_); clusters[minc].addHit(ihit); int itime = int(chit.correctedTime()/tbin_); clusterIndices[itime].emplace_back(minc); - clusters[minc].setDistanceMethod(distMethodFlag_); } else{ BkgHits[ihit].distance_ = 10000.0f; From 4ab4ba3c0dffa2b4eaa0f407d4502ea5d5a5b270 Mon Sep 17 00:00:00 2001 From: sophieMu2e Date: Fri, 9 Feb 2024 08:29:15 -0600 Subject: [PATCH 104/213] reverted CRY --- Analyses/src/CRYGenPlots_module.cc | 119 +++++++++++++---------------- 1 file changed, 52 insertions(+), 67 deletions(-) diff --git a/Analyses/src/CRYGenPlots_module.cc b/Analyses/src/CRYGenPlots_module.cc index 6d177ce613..1028f6fe5d 100644 --- a/Analyses/src/CRYGenPlots_module.cc +++ b/Analyses/src/CRYGenPlots_module.cc @@ -1,3 +1,11 @@ +//////////////////////////////////////////////////////////////////////// +// Class: CRYGenPlots +// Plugin Type: analyzer (art v2_10_04) +// File: CRYGenPlots_module.cc +// +// Generated at Wed Jun 27 18:05:40 2018 by Hoai Nam Tran using cetskelgen +// from cetlib version v3_02_01. +//////////////////////////////////////////////////////////////////////// #include "art/Framework/Core/EDAnalyzer.h" #include "art/Framework/Principal/Event.h" @@ -16,7 +24,6 @@ #include "Offline/GlobalConstantsService/inc/PhysicsParams.hh" #include "Offline/GlobalConstantsService/inc/ParticleDataList.hh" #include "Offline/MCDataProducts/inc/GenParticle.hh" -#include "Offline/Mu2eUtilities/inc/TwoLinePCA.hh" #include "Offline/Mu2eUtilities/inc/compressPdgId.hh" #include "Offline/DataProducts/inc/PDGCode.hh" @@ -54,47 +61,46 @@ class mu2e::CRYGenPlots : public art::EDAnalyzer { std::string processName_; std::string CRYModuleLabel_; std::string CRYInstanceName_; - float _keMax = std::numeric_limits::max(); + double _keMax; // histograms - TH2F *_hXZ = nullptr; - TH1F *_hY = nullptr; - TH1F *_hKE = nullptr; - TH1F *_hTheta = nullptr; - TH1F *_hPhi = nullptr; - TH1F *_hPmag = nullptr; - TH1F *_hPyOverPmag = nullptr; - TH1F *_hTime = nullptr; - TH2F *_hPtypeKE = nullptr; - TH1F *_hNSecondaries = nullptr; - - TTree *_cosmicTree = nullptr; - TTree *_eventTree = nullptr; - - float _x = std::numeric_limits::lowest(); - float _y = std::numeric_limits::lowest(); - float _z = std::numeric_limits::lowest(); - float _px = std::numeric_limits::lowest(); - float _py = std::numeric_limits::lowest(); - float _pz = std::numeric_limits::lowest(); - float _theta = std::numeric_limits::lowest(); - float _phi = std::numeric_limits::lowest(); - float _KE = std::numeric_limits::lowest(); - float _p = std::numeric_limits::lowest(); - float _t = std::numeric_limits::lowest(); - std::vector _dca; - PDGCode::type _pdgId; + TH2F *_hXZ; + TH1F *_hY; + TH1F *_hKE; + TH1F *_hTheta; + TH1F *_hPhi; + TH1F *_hPmag; + TH1F *_hPyOverPmag; + TH1F *_hTime; + TH2F *_hPtypeKE; + TH1F *_hNSecondaries; + + TTree *_cosmicTree; + + float _x; + float _y; + float _z; + float _px; + float _py; + float _pz; + float _theta; + float _phi; + float _KE; + float _p; + float _t; + int _pdgId; void bookHists(art::ServiceHandle &); GlobalConstantsHandle pdt; }; -mu2e::CRYGenPlots::CRYGenPlots(fhicl::ParameterSet const &p) - : EDAnalyzer(p), - processName_(p.get("processName", "")), - CRYModuleLabel_(p.get("CRYModuleLabel", "FromCRYBinary")), - CRYInstanceName_(p.get("CRYInstanceName", "")), - _keMax(p.get("keMax", 10E3)) + + mu2e::CRYGenPlots::CRYGenPlots(fhicl::ParameterSet const & p) +: EDAnalyzer(p) + , processName_(p.get("processName", "")) + , CRYModuleLabel_(p.get("CRYModuleLabel", "cryGen")) + , CRYInstanceName_(p.get("CRYInstanceName", "")) + , _keMax(p.get("keMax", 10E3)) { art::ServiceHandle tfs; @@ -114,9 +120,6 @@ mu2e::CRYGenPlots::CRYGenPlots(fhicl::ParameterSet const &p) _cosmicTree->Branch("p", &_p, "p/F"); _cosmicTree->Branch("t", &_t, "t/F"); _cosmicTree->Branch("pdgId", &_pdgId, "pdgId/I"); - - _eventTree = tfs->make("eventTree", "TTree with cosmic ray info per shower"); - _eventTree->Branch("dca", &_dca); } @@ -129,41 +132,13 @@ void mu2e::CRYGenPlots::analyze(art::Event const & e) success = e.getByLabel(CRYModuleLabel_, CRYInstanceName_, processName_, gpHandle); else - success = e.getByLabel(CRYModuleLabel_, gpHandle); + success = e.getByLabel(CRYModuleLabel_, CRYInstanceName_, gpHandle); if (!success) return; const auto & particles = *gpHandle; - - // Store the point of closest approach between target box and roof for - // events with more than one particle - _dca.clear(); - for (GenParticleCollection::const_iterator i = particles.begin(); i != particles.end(); ++i) - { - for (GenParticleCollection::const_iterator j = i+1; j != particles.end(); ++j) - { - GenParticle const &particle1 = *i; - GenParticle const &particle2 = *j; - - TwoLinePCA twoLine(particle1.position(), -particle1.momentum().vect(), particle2.position(), -particle2.momentum().vect()); - const CLHEP::Hep3Vector point1 = twoLine.point1(); - const CLHEP::Hep3Vector point2 = twoLine.point2(); - - - if (point1.y() > 5000 && - point1.y() < 15365.4 && - point2.y() > 5000 && - point2.y() < 15365.4) - { - _dca.push_back(twoLine.dca()); - } - } - } - _eventTree->Fill(); - _hNSecondaries->Fill(particles.size()); - for(const auto & p : particles) { _hXZ->Fill(p.position().x(), p.position().z()); @@ -194,6 +169,7 @@ void mu2e::CRYGenPlots::analyze(art::Event const & e) _theta = yMom3.theta(); _phi = yMom3.phi(); + _KE = mom4.e() - mass; _p = mom3.mag(); @@ -202,8 +178,17 @@ void mu2e::CRYGenPlots::analyze(art::Event const & e) _pdgId = p.pdgId(); _cosmicTree->Fill(); + _hKE->Fill(mom4.e() - mass); + _hTheta->Fill(yMom3.theta()); + _hPhi->Fill(yMom3.phi()); + + _hPmag->Fill(mom3.mag()); + _hTime->Fill(p.time()); + _hPyOverPmag->Fill(mom4.py() / mom3.mag()); + int pbin = compressPdgIdCosmic(p.pdgId()); _hPtypeKE->Fill(mom4.e(), pbin); + } } From 54117c1796233a3739bf778c8e2af2f208d5efb2 Mon Sep 17 00:00:00 2001 From: David Nathan Brown Date: Fri, 9 Feb 2024 11:28:56 -0600 Subject: [PATCH 105/213] Update scripts --- Mu2eKinKal/test/KKDrift.fcl | 1 - Mu2eKinKal/test/KKLineDrift.fcl | 1 - Mu2eKinKal/test/KKLineSeed.fcl | 1 - Mu2eKinKal/test/KKOffSpill.fcl | 1 - Mu2eKinKal/test/KKOffSpillSeed.fcl | 1 - Mu2eKinKal/test/KKSeed.fcl | 1 - Mu2eKinKal/test/TTBTrk.fcl | 2 -- Mu2eKinKal/test/TTOffline.fcl | 1 - 8 files changed, 9 deletions(-) diff --git a/Mu2eKinKal/test/KKDrift.fcl b/Mu2eKinKal/test/KKDrift.fcl index 606129c512..7fa15f0fd0 100644 --- a/Mu2eKinKal/test/KKDrift.fcl +++ b/Mu2eKinKal/test/KKDrift.fcl @@ -105,7 +105,6 @@ physics.analyzers.TAKK.candidate.options : @local::AllOpt physics.analyzers.TAKK.diagLevel : 2 physics.analyzers.TAKK.FillMCInfo : true physics.analyzers.TAKK.FillCRVHits : true -physics.analyzers.TAKK.FillTrkQualInfo : false physics.analyzers.TAKK.FillTrkPIDInfo : false physics.analyzers.TAKK.FillHitInfo : true physics.analyzers.TAKK.FillTriggerInfo : false diff --git a/Mu2eKinKal/test/KKLineDrift.fcl b/Mu2eKinKal/test/KKLineDrift.fcl index 8f610b2962..e2db30127c 100644 --- a/Mu2eKinKal/test/KKLineDrift.fcl +++ b/Mu2eKinKal/test/KKLineDrift.fcl @@ -59,7 +59,6 @@ physics : FillMCInfo : true FillCRVHits : true - FillTrkQualInfo : false FillTrkPIDInfo : false FillHitInfo : true FillTriggerInfo : false diff --git a/Mu2eKinKal/test/KKLineSeed.fcl b/Mu2eKinKal/test/KKLineSeed.fcl index 9d7ba1a606..ab39b4daac 100644 --- a/Mu2eKinKal/test/KKLineSeed.fcl +++ b/Mu2eKinKal/test/KKLineSeed.fcl @@ -58,7 +58,6 @@ physics : FillMCInfo : true FillCRVHits : true - FillTrkQualInfo : false FillTrkPIDInfo : false FillHitInfo : true FillTriggerInfo : false diff --git a/Mu2eKinKal/test/KKOffSpill.fcl b/Mu2eKinKal/test/KKOffSpill.fcl index 51e9949948..2ef55056b4 100644 --- a/Mu2eKinKal/test/KKOffSpill.fcl +++ b/Mu2eKinKal/test/KKOffSpill.fcl @@ -59,7 +59,6 @@ physics : FillMCInfo : true FillCRVHits : true - FillTrkQualInfo : false FillTrkPIDInfo : false FillHitInfo : true FillTriggerInfo : false diff --git a/Mu2eKinKal/test/KKOffSpillSeed.fcl b/Mu2eKinKal/test/KKOffSpillSeed.fcl index 33d577e9d2..abffe2ede2 100644 --- a/Mu2eKinKal/test/KKOffSpillSeed.fcl +++ b/Mu2eKinKal/test/KKOffSpillSeed.fcl @@ -59,7 +59,6 @@ physics : FillMCInfo : true FillCRVHits : true - FillTrkQualInfo : false FillTrkPIDInfo : false FillHitInfo : true FillTriggerInfo : false diff --git a/Mu2eKinKal/test/KKSeed.fcl b/Mu2eKinKal/test/KKSeed.fcl index d0d88a5fdf..38ed58ecf6 100644 --- a/Mu2eKinKal/test/KKSeed.fcl +++ b/Mu2eKinKal/test/KKSeed.fcl @@ -83,7 +83,6 @@ physics.analyzers.TAKK.diagLevel : 2 physics.analyzers.TAKK.FillCRVHits : false physics.analyzers.TAKK.FillMCInfo : true physics.analyzers.TAKK.FillTriggerInfo : true -physics.analyzers.TAKK.FillTrkQualInfo : false physics.analyzers.TAKK.FillTrkPIDInfo : false physics.analyzers.TAKK.FillHitInfo : true physics.analyzers.TAKK.FillTriggerInfo : false diff --git a/Mu2eKinKal/test/TTBTrk.fcl b/Mu2eKinKal/test/TTBTrk.fcl index 65f5a8c4f8..845a081c98 100644 --- a/Mu2eKinKal/test/TTBTrk.fcl +++ b/Mu2eKinKal/test/TTBTrk.fcl @@ -84,7 +84,6 @@ physics.analyzers.TAtpr.FillCRVHits : false physics.analyzers.TAtpr.FillMCInfo : false physics.analyzers.TAtpr.RecoCountTag : "" physics.analyzers.TAtpr.FillTriggerInfo : true -physics.analyzers.TAtpr.FillTrkQualInfo : false physics.analyzers.TAtpr.FillTrkPIDInfo : false physics.analyzers.TAtpr.FillHitInfo : true physics.analyzers.TAtpr.FillTriggerInfo : false @@ -100,7 +99,6 @@ physics.analyzers.TAcpr.FillCRVHits : false physics.analyzers.TAcpr.FillMCInfo : false physics.analyzers.TAcpr.RecoCountTag : "" physics.analyzers.TAcpr.FillTriggerInfo : true -physics.analyzers.TAcpr.FillTrkQualInfo : false physics.analyzers.TAcpr.FillTrkPIDInfo : false physics.analyzers.TAcpr.FillHitInfo : true physics.analyzers.TAcpr.FillTriggerInfo : false diff --git a/Mu2eKinKal/test/TTOffline.fcl b/Mu2eKinKal/test/TTOffline.fcl index c4f12f5f6f..7445f24173 100644 --- a/Mu2eKinKal/test/TTOffline.fcl +++ b/Mu2eKinKal/test/TTOffline.fcl @@ -113,7 +113,6 @@ physics.analyzers.TAKK.diagLevel : 2 physics.analyzers.TAKK.FillCRVHits : false physics.analyzers.TAKK.FillMCInfo : true physics.analyzers.TAKK.FillTriggerInfo : true -physics.analyzers.TAKK.FillTrkQualInfo : false physics.analyzers.TAKK.FillTrkPIDInfo : false physics.analyzers.TAKK.FillHitInfo : true physics.analyzers.TAKK.FillTriggerInfo : false From c32553b9f6647ec4b58453710cb49e438bced52f Mon Sep 17 00:00:00 2001 From: Sophie Middleton Date: Fri, 9 Feb 2024 15:16:54 -0600 Subject: [PATCH 106/213] Update KalSeedMC.hh --- MCDataProducts/inc/KalSeedMC.hh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/MCDataProducts/inc/KalSeedMC.hh b/MCDataProducts/inc/KalSeedMC.hh index 3b4cab60b9..aad5a74d87 100644 --- a/MCDataProducts/inc/KalSeedMC.hh +++ b/MCDataProducts/inc/KalSeedMC.hh @@ -35,7 +35,7 @@ namespace mu2e { uint16_t _nhits; // number of associated StrawHits uint16_t _nactive; // number of associated active hits XYZTVectorF _mom; // initial momentum - CLHEP::Hep3Vector _pos; // initial position + XYZVectorF _pos; // initial position double _time; //global start time cet::map_vector_key _spkey; // key to the SimParticle // construct a Ptr from Handle and key From 98d7287fe36ce2f88793f417166c36e70219cc82 Mon Sep 17 00:00:00 2001 From: Rob Kutschke Date: Fri, 9 Feb 2024 16:11:37 -0600 Subject: [PATCH 107/213] Quick fix for the crashes in g4test_03MT.fcl and transportOnly.fcl introduced by Offline PR #1183. The fix is to remove all hit processing downstream of g4run and then edit ReadBack_module.cc to skip steps when it's inputs are missing. The full fix will be to remove unneeded parts of ReadBack_module.cc in their entirety, prune configuration that is no longer needed, switch to validated fcl and update about 15 .fcl files (some of which can be deleted). --- Analyses/src/ReadBack_module.cc | 9 ++------- Mu2eG4/fcl/g4test_03.fcl | 21 +-------------------- Mu2eG4/fcl/transportOnly.fcl | 29 +---------------------------- 3 files changed, 4 insertions(+), 55 deletions(-) diff --git a/Analyses/src/ReadBack_module.cc b/Analyses/src/ReadBack_module.cc index 782df4910c..5e4652f442 100644 --- a/Analyses/src/ReadBack_module.cc +++ b/Analyses/src/ReadBack_module.cc @@ -388,15 +388,10 @@ namespace mu2e { //Calorimeter shower MC art::Handle caloShowerSimHandle; event.getByLabel(_caloShowerSimModuleLabel, caloShowerSimHandle); - const CaloShowerSimCollection& caloShowerSims(*caloShowerSimHandle); //Crystal hits (average from readouts) art::Handle CaloHitsHandle; event.getByLabel(_caloCrystalModuleLabel, CaloHitsHandle); - CaloHitCollection const& CaloHits(*CaloHitsHandle); - - - //collect all StepPointMC in crystal @@ -424,10 +419,9 @@ namespace mu2e { for (const auto& iter : stepPtMap) _hCaStepEdep->Fill(iter.first,iter.second); for (const auto& iter : stepPtMap2) _hCaStepNum->Fill(iter.first,iter.second); - - //do the same with the CaloShowers if (!caloShowerSimHandle.isValid()) return; + const CaloShowerSimCollection& caloShowerSims(*caloShowerSimHandle); map showerMap; map showerMap2; @@ -448,6 +442,7 @@ namespace mu2e { //look at reconstructed hits if (!CaloHitsHandle.isValid()) return; + CaloHitCollection const& CaloHits(*CaloHitsHandle); double totalEdep = 0.0; set hit_crystals; diff --git a/Mu2eG4/fcl/g4test_03.fcl b/Mu2eG4/fcl/g4test_03.fcl index 4dda8aca16..6476f4e212 100644 --- a/Mu2eG4/fcl/g4test_03.fcl +++ b/Mu2eG4/fcl/g4test_03.fcl @@ -37,14 +37,6 @@ physics : { # Run G4 and add its output to the event. g4run : @local::g4run - # Work needed to setup the digi makers. - @table::CommonMC.producers - @table::TrackerMC.producers - - # Calorimeter sequence - @table::CaloMC.producers - @table::CaloReco.producers - # Save state of the random number engines. randomsaver : @local::randomsaver @@ -68,8 +60,7 @@ physics : { } - p1 : [generate, g4run, @sequence::CommonMC.DigiSim, @sequence::TrackerMC.StepAndDigiSim, @sequence::CaloMC.StepAndDigiSim, - @sequence::CaloReco.Reco,randomsaver ] + p1 : [generate, g4run, randomsaver ] e1 : [readGens, checkhits, outfile] trigger_paths : [p1] @@ -94,20 +85,10 @@ services.SeedService.maxUniqueEngines : 20 services.scheduler.wantSummary: true services.TimeTracker.printSummary: true -# physics.producers.g4run.SDConfig.enableAllSDs : true physics.producers.g4run.SDConfig.enableSD : [tracker, calorimeter, calorimeterRO, CRV, virtualdetector, stoppingtarget ] -# physics.producers.g4run.BirksConsts : { G4_POLYSTYRENE : 0.07943 } // {string : mm/MeV } # mu stops physics.producers.generate.muonStops.inputFiles : @local::mergedMuon_tgtStops_mdc2018 // Enable diagnsotic printout for pedagogical purposes. -physics.producers.makeSH.diagLevel : 0 -physics.producers.makeSH.maxFullPrint : 5 -#physics.producers.g4run.visualization.initMacro : "Mu2eG4/vis/vismqt.mac" -physics.producers.CaloShowerStepMaker.physVolInfoInput : "g4run" -#physics.producers.g4run.physics.turnOffRadioactiveDecay: true -#physics.producers.g4run.physics.addProcesses : [ "GammaToMuPair", "AnnihiToMuPair", "ee2hadr" ] #physics.producers.g4run.debug.diagLevel : 1 -#physics.producers.g4run.physics.minRangeRegionCuts: { -# CalorimeterMother : 0.1 TrackerMother : 0.001 } // {RegionName : mm } diff --git a/Mu2eG4/fcl/transportOnly.fcl b/Mu2eG4/fcl/transportOnly.fcl index c2626da523..ac29668155 100644 --- a/Mu2eG4/fcl/transportOnly.fcl +++ b/Mu2eG4/fcl/transportOnly.fcl @@ -29,14 +29,6 @@ physics : { # Run G4 and add its output to the event. g4run : @local::g4run - # Work needed to setup the digi makers. - @table::CommonMC.producers - @table::TrackerMC.producers - - # Calorimeter sequence - @table::CaloMC.producers - @table::CaloReco.producers - # Save state of the random number engines. randomsaver : @local::randomsaver @@ -68,8 +60,7 @@ physics : { } - p1 : [generate , g4run, @sequence::CommonMC.DigiSim, @sequence::TrackerMC.StepAndDigiSim, @sequence::CaloMC.StepAndDigiSim, @sequence::CaloReco.Reco,randomsaver ] -# e1 : [readGens, checkhits, readvd, outfile, dump] + p1 : [generate , g4run, randomsaver ] e1 : [readGens, checkhits, readvd, outfile] trigger_paths : [p1] @@ -83,16 +74,8 @@ outputs: { module_type : RootOutput fileName : "transportOnly.art" } - # Print info about all data products in the file. -# dump: -# { -# module_type : DataProductDump -# # temporary patch for crash until art 2_10 or 2_11 -# wantResolvedOnly: true -# } } -physics.producers.EWMProducer.SpillType : 1 // Initialze seeding of random engines: do not put these lines in base .fcl files for grid jobs. services.SeedService.baseSeed : 8 @@ -104,19 +87,9 @@ services.TimeTracker.printSummary: true // Disable all physics except transport. physics.producers.g4run.physics.physicsListName: "Minimal" -# physics.producers.g4run.SDConfig.enableAllSDs : true physics.producers.g4run.SDConfig.enableSD : [tracker, calorimeter, calorimeterRO, CRV, virtualdetector, stoppingtarget ] -#physics.producers.g4run.SDConfig.enableSD : @erase # mu stops physics.producers.generate.muonStops.inputFiles : @local::mergedMuon_tgtStops_mdc2018 -// Enable diagnsotic printout for pedagogical purposes. -physics.producers.makeSH.diagLevel : 0 -physics.producers.makeSH.maxFullPrint : 5 -physics.producers.makeSH.minimumEnergy : 0 - -#physics.producers.g4run.visualization.initMacro : "Mu2eG4/vis/vismqt.mac" -#physics.producers.CaloShowerStepMaker.physVolInfoInput : "g4run" physics.producers.g4run.debug.diagLevel : 1 -#physics.producers.g4run.debug.worldVerbosityLevel : 1 From 99a5d7c239cc3c2e6604ea80a98620b59f6ac1c8 Mon Sep 17 00:00:00 2001 From: Rob Kutschke Date: Fri, 9 Feb 2024 21:08:18 -0600 Subject: [PATCH 108/213] Trival update to force CI to rebuild. --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 99c4132978..879dd1a665 100644 --- a/README.md +++ b/README.md @@ -1,2 +1,2 @@ # Offline -Offline software for the Mu2e experiment. +Offline software for the Mu2e experiment at Fermilab. From ff2c421cdf6c63ddee0e5c1f24a7de653648525f Mon Sep 17 00:00:00 2001 From: Rob Kutschke Date: Sun, 11 Feb 2024 13:27:01 -0600 Subject: [PATCH 109/213] Update to validated fcl. --- Analyses/src/ReadBack_module.cc | 203 +++++++++++++++----------------- 1 file changed, 94 insertions(+), 109 deletions(-) diff --git a/Analyses/src/ReadBack_module.cc b/Analyses/src/ReadBack_module.cc index 5e4652f442..526514e6e0 100644 --- a/Analyses/src/ReadBack_module.cc +++ b/Analyses/src/ReadBack_module.cc @@ -53,10 +53,46 @@ using CLHEP::keV; namespace mu2e { class ReadBack : public art::EDAnalyzer { + + struct Config { + using Name=fhicl::Name; + using Comment=fhicl::Comment; + + /* + - gensTag: + - trackerStepPoints: + - calorimeterStepPoints: + - caloShowerSimModuleLabel: + - caloCrystalModuleLabel: + - targetStepPoints: + - CRVStepPoints: + */ + + fhicl::Atom diagLevel{Name("diagLevel"), Comment("Level of diagnostic printout; larger = more printout."), 0}; + fhicl::Atom gensTag{Name("gensTag"), Comment("Input tag for generator output."), art::InputTag("generate")}; + fhicl::Atom generatorModuleLabel{Name("generatorModuleLabel"), Comment("Module label of event generator.")}; + fhicl::Atom g4ModuleLabel{Name("g4ModuleLabel"), Comment("Module label of module that ran Geant4.")}; + fhicl::Atom trackerStepPoints{Name("trackerStepPoints"), Comment("Instance name of tracker StepPointMCs."),"tracker"}; + fhicl::Atom calorimeterStepPoints{Name("calorimeterStepPoints"), Comment("Instance name of StepPointMCs for the calorimeter Crystals."), "calorimeter"}; + fhicl::Atom caloShowerSimModuleLabel{Name("caloShowerSimModuleLabel"), Comment("Module label of a CaloShowerSimCollection."), "CaloShowerROMaker"}; + fhicl::Atom caloCrystalModuleLabel{Name("caloCrystalModuleLabel"), Comment("Module label of a CaloHitCollection."),"CaloHitMaker"}; + fhicl::Atom targetStepPoints{Name("targetStepPoints"), Comment("Instance name of StepPointMCs for the stopping target."),"stoppingtarget"}; + fhicl::Atom crvStepPoints{Name("CRVStepPoints"), + Comment("Instance name of StepPointMCs for the CRV."),"CRV"}; + fhicl::Atom minimumEnergy{Name("minimumEnergy"), + Comment("Minimum energy deposited for tracker StepPointMC to be counted.")}; + fhicl::Atom maxFullPrint{Name("maxFullPrint"), + Comment("Maximum number of events for which to give full printout."), 5}; + fhicl::Atom xyHitsMax{Name("xyHitsMax"), + Comment("Maximum number of tracker StepPointMCs to add to the example TGraph ."), 10000}; + fhicl::Atom SHPositionTolerance{Name("SHPositionTolerance"), + Comment("Minimum energy deposited for tracker StepPointMC to be counted."), 0.01}; + }; + typedef art::EDAnalyzer::Table Parameters; + public: - explicit ReadBack(fhicl::ParameterSet const& pset); - virtual ~ReadBack() { } + explicit ReadBack( Parameters const& conf ); virtual void beginJob() override; virtual void endJob() override; @@ -79,9 +115,6 @@ namespace mu2e { // Module label of the g4 module that made the hits. std::string _g4ModuleLabel; - // Module label of the generator module that was passed as input to G4. - std::string _generatorModuleLabel; - // Name of the tracker StepPoint collection std::string _trackerStepPoints; @@ -115,55 +148,54 @@ namespace mu2e { // End: run time parameters // Number of events analyzed. - int _nAnalyzed; + int _nAnalyzed = 0; // Pointers to histograms, ntuples, TGraphs. - TH1F* _hRadius; - TH1F* _hEnergyDep; - TH1F* _hTime; - TH1F* _hMultiplicity; - TH1F* _hDriftDist; - TH1F* _hDriftDistW; - TH1F* _hxHit; - TH1F* _hyHit; - TH1F* _hzHit; - TH1F* _hHitNeighbours; - TH1F* _hCheckPointRadius; - TH1F* _hCheckPointRadiusW; - TH1F* _hCheckPointWireZ; - TH1F* _hMomentumG4; - TH1F* _hStepLength; - - TH1F* _hCaStepEdep; - TH1F* _hCaStepNum; - TH1F* _hCaShowerEdep; - TH1F* _hCaShowerNum; - TH1F* _hCaTime; - TH1F* _hCaEdep; - TH2F* _hCaCrystalXY; - TH1F* _hCaEdepMC; - TH1F* _hCaNcrystal; - - TH1F* _hTargetEdep; - TH1F* _hTargetPathLength; - TH1F* _hTargetNfoils; - TH2F* _hTargetNfoils2D; - - TH1F* _hNPointTrajectories; - TH1F* _hNPointsPerTrajectory; - TH1F* _hNPointsPerTrajectoryLog; - - TNtuple* _ntup; - TGraph* _xyHits; + TH1F* _hRadius = nullptr; + TH1F* _hEnergyDep = nullptr; + TH1F* _hTime = nullptr; + TH1F* _hMultiplicity = nullptr; + TH1F* _hDriftDist = nullptr; + TH1F* _hDriftDistW = nullptr; + TH1F* _hxHit = nullptr; + TH1F* _hyHit = nullptr; + TH1F* _hzHit = nullptr; + TH1F* _hHitNeighbours = nullptr; + TH1F* _hCheckPointRadius = nullptr; + TH1F* _hCheckPointRadiusW = nullptr; + TH1F* _hCheckPointWireZ = nullptr; + TH1F* _hMomentumG4 = nullptr; + TH1F* _hStepLength = nullptr; + + TH1F* _hCaStepEdep = nullptr; + TH1F* _hCaStepNum = nullptr; + TH1F* _hCaShowerEdep = nullptr; + TH1F* _hCaShowerNum = nullptr; + TH1F* _hCaTime = nullptr; + TH1F* _hCaEdep = nullptr; + TH2F* _hCaCrystalXY = nullptr; + TH1F* _hCaNcrystal = nullptr; + + TH1F* _hTargetEdep = nullptr; + TH1F* _hTargetPathLength = nullptr; + TH1F* _hTargetNfoils = nullptr; + TH2F* _hTargetNfoils2D = nullptr; + + TH1F* _hNPointTrajectories = nullptr; + TH1F* _hNPointsPerTrajectory = nullptr; + TH1F* _hNPointsPerTrajectoryLog = nullptr; + + TNtuple* _ntup = nullptr; + TGraph* _xyHits = nullptr; // Need to keep track of TGraph entries by hand. - int _xyHitCount; + int _xyHitCount = 0; // CRV - TH1F* _hCRVMultiplicity; - TNtuple* _ntupCRV; + TH1F* _hCRVMultiplicity = nullptr; + TNtuple* _ntupCRV = nullptr; - int _nBadG4Status; + int _nBadG4Status = 0; // Examine various parts of the event. void doTracker ( const art::Event& event ); @@ -177,66 +209,23 @@ namespace mu2e { art::Handle& hits ); }; - ReadBack::ReadBack(fhicl::ParameterSet const& pset) : - art::EDAnalyzer(pset), + ReadBack::ReadBack( Parameters const& conf) : + art::EDAnalyzer(conf), // Run time parameters - _diagLevel(pset.get("diagLevel",0)), - _gensTag(pset.get("gensTag","generate")), - _g4ModuleLabel(pset.get("g4ModuleLabel")), - _generatorModuleLabel(pset.get("generatorModuleLabel")), - _trackerStepPoints(pset.get("trackerStepPoints","tracker")), - _calorimeterStepPoints(pset.get("calorimeterStepPoints","calorimeter")), - _caloShowerSimModuleLabel(pset.get("caloShowerSimModuleLabel","CaloShowerROMaker")), - _caloCrystalModuleLabel(pset.get("caloCrystalModuleLabel","CaloHitMaker")), - _targetStepPoints(pset.get("targetStepPoints","stoppingtarget")), - _crvStepPoints(pset.get("CRVStepPoints","CRV")), - _minimumEnergy(pset.get("minimumEnergy")), - _maxFullPrint(pset.get("maxFullPrint",5)), - _xyHitsMax(pset.get("xyHitsMax",10000)), - _strawHitPositionTolerance(pset.get("SHPositionTolerance",0.01)), - // looking for gross errors only - - // Histograms - _nAnalyzed(0), - _hRadius(0), - _hTime(0), - _hMultiplicity(0), - _hDriftDist(0), - _hDriftDistW(0), - _hxHit(0), - _hyHit(0), - _hzHit(0), - _hHitNeighbours(0), - _hCheckPointRadius(0), - _hCheckPointRadiusW(0), - _hCheckPointWireZ(0), - _hMomentumG4(0), - _hStepLength(0), - _hCaStepEdep(0), - _hCaStepNum(0), - _hCaShowerEdep(0), - _hCaShowerNum(0), - _hCaTime(0), - _hCaEdep(0), - _hCaCrystalXY(0), - _hCaEdepMC(0), - _hCaNcrystal(0), - _hTargetEdep(0), - _hTargetPathLength(0), - _hTargetNfoils(0), - _hTargetNfoils2D(0), - _hNPointTrajectories(0), - _hNPointsPerTrajectory(0), - _hNPointsPerTrajectoryLog(0), - _ntup(0), - _xyHits(0), - _xyHitCount(0), - // CRV - _hCRVMultiplicity(0), - _ntupCRV(0), - // Remaining member data - _nBadG4Status(0){ + _diagLevel(conf().diagLevel()), + _gensTag(conf().gensTag()), + _g4ModuleLabel(conf().g4ModuleLabel()), + _trackerStepPoints(conf().trackerStepPoints()), + _calorimeterStepPoints(conf().calorimeterStepPoints()), + _caloShowerSimModuleLabel(conf().caloShowerSimModuleLabel()), + _caloCrystalModuleLabel(conf().caloCrystalModuleLabel()), + _targetStepPoints(conf().targetStepPoints()), + _crvStepPoints(conf().crvStepPoints()), + _minimumEnergy(conf().minimumEnergy()), + _maxFullPrint(conf().maxFullPrint()), + _xyHitsMax(conf().xyHitsMax()), + _strawHitPositionTolerance(conf().SHPositionTolerance()){ } void ReadBack::beginJob(){ @@ -867,10 +856,6 @@ namespace mu2e { event.getByLabel(_g4ModuleLabel,_crvStepPoints,hits); if ( ! hits.isValid() ) { return; } - // Get handles to the generated and simulated particles. - art::Handle genParticles; - event.getByLabel(_generatorModuleLabel,genParticles); - art::Handle simParticles; event.getByLabel(_g4ModuleLabel,simParticles); From 0c09b27cf4a2d1b11ac3219b0bb7e4aeb106b4cf Mon Sep 17 00:00:00 2001 From: Rob Kutschke Date: Mon, 12 Feb 2024 12:32:45 -0600 Subject: [PATCH 110/213] Update to validated fhicl. --- Analyses/src/ReadBack_module.cc | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/Analyses/src/ReadBack_module.cc b/Analyses/src/ReadBack_module.cc index 526514e6e0..dfe12d1236 100644 --- a/Analyses/src/ReadBack_module.cc +++ b/Analyses/src/ReadBack_module.cc @@ -58,16 +58,6 @@ namespace mu2e { using Name=fhicl::Name; using Comment=fhicl::Comment; - /* - - gensTag: - - trackerStepPoints: - - calorimeterStepPoints: - - caloShowerSimModuleLabel: - - caloCrystalModuleLabel: - - targetStepPoints: - - CRVStepPoints: - */ - fhicl::Atom diagLevel{Name("diagLevel"), Comment("Level of diagnostic printout; larger = more printout."), 0}; fhicl::Atom gensTag{Name("gensTag"), Comment("Input tag for generator output."), art::InputTag("generate")}; fhicl::Atom generatorModuleLabel{Name("generatorModuleLabel"), Comment("Module label of event generator.")}; From b55eb4af071dc2137e8d046c929b4fe38a288edc Mon Sep 17 00:00:00 2001 From: Sophie Middleton Date: Mon, 12 Feb 2024 14:33:44 -0600 Subject: [PATCH 111/213] Update GenFilter_module.cc --- EventGenerator/src/GenFilter_module.cc | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/EventGenerator/src/GenFilter_module.cc b/EventGenerator/src/GenFilter_module.cc index 3ef1068a64..80003b1df0 100644 --- a/EventGenerator/src/GenFilter_module.cc +++ b/EventGenerator/src/GenFilter_module.cc @@ -40,8 +40,8 @@ namespace mu2e { virtual bool filter(art::Event& event) override; private: - art::InputTag _SimToken; - const StageParticleCollection* _SimCol; + art::InputTag _SimToken; + const StageParticleCollection* _SimCol; double maxr_min_; double maxr_max_; bool makeplots_; @@ -103,12 +103,12 @@ namespace mu2e { // calculate rmax and add maxr to siminfo _maxr =sqrt(lh.cx()*lh.cx()+lh.cy()*lh.cy())+fabs(lh.rad()); if(makeplots_){ - // fill other branches for plots - _momT = sqrt(mom0.x()*mom0.x() + mom0.y()*mom0.y()); - _posT = sqrt(pos.x()*pos.x() + pos.y()*pos.y()); - _cosTheta = cos(atan2(_momT,mom0.z())); - _time = aParticle.time(); - genTree->Fill(); + // fill other branches for plots + _momT = sqrt(mom0.x()*mom0.x() + mom0.y()*mom0.y()); + _posT = sqrt(pos.x()*pos.x() + pos.y()*pos.y()); + _cosTheta = cos(atan2(_momT,mom0.z())); + _time = aParticle.time(); + genTree->Fill(); } if((_maxr < maxr_max_ and _maxr > maxr_min_ )){ passed = true; } } From 54dab43a1f37c52ba48fa1da25c2a379cbe256ca Mon Sep 17 00:00:00 2001 From: Sophie Middleton Date: Mon, 12 Feb 2024 14:34:12 -0600 Subject: [PATCH 112/213] Update GenFilter_module.cc --- EventGenerator/src/GenFilter_module.cc | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/EventGenerator/src/GenFilter_module.cc b/EventGenerator/src/GenFilter_module.cc index 80003b1df0..4a5119ed71 100644 --- a/EventGenerator/src/GenFilter_module.cc +++ b/EventGenerator/src/GenFilter_module.cc @@ -63,13 +63,13 @@ namespace mu2e { , isNull_{config().isNull()} { if(makeplots_){ - art::ServiceHandle tfs; - genTree = tfs->make("GenAna", "GenAna"); - genTree->Branch("maxr", &_maxr, "maxr/F"); - genTree->Branch("momT", &_momT, "momT/F"); - genTree->Branch("posT", &_posT, "posT/F"); - genTree->Branch("cosTheta", &_cosTheta, "cosTheta/F"); - genTree->Branch("time", &_time, "time/F"); + art::ServiceHandle tfs; + genTree = tfs->make("GenAna", "GenAna"); + genTree->Branch("maxr", &_maxr, "maxr/F"); + genTree->Branch("momT", &_momT, "momT/F"); + genTree->Branch("posT", &_posT, "posT/F"); + genTree->Branch("cosTheta", &_cosTheta, "cosTheta/F"); + genTree->Branch("time", &_time, "time/F"); } } From cfae165a657ae59b8f119ca025711fbbf0fd9a87 Mon Sep 17 00:00:00 2001 From: Sophie Middleton Date: Mon, 12 Feb 2024 14:34:51 -0600 Subject: [PATCH 113/213] Update GenFilter_module.cc --- EventGenerator/src/GenFilter_module.cc | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/EventGenerator/src/GenFilter_module.cc b/EventGenerator/src/GenFilter_module.cc index 4a5119ed71..a7608e0842 100644 --- a/EventGenerator/src/GenFilter_module.cc +++ b/EventGenerator/src/GenFilter_module.cc @@ -65,8 +65,8 @@ namespace mu2e { if(makeplots_){ art::ServiceHandle tfs; genTree = tfs->make("GenAna", "GenAna"); - genTree->Branch("maxr", &_maxr, "maxr/F"); - genTree->Branch("momT", &_momT, "momT/F"); + genTree->Branch("maxr", &_maxr, "maxr/F"); + genTree->Branch("momT", &_momT, "momT/F"); genTree->Branch("posT", &_posT, "posT/F"); genTree->Branch("cosTheta", &_cosTheta, "cosTheta/F"); genTree->Branch("time", &_time, "time/F"); @@ -78,12 +78,11 @@ namespace mu2e { bool passed = false; auto sim = event.getValidHandle(_SimToken); _SimCol = sim.product(); - for(const auto& aParticle : *_SimCol){ // make momentum and position vectors GeomHandle det; ROOT::Math::XYZVectorF pos = XYZVectorF(det->toDetector(aParticle.position())); - ROOT::Math::XYZTVector pos0(pos.x(), pos.y(), pos.z(), aParticle.time()); + ROOT::Math::XYZTVector pos0(pos.x(), pos.y(), pos.z(), aParticle.time()); ROOT::Math::PxPyPzMVector mom0(aParticle.momentum().x(), aParticle.momentum().y(), aParticle.momentum().z(), aParticle.momentum().t()); // extract charge @@ -112,7 +111,6 @@ namespace mu2e { } if((_maxr < maxr_max_ and _maxr > maxr_min_ )){ passed = true; } } - return passed; } } From c08bb9831f12d8156177a638c2d96950d9d6fb12 Mon Sep 17 00:00:00 2001 From: Mete Yucel Date: Mon, 12 Feb 2024 15:18:04 -0600 Subject: [PATCH 114/213] fix for OptionalTable --- RecoDataProducts/inc/BkgCluster.hh | 9 ++------- TrkHitReco/fcl/prolog.fcl | 1 + TrkHitReco/src/Chi2Clusterer.cc | 9 +++++++-- TrkHitReco/src/FlagBkgHits_module.cc | 11 ++++++++++- 4 files changed, 20 insertions(+), 10 deletions(-) diff --git a/RecoDataProducts/inc/BkgCluster.hh b/RecoDataProducts/inc/BkgCluster.hh index b6a628cbdb..3cd27daa49 100644 --- a/RecoDataProducts/inc/BkgCluster.hh +++ b/RecoDataProducts/inc/BkgCluster.hh @@ -19,7 +19,7 @@ namespace mu2e //Default hit count chosen for compuational efficiency BkgCluster() {_hits.reserve(16);} - BkgCluster(TwoDPoint point, float time, float weight, distMethod method) : _point(point), _time(time), _weight(weight), _distMethod(method){_hits.reserve(16);_cpoints.addPoint(_point,0);_pos = point.pos3();_wtime = _time*_weight;} + BkgCluster(TwoDPoint point, distMethod method) : _point(point), _distMethod(method){_hits.reserve(16);_cpoints.addPoint(_point,0);_pos = point.pos3();} BkgCluster(XYZVectorF const& pos, float time, distMethod method) : _pos(pos), _time(time), _distMethod(method) {_hits.reserve(16);} float getKerasQ() const {return _kerasQ; } @@ -37,21 +37,16 @@ namespace mu2e void clearHits() {_hits.clear();} void setKerasQ(float kerasQ) {_kerasQ = kerasQ;} void addHit(unsigned val) {_hits.emplace_back(val);} - void addHit(unsigned val, TwoDPoint point, float time, float weight) { + void addHit(unsigned val, TwoDPoint point) { _hits.push_back(val); _cpoints.addPoint(point,_cpoints.nPoints()); _pos = _cpoints.point().pos3(); - _weight += weight; - _wtime += time*weight; - _time = _wtime/_weight; } XYZVectorF _pos;// ideally should be a 2d vec - FIXME TwoDPoint _point;//initial point CombineTwoDPoints _cpoints;//combined points float _time = 0.0;//cluster time - float _wtime;//weighted time - float _weight;//weighted by nStrawHits std::vector _hits; BkgClusterFlag _flag = BkgClusterFlag(BkgClusterFlag::update); float _kerasQ = -0.5; //result of keras result for the cluster diff --git a/TrkHitReco/fcl/prolog.fcl b/TrkHitReco/fcl/prolog.fcl index acca70f4c9..f7094dcd3c 100644 --- a/TrkHitReco/fcl/prolog.fcl +++ b/TrkHitReco/fcl/prolog.fcl @@ -128,6 +128,7 @@ FlagBkgHits : { module_type : FlagBkgHits ComboHitCollection : "makeSTH" ClusterAlgorithm : 1 + TNTClustering : {@table::TNTClusterer} MinActiveHits : 3 MinNPlanes : 2 ClusterPositionError : 10 diff --git a/TrkHitReco/src/Chi2Clusterer.cc b/TrkHitReco/src/Chi2Clusterer.cc index f4ceca7f55..d8f53cac66 100644 --- a/TrkHitReco/src/Chi2Clusterer.cc +++ b/TrkHitReco/src/Chi2Clusterer.cc @@ -133,10 +133,10 @@ namespace mu2e // -- either add hit to existing cluster, form new cluster, or do nothing if hit is "in between" if (mindist < dhit_) - clusters[minc].addHit(ihit,TwoDPoint(chit.pos(),chit.uDir(),chit.uVar(),chit.vVar()),chit.correctedTime(),chit.nStrawHits()); + clusters[minc].addHit(ihit,TwoDPoint(chit.pos(),chit.uDir(),chit.uVar(),chit.vVar())); else if (mindist > dseed_) { minc = clusters.size(); - clusters.emplace_back(BkgCluster(TwoDPoint(chit.pos(),chit.uDir(),chit.uVar(),chit.vVar()),chit.correctedTime(),chit.nStrawHits(),distMethodFlag_)); + clusters.emplace_back(BkgCluster(TwoDPoint(chit.pos(),chit.uDir(),chit.uVar(),chit.vVar()),distMethodFlag_)); clusters[minc].addHit(ihit); size_t itime = size_t((chit.correctedTime()-tmin_)/tbin_); clusterIndices[itime].emplace_back(minc); @@ -151,9 +151,14 @@ namespace mu2e cluster = clusters.erase(cluster); } else{ + //update cluster idx and cluster time + float weight(0.),wtime(0.); for (auto& hit : (*cluster).hits()){ BkgHits[hit].clusterIdx_ = std::distance(clusters.begin(),cluster); + weight += chcol[BkgHits[hit].chidx_].nStrawHits(); + wtime += chcol[BkgHits[hit].chidx_].correctedTime()*chcol[BkgHits[hit].chidx_].nStrawHits(); } + (*cluster)._time = wtime/weight; ++cluster; } } diff --git a/TrkHitReco/src/FlagBkgHits_module.cc b/TrkHitReco/src/FlagBkgHits_module.cc index 45881b1055..9438304ba7 100644 --- a/TrkHitReco/src/FlagBkgHits_module.cc +++ b/TrkHitReco/src/FlagBkgHits_module.cc @@ -61,7 +61,6 @@ namespace mu2e void produce(art::Event& event) override; private: - using BkgClustererRef = std::reference_wrapper; const art::ProductToken chtoken_; unsigned minnhits_; unsigned minnp_; @@ -113,9 +112,19 @@ namespace mu2e switch ( ctype ) { case TNT: + if(!config().TNTClustering()) + { + throw cet::exception("RECO")<< "FlagBkgHits: TNTClusterer is not configured. Configure by adding\n" + << "physics.producers.FlagBkgHits.TNTClustering : {@table::TNTClusterer}" << std::endl; + } clusterer_ = std::make_unique(config().TNTClustering()); break; case Chi2: + if(!config().Chi2Clustering()) + { + throw cet::exception("RECO")<< "FlagBkgHits: Chi2Clusterer is not configured. Configure by adding\n" + << "physics.producers.FlagBkgHits.Chi2Clustering : {@table::Chi2Clusterer}" << std::endl; + } clusterer_ = std::make_unique(config().Chi2Clustering()); break; default: From b9f2ef4664dbf94c9a88039272cd7f432935925e Mon Sep 17 00:00:00 2001 From: Andrew Edmonds Date: Mon, 12 Feb 2024 15:42:37 -0600 Subject: [PATCH 115/213] Make error message for TrkQual more useful --- TrkDiag/inc/TrkQual_ANN1.hxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/TrkDiag/inc/TrkQual_ANN1.hxx b/TrkDiag/inc/TrkQual_ANN1.hxx index b15b393231..bff50a5562 100644 --- a/TrkDiag/inc/TrkQual_ANN1.hxx +++ b/TrkDiag/inc/TrkQual_ANN1.hxx @@ -65,7 +65,7 @@ Session(std::string filename ="") { std::ifstream f; f.open(filename); if (!f.is_open()){ - throw std::runtime_error("tmva-sofie failed to open file for input weights"); + throw std::runtime_error("tmva-sofie failed to open file \"" + filename +"\" for input weights"); } std::string tensor_name; int length; From daf789bdbfeb84eeb4499f75fb187b99de8ee027 Mon Sep 17 00:00:00 2001 From: Andrew Edmonds Date: Mon, 12 Feb 2024 15:43:09 -0600 Subject: [PATCH 116/213] Allow for running TrkQual in any directory by following MU2E_SEARCH_PATH --- TrkDiag/src/TrackQuality_module.cc | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/TrkDiag/src/TrackQuality_module.cc b/TrkDiag/src/TrackQuality_module.cc index adc399f7f8..3ed951bd52 100644 --- a/TrkDiag/src/TrackQuality_module.cc +++ b/TrkDiag/src/TrackQuality_module.cc @@ -17,6 +17,7 @@ #include "Offline/Mu2eUtilities/inc/MVATools.hh" #include "Offline/GlobalConstantsService/inc/GlobalConstantsHandle.hh" #include "Offline/GlobalConstantsService/inc/ParticleDataList.hh" +#include "Offline/ConfigTools/inc/ConfigFileLookupPolicy.hh" // data #include "Offline/RecoDataProducts/inc/KalSeed.hh" #include "Offline/RecoDataProducts/inc/MVAResult.hh" @@ -70,7 +71,9 @@ namespace mu2e _printMVA(conf().printMVA()) { produces(); - mva_ = std::make_shared(conf().datFilename()); + + ConfigFileLookupPolicy configFile; + mva_ = std::make_shared(configFile(conf().datFilename())); } void TrackQuality::produce(art::Event& event ) { From 1b1cbc462b588d6d8808bb7c83de27f36579ca6b Mon Sep 17 00:00:00 2001 From: David Nathan Brown Date: Mon, 12 Feb 2024 15:58:24 -0800 Subject: [PATCH 117/213] Follow TrkAna change --- Mu2eKinKal/test/KKDrift.fcl | 1 - Mu2eKinKal/test/KKLineDrift.fcl | 2 -- Mu2eKinKal/test/KKLineSeed.fcl | 2 -- Mu2eKinKal/test/KKOffSpill.fcl | 2 -- Mu2eKinKal/test/KKOffSpillSeed.fcl | 2 -- Mu2eKinKal/test/KKSeed.fcl | 1 - Mu2eKinKal/test/TTBTrk.fcl | 2 -- 7 files changed, 12 deletions(-) diff --git a/Mu2eKinKal/test/KKDrift.fcl b/Mu2eKinKal/test/KKDrift.fcl index 606129c512..7fa15f0fd0 100644 --- a/Mu2eKinKal/test/KKDrift.fcl +++ b/Mu2eKinKal/test/KKDrift.fcl @@ -105,7 +105,6 @@ physics.analyzers.TAKK.candidate.options : @local::AllOpt physics.analyzers.TAKK.diagLevel : 2 physics.analyzers.TAKK.FillMCInfo : true physics.analyzers.TAKK.FillCRVHits : true -physics.analyzers.TAKK.FillTrkQualInfo : false physics.analyzers.TAKK.FillTrkPIDInfo : false physics.analyzers.TAKK.FillHitInfo : true physics.analyzers.TAKK.FillTriggerInfo : false diff --git a/Mu2eKinKal/test/KKLineDrift.fcl b/Mu2eKinKal/test/KKLineDrift.fcl index 8f610b2962..f1a7983dba 100644 --- a/Mu2eKinKal/test/KKLineDrift.fcl +++ b/Mu2eKinKal/test/KKLineDrift.fcl @@ -50,7 +50,6 @@ physics : options : { fillMC : true fillHits : true - fillTrkQual : false fillTrkPID : false genealogyDepth : 5 } @@ -59,7 +58,6 @@ physics : FillMCInfo : true FillCRVHits : true - FillTrkQualInfo : false FillTrkPIDInfo : false FillHitInfo : true FillTriggerInfo : false diff --git a/Mu2eKinKal/test/KKLineSeed.fcl b/Mu2eKinKal/test/KKLineSeed.fcl index 9d7ba1a606..0fd4ccfc06 100644 --- a/Mu2eKinKal/test/KKLineSeed.fcl +++ b/Mu2eKinKal/test/KKLineSeed.fcl @@ -49,7 +49,6 @@ physics : options : { fillMC : true fillHits : true - fillTrkQual : false fillTrkPID : false genealogyDepth : 5 } @@ -58,7 +57,6 @@ physics : FillMCInfo : true FillCRVHits : true - FillTrkQualInfo : false FillTrkPIDInfo : false FillHitInfo : true FillTriggerInfo : false diff --git a/Mu2eKinKal/test/KKOffSpill.fcl b/Mu2eKinKal/test/KKOffSpill.fcl index 51e9949948..57fb7aa366 100644 --- a/Mu2eKinKal/test/KKOffSpill.fcl +++ b/Mu2eKinKal/test/KKOffSpill.fcl @@ -50,7 +50,6 @@ physics : options : { fillMC : true fillHits : true - fillTrkQual : false fillTrkPID : false genealogyDepth : 5 } @@ -59,7 +58,6 @@ physics : FillMCInfo : true FillCRVHits : true - FillTrkQualInfo : false FillTrkPIDInfo : false FillHitInfo : true FillTriggerInfo : false diff --git a/Mu2eKinKal/test/KKOffSpillSeed.fcl b/Mu2eKinKal/test/KKOffSpillSeed.fcl index 33d577e9d2..bd364f8674 100644 --- a/Mu2eKinKal/test/KKOffSpillSeed.fcl +++ b/Mu2eKinKal/test/KKOffSpillSeed.fcl @@ -50,7 +50,6 @@ physics : options : { fillMC : true fillHits : true - fillTrkQual : false fillTrkPID : false genealogyDepth : 5 } @@ -59,7 +58,6 @@ physics : FillMCInfo : true FillCRVHits : true - FillTrkQualInfo : false FillTrkPIDInfo : false FillHitInfo : true FillTriggerInfo : false diff --git a/Mu2eKinKal/test/KKSeed.fcl b/Mu2eKinKal/test/KKSeed.fcl index d0d88a5fdf..38ed58ecf6 100644 --- a/Mu2eKinKal/test/KKSeed.fcl +++ b/Mu2eKinKal/test/KKSeed.fcl @@ -83,7 +83,6 @@ physics.analyzers.TAKK.diagLevel : 2 physics.analyzers.TAKK.FillCRVHits : false physics.analyzers.TAKK.FillMCInfo : true physics.analyzers.TAKK.FillTriggerInfo : true -physics.analyzers.TAKK.FillTrkQualInfo : false physics.analyzers.TAKK.FillTrkPIDInfo : false physics.analyzers.TAKK.FillHitInfo : true physics.analyzers.TAKK.FillTriggerInfo : false diff --git a/Mu2eKinKal/test/TTBTrk.fcl b/Mu2eKinKal/test/TTBTrk.fcl index 65f5a8c4f8..845a081c98 100644 --- a/Mu2eKinKal/test/TTBTrk.fcl +++ b/Mu2eKinKal/test/TTBTrk.fcl @@ -84,7 +84,6 @@ physics.analyzers.TAtpr.FillCRVHits : false physics.analyzers.TAtpr.FillMCInfo : false physics.analyzers.TAtpr.RecoCountTag : "" physics.analyzers.TAtpr.FillTriggerInfo : true -physics.analyzers.TAtpr.FillTrkQualInfo : false physics.analyzers.TAtpr.FillTrkPIDInfo : false physics.analyzers.TAtpr.FillHitInfo : true physics.analyzers.TAtpr.FillTriggerInfo : false @@ -100,7 +99,6 @@ physics.analyzers.TAcpr.FillCRVHits : false physics.analyzers.TAcpr.FillMCInfo : false physics.analyzers.TAcpr.RecoCountTag : "" physics.analyzers.TAcpr.FillTriggerInfo : true -physics.analyzers.TAcpr.FillTrkQualInfo : false physics.analyzers.TAcpr.FillTrkPIDInfo : false physics.analyzers.TAcpr.FillHitInfo : true physics.analyzers.TAcpr.FillTriggerInfo : false From 2286b68f9e780d79fd3198e931e1ddc7b85f63b8 Mon Sep 17 00:00:00 2001 From: sophieMu2e Date: Mon, 12 Feb 2024 18:35:34 -0600 Subject: [PATCH 118/213] first things --- EventGenerator/src/GenFilter_module.cc | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/EventGenerator/src/GenFilter_module.cc b/EventGenerator/src/GenFilter_module.cc index 3ef1068a64..7f6ee0f690 100644 --- a/EventGenerator/src/GenFilter_module.cc +++ b/EventGenerator/src/GenFilter_module.cc @@ -40,8 +40,8 @@ namespace mu2e { virtual bool filter(art::Event& event) override; private: - art::InputTag _SimToken; - const StageParticleCollection* _SimCol; + art::InputTag _SimToken; + const StageParticleCollection* _SimCol; double maxr_min_; double maxr_max_; bool makeplots_; @@ -65,8 +65,8 @@ namespace mu2e { if(makeplots_){ art::ServiceHandle tfs; genTree = tfs->make("GenAna", "GenAna"); - genTree->Branch("maxr", &_maxr, "maxr/F"); - genTree->Branch("momT", &_momT, "momT/F"); + genTree->Branch("maxr", &_maxr, "maxr/F"); + genTree->Branch("momT", &_momT, "momT/F"); genTree->Branch("posT", &_posT, "posT/F"); genTree->Branch("cosTheta", &_cosTheta, "cosTheta/F"); genTree->Branch("time", &_time, "time/F"); @@ -112,7 +112,7 @@ namespace mu2e { } if((_maxr < maxr_max_ and _maxr > maxr_min_ )){ passed = true; } } - + return passed; } } From cec8e2472ae311e7db3a11c3e8bd3d5ed7b62aa3 Mon Sep 17 00:00:00 2001 From: Gianantonio Pezzullo Date: Wed, 24 Jan 2024 07:44:49 -0600 Subject: [PATCH 119/213] removed the prolog_trigger fcl files moved to the mu2e_trig_repo --- CRVFilters/fcl/prolog_trigger.fcl | 33 - CalPatRec/fcl/prolog_trigger.fcl | 261 -------- CaloCluster/fcl/prolog_trigger.fcl | 51 -- CaloFilters/fcl/prolog_trigger.fcl | 386 ----------- CaloReco/fcl/prolog_trigger.fcl | 33 - CosmicReco/fcl/prolog_trigger.fcl | 135 ---- DAQ/fcl/prolog_trigger.fcl | 114 ---- Mu2eKinKal/fcl/prolog_trigger.fcl | 129 ---- Trigger/fcl/prolog_trigger.fcl | 252 -------- TrkFilters/fcl/prolog_trigger.fcl | 991 ----------------------------- TrkHitReco/fcl/prolog_trigger.fcl | 79 --- TrkPatRec/fcl/prolog_trigger.fcl | 188 ------ 12 files changed, 2652 deletions(-) delete mode 100644 CRVFilters/fcl/prolog_trigger.fcl delete mode 100644 CalPatRec/fcl/prolog_trigger.fcl delete mode 100644 CaloCluster/fcl/prolog_trigger.fcl delete mode 100644 CaloFilters/fcl/prolog_trigger.fcl delete mode 100644 CaloReco/fcl/prolog_trigger.fcl delete mode 100644 CosmicReco/fcl/prolog_trigger.fcl delete mode 100644 DAQ/fcl/prolog_trigger.fcl delete mode 100644 Mu2eKinKal/fcl/prolog_trigger.fcl delete mode 100644 Trigger/fcl/prolog_trigger.fcl delete mode 100644 TrkFilters/fcl/prolog_trigger.fcl delete mode 100644 TrkHitReco/fcl/prolog_trigger.fcl delete mode 100644 TrkPatRec/fcl/prolog_trigger.fcl diff --git a/CRVFilters/fcl/prolog_trigger.fcl b/CRVFilters/fcl/prolog_trigger.fcl deleted file mode 100644 index 8d4c0c42ad..0000000000 --- a/CRVFilters/fcl/prolog_trigger.fcl +++ /dev/null @@ -1,33 +0,0 @@ -# -*- mode: tcl -*- -#------------------------------------------------------------------------------ -#------------------------------------------------------------------------------ - -BEGIN_PROLOG - -CRVFilters : { - -#skelethon for a cosmic muon calibration - crvCoincidenceClusterFilter : { - module_type : CrvCoincidenceClusterFilter - CrvCoincidenceClusterFinder : "CrvCoincidenceClusterFinder" - MinNCluster : 1 - triggerPath : "CRVCC" - } - -CRVFilters : { @table::CRVFilters - - filters : { - - #select events based on the presence of a cluster of coincidences - crvCoincidenceClusterFilter : { @table::CaloFilters.crvCoincidenceClusterFilter } - - } - - sequences : { - - caloCalibCosmic : [ CrvRecoPulses, CrvCoincidence, CrvCoincidenceClusterFinder, crvCoincidenceClusterFilter] - - } -} - -END_PROLOG diff --git a/CalPatRec/fcl/prolog_trigger.fcl b/CalPatRec/fcl/prolog_trigger.fcl deleted file mode 100644 index 55b379f827..0000000000 --- a/CalPatRec/fcl/prolog_trigger.fcl +++ /dev/null @@ -1,261 +0,0 @@ -# -*- mode: tcl -*- -#------------------------------------------------------------------------------ -# this file is included by fcl/standardProducers.fcl inside the PROLOG section -# CalPatRec: calorimeter-seeded track finding -# CalPatRec uses its own instance of the hit flags -# DoubletAmbigResolver is defined in TrkReco/fcl/prolog.fcl -#------------------------------------------------------------------------------ - -BEGIN_PROLOG -#------------------------------------------------------------------------------ -# there seems to be a circular dependence between MakeStrawHitPositions and -# FlagStrawHits ... FlagBkgHits ? -# MakeStrawHitPositions stores the hit flag in StrawHitPosition object -# for that, an existing StrawHitFlagCollection is required -# -# in its turn, the FlagStrawHits module flags if the corresponding hit -# position 'stereo' and also sets radial selection flag -# it also sets 'timesel' and 'energysel' flags -# if, however, the StrawHitPosition doesnt exist, the 'stereo' and 'radsel' -# flags are not set -# -# FlagBkgHits produces yet another hit flag collection, copying flags set by -# the OR of FlagStrawHits and flags stored in StrawHitPositions, and potentially adding -# a 'delta' and 'isolated' flags -# in principle, FlagBkgHits also uses StereoHitCollection, but that is not a must -# -# yes, there is a circular dependence between the data products. -# Dave runs several instances of the hit flagging modules for a reason -#------------------------------------------------------------------------------ -#----------------------------------------------------------------------------- -# new format -#------------------------------------------------------------------------------ - -CprTrigger : { - -#------------------------------------------------------------------------------ -# CalPatRec.HelixFinder and HelixFitHack configuratons (pattern recognition) -#------------------------------------------------------------------------------ - TTHelixFinderAlg : { @table::CalPatRec.HelixFinderAlg - targetconsistent : 0 - maxZTripletSearch : 0. # mm - maxDfDz : 0.025 - initDfDz : 0 - } -#------------------------------------------------------------------------------ -# SeedFitter(SeedFitHackNew) configuration for the final track fit: NOT USED ANYMORE -#------------------------------------------------------------------------------ -} -#------------------------------------------------------------------------------ -# producers -#------------------------------------------------------------------------------ -CprTrigger : { @table::CprTrigger - - producers : { -# @table::CaloClusterFast.producers - - cprFetchDigis : { module_type:PrefetchData - debugLevel : 0 - mcDiag : true - - fetchCaloDigis : 1 - fetchStrawDigis : 1 - fetchStrawHits : 0 - fetchStrawHitFlags : 0 - fetchStrawHitPositions : 0 - fetchComboHits : 0 - - caloDigiCollectionTag : CaloDigiMaker - strawDigiCollection : makeSD - strawHitCollectionTag : TTmakeSH - strawHitPositionCollectionTag : TTmakeSH - strawHitFlagCollectionTag : TTmakeSH - comboHitCollectionTag : TTmakePH # MakeStereoHits - } - - TTDeltaFinder : { @table::CalPatRec.producers.DeltaFinder - chCollTag : TTmakePH # input coll - sschCollTag : TTmakeSH # input coll - writeFilteredComboHits : 1 - } - -#------------------------------------------------------------------------------ -# default configuration: DEM -# CalPatRec, so far, has been validated only for e- -#------------------------------------------------------------------------------ - TTCalSeedFit : { @table::TTMu2eKinKal.producers.TTKKDeMSeedFit - ModuleSettings : { @table::TTMu2eKinKal.producers.TTKKDeMSeedFit.ModuleSettings - ComboHitCollection : "TTmakeSH" - CaloClusterCollection : "CaloClusterFast" - PrintLevel : 0 - SaveAllFits : false - } - } - - } - - filters : { -#------------------------------------------------------------------------------ -# new modules -#------------------------------------------------------------------------------ - TTfastTimeClusterFinder : { @table::CalPatRec.filters.CalTimePeakFinder - useAsFilter : 0 - StrawHitCollectionLabel : TTmakePH - caloClusterModuleLabel : CaloClusterFast -# HitSelectionBits : ["EnergySelection","TimeSelection"] -# BackgroundSelectionBits : ["Background"] - minClusterEnergy : 50. # MeV - minClusterSize : 2 # number of crystals - # dtOffset : -61. #FIXME! this is necessary because CaloClusterFast returns an uncalibrated time! - dtOffset : 0 - } - - - TTCalTimePeakFinder : { @table::CalPatRec.filters.CalTimePeakFinder - useAsFilter : 0 - StrawHitCollectionLabel : "TTflagBkgHits" - caloClusterModuleLabel : CaloClusterFast -# HitSelectionBits : ["EnergySelection","TimeSelection"] -# BackgroundSelectionBits : ["Background"] - minClusterEnergy : 50. # MeV - minClusterSize : 2 # number of crystals - # dtOffset : -61. #-41.8 #FIXME! this is necessary because CaloClusterFast returns an uncalibrated time! - dtOffset : 0 - } - - TTCalTimePeakFinderUe : { @table::CalPatRec.filters.CalTimePeakFinder - useAsFilter : 0 - StrawHitCollectionLabel : "TTflagBkgHits" - caloClusterModuleLabel : CaloClusterFast -# HitSelectionBits : ["EnergySelection","TimeSelection"] -# BackgroundSelectionBits : ["Background"] - minClusterEnergy : 50. # MeV - minClusterSize : 2 # number of crystals - pitchAngle : -0.67 - } - - TTCalHelixFinder : { @table::CalPatRec.filters.CalHelixFinder - useAsFilter : 0 - StrawHitCollectionLabel : "TTflagBkgHits" - TimeClusterCollectionLabel : TTCalTimePeakFinder - - # HelixFinderAlg configuraton (pattern recognition) - HelixFinderAlg : { @table::CprTrigger.TTHelixFinderAlg } - } - - TTCalHelixFinderUe : { @table::CalPatRec.filters.CalHelixFinder - useAsFilter : 0 - StrawHitCollectionLabel : "TTflagBkgHits" - TimeClusterCollectionLabel : TTCalTimePeakFinderUe - - # HelixFinderAlg configuraton (pattern recognition) - HelixFinderAlg : { @table::CprTrigger.TTHelixFinderAlg } - } - - TTCalTimePeakFinderUCC : { @table::CalPatRec.filters.CalTimePeakFinder - useAsFilter : 0 - StrawHitCollectionLabel : "TTflagBkgHits" - caloClusterModuleLabel : CaloClusterFast -# HitSelectionBits : ["EnergySelection","TimeSelection"] -# BackgroundSelectionBits : ["Background"] - minClusterEnergy : 50. # MeV - minClusterSize : 2 # number of crystals - # dtOffset : -41.8 #FIXME! this is necessary because CaloClusterFast returns an uncalibrated time! - dtOffset : 0.0 - } - - TTCalHelixFinderUCC : { @table::CalPatRec.filters.CalHelixFinder - useAsFilter : 0 - StrawHitCollectionLabel : TTmakePHUCC - TimeClusterCollectionLabel : TTCalTimePeakFinderUCC - - # HelixFinderAlg configuraton (pattern recognition) - HelixFinderAlg : { @table::CprTrigger.TTHelixFinderAlg } - } - } -} - -#------------------------------------------------------------------------------ -# calorimeter-seeded tracking makes sense only for downstream particles -#------------------------------------------------------------------------------ -CprTrigger: { @table::CprTrigger - producers : { @table::CprTrigger.producers - - TTCalSeedFitDem : { @table::CprTrigger.producers.TTCalSeedFit - ModuleSettings : { @table::CprTrigger.producers.TTCalSeedFit.ModuleSettings - HelixSeedCollections : [ "TTCalHelixMergerDeM" ] - FitParticle : 11 - } - KKFitSettings : { @table::CprTrigger.producers.TTCalSeedFit.KKFitSettings - } - FitDirection : 0 - } - TTCalSeedFitUCCDem : { @table::CprTrigger.producers.TTCalSeedFit - ModuleSettings : { @table::CprTrigger.producers.TTCalSeedFit.ModuleSettings - ComboHitCollection : "TTmakeSHUCC" - HelixSeedCollections : [ "TTCalHelixUCCMergerDeM" ] - FitParticle : 11 - } - KKFitSettings : { @table::CprTrigger.producers.TTCalSeedFit.KKFitSettings - } - FitDirection : 0 - } - TTCalSeedFitDmm : { @table::CprTrigger.producers.TTCalSeedFit - ModuleSettings : { @table::CprTrigger.producers.TTCalSeedFit.ModuleSettings - HelixSeedCollections : [ "TTCalHelixFinderDm:Positive" ] - FitParticle : 13 - } - KKFitSettings : { @table::CprTrigger.producers.TTCalSeedFit.KKFitSettings - } - FitDirection : 0 - } - TTCalSeedFitDep : { @table::CprTrigger.producers.TTCalSeedFit - ModuleSettings : { @table::CprTrigger.producers.TTCalSeedFit.ModuleSettings - HelixSeedCollections : [ "TTCalHelixMergerDeP" ] - FitParticle : -11 - } - KKFitSettings : { @table::CprTrigger.producers.TTCalSeedFit.KKFitSettings - } - FitDirection : 0 - - } - TTCalSeedFitUCCDep : { @table::CprTrigger.producers.TTCalSeedFit - ModuleSettings : { @table::CprTrigger.producers.TTCalSeedFit.ModuleSettings - ComboHitCollection : "TTmakeSHUCC" - HelixSeedCollections : [ "TTCalHelixUCCMergerDeP" ] - FitParticle : -11 - } - KKFitSettings : { @table::CprTrigger.producers.TTCalSeedFit.KKFitSettings - } - FitDirection : 0 - - } - TTCalSeedFitDmp : { @table::CprTrigger.producers.TTCalSeedFit - ModuleSettings : { @table::CprTrigger.producers.TTCalSeedFit.ModuleSettings - HelixSeedCollections : [ "TTCalHelixFinderDm:Negative" ] - FitParticle : -13 - } - KKFitSettings : { @table::CprTrigger.producers.TTCalSeedFit.KKFitSettings - } - FitDirection : 0 - } - - } - - filters : { @table::CprTrigger.filters - TTCalHelixFinderDe : { @table::CprTrigger.filters.TTCalHelixFinder } - TTCalHelixFinderUCCDe : { @table::CprTrigger.filters.TTCalHelixFinderUCC } - TTCalHelixFinderDm : { @table::CprTrigger.filters.TTCalHelixFinder FitParticle: @local::Particle.muminus } - } - - sequences : { - # production sequence to find helices - findHelices : [ TTtimeClusterFinder, TThelixFinder ] - # production sequence to find TrackSeeds - KSFDeM : [ TTCalTimePeakFinder, TTCalHelixFinderDe, TTCalSeedFitDem ] - KSFDeP : [ TTCalTimePeakFinder, TTCalHelixFinderDe, TTCalSeedFitDep ] - - } -} - -END_PROLOG diff --git a/CaloCluster/fcl/prolog_trigger.fcl b/CaloCluster/fcl/prolog_trigger.fcl deleted file mode 100644 index a84014b8be..0000000000 --- a/CaloCluster/fcl/prolog_trigger.fcl +++ /dev/null @@ -1,51 +0,0 @@ -# -*- mode: tcl -*- -#------------------------------------------------------------------------------ -#------------------------------------------------------------------------------ -#include "Offline/CaloReco/fcl/common.fcl" - - -BEGIN_PROLOG - -CaloClusterFast: -{ - module_type : CaloClusterFast - caloHitCollection : "CaloHitMakerFast:calo" - EminSeed : 10 - ExpandCut : 1.0 - EnoiseCut : 1.0 - deltaTime : 10 - minSiPMPerHit : 2 - extendSearch : true - timeOffset : -61 #ns - diagLevel : 0 -} - -CaloTrigger : { - module_type : CaloTrigger - caloDigiModuleLabel : CaloDigiMaker - digiSampling : @local::HitMakerDigiSampling - blindTime : @local::HitMakerDigitizationStart - endTimeBuffer : 80 - windowPeak : 2 - minAmplitude : 20 - extendSecond : false - minSeedAmplitude : 433 - minEnergy : 50 - timeCorrection : 20.0 - adcToEnergy : 0.0461333 - diagLevel : 0 -} - - -CaloClusterTrigger: -{ - producers : { - CaloClusterFast : @local::CaloClusterFast - CaloTrigger : @local::CaloTrigger - } - - Reco : [ CaloClusterFast ] -} - - -END_PROLOG diff --git a/CaloFilters/fcl/prolog_trigger.fcl b/CaloFilters/fcl/prolog_trigger.fcl deleted file mode 100644 index a68fabf579..0000000000 --- a/CaloFilters/fcl/prolog_trigger.fcl +++ /dev/null @@ -1,386 +0,0 @@ -# -*- mode: tcl -*- -#------------------------------------------------------------------------------ -#------------------------------------------------------------------------------ - -BEGIN_PROLOG - -CaloFilters : { - caloTriggerPreselect : { - diagLevel : 0 - module_type : EcalTriggerPreselect - trkPatRecModuleLabel : MergePatRec - trkQualTag : MergePatRec - caloClusterModuleLabel : CaloClusterMaker - trackClusterMatchModuleLabel : TrackCaloMatching - fitparticle : 11 - fitdirection : 0 - virtualhit : 1 # ask for CE hit on a ECAL virtual detector - trkgood : 1 # 0:no match 1:good track - matchgood : 1 # 0:no match 1:good track match - T0MIN : 700 - ECLUMIN : 50 - } - - caloMVACEFilter : { - module_type : FilterEcalMVATrigger - caloTrigSeedModuleLabel : CaloTrigger - diagLevel : 0 - MVAMethod : BDT - weightsfile : "Offline/CaloFilters/data/ce_bkg_ecal_20_BDT.weights.xml" - TimeOFFSET : 22.5 - MVAhighcut0 : 0.1 - MVArpivot0 : 445 # mm - MVApivotcut0 : 0.1 - MVAlowcut0 : 0.0 - MVAhighcut1 : 0.1 - MVArpivot1 : 445 # mm - MVApivotcut1 : 0.1 - MVAlowcut1 : 0.0 - downscale500factor : 1 - } - - caloFastMVAMixedCEFilter : { - module_type : FilterEcalMixedTrigger - diagLevel : 0 - MVAMethod : BDT - caloTrigSeedModuleLabel : CaloTrigger - ecalweightsfile : "Offline/CaloFilters/data/ce_bkg_ecal_20_BDT.weights.xml" - mixedweightsfile : "Offline/CaloFilters/data/ce_bkg_20_BDT.weights.xml" - StrawHitCollectionTag : "TTmakePH" - TimeOFFSET : 22.5 - MVArpivot : 445 # mm - ecalMVAhighcut0 : -0.3 - ecalMVApivotcut0 : -0.3 - ecalMVAlowcut0 : -0.3 - ecalMVAhighcut1 : -0.3 - ecalMVApivotcut1 : -0.3 - ecalMVAlowcut1 : -0.3 - mixedMVAhighcut0 : -0.1 - mixedMVApivotcut0 : -0.1 - mixedMVAlowcut0 : -0.1 - mixedMVAhighcut1 : -0.1 - mixedMVApivotcut1 : -0.1 - mixedMVAlowcut1 : -0.1 - downscale500factor : 1 - step : 10 - } - - -#skelethon for a cosmic muon calibration - caloFastCosmicFilter : { - module_type : CaloCosmicCalib - CaloClusterModuleLabel : "CaloClusterFast" - debugLevel : 0 - MinNCrystalHits : 0 - MinEnergy : 10.0 #MeV - MaxEnergy : 600.0 #MeV - MinNumCelinout : 6 - MinNumCeldiagver : 6 - MinCelEneCut : 15.0 # MeV - OutRadius : 580 # mm - InnerRadius : 460 # mm - diagminval : 1.5 # slope min - diagmaxval : 2.5 # slope max - dyminval : 140 # mm - } - - caloFastRMCFilter : { - module_type: CaloClusterCounterFilter - CaloClusterModuleLabel : "CaloClusterFast" - diagLevel : 0 - MinNCel : 2 - MaxNCel : 10 - MinClusterEnergy : 55.0 - MaxClusterEnergy : 200.0 - MinClusterRadius : 490 - MinNCl : 1 - DiskID : [0] - } - - caloFastMVALHCEFilter : { - module_type : CaloLikelihood - CaloClusterModuleLabel : CaloClusterFast - SignalTemplates : "OfflineData/CaloFilters/v7_1_5/caloLH_ce.root" - BackgroundTemplates : "OfflineData/CaloFilters/v7_1_5/caloLH_bkg.root" - DropSecondDisk : false - MinClusterEnergy : 50. # MeV - ClusterEnergyStep : 10. # MeV - MinClusterRadialDist : 350. # mm - ClusterRadialDistStep : 50. # mm - MinLikelihoodCut : [ 41.44, 10.36] - } - - #fixme! this is just a place holder for the photon filter - caloFastPhotonFilter : { - module_type : CaloLikelihood - CaloClusterModuleLabel : CaloClusterFast - SignalTemplates : "OfflineData/CaloFilters/v7_1_5/caloLH_ce.root" - BackgroundTemplates : "OfflineData/CaloFilters/v7_1_5/caloLH_bkg.root" - DropSecondDisk : false - MinClusterEnergy : 50. # MeV - ClusterEnergyStep : 10. # MeV - MinClusterRadialDist : 350. # mm - ClusterRadialDistStep : 50. # mm - MinLikelihoodCut : [ 41.44, 10.36] - } - - caloFastMVANNCEFilter : { - module_type : FilterEcalNNTrigger - caloClusterCollection : CaloClusterFast - caloBkgMVA :{ MVAWeights : "Offline/CaloFilters/data/CE_NN_ReLU.weights.xml" } - minEtoTest : 40 - minMVAScore : 0.95 - diagLevel : 0 - } -} - -CaloFilters : { @table::CaloFilters - - producers : { - fetchCaloDigis : { module_type:PrefetchData - debugLevel : 0 - mcDiag : true - - fetchCaloDigis : 1 - fetchStrawDigis : 0 - fetchStrawHits : 0 - fetchStrawHitFlags : 0 - fetchStrawHitPositions : 0 - fetchComboHits : 0 - - caloDigiCollectionTag : CaloDigiMaker - strawDigiCollection : makeSD - strawHitCollectionTag : TTmakeSH - strawHitPositionCollectionTag : TTmakeSH - strawHitFlagCollectionTag : TTmakeSH - comboHitCollectionTag : TTmakePH - } - - fetchDigis : { module_type:PrefetchData - debugLevel : 0 - mcDiag : true - - fetchCaloDigis : 1 - fetchStrawDigis : 1 - fetchStrawHits : 0 - fetchStrawHitFlags : 0 - fetchStrawHitPositions : 0 - fetchComboHits : 0 - - caloDigiCollectionTag : CaloDigiMaker - strawDigiCollection : makeSD - strawHitCollectionTag : TTmakeSH - strawHitPositionCollectionTag : TTmakeSH - strawHitFlagCollectionTag : TTmakeSH - comboHitCollectionTag : TTmakePH - } - - } - - filters : { - - #set the prescaler for each trigger path: we want a event-based prescaler and also a prescaler - #on the good events. - #TODO: add also a path for the selection of failed events - caloMVACECDCountFilter : { - module_type : DigiFilter - caloDigiCollection : CaloDigiMaker - strawDigiCollection : notUSed - useStrawDigi : false - useCaloDigi : true - minNStrawDigi : -1 - maxNStrawDigi : -1 - minNCaloDigi : 2 - maxNCaloDigi : 10000 - maxCaloEnergy : -1 - } - - caloFastMVAMixedCECDCountFilter : { - module_type : DigiFilter - strawDigiCollection : notUSed - caloDigiCollection : CaloDigiMaker - useStrawDigi : false - useCaloDigi : true - minNStrawDigi : -1 - maxNStrawDigi : -1 - minNCaloDigi : 2 - maxNCaloDigi : 10000 - maxCaloEnergy : -1 - } - - caloFastCosmicCDCountFilter : { - module_type : DigiFilter - strawDigiCollection : notUSed - caloDigiCollection : CaloDigiMaker - useStrawDigi : false - useCaloDigi : true - minNStrawDigi : -1 - maxNStrawDigi : -1 - minNCaloDigi : 2 - maxNCaloDigi : 10000 - maxCaloEnergy : -1 - } - - caloLHCECDCountFilter : { - module_type : DigiFilter - strawDigiCollection : notUSed - caloDigiCollection : CaloDigiMaker - useStrawDigi : false - useCaloDigi : true - minNStrawDigi : -1 - maxNStrawDigi : -1 - minNCaloDigi : 2 - maxNCaloDigi : 10000 - maxCaloEnergy : -1 - } - - caloFastPhotonCDCountFilter : { - module_type : DigiFilter - strawDigiCollection : notUSed - caloDigiCollection : CaloDigiMaker - useStrawDigi : false - useCaloDigi : true - minNStrawDigi : -1 - maxNStrawDigi : -1 - minNCaloDigi : 2 - maxNCaloDigi : 10000 - maxCaloEnergy : -1 - } - - caloFastMVANNCECDCountFilter : { - module_type : DigiFilter - caloDigiCollection : CaloDigiMaker - strawDigiCollection : notUSed - useStrawDigi : false - useCaloDigi : true - minNStrawDigi : -1 - maxNStrawDigi : -1 - minNCaloDigi : 2 - maxNCaloDigi : 10000 - maxCaloEnergy : -1 - } - - caloMVACEEventPrescale : { - module_type : PrescaleEvent - nPrescale : 1 - } - - caloMVACEPrescale : { - module_type : PrescaleEvent - nPrescale : 1 - useFilteredEvents : true - } - - caloFastMVAMixedCEEventPrescale : { - module_type : PrescaleEvent - nPrescale : 1 -# nPrescale : @local::caloMixed_evt_sf - } - - caloFastMVAMixedCEPrescale : { - module_type : PrescaleEvent - nPrescale : 1 -# nPrescale : @local::caloMixed_sf - useFilteredEvents : true - } - - caloFastCosmicEventPrescale : { - module_type : PrescaleEvent - nPrescale : 1 - } - - caloFastRMCEventPrescale : { - module_type: PrescaleEvent - nPrescale : 1 - useFilteredEvents : true - } - - caloFastCosmicEventPrescale : { - module_type : PrescaleEvent - nPrescale : 1 - useFilteredEvents : true - } - - caloFastMVALHCEEventPrescale : { - module_type : PrescaleEvent -# nPrescale : @local::caloFastMVALHCE__evt_sf - nPrescale : 1 - } - - caloFastMVALHCEPrescale : { - module_type : PrescaleEvent -# nPrescale : @local::caloFastMVALHCE__sf - nPrescale : 1 - useFilteredEvents : true - } - - caloFastPhotonEventPrescale : { - module_type : PrescaleEvent - nPrescale : 1 - } - - caloFastPhotonPrescale : { - module_type : PrescaleEvent - nPrescale : 1 - useFilteredEvents : true - } - - caloFastMVANNCEEventPrescale : { - module_type : PrescaleEvent - nPrescale : 1 - } - - caloFastMVANNCEPrescale : { - module_type : PrescaleEvent - nPrescale : 1 - useFilteredEvents : true - } - - #FIXME! this filter will no longer be needed once we will have a standardized definition of good events - caloTriggerPreselect : { @table::CaloFilters.caloTriggerPreselect } - - #filter instances - - #FIXME! we might want to have few config of these filters - caloMVACEFilter : { @table::CaloFilters.caloMVACEFilter } - - caloFastMVAMixedCEFilter : { @table::CaloFilters.caloFastMVAMixedCEFilter } - - #dummy filter for cosmic muon calibration - caloFastCosmicFilter : { @table::CaloFilters.caloFastCosmicFilter } - - #RMC filter - caloFastRMCFilter : { @table::CaloFilters.caloFastRMCFilter } - - #select events based on a likelihood discriminator - caloFastMVALHCEFilter : { @table::CaloFilters.caloFastMVALHCEFilter } - - #fixme@ this is just a place holder - caloFastPhotonFilter : { @table::CaloFilters.caloFastPhotonFilter } - - caloFastMVANNCEFilter : { @table::CaloFilters.caloFastMVANNCEFilter } - - } - - sequences : { - - caloFast_mvaNNCE : [ caloFastMVANNCEEventPrescale, @sequence::CaloHitRecoTrigger.prepareHits, @sequence::CaloClusterTrigger.Reco, caloFastMVANNCEFilter] - - caloFast_mvaMixedCE : [ caloFastMVAMixedCEEventPrescale, @sequence::TrkHitRecoTrigger.sequences.TTprepareHits, - CaloTrigger, caloFastMVAMixedCEFilter ] - - caloFast_cosmic : [ caloFastCosmicEventPrescale, @sequence::CaloHitRecoTrigger.prepareHits, @sequence::CaloClusterTrigger.Reco, caloFastCosmicFilter] - - caloFast_rmc : [ caloFastRMCEventPrescale, @sequence::CaloHitRecoTrigger.prepareHits, @sequence::CaloClusterTrigger.Reco, caloFastRMCFilter ] - - caloFast_mvaLHCE : [ caloFastMVALHCEEventPrescale, @sequence::CaloHitRecoTrigger.prepareHits, @sequence::CaloClusterTrigger.Reco, caloFastMVALHCEFilter] - - #FIX ME! THIS IS JUST A PLACE HOLDER - caloFast_photon : [ caloFastPhotonEventPrescale, @sequence::CaloHitRecoTrigger.prepareHits, @sequence::CaloClusterTrigger.Reco, caloFastPhotonFilter] - - # caloFast_photon : [ caloFastMVANNCEEventPrescale, sequence::CaloHitRecoTrigger.prepareHits, CaloClusterFast,caloFastMVANNCEFilter ] - - } -} - -END_PROLOG diff --git a/CaloReco/fcl/prolog_trigger.fcl b/CaloReco/fcl/prolog_trigger.fcl deleted file mode 100644 index b178f527a8..0000000000 --- a/CaloReco/fcl/prolog_trigger.fcl +++ /dev/null @@ -1,33 +0,0 @@ -# -*- mode: tcl -*- -#------------------------------------------------------------------------------ -#------------------------------------------------------------------------------ -#include "Offline/CaloReco/fcl/common.fcl" - - -BEGIN_PROLOG - -CaloHitMakerFast : -{ - module_type : CaloHitMakerFast - caloDigiCollection : CaloDigiMaker - digiSampling : @local::HitMakerDigiSampling - ProtonBunchTimeTag : "EWMProducer" - diagLevel : 0 - deltaTPulses : 11 - nPEperMeV : 30 - noiseLevelMeV : 0.55 - nSigmaNoise : 4 - caphriCrystalID : [623, 624, 595, 596] -} - - -CaloHitRecoTrigger : -{ - producers : { - CaloHitMakerFast : @local::CaloHitMakerFast - } - - prepareHits : [ CaloHitMakerFast ] -} - -END_PROLOG diff --git a/CosmicReco/fcl/prolog_trigger.fcl b/CosmicReco/fcl/prolog_trigger.fcl deleted file mode 100644 index 13cc00a87d..0000000000 --- a/CosmicReco/fcl/prolog_trigger.fcl +++ /dev/null @@ -1,135 +0,0 @@ -# -*- mode: tcl -*- -#------------------------------------------------------------------------------ -#------------------------------------------------------------------------------ -#include "Offline/CosmicReco/fcl/prolog.fcl" - -BEGIN_PROLOG - - -CstTimeClusterFinder : { - module_type : TimeClusterFinderCosmics - ComboHitCollection : "TTflagBkgHits" - CaloClusterCollection : "none" - TestFlag : false - T0Calculator : @local::TimeCalculator - -} - -CstSimpleTimeCluster : { - module_type : SimpleTimeCluster - ComboHitCollection : "TTmakePH" - TestFlag : false -} - -CstLineFinder : { - @table::CosmicTracking.producers.LineFinder - ComboHitCollection : "TTmakePH" - TimeClusterCollection : "CstSimpleTimeCluster" -} - -CstTrigger : { - - producers : { - CstTimeClusterFinder : @local::CstTimeClusterFinder - CstSimpleTimeCluster : @local::CstSimpleTimeCluster - CstLineFinder : @local::CstLineFinder - - CstCosmicTrackFinder :{ @table::CosmicTracking.producers.CosmicTrackFinderTimeFit - ComboHitCollection : "TTmakePH" - TimeClusterCollection : "CstSimpleTimeCluster" - LineFinderTag : "CstLineFinder" - } - } - - filters : { - #PreEvent PreScaler: - cstEventPrescale : { - module_type : PrescaleEvent - nPrescale : 1 - } - - cstTimeClusterEventPrescale : { - module_type : PrescaleEvent - nPrescale : 1 - } - - cstSDCountFilter : { - module_type : DigiFilter #defined in Triggers - strawDigiCollection : makeSD - caloDigiCollection : notUsed - useStrawDigi : true - useCaloDigi : false - minNStrawDigi : 8 - maxNStrawDigi : 10000 - minNCaloDigi : -1 - maxNCaloDigi : -1 - maxCaloEnergy : -1 - } - - cstTimeClusterSDCountFilter : { - module_type : DigiFilter #defined in Triggers - strawDigiCollection : makeSD - caloDigiCollection : notUsed - useStrawDigi : true - useCaloDigi : false - minNStrawDigi : 8 - maxNStrawDigi : 10000 - minNCaloDigi : -1 - maxNCaloDigi : -1 - maxCaloEnergy : -1 - } - - - cstTCFilter : { - module_type : TimeClusterFilter - timeClusterCollection : "CstSimpleTimeCluster" - minNStrawHits : 8 - } - - cstTimeClusterTCFilter : { - module_type : TimeClusterFilter - timeClusterCollection : "CstSimpleTimeCluster" - minNStrawHits : 8 - } - - #From Filter, only by hits currently: - cstTSFilter : { - module_type : CosmicSeedFilter - CosmicTrackSeedCollection : "CstCosmicTrackFinder" - cosmicseedFitFlag : ["HelixOK","HelixConverged"] - minnsh : 8 - debugLevel : 0 - } - } - - sequences : { - - cst : [ cstEventPrescale, @sequence::CaloHitRecoTrigger.prepareHits, @sequence::CaloClusterTrigger.Reco, - @sequence::TrkHitRecoTrigger.sequences.TTmakefastHits, - cstSDCountFilter, - CstSimpleTimeCluster, cstTCFilter, - CstLineFinder, - CstCosmicTrackFinder, - cstTSFilter, - cstTriggerInfoMerger ] - - cst_timing0 : [ cstEventPrescale, @sequence::CaloHitRecoTrigger.prepareHits, @sequence::CaloClusterTrigger.Reco, - @sequence::TrkHitRecoTrigger.sequences.TTmakefastHits, - cstSDCountFilter, - CstSimpleTimeCluster, cstTCFilter, - CstCosmicTrackFinder ] - - cst_timing1 : [ cstEventPrescale, @sequence::CaloHitRecoTrigger.prepareHits, @sequence::CaloClusterTrigger.Reco, - @sequence::TrkHitRecoTrigger.sequences.TTmakefastHits, - cstSDCountFilter, - CstSimpleTimeCluster ] - - cstTimeCluster : [ cstTimeClusterEventPrescale, - @sequence::TrkHitRecoTrigger.sequences.TTmakefastHits, - cstTimeClusterSDCountFilter, - CstSimpleTimeCluster, cstTimeClusterTCFilter, cstTimeClusterTriggerInfoMerger ] - - - } -} -END_PROLOG diff --git a/DAQ/fcl/prolog_trigger.fcl b/DAQ/fcl/prolog_trigger.fcl deleted file mode 100644 index c9a1341a1e..0000000000 --- a/DAQ/fcl/prolog_trigger.fcl +++ /dev/null @@ -1,114 +0,0 @@ -# -*- mode: tcl -*- -# -# Define sequences for track based triggers. The sequences for hit preparation -# and the tracking modules configuration must preceede these and are defined elsewhere -# original author: Dave Brown (LBNL) Mar. 7 2017 -# -BEGIN_PROLOG -# define the filter modules used for track-based trigger -# filter to require a minimum # of hits in a time slot -DAQ : { - producers : { - binaryOutput: { - # module_type : BinaryPacketsFromDataBlocks - module_type : ArtBinaryPacketsFromDigis - strawDigiCollection : "makeSD" - caloDigiCollection : "CaloDigiMaker" - crvDigiCollection : "CrvDigi" - diagLevel : 0 - maxFullPrint : 0 - - includeTracker : 0 - includeCalorimeter : 0 - includeCrv : 0 - includeDMAHeaders: 1 - - generateTimestampTable : 0 - tableFile : "tsTable.bin" - timestampOffset : 0 - - generateBinaryFile : 1 - generateTextFile : 0 -# outputFile : "DTC_packets.bin" -# maxDMABlockSize : 32000 -# bufferSize : 1000 - } - - makeSDOld: - { - module_type: StrawAndCaloDigisFromFragments - diagLevel: 0 - parseCAL: 0 - parseTRK: 1 - useTrkADC : 0 - - trkTag : "daq:trk" - caloTag : "daq:calo" - } - - makeSD: - { - module_type: StrawRecoFromFragments - diagLevel : 0 - useTrkADC : 0 - trkTag : "genFrags:" #"daq:trk" - } - - CaloDigiMaker: - { - module_type : CaloRecoFromFragments - diagLevel : 0 - caloTag : "" #"daq:calo" - } - - CaloHitMaker: - { - module_type : CaloHitsFromFragments - diagLevel : 0 - caloTag : "" #"daq:calo" - digiSampling : 5 - deltaTPulses : 5. - nPEperMeV : 30 - noiseLevelMeV : 0.55 - nSigmaNoise : 4 - # hitEDepMax : 80. - hitEDepMax : 1000. # for testing - hitEDepMin : 1.0 - caphriEDepMax : 5.0 #MeV - caphriEDepMin : 1.0 #MeV - } - - CrvDigi: - { - module_type : CrvDigisFromFragments - diagLevel : 0 - crvTag : "genFrags" - } - - makeSH: - { - module_type : StrawHitRecoFromFragments - diagLevel : 0 - printLevel : 0 - FitType : 5 - UseCalorimeter : false - clusterDt : 100 - minimumEnergy : 0.0 - maximumEnergy : 0.0035 - minimumRho : 0. - maximumRho : 800. - crossTalkEnergy : 0.007 - crossTalkMinimumTime : -1 - crossTalkMaximumTime : 100 - minimumTime : 500 - maximumTime : 2000 - FilterHits : true - WriteStrawHitCollection : false - FlagCrossTalk : false - CaloClusterCollectionTag : "CaloClusterFast" - ProtonBunchTimeTag : "EWMProducer" - TrackerFragmentTag : "daq:trk" - } - } -} -END_PROLOG diff --git a/Mu2eKinKal/fcl/prolog_trigger.fcl b/Mu2eKinKal/fcl/prolog_trigger.fcl deleted file mode 100644 index e8ce240d46..0000000000 --- a/Mu2eKinKal/fcl/prolog_trigger.fcl +++ /dev/null @@ -1,129 +0,0 @@ -# -# Trigger-specific overrides for KinKal settings -# -#include "Offline/Mu2eKinKal/fcl/prolog.fcl" -BEGIN_PROLOG -Mu2eKinKalTrigger : { - MAT: { - @table::Mu2eKinKal.MAT - } - - KKFIT: { - @table::Mu2eKinKal.KKFIT - AddHits : false - AddMaterial : false - MaterialCorrection : true - MaxCaloClusterDt : 10.0 - MaxCaloClusterDOCA : 150.0 # mm - SampleSurfaces : ["TT_Mid"] - ExtendSurfaces : ["TT_Mid"] - } - - SEEDFIT: { - @table::Mu2eKinKal.SEEDFIT - MaxNIter : 2 - MetaIterationSettings : [ - [ 4.0, "CADSHU" ], - [ 3.0, "CADSHU" ] - ] - CADSHUSettings : [ - # maxdoca, maxderr, minrdrift, maxrdrift, flag, , allowed, freeze, diag - [ 60.0, 1e6, 5.0, 5.0, "TOT", "Null:Inactive", "", 0 ], - [ 40.0, 1e6, 5.0, 5.0, "TOT", "Null:Inactive", "", 0 ] - ] - StrawXingUpdaterSettings : [ - [10.0, -1.0, -1.0, true, 0 ] - ] - BkgANNSHUSettings : [ - ] - } - - SEEDEXT: { - @table::Mu2eKinKal.SEEDEXT - MaxNIter : 2 - BFieldCorrection : true - - CADSHUSettings : [ - [ 30.0, 1e6, 5.0, 5.0, "TOT", "Null:Inactive", "", 0 ], - [ 20.0, 20.0, 5.0, 5.0, "TOT", "Null:Inactive", "", 0 ] - ] - MetaIterationSettings : [ - [ 2.0, "CADSHU" ], - [ 1.0, "CADSHU:BkgANNSHU" ] - ] - StrawXingUpdaterSettings : [ - [10.0, -1.0, -1.0, true, 0 ] - ] - BkgANNSHUSettings : [ - [ "Offline/Mu2eKinKal/data/TrainBkgTrigger.dat",0.01,"Inactive", 1] - ] - } - - LOOPHELIX : { - @table::Mu2eKinKal.LOOPHELIX - SeedErrors: [ 5, 5, 5, 5, 2e-2, 5 ] - } - - KINEMATICLINE : { - @table::Mu2eKinKal.KINEMATICLINE - } -} - -TTMu2eKinKal : { - @table::Mu2eKinKal - @table::Mu2eKinKalTrigger - - TTKKSeedFit : { - module_type : LoopHelixFit - MaterialSettings : @local::Mu2eKinKalTrigger.MAT - KKFitSettings: @local::Mu2eKinKalTrigger.KKFIT - FitSettings : @local::Mu2eKinKalTrigger.SEEDFIT - ExtensionSettings : @local::Mu2eKinKalTrigger.SEEDEXT - ModuleSettings : @local::Mu2eKinKalTrigger.LOOPHELIX - UsePDGCharge : true - } - - TTKKLineSeedFit : { - module_type : KinematicLineFit - MaterialSettings : @local::Mu2eKinKalTrigger.MAT - KKFitSettings: @local::Mu2eKinKalTrigger.KKFIT - FitSettings : @local::Mu2eKinKalTrigger.SEEDFIT - ExtensionSettings : @local::Mu2eKinKalTrigger.SEEDEXT - ModuleSettings : @local::Mu2eKinKalTrigger.KINEMATICLINE - UsePDGCharge : true - } - - CosmicFilter : { - module_type : LineFit - } -} - -TTMu2eKinKal : { - @table::TTMu2eKinKal - producers : { - # seed fits: these don't use drift information - TTKKDePSeedFit: @local::TTMu2eKinKal.TTKKSeedFit - TTKKDeMSeedFit: @local::TTMu2eKinKal.TTKKSeedFit - TTKKUePSeedFit: @local::TTMu2eKinKal.TTKKSeedFit - TTKKUeMSeedFit: @local::TTMu2eKinKal.TTKKSeedFit - TTKKLineSeedFit: @local::TTMu2eKinKal.KKLineSeedFit - # do we want other fits here? - - } - filters : { - CosmicFilter: @local::TTMu2eKinKal.CosmicFilter - } -} - -TTMu2eKinKal.producers.TTKKLineSeedFit.ExtensionSettings.BFieldCorrection : false -TTMu2eKinKal.producers.TTKKLineSeedFit.ModuleSettings.FitParticle : 13 -TTMu2eKinKal.producers.TTKKDeMSeedFit.ModuleSettings.FitParticle : 11 -TTMu2eKinKal.producers.TTKKDeMSeedFit.FitDirection : 0 -TTMu2eKinKal.producers.TTKKDePSeedFit.ModuleSettings.FitParticle : -11 -TTMu2eKinKal.producers.TTKKDePSeedFit.FitDirection : 0 -TTMu2eKinKal.producers.TTKKUeMSeedFit.ModuleSettings.FitParticle : 11 -TTMu2eKinKal.producers.TTKKUeMSeedFit.FitDirection : 1 -TTMu2eKinKal.producers.TTKKUePSeedFit.ModuleSettings.FitParticle : -11 -TTMu2eKinKal.producers.TTKKUePSeedFit.FitDirection : 1 - -END_PROLOG diff --git a/Trigger/fcl/prolog_trigger.fcl b/Trigger/fcl/prolog_trigger.fcl deleted file mode 100644 index a319d2af9b..0000000000 --- a/Trigger/fcl/prolog_trigger.fcl +++ /dev/null @@ -1,252 +0,0 @@ -# -*- mode: tcl -*- -#------------------------------------------------------------------------------ -# this file includes all the prolog needed to run the reconstruction -# at the trigger level and the filters used to make the trigger decision -#------------------------------------------------------------------------------ -#include "Offline/Mu2eKinKal/fcl/prolog_trigger.fcl" -#include "Offline/TrkReco/fcl/prolog_trigger.fcl" -#include "Offline/TrkPatRec/fcl/prolog_trigger.fcl" -#include "Offline/CalPatRec/fcl/prolog.fcl" -#include "Offline/CalPatRec/fcl/prolog_trigger.fcl" -#include "Offline/CaloReco/fcl/prolog_trigger.fcl" -#include "Offline/CaloCluster/fcl/prolog_trigger.fcl" -#include "Offline/TrkHitReco/fcl/prolog_trigger.fcl" -#include "Offline/TrkFilters/fcl/prolog_trigger.fcl" -#include "Offline/Compression/fcl/prolog.fcl" -#include "Offline/CosmicReco/fcl/prolog.fcl" -#include "Offline/CosmicReco/fcl/prolog_trigger.fcl" -#include "Offline/CaloFilters/fcl/prolog_trigger.fcl" - -BEGIN_PROLOG -Trigger : { - producers : { - @table::CaloFilters.producers - @table::CaloHitRecoTrigger.producers - @table::CaloClusterTrigger.producers - @table::TrkHitRecoTrigger.producers - @table::TrkHitReco.producers - @table::TrkRecoTrigger.producers - @table::TTMu2eKinKal.producers - @table::CosmicTracking.producers - @table::CstTrigger.producers - @table::TprTrigger.producers - @table::CprTrigger.producers - } - - filters : { - @table::CprTrigger.filters - @table::CaloFilters.filters - @table::TrkFilters.filters - @table::CstTrigger.filters - - #used to select 1 event out of N - unbiasedEventPrescale : { - module_type : PrescaleEvent - nPrescale : 10000 - triggerPath : "unbiased" - triggerFlag : ["PrescaleGoodEvents"] - } - - #prescaler for the standard strawDigi occupancy filter - minBiasSDCountEventPrescale : { - module_type : PrescaleEvent - nPrescale : 10000 - triggerPath : "minBiasStrawDigiCount" - triggerFlag : ["PrescaleRandom"] - } - - #prescaler for the strawDigi large-occupancy filter - largeSDCountEventPrescale : { - module_type : PrescaleEvent - nPrescale : 10000 - triggerPath : "largeStrawDigiCount" - triggerFlag : ["PrescaleRandom"] - } - - #filters based on the strawDigi occupancy: - - # LargeSDCountFilter: we need this filter to select strange events - # where we had lot of hits. That is a good handle - # for spotting strange behaviour of the tracker - largeSDCountFilter : { - module_type : DigiFilter - strawDigiCollection : makeSD - caloDigiCollection : notUsed - useStrawDigi : true - useCaloDigi : false - triggerPath : "largeStrawDigiCount" - minNStrawDigi : 10000 - maxNStrawDigi : 1000000 - minNCaloDigi : -1 - maxNCaloDigi : -1 - maxCaloEnergy : -1 - } - - # CDCountFilter : it's a minimum bias filter. It allows to select - # events based on the number of strawDigi - minBiasSDCountFilter : { - module_type : DigiFilter - strawDigiCollection : makeSD - caloDigiCollection : notUSed - useStrawDigi : true - useCaloDigi : false - triggerPath : "minBiasStrawDigiCount" - minNStrawDigi : 500 - maxNStrawDigi : 10000 - minNCaloDigi : -1 - maxNCaloDigi : -1 - maxCaloEnergy : -1 - } - - #prescaler for the standard strawDigi occupancy filter - minBiasCDCountEventPrescale : { - module_type : PrescaleEvent - nPrescale : 10000 - triggerPath : "minBiasCaloDigiCount" - triggerFlag : ["PrescaleRandom"] - } - - #prescaler for the strawDigi large-occupancy filter - largeCDCountEventPrescale : { - module_type : PrescaleEvent - nPrescale : 10000 - triggerPath : "largeCaloDigiCount" - triggerFlag : ["PrescaleRandom"] - } - - #filters based on the strawDigi occupancy: - - # LargeCDCountFilter: we need this filter to select strange events - # where we had lot of hits. That is a good handle - # for spotting strange behaviour of the tracker - largeCDCountFilter : { - module_type : DigiFilter - strawDigiCollection : notUsed - caloDigiCollection : CaloDigiMaker - useStrawDigi : false - useCaloDigi : true - triggerPath : "largeCaloDigiCount" - minNStrawDigi : -1 - maxNStrawDigi : -1 - minNCaloDigi : 5000 - maxNCaloDigi : 1000000 - maxCaloEnergy : -1 - } - - # CDCountFilter : it's a minimum bias filter. It allows to select - # events based on the number of strawDigi - minBiasCDCountFilter : { - module_type : DigiFilter - strawDigiCollection : notUsed - caloDigiCollection : CaloDigiMaker - useStrawDigi : false - useCaloDigi : true - triggerPath : "minBiasCaloDigiCount" - minNStrawDigi : -1 - maxNStrawDigi : -1 - minNCaloDigi : 200 - maxNCaloDigi : 5000 - maxCaloEnergy : -1 - } - } - - analyzers : { - ReadTriggerInfo : { - module_type : ReadTriggerInfo - } - } - - paths : { - #calorimeter based filters. It includes: CE, and calibrations - @table::CaloFilters.sequences - - #tracking filters. It includes: TrkPatRec, CalPatRec - @table::TrkFilters.sequences - - #straight track finder - @table::CstTrigger.sequences - - #unbiased filter. It selects the events based on their event id - unbiased : [ unbiasedEventPrescale ] - - #minimum bias filters. So far, a filter based on the StrawDigi occupancy - minBias_sdCount : [ minBiasSDCountEventPrescale, minBiasSDCountFilter] - - #filter to select events with large occupancy in the tracker - largeSDCount : [ largeSDCountEventPrescale, largeSDCountFilter] - - #minimum bias filters. So far, a filter based on the StrawDigi occupancy - minBias_cdCount : [ minBiasCDCountEventPrescale, minBiasCDCountFilter] - - #filter to select events with large occupancy in the tracker - largeCDCount : [ largeCDCountEventPrescale, largeCDCountFilter] - } - - outputs: { - triggerOutput : { - module_type: RootOutput - fileName: "filteredOutput.root" - SelectEvents : [ - "tpr*", - "cpr*", - "calo*" - ] -# Compressionlevel: 0 - # fileProperties : { - # maxEvents : 1000 - # maxSubRuns : - # maxSize : # in Kib - # maxAge : #in s - # granularity : [Event | SubRun | Run | InputFile | Job] # default is Event - # maxInputFiles : 1 - # } - outputCommands: ["drop *_*_*_*", - "keep *_*_*_*" ] - } - - rootoutUnbiased : { - module_type: RootOutput - fileName: "driver_unbiased.root" - SelectEvents : [ unbiasedTrigger ] - compressionLevel: 0 - - outputCommands: ["drop *_*_*_*", - "keep *_*_*_*" ] - } - - rootoutCaloOnly : { - module_type: RootOutput - fileName: "driver_calo_only.root" - SelectEvents : [ caloOnlyTrigger ] -# compressionLevel: 0 - - outputCommands: ["drop *_*_*_*", - "keep *_*_*_*" ] - } - - rootoutTrkDem : { - module_type: RootOutput - fileName: "driver_trk_dem.root" - SelectEvents : [ tprDeMHighPStopTargTrigger, cprDeMHighPStopTargTrigger ] - compressionLevel: 0 - - outputCommands: ["drop *_*_*_*", - "keep *_*_*_*" ] - } - - rootoutTrkDep : { - module_type: RootOutput - fileName: "driver_trk_dep.root" - SelectEvents : [ tprDePTrigger, cprDePHighPStopTargTrigger ] - compressionLevel: 0 - - outputCommands: ["drop *_*_*_*", - "keep *_*_*_*" ] - } - - - } - # sequence to create digis - PrepareDigis: [] -} -END_PROLOG diff --git a/TrkFilters/fcl/prolog_trigger.fcl b/TrkFilters/fcl/prolog_trigger.fcl deleted file mode 100644 index 248679c4ed..0000000000 --- a/TrkFilters/fcl/prolog_trigger.fcl +++ /dev/null @@ -1,991 +0,0 @@ -# -*- mode: tcl -*- -# -# Define sequences for track based triggers. The sequences for hit preparation -# and the tracking modules configuration must preceede these and are defined elsewhere -# original author: Dave Brown (LBNL) Mar. 7 2017 -# -BEGIN_PROLOG -# define the filter modules used for track-based trigger -# filter to require a minimum # of hits in a time slot -TrkFilters : { - filters : { - #-------------------------------------------------------------------------------- - # filters for the TimeClustering results - #-------------------------------------------------------------------------------- - tprTimeClusterDeMTCFilter : { - module_type : TimeClusterFilter - timeClusterCollection : "TTtimeClusterFinder" - } - tprTimeClusterDePTCFilter : { - module_type : TimeClusterFilter - timeClusterCollection : "TTtimeClusterFinder" - } - - - # CE and CEPlus from the ST - tprDeMHighPStopTargTCFilter : { - module_type : TimeClusterFilter - timeClusterCollection : "TTtimeClusterFinder" - } - tprDePHighPStopTargTCFilter : { - module_type : TimeClusterFilter - timeClusterCollection : "TTtimeClusterFinder" - } - cprDeMHighPStopTargTCFilter : { - module_type : TimeClusterFilter - timeClusterCollection : "TTCalTimePeakFinder" - minNStrawHits : 1 #just check if there are TimeClusters - } - cprDePHighPStopTargTCFilter : { - module_type : TimeClusterFilter - timeClusterCollection : "TTCalTimePeakFinder" - minNStrawHits : 1 #just check if there are TimeClusters - } - - #cosmic tracks - tprDeMTCFilter : { - module_type : TimeClusterFilter - timeClusterCollection : "TTtimeClusterFinder" - } - tprDePTCFilter : { - module_type : TimeClusterFilter - timeClusterCollection : "TTtimeClusterFinder" - } - tprHelixDeMTCFilter : { - module_type : TimeClusterFilter - timeClusterCollection : "TTtimeClusterFinder" - } - tprHelixDePTCFilter : { - module_type : TimeClusterFilter - timeClusterCollection : "TTtimeClusterFinder" - } - tprHelixUeMTCFilter : { - module_type : TimeClusterFilter - timeClusterCollection : "TTtimeClusterFinderUe" - } - tprHelixUePTCFilter : { - module_type : TimeClusterFilter - timeClusterCollection : "TTtimeClusterFinderUe" - } - cprDeMTCFilter : { - module_type : TimeClusterFilter - timeClusterCollection : "TTCalTimePeakFinder" - } - cprDePTCFilter : { - module_type : TimeClusterFilter - timeClusterCollection : "TTCalTimePeakFinder" - } - cprHelixDeMTCFilter : { - module_type : TimeClusterFilter - timeClusterCollection : "TTCalTimePeakFinder" - } - cprHelixDePTCFilter : { - module_type : TimeClusterFilter - timeClusterCollection : "TTCalTimePeakFinder" - } - cprHelixUeMTCFilter : { - module_type : TimeClusterFilter - timeClusterCollection : "TTCalTimePeakFinderUe" - } - cprHelixUePTCFilter : { - module_type : TimeClusterFilter - timeClusterCollection : "TTCalTimePeakFinderUe" - } - - #low p particles from the ST - tprDeMLowPStopTargTCFilter : { - module_type : TimeClusterFilter - timeClusterCollection : "TTtimeClusterFinder" - } - tprDePLowPStopTargTCFilter : { - module_type : TimeClusterFilter - timeClusterCollection : "TTtimeClusterFinder" - } - cprDeMLowPStopTargTCFilter : { - module_type : TimeClusterFilter - timeClusterCollection : "TTCalTimePeakFinder" - } - cprDePLowPStopTargTCFilter : { - module_type : TimeClusterFilter - timeClusterCollection : "TTCalTimePeakFinder" - } - - #fast sequcnes that process only the ComboHits in time with the calo-cluster with E>50MeV - tprSeedUCCDeMTCFilter : { - module_type : TimeClusterFilter - timeClusterCollection : "TTtimeClusterFinderUCC" - } - tprSeedUCCDePTCFilter : { - module_type : TimeClusterFilter - timeClusterCollection : "TTtimeClusterFinderUCC" - } - cprSeedUCCDeMTCFilter : { - module_type : TimeClusterFilter - timeClusterCollection : "TTCalTimePeakFinderUCC" - } - cprSeedUCCDePTCFilter : { - module_type : TimeClusterFilter - timeClusterCollection : "TTCalTimePeakFinderUCC" - } - - #e- from the IPA - tprHelixDeMIpaTCFilter : { - module_type : TimeClusterFilter - timeClusterCollection : "TTtimeClusterFinder" - } - - tprHelixDeMIpaPhiScaledTCFilter : { - module_type : TimeClusterFilter - timeClusterCollection : "TTtimeClusterFinder" - } - - #-------------------------------------------------------------------------------- - # Helix filters - #-------------------------------------------------------------------------------- - - # filters for either positive or negative helicity tracks near the CE energy - tprDeMHighPStopTargHSFilter : { - module_type : HelixFilter - helixSeedCollection : "TTHelixMergerDeM" - } - tprDePHighPStopTargHSFilter : { - module_type : HelixFilter - helixSeedCollection : "TTHelixMergerDeP" - } - - cprDeMHighPStopTargHSFilter : { - module_type : HelixFilter - helixSeedCollection : "TTCalHelixMergerDeM" - } - cprDePHighPStopTargHSFilter : { - module_type : HelixFilter - helixSeedCollection : "TTCalHelixMergerDeP" - } - - # cosmic tracks e-/e+ not from the ST - tprDeMHSFilter : { - module_type : HelixFilter - helixSeedCollection : "TTHelixMergerDeM" - } - tprDePHSFilter : { - module_type : HelixFilter - helixSeedCollection : "TTHelixMergerDeP" - } - - cprDeMHSFilter : { - module_type : HelixFilter - helixSeedCollection : "TTCalHelixMergerDeM" - } - cprDePHSFilter : { - module_type : HelixFilter - helixSeedCollection : "TTCalHelixMergerDeP" - } - - #cosmic helix: HS filters - tprHelixDeMHSFilter : { - module_type : HelixFilter - helixSeedCollection : "TTHelixMergerDeM" - } - tprHelixDePHSFilter : { - module_type : HelixFilter - helixSeedCollection : "TTHelixMergerDeP" - } - tprHelixUeMHSFilter : { - module_type : HelixFilter - helixSeedCollection : "TTHelixMergerUeM" - } - tprHelixUePHSFilter : { - module_type : HelixFilter - helixSeedCollection : "TTHelixMergerUeP" - } - - cprHelixDeMHSFilter : { - module_type : HelixFilter - helixSeedCollection : "TTCalHelixMergerDeM" - } - cprHelixDePHSFilter : { - module_type : HelixFilter - helixSeedCollection : "TTCalHelixMergerDeP" - } - cprHelixUeMHSFilter : { - module_type : HelixFilter - helixSeedCollection : "TTCalHelixMergerUeM" - } - cprHelixUePHSFilter : { - module_type : HelixFilter - helixSeedCollection : "TTCalHelixMergerUeP" - } - - - # low P e-/e+ from the ST - tprDeMLowPStopTargHSFilter : { - module_type : HelixFilter - helixSeedCollection : "TTHelixMergerDeM" - } - tprDePLowPStopTargHSFilter : { - module_type : HelixFilter - helixSeedCollection : "TTHelixMergerDeP" - } - - cprDeMLowPStopTargHSFilter : { - module_type : HelixFilter - helixSeedCollection : "TTCalHelixMergerDeM" - } - cprDePLowPStopTargHSFilter : { - module_type : HelixFilter - helixSeedCollection : "TTCalHelixMergerDeP" - } - - # filters that uses the combohit collection filtered with the calorimeter info - tprSeedUCCDeMHSFilter : { - module_type : HelixFilter - helixSeedCollection : "TTHelixUCCMergerDeM" - } - tprSeedUCCDePHSFilter : { - module_type : HelixFilter - helixSeedCollection : "TTHelixUCCMergerDeP" - } - - cprSeedUCCDeMHSFilter : { - module_type : HelixFilter - helixSeedCollection : "TTCalHelixUCCMergerDeM" - } - cprSeedUCCDePHSFilter : { - module_type : HelixFilter - helixSeedCollection : "TTCalHelixUCCMergerDeP" - } - - - tprHelixDeMIpaHSFilter : { - module_type : HelixFilter - helixSeedCollection : "TTHelixMergerDeM" - } - - tprHelixDeMIpaPhiScaledHSFilter : { - module_type : HelixFilter - helixSeedCollection : "TTHelixMergerDeM" - } - - - # filters for CE candidates (downstream eminus near 100 MeV/c) - tprDeMHighPStopTargTSFilter : { - module_type : SeedFilter - kalSeedCollection : "TTKSFDeM" - } - - cprDeMHighPStopTargTSFilter : { - module_type : SeedFilter - kalSeedCollection : "TTCalSeedFitDem" - } - - #cosmic tracks e-/e+ - tprDeMTSFilter : { - module_type : SeedFilter - kalSeedCollection : "TTKSFDeM" - } - - cprDeMTSFilter : { - module_type : SeedFilter - kalSeedCollection : "TTCalSeedFitDem" - } - - #low P e-/e+ from the ST - tprDeMLowPStopTargTSFilter : { - module_type : SeedFilter - kalSeedCollection : "TTKSFDeM" - } - - cprDeMLowPStopTargTSFilter : { - module_type : SeedFilter - kalSeedCollection : "TTCalSeedFitDem" - } - - - # fitlered sequences - tprSeedUCCDeMTSFilter : { - module_type : SeedFilter - kalSeedCollection : "TTKSFUCCDeM" - } - - cprSeedUCCDeMTSFilter : { - module_type : SeedFilter - kalSeedCollection : "TTCalSeedFitUCCDem" - } - tprDeMHighPStopTargKFFilter : { - module_type : SeedFilter - kalSeedCollection : "TTKFFDeM" - } - # filters for downstream positrons (mu- -> e+ conversion) - tprDePHighPStopTargTSFilter : { - module_type : SeedFilter - kalSeedCollection : "TTKSFDeP" - } - - cprDePHighPStopTargTSFilter : { - module_type : SeedFilter - kalSeedCollection : "TTCalSeedFitDep" - } - - - #cosmic tracks e-/e+ from the ST - tprDePTSFilter : { - module_type : SeedFilter - kalSeedCollection : "TTKSFDeP" - } - - cprDePTSFilter : { - module_type : SeedFilter - kalSeedCollection : "TTCalSeedFitDep" - } - - #low P e-/e+ from the ST - tprDePLowPStopTargTSFilter : { - module_type : SeedFilter - kalSeedCollection : "TTKSFDeP" - } - - cprDePLowPStopTargTSFilter : { - module_type : SeedFilter - kalSeedCollection : "TTCalSeedFitDep" - } - - - - tprSeedUCCDePTSFilter : { - module_type : SeedFilter - kalSeedCollection : "TTKSFUCCDeP" - } - - cprSeedUCCDePTSFilter : { - module_type : SeedFilter - kalSeedCollection : "TTCalSeedFitUCCDep" - } - - tprDePHighPStopTargKFFilter : { - module_type : SeedFilter - kalSeedCollection : "TTKFFDeP" - } - # Other filters FIXME!! - # calibration filters - # reflecting cosmic filters - # low-momentum electron filters - # low-field running filters - - # trackSDCountFilter: is used upstream all the tracking sequence. - # it requires minimum number of hits; that is - # particularly useful for the off-spill events - tprTimeClusterDeMSDCountFilter : { - module_type : DigiFilter - strawDigiCollection : makeSD - caloDigiCollection : notUsed - } - tprTimeClusterDePSDCountFilter : { - module_type : DigiFilter - strawDigiCollection : makeSD - caloDigiCollection : notUsed - } - - tprHelixDeMSDCountFilter : { - module_type : DigiFilter - strawDigiCollection : makeSD - caloDigiCollection : notUsed - } - tprHelixDePSDCountFilter : { - module_type : DigiFilter - strawDigiCollection : makeSD - caloDigiCollection : notUsed - } - tprHelixDeMIpaSDCountFilter : { - module_type : DigiFilter - strawDigiCollection : makeSD - caloDigiCollection : notUsed - } - - tprHelixDeMIpaPhiScaledSDCountFilter : { - module_type : DigiFilter - strawDigiCollection : makeSD - caloDigiCollection : notUsed - } - - tprDeMHighPStopTargSDCountFilter : { - module_type : DigiFilter - strawDigiCollection : makeSD - caloDigiCollection : notUsed - } - tprDePHighPStopTargSDCountFilter : { - module_type : DigiFilter - strawDigiCollection : makeSD - caloDigiCollection : notUsed - } - - cprDeMHighPStopTargSDCountFilter : { - module_type : DigiFilter - strawDigiCollection : makeSD - caloDigiCollection : notUsed - } - cprDePHighPStopTargSDCountFilter : { - module_type : DigiFilter - strawDigiCollection : makeSD - caloDigiCollection : notUsed - } - - #SD counter filter for comisc track triggers - - tprDeMSDCountFilter : { - module_type : DigiFilter - strawDigiCollection : makeSD - caloDigiCollection : notUsed - } - tprDePSDCountFilter : { - module_type : DigiFilter - strawDigiCollection : makeSD - caloDigiCollection : notUsed - } - - cprDeMSDCountFilter : { - module_type : DigiFilter - strawDigiCollection : makeSD - caloDigiCollection : notUsed - } - cprDePSDCountFilter : { - module_type : DigiFilter - strawDigiCollection : makeSD - caloDigiCollection : notUsed - } - - #cosmic cpr helix - tprHelixDeMSDCountFilter : { - module_type : DigiFilter - strawDigiCollection : makeSD - caloDigiCollection : notUsed - } - tprHelixDePSDCountFilter : { - module_type : DigiFilter - strawDigiCollection : makeSD - caloDigiCollection : notUsed - } - tprHelixUeMSDCountFilter : { - module_type : DigiFilter - strawDigiCollection : makeSD - caloDigiCollection : notUsed - } - tprHelixUePSDCountFilter : { - module_type : DigiFilter - strawDigiCollection : makeSD - caloDigiCollection : notUsed - } - - cprHelixDeMSDCountFilter : { - module_type : DigiFilter - strawDigiCollection : makeSD - caloDigiCollection : notUsed - } - cprHelixDePSDCountFilter : { - module_type : DigiFilter - strawDigiCollection : makeSD - caloDigiCollection : notUsed - } - - - #SD counter filter for lowP trigger lines - tprDeMLowPStopTargSDCountFilter : { - module_type : DigiFilter - strawDigiCollection : makeSD - caloDigiCollection : notUsed - } - tprDePLowPStopTargSDCountFilter : { - module_type : DigiFilter - strawDigiCollection : makeSD - caloDigiCollection : notUsed - } - - cprDeMLowPStopTargSDCountFilter : { - module_type : DigiFilter - strawDigiCollection : makeSD - caloDigiCollection : notUsed - } - cprDePLowPStopTargSDCountFilter : { - module_type : DigiFilter - strawDigiCollection : makeSD - caloDigiCollection : notUsed - } - - - tprSeedUCCDeMSDCountFilter : { - module_type : DigiFilter - strawDigiCollection : makeSD - caloDigiCollection : notUsed - } - tprSeedUCCDePSDCountFilter : { - module_type : DigiFilter - strawDigiCollection : makeSD - caloDigiCollection : notUsed - } - - cprSeedUCCDeMSDCountFilter : { - module_type : DigiFilter - strawDigiCollection : makeSD - caloDigiCollection : notUsed - } - cprSeedUCCDePSDCountFilter : { - module_type : DigiFilter - strawDigiCollection : makeSD - caloDigiCollection : notUsed - } - # Prescaling filters - #follow the prescaler filters for Tpr Track sequences - - #filters for the paths where decision is made using the TimeCluster - tprTimeClusterDeMEventPrescale : { - module_type : PrescaleEvent - } - tprTimeClusterDeMPrescale : { - module_type : PrescaleEvent - } - tprTimeClusterDePEventPrescale : { - module_type : PrescaleEvent - } - tprTimeClusterDePPrescale : { - module_type : PrescaleEvent - } - - #filters for the paths where decision is made using the HelixSeed - tprHelixDeMEventPrescale : { - module_type : PrescaleEvent - } - tprHelixDeMPrescale : { - module_type : PrescaleEvent - } - tprHelixDePEventPrescale : { - module_type : PrescaleEvent - } - tprHelixDePPrescale : { - module_type : PrescaleEvent - } - tprHelixDeMIpaEventPrescale : { - module_type : PrescaleEvent - } - tprHelixDeMIpaPrescale : { - module_type : PrescaleEvent - } - - tprHelixDeMIpaPhiScaledEventPrescale : { - module_type : PrescaleEvent - } - tprHelixDeMIpaPhiScaledPrescale : { - module_type : PrescaleEvent - } - - #filters for the paths where decision is made using the TrackSeed - tprDeMHighPStopTargEventPrescale: { - module_type : PrescaleEvent - } - - tprDeMHighPStopTargPrescale : { - module_type : PrescaleEvent - } - - tprDePHighPStopTargEventPrescale: { - module_type : PrescaleEvent - } - tprDePHighPStopTargPrescale : { - module_type : PrescaleEvent - } - - - tprDeMEventPrescale: { - module_type : PrescaleEvent - } - - tprDeMPrescale : { - module_type : PrescaleEvent - } - - tprDePEventPrescale: { - module_type : PrescaleEvent - nPrescale : 1 - } - tprDePPrescale : { - module_type : PrescaleEvent - } - - #cosmic tpr helix - tprHelixDeMEventPrescale: { - module_type : PrescaleEvent - } - - tprHelixDePEventPrescale: { - module_type : PrescaleEvent - } - - tprHelixUeMEventPrescale: { - module_type : PrescaleEvent - } - - tprHelixUePEventPrescale: { - module_type : PrescaleEvent - } - - # low p particles - tprDeMLowPStopTargEventPrescale: { - module_type : PrescaleEvent - } - - tprDeMLowPStopTargPrescale : { - module_type : PrescaleEvent - } - - tprDePLowPStopTargEventPrescale: { - module_type : PrescaleEvent - } - tprDePLowPStopTargPrescale : { - module_type : PrescaleEvent - } - - - #follow the prescaler filters for Tpr Track sequences - cprDeMHighPStopTargEventPrescale: { - module_type : PrescaleEvent - } - - cprDeMHighPStopTargPrescale : { - module_type : PrescaleEvent - } - - cprDePHighPStopTargEventPrescale: { - module_type : PrescaleEvent - } - - cprDePHighPStopTargPrescale : { - module_type : PrescaleEvent - } - - cprDePLowPStopTargPrescale : { - module_type : PrescaleEvent - } - - cprDePLowPStopTargEventPrescale: { - module_type : PrescaleEvent - } - - cprDeMLowPStopTargPrescale : { - module_type : PrescaleEvent - } - - cprDeMLowPStopTargEventPrescale: { - module_type : PrescaleEvent - } - - #cosmic tracks - cprDeMPrescale : { - module_type : PrescaleEvent - } - - cprDeMEventPrescale: { - module_type : PrescaleEvent - } - - cprDePPrescale : { - module_type : PrescaleEvent - } - - cprDePEventPrescale: { - module_type : PrescaleEvent - } - - #cosmic helixes - cprHelixDeMEventPrescale: { - module_type : PrescaleEvent - } - - cprHelixUeMEventPrescale: { - module_type : PrescaleEvent - } - - cprHelixDePPrescale : { - module_type : PrescaleEvent - } - - cprHelixDePEventPrescale: { - module_type : PrescaleEvent - } - - cprHelixUePEventPrescale: { - module_type : PrescaleEvent - } - - #prescaler for the sequences that use the combohit collection filtered with the calorimeter cluster - tprSeedUCCDeMEventPrescale: { - module_type : PrescaleEvent - } - - tprSeedUCCDeMPrescale : { - module_type : PrescaleEvent - } - - tprSeedUCCDePEventPrescale: { - module_type : PrescaleEvent - } - tprSeedUCCDePPrescale : { - module_type : PrescaleEvent - } - - #follow the prescaler filters for Tpr Track sequences - cprSeedUCCDeMEventPrescale: { - module_type : PrescaleEvent - } - - cprSeedUCCDeMPrescale : { - module_type : PrescaleEvent - } - - cprSeedUCCDePEventPrescale: { - module_type : PrescaleEvent - } - cprSeedUCCDePPrescale : { - module_type : PrescaleEvent - } - - } - - # sequences for different trigger paths. Early triggers are prescaled - sequences : { - # #trkpatrec tracking - tprTimeClusterDeM : [ tprTimeClusterDeMEventPrescale, - @sequence::CaloHitRecoTrigger.prepareHits, @sequence::CaloClusterTrigger.Reco, - @sequence::TrkHitRecoTrigger.sequences.TTprepareHits, - TTtimeClusterFinder, tprTimeClusterDeMTCFilter ] - tprTimeClusterDeP : [ tprTimeClusterDePEventPrescale, @sequence::CaloHitRecoTrigger.prepareHits, @sequence::CaloClusterTrigger.Reco, - @sequence::TrkHitRecoTrigger.sequences.TTprepareHits, - TTtimeClusterFinder, tprTimeClusterDePTCFilter ] - - # tprHelixDeM : [ tprHelixDeMEventPrescale, tprHelixDeMSDCountFilter, @sequence::CaloClusterTrigger.Reco, @sequence::TrkHitRecoTrigger.sequences.TTprepareHits, - # TTtimeClusterFinder, tprHelixDeMTCFilter, TThelixFinder, TTHelixMergerDeM, tprHelixDeMHSFilter ] - # tprHelixDeP : [ tprDePHelixEventPrescale, tprDePHelixSDCountFilter, @sequence::CaloClusterTrigger.Reco, @sequence::TrkHitRecoTrigger.sequences.TTprepareHits, - # TTtimeClusterFinder, tprHelixDePTCFilter, TThelixFinder, TTHelixMergerDeP, tprHelixDePHSFilter ] - - tprDeM_highP_stopTarg : [ tprDeMHighPStopTargEventPrescale, @sequence::CaloHitRecoTrigger.prepareHits, @sequence::CaloClusterTrigger.Reco, - @sequence::TrkHitRecoTrigger.sequences.TTprepareHits, - TTtimeClusterFinder, tprDeMHighPStopTargTCFilter, TThelixFinder, TTHelixMergerDeM, tprDeMHighPStopTargHSFilter, TTKSFDeM, tprDeMHighPStopTargTSFilter, tprDeMHighPStopTargTriggerInfoMerger ] - trpDeM : [ tprDeMHighPStopTargEventPrescale, @sequence::CaloHitRecoTrigger.prepareHits, @sequence::CaloClusterTrigger.Reco, - @sequence::TrkHitRecoTrigger.sequences.TTprepareHits, - TTtimeClusterFinder, tprDeMHighPStopTargTCFilter, TThelixFinder, TTHelixMergerDeM, tprDeMHighPStopTargHSFilter, TTKSFDeM, tprDeMHighPStopTargTSFilter, tprDeMHighPStopTargTriggerInfoMerger ] - - tprDeP_highP_stopTarg : [ tprDePHighPStopTargEventPrescale, @sequence::CaloHitRecoTrigger.prepareHits, @sequence::CaloClusterTrigger.Reco, - @sequence::TrkHitRecoTrigger.sequences.TTprepareHits, - TTtimeClusterFinder, tprDePHighPStopTargTCFilter, TThelixFinder,TTHelixMergerDeP, tprDePHighPStopTargHSFilter, TTKSFDeP, tprDePHighPStopTargTSFilter, tprDePHighPStopTargTriggerInfoMerger ] - - tprDeM_lowP_stopTarg : [ tprDeMLowPStopTargEventPrescale, @sequence::CaloHitRecoTrigger.prepareHits, @sequence::CaloClusterTrigger.Reco, - @sequence::TrkHitRecoTrigger.sequences.TTprepareHits, - TTtimeClusterFinder, tprDeMLowPStopTargTCFilter, TThelixFinder, TTHelixMergerDeM, tprDeMLowPStopTargHSFilter, TTKSFDeM, tprDeMLowPStopTargTSFilter, tprDeMLowPStopTargTriggerInfoMerger ] - tprDeP_lowP_stopTarg : [ tprDePLowPStopTargEventPrescale, @sequence::CaloHitRecoTrigger.prepareHits, @sequence::CaloClusterTrigger.Reco, - @sequence::TrkHitRecoTrigger.sequences.TTprepareHits, - TTtimeClusterFinder, tprDePLowPStopTargTCFilter, TThelixFinder,TTHelixMergerDeP, tprDePLowPStopTargHSFilter, TTKSFDeP, tprDePLowPStopTargTSFilter, tprDePLowPStopTargTriggerInfoMerger ] - - tprDeM : [ tprDeMEventPrescale, @sequence::CaloHitRecoTrigger.prepareHits, @sequence::CaloClusterTrigger.Reco, - @sequence::TrkHitRecoTrigger.sequences.TTprepareHits, - TTtimeClusterFinder, tprDeMTCFilter, TThelixFinder, TTHelixMergerDeM, tprDeMHSFilter, TTKSFDeM, tprDeMTSFilter, tprDeMTriggerInfoMerger ] - tprDeP : [ tprDePEventPrescale, @sequence::CaloHitRecoTrigger.prepareHits, @sequence::CaloClusterTrigger.Reco, - @sequence::TrkHitRecoTrigger.sequences.TTprepareHits, - TTtimeClusterFinder, tprDePTCFilter, TThelixFinder,TTHelixMergerDeP, tprDePHSFilter, TTKSFDeP, tprDePTSFilter, tprDePTriggerInfoMerger ] - - tprHelixDeM : [ tprHelixDeMEventPrescale, @sequence::CaloHitRecoTrigger.prepareHits, @sequence::CaloClusterTrigger.Reco, - @sequence::TrkHitRecoTrigger.sequences.TTprepareHits, - TTtimeClusterFinder, tprHelixDeMTCFilter, TThelixFinder, TTHelixMergerDeM, tprHelixDeMHSFilter, tprHelixDeMTriggerInfoMerger ] - tprHelixDeP : [ tprHelixDePEventPrescale, @sequence::CaloHitRecoTrigger.prepareHits, @sequence::CaloClusterTrigger.Reco, - @sequence::TrkHitRecoTrigger.sequences.TTprepareHits, - TTtimeClusterFinder, tprHelixDePTCFilter, TThelixFinder,TTHelixMergerDeP, tprHelixDePHSFilter, tprHelixDePTriggerInfoMerger ] - - tprHelixUeM : [ tprHelixUeMEventPrescale, @sequence::CaloHitRecoTrigger.prepareHits, @sequence::CaloClusterTrigger.Reco, - @sequence::TrkHitRecoTrigger.sequences.TTprepareHits, - TTtimeClusterFinderUe, tprHelixUeMTCFilter, TThelixFinderUe, TTHelixMergerUeM, tprHelixUeMHSFilter, tprHelixUeMTriggerInfoMerger ] - tprHelixUeP : [ tprHelixUePEventPrescale, @sequence::CaloHitRecoTrigger.prepareHits, @sequence::CaloClusterTrigger.Reco, - @sequence::TrkHitRecoTrigger.sequences.TTprepareHits, - TTtimeClusterFinderUe, tprHelixUePTCFilter, TThelixFinderUe,TTHelixMergerUeP, tprHelixUePHSFilter, tprHelixUePTriggerInfoMerger ] - - - # sequences that use a collection of combohits filtered using the calorimeter cluster info - tprSeedUCCDeM : [ tprSeedUCCDeMEventPrescale, @sequence::CaloHitRecoTrigger.prepareHits, @sequence::CaloClusterTrigger.Reco, - @sequence::TrkHitRecoTrigger.sequences.TTprepareHitsUCC, - TTtimeClusterFinderUCC, tprSeedUCCDeMTCFilter, TThelixFinderUCC, TTHelixUCCMergerDeM, tprSeedUCCDeMHSFilter, TTKSFUCCDeM, tprSeedUCCDeMTSFilter, tprSeedUCCDeMTriggerInfoMerger ] - tprSeedUCCDeP : [ tprSeedUCCDePEventPrescale, @sequence::CaloHitRecoTrigger.prepareHits, @sequence::CaloClusterTrigger.Reco, - @sequence::TrkHitRecoTrigger.sequences.TTprepareHitsUCC, - TTtimeClusterFinderUCC, tprSeedUCCDePTCFilter, TThelixFinderUCC, TTHelixUCCMergerDeP, tprSeedUCCDePHSFilter, TTKSFUCCDeP, tprSeedUCCDePTSFilter, tprSeedUCCDeMTriggerInfoMerger ] - - # calibration with DIO-Michel form Inner Proton Absorber - tprHelixDeM_ipa_phiScaled : [ tprHelixDeMIpaPhiScaledEventPrescale, @sequence::CaloHitRecoTrigger.prepareHits, @sequence::CaloClusterTrigger.Reco, - @sequence::TrkHitRecoTrigger.sequences.TTprepareHits, - TTtimeClusterFinder, tprHelixDeMIpaPhiScaledTCFilter, TThelixFinder, TTHelixMergerDeM, tprHelixDeMIpaPhiScaledHSFilter, tprHelixDeMIpaPhiScaledTriggerInfoMerger ] - - # beam monitoring using the e- from the DIO in the IPA - tprHelixDeM_ipa : [ tprHelixDeMIpaEventPrescale, @sequence::CaloHitRecoTrigger.prepareHits, @sequence::CaloClusterTrigger.Reco, - @sequence::TrkHitRecoTrigger.sequences.TTprepareHits, - TTtimeClusterFinder, tprHelixDeMIpaTCFilter, TThelixFinder, TTHelixMergerDeM, tprHelixDeMIpaHSFilter, tprHelixDeMIpaTriggerInfoMerger ] - - #calo-seeded tracking - cprDeM_highP_stopTarg : [ cprDeMHighPStopTargEventPrescale, @sequence::CaloHitRecoTrigger.prepareHits, @sequence::CaloClusterTrigger.Reco, - @sequence::TrkHitRecoTrigger.sequences.TTprepareHits, - TTCalTimePeakFinder, cprDeMHighPStopTargTCFilter, TTCalHelixFinderDe, TTCalHelixMergerDeM, cprDeMHighPStopTargHSFilter, - TTCalSeedFitDem, cprDeMHighPStopTargTSFilter, cprDeMHighPStopTargTriggerInfoMerger ] - cprDeP_highP_stopTarg : [ cprDePHighPStopTargEventPrescale, @sequence::CaloHitRecoTrigger.prepareHits, @sequence::CaloClusterTrigger.Reco, - @sequence::TrkHitRecoTrigger.sequences.TTprepareHits, - TTCalTimePeakFinder, cprDePHighPStopTargTCFilter, TTCalHelixFinderDe, TTCalHelixMergerDeP, cprDePHighPStopTargHSFilter, - TTCalSeedFitDep, cprDePHighPStopTargTSFilter, cprDePHighPStopTargTriggerInfoMerger ] - - cprDeM_lowP_stopTarg : [ cprDeMLowPStopTargEventPrescale, @sequence::CaloHitRecoTrigger.prepareHits, @sequence::CaloClusterTrigger.Reco, - @sequence::TrkHitRecoTrigger.sequences.TTprepareHits, - TTCalTimePeakFinder, cprDeMLowPStopTargTCFilter, TTCalHelixFinderDe, TTCalHelixMergerDeM, cprDeMLowPStopTargHSFilter, - TTCalSeedFitDem, cprDeMLowPStopTargTSFilter, cprDeMLowPStopTargTriggerInfoMerger ] - cprDeP_lowP_stopTarg : [ cprDePLowPStopTargEventPrescale, @sequence::CaloHitRecoTrigger.prepareHits, @sequence::CaloClusterTrigger.Reco, - @sequence::TrkHitRecoTrigger.sequences.TTprepareHits, - TTCalTimePeakFinder, cprDePLowPStopTargTCFilter, TTCalHelixFinderDe, TTCalHelixMergerDeP, cprDePLowPStopTargHSFilter, - TTCalSeedFitDep, cprDePLowPStopTargTSFilter, cprDePLowPStopTargTriggerInfoMerger ] - - cprDeM : [ cprDeMEventPrescale, @sequence::CaloHitRecoTrigger.prepareHits, @sequence::CaloClusterTrigger.Reco, - @sequence::TrkHitRecoTrigger.sequences.TTprepareHits, - TTCalTimePeakFinder, cprDeMTCFilter, TTCalHelixFinderDe, TTCalHelixMergerDeM, cprDeMHSFilter, - TTCalSeedFitDem, cprDeMTSFilter, cprDeMTriggerInfoMerger ] - cprDeP : [ cprDePEventPrescale, @sequence::CaloHitRecoTrigger.prepareHits, @sequence::CaloClusterTrigger.Reco, - @sequence::TrkHitRecoTrigger.sequences.TTprepareHits, - TTCalTimePeakFinder, cprDePTCFilter, TTCalHelixFinderDe, TTCalHelixMergerDeP, cprDePHSFilter, - TTCalSeedFitDep, cprDePTSFilter, cprDePTriggerInfoMerger ] - cprHelixDeM : [ cprHelixDeMEventPrescale, @sequence::CaloHitRecoTrigger.prepareHits, @sequence::CaloClusterTrigger.Reco, - @sequence::TrkHitRecoTrigger.sequences.TTprepareHits, - TTCalTimePeakFinder, cprHelixDeMTCFilter, TTCalHelixFinderDe, TTCalHelixMergerDeM, cprHelixDeMHSFilter, cprHelixDeMTriggerInfoMerger ] - cprHelixDeP : [ cprHelixDePEventPrescale, @sequence::CaloHitRecoTrigger.prepareHits, @sequence::CaloClusterTrigger.Reco, - @sequence::TrkHitRecoTrigger.sequences.TTprepareHits, - TTCalTimePeakFinder, cprHelixDePTCFilter, TTCalHelixFinderDe, TTCalHelixMergerDeP, cprHelixDePHSFilter, cprHelixDePTriggerInfoMerger ] - cprHelixUeM : [ cprHelixUeMEventPrescale, @sequence::CaloHitRecoTrigger.prepareHits, @sequence::CaloClusterTrigger.Reco, - @sequence::TrkHitRecoTrigger.sequences.TTprepareHits, - TTCalTimePeakFinderUe, cprHelixUeMTCFilter, TTCalHelixFinderUe, TTCalHelixMergerUeM, cprHelixUeMHSFilter ] - cprHelixUeP : [ cprHelixUePEventPrescale, @sequence::CaloHitRecoTrigger.prepareHits, @sequence::CaloClusterTrigger.Reco, - @sequence::TrkHitRecoTrigger.sequences.TTprepareHits, - TTCalTimePeakFinderUe, cprHelixUePTCFilter, TTCalHelixFinderUe, TTCalHelixMergerUeP, cprHelixUePHSFilter ] - - cprSeedUCCDeM : [ cprSeedUCCDeMEventPrescale, @sequence::CaloHitRecoTrigger.prepareHits, @sequence::CaloClusterTrigger.Reco, - @sequence::TrkHitRecoTrigger.sequences.TTprepareHitsUCC, - TTCalTimePeakFinderUCC, cprSeedUCCDeMTCFilter, TTCalHelixFinderUCCDe, TTCalHelixUCCMergerDeM, cprSeedUCCDeMHSFilter, - TTCalSeedFitUCCDem, cprSeedUCCDeMTSFilter, cprSeedUCCDeMTriggerInfoMerger ] - cprSeedUCCDeP : [ cprSeedUCCDePEventPrescale, @sequence::CaloHitRecoTrigger.prepareHits, @sequence::CaloClusterTrigger.Reco, - @sequence::TrkHitRecoTrigger.sequences.TTprepareHitsUCC, - TTCalTimePeakFinderUCC, cprSeedUCCDePTCFilter, TTCalHelixFinderUCCDe, TTCalHelixUCCMergerDeP, cprSeedUCCDePHSFilter, - TTCalSeedFitUCCDep, cprSeedUCCDePTSFilter, cprSeedUCCDePTriggerInfoMerger ] - - #fast tracking sequences that uses the calorimeter-time selection to reduce the number of TimeClusters and also the number of hits processed by the Delta-ray - #removal algorithm - # fastTprSeedDeM : [ tprDeMHighPStopTargEventPrescale, TrackSDCountFilter, @sequence::CaloClusterTrigger.Reco, @sequence::TrkHitRecoTrigger.sequences.TTmakefastHits, - # TTfastTimeClusterFinder, tprFTCFilter, TTDeltaFinder, TTfastHelixFinder, FtprDeMHelixFilter, TTFKSFDeM, FtprDeMHighPStopTargFilter, tprDeMHighPStopTargPrescale ] - # fastTprSeedDeP : [ tprDePHighPStopTargEventPrescale, TrackSDCountFilter, @sequence::CaloClusterTrigger.Reco, @sequence::TrkHitRecoTrigger.sequences.TTmakefastHits, - # TTfastTimeClusterFinder, tprFTCFilter, TTDeltaFinder, TTfastHelixFinder, FtprDePHelixFilter, TTFKSFDeP, FtprDePHighPStopTargFilter, tprDePHighPStopTargPrescale ] - - - # sequences for doing timing tests - tprDeM_highP_stopTarg_timing0 : [ tprDeMHighPStopTargEventPrescale, @sequence::CaloHitRecoTrigger.prepareHits, @sequence::CaloClusterTrigger.Reco, - @sequence::TrkHitRecoTrigger.sequences.TTprepareHits, - TTtimeClusterFinder, tprDeMHighPStopTargTCFilter, TThelixFinder, TTHelixMergerDeM, tprDeMHighPStopTargHSFilter, TTKSFDeM, tprDeMHighPStopTargTriggerInfoMerger ] - tprDeM_highP_stopTarg_timing1 : [ tprDeMHighPStopTargEventPrescale, @sequence::CaloHitRecoTrigger.prepareHits, @sequence::CaloClusterTrigger.Reco, - @sequence::TrkHitRecoTrigger.sequences.TTprepareHits, - TTtimeClusterFinder, tprDeMHighPStopTargTCFilter, TThelixFinder, TTHelixMergerDeM ] - tprDeM_highP_stopTarg_timing2 : [ tprDeMHighPStopTargEventPrescale, @sequence::CaloHitRecoTrigger.prepareHits, @sequence::CaloClusterTrigger.Reco, - @sequence::TrkHitRecoTrigger.sequences.TTprepareHits, - TTtimeClusterFinder ] - - tprDeP_highP_stopTarg_timing0 : [ tprDePHighPStopTargEventPrescale, @sequence::CaloHitRecoTrigger.prepareHits, @sequence::CaloClusterTrigger.Reco, - @sequence::TrkHitRecoTrigger.sequences.TTprepareHits, - TTtimeClusterFinder, tprDePHighPStopTargTCFilter, TThelixFinder, TTHelixMergerDeP, tprDePHighPStopTargHSFilter, TTKSFDeP, tprDePHighPStopTargTriggerInfoMerger ] - tprDeP_highP_stopTarg_timing1 : [ tprDePHighPStopTargEventPrescale, @sequence::CaloHitRecoTrigger.prepareHits, @sequence::CaloClusterTrigger.Reco, - @sequence::TrkHitRecoTrigger.sequences.TTprepareHits, - TTtimeClusterFinder, tprDePHighPStopTargTCFilter, TThelixFinder, TTHelixMergerDeP ] - tprDeP_highP_stopTarg_timing2 : [ tprDePHighPStopTargEventPrescale, @sequence::CaloHitRecoTrigger.prepareHits, @sequence::CaloClusterTrigger.Reco, - @sequence::TrkHitRecoTrigger.sequences.TTprepareHits, - TTtimeClusterFinder ] - - cprDeM_highP_stopTarg_timing0 : [ cprDeMHighPStopTargEventPrescale, @sequence::CaloHitRecoTrigger.prepareHits, @sequence::CaloClusterTrigger.Reco, - @sequence::TrkHitRecoTrigger.sequences.TTprepareHits, - TTCalTimePeakFinder, cprDeMHighPStopTargTCFilter, TTCalHelixFinderDe, TTCalHelixMergerDeM, cprDeMHighPStopTargHSFilter, - TTCalSeedFitDem, cprDeMHighPStopTargTriggerInfoMerger ] - cprDeM_highP_stopTarg_timing1 : [ cprDeMHighPStopTargEventPrescale, @sequence::CaloHitRecoTrigger.prepareHits, @sequence::CaloClusterTrigger.Reco, - @sequence::TrkHitRecoTrigger.sequences.TTprepareHits, - TTCalTimePeakFinder, cprDeMHighPStopTargTCFilter, TTCalHelixFinderDe, TTCalHelixMergerDeM ] - cprDeM_highP_stopTarg_timing2 : [ cprDeMHighPStopTargEventPrescale, @sequence::CaloHitRecoTrigger.prepareHits, @sequence::CaloClusterTrigger.Reco, - @sequence::TrkHitRecoTrigger.sequences.TTprepareHits, - TTCalTimePeakFinder ] - - cprDeP_highP_stopTarg_timing0 : [ cprDePHighPStopTargEventPrescale, @sequence::CaloHitRecoTrigger.prepareHits, @sequence::CaloClusterTrigger.Reco, - @sequence::TrkHitRecoTrigger.sequences.TTprepareHits, - TTCalTimePeakFinder, cprDePHighPStopTargTCFilter, TTCalHelixFinderDe, TTCalHelixMergerDeP, cprDePHighPStopTargHSFilter, - TTCalSeedFitDep, cprDePHighPStopTargTriggerInfoMerger ] - cprDeP_highP_stopTarg_timing1 : [ cprDePHighPStopTargEventPrescale, @sequence::CaloHitRecoTrigger.prepareHits, @sequence::CaloClusterTrigger.Reco, - @sequence::TrkHitRecoTrigger.sequences.TTprepareHits, - TTCalTimePeakFinder, cprDePHighPStopTargTCFilter, TTCalHelixFinderDe, TTCalHelixMergerDeP ] - cprDeP_highP_stopTarg_timing2 : [ cprDePHighPStopTargEventPrescale, @sequence::CaloHitRecoTrigger.prepareHits, @sequence::CaloClusterTrigger.Reco, - @sequence::TrkHitRecoTrigger.sequences.TTprepareHits, - TTCalTimePeakFinder ] - - - - tprDeM_lowP_stopTarg_timing0 : [ tprDeMLowPStopTargEventPrescale, @sequence::CaloHitRecoTrigger.prepareHits, @sequence::CaloClusterTrigger.Reco, - @sequence::TrkHitRecoTrigger.sequences.TTprepareHits, - TTtimeClusterFinder, tprDeMLowPStopTargTCFilter, TThelixFinder, TTHelixMergerDeM, tprDeMLowPStopTargHSFilter, - TTKSFDeM, tprDeMLowPStopTargTriggerInfoMerger ] - - tprDeM_lowP_stopTarg_timing1 : [ tprDeMLowPStopTargEventPrescale, @sequence::CaloHitRecoTrigger.prepareHits, @sequence::CaloClusterTrigger.Reco, - @sequence::TrkHitRecoTrigger.sequences.TTprepareHits, - TTtimeClusterFinder, tprDeMLowPStopTargTCFilter, TThelixFinder, TTHelixMergerDeM ] - - tprDeM_lowP_stopTarg_timing2 : [ tprDeMLowPStopTargEventPrescale, @sequence::CaloHitRecoTrigger.prepareHits, @sequence::CaloClusterTrigger.Reco, - @sequence::TrkHitRecoTrigger.sequences.TTprepareHits, - TTtimeClusterFinder ] - - - tprDeP_lowP_stopTarg_timing0 : [ tprDePLowPStopTargEventPrescale, @sequence::CaloHitRecoTrigger.prepareHits, @sequence::CaloClusterTrigger.Reco, - @sequence::TrkHitRecoTrigger.sequences.TTprepareHits, - TTtimeClusterFinder, tprDePLowPStopTargTCFilter, TThelixFinder, TTHelixMergerDeP, tprDePLowPStopTargHSFilter, - TTKSFDeP, tprDePLowPStopTargTriggerInfoMerger ] - - tprDeP_lowP_stopTarg_timing1 : [ tprDePLowPStopTargEventPrescale, @sequence::CaloHitRecoTrigger.prepareHits, @sequence::CaloClusterTrigger.Reco, - @sequence::TrkHitRecoTrigger.sequences.TTprepareHits, - TTtimeClusterFinder, tprDePLowPStopTargTCFilter, TThelixFinder, TTHelixMergerDeP ] - - tprDeP_lowP_stopTarg_timing2 : [ tprDePLowPStopTargEventPrescale, @sequence::CaloHitRecoTrigger.prepareHits, @sequence::CaloClusterTrigger.Reco, - @sequence::TrkHitRecoTrigger.sequences.TTprepareHits, - TTtimeClusterFinder ] - - - cprDeM_lowP_stopTarg_timing0 : [ cprDeMLowPStopTargEventPrescale, @sequence::CaloHitRecoTrigger.prepareHits, @sequence::CaloClusterTrigger.Reco, - @sequence::TrkHitRecoTrigger.sequences.TTprepareHits, - TTCalTimePeakFinder, cprDeMLowPStopTargTCFilter, TTCalHelixFinderDe, TTCalHelixMergerDeM, cprDeMLowPStopTargHSFilter, - TTCalSeedFitDem, cprDeMLowPStopTargTriggerInfoMerger ] - - cprDeM_lowP_stopTarg_timing1 : [ cprDeMLowPStopTargEventPrescale, @sequence::CaloHitRecoTrigger.prepareHits, @sequence::CaloClusterTrigger.Reco, - @sequence::TrkHitRecoTrigger.sequences.TTprepareHits, - TTCalTimePeakFinder, cprDeMLowPStopTargTCFilter, TTCalHelixFinderDe, TTCalHelixMergerDeM] - - cprDeM_lowP_stopTarg_timing2 : [ cprDeMLowPStopTargEventPrescale, @sequence::CaloHitRecoTrigger.prepareHits, @sequence::CaloClusterTrigger.Reco, - @sequence::TrkHitRecoTrigger.sequences.TTprepareHits, - TTCalTimePeakFinder] - - - cprDeP_lowP_stopTarg_timing0 : [ cprDePLowPStopTargEventPrescale, @sequence::CaloHitRecoTrigger.prepareHits, @sequence::CaloClusterTrigger.Reco, - @sequence::TrkHitRecoTrigger.sequences.TTprepareHits, - TTCalTimePeakFinder, cprDePLowPStopTargTCFilter, TTCalHelixFinderDe, TTCalHelixMergerDeP, cprDePLowPStopTargHSFilter, - TTCalSeedFitDep, cprDePLowPStopTargTriggerInfoMerger ] - - cprDeP_lowP_stopTarg_timing1 : [ cprDePLowPStopTargEventPrescale, @sequence::CaloHitRecoTrigger.prepareHits, @sequence::CaloClusterTrigger.Reco, - @sequence::TrkHitRecoTrigger.sequences.TTprepareHits, - TTCalTimePeakFinder, cprDePLowPStopTargTCFilter, TTCalHelixFinderDe, TTCalHelixMergerDeP ] - - cprDeP_lowP_stopTarg_timing2 : [ cprDePLowPStopTargEventPrescale, @sequence::CaloHitRecoTrigger.prepareHits, @sequence::CaloClusterTrigger.Reco, - @sequence::TrkHitRecoTrigger.sequences.TTprepareHits, - TTCalTimePeakFinder ] - - - #kalman filter included - tprKalDeM : [ @sequence::CaloHitRecoTrigger.prepareHits, @sequence::CaloClusterTrigger.Reco, - @sequence::TrkHitRecoTrigger.sequences.TTprepareHits, - TTtimeClusterFinder, tprDeMHighPStopTargTCFilter, TThelixFinder, TTHelixMergerDeM, tprDeMHighPStopTargHSFilter, - TTKSFDeM, tprDeMHighPStopTargTSFilter, TTKFFDeM, tprDeMHighPStopTargKFFilter ] - # add sequences for upstream, calibration, ... FIXME! - } -} -END_PROLOG diff --git a/TrkHitReco/fcl/prolog_trigger.fcl b/TrkHitReco/fcl/prolog_trigger.fcl deleted file mode 100644 index 2e98d9bec5..0000000000 --- a/TrkHitReco/fcl/prolog_trigger.fcl +++ /dev/null @@ -1,79 +0,0 @@ -#include "Offline/TrkHitReco/fcl/prolog.fcl" -BEGIN_PROLOG -# Normal reco seqence module: this produces a hit for every digi, and uses -# flags to keep track of which hits to use -# Reconstruct hits: this produces StrawHits and ComboHits - -# now trigger-specific versions; these make deep copies -TTPBTFSD : { - module_type : ProtonBunchTimeFromStrawDigis -} - -TTmakeSH : { - @table::makeSH - FitType : 5 - FilterHits : true - WriteStrawHitCollection : false - StrawDigiADCWaveformCollectionTag : "notUsed" -} -# combine hits in a panel -TTmakePH : { - @table::makePH - TestFlag : false # not needed, since TTmakeSH is filtering - FilterHits : false - ComboHitCollection : "TTmakeSH" - StrawHitSelectionBits : [] - StrawHitMask : [] -} -TTmakeSHUCC : { - @table::TTmakeSH - UseCalorimeter : true - CaloClusterCollectionTag : "CaloClusterFast" -} -# combine hits in a panel -TTmakePHUCC : { - @table::TTmakePH - ComboHitCollection : "TTmakeSHUCC" -} -# stereo version: defer the radius test -TTSmakePH : { - @table::TTmakePH -} -# combine panel hits in a station -TTmakeSTH : { - @table::makeSTH - TestFlag : false - FilterHits : true - ComboHitCollection : "TTmakePH" -} -TTflagBkgHits : { - @table::FlagBkgHits - ComboHitCollection : "TTmakeSTH" - FilterHits : true -} - -# combine together -TrkHitRecoTrigger : { - producers : { - TTPBTFSD : { @table::TTPBTFSD } - TTmakeSH : { @table::TTmakeSH } - TTmakePH : { @table::TTmakePH } - TTmakeSHUCC : { @table::TTmakeSHUCC } - TTmakePHUCC : { @table::TTmakePHUCC } - TTmakeSTH : { @table::TTmakeSTH } - TTflagBkgHits : { @table::TTflagBkgHits } - TTflagBkgHitsUCC : { @table::TTflagBkgHits - ComboHitCollection : TTmakePHUCC - } - } - - # SEQUENCES - # production sequence to prepare hits for tracking - sequences: { - TTprepareHits : [ TTmakeSH, TTmakePH, TTmakeSTH, TTflagBkgHits ] - TTprepareHitsUCC : [ TTmakeSHUCC, TTmakePHUCC, TTflagBkgHitsUCC ] - TTmakefastHits : [ TTmakeSH, TTmakePH ] - } -} - -END_PROLOG diff --git a/TrkPatRec/fcl/prolog_trigger.fcl b/TrkPatRec/fcl/prolog_trigger.fcl deleted file mode 100644 index 80e1d57de7..0000000000 --- a/TrkPatRec/fcl/prolog_trigger.fcl +++ /dev/null @@ -1,188 +0,0 @@ -# -*- mode: tcl -*- -#------------------------------------------------------------------------------ -# this file is included by fcl/standardProducers.fcl inside the PROLOG section -#------------------------------------------------------------------------------ -#include "Offline/TrkPatRec/fcl/Particle.fcl" -#include "Offline/TrkPatRec/fcl/PanelAmbigResolver.fcl" -#include "Offline/TrkPatRec/fcl/prolog.fcl" -#include "Offline/TrkReco/fcl/prolog_trigger.fcl" - -BEGIN_PROLOG - -TTTimeCalculator : { - TrkToCaloTimeOffset : 0. - CaloTimeErr : 0.5 -} - -TTtimeClusterFinder : { - @table::TimeClusterFinder - ComboHitCollection : "TTflagBkgHits" - CaloClusterCollection : "CaloClusterFast" - TestFlag : false - T0Calculator : @local::TTTimeCalculator -} - -TTtimeClusterFinderUe : { - @table::TimeClusterFinder - ComboHitCollection : "TTflagBkgHits" - CaloClusterCollection : "CaloClusterFast" - TestFlag : false - AveragePitch : -0.63 - T0Calculator : @local::TTTimeCalculator -} - -TTrobustHelixFinder : { @table::RobustHelixFinder - ComboHitCollection : "TTflagBkgHits" - TimeClusterCollection : "TTtimeClusterFinder" - RPullScaleF : 1.0 - HelixFitter : { @table::TrkRecoTrigger.TTrobustHelixFit} -} - -TTrobustHelixFinderUe : { @table::RobustHelixFinder - ComboHitCollection : "TTflagBkgHits" - TimeClusterCollection : "TTtimeClusterFinderUe" - RPullScaleF : 1.0 - HelixFitter : { @table::TrkRecoTrigger.TTrobustHelixFit} -} -# pattern recognition internals -# Kalman fit configuration for the seed fit (least squares configuration of Kalman fit) - -# same for trigger -TTKSF : { @table::TTMu2eKinKal.producers.TTKKDeMSeedFit - ModuleSettings : { @table::TTMu2eKinKal.producers.TTKKDeMSeedFit.ModuleSettings - ComboHitCollection : "TTmakeSH" - HelixSeedCollections : [ "TTHelixMergerDeM" ] - CaloClusterCollection : "CaloClusterFast" - PrintLevel : 0 - SaveAllFits : false - } -} -# Final Kalman fit, including material and magnetic inhomogeneity effects -TTKFF : { @table::KFF - ComboHitCollection : "TTmakeSH" - SeedCollection : "TTkalSeedFit" -} - -# seed Fit configuration for specific particles -# First, downstream electrons -TTKSFDeM : @local::TTKSF -TTKSFDeM.ModuleSettings.HelixSeedCollections : ["TTHelixMergerDeM"] -TTKSFDeM.ModuleSettings.FitParticle : 11 -TTKSFDeM.FitDirection : 0 - -TTKSFDeP : @local::TTKSF -TTKSFDeP.ModuleSettings.HelixSeedCollections : ["TTHelixMergerDeP"] -TTKSFDeP.ModuleSettings.FitParticle : -11 -TTKSFDeP.FitDirection : 0 - -# Declare a table with all the modules needed for track reconstruction -# This should be divided into sim, reco FIXME! -TprTrigger : { - producers : { - tprFetchDigis : { module_type:PrefetchData - debugLevel : 0 - mcDiag : true - - fetchCaloDigis : 1 - fetchStrawDigis : 1 - fetchStrawHits : 0 - fetchStrawHitFlags : 0 - fetchStrawHitPositions : 0 - fetchComboHits : 0 - - caloDigiCollectionTag : CaloDigiMaker - strawDigiCollection : makeSD - strawHitCollectionTag : TTmakeSH - strawHitPositionCollectionTag : TTmakeSH - strawHitFlagCollectionTag : TTmakeSH - comboHitCollectionTag : TTmakePH # MakeStereoHits - } - - - TTtimeClusterFinder : @local::TTtimeClusterFinder - TTtimeClusterFinderUe : @local::TTtimeClusterFinderUe - TTtimeClusterFinderUCC : { @table::TTtimeClusterFinder - ComboHitCollection : "TTflagBkgHitsUCC" - } - TThelixFinder : @local::TTrobustHelixFinder - TThelixFinderUe : @local::TTrobustHelixFinderUe - TThelixFinderUCC : { @table::TTrobustHelixFinder - ComboHitCollection : "TTflagBkgHitsUCC" - TimeClusterCollection : "TTtimeClusterFinderUCC" - } - TTfastHelixFinder : { @table::TTrobustHelixFinder - ComboHitCollection : "TTDeltaFinder" - TimeClusterCollection : "TTfastTimeClusterFinder" - } - TTKSFDeM : @local::TTKSFDeM - TTKSFDeP : @local::TTKSFDeP - - TTKSFDmuM : { @table::TTKSFDeM - ModuleSettings : { @table::TTKSFDeM.ModuleSettings - HelixSeedCollections : [ "TTHelixFinderMergerDmuM" ] - } - KKFitSettings : { @table::TTKSFDeM.KKFitSettings - FitParticle : 13 - FitDirection : 0 - } - } - - TTKSFDmuP : { @table::TTKSFDeP - ModuleSettings : { @table::TTKSFDeP.ModuleSettings - HelixSeedCollections : [ "TTHelixFinderMergerDmuP" ] - } - KKFitSettings : { @table::TTKSFDeP.KKFitSettings - FitParticle : -13 - FitDirection : 0 - } - } - - TTKSFUCCDeM : { @table::TTKSFDeM - ModuleSettings : { @table::TTKSFDeM.ModuleSettings - ComboHitCollection : "TTmakeSHUCC" - HelixSeedCollections : [ "TThelixFinderUCC:Positive" ] - } - } - TTKSFUCCDeP : { @table::TTKSFDeP - ModuleSettings : { @table::TTKSFDeP.ModuleSettings - ComboHitCollection : "TTmakeSHUCC" - HelixSeedCollections : [ "TThelixFinderUCC:Negative" ] - } - } - - TTFKSFDeM : { @table::TTKSFDeM - ModuleSettings : { @table::TTKSFDeM.ModuleSettings - HelixSeedCollections : [ "TTfastHelixFinder:Positive" ] - } - } - TTFKSFDeP : { @table::TTKSFDeP - ModuleSettings : { @table::TTKSFDeP.ModuleSettings - HelixSeedCollections : [ "TTfastHelixFinder:Negative" ] - } - } - } - - sequences : { - # production sequence to find helicse - findHelices : [ TTtimeClusterFinder, TThelixFinder ] - # production sequence to find TrackSeeds - KSFDeM : [ TTtimeClusterFinder, TThelixFinder, TTKSFDeM ] - KSFDeP : [ TTtimeClusterFinder, TThelixFinder, TTKSFDeP ] - } - - # define standard outputs - Output : { - Digis : [ "keep mu2e::StrawDigis_*_*_*" ] - Hits : [ "keep mu2e::StrawHitFlagDetailmu2e::BitMaps_FlagBkgHits_*_*", - "keep mu2e::StrawHitPositions_MakeStereoHits_*_*", - "keep mu2e::StrawHits_*_*_*" ] - - Tracks : [ "keep mu2e::StrawHitFlagDetailmu2e::BitMaps_*_*_*", - "keep mu2e::TrkQualDetailmu2e::MVAStructs_*_*_*", - "keep mu2e::KalSeeds_*_*_*", - "keep mu2e::HelixSeeds_*_*_*", - "keep mu2e::TimeClusters_*_*_*" ] - } -} - -END_PROLOG From 7ea3f8a85ab2a9bd602684b99be0f3103f49b2a7 Mon Sep 17 00:00:00 2001 From: Gianantonio Pezzullo Date: Wed, 24 Jan 2024 08:11:04 -0600 Subject: [PATCH 120/213] clean up in the Trigger package --- Trigger/data/ExtrPosTrigMenu.config | 5 - Trigger/data/OffSpillTrigMenu.config | 26 -- Trigger/data/OnSpillTrigMenu.config | 11 - Trigger/data/allPaths.config | 25 -- .../main_caloFast_cosmic_eventPrescale.fcl | 1 - .../main_caloFast_cosmic_filter.fcl | 9 - .../main_caloFast_mvaLHCE_eventPrescale.fcl | 2 - .../main_caloFast_mvaLHCE_filter.fcl | 8 - .../main_caloLHCECDCountFilter.fcl | 8 - .../main_caloFast_mvaNNCE_eventPrescale.fcl | 1 - .../main_caloFast_mvaNNCE_filter.fcl | 4 - .../main_caloFast_photon_cdCountFilter.fcl | 8 - .../main_caloFast_photon_eventPrescale.fcl | 2 - .../main_caloFast_photon_filter.fcl | 8 - .../main_caloFast_rmc_eventPrescale.fcl | 1 - .../caloFast_rmc/main_caloFast_rmc_filter.fcl | 8 - .../caloMVACE/main_caloMVACECDCountFilter.fcl | 8 - .../caloMVACE/main_caloMVACEEventPrescale.fcl | 2 - .../data/caloMVACE/main_caloMVACEFilter.fcl | 13 - .../main_caloMVACECDCountFilter.fcl | 8 - .../main_caloMVACEEventPrescale.fcl | 2 - .../caloMVAMixedCE/main_caloMVACEFilter.fcl | 13 - Trigger/data/caloOnly.config | 2 - .../main_cprCosmicSeedDeMEventPrescale.fcl | 2 - .../main_cprCosmicSeedDeMHSFilter.fcl | 17 - .../main_cprCosmicSeedDeMSDCountFilter.fcl | 9 - .../main_cprCosmicSeedDeMTCFilter.fcl | 2 - .../main_cprCosmicSeedDeMTSFilter.fcl | 14 - .../main_cprCosmicSeedDePEventPrescale.fcl | 2 - .../main_cprCosmicSeedDePHSFilter.fcl | 17 - .../main_cprCosmicSeedDePSDCountFilter.fcl | 9 - .../main_cprCosmicSeedDePTCFilter.fcl | 2 - .../main_cprCosmicSeedDePTSFilter.fcl | 14 - ...in_cprDeM_highP_stopTarg_eventPrescale.fcl | 1 - .../main_cprDeM_highP_stopTarg_hsFilter.fcl | 17 - ...in_cprDeM_highP_stopTarg_sdCountFilter.fcl | 9 - .../main_cprDeM_highP_stopTarg_tcFilter.fcl | 2 - .../main_cprDeM_highP_stopTarg_tsFilter.fcl | 14 - ...ain_cprDeM_lowP_stopTarg_eventPrescale.fcl | 2 - .../main_cprDeM_lowP_stopTarg_hsFilter.fcl | 17 - ...ain_cprDeM_lowP_stopTarg_sdCountFilter.fcl | 9 - .../main_cprDeM_lowP_stopTarg_tcFilter.fcl | 2 - .../main_cprDeM_lowP_stopTarg_tsFilter.fcl | 14 - ...in_cprDeP_highP_stopTarg_eventPrescale.fcl | 2 - .../main_cprDeP_highP_stopTarg_hsFilter.fcl | 17 - ...in_cprDeP_highP_stopTarg_sdCountFilter.fcl | 9 - .../main_cprDeP_highP_stopTarg_tcFilter.fcl | 2 - .../main_cprDeP_highP_stopTarg_tsFilter.fcl | 14 - ...ain_cprDeP_lowP_stopTarg_eventPrescale.fcl | 2 - .../main_cprDeP_lowP_stopTarg_hsFilter.fcl | 17 - ...ain_cprDeP_lowP_stopTarg_sdCountFilter.fcl | 9 - .../main_cprDeP_lowP_stopTarg_tcFilter.fcl | 2 - .../main_cprDeP_lowP_stopTarg_tsFilter.fcl | 14 - .../main_cprHelixDeM_eventPrescale.fcl | 2 - .../cprHelixDeM/main_cprHelixDeM_hsFilter.fcl | 17 - .../main_cprHelixDeM_sdCountFilter.fcl | 9 - .../cprHelixDeM/main_cprHelixDeM_tcFilter.fcl | 2 - .../main_cprHelixDeP_eventPrescale.fcl | 2 - .../cprHelixDeP/main_cprHelixDeP_hsFilter.fcl | 17 - .../main_cprHelixDeP_sdCountFilter.fcl | 9 - .../cprHelixDeP/main_cprHelixDeP_tcFilter.fcl | 2 - .../main_cprHelixUeM_eventPrescale.fcl | 2 - .../cprHelixUeM/main_cprHelixUeM_hsFilter.fcl | 17 - .../main_cprHelixUeM_sdCountFilter.fcl | 9 - .../cprHelixUeM/main_cprHelixUeM_tcFilter.fcl | 2 - .../main_cprHelixUeP_eventPrescale.fcl | 2 - .../cprHelixUeP/main_cprHelixUeP_hsFilter.fcl | 17 - .../main_cprHelixUeP_sdCountFilter.fcl | 9 - .../cprHelixUeP/main_cprHelixUeP_tcFilter.fcl | 2 - Trigger/data/cst/main_cst_eventPrescale.fcl | 1 - Trigger/data/cst/main_cst_sdCountFilter.fcl | 9 - Trigger/data/cst/main_cst_tcFilter.fcl | 2 - Trigger/data/cst/main_cst_tsFilter.fcl | 2 - .../main_cstTimeCluster_eventPrescale.fcl | 1 - .../main_cstTimeCluster_sdCountFilter.fcl | 9 - .../main_cstTimeCluster_tcFilter.fcl | 2 - .../main_largeCDCountEventPrescale.fcl | 2 - .../largeCDCount/main_largeCDCountFilter.fcl | 8 - .../main_largeSDCountEventPrescale.fcl | 2 - .../largeSDCount/main_largeSDCountFilter.fcl | 8 - .../main_minBias_cdCount_eventPrescale.fcl | 2 - .../main_minBias_cdCount_filter.fcl | 8 - .../main_minBias_sdCount_eventPrescale.fcl | 1 - .../main_minBias_sdCount_filter.fcl | 8 - .../main_tprCosmicSeedDeMEventPrescale.fcl | 2 - .../main_tprCosmicSeedDeMHSFilter.fcl | 17 - .../main_tprCosmicSeedDeMSDCountFilter.fcl | 9 - .../main_tprCosmicSeedDeMTCFilter.fcl | 2 - .../main_tprCosmicSeedDeMTSFilter.fcl | 14 - .../main_tprCosmicSeedDePEventPrescale.fcl | 2 - .../main_tprCosmicSeedDePHSFilter.fcl | 17 - .../main_tprCosmicSeedDePSDCountFilter.fcl | 9 - .../main_tprCosmicSeedDePTCFilter.fcl | 2 - .../main_tprCosmicSeedDePTSFilter.fcl | 14 - ...in_tprDeM_highP_stopTarg_eventPrescale.fcl | 1 - .../main_tprDeM_highP_stopTarg_hsFilter.fcl | 17 - .../main_tprDeM_highP_stopTarg_tcFilter.fcl | 2 - .../main_tprDeM_highP_stopTarg_tsFilter.fcl | 14 - ...ain_tprDeM_lowP_stopTarg_eventPrescale.fcl | 1 - .../main_tprDeM_lowP_stopTarg_hsFilter.fcl | 17 - ...ain_tprDeM_lowP_stopTarg_sdCountFilter.fcl | 9 - .../main_tprDeM_lowP_stopTarg_tcFilter.fcl | 2 - .../main_tprDeM_lowP_stopTarg_tsFilter.fcl | 14 - ...in_tprDeP_highP_stopTarg_eventPrescale.fcl | 2 - .../main_tprDeP_highP_stopTarg_hsFilter.fcl | 17 - .../main_tprDeP_highP_stopTarg_tcFilter.fcl | 2 - .../main_tprDeP_highP_stopTarg_tsFilter.fcl | 14 - ...ain_tprDeP_lowP_stopTarg_eventPrescale.fcl | 2 - .../main_tprDeP_lowP_stopTarg_hsFilter.fcl | 17 - ...ain_tprDeP_lowP_stopTarg_sdCountFilter.fcl | 10 - .../main_tprDeP_lowP_stopTarg_tcFilter.fcl | 2 - .../main_tprDeP_lowP_stopTarg_tsFilter.fcl | 14 - .../main_tprHelixDeM_eventPrescale.fcl | 2 - .../tprHelixDeM/main_tprHelixDeM_hsFilter.fcl | 17 - .../main_tprHelixDeM_sdCountFilter.fcl | 9 - .../tprHelixDeM/main_tprHelixDeM_tcFilter.fcl | 2 - .../main_tprHelixDeM_ipa_eventPrescale.fcl | 2 - .../main_tprHelixDeM_ipa_hsFilter.fcl | 17 - .../main_tprHelixDeM_ipa_sdCountFilter.fcl | 9 - .../main_tprHelixDeM_ipa_tcFilter.fcl | 2 - ...prHelixDeM_ipa_phiScaled_eventPrescale.fcl | 2 - ...ain_tprHelixDeM_ipa_phiScaled_hsFilter.fcl | 19 - ...prHelixDeM_ipa_phiScaled_sdCountFilter.fcl | 9 - ...ain_tprHelixDeM_ipa_phiScaled_tcFilter.fcl | 2 - .../main_tprHelixDeP_eventPrescale.fcl | 2 - .../tprHelixDeP/main_tprHelixDeP_hsFilter.fcl | 17 - .../main_tprHelixDeP_sdCountFilter.fcl | 9 - .../tprHelixDeP/main_tprHelixDeP_tcFilter.fcl | 2 - .../main_tprHelixUeM_eventPrescale.fcl | 2 - .../tprHelixUeM/main_tprHelixUeM_hsFilter.fcl | 17 - .../main_tprHelixUeM_sdCountFilter.fcl | 9 - .../tprHelixUeM/main_tprHelixUeM_tcFilter.fcl | 2 - .../main_tprHelixUeP_eventPrescale.fcl | 2 - .../tprHelixUeP/main_tprHelixUeP_hsFilter.fcl | 17 - .../main_tprHelixUeP_sdCountFilter.fcl | 9 - .../tprHelixUeP/main_tprHelixUeP_tcFilter.fcl | 2 - Trigger/data/trkAll.config | 5 - .../unbiased/main_unbiasedEventPrescale.fcl | 3 - Trigger/python/SConscript | 33 -- Trigger/python/genTriggerFcl.py | 374 ------------------ 140 files changed, 1465 deletions(-) delete mode 100644 Trigger/data/ExtrPosTrigMenu.config delete mode 100644 Trigger/data/OffSpillTrigMenu.config delete mode 100644 Trigger/data/OnSpillTrigMenu.config delete mode 100644 Trigger/data/allPaths.config delete mode 100644 Trigger/data/caloFast_cosmic/main_caloFast_cosmic_eventPrescale.fcl delete mode 100644 Trigger/data/caloFast_cosmic/main_caloFast_cosmic_filter.fcl delete mode 100644 Trigger/data/caloFast_mvaLHCE/main_caloFast_mvaLHCE_eventPrescale.fcl delete mode 100644 Trigger/data/caloFast_mvaLHCE/main_caloFast_mvaLHCE_filter.fcl delete mode 100644 Trigger/data/caloFast_mvaLHCE/main_caloLHCECDCountFilter.fcl delete mode 100644 Trigger/data/caloFast_mvaNNCE/main_caloFast_mvaNNCE_eventPrescale.fcl delete mode 100644 Trigger/data/caloFast_mvaNNCE/main_caloFast_mvaNNCE_filter.fcl delete mode 100644 Trigger/data/caloFast_photon/main_caloFast_photon_cdCountFilter.fcl delete mode 100644 Trigger/data/caloFast_photon/main_caloFast_photon_eventPrescale.fcl delete mode 100644 Trigger/data/caloFast_photon/main_caloFast_photon_filter.fcl delete mode 100644 Trigger/data/caloFast_rmc/main_caloFast_rmc_eventPrescale.fcl delete mode 100644 Trigger/data/caloFast_rmc/main_caloFast_rmc_filter.fcl delete mode 100644 Trigger/data/caloMVACE/main_caloMVACECDCountFilter.fcl delete mode 100644 Trigger/data/caloMVACE/main_caloMVACEEventPrescale.fcl delete mode 100644 Trigger/data/caloMVACE/main_caloMVACEFilter.fcl delete mode 100644 Trigger/data/caloMVAMixedCE/main_caloMVACECDCountFilter.fcl delete mode 100644 Trigger/data/caloMVAMixedCE/main_caloMVACEEventPrescale.fcl delete mode 100644 Trigger/data/caloMVAMixedCE/main_caloMVACEFilter.fcl delete mode 100644 Trigger/data/caloOnly.config delete mode 100644 Trigger/data/cprCosmicSeedDeM/main_cprCosmicSeedDeMEventPrescale.fcl delete mode 100644 Trigger/data/cprCosmicSeedDeM/main_cprCosmicSeedDeMHSFilter.fcl delete mode 100644 Trigger/data/cprCosmicSeedDeM/main_cprCosmicSeedDeMSDCountFilter.fcl delete mode 100644 Trigger/data/cprCosmicSeedDeM/main_cprCosmicSeedDeMTCFilter.fcl delete mode 100644 Trigger/data/cprCosmicSeedDeM/main_cprCosmicSeedDeMTSFilter.fcl delete mode 100644 Trigger/data/cprCosmicSeedDeP/main_cprCosmicSeedDePEventPrescale.fcl delete mode 100644 Trigger/data/cprCosmicSeedDeP/main_cprCosmicSeedDePHSFilter.fcl delete mode 100644 Trigger/data/cprCosmicSeedDeP/main_cprCosmicSeedDePSDCountFilter.fcl delete mode 100644 Trigger/data/cprCosmicSeedDeP/main_cprCosmicSeedDePTCFilter.fcl delete mode 100644 Trigger/data/cprCosmicSeedDeP/main_cprCosmicSeedDePTSFilter.fcl delete mode 100644 Trigger/data/cprDeM_highP_stopTarg/main_cprDeM_highP_stopTarg_eventPrescale.fcl delete mode 100644 Trigger/data/cprDeM_highP_stopTarg/main_cprDeM_highP_stopTarg_hsFilter.fcl delete mode 100644 Trigger/data/cprDeM_highP_stopTarg/main_cprDeM_highP_stopTarg_sdCountFilter.fcl delete mode 100644 Trigger/data/cprDeM_highP_stopTarg/main_cprDeM_highP_stopTarg_tcFilter.fcl delete mode 100644 Trigger/data/cprDeM_highP_stopTarg/main_cprDeM_highP_stopTarg_tsFilter.fcl delete mode 100644 Trigger/data/cprDeM_lowP_stopTarg/main_cprDeM_lowP_stopTarg_eventPrescale.fcl delete mode 100644 Trigger/data/cprDeM_lowP_stopTarg/main_cprDeM_lowP_stopTarg_hsFilter.fcl delete mode 100644 Trigger/data/cprDeM_lowP_stopTarg/main_cprDeM_lowP_stopTarg_sdCountFilter.fcl delete mode 100644 Trigger/data/cprDeM_lowP_stopTarg/main_cprDeM_lowP_stopTarg_tcFilter.fcl delete mode 100644 Trigger/data/cprDeM_lowP_stopTarg/main_cprDeM_lowP_stopTarg_tsFilter.fcl delete mode 100644 Trigger/data/cprDeP_highP_stopTarg/main_cprDeP_highP_stopTarg_eventPrescale.fcl delete mode 100644 Trigger/data/cprDeP_highP_stopTarg/main_cprDeP_highP_stopTarg_hsFilter.fcl delete mode 100644 Trigger/data/cprDeP_highP_stopTarg/main_cprDeP_highP_stopTarg_sdCountFilter.fcl delete mode 100644 Trigger/data/cprDeP_highP_stopTarg/main_cprDeP_highP_stopTarg_tcFilter.fcl delete mode 100644 Trigger/data/cprDeP_highP_stopTarg/main_cprDeP_highP_stopTarg_tsFilter.fcl delete mode 100644 Trigger/data/cprDeP_lowP_stopTarg/main_cprDeP_lowP_stopTarg_eventPrescale.fcl delete mode 100644 Trigger/data/cprDeP_lowP_stopTarg/main_cprDeP_lowP_stopTarg_hsFilter.fcl delete mode 100644 Trigger/data/cprDeP_lowP_stopTarg/main_cprDeP_lowP_stopTarg_sdCountFilter.fcl delete mode 100644 Trigger/data/cprDeP_lowP_stopTarg/main_cprDeP_lowP_stopTarg_tcFilter.fcl delete mode 100644 Trigger/data/cprDeP_lowP_stopTarg/main_cprDeP_lowP_stopTarg_tsFilter.fcl delete mode 100644 Trigger/data/cprHelixDeM/main_cprHelixDeM_eventPrescale.fcl delete mode 100644 Trigger/data/cprHelixDeM/main_cprHelixDeM_hsFilter.fcl delete mode 100644 Trigger/data/cprHelixDeM/main_cprHelixDeM_sdCountFilter.fcl delete mode 100644 Trigger/data/cprHelixDeM/main_cprHelixDeM_tcFilter.fcl delete mode 100644 Trigger/data/cprHelixDeP/main_cprHelixDeP_eventPrescale.fcl delete mode 100644 Trigger/data/cprHelixDeP/main_cprHelixDeP_hsFilter.fcl delete mode 100644 Trigger/data/cprHelixDeP/main_cprHelixDeP_sdCountFilter.fcl delete mode 100644 Trigger/data/cprHelixDeP/main_cprHelixDeP_tcFilter.fcl delete mode 100644 Trigger/data/cprHelixUeM/main_cprHelixUeM_eventPrescale.fcl delete mode 100644 Trigger/data/cprHelixUeM/main_cprHelixUeM_hsFilter.fcl delete mode 100644 Trigger/data/cprHelixUeM/main_cprHelixUeM_sdCountFilter.fcl delete mode 100644 Trigger/data/cprHelixUeM/main_cprHelixUeM_tcFilter.fcl delete mode 100644 Trigger/data/cprHelixUeP/main_cprHelixUeP_eventPrescale.fcl delete mode 100644 Trigger/data/cprHelixUeP/main_cprHelixUeP_hsFilter.fcl delete mode 100644 Trigger/data/cprHelixUeP/main_cprHelixUeP_sdCountFilter.fcl delete mode 100644 Trigger/data/cprHelixUeP/main_cprHelixUeP_tcFilter.fcl delete mode 100644 Trigger/data/cst/main_cst_eventPrescale.fcl delete mode 100644 Trigger/data/cst/main_cst_sdCountFilter.fcl delete mode 100644 Trigger/data/cst/main_cst_tcFilter.fcl delete mode 100644 Trigger/data/cst/main_cst_tsFilter.fcl delete mode 100644 Trigger/data/cstTimeCluster/main_cstTimeCluster_eventPrescale.fcl delete mode 100644 Trigger/data/cstTimeCluster/main_cstTimeCluster_sdCountFilter.fcl delete mode 100644 Trigger/data/cstTimeCluster/main_cstTimeCluster_tcFilter.fcl delete mode 100644 Trigger/data/largeCDCount/main_largeCDCountEventPrescale.fcl delete mode 100644 Trigger/data/largeCDCount/main_largeCDCountFilter.fcl delete mode 100644 Trigger/data/largeSDCount/main_largeSDCountEventPrescale.fcl delete mode 100644 Trigger/data/largeSDCount/main_largeSDCountFilter.fcl delete mode 100644 Trigger/data/minBias_cdCount/main_minBias_cdCount_eventPrescale.fcl delete mode 100644 Trigger/data/minBias_cdCount/main_minBias_cdCount_filter.fcl delete mode 100644 Trigger/data/minBias_sdCount/main_minBias_sdCount_eventPrescale.fcl delete mode 100644 Trigger/data/minBias_sdCount/main_minBias_sdCount_filter.fcl delete mode 100644 Trigger/data/tprCosmicSeedDeM/main_tprCosmicSeedDeMEventPrescale.fcl delete mode 100644 Trigger/data/tprCosmicSeedDeM/main_tprCosmicSeedDeMHSFilter.fcl delete mode 100644 Trigger/data/tprCosmicSeedDeM/main_tprCosmicSeedDeMSDCountFilter.fcl delete mode 100644 Trigger/data/tprCosmicSeedDeM/main_tprCosmicSeedDeMTCFilter.fcl delete mode 100644 Trigger/data/tprCosmicSeedDeM/main_tprCosmicSeedDeMTSFilter.fcl delete mode 100644 Trigger/data/tprCosmicSeedDeP/main_tprCosmicSeedDePEventPrescale.fcl delete mode 100644 Trigger/data/tprCosmicSeedDeP/main_tprCosmicSeedDePHSFilter.fcl delete mode 100644 Trigger/data/tprCosmicSeedDeP/main_tprCosmicSeedDePSDCountFilter.fcl delete mode 100644 Trigger/data/tprCosmicSeedDeP/main_tprCosmicSeedDePTCFilter.fcl delete mode 100644 Trigger/data/tprCosmicSeedDeP/main_tprCosmicSeedDePTSFilter.fcl delete mode 100644 Trigger/data/tprDeM_highP_stopTarg/main_tprDeM_highP_stopTarg_eventPrescale.fcl delete mode 100644 Trigger/data/tprDeM_highP_stopTarg/main_tprDeM_highP_stopTarg_hsFilter.fcl delete mode 100644 Trigger/data/tprDeM_highP_stopTarg/main_tprDeM_highP_stopTarg_tcFilter.fcl delete mode 100644 Trigger/data/tprDeM_highP_stopTarg/main_tprDeM_highP_stopTarg_tsFilter.fcl delete mode 100644 Trigger/data/tprDeM_lowP_stopTarg/main_tprDeM_lowP_stopTarg_eventPrescale.fcl delete mode 100644 Trigger/data/tprDeM_lowP_stopTarg/main_tprDeM_lowP_stopTarg_hsFilter.fcl delete mode 100644 Trigger/data/tprDeM_lowP_stopTarg/main_tprDeM_lowP_stopTarg_sdCountFilter.fcl delete mode 100644 Trigger/data/tprDeM_lowP_stopTarg/main_tprDeM_lowP_stopTarg_tcFilter.fcl delete mode 100644 Trigger/data/tprDeM_lowP_stopTarg/main_tprDeM_lowP_stopTarg_tsFilter.fcl delete mode 100644 Trigger/data/tprDeP_highP_stopTarg/main_tprDeP_highP_stopTarg_eventPrescale.fcl delete mode 100644 Trigger/data/tprDeP_highP_stopTarg/main_tprDeP_highP_stopTarg_hsFilter.fcl delete mode 100644 Trigger/data/tprDeP_highP_stopTarg/main_tprDeP_highP_stopTarg_tcFilter.fcl delete mode 100644 Trigger/data/tprDeP_highP_stopTarg/main_tprDeP_highP_stopTarg_tsFilter.fcl delete mode 100644 Trigger/data/tprDeP_lowP_stopTarg/main_tprDeP_lowP_stopTarg_eventPrescale.fcl delete mode 100644 Trigger/data/tprDeP_lowP_stopTarg/main_tprDeP_lowP_stopTarg_hsFilter.fcl delete mode 100644 Trigger/data/tprDeP_lowP_stopTarg/main_tprDeP_lowP_stopTarg_sdCountFilter.fcl delete mode 100644 Trigger/data/tprDeP_lowP_stopTarg/main_tprDeP_lowP_stopTarg_tcFilter.fcl delete mode 100644 Trigger/data/tprDeP_lowP_stopTarg/main_tprDeP_lowP_stopTarg_tsFilter.fcl delete mode 100644 Trigger/data/tprHelixDeM/main_tprHelixDeM_eventPrescale.fcl delete mode 100644 Trigger/data/tprHelixDeM/main_tprHelixDeM_hsFilter.fcl delete mode 100644 Trigger/data/tprHelixDeM/main_tprHelixDeM_sdCountFilter.fcl delete mode 100644 Trigger/data/tprHelixDeM/main_tprHelixDeM_tcFilter.fcl delete mode 100644 Trigger/data/tprHelixDeM_ipa/main_tprHelixDeM_ipa_eventPrescale.fcl delete mode 100644 Trigger/data/tprHelixDeM_ipa/main_tprHelixDeM_ipa_hsFilter.fcl delete mode 100644 Trigger/data/tprHelixDeM_ipa/main_tprHelixDeM_ipa_sdCountFilter.fcl delete mode 100644 Trigger/data/tprHelixDeM_ipa/main_tprHelixDeM_ipa_tcFilter.fcl delete mode 100644 Trigger/data/tprHelixDeM_ipa_phiScaled/main_tprHelixDeM_ipa_phiScaled_eventPrescale.fcl delete mode 100644 Trigger/data/tprHelixDeM_ipa_phiScaled/main_tprHelixDeM_ipa_phiScaled_hsFilter.fcl delete mode 100644 Trigger/data/tprHelixDeM_ipa_phiScaled/main_tprHelixDeM_ipa_phiScaled_sdCountFilter.fcl delete mode 100644 Trigger/data/tprHelixDeM_ipa_phiScaled/main_tprHelixDeM_ipa_phiScaled_tcFilter.fcl delete mode 100644 Trigger/data/tprHelixDeP/main_tprHelixDeP_eventPrescale.fcl delete mode 100644 Trigger/data/tprHelixDeP/main_tprHelixDeP_hsFilter.fcl delete mode 100644 Trigger/data/tprHelixDeP/main_tprHelixDeP_sdCountFilter.fcl delete mode 100644 Trigger/data/tprHelixDeP/main_tprHelixDeP_tcFilter.fcl delete mode 100644 Trigger/data/tprHelixUeM/main_tprHelixUeM_eventPrescale.fcl delete mode 100644 Trigger/data/tprHelixUeM/main_tprHelixUeM_hsFilter.fcl delete mode 100644 Trigger/data/tprHelixUeM/main_tprHelixUeM_sdCountFilter.fcl delete mode 100644 Trigger/data/tprHelixUeM/main_tprHelixUeM_tcFilter.fcl delete mode 100644 Trigger/data/tprHelixUeP/main_tprHelixUeP_eventPrescale.fcl delete mode 100644 Trigger/data/tprHelixUeP/main_tprHelixUeP_hsFilter.fcl delete mode 100644 Trigger/data/tprHelixUeP/main_tprHelixUeP_sdCountFilter.fcl delete mode 100644 Trigger/data/tprHelixUeP/main_tprHelixUeP_tcFilter.fcl delete mode 100644 Trigger/data/trkAll.config delete mode 100644 Trigger/data/unbiased/main_unbiasedEventPrescale.fcl delete mode 100644 Trigger/python/SConscript delete mode 100755 Trigger/python/genTriggerFcl.py diff --git a/Trigger/data/ExtrPosTrigMenu.config b/Trigger/data/ExtrPosTrigMenu.config deleted file mode 100644 index eb53a9177b..0000000000 --- a/Trigger/data/ExtrPosTrigMenu.config +++ /dev/null @@ -1,5 +0,0 @@ -caloFast_cosmic:202 -cst:300 -cstTimeCluster:310 -minBias_sdCount:400 -minBias_cdCount:410 diff --git a/Trigger/data/OffSpillTrigMenu.config b/Trigger/data/OffSpillTrigMenu.config deleted file mode 100644 index 3335e372dc..0000000000 --- a/Trigger/data/OffSpillTrigMenu.config +++ /dev/null @@ -1,26 +0,0 @@ -tprDeM_highP_stopTarg:100 -tprDeP_highP_stopTarg:101 -tprDeM_lowP_stopTarg:110 -tprDeP_lowP_stopTarg:111 -tprHelixDeM_ipa:120 -tprHelixDeM_ipa_phiScaled:121 -tprHelixDeM:130 -tprHelixDeP:131 -tprHelixUeM:132 -tprHelixUeP:133 -cprDeM_highP_stopTarg:150 -cprDeP_highP_stopTarg:151 -cprDeM_lowP_stopTarg:160 -cprDeP_lowP_stopTarg:161 -cprHelixDeM:170 -cprHelixDeP:171 -cprHelixUeM:172 -cprHelixUeP:173 -caloFast_photon:200 -caloFast_mvaNNCE:201 -caloFast_cosmic:202 -caloFast_rmc:220 -cst:300 -cstTimeCluster:310 -minBias_sdCount:400 -minBias_cdCount:410 diff --git a/Trigger/data/OnSpillTrigMenu.config b/Trigger/data/OnSpillTrigMenu.config deleted file mode 100644 index 26498ca179..0000000000 --- a/Trigger/data/OnSpillTrigMenu.config +++ /dev/null @@ -1,11 +0,0 @@ -tprDeM_highP_stopTarg:100 -tprDeP_highP_stopTarg:101 -tprDeM_lowP_stopTarg:110 -tprDeP_lowP_stopTarg:111 -tprHelixDeM_ipa:120 -tprHelixDeM_ipa_phiScaled:121 -cprDeM_highP_stopTarg:150 -cprDeP_highP_stopTarg:151 -cprDeM_lowP_stopTarg:160 -cprDeP_lowP_stopTarg:161 -caloFast_rmc:220 diff --git a/Trigger/data/allPaths.config b/Trigger/data/allPaths.config deleted file mode 100644 index 0d35eac67b..0000000000 --- a/Trigger/data/allPaths.config +++ /dev/null @@ -1,25 +0,0 @@ -caloMVANNCE:201 -caloPhoton:200 -caloCalibCosmic:202 -tprSeedDeM:100 -tprSeedDeP:101 -tprLowPSeedDeM:110 -tprLowPSeedDeP:111 -tprHelixIPADeM:120 -tprHelixCalibIPADeM:121 -tprCosmicHelixDeM:130 -tprCosmicHelixDeP:131 -tprCosmicHelixUeM:132 -tprCosmicHelixUeP:133 -cprSeedDeM:150 -cprSeedDeP:151 -cprLowPSeedDeM:160 -cprLowPSeedDeP:161 -cprCosmicHelixDeM:170 -cprCosmicHelixDeP:171 -cstSeed:300 -minimumbiasSDCount:400 -minimumbiasCDCount:401 -unbiased:403 -largeSDCount:404 -largeCDCount:405 diff --git a/Trigger/data/caloFast_cosmic/main_caloFast_cosmic_eventPrescale.fcl b/Trigger/data/caloFast_cosmic/main_caloFast_cosmic_eventPrescale.fcl deleted file mode 100644 index 02453049f9..0000000000 --- a/Trigger/data/caloFast_cosmic/main_caloFast_cosmic_eventPrescale.fcl +++ /dev/null @@ -1 +0,0 @@ -physics.filters.caloFastCosmicEeventPrescale.nPrescale : 1 diff --git a/Trigger/data/caloFast_cosmic/main_caloFast_cosmic_filter.fcl b/Trigger/data/caloFast_cosmic/main_caloFast_cosmic_filter.fcl deleted file mode 100644 index 4279d48c4e..0000000000 --- a/Trigger/data/caloFast_cosmic/main_caloFast_cosmic_filter.fcl +++ /dev/null @@ -1,9 +0,0 @@ -physics.filters.caloFastCosmicFilter.debugLevel : 0 -physics.filters.caloFastCosmicFilter.MinNCrystalHits : 0 -physics.filters.caloFastCosmicFilter.MinEnergy : 120.0 -physics.filters.caloFastCosmicFilter.MaxEnergy : 600.0 -physics.filters.caloFastCosmicFilter.MinNumCelinout : 6 -physics.filters.caloFastCosmicFilter.MinNumCeldiagver : 6 -physics.filters.caloFastCosmicFilter.MinCelEneCut : 15 -physics.filters.caloFastCosmicFilter.OutRadius : 580.0 -physics.filters.caloFastCosmicFilter.InnerRadius : 460.0 diff --git a/Trigger/data/caloFast_mvaLHCE/main_caloFast_mvaLHCE_eventPrescale.fcl b/Trigger/data/caloFast_mvaLHCE/main_caloFast_mvaLHCE_eventPrescale.fcl deleted file mode 100644 index eaf810a1a5..0000000000 --- a/Trigger/data/caloFast_mvaLHCE/main_caloFast_mvaLHCE_eventPrescale.fcl +++ /dev/null @@ -1,2 +0,0 @@ -physics.filters.caloFastMvaLHCEEventPrescale.nPrescale : 1 - diff --git a/Trigger/data/caloFast_mvaLHCE/main_caloFast_mvaLHCE_filter.fcl b/Trigger/data/caloFast_mvaLHCE/main_caloFast_mvaLHCE_filter.fcl deleted file mode 100644 index e9a6aa05c7..0000000000 --- a/Trigger/data/caloFast_mvaLHCE/main_caloFast_mvaLHCE_filter.fcl +++ /dev/null @@ -1,8 +0,0 @@ -physics.filters.caloFastMvaLHCE_Filter.SignalTemplates : "OfflineData/CaloFilters/v7_1_5/caloLH_ce.root" -physics.filters.caloFastMvaLHCEFilter.BackgroundTemplates : "OfflineData/CaloFilters/v7_1_5/caloLH_bkg.root" -physics.filters.caloFastMvaLHCEFilter.DropSecondDisk : false -physics.filters.caloFastMvaLHCEFilter.MinClusterEnergy : 50. -physics.filters.caloFastMvaLHCEFilter.ClusterEnergyStep : 10. -physics.filters.caloFastMvaLHCEFilter.MinClusterRadialDist : 350. -physics.filters.caloFastMvaLHCEFilter.ClusterRadialDistStep : 50. -physics.filters.caloFastMvaLHCEFilter.MinLikelihoodCut : [ 41.44, 10.36] diff --git a/Trigger/data/caloFast_mvaLHCE/main_caloLHCECDCountFilter.fcl b/Trigger/data/caloFast_mvaLHCE/main_caloLHCECDCountFilter.fcl deleted file mode 100644 index 976a16e0f7..0000000000 --- a/Trigger/data/caloFast_mvaLHCE/main_caloLHCECDCountFilter.fcl +++ /dev/null @@ -1,8 +0,0 @@ -physics.filters.caloLHCECDCountFilter.strawDigiCollection : notUSed -physics.filters.caloLHCECDCountFilter.useStrawDigi : false -physics.filters.caloLHCECDCountFilter.useCaloDigi : true -physics.filters.caloLHCECDCountFilter.minNStrawDigi : -1 -physics.filters.caloLHCECDCountFilter.maxNStrawDigi : -1 -physics.filters.caloLHCECDCountFilter.minNCaloDigi : 2 -physics.filters.caloLHCECDCountFilter.maxNCaloDigi : 10000 -physics.filters.caloLHCECDCountFilter.maxCaloEnergy : -1 diff --git a/Trigger/data/caloFast_mvaNNCE/main_caloFast_mvaNNCE_eventPrescale.fcl b/Trigger/data/caloFast_mvaNNCE/main_caloFast_mvaNNCE_eventPrescale.fcl deleted file mode 100644 index 67596d370e..0000000000 --- a/Trigger/data/caloFast_mvaNNCE/main_caloFast_mvaNNCE_eventPrescale.fcl +++ /dev/null @@ -1 +0,0 @@ -physics.filters.caloFastMvaNNCEEventPrescale.nPrescale : 1 diff --git a/Trigger/data/caloFast_mvaNNCE/main_caloFast_mvaNNCE_filter.fcl b/Trigger/data/caloFast_mvaNNCE/main_caloFast_mvaNNCE_filter.fcl deleted file mode 100644 index 3fe8da9cb3..0000000000 --- a/Trigger/data/caloFast_mvaNNCE/main_caloFast_mvaNNCE_filter.fcl +++ /dev/null @@ -1,4 +0,0 @@ -physics.filters.caloFastMvaNNCEFilter.diagLevel : 0 -physics.filters.caloFastMvaNNCEFilter.caloBkgMVA : { MVAWeights : "Offline/CaloFilters/data/CE_NN_ReLU.weights.xml" } -physics.filters.caloFastMvaNNCEFilter.minEtoTest : 40 -physics.filters.caloFastMvaNNCEFilter.minMVAScore : 0.95 diff --git a/Trigger/data/caloFast_photon/main_caloFast_photon_cdCountFilter.fcl b/Trigger/data/caloFast_photon/main_caloFast_photon_cdCountFilter.fcl deleted file mode 100644 index 98d0dbeb77..0000000000 --- a/Trigger/data/caloFast_photon/main_caloFast_photon_cdCountFilter.fcl +++ /dev/null @@ -1,8 +0,0 @@ -physics.filters.caloFastPhotoncdCountFilter.strawDigiCollection : notUSed -physics.filters.caloFastPhotoncdCountFilter.useStrawDigi : false -physics.filters.caloFastPhotoncdCountFilter.useCaloDigi : true -physics.filters.caloFastPhotoncdCountFilter.minNStrawDigi : -1 -physics.filters.caloFastPhotoncdCountFilter.maxNStrawDigi : -1 -physics.filters.caloFastPhotoncdCountFilter.minNCaloDigi : 2 -physics.filters.caloFastPhotoncdCountFilter.maxNCaloDigi : 10000 -physics.filters.caloFastPhotoncdCountFilter.maxCaloEnergy : -1 diff --git a/Trigger/data/caloFast_photon/main_caloFast_photon_eventPrescale.fcl b/Trigger/data/caloFast_photon/main_caloFast_photon_eventPrescale.fcl deleted file mode 100644 index c095919e31..0000000000 --- a/Trigger/data/caloFast_photon/main_caloFast_photon_eventPrescale.fcl +++ /dev/null @@ -1,2 +0,0 @@ -physics.filters.caloFastPhotonEventPrescale.nPrescale : 1 - diff --git a/Trigger/data/caloFast_photon/main_caloFast_photon_filter.fcl b/Trigger/data/caloFast_photon/main_caloFast_photon_filter.fcl deleted file mode 100644 index a0952a47d8..0000000000 --- a/Trigger/data/caloFast_photon/main_caloFast_photon_filter.fcl +++ /dev/null @@ -1,8 +0,0 @@ -physics.filters.caloFastPhotonFilter.SignalTemplates : "OfflineData/CaloFilters/v7_1_5/caloLH_ce.root" -physics.filters.caloFastPhotonFilter.BackgroundTemplates : "OfflineData/CaloFilters/v7_1_5/caloLH_bkg.root" -physics.filters.caloFastPhotonFilter.DropSecondDisk : false -physics.filters.caloFastPhotonFilter.MinClusterEnergy : 50. -physics.filters.caloFastPhotonFilter.ClusterEnergyStep : 10. -physics.filters.caloFastPhotonFilter.MinClusterRadialDist : 350. -physics.filters.caloFastPhotonFilter.ClusterRadialDistStep : 50. -physics.filters.caloFastPhotonFilter.MinLikelihoodCut : [ 41.44, 10.36] diff --git a/Trigger/data/caloFast_rmc/main_caloFast_rmc_eventPrescale.fcl b/Trigger/data/caloFast_rmc/main_caloFast_rmc_eventPrescale.fcl deleted file mode 100644 index aa1f252e65..0000000000 --- a/Trigger/data/caloFast_rmc/main_caloFast_rmc_eventPrescale.fcl +++ /dev/null @@ -1 +0,0 @@ -physics.filters.caloFastRMCEeventPrescale.nPrescale : 1 diff --git a/Trigger/data/caloFast_rmc/main_caloFast_rmc_filter.fcl b/Trigger/data/caloFast_rmc/main_caloFast_rmc_filter.fcl deleted file mode 100644 index fae1545ca4..0000000000 --- a/Trigger/data/caloFast_rmc/main_caloFast_rmc_filter.fcl +++ /dev/null @@ -1,8 +0,0 @@ -physics.filters.caloFastRMCFilter.diagLevel : 0 -physics.filters.caloFastRMCFilter.MinClusterEnergy : 120.0 -physics.filters.caloFastRMCFilter.MaxClusterEnergy : 200.0 -physics.filters.caloFastRMCFilter.MinClusterRadius : 490. -physics.filters.caloFastRMCFilter.MinNCel : 2 -physics.filters.caloFastRMCFilter.MaxNCel : 10 -physics.filters.caloFastRMCFilter.MinNCl : 1 -physics.filters.caloFastRMCFilter.DiskID : [ 0 ] diff --git a/Trigger/data/caloMVACE/main_caloMVACECDCountFilter.fcl b/Trigger/data/caloMVACE/main_caloMVACECDCountFilter.fcl deleted file mode 100644 index d2fab30e18..0000000000 --- a/Trigger/data/caloMVACE/main_caloMVACECDCountFilter.fcl +++ /dev/null @@ -1,8 +0,0 @@ -physics.filters.caloMVACECDCountFilter.strawDigiCollection : notUSed -physics.filters.caloMVACECDCountFilter.useStrawDigi : false -physics.filters.caloMVACECDCountFilter.useCaloDigi : true -physics.filters.caloMVACECDCountFilter.minNStrawDigi : -1 -physics.filters.caloMVACECDCountFilter.maxNStrawDigi : -1 -physics.filters.caloMVACECDCountFilter.minNCaloDigi : 2 -physics.filters.caloMVACECDCountFilter.maxNCaloDigi : 10000 -physics.filters.caloMVACECDCountFilter.maxCaloEnergy : -1 diff --git a/Trigger/data/caloMVACE/main_caloMVACEEventPrescale.fcl b/Trigger/data/caloMVACE/main_caloMVACEEventPrescale.fcl deleted file mode 100644 index b1ce2f2da8..0000000000 --- a/Trigger/data/caloMVACE/main_caloMVACEEventPrescale.fcl +++ /dev/null @@ -1,2 +0,0 @@ -physics.filters.caloMVACEEventPrescale.nPrescale : 1 -physics.filters.caloMVACEEventPrescale.triggerFlag : ["PrescaleRandom"] diff --git a/Trigger/data/caloMVACE/main_caloMVACEFilter.fcl b/Trigger/data/caloMVACE/main_caloMVACEFilter.fcl deleted file mode 100644 index 5fb752ca62..0000000000 --- a/Trigger/data/caloMVACE/main_caloMVACEFilter.fcl +++ /dev/null @@ -1,13 +0,0 @@ -physics.filters.caloMVACEFilter.diagLevel : 0 -physics.filters.caloMVACEFilter.MVAMethod : BDT -physics.filters.caloMVACEFilter.weightsfile : "Offline/CaloFilters/data/ce_bkg_ecal_20_BDT.weights.xml" -physics.filters.caloMVACEFilter.TimeOFFSET : 22.5 -physics.filters.caloMVACEFilter.MVAhighcut0 : 0.1 -physics.filters.caloMVACEFilter.MVArpivot0 : 445 # mm -physics.filters.caloMVACEFilter.MVApivotcut0 : 0.1 -physics.filters.caloMVACEFilter.MVAlowcut0 : 0.0 -physics.filters.caloMVACEFilter.MVAhighcut1 : 0.1 -physics.filters.caloMVACEFilter.MVArpivot1 : 445 # mm -physics.filters.caloMVACEFilter.MVApivotcut1 : 0.1 -physics.filters.caloMVACEFilter.MVAlowcut1 : 0.0 -physics.filters.caloMVACEFilter.downscale500factor : 1 diff --git a/Trigger/data/caloMVAMixedCE/main_caloMVACECDCountFilter.fcl b/Trigger/data/caloMVAMixedCE/main_caloMVACECDCountFilter.fcl deleted file mode 100644 index d2fab30e18..0000000000 --- a/Trigger/data/caloMVAMixedCE/main_caloMVACECDCountFilter.fcl +++ /dev/null @@ -1,8 +0,0 @@ -physics.filters.caloMVACECDCountFilter.strawDigiCollection : notUSed -physics.filters.caloMVACECDCountFilter.useStrawDigi : false -physics.filters.caloMVACECDCountFilter.useCaloDigi : true -physics.filters.caloMVACECDCountFilter.minNStrawDigi : -1 -physics.filters.caloMVACECDCountFilter.maxNStrawDigi : -1 -physics.filters.caloMVACECDCountFilter.minNCaloDigi : 2 -physics.filters.caloMVACECDCountFilter.maxNCaloDigi : 10000 -physics.filters.caloMVACECDCountFilter.maxCaloEnergy : -1 diff --git a/Trigger/data/caloMVAMixedCE/main_caloMVACEEventPrescale.fcl b/Trigger/data/caloMVAMixedCE/main_caloMVACEEventPrescale.fcl deleted file mode 100644 index b1ce2f2da8..0000000000 --- a/Trigger/data/caloMVAMixedCE/main_caloMVACEEventPrescale.fcl +++ /dev/null @@ -1,2 +0,0 @@ -physics.filters.caloMVACEEventPrescale.nPrescale : 1 -physics.filters.caloMVACEEventPrescale.triggerFlag : ["PrescaleRandom"] diff --git a/Trigger/data/caloMVAMixedCE/main_caloMVACEFilter.fcl b/Trigger/data/caloMVAMixedCE/main_caloMVACEFilter.fcl deleted file mode 100644 index 5fb752ca62..0000000000 --- a/Trigger/data/caloMVAMixedCE/main_caloMVACEFilter.fcl +++ /dev/null @@ -1,13 +0,0 @@ -physics.filters.caloMVACEFilter.diagLevel : 0 -physics.filters.caloMVACEFilter.MVAMethod : BDT -physics.filters.caloMVACEFilter.weightsfile : "Offline/CaloFilters/data/ce_bkg_ecal_20_BDT.weights.xml" -physics.filters.caloMVACEFilter.TimeOFFSET : 22.5 -physics.filters.caloMVACEFilter.MVAhighcut0 : 0.1 -physics.filters.caloMVACEFilter.MVArpivot0 : 445 # mm -physics.filters.caloMVACEFilter.MVApivotcut0 : 0.1 -physics.filters.caloMVACEFilter.MVAlowcut0 : 0.0 -physics.filters.caloMVACEFilter.MVAhighcut1 : 0.1 -physics.filters.caloMVACEFilter.MVArpivot1 : 445 # mm -physics.filters.caloMVACEFilter.MVApivotcut1 : 0.1 -physics.filters.caloMVACEFilter.MVAlowcut1 : 0.0 -physics.filters.caloMVACEFilter.downscale500factor : 1 diff --git a/Trigger/data/caloOnly.config b/Trigger/data/caloOnly.config deleted file mode 100644 index 26ececefb0..0000000000 --- a/Trigger/data/caloOnly.config +++ /dev/null @@ -1,2 +0,0 @@ -caloMVACE -caloCalibCosmic diff --git a/Trigger/data/cprCosmicSeedDeM/main_cprCosmicSeedDeMEventPrescale.fcl b/Trigger/data/cprCosmicSeedDeM/main_cprCosmicSeedDeMEventPrescale.fcl deleted file mode 100644 index c31dd11451..0000000000 --- a/Trigger/data/cprCosmicSeedDeM/main_cprCosmicSeedDeMEventPrescale.fcl +++ /dev/null @@ -1,2 +0,0 @@ -physics.filters.cprCosmicSeedDeMEventPrescale.nPrescale : 1 -physics.filters.cprCosmicSeedDeMEventPrescale.triggerFlag : ["PrescaleRandom"] diff --git a/Trigger/data/cprCosmicSeedDeM/main_cprCosmicSeedDeMHSFilter.fcl b/Trigger/data/cprCosmicSeedDeM/main_cprCosmicSeedDeMHSFilter.fcl deleted file mode 100644 index 8bf7f65475..0000000000 --- a/Trigger/data/cprCosmicSeedDeM/main_cprCosmicSeedDeMHSFilter.fcl +++ /dev/null @@ -1,17 +0,0 @@ -physics.filters.cprCosmicSeedDeMHSFilter.requireCaloCluster : false -physics.filters.cprCosmicSeedDeMHSFilter.doHelicityCheck : true -physics.filters.cprCosmicSeedDeMHSFilter.helicity : 1 -physics.filters.cprCosmicSeedDeMHSFilter.minNStrawHits : 15 -physics.filters.cprCosmicSeedDeMHSFilter.minHitRatio : 0.4 -physics.filters.cprCosmicSeedDeMHSFilter.minMomentum : 50.0 -physics.filters.cprCosmicSeedDeMHSFilter.maxMomentum : 300.0 -physics.filters.cprCosmicSeedDeMHSFilter.minPt : 0.0 -physics.filters.cprCosmicSeedDeMHSFilter.maxChi2XY : 8.0 -physics.filters.cprCosmicSeedDeMHSFilter.maxChi2PhiZ : 8.0 -physics.filters.cprCosmicSeedDeMHSFilter.maxD0 : 800.0 -physics.filters.cprCosmicSeedDeMHSFilter.minD0 : -800.0 -physics.filters.cprCosmicSeedDeMHSFilter.minAbsLambda : 50.0 -physics.filters.cprCosmicSeedDeMHSFilter.maxAbsLambda : 1000.0 -physics.filters.cprCosmicSeedDeMHSFilter.minNLoops : 0 -physics.filters.cprCosmicSeedDeMHSFilter.maxNLoops : 30 -physics.filters.cprCosmicSeedDeMHSFilter.prescaleUsingD0Phi : false diff --git a/Trigger/data/cprCosmicSeedDeM/main_cprCosmicSeedDeMSDCountFilter.fcl b/Trigger/data/cprCosmicSeedDeM/main_cprCosmicSeedDeMSDCountFilter.fcl deleted file mode 100644 index a87d1a8d8a..0000000000 --- a/Trigger/data/cprCosmicSeedDeM/main_cprCosmicSeedDeMSDCountFilter.fcl +++ /dev/null @@ -1,9 +0,0 @@ -physics.filters.cprCosmicSeedDeMSDCountFilter.caloDigiCollection : notUsed -physics.filters.cprCosmicSeedDeMSDCountFilter.useStrawDigi : true -physics.filters.cprCosmicSeedDeMSDCountFilter.useCaloDigi : false -physics.filters.cprCosmicSeedDeMSDCountFilter.minNStrawDigi : 10 -physics.filters.cprCosmicSeedDeMSDCountFilter.maxNStrawDigi : 10000 -physics.filters.cprCosmicSeedDeMSDCountFilter.minNCaloDigi : -1 -physics.filters.cprCosmicSeedDeMSDCountFilter.maxNCaloDigi : -1 -physics.filters.cprCosmicSeedDeMSDCountFilter.maxCaloEnergy : -1 - diff --git a/Trigger/data/cprCosmicSeedDeM/main_cprCosmicSeedDeMTCFilter.fcl b/Trigger/data/cprCosmicSeedDeM/main_cprCosmicSeedDeMTCFilter.fcl deleted file mode 100644 index 848e636f54..0000000000 --- a/Trigger/data/cprCosmicSeedDeM/main_cprCosmicSeedDeMTCFilter.fcl +++ /dev/null @@ -1,2 +0,0 @@ -physics.filters.cprCosmicSeedDeMTCFilter.requireCaloCluster : false -physics.filters.cprCosmicSeedDeMTCFilter.minNStrawHits : 15 diff --git a/Trigger/data/cprCosmicSeedDeM/main_cprCosmicSeedDeMTSFilter.fcl b/Trigger/data/cprCosmicSeedDeM/main_cprCosmicSeedDeMTSFilter.fcl deleted file mode 100644 index 55b3fd163d..0000000000 --- a/Trigger/data/cprCosmicSeedDeM/main_cprCosmicSeedDeMTSFilter.fcl +++ /dev/null @@ -1,14 +0,0 @@ -physics.filters.cprCosmicSeedDeMTSFilter.fitparticle : @local::Particle.eminus -physics.filters.cprCosmicSeedDeMTSFilter.fitdirection : @local::FitDir.downstream -physics.filters.cprCosmicSeedDeMTSFilter.minNStrawHits : 15 -physics.filters.cprCosmicSeedDeMTSFilter.minMomentum : 50.0 -physics.filters.cprCosmicSeedDeMTSFilter.maxMomentum : 300.0 -physics.filters.cprCosmicSeedDeMTSFilter.maxChi2DOF : 20.0 -physics.filters.cprCosmicSeedDeMTSFilter.maxMomErr : 10.0 -physics.filters.cprCosmicSeedDeMTSFilter.minD0 : -800.0 -physics.filters.cprCosmicSeedDeMTSFilter.maxD0 : 800.0 -physics.filters.cprCosmicSeedDeMTSFilter.requireCaloCluster : false -physics.filters.cprCosmicSeedDeMTSFilter.minT0 : 0. -physics.filters.cprCosmicSeedDeMTSFilter.minFitCons : -1. -physics.filters.cprCosmicSeedDeMTSFilter.minTanDip : 0. -physics.filters.cprCosmicSeedDeMTSFilter.maxTanDip : 100. diff --git a/Trigger/data/cprCosmicSeedDeP/main_cprCosmicSeedDePEventPrescale.fcl b/Trigger/data/cprCosmicSeedDeP/main_cprCosmicSeedDePEventPrescale.fcl deleted file mode 100644 index 9df10ba0f1..0000000000 --- a/Trigger/data/cprCosmicSeedDeP/main_cprCosmicSeedDePEventPrescale.fcl +++ /dev/null @@ -1,2 +0,0 @@ -physics.filters.cprCosmicSeedDePEventPrescale.nPrescale : 1 -physics.filters.cprCosmicSeedDePEventPrescale.triggerFlag : ["PrescaleRandom"] diff --git a/Trigger/data/cprCosmicSeedDeP/main_cprCosmicSeedDePHSFilter.fcl b/Trigger/data/cprCosmicSeedDeP/main_cprCosmicSeedDePHSFilter.fcl deleted file mode 100644 index 1d53505b5f..0000000000 --- a/Trigger/data/cprCosmicSeedDeP/main_cprCosmicSeedDePHSFilter.fcl +++ /dev/null @@ -1,17 +0,0 @@ -physics.filters.cprCosmicSeedDePHSFilter.requireCaloCluster : false -physics.filters.cprCosmicSeedDePHSFilter.doHelicityCheck : true -physics.filters.cprCosmicSeedDePHSFilter.helicity : -1 -physics.filters.cprCosmicSeedDePHSFilter.minNStrawHits : 15 -physics.filters.cprCosmicSeedDePHSFilter.minHitRatio : 0.4 -physics.filters.cprCosmicSeedDePHSFilter.minMomentum : 50.0 -physics.filters.cprCosmicSeedDePHSFilter.maxMomentum : 300.0 -physics.filters.cprCosmicSeedDePHSFilter.minPt : 0.0 -physics.filters.cprCosmicSeedDePHSFilter.maxChi2XY : 5.0 -physics.filters.cprCosmicSeedDePHSFilter.maxChi2PhiZ : 5.0 -physics.filters.cprCosmicSeedDePHSFilter.maxD0 : 800.0 -physics.filters.cprCosmicSeedDePHSFilter.minD0 : -800.0 -physics.filters.cprCosmicSeedDePHSFilter.minAbsLambda : 50.0 -physics.filters.cprCosmicSeedDePHSFilter.maxAbsLambda : 1000.0 -physics.filters.cprCosmicSeedDePHSFilter.minNLoops : 0 -physics.filters.cprCosmicSeedDePHSFilter.maxNLoops : 30 -physics.filters.cprCosmicSeedDePHSFilter.prescaleUsingD0Phi : false diff --git a/Trigger/data/cprCosmicSeedDeP/main_cprCosmicSeedDePSDCountFilter.fcl b/Trigger/data/cprCosmicSeedDeP/main_cprCosmicSeedDePSDCountFilter.fcl deleted file mode 100644 index 928b2893db..0000000000 --- a/Trigger/data/cprCosmicSeedDeP/main_cprCosmicSeedDePSDCountFilter.fcl +++ /dev/null @@ -1,9 +0,0 @@ -physics.filters.cprCosmicSeedDePSDCountFilter.caloDigiCollection : notUsed -physics.filters.cprCosmicSeedDePSDCountFilter.useStrawDigi : true -physics.filters.cprCosmicSeedDePSDCountFilter.useCaloDigi : false -physics.filters.cprCosmicSeedDePSDCountFilter.minNStrawDigi : 10 -physics.filters.cprCosmicSeedDePSDCountFilter.maxNStrawDigi : 10000 -physics.filters.cprCosmicSeedDePSDCountFilter.minNCaloDigi : -1 -physics.filters.cprCosmicSeedDePSDCountFilter.maxNCaloDigi : -1 -physics.filters.cprCosmicSeedDePSDCountFilter.maxCaloEnergy : -1 - diff --git a/Trigger/data/cprCosmicSeedDeP/main_cprCosmicSeedDePTCFilter.fcl b/Trigger/data/cprCosmicSeedDeP/main_cprCosmicSeedDePTCFilter.fcl deleted file mode 100644 index 7383c75ee8..0000000000 --- a/Trigger/data/cprCosmicSeedDeP/main_cprCosmicSeedDePTCFilter.fcl +++ /dev/null @@ -1,2 +0,0 @@ -physics.filters.cprCosmicSeedDePTCFilter.requireCaloCluster : false -physics.filters.cprCosmicSeedDePTCFilter.minNStrawHits : 15 diff --git a/Trigger/data/cprCosmicSeedDeP/main_cprCosmicSeedDePTSFilter.fcl b/Trigger/data/cprCosmicSeedDeP/main_cprCosmicSeedDePTSFilter.fcl deleted file mode 100644 index ce5f779bc9..0000000000 --- a/Trigger/data/cprCosmicSeedDeP/main_cprCosmicSeedDePTSFilter.fcl +++ /dev/null @@ -1,14 +0,0 @@ -physics.filters.cprCosmicSeedDePTSFilter.fitparticle : @local::Particle.eplus -physics.filters.cprCosmicSeedDePTSFilter.fitdirection : @local::FitDir.downstream -physics.filters.cprCosmicSeedDePTSFilter.minNStrawHits : 15 -physics.filters.cprCosmicSeedDePTSFilter.minMomentum : 50.0 -physics.filters.cprCosmicSeedDePTSFilter.maxMomentum : 300.0 -physics.filters.cprCosmicSeedDePTSFilter.maxChi2DOF : 20.0 -physics.filters.cprCosmicSeedDePTSFilter.maxMomErr : 10.0 -physics.filters.cprCosmicSeedDePTSFilter.minD0 : -800.0 -physics.filters.cprCosmicSeedDePTSFilter.maxD0 : 800.0 -physics.filters.cprCosmicSeedDePTSFilter.requireCaloCluster : false -physics.filters.cprCosmicSeedDePTSFilter.minT0 : 0. -physics.filters.cprCosmicSeedDePTSFilter.minFitCons : -1. -physics.filters.cprCosmicSeedDePTSFilter.minTanDip : 0. -physics.filters.cprCosmicSeedDePTSFilter.maxTanDip : 100. diff --git a/Trigger/data/cprDeM_highP_stopTarg/main_cprDeM_highP_stopTarg_eventPrescale.fcl b/Trigger/data/cprDeM_highP_stopTarg/main_cprDeM_highP_stopTarg_eventPrescale.fcl deleted file mode 100644 index 4a3d0e5ad1..0000000000 --- a/Trigger/data/cprDeM_highP_stopTarg/main_cprDeM_highP_stopTarg_eventPrescale.fcl +++ /dev/null @@ -1 +0,0 @@ -physics.filters.cprDeMHighPStopTargEventPrescale.nPrescale : 1 diff --git a/Trigger/data/cprDeM_highP_stopTarg/main_cprDeM_highP_stopTarg_hsFilter.fcl b/Trigger/data/cprDeM_highP_stopTarg/main_cprDeM_highP_stopTarg_hsFilter.fcl deleted file mode 100644 index 602197721a..0000000000 --- a/Trigger/data/cprDeM_highP_stopTarg/main_cprDeM_highP_stopTarg_hsFilter.fcl +++ /dev/null @@ -1,17 +0,0 @@ -physics.filters.cprDeMHighPStopTargHSFilter.requireCaloCluster : false -physics.filters.cprDeMHighPStopTargHSFilter.doHelicityCheck : true -physics.filters.cprDeMHighPStopTargHSFilter.helicity : 1 -physics.filters.cprDeMHighPStopTargHSFilter.minNStrawHits : 15 -physics.filters.cprDeMHighPStopTargHSFilter.minHitRatio : 0.4 -physics.filters.cprDeMHighPStopTargHSFilter.minMomentum : 70.0 -physics.filters.cprDeMHighPStopTargHSFilter.maxMomentum : 200.0 -physics.filters.cprDeMHighPStopTargHSFilter.minPt : 0.0 -physics.filters.cprDeMHighPStopTargHSFilter.maxChi2XY : 5.0 -physics.filters.cprDeMHighPStopTargHSFilter.maxChi2PhiZ : 5.0 -physics.filters.cprDeMHighPStopTargHSFilter.maxD0 : 350.0 -physics.filters.cprDeMHighPStopTargHSFilter.minD0 : -350.0 -physics.filters.cprDeMHighPStopTargHSFilter.minAbsLambda : 140.0 -physics.filters.cprDeMHighPStopTargHSFilter.maxAbsLambda : 330.0 -physics.filters.cprDeMHighPStopTargHSFilter.minNLoops : 0 -physics.filters.cprDeMHighPStopTargHSFilter.maxNLoops : 30 -physics.filters.cprDeMHighPStopTargHSFilter.prescaleUsingD0Phi : false diff --git a/Trigger/data/cprDeM_highP_stopTarg/main_cprDeM_highP_stopTarg_sdCountFilter.fcl b/Trigger/data/cprDeM_highP_stopTarg/main_cprDeM_highP_stopTarg_sdCountFilter.fcl deleted file mode 100644 index 98d5ee4053..0000000000 --- a/Trigger/data/cprDeM_highP_stopTarg/main_cprDeM_highP_stopTarg_sdCountFilter.fcl +++ /dev/null @@ -1,9 +0,0 @@ -physics.filters.cprDeMHighPStopTargSDCountFilter.caloDigiCollection : notUsed -physics.filters.cprDeMHighPStopTargSDCountFilter.useStrawDigi : true -physics.filters.cprDeMHighPStopTargSDCountFilter.useCaloDigi : false -physics.filters.cprDeMHighPStopTargSDCountFilter.minNStrawDigi : 10 -physics.filters.cprDeMHighPStopTargSDCountFilter.maxNStrawDigi : 10000 -physics.filters.cprDeMHighPStopTargSDCountFilter.minNCaloDigi : -1 -physics.filters.cprDeMHighPStopTargSDCountFilter.maxNCaloDigi : -1 -physics.filters.cprDeMHighPStopTargSDCountFilter.maxCaloEnergy : -1 - diff --git a/Trigger/data/cprDeM_highP_stopTarg/main_cprDeM_highP_stopTarg_tcFilter.fcl b/Trigger/data/cprDeM_highP_stopTarg/main_cprDeM_highP_stopTarg_tcFilter.fcl deleted file mode 100644 index a2a47dbe16..0000000000 --- a/Trigger/data/cprDeM_highP_stopTarg/main_cprDeM_highP_stopTarg_tcFilter.fcl +++ /dev/null @@ -1,2 +0,0 @@ -physics.filters.cprDeMHighPStopTargTCFilter.requireCaloCluster : true -physics.filters.cprDeMHighPStopTargTCFilter.minNStrawHits : 15 diff --git a/Trigger/data/cprDeM_highP_stopTarg/main_cprDeM_highP_stopTarg_tsFilter.fcl b/Trigger/data/cprDeM_highP_stopTarg/main_cprDeM_highP_stopTarg_tsFilter.fcl deleted file mode 100644 index b8db996b13..0000000000 --- a/Trigger/data/cprDeM_highP_stopTarg/main_cprDeM_highP_stopTarg_tsFilter.fcl +++ /dev/null @@ -1,14 +0,0 @@ -physics.filters.cprDeMHighPStopTargTSFilter.fitparticle : @local::Particle.eminus -physics.filters.cprDeMHighPStopTargTSFilter.fitdirection : @local::FitDir.downstream -physics.filters.cprDeMHighPStopTargTSFilter.minNStrawHits : 15 -physics.filters.cprDeMHighPStopTargTSFilter.minMomentum : 80.0 -physics.filters.cprDeMHighPStopTargTSFilter.maxMomentum : 200.0 -physics.filters.cprDeMHighPStopTargTSFilter.maxChi2DOF : 20.0 -physics.filters.cprDeMHighPStopTargTSFilter.maxMomErr : 10.0 -physics.filters.cprDeMHighPStopTargTSFilter.minD0 : -200.0 -physics.filters.cprDeMHighPStopTargTSFilter.maxD0 : 200.0 -physics.filters.cprDeMHighPStopTargTSFilter.requireCaloCluster : false -physics.filters.cprDeMHighPStopTargTSFilter.minT0 : 0. -physics.filters.cprDeMHighPStopTargTSFilter.minFitCons : -1. -physics.filters.cprDeMHighPStopTargTSFilter.minTanDip : 0. -physics.filters.cprDeMHighPStopTargTSFilter.maxTanDip : 100. diff --git a/Trigger/data/cprDeM_lowP_stopTarg/main_cprDeM_lowP_stopTarg_eventPrescale.fcl b/Trigger/data/cprDeM_lowP_stopTarg/main_cprDeM_lowP_stopTarg_eventPrescale.fcl deleted file mode 100644 index 2c5d10d665..0000000000 --- a/Trigger/data/cprDeM_lowP_stopTarg/main_cprDeM_lowP_stopTarg_eventPrescale.fcl +++ /dev/null @@ -1,2 +0,0 @@ -physics.filters.cprDeMLowPStopTargEventPrescale.nPrescale : 1 -physics.filters.cprDeMLowPStopTargEventPrescale.triggerFlag : ["PrescaleRandom"] diff --git a/Trigger/data/cprDeM_lowP_stopTarg/main_cprDeM_lowP_stopTarg_hsFilter.fcl b/Trigger/data/cprDeM_lowP_stopTarg/main_cprDeM_lowP_stopTarg_hsFilter.fcl deleted file mode 100644 index 5c5813c637..0000000000 --- a/Trigger/data/cprDeM_lowP_stopTarg/main_cprDeM_lowP_stopTarg_hsFilter.fcl +++ /dev/null @@ -1,17 +0,0 @@ -physics.filters.cprDeMLowPStopTargHSFilter.requireCaloCluster : false -physics.filters.cprDeMLowPStopTargHSFilter.doHelicityCheck : true -physics.filters.cprDeMLowPStopTargHSFilter.helicity : 1 -physics.filters.cprDeMLowPStopTargHSFilter.minNStrawHits : 15 -physics.filters.cprDeMLowPStopTargHSFilter.minHitRatio : 0.4 -physics.filters.cprDeMLowPStopTargHSFilter.minMomentum : 50.0 -physics.filters.cprDeMLowPStopTargHSFilter.maxMomentum : 80.0 -physics.filters.cprDeMLowPStopTargHSFilter.minPt : 0.0 -physics.filters.cprDeMLowPStopTargHSFilter.maxChi2XY : 5.0 -physics.filters.cprDeMLowPStopTargHSFilter.maxChi2PhiZ : 5.0 -physics.filters.cprDeMLowPStopTargHSFilter.maxD0 : 350.0 -physics.filters.cprDeMLowPStopTargHSFilter.minD0 : -350.0 -physics.filters.cprDeMLowPStopTargHSFilter.minAbsLambda : 50.0 -physics.filters.cprDeMLowPStopTargHSFilter.maxAbsLambda : 500.0 -physics.filters.cprDeMLowPStopTargHSFilter.minNLoops : 0 -physics.filters.cprDeMLowPStopTargHSFilter.maxNLoops : 30 -physics.filters.cprDeMLowPStopTargHSFilter.prescaleUsingD0Phi : false diff --git a/Trigger/data/cprDeM_lowP_stopTarg/main_cprDeM_lowP_stopTarg_sdCountFilter.fcl b/Trigger/data/cprDeM_lowP_stopTarg/main_cprDeM_lowP_stopTarg_sdCountFilter.fcl deleted file mode 100644 index b460172b50..0000000000 --- a/Trigger/data/cprDeM_lowP_stopTarg/main_cprDeM_lowP_stopTarg_sdCountFilter.fcl +++ /dev/null @@ -1,9 +0,0 @@ -physics.filters.cprDeMLowPStopTargSDCountFilter.caloDigiCollection : notUsed -physics.filters.cprDeMLowPStopTargSDCountFilter.useStrawDigi : true -physics.filters.cprDeMLowPStopTargSDCountFilter.useCaloDigi : false -physics.filters.cprDeMLowPStopTargSDCountFilter.minNStrawDigi : 10 -physics.filters.cprDeMLowPStopTargSDCountFilter.maxNStrawDigi : 10000 -physics.filters.cprDeMLowPStopTargSDCountFilter.minNCaloDigi : -1 -physics.filters.cprDeMLowPStopTargSDCountFilter.maxNCaloDigi : -1 -physics.filters.cprDeMLowPStopTargSDCountFilter.maxCaloEnergy : -1 - diff --git a/Trigger/data/cprDeM_lowP_stopTarg/main_cprDeM_lowP_stopTarg_tcFilter.fcl b/Trigger/data/cprDeM_lowP_stopTarg/main_cprDeM_lowP_stopTarg_tcFilter.fcl deleted file mode 100644 index 6ed218b9be..0000000000 --- a/Trigger/data/cprDeM_lowP_stopTarg/main_cprDeM_lowP_stopTarg_tcFilter.fcl +++ /dev/null @@ -1,2 +0,0 @@ -physics.filters.cprDeMLowPStopTargTCFilter.requireCaloCluster : false -physics.filters.cprDeMLowPStopTargTCFilter.minNStrawHits : 15 diff --git a/Trigger/data/cprDeM_lowP_stopTarg/main_cprDeM_lowP_stopTarg_tsFilter.fcl b/Trigger/data/cprDeM_lowP_stopTarg/main_cprDeM_lowP_stopTarg_tsFilter.fcl deleted file mode 100644 index f1115d6451..0000000000 --- a/Trigger/data/cprDeM_lowP_stopTarg/main_cprDeM_lowP_stopTarg_tsFilter.fcl +++ /dev/null @@ -1,14 +0,0 @@ -physics.filters.cprDeMLowPStopTargTSFilter.fitparticle : @local::Particle.eminus -physics.filters.cprDeMLowPStopTargTSFilter.fitdirection : @local::FitDir.downstream -physics.filters.cprDeMLowPStopTargTSFilter.minNStrawHits : 15 -physics.filters.cprDeMLowPStopTargTSFilter.minMomentum : 50.0 -physics.filters.cprDeMLowPStopTargTSFilter.maxMomentum : 80.0 -physics.filters.cprDeMLowPStopTargTSFilter.maxChi2DOF : 20.0 -physics.filters.cprDeMLowPStopTargTSFilter.maxMomErr : 10.0 -physics.filters.cprDeMLowPStopTargTSFilter.minD0 : -200.0 -physics.filters.cprDeMLowPStopTargTSFilter.maxD0 : 200.0 -physics.filters.cprDeMLowPStopTargTSFilter.requireCaloCluster : false -physics.filters.cprDeMLowPStopTargTSFilter.minT0 : 0. -physics.filters.cprDeMLowPStopTargTSFilter.minFitCons : -1. -physics.filters.cprDeMLowPStopTargTSFilter.minTanDip : 0. -physics.filters.cprDeMLowPStopTargTSFilter.maxTanDip : 100. diff --git a/Trigger/data/cprDeP_highP_stopTarg/main_cprDeP_highP_stopTarg_eventPrescale.fcl b/Trigger/data/cprDeP_highP_stopTarg/main_cprDeP_highP_stopTarg_eventPrescale.fcl deleted file mode 100644 index 7c768d21e0..0000000000 --- a/Trigger/data/cprDeP_highP_stopTarg/main_cprDeP_highP_stopTarg_eventPrescale.fcl +++ /dev/null @@ -1,2 +0,0 @@ -physics.filters.cprDePHighPStopTargEventPrescale.nPrescale : 1 -physics.filters.cprDePHighPStopTargEventPrescale.triggerFlag : ["PrescaleRandom"] diff --git a/Trigger/data/cprDeP_highP_stopTarg/main_cprDeP_highP_stopTarg_hsFilter.fcl b/Trigger/data/cprDeP_highP_stopTarg/main_cprDeP_highP_stopTarg_hsFilter.fcl deleted file mode 100644 index 88d682c727..0000000000 --- a/Trigger/data/cprDeP_highP_stopTarg/main_cprDeP_highP_stopTarg_hsFilter.fcl +++ /dev/null @@ -1,17 +0,0 @@ -physics.filters.cprDePHighPStopTargHSFilter.requireCaloCluster : false -physics.filters.cprDePHighPStopTargHSFilter.doHelicityCheck : true -physics.filters.cprDePHighPStopTargHSFilter.helicity : -1 -physics.filters.cprDePHighPStopTargHSFilter.minNStrawHits : 15 -physics.filters.cprDePHighPStopTargHSFilter.minHitRatio : 0.4 -physics.filters.cprDePHighPStopTargHSFilter.minMomentum : 60.0 -physics.filters.cprDePHighPStopTargHSFilter.maxMomentum : 140.0 -physics.filters.cprDePHighPStopTargHSFilter.minPt : 0.0 -physics.filters.cprDePHighPStopTargHSFilter.maxChi2XY : 5.0 -physics.filters.cprDePHighPStopTargHSFilter.maxChi2PhiZ : 5.0 -physics.filters.cprDePHighPStopTargHSFilter.maxD0 : 300.0 -physics.filters.cprDePHighPStopTargHSFilter.minD0 : -150.0 -physics.filters.cprDePHighPStopTargHSFilter.minAbsLambda : 100.0 -physics.filters.cprDePHighPStopTargHSFilter.maxAbsLambda : 330.0 -physics.filters.cprDePHighPStopTargHSFilter.minNLoops : 0 -physics.filters.cprDePHighPStopTargHSFilter.maxNLoops : 30 -physics.filters.cprDePHighPStopTargHSFilter.prescaleUsingD0Phi : false diff --git a/Trigger/data/cprDeP_highP_stopTarg/main_cprDeP_highP_stopTarg_sdCountFilter.fcl b/Trigger/data/cprDeP_highP_stopTarg/main_cprDeP_highP_stopTarg_sdCountFilter.fcl deleted file mode 100644 index d1e2f7bc1f..0000000000 --- a/Trigger/data/cprDeP_highP_stopTarg/main_cprDeP_highP_stopTarg_sdCountFilter.fcl +++ /dev/null @@ -1,9 +0,0 @@ -physics.filters.cprDePHighPStopTargSDCountFilter.caloDigiCollection : notUsed -physics.filters.cprDePHighPStopTargSDCountFilter.useStrawDigi : true -physics.filters.cprDePHighPStopTargSDCountFilter.useCaloDigi : false -physics.filters.cprDePHighPStopTargSDCountFilter.minNStrawDigi : 10 -physics.filters.cprDePHighPStopTargSDCountFilter.maxNStrawDigi : 10000 -physics.filters.cprDePHighPStopTargSDCountFilter.minNCaloDigi : -1 -physics.filters.cprDePHighPStopTargSDCountFilter.maxNCaloDigi : -1 -physics.filters.cprDePHighPStopTargSDCountFilter.maxCaloEnergy : -1 - diff --git a/Trigger/data/cprDeP_highP_stopTarg/main_cprDeP_highP_stopTarg_tcFilter.fcl b/Trigger/data/cprDeP_highP_stopTarg/main_cprDeP_highP_stopTarg_tcFilter.fcl deleted file mode 100644 index 8b0d39c3be..0000000000 --- a/Trigger/data/cprDeP_highP_stopTarg/main_cprDeP_highP_stopTarg_tcFilter.fcl +++ /dev/null @@ -1,2 +0,0 @@ -physics.filters.cprDePHighPStopTargTCFilter.requireCaloCluster : false -physics.filters.cprDePHighPStopTargTCFilter.minNStrawHits : 15 diff --git a/Trigger/data/cprDeP_highP_stopTarg/main_cprDeP_highP_stopTarg_tsFilter.fcl b/Trigger/data/cprDeP_highP_stopTarg/main_cprDeP_highP_stopTarg_tsFilter.fcl deleted file mode 100644 index 0f039a8d40..0000000000 --- a/Trigger/data/cprDeP_highP_stopTarg/main_cprDeP_highP_stopTarg_tsFilter.fcl +++ /dev/null @@ -1,14 +0,0 @@ -physics.filters.cprDePHighPStopTargTSFilter.fitparticle : @local::Particle.eplus -physics.filters.cprDePHighPStopTargTSFilter.fitdirection : @local::FitDir.downstream -physics.filters.cprDePHighPStopTargTSFilter.minNStrawHits : 15 -physics.filters.cprDePHighPStopTargTSFilter.minMomentum : 70.0 -physics.filters.cprDePHighPStopTargTSFilter.maxMomentum : 110.0 -physics.filters.cprDePHighPStopTargTSFilter.maxChi2DOF : 20.0 -physics.filters.cprDePHighPStopTargTSFilter.maxMomErr : 10.0 -physics.filters.cprDePHighPStopTargTSFilter.minD0 : -200.0 -physics.filters.cprDePHighPStopTargTSFilter.maxD0 : 200.0 -physics.filters.cprDePHighPStopTargTSFilter.requireCaloCluster : false -physics.filters.cprDePHighPStopTargTSFilter.minT0 : 0. -physics.filters.cprDePHighPStopTargTSFilter.minFitCons : -1. -physics.filters.cprDePHighPStopTargTSFilter.minTanDip : 0. -physics.filters.cprDePHighPStopTargTSFilter.maxTanDip : 100. diff --git a/Trigger/data/cprDeP_lowP_stopTarg/main_cprDeP_lowP_stopTarg_eventPrescale.fcl b/Trigger/data/cprDeP_lowP_stopTarg/main_cprDeP_lowP_stopTarg_eventPrescale.fcl deleted file mode 100644 index b186d4e357..0000000000 --- a/Trigger/data/cprDeP_lowP_stopTarg/main_cprDeP_lowP_stopTarg_eventPrescale.fcl +++ /dev/null @@ -1,2 +0,0 @@ -physics.filters.cprDePLowPStopTargEventPrescale.nPrescale : 1 -physics.filters.cprDePLowPStopTargEventPrescale.triggerFlag : ["PrescaleRandom"] diff --git a/Trigger/data/cprDeP_lowP_stopTarg/main_cprDeP_lowP_stopTarg_hsFilter.fcl b/Trigger/data/cprDeP_lowP_stopTarg/main_cprDeP_lowP_stopTarg_hsFilter.fcl deleted file mode 100644 index 13e8f46560..0000000000 --- a/Trigger/data/cprDeP_lowP_stopTarg/main_cprDeP_lowP_stopTarg_hsFilter.fcl +++ /dev/null @@ -1,17 +0,0 @@ -physics.filters.cprDePLowPStopTargHSFilter.requireCaloCluster : false -physics.filters.cprDePLowPStopTargHSFilter.doHelicityCheck : true -physics.filters.cprDePLowPStopTargHSFilter.helicity : -1 -physics.filters.cprDePLowPStopTargHSFilter.minNStrawHits : 15 -physics.filters.cprDePLowPStopTargHSFilter.minHitRatio : 0.4 -physics.filters.cprDePLowPStopTargHSFilter.minMomentum : 40.0 -physics.filters.cprDePLowPStopTargHSFilter.maxMomentum : 60.0 -physics.filters.cprDePLowPStopTargHSFilter.minPt : 0.0 -physics.filters.cprDePLowPStopTargHSFilter.maxChi2XY : 5.0 -physics.filters.cprDePLowPStopTargHSFilter.maxChi2PhiZ : 5.0 -physics.filters.cprDePLowPStopTargHSFilter.maxD0 : 300.0 -physics.filters.cprDePLowPStopTargHSFilter.minD0 : -150.0 -physics.filters.cprDePLowPStopTargHSFilter.minAbsLambda : 50.0 -physics.filters.cprDePLowPStopTargHSFilter.maxAbsLambda : 500.0 -physics.filters.cprDePLowPStopTargHSFilter.minNLoops : 0 -physics.filters.cprDePLowPStopTargHSFilter.maxNLoops : 30 -physics.filters.cprDePLowPStopTargHSFilter.prescaleUsingD0Phi : false diff --git a/Trigger/data/cprDeP_lowP_stopTarg/main_cprDeP_lowP_stopTarg_sdCountFilter.fcl b/Trigger/data/cprDeP_lowP_stopTarg/main_cprDeP_lowP_stopTarg_sdCountFilter.fcl deleted file mode 100644 index 711ea56c62..0000000000 --- a/Trigger/data/cprDeP_lowP_stopTarg/main_cprDeP_lowP_stopTarg_sdCountFilter.fcl +++ /dev/null @@ -1,9 +0,0 @@ -physics.filters.cprDePLowPStopTargSDCountFilter.caloDigiCollection : notUsed -physics.filters.cprDePLowPStopTargSDCountFilter.useStrawDigi : true -physics.filters.cprDePLowPStopTargSDCountFilter.useCaloDigi : false -physics.filters.cprDePLowPStopTargSDCountFilter.minNStrawDigi : 10 -physics.filters.cprDePLowPStopTargSDCountFilter.maxNStrawDigi : 10000 -physics.filters.cprDePLowPStopTargSDCountFilter.minNCaloDigi : -1 -physics.filters.cprDePLowPStopTargSDCountFilter.maxNCaloDigi : -1 -physics.filters.cprDePLowPStopTargSDCountFilter.maxCaloEnergy : -1 - diff --git a/Trigger/data/cprDeP_lowP_stopTarg/main_cprDeP_lowP_stopTarg_tcFilter.fcl b/Trigger/data/cprDeP_lowP_stopTarg/main_cprDeP_lowP_stopTarg_tcFilter.fcl deleted file mode 100644 index 20c091f20d..0000000000 --- a/Trigger/data/cprDeP_lowP_stopTarg/main_cprDeP_lowP_stopTarg_tcFilter.fcl +++ /dev/null @@ -1,2 +0,0 @@ -physics.filters.cprDePLowPStopTargTCFilter.requireCaloCluster : false -physics.filters.cprDePLowPStopTargTCFilter.minNStrawHits : 15 diff --git a/Trigger/data/cprDeP_lowP_stopTarg/main_cprDeP_lowP_stopTarg_tsFilter.fcl b/Trigger/data/cprDeP_lowP_stopTarg/main_cprDeP_lowP_stopTarg_tsFilter.fcl deleted file mode 100644 index 16da082855..0000000000 --- a/Trigger/data/cprDeP_lowP_stopTarg/main_cprDeP_lowP_stopTarg_tsFilter.fcl +++ /dev/null @@ -1,14 +0,0 @@ -physics.filters.cprDePLowPStopTargTSFilter.fitparticle : @local::Particle.eplus -physics.filters.cprDePLowPStopTargTSFilter.fitdirection : @local::FitDir.downstream -physics.filters.cprDePLowPStopTargTSFilter.minNStrawHits : 15 -physics.filters.cprDePLowPStopTargTSFilter.minMomentum : 50.0 -physics.filters.cprDePLowPStopTargTSFilter.maxMomentum : 70.0 -physics.filters.cprDePLowPStopTargTSFilter.maxChi2DOF : 20.0 -physics.filters.cprDePLowPStopTargTSFilter.maxMomErr : 10.0 -physics.filters.cprDePLowPStopTargTSFilter.minD0 : -200.0 -physics.filters.cprDePLowPStopTargTSFilter.maxD0 : 200.0 -physics.filters.cprDePLowPStopTargTSFilter.requireCaloCluster : false -physics.filters.cprDePLowPStopTargTSFilter.minT0 : 0. -physics.filters.cprDePLowPStopTargTSFilter.minFitCons : -1. -physics.filters.cprDePLowPStopTargTSFilter.minTanDip : 0. -physics.filters.cprDePLowPStopTargTSFilter.maxTanDip : 100. diff --git a/Trigger/data/cprHelixDeM/main_cprHelixDeM_eventPrescale.fcl b/Trigger/data/cprHelixDeM/main_cprHelixDeM_eventPrescale.fcl deleted file mode 100644 index a91972b250..0000000000 --- a/Trigger/data/cprHelixDeM/main_cprHelixDeM_eventPrescale.fcl +++ /dev/null @@ -1,2 +0,0 @@ -physics.filters.cprHelixDeMEventPrescale.nPrescale : 1 -physics.filters.cprHelixDeMEventPrescale.triggerFlag : ["PrescaleRandom"] diff --git a/Trigger/data/cprHelixDeM/main_cprHelixDeM_hsFilter.fcl b/Trigger/data/cprHelixDeM/main_cprHelixDeM_hsFilter.fcl deleted file mode 100644 index fd36634065..0000000000 --- a/Trigger/data/cprHelixDeM/main_cprHelixDeM_hsFilter.fcl +++ /dev/null @@ -1,17 +0,0 @@ -physics.filters.cprHelixDeMHSFilter.requireCaloCluster : false -physics.filters.cprHelixDeMHSFilter.doHelicityCheck : true -physics.filters.cprHelixDeMHSFilter.helicity : 1 -physics.filters.cprHelixDeMHSFilter.minNStrawHits : 15 -physics.filters.cprHelixDeMHSFilter.minHitRatio : 0.4 -physics.filters.cprHelixDeMHSFilter.minMomentum : 50.0 -physics.filters.cprHelixDeMHSFilter.maxMomentum : 300.0 -physics.filters.cprHelixDeMHSFilter.minPt : 0.0 -physics.filters.cprHelixDeMHSFilter.maxChi2XY : 5.0 -physics.filters.cprHelixDeMHSFilter.maxChi2PhiZ : 5.0 -physics.filters.cprHelixDeMHSFilter.maxD0 : 800.0 -physics.filters.cprHelixDeMHSFilter.minD0 : -800.0 -physics.filters.cprHelixDeMHSFilter.minAbsLambda : 50.0 -physics.filters.cprHelixDeMHSFilter.maxAbsLambda : 1000.0 -physics.filters.cprHelixDeMHSFilter.minNLoops : 0 -physics.filters.cprHelixDeMHSFilter.maxNLoops : 30 -physics.filters.cprHelixDeMHSFilter.prescaleUsingD0Phi : false diff --git a/Trigger/data/cprHelixDeM/main_cprHelixDeM_sdCountFilter.fcl b/Trigger/data/cprHelixDeM/main_cprHelixDeM_sdCountFilter.fcl deleted file mode 100644 index d514829e2e..0000000000 --- a/Trigger/data/cprHelixDeM/main_cprHelixDeM_sdCountFilter.fcl +++ /dev/null @@ -1,9 +0,0 @@ -physics.filters.cprHelixDeMSDCountFilter.caloDigiCollection : notUsed -physics.filters.cprHelixDeMSDCountFilter.useStrawDigi : true -physics.filters.cprHelixDeMSDCountFilter.useCaloDigi : false -physics.filters.cprHelixDeMSDCountFilter.minNStrawDigi : 10 -physics.filters.cprHelixDeMSDCountFilter.maxNStrawDigi : 10000 -physics.filters.cprHelixDeMSDCountFilter.minNCaloDigi : -1 -physics.filters.cprHelixDeMSDCountFilter.maxNCaloDigi : -1 -physics.filters.cprHelixDeMSDCountFilter.maxCaloEnergy : -1 - diff --git a/Trigger/data/cprHelixDeM/main_cprHelixDeM_tcFilter.fcl b/Trigger/data/cprHelixDeM/main_cprHelixDeM_tcFilter.fcl deleted file mode 100644 index 87477bf37f..0000000000 --- a/Trigger/data/cprHelixDeM/main_cprHelixDeM_tcFilter.fcl +++ /dev/null @@ -1,2 +0,0 @@ -physics.filters.cprHelixDeMTCFilter.requireCaloCluster : false -physics.filters.cprHelixDeMTCFilter.minNStrawHits : 15 diff --git a/Trigger/data/cprHelixDeP/main_cprHelixDeP_eventPrescale.fcl b/Trigger/data/cprHelixDeP/main_cprHelixDeP_eventPrescale.fcl deleted file mode 100644 index 8656ad621a..0000000000 --- a/Trigger/data/cprHelixDeP/main_cprHelixDeP_eventPrescale.fcl +++ /dev/null @@ -1,2 +0,0 @@ -physics.filters.cprHelixDePEventPrescale.nPrescale : 1 -physics.filters.cprHelixDePEventPrescale.triggerFlag : ["PrescaleRandom"] diff --git a/Trigger/data/cprHelixDeP/main_cprHelixDeP_hsFilter.fcl b/Trigger/data/cprHelixDeP/main_cprHelixDeP_hsFilter.fcl deleted file mode 100644 index 1bbd5b17ac..0000000000 --- a/Trigger/data/cprHelixDeP/main_cprHelixDeP_hsFilter.fcl +++ /dev/null @@ -1,17 +0,0 @@ -physics.filters.cprHelixDePHSFilter.requireCaloCluster : false -physics.filters.cprHelixDePHSFilter.doHelicityCheck : true -physics.filters.cprHelixDePHSFilter.helicity : -1 -physics.filters.cprHelixDePHSFilter.minNStrawHits : 15 -physics.filters.cprHelixDePHSFilter.minHitRatio : 0.4 -physics.filters.cprHelixDePHSFilter.minMomentum : 50.0 -physics.filters.cprHelixDePHSFilter.maxMomentum : 300.0 -physics.filters.cprHelixDePHSFilter.minPt : 0.0 -physics.filters.cprHelixDePHSFilter.maxChi2XY : 5.0 -physics.filters.cprHelixDePHSFilter.maxChi2PhiZ : 5.0 -physics.filters.cprHelixDePHSFilter.maxD0 : 800.0 -physics.filters.cprHelixDePHSFilter.minD0 : -800.0 -physics.filters.cprHelixDePHSFilter.minAbsLambda : 50.0 -physics.filters.cprHelixDePHSFilter.maxAbsLambda : 1000.0 -physics.filters.cprHelixDePHSFilter.minNLoops : 0 -physics.filters.cprHelixDePHSFilter.maxNLoops : 30 -physics.filters.cprHelixDePHSFilter.prescaleUsingD0Phi : false diff --git a/Trigger/data/cprHelixDeP/main_cprHelixDeP_sdCountFilter.fcl b/Trigger/data/cprHelixDeP/main_cprHelixDeP_sdCountFilter.fcl deleted file mode 100644 index abda5d14c6..0000000000 --- a/Trigger/data/cprHelixDeP/main_cprHelixDeP_sdCountFilter.fcl +++ /dev/null @@ -1,9 +0,0 @@ -physics.filters.cprHelixDePSDCountFilter.caloDigiCollection : notUsed -physics.filters.cprHelixDePSDCountFilter.useStrawDigi : true -physics.filters.cprHelixDePSDCountFilter.useCaloDigi : false -physics.filters.cprHelixDePSDCountFilter.minNStrawDigi : 10 -physics.filters.cprHelixDePSDCountFilter.maxNStrawDigi : 10000 -physics.filters.cprHelixDePSDCountFilter.minNCaloDigi : -1 -physics.filters.cprHelixDePSDCountFilter.maxNCaloDigi : -1 -physics.filters.cprHelixDePSDCountFilter.maxCaloEnergy : -1 - diff --git a/Trigger/data/cprHelixDeP/main_cprHelixDeP_tcFilter.fcl b/Trigger/data/cprHelixDeP/main_cprHelixDeP_tcFilter.fcl deleted file mode 100644 index 5b418444d9..0000000000 --- a/Trigger/data/cprHelixDeP/main_cprHelixDeP_tcFilter.fcl +++ /dev/null @@ -1,2 +0,0 @@ -physics.filters.cprHelixDePTCFilter.requireCaloCluster : false -physics.filters.cprHelixDePTCFilter.minNStrawHits : 15 diff --git a/Trigger/data/cprHelixUeM/main_cprHelixUeM_eventPrescale.fcl b/Trigger/data/cprHelixUeM/main_cprHelixUeM_eventPrescale.fcl deleted file mode 100644 index e76640b2ea..0000000000 --- a/Trigger/data/cprHelixUeM/main_cprHelixUeM_eventPrescale.fcl +++ /dev/null @@ -1,2 +0,0 @@ -physics.filters.cprHelixUeMEventPrescale.nPrescale : 1 -physics.filters.cprHelixUeMEventPrescale.triggerFlag : ["PrescaleRandom"] diff --git a/Trigger/data/cprHelixUeM/main_cprHelixUeM_hsFilter.fcl b/Trigger/data/cprHelixUeM/main_cprHelixUeM_hsFilter.fcl deleted file mode 100644 index b2c16be433..0000000000 --- a/Trigger/data/cprHelixUeM/main_cprHelixUeM_hsFilter.fcl +++ /dev/null @@ -1,17 +0,0 @@ -physics.filters.cprHelixUeMHSFilter.requireCaloCluster : false -physics.filters.cprHelixUeMHSFilter.doHelicityCheck : true -physics.filters.cprHelixUeMHSFilter.helicity : -1 -physics.filters.cprHelixUeMHSFilter.minNStrawHits : 15 -physics.filters.cprHelixUeMHSFilter.minHitRatio : 0.4 -physics.filters.cprHelixUeMHSFilter.minMomentum : 40.0 -physics.filters.cprHelixUeMHSFilter.maxMomentum : 500.0 -physics.filters.cprHelixUeMHSFilter.minPt : 0.0 -physics.filters.cprHelixUeMHSFilter.maxChi2XY : 5.0 -physics.filters.cprHelixUeMHSFilter.maxChi2PhiZ : 5.0 -physics.filters.cprHelixUeMHSFilter.maxD0 : 800.0 -physics.filters.cprHelixUeMHSFilter.minD0 : -800.0 -physics.filters.cprHelixUeMHSFilter.minAbsLambda : 50.0 -physics.filters.cprHelixUeMHSFilter.maxAbsLambda : 1000.0 -physics.filters.cprHelixUeMHSFilter.minNLoops : 0 -physics.filters.cprHelixUeMHSFilter.maxNLoops : 30 -physics.filters.cprHelixUeMHSFilter.prescaleUsingD0Phi : false diff --git a/Trigger/data/cprHelixUeM/main_cprHelixUeM_sdCountFilter.fcl b/Trigger/data/cprHelixUeM/main_cprHelixUeM_sdCountFilter.fcl deleted file mode 100644 index 1bec236283..0000000000 --- a/Trigger/data/cprHelixUeM/main_cprHelixUeM_sdCountFilter.fcl +++ /dev/null @@ -1,9 +0,0 @@ -physics.filters.cprHelixUeMSDCountFilter.caloDigiCollection : notUsed -physics.filters.cprHelixUeMSDCountFilter.useStrawDigi : true -physics.filters.cprHelixUeMSDCountFilter.useCaloDigi : false -physics.filters.cprHelixUeMSDCountFilter.minNStrawDigi : 10 -physics.filters.cprHelixUeMSDCountFilter.maxNStrawDigi : 10000 -physics.filters.cprHelixUeMSDCountFilter.minNCaloDigi : -1 -physics.filters.cprHelixUeMSDCountFilter.maxNCaloDigi : -1 -physics.filters.cprHelixUeMSDCountFilter.maxCaloEnergy : -1 - diff --git a/Trigger/data/cprHelixUeM/main_cprHelixUeM_tcFilter.fcl b/Trigger/data/cprHelixUeM/main_cprHelixUeM_tcFilter.fcl deleted file mode 100644 index 1a4aa165e7..0000000000 --- a/Trigger/data/cprHelixUeM/main_cprHelixUeM_tcFilter.fcl +++ /dev/null @@ -1,2 +0,0 @@ -physics.filters.cprHelixUeMTCFilter.requireCaloCluster : false -physics.filters.cprHelixUeMTCFilter.minNStrawHits : 15 diff --git a/Trigger/data/cprHelixUeP/main_cprHelixUeP_eventPrescale.fcl b/Trigger/data/cprHelixUeP/main_cprHelixUeP_eventPrescale.fcl deleted file mode 100644 index d71ed74322..0000000000 --- a/Trigger/data/cprHelixUeP/main_cprHelixUeP_eventPrescale.fcl +++ /dev/null @@ -1,2 +0,0 @@ -physics.filters.cprHelixUePEventPrescale.nPrescale : 1 -physics.filters.cprHelixUePEventPrescale.triggerFlag : ["PrescaleRandom"] diff --git a/Trigger/data/cprHelixUeP/main_cprHelixUeP_hsFilter.fcl b/Trigger/data/cprHelixUeP/main_cprHelixUeP_hsFilter.fcl deleted file mode 100644 index 8680fe01f1..0000000000 --- a/Trigger/data/cprHelixUeP/main_cprHelixUeP_hsFilter.fcl +++ /dev/null @@ -1,17 +0,0 @@ -physics.filters.cprHelixUePHSFilter.requireCaloCluster : false -physics.filters.cprHelixUePHSFilter.doHelicityCheck : true -physics.filters.cprHelixUePHSFilter.helicity : 1 -physics.filters.cprHelixUePHSFilter.minNStrawHits : 15 -physics.filters.cprHelixUePHSFilter.minHitRatio : 0.4 -physics.filters.cprHelixUePHSFilter.minMomentum : 40.0 -physics.filters.cprHelixUePHSFilter.maxMomentum : 500.0 -physics.filters.cprHelixUePHSFilter.minPt : 0.0 -physics.filters.cprHelixUePHSFilter.maxChi2XY : 5.0 -physics.filters.cprHelixUePHSFilter.maxChi2PhiZ : 5.0 -physics.filters.cprHelixUePHSFilter.maxD0 : 800.0 -physics.filters.cprHelixUePHSFilter.minD0 : -800.0 -physics.filters.cprHelixUePHSFilter.minAbsLambda : 50.0 -physics.filters.cprHelixUePHSFilter.maxAbsLambda : 1000.0 -physics.filters.cprHelixUePHSFilter.minNLoops : 0 -physics.filters.cprHelixUePHSFilter.maxNLoops : 30 -physics.filters.cprHelixUePHSFilter.prescaleUsingD0Phi : false diff --git a/Trigger/data/cprHelixUeP/main_cprHelixUeP_sdCountFilter.fcl b/Trigger/data/cprHelixUeP/main_cprHelixUeP_sdCountFilter.fcl deleted file mode 100644 index 8c69e766c9..0000000000 --- a/Trigger/data/cprHelixUeP/main_cprHelixUeP_sdCountFilter.fcl +++ /dev/null @@ -1,9 +0,0 @@ -physics.filters.cprHelixUePSDCountFilter.caloDigiCollection : notUsed -physics.filters.cprHelixUePSDCountFilter.useStrawDigi : true -physics.filters.cprHelixUePSDCountFilter.useCaloDigi : false -physics.filters.cprHelixUePSDCountFilter.minNStrawDigi : 10 -physics.filters.cprHelixUePSDCountFilter.maxNStrawDigi : 10000 -physics.filters.cprHelixUePSDCountFilter.minNCaloDigi : -1 -physics.filters.cprHelixUePSDCountFilter.maxNCaloDigi : -1 -physics.filters.cprHelixUePSDCountFilter.maxCaloEnergy : -1 - diff --git a/Trigger/data/cprHelixUeP/main_cprHelixUeP_tcFilter.fcl b/Trigger/data/cprHelixUeP/main_cprHelixUeP_tcFilter.fcl deleted file mode 100644 index b2d5daa2f5..0000000000 --- a/Trigger/data/cprHelixUeP/main_cprHelixUeP_tcFilter.fcl +++ /dev/null @@ -1,2 +0,0 @@ -physics.filters.cprHelixUePTCFilter.requireCaloCluster : false -physics.filters.cprHelixUePTCFilter.minNStrawHits : 15 diff --git a/Trigger/data/cst/main_cst_eventPrescale.fcl b/Trigger/data/cst/main_cst_eventPrescale.fcl deleted file mode 100644 index 54bb53c9f4..0000000000 --- a/Trigger/data/cst/main_cst_eventPrescale.fcl +++ /dev/null @@ -1 +0,0 @@ -physics.filters.cstEventPrescale.nPrescale : 1 diff --git a/Trigger/data/cst/main_cst_sdCountFilter.fcl b/Trigger/data/cst/main_cst_sdCountFilter.fcl deleted file mode 100644 index b21b954235..0000000000 --- a/Trigger/data/cst/main_cst_sdCountFilter.fcl +++ /dev/null @@ -1,9 +0,0 @@ -physics.filters.cstSDCountFilter.caloDigiCollection : notUsed -physics.filters.cstSDCountFilter.useStrawDigi : true -physics.filters.cstSDCountFilter.useCaloDigi : false -physics.filters.cstSDCountFilter.minNStrawDigi : 8 -physics.filters.cstSDCountFilter.maxNStrawDigi : 10000 -physics.filters.cstSDCountFilter.minNCaloDigi : -1 -physics.filters.cstSDCountFilter.maxNCaloDigi : -1 -physics.filters.cstSDCountFilter.maxCaloEnergy : -1 - diff --git a/Trigger/data/cst/main_cst_tcFilter.fcl b/Trigger/data/cst/main_cst_tcFilter.fcl deleted file mode 100644 index f5918d6b22..0000000000 --- a/Trigger/data/cst/main_cst_tcFilter.fcl +++ /dev/null @@ -1,2 +0,0 @@ -physics.filters.cstTCFilter.requireCaloCluster : false -physics.filters.cstTCFilter.minNStrawHits : 8 diff --git a/Trigger/data/cst/main_cst_tsFilter.fcl b/Trigger/data/cst/main_cst_tsFilter.fcl deleted file mode 100644 index 3963460fd5..0000000000 --- a/Trigger/data/cst/main_cst_tsFilter.fcl +++ /dev/null @@ -1,2 +0,0 @@ -physics.filters.cstTSFilter.minnsh : 8 -physics.filters.cstTSFilter.debugLevel : 0 diff --git a/Trigger/data/cstTimeCluster/main_cstTimeCluster_eventPrescale.fcl b/Trigger/data/cstTimeCluster/main_cstTimeCluster_eventPrescale.fcl deleted file mode 100644 index ba7ffad6dd..0000000000 --- a/Trigger/data/cstTimeCluster/main_cstTimeCluster_eventPrescale.fcl +++ /dev/null @@ -1 +0,0 @@ -physics.filters.cstTimeClusterEventPrescale.nPrescale : 1 diff --git a/Trigger/data/cstTimeCluster/main_cstTimeCluster_sdCountFilter.fcl b/Trigger/data/cstTimeCluster/main_cstTimeCluster_sdCountFilter.fcl deleted file mode 100644 index 0664ea3599..0000000000 --- a/Trigger/data/cstTimeCluster/main_cstTimeCluster_sdCountFilter.fcl +++ /dev/null @@ -1,9 +0,0 @@ -physics.filters.cstTimeClusterSDCountFilter.caloDigiCollection : notUsed -physics.filters.cstTimeClusterSDCountFilter.useStrawDigi : true -physics.filters.cstTimeClusterSDCountFilter.useCaloDigi : false -physics.filters.cstTimeClusterSDCountFilter.minNStrawDigi : 8 -physics.filters.cstTimeClusterSDCountFilter.maxNStrawDigi : 10000 -physics.filters.cstTimeClusterSDCountFilter.minNCaloDigi : -1 -physics.filters.cstTimeClusterSDCountFilter.maxNCaloDigi : -1 -physics.filters.cstTimeClusterSDCountFilter.maxCaloEnergy : -1 - diff --git a/Trigger/data/cstTimeCluster/main_cstTimeCluster_tcFilter.fcl b/Trigger/data/cstTimeCluster/main_cstTimeCluster_tcFilter.fcl deleted file mode 100644 index 03c6e36748..0000000000 --- a/Trigger/data/cstTimeCluster/main_cstTimeCluster_tcFilter.fcl +++ /dev/null @@ -1,2 +0,0 @@ -physics.filters.cstTimeClusterTCFilter.requireCaloCluster : false -physics.filters.cstTimeClusterTCFilter.minNStrawHits : 4 diff --git a/Trigger/data/largeCDCount/main_largeCDCountEventPrescale.fcl b/Trigger/data/largeCDCount/main_largeCDCountEventPrescale.fcl deleted file mode 100644 index 2634ce9e33..0000000000 --- a/Trigger/data/largeCDCount/main_largeCDCountEventPrescale.fcl +++ /dev/null @@ -1,2 +0,0 @@ -physics.filters.largeCDCountEventPrescale.nPrescale : 10000 -physics.filters.largeCDCountEventPrescale.triggerFlag : ["PrescaleRandom"] diff --git a/Trigger/data/largeCDCount/main_largeCDCountFilter.fcl b/Trigger/data/largeCDCount/main_largeCDCountFilter.fcl deleted file mode 100644 index 587cb531d2..0000000000 --- a/Trigger/data/largeCDCount/main_largeCDCountFilter.fcl +++ /dev/null @@ -1,8 +0,0 @@ -physics.filters.largeCDCountPrescale.strawDigiCollection : notUSed -physics.filters.largeCDCountPrescale.useStrawDigi : false -physics.filters.largeCDCountPrescale.useCaloDigi : true -physics.filters.largeCDCountPrescale.minNStrawDigi : -1 -physics.filters.largeCDCountPrescale.maxNStrawDigi : -1 -physics.filters.largeCDCountPrescale.minNCaloDigi : 5000 -physics.filters.largeCDCountPrescale.maxNCaloDigi : 1000000 -physics.filters.largeCDCountPrescale.maxCaloEnergy : -1 diff --git a/Trigger/data/largeSDCount/main_largeSDCountEventPrescale.fcl b/Trigger/data/largeSDCount/main_largeSDCountEventPrescale.fcl deleted file mode 100644 index 2ca215973d..0000000000 --- a/Trigger/data/largeSDCount/main_largeSDCountEventPrescale.fcl +++ /dev/null @@ -1,2 +0,0 @@ -physics.filters.largeSDCountEventPrescale.nPrescale : 10000 -physics.filters.largeSDCountEventPrescale.triggerFlag : ["PrescaleRandom"] diff --git a/Trigger/data/largeSDCount/main_largeSDCountFilter.fcl b/Trigger/data/largeSDCount/main_largeSDCountFilter.fcl deleted file mode 100644 index c6b139ea19..0000000000 --- a/Trigger/data/largeSDCount/main_largeSDCountFilter.fcl +++ /dev/null @@ -1,8 +0,0 @@ -physics.filters.largeSDCountPrescale.caloDigiCollection : notUSed -physics.filters.largeSDCountPrescale.useStrawDigi : true -physics.filters.largeSDCountPrescale.useCaloDigi : false -physics.filters.largeSDCountPrescale.minNStrawDigi : 500 -physics.filters.largeSDCountPrescale.maxNStrawDigi : 10000 -physics.filters.largeSDCountPrescale.minNCaloDigi : -1 -physics.filters.largeSDCountPrescale.maxNCaloDigi : -1 -physics.filters.largeSDCountPrescale.maxCaloEnergy : -1 diff --git a/Trigger/data/minBias_cdCount/main_minBias_cdCount_eventPrescale.fcl b/Trigger/data/minBias_cdCount/main_minBias_cdCount_eventPrescale.fcl deleted file mode 100644 index 2eda132833..0000000000 --- a/Trigger/data/minBias_cdCount/main_minBias_cdCount_eventPrescale.fcl +++ /dev/null @@ -1,2 +0,0 @@ -physics.filters.minimumbiasCDCountEventPrescale.nPrescale : 10000 -physics.filters.minimumbiasCDCountEventPrescale.triggerFlag : ["PrescaleRandom"] diff --git a/Trigger/data/minBias_cdCount/main_minBias_cdCount_filter.fcl b/Trigger/data/minBias_cdCount/main_minBias_cdCount_filter.fcl deleted file mode 100644 index 0b437a0b44..0000000000 --- a/Trigger/data/minBias_cdCount/main_minBias_cdCount_filter.fcl +++ /dev/null @@ -1,8 +0,0 @@ -physics.filters.minimumbiasCDCountPrescale.strawDigiCollection : notUSed -physics.filters.minimumbiasCDCountPrescale.useStrawDigi : false -physics.filters.minimumbiasCDCountPrescale.useCaloDigi : true -physics.filters.minimumbiasCDCountPrescale.minNStrawDigi : -1 -physics.filters.minimumbiasCDCountPrescale.maxNStrawDigi : -1 -physics.filters.minimumbiasCDCountPrescale.minNCaloDigi : 10 -physics.filters.minimumbiasCDCountPrescale.maxNCaloDigi : 10000 -physics.filters.minimumbiasCDCountPrescale.maxCaloEnergy : -1 diff --git a/Trigger/data/minBias_sdCount/main_minBias_sdCount_eventPrescale.fcl b/Trigger/data/minBias_sdCount/main_minBias_sdCount_eventPrescale.fcl deleted file mode 100644 index 365d0fae3f..0000000000 --- a/Trigger/data/minBias_sdCount/main_minBias_sdCount_eventPrescale.fcl +++ /dev/null @@ -1 +0,0 @@ -physics.filters.minBiasSDCountEventPrescale.nPrescale : 10000 diff --git a/Trigger/data/minBias_sdCount/main_minBias_sdCount_filter.fcl b/Trigger/data/minBias_sdCount/main_minBias_sdCount_filter.fcl deleted file mode 100644 index e49b04204c..0000000000 --- a/Trigger/data/minBias_sdCount/main_minBias_sdCount_filter.fcl +++ /dev/null @@ -1,8 +0,0 @@ -physics.filters.minBiasSDCountFilter.caloDigiCollection : notUSed -physics.filters.minBiasSDCountFilter.useStrawDigi : true -physics.filters.minBiasSDCountFilter.useCaloDigi : false -physics.filters.minBiasSDCountFilter.minNStrawDigi : 10 -physics.filters.minBiasSDCountFilter.maxNStrawDigi : 10000 -physics.filters.minBiasSDCountFilter.minNCaloDigi : -1 -physics.filters.minBiasSDCountFilter.maxNCaloDigi : -1 -physics.filters.minBiasSDCountFilter.maxCaloEnergy : -1 diff --git a/Trigger/data/tprCosmicSeedDeM/main_tprCosmicSeedDeMEventPrescale.fcl b/Trigger/data/tprCosmicSeedDeM/main_tprCosmicSeedDeMEventPrescale.fcl deleted file mode 100644 index 3f4a48304d..0000000000 --- a/Trigger/data/tprCosmicSeedDeM/main_tprCosmicSeedDeMEventPrescale.fcl +++ /dev/null @@ -1,2 +0,0 @@ -physics.filters.tprCosmicSeedDeMEventPrescale.nPrescale : 1 -physics.filters.tprCosmicSeedDeMEventPrescale.triggerFlag : ["PrescaleRandom"] diff --git a/Trigger/data/tprCosmicSeedDeM/main_tprCosmicSeedDeMHSFilter.fcl b/Trigger/data/tprCosmicSeedDeM/main_tprCosmicSeedDeMHSFilter.fcl deleted file mode 100644 index 2b8ba66a86..0000000000 --- a/Trigger/data/tprCosmicSeedDeM/main_tprCosmicSeedDeMHSFilter.fcl +++ /dev/null @@ -1,17 +0,0 @@ -physics.filters.tprCosmicSeedDeMHSFilter.requireCaloCluster : false -physics.filters.tprCosmicSeedDeMHSFilter.doHelicityCheck : true -physics.filters.tprCosmicSeedDeMHSFilter.helicity : 1 -physics.filters.tprCosmicSeedDeMHSFilter.minNStrawHits : 15 -physics.filters.tprCosmicSeedDeMHSFilter.minHitRatio : 0.4 -physics.filters.tprCosmicSeedDeMHSFilter.minMomentum : 50.0 -physics.filters.tprCosmicSeedDeMHSFilter.maxMomentum : 300.0 -physics.filters.tprCosmicSeedDeMHSFilter.minPt : 0.0 -physics.filters.tprCosmicSeedDeMHSFilter.maxChi2XY : 8.0 -physics.filters.tprCosmicSeedDeMHSFilter.maxChi2PhiZ : 8.0 -physics.filters.tprCosmicSeedDeMHSFilter.maxD0 : 600.0 -physics.filters.tprCosmicSeedDeMHSFilter.minD0 : -600.0 -physics.filters.tprCosmicSeedDeMHSFilter.minAbsLambda : 50.0 -physics.filters.tprCosmicSeedDeMHSFilter.maxAbsLambda : 1000.0 -physics.filters.tprCosmicSeedDeMHSFilter.minNLoops : 0 -physics.filters.tprCosmicSeedDeMHSFilter.maxNLoops : 30 -physics.filters.tprCosmicSeedDeMHSFilter.prescaleUsingD0Phi : false diff --git a/Trigger/data/tprCosmicSeedDeM/main_tprCosmicSeedDeMSDCountFilter.fcl b/Trigger/data/tprCosmicSeedDeM/main_tprCosmicSeedDeMSDCountFilter.fcl deleted file mode 100644 index 91842b1aeb..0000000000 --- a/Trigger/data/tprCosmicSeedDeM/main_tprCosmicSeedDeMSDCountFilter.fcl +++ /dev/null @@ -1,9 +0,0 @@ -physics.filters.tprCosmicSeedDeMSDCountFilter.caloDigiCollection : notUsed -physics.filters.tprCosmicSeedDeMSDCountFilter.useStrawDigi : true -physics.filters.tprCosmicSeedDeMSDCountFilter.useCaloDigi : false -physics.filters.tprCosmicSeedDeMSDCountFilter.minNStrawDigi : 10 -physics.filters.tprCosmicSeedDeMSDCountFilter.maxNStrawDigi : 10000 -physics.filters.tprCosmicSeedDeMSDCountFilter.minNCaloDigi : -1 -physics.filters.tprCosmicSeedDeMSDCountFilter.maxNCaloDigi : -1 -physics.filters.tprCosmicSeedDeMSDCountFilter.maxCaloEnergy : -1 - diff --git a/Trigger/data/tprCosmicSeedDeM/main_tprCosmicSeedDeMTCFilter.fcl b/Trigger/data/tprCosmicSeedDeM/main_tprCosmicSeedDeMTCFilter.fcl deleted file mode 100644 index 4abd5c82f5..0000000000 --- a/Trigger/data/tprCosmicSeedDeM/main_tprCosmicSeedDeMTCFilter.fcl +++ /dev/null @@ -1,2 +0,0 @@ -physics.filters.tprCosmicSeedDeMTCFilter.requireCaloCluster : false -physics.filters.tprCosmicSeedDeMTCFilter.minNStrawHits : 15 diff --git a/Trigger/data/tprCosmicSeedDeM/main_tprCosmicSeedDeMTSFilter.fcl b/Trigger/data/tprCosmicSeedDeM/main_tprCosmicSeedDeMTSFilter.fcl deleted file mode 100644 index 89fcb01cc8..0000000000 --- a/Trigger/data/tprCosmicSeedDeM/main_tprCosmicSeedDeMTSFilter.fcl +++ /dev/null @@ -1,14 +0,0 @@ -physics.filters.tprCosmicSeedDeMTSFilter.fitparticle : @local::Particle.eminus -physics.filters.tprCosmicSeedDeMTSFilter.fitdirection : @local::FitDir.downstream -physics.filters.tprCosmicSeedDeMTSFilter.minNStrawHits : 15 -physics.filters.tprCosmicSeedDeMTSFilter.minMomentum : 50.0 -physics.filters.tprCosmicSeedDeMTSFilter.maxMomentum : 300.0 -physics.filters.tprCosmicSeedDeMTSFilter.maxChi2DOF : 20.0 -physics.filters.tprCosmicSeedDeMTSFilter.maxMomErr : 10.0 -physics.filters.tprCosmicSeedDeMTSFilter.minD0 : -800.0 -physics.filters.tprCosmicSeedDeMTSFilter.maxD0 : 800.0 -physics.filters.tprCosmicSeedDeMTSFilter.requireCaloCluster : false -physics.filters.tprCosmicSeedDeMTSFilter.minT0 : 0. -physics.filters.tprCosmicSeedDeMTSFilter.minFitCons : -1. -physics.filters.tprCosmicSeedDeMTSFilter.minTanDip : 0. -physics.filters.tprCosmicSeedDeMTSFilter.maxTanDip : 100. diff --git a/Trigger/data/tprCosmicSeedDeP/main_tprCosmicSeedDePEventPrescale.fcl b/Trigger/data/tprCosmicSeedDeP/main_tprCosmicSeedDePEventPrescale.fcl deleted file mode 100644 index ccdd100860..0000000000 --- a/Trigger/data/tprCosmicSeedDeP/main_tprCosmicSeedDePEventPrescale.fcl +++ /dev/null @@ -1,2 +0,0 @@ -physics.filters.tprCosmicSeedDePEventPrescale.nPrescale : 1 -physics.filters.tprCosmicSeedDePEventPrescale.triggerFlag : ["PrescaleRandom"] diff --git a/Trigger/data/tprCosmicSeedDeP/main_tprCosmicSeedDePHSFilter.fcl b/Trigger/data/tprCosmicSeedDeP/main_tprCosmicSeedDePHSFilter.fcl deleted file mode 100644 index b60c7096a7..0000000000 --- a/Trigger/data/tprCosmicSeedDeP/main_tprCosmicSeedDePHSFilter.fcl +++ /dev/null @@ -1,17 +0,0 @@ -physics.filters.tprCosmicSeedDePHSFilter.requireCaloCluster : false -physics.filters.tprCosmicSeedDePHSFilter.doHelicityCheck : true -physics.filters.tprCosmicSeedDePHSFilter.helicity : -1 -physics.filters.tprCosmicSeedDePHSFilter.minNStrawHits : 15 -physics.filters.tprCosmicSeedDePHSFilter.minHitRatio : 0.5 -physics.filters.tprCosmicSeedDePHSFilter.minMomentum : 70.0 -physics.filters.tprCosmicSeedDePHSFilter.maxMomentum : 300.0 -physics.filters.tprCosmicSeedDePHSFilter.minPt : 0.0 -physics.filters.tprCosmicSeedDePHSFilter.maxChi2XY : 8.0 -physics.filters.tprCosmicSeedDePHSFilter.maxChi2PhiZ : 8.0 -physics.filters.tprCosmicSeedDePHSFilter.maxD0 : 800.0 -physics.filters.tprCosmicSeedDePHSFilter.minD0 : -800.0 -physics.filters.tprCosmicSeedDePHSFilter.minAbsLambda : 50.0 -physics.filters.tprCosmicSeedDePHSFilter.maxAbsLambda : 1000.0 -physics.filters.tprCosmicSeedDePHSFilter.minNLoops : 0 -physics.filters.tprCosmicSeedDePHSFilter.maxNLoops : 30 -physics.filters.tprCosmicSeedDePHSFilter.prescaleUsingD0Phi : false diff --git a/Trigger/data/tprCosmicSeedDeP/main_tprCosmicSeedDePSDCountFilter.fcl b/Trigger/data/tprCosmicSeedDeP/main_tprCosmicSeedDePSDCountFilter.fcl deleted file mode 100644 index 99d06a6d54..0000000000 --- a/Trigger/data/tprCosmicSeedDeP/main_tprCosmicSeedDePSDCountFilter.fcl +++ /dev/null @@ -1,9 +0,0 @@ -physics.filters.tprCosmicSeedDePSDCountFilter.caloDigiCollection : notUsed -physics.filters.tprCosmicSeedDePSDCountFilter.useStrawDigi : true -physics.filters.tprCosmicSeedDePSDCountFilter.useCaloDigi : false -physics.filters.tprCosmicSeedDePSDCountFilter.minNStrawDigi : 10 -physics.filters.tprCosmicSeedDePSDCountFilter.maxNStrawDigi : 10000 -physics.filters.tprCosmicSeedDePSDCountFilter.minNCaloDigi : -1 -physics.filters.tprCosmicSeedDePSDCountFilter.maxNCaloDigi : -1 -physics.filters.tprCosmicSeedDePSDCountFilter.maxCaloEnergy : -1 - diff --git a/Trigger/data/tprCosmicSeedDeP/main_tprCosmicSeedDePTCFilter.fcl b/Trigger/data/tprCosmicSeedDeP/main_tprCosmicSeedDePTCFilter.fcl deleted file mode 100644 index 080c85feff..0000000000 --- a/Trigger/data/tprCosmicSeedDeP/main_tprCosmicSeedDePTCFilter.fcl +++ /dev/null @@ -1,2 +0,0 @@ -physics.filters.tprCosmicSeedDePTCFilter.requireCaloCluster : false -physics.filters.tprCosmicSeedDePTCFilter.minNStrawHits : 15 diff --git a/Trigger/data/tprCosmicSeedDeP/main_tprCosmicSeedDePTSFilter.fcl b/Trigger/data/tprCosmicSeedDeP/main_tprCosmicSeedDePTSFilter.fcl deleted file mode 100644 index a92d1a73a9..0000000000 --- a/Trigger/data/tprCosmicSeedDeP/main_tprCosmicSeedDePTSFilter.fcl +++ /dev/null @@ -1,14 +0,0 @@ -physics.filters.tprCosmicSeedDePTSFilter.fitparticle : @local::Particle.eplus -physics.filters.tprCosmicSeedDePTSFilter.fitdirection : @local::FitDir.downstream -physics.filters.tprCosmicSeedDePTSFilter.minNStrawHits : 15 -physics.filters.tprCosmicSeedDePTSFilter.minMomentum : 50.0 -physics.filters.tprCosmicSeedDePTSFilter.maxMomentum : 300.0 -physics.filters.tprCosmicSeedDePTSFilter.maxChi2DOF : 20.0 -physics.filters.tprCosmicSeedDePTSFilter.maxMomErr : 10.0 -physics.filters.tprCosmicSeedDePTSFilter.minD0 : -800.0 -physics.filters.tprCosmicSeedDePTSFilter.maxD0 : 800.0 -physics.filters.tprCosmicSeedDePTSFilter.requireCaloCluster : false -physics.filters.tprCosmicSeedDePTSFilter.minT0 : 0. -physics.filters.tprCosmicSeedDePTSFilter.minFitCons : -1. -physics.filters.tprCosmicSeedDePTSFilter.minTanDip : 0. -physics.filters.tprCosmicSeedDePTSFilter.maxTanDip : 100. diff --git a/Trigger/data/tprDeM_highP_stopTarg/main_tprDeM_highP_stopTarg_eventPrescale.fcl b/Trigger/data/tprDeM_highP_stopTarg/main_tprDeM_highP_stopTarg_eventPrescale.fcl deleted file mode 100644 index d6eceaa93e..0000000000 --- a/Trigger/data/tprDeM_highP_stopTarg/main_tprDeM_highP_stopTarg_eventPrescale.fcl +++ /dev/null @@ -1 +0,0 @@ -physics.filters.tprDeMHighPStopTargEventPrescale.nPrescale : 1 diff --git a/Trigger/data/tprDeM_highP_stopTarg/main_tprDeM_highP_stopTarg_hsFilter.fcl b/Trigger/data/tprDeM_highP_stopTarg/main_tprDeM_highP_stopTarg_hsFilter.fcl deleted file mode 100644 index 5db5c0d6a0..0000000000 --- a/Trigger/data/tprDeM_highP_stopTarg/main_tprDeM_highP_stopTarg_hsFilter.fcl +++ /dev/null @@ -1,17 +0,0 @@ -physics.filters.tprDeMHighPStopTargHSFilter.requireCaloCluster : false -physics.filters.tprDeMHighPStopTargHSFilter.doHelicityCheck : true -physics.filters.tprDeMHighPStopTargHSFilter.helicity : 1 -physics.filters.tprDeMHighPStopTargHSFilter.minNStrawHits : 15 -physics.filters.tprDeMHighPStopTargHSFilter.minHitRatio : 0.4 -physics.filters.tprDeMHighPStopTargHSFilter.minMomentum : 70.0 -physics.filters.tprDeMHighPStopTargHSFilter.maxMomentum : 200.0 -physics.filters.tprDeMHighPStopTargHSFilter.minPt : 0.0 -physics.filters.tprDeMHighPStopTargHSFilter.maxChi2XY : 8.0 -physics.filters.tprDeMHighPStopTargHSFilter.maxChi2PhiZ : 8.0 -physics.filters.tprDeMHighPStopTargHSFilter.maxD0 : 300.0 -physics.filters.tprDeMHighPStopTargHSFilter.minD0 : -150.0 -physics.filters.tprDeMHighPStopTargHSFilter.minAbsLambda : 140.0 -physics.filters.tprDeMHighPStopTargHSFilter.maxAbsLambda : 300.0 -physics.filters.tprDeMHighPStopTargHSFilter.minNLoops : 0 -physics.filters.tprDeMHighPStopTargHSFilter.maxNLoops : 30 -physics.filters.tprDeMHighPStopTargHSFilter.prescaleUsingD0Phi : false diff --git a/Trigger/data/tprDeM_highP_stopTarg/main_tprDeM_highP_stopTarg_tcFilter.fcl b/Trigger/data/tprDeM_highP_stopTarg/main_tprDeM_highP_stopTarg_tcFilter.fcl deleted file mode 100644 index 2a8132537b..0000000000 --- a/Trigger/data/tprDeM_highP_stopTarg/main_tprDeM_highP_stopTarg_tcFilter.fcl +++ /dev/null @@ -1,2 +0,0 @@ -physics.filters.tprDeMHighPStopTargTCFilter.requireCaloCluster : false -physics.filters.tprDeMHighPStopTargTCFilter.minNStrawHits : 15 diff --git a/Trigger/data/tprDeM_highP_stopTarg/main_tprDeM_highP_stopTarg_tsFilter.fcl b/Trigger/data/tprDeM_highP_stopTarg/main_tprDeM_highP_stopTarg_tsFilter.fcl deleted file mode 100644 index 023ce0802b..0000000000 --- a/Trigger/data/tprDeM_highP_stopTarg/main_tprDeM_highP_stopTarg_tsFilter.fcl +++ /dev/null @@ -1,14 +0,0 @@ -physics.filters.tprDeMHighPStopTargTSFilter.fitparticle : @local::Particle.eminus -physics.filters.tprDeMHighPStopTargTSFilter.fitdirection : @local::FitDir.downstream -physics.filters.tprDeMHighPStopTargTSFilter.minNStrawHits : 15 -physics.filters.tprDeMHighPStopTargTSFilter.minMomentum : 80.0 -physics.filters.tprDeMHighPStopTargTSFilter.maxMomentum : 200.0 -physics.filters.tprDeMHighPStopTargTSFilter.maxChi2DOF : 20.0 -physics.filters.tprDeMHighPStopTargTSFilter.maxMomErr : 10.0 -physics.filters.tprDeMHighPStopTargTSFilter.minD0 : -200.0 -physics.filters.tprDeMHighPStopTargTSFilter.maxD0 : 200.0 -physics.filters.tprDeMHighPStopTargTSFilter.requireCaloCluster : false -physics.filters.tprDeMHighPStopTargTSFilter.minT0 : 0. -physics.filters.tprDeMHighPStopTargTSFilter.minFitCons : -1. -physics.filters.tprDeMHighPStopTargTSFilter.minTanDip : 0. -physics.filters.tprDeMHighPStopTargTSFilter.maxTanDip : 100. diff --git a/Trigger/data/tprDeM_lowP_stopTarg/main_tprDeM_lowP_stopTarg_eventPrescale.fcl b/Trigger/data/tprDeM_lowP_stopTarg/main_tprDeM_lowP_stopTarg_eventPrescale.fcl deleted file mode 100644 index 483b638b3c..0000000000 --- a/Trigger/data/tprDeM_lowP_stopTarg/main_tprDeM_lowP_stopTarg_eventPrescale.fcl +++ /dev/null @@ -1 +0,0 @@ -physics.filters.tprDeMLowPStopTargEventPrescale.nPrescale : 1 diff --git a/Trigger/data/tprDeM_lowP_stopTarg/main_tprDeM_lowP_stopTarg_hsFilter.fcl b/Trigger/data/tprDeM_lowP_stopTarg/main_tprDeM_lowP_stopTarg_hsFilter.fcl deleted file mode 100644 index bf3fbe121f..0000000000 --- a/Trigger/data/tprDeM_lowP_stopTarg/main_tprDeM_lowP_stopTarg_hsFilter.fcl +++ /dev/null @@ -1,17 +0,0 @@ -physics.filters.tprDeMLowPStopTargHSFilter.requireCaloCluster : false -physics.filters.tprDeMLowPStopTargHSFilter.doHelicityCheck : true -physics.filters.tprDeMLowPStopTargHSFilter.helicity : 1 -physics.filters.tprDeMLowPStopTargHSFilter.minNStrawHits : 15 -physics.filters.tprDeMLowPStopTargHSFilter.minHitRatio : 0.4 -physics.filters.tprDeMLowPStopTargHSFilter.minMomentum : 50.0 -physics.filters.tprDeMLowPStopTargHSFilter.maxMomentum : 80.0 -physics.filters.tprDeMLowPStopTargHSFilter.minPt : 0.0 -physics.filters.tprDeMLowPStopTargHSFilter.maxChi2XY : 8.0 -physics.filters.tprDeMLowPStopTargHSFilter.maxChi2PhiZ : 8.0 -physics.filters.tprDeMLowPStopTargHSFilter.maxD0 : 300.0 -physics.filters.tprDeMLowPStopTargHSFilter.minD0 : -150.0 -physics.filters.tprDeMLowPStopTargHSFilter.minAbsLambda : 50.0 -physics.filters.tprDeMLowPStopTargHSFilter.maxAbsLambda : 500.0 -physics.filters.tprDeMLowPStopTargHSFilter.minNLoops : 0 -physics.filters.tprDeMLowPStopTargHSFilter.maxNLoops : 30 -physics.filters.tprDeMLowPStopTargHSFilter.prescaleUsingD0Phi : false diff --git a/Trigger/data/tprDeM_lowP_stopTarg/main_tprDeM_lowP_stopTarg_sdCountFilter.fcl b/Trigger/data/tprDeM_lowP_stopTarg/main_tprDeM_lowP_stopTarg_sdCountFilter.fcl deleted file mode 100644 index 2cd8d242c0..0000000000 --- a/Trigger/data/tprDeM_lowP_stopTarg/main_tprDeM_lowP_stopTarg_sdCountFilter.fcl +++ /dev/null @@ -1,9 +0,0 @@ -physics.filters.tprDeMLowPStopTargSDCountFilter.caloDigiCollection : notUsed -physics.filters.tprDeMLowPStopTargSDCountFilter.useStrawDigi : true -physics.filters.tprDeMLowPStopTargSDCountFilter.useCaloDigi : false -physics.filters.tprDeMLowPStopTargSDCountFilter.minNStrawDigi : 10 -physics.filters.tprDeMLowPStopTargSDCountFilter.maxNStrawDigi : 10000 -physics.filters.tprDeMLowPStopTargSDCountFilter.minNCaloDigi : -1 -physics.filters.tprDeMLowPStopTargSDCountFilter.maxNCaloDigi : -1 -physics.filters.tprDeMLowPStopTargSDCountFilter.maxCaloEnergy : -1 - diff --git a/Trigger/data/tprDeM_lowP_stopTarg/main_tprDeM_lowP_stopTarg_tcFilter.fcl b/Trigger/data/tprDeM_lowP_stopTarg/main_tprDeM_lowP_stopTarg_tcFilter.fcl deleted file mode 100644 index 2d60d272b9..0000000000 --- a/Trigger/data/tprDeM_lowP_stopTarg/main_tprDeM_lowP_stopTarg_tcFilter.fcl +++ /dev/null @@ -1,2 +0,0 @@ -physics.filters.tprDeMLowPStopTargTCFilter.requireCaloCluster : false -physics.filters.tprDeMLowPStopTargTCFilter.minNStrawHits : 10.0 diff --git a/Trigger/data/tprDeM_lowP_stopTarg/main_tprDeM_lowP_stopTarg_tsFilter.fcl b/Trigger/data/tprDeM_lowP_stopTarg/main_tprDeM_lowP_stopTarg_tsFilter.fcl deleted file mode 100644 index 69c5339e7f..0000000000 --- a/Trigger/data/tprDeM_lowP_stopTarg/main_tprDeM_lowP_stopTarg_tsFilter.fcl +++ /dev/null @@ -1,14 +0,0 @@ -physics.filters.tprDeMLowPStopTargTSFilter.fitparticle : @local::Particle.eminus -physics.filters.tprDeMLowPStopTargTSFilter.fitdirection : @local::FitDir.downstream -physics.filters.tprDeMLowPStopTargTSFilter.minNStrawHits : 15 -physics.filters.tprDeMLowPStopTargTSFilter.minMomentum : 50.0 -physics.filters.tprDeMLowPStopTargTSFilter.maxMomentum : 80.0 -physics.filters.tprDeMLowPStopTargTSFilter.maxChi2DOF : 20.0 -physics.filters.tprDeMLowPStopTargTSFilter.maxMomErr : 10.0 -physics.filters.tprDeMLowPStopTargTSFilter.minD0 : -200.0 -physics.filters.tprDeMLowPStopTargTSFilter.maxD0 : 200.0 -physics.filters.tprDeMLowPStopTargTSFilter.requireCaloCluster : false -physics.filters.tprDeMLowPStopTargTSFilter.minT0 : 0. -physics.filters.tprDeMLowPStopTargTSFilter.minFitCons : -1. -physics.filters.tprDeMLowPStopTargTSFilter.minTanDip : 0. -physics.filters.tprDeMLowPStopTargTSFilter.maxTanDip : 100. diff --git a/Trigger/data/tprDeP_highP_stopTarg/main_tprDeP_highP_stopTarg_eventPrescale.fcl b/Trigger/data/tprDeP_highP_stopTarg/main_tprDeP_highP_stopTarg_eventPrescale.fcl deleted file mode 100644 index 4662a1aa00..0000000000 --- a/Trigger/data/tprDeP_highP_stopTarg/main_tprDeP_highP_stopTarg_eventPrescale.fcl +++ /dev/null @@ -1,2 +0,0 @@ -physics.filters.tprDePHighPStopTargEventPrescale.nPrescale : 1 -physics.filters.tprDePHighPStopTargEventPrescale.triggerFlag : ["PrescaleRandom"] diff --git a/Trigger/data/tprDeP_highP_stopTarg/main_tprDeP_highP_stopTarg_hsFilter.fcl b/Trigger/data/tprDeP_highP_stopTarg/main_tprDeP_highP_stopTarg_hsFilter.fcl deleted file mode 100644 index c3cbf54bd3..0000000000 --- a/Trigger/data/tprDeP_highP_stopTarg/main_tprDeP_highP_stopTarg_hsFilter.fcl +++ /dev/null @@ -1,17 +0,0 @@ -physics.filters.tprDePHighPStopTargHSFilter.requireCaloCluster : false -physics.filters.tprDePHighPStopTargHSFilter.doHelicityCheck : true -physics.filters.tprDePHighPStopTargHSFilter.helicity : -1 -physics.filters.tprDePHighPStopTargHSFilter.minNStrawHits : 15 -physics.filters.tprDePHighPStopTargHSFilter.minHitRatio : 0.4 -physics.filters.tprDePHighPStopTargHSFilter.minMomentum : 60.0 -physics.filters.tprDePHighPStopTargHSFilter.maxMomentum : 140.0 -physics.filters.tprDePHighPStopTargHSFilter.minPt : 0.0 -physics.filters.tprDePHighPStopTargHSFilter.maxChi2XY : 8.0 -physics.filters.tprDePHighPStopTargHSFilter.maxChi2PhiZ : 8.0 -physics.filters.tprDePHighPStopTargHSFilter.maxD0 : 300.0 -physics.filters.tprDePHighPStopTargHSFilter.minD0 : -150.0 -physics.filters.tprDePHighPStopTargHSFilter.minAbsLambda : 100.0 -physics.filters.tprDePHighPStopTargHSFilter.maxAbsLambda : 330.0 -physics.filters.tprDePHighPStopTargHSFilter.minNLoops : 0 -physics.filters.tprDePHighPStopTargHSFilter.maxNLoops : 30 -physics.filters.tprDePHighPStopTargHSFilter.prescaleUsingD0Phi : false diff --git a/Trigger/data/tprDeP_highP_stopTarg/main_tprDeP_highP_stopTarg_tcFilter.fcl b/Trigger/data/tprDeP_highP_stopTarg/main_tprDeP_highP_stopTarg_tcFilter.fcl deleted file mode 100644 index 72de15ecde..0000000000 --- a/Trigger/data/tprDeP_highP_stopTarg/main_tprDeP_highP_stopTarg_tcFilter.fcl +++ /dev/null @@ -1,2 +0,0 @@ -physics.filters.tprDePHighPStopTargTCFilter.requireCaloCluster : false -physics.filters.tprDePHighPStopTargTCFilter.minNStrawHits : 15 diff --git a/Trigger/data/tprDeP_highP_stopTarg/main_tprDeP_highP_stopTarg_tsFilter.fcl b/Trigger/data/tprDeP_highP_stopTarg/main_tprDeP_highP_stopTarg_tsFilter.fcl deleted file mode 100644 index 29bfe83f4d..0000000000 --- a/Trigger/data/tprDeP_highP_stopTarg/main_tprDeP_highP_stopTarg_tsFilter.fcl +++ /dev/null @@ -1,14 +0,0 @@ -physics.filters.tprDePHighPStopTargTSFilter.fitparticle : @local::Particle.eplus -physics.filters.tprDePHighPStopTargTSFilter.fitdirection : @local::FitDir.downstream -physics.filters.tprDePHighPStopTargTSFilter.minNStrawHits : 15 -physics.filters.tprDePHighPStopTargTSFilter.minMomentum : 70.0 -physics.filters.tprDePHighPStopTargTSFilter.maxMomentum : 110.0 -physics.filters.tprDePHighPStopTargTSFilter.maxChi2DOF : 20.0 -physics.filters.tprDePHighPStopTargTSFilter.maxMomErr : 10.0 -physics.filters.tprDePHighPStopTargTSFilter.minD0 : -200.0 -physics.filters.tprDePHighPStopTargTSFilter.maxD0 : 200.0 -physics.filters.tprDePHighPStopTargTSFilter.requireCaloCluster : false -physics.filters.tprDePHighPStopTargTSFilter.minT0 : 0. -physics.filters.tprDePHighPStopTargTSFilter.minFitCons : -1. -physics.filters.tprDePHighPStopTargTSFilter.minTanDip : 0. -physics.filters.tprDePHighPStopTargTSFilter.maxTanDip : 100. diff --git a/Trigger/data/tprDeP_lowP_stopTarg/main_tprDeP_lowP_stopTarg_eventPrescale.fcl b/Trigger/data/tprDeP_lowP_stopTarg/main_tprDeP_lowP_stopTarg_eventPrescale.fcl deleted file mode 100644 index fff68d493e..0000000000 --- a/Trigger/data/tprDeP_lowP_stopTarg/main_tprDeP_lowP_stopTarg_eventPrescale.fcl +++ /dev/null @@ -1,2 +0,0 @@ -physics.filters.tprDePLowPStopTargEventPrescale.nPrescale : 1 -physics.filters.tprDePLowPStopTargEventPrescale.triggerFlag : ["PrescaleRandom"] diff --git a/Trigger/data/tprDeP_lowP_stopTarg/main_tprDeP_lowP_stopTarg_hsFilter.fcl b/Trigger/data/tprDeP_lowP_stopTarg/main_tprDeP_lowP_stopTarg_hsFilter.fcl deleted file mode 100644 index 5dc1931a84..0000000000 --- a/Trigger/data/tprDeP_lowP_stopTarg/main_tprDeP_lowP_stopTarg_hsFilter.fcl +++ /dev/null @@ -1,17 +0,0 @@ -physics.filters.tprDePLowPStopTargHSFilter.requireCaloCluster : false -physics.filters.tprDePLowPStopTargHSFilter.doHelicityCheck : true -physics.filters.tprDePLowPStopTargHSFilter.helicity : -1 -physics.filters.tprDePLowPStopTargHSFilter.minNStrawHits : 15 -physics.filters.tprDePLowPStopTargHSFilter.minHitRatio : 0.4 -physics.filters.tprDePLowPStopTargHSFilter.minMomentum : 40.0 -physics.filters.tprDePLowPStopTargHSFilter.maxMomentum : 60.0 -physics.filters.tprDePLowPStopTargHSFilter.minPt : 0.0 -physics.filters.tprDePLowPStopTargHSFilter.maxChi2XY : 8.0 -physics.filters.tprDePLowPStopTargHSFilter.maxChi2PhiZ : 8.0 -physics.filters.tprDePLowPStopTargHSFilter.maxD0 : 300.0 -physics.filters.tprDePLowPStopTargHSFilter.minD0 : -150.0 -physics.filters.tprDePLowPStopTargHSFilter.minAbsLambda : 50.0 -physics.filters.tprDePLowPStopTargHSFilter.maxAbsLambda : 500.0 -physics.filters.tprDePLowPStopTargHSFilter.minNLoops : 0 -physics.filters.tprDePLowPStopTargHSFilter.maxNLoops : 30 -physics.filters.tprDePLowPStopTargHSFilter.prescaleUsingD0Phi : false diff --git a/Trigger/data/tprDeP_lowP_stopTarg/main_tprDeP_lowP_stopTarg_sdCountFilter.fcl b/Trigger/data/tprDeP_lowP_stopTarg/main_tprDeP_lowP_stopTarg_sdCountFilter.fcl deleted file mode 100644 index e60c652de5..0000000000 --- a/Trigger/data/tprDeP_lowP_stopTarg/main_tprDeP_lowP_stopTarg_sdCountFilter.fcl +++ /dev/null @@ -1,10 +0,0 @@ -physics.filters.tprDePLowPStopTargSDCountFilter.caloDigiCollection : notUsed -physics.filters.tprDePLowPStopTargSDCountFilter.useStrawDigi : true -physics.filters.tprDePLowPStopTargSDCountFilter.useCaloDigi : false -physics.filters.tprDePLowPStopTargSDCountFilter.minNStrawDigi : 10 -physics.filters.tprDePLowPStopTargSDCountFilter.maxNStrawDigi : 10000 -physics.filters.tprDePLowPStopTargSDCountFilter.minNCaloDigi : -1 -physics.filters.tprDePLowPStopTargSDCountFilter.maxNCaloDigi : -1 -physics.filters.tprDePLowPStopTargSDCountFilter.maxCaloEnergy : -1 - - diff --git a/Trigger/data/tprDeP_lowP_stopTarg/main_tprDeP_lowP_stopTarg_tcFilter.fcl b/Trigger/data/tprDeP_lowP_stopTarg/main_tprDeP_lowP_stopTarg_tcFilter.fcl deleted file mode 100644 index 1e7955b14a..0000000000 --- a/Trigger/data/tprDeP_lowP_stopTarg/main_tprDeP_lowP_stopTarg_tcFilter.fcl +++ /dev/null @@ -1,2 +0,0 @@ -physics.filters.tprDePLowPStopTargTCFilter.requireCaloCluster : false -physics.filters.tprDePLowPStopTargTCFilter.minNStrawHits : 15 diff --git a/Trigger/data/tprDeP_lowP_stopTarg/main_tprDeP_lowP_stopTarg_tsFilter.fcl b/Trigger/data/tprDeP_lowP_stopTarg/main_tprDeP_lowP_stopTarg_tsFilter.fcl deleted file mode 100644 index e9320b072f..0000000000 --- a/Trigger/data/tprDeP_lowP_stopTarg/main_tprDeP_lowP_stopTarg_tsFilter.fcl +++ /dev/null @@ -1,14 +0,0 @@ -physics.filters.tprDePLowPStopTargTSFilter.fitparticle : @local::Particle.eplus -physics.filters.tprDePLowPStopTargTSFilter.fitdirection : @local::FitDir.downstream -physics.filters.tprDePLowPStopTargTSFilter.minNStrawHits : 15 -physics.filters.tprDePLowPStopTargTSFilter.minMomentum : 50.0 -physics.filters.tprDePLowPStopTargTSFilter.maxMomentum : 70.0 -physics.filters.tprDePLowPStopTargTSFilter.maxChi2DOF : 20.0 -physics.filters.tprDePLowPStopTargTSFilter.maxMomErr : 10.0 -physics.filters.tprDePLowPStopTargTSFilter.minD0 : -200.0 -physics.filters.tprDePLowPStopTargTSFilter.maxD0 : 200.0 -physics.filters.tprDePLowPStopTargTSFilter.requireCaloCluster : false -physics.filters.tprDePLowPStopTargTSFilter.minT0 : 0. -physics.filters.tprDePLowPStopTargTSFilter.minFitCons : -1. -physics.filters.tprDePLowPStopTargTSFilter.minTanDip : 0. -physics.filters.tprDePLowPStopTargTSFilter.maxTanDip : 100. diff --git a/Trigger/data/tprHelixDeM/main_tprHelixDeM_eventPrescale.fcl b/Trigger/data/tprHelixDeM/main_tprHelixDeM_eventPrescale.fcl deleted file mode 100644 index 82f82f6856..0000000000 --- a/Trigger/data/tprHelixDeM/main_tprHelixDeM_eventPrescale.fcl +++ /dev/null @@ -1,2 +0,0 @@ -physics.filters.tprHelixDeMEventPrescale.nPrescale : 1 -physics.filters.tprHelixDeMEventPrescale.triggerFlag : ["PrescaleRandom"] diff --git a/Trigger/data/tprHelixDeM/main_tprHelixDeM_hsFilter.fcl b/Trigger/data/tprHelixDeM/main_tprHelixDeM_hsFilter.fcl deleted file mode 100644 index c27657ce34..0000000000 --- a/Trigger/data/tprHelixDeM/main_tprHelixDeM_hsFilter.fcl +++ /dev/null @@ -1,17 +0,0 @@ -physics.filters.tprHelixDeMHSFilter.requireCaloCluster : false -physics.filters.tprHelixDeMHSFilter.doHelicityCheck : true -physics.filters.tprHelixDeMHSFilter.helicity : 1 -physics.filters.tprHelixDeMHSFilter.minNStrawHits : 15 -physics.filters.tprHelixDeMHSFilter.minHitRatio : 0.4 -physics.filters.tprHelixDeMHSFilter.minMomentum : 50.0 -physics.filters.tprHelixDeMHSFilter.maxMomentum : 300.0 -physics.filters.tprHelixDeMHSFilter.minPt : 0.0 -physics.filters.tprHelixDeMHSFilter.maxChi2XY : 8.0 -physics.filters.tprHelixDeMHSFilter.maxChi2PhiZ : 8.0 -physics.filters.tprHelixDeMHSFilter.maxD0 : 600.0 -physics.filters.tprHelixDeMHSFilter.minD0 : -600.0 -physics.filters.tprHelixDeMHSFilter.minAbsLambda : 50.0 -physics.filters.tprHelixDeMHSFilter.maxAbsLambda : 1000.0 -physics.filters.tprHelixDeMHSFilter.minNLoops : 0 -physics.filters.tprHelixDeMHSFilter.maxNLoops : 30 -physics.filters.tprHelixDeMHSFilter.prescaleUsingD0Phi : false diff --git a/Trigger/data/tprHelixDeM/main_tprHelixDeM_sdCountFilter.fcl b/Trigger/data/tprHelixDeM/main_tprHelixDeM_sdCountFilter.fcl deleted file mode 100644 index 534015e05e..0000000000 --- a/Trigger/data/tprHelixDeM/main_tprHelixDeM_sdCountFilter.fcl +++ /dev/null @@ -1,9 +0,0 @@ -physics.filters.tprHelixDeMSDCountFilter.caloDigiCollection : notUsed -physics.filters.tprHelixDeMSDCountFilter.useStrawDigi : true -physics.filters.tprHelixDeMSDCountFilter.useCaloDigi : false -physics.filters.tprHelixDeMSDCountFilter.minNStrawDigi : 10 -physics.filters.tprHelixDeMSDCountFilter.maxNStrawDigi : 10000 -physics.filters.tprHelixDeMSDCountFilter.minNCaloDigi : -1 -physics.filters.tprHelixDeMSDCountFilter.maxNCaloDigi : -1 -physics.filters.tprHelixDeMSDCountFilter.maxCaloEnergy : -1 - diff --git a/Trigger/data/tprHelixDeM/main_tprHelixDeM_tcFilter.fcl b/Trigger/data/tprHelixDeM/main_tprHelixDeM_tcFilter.fcl deleted file mode 100644 index d66f940eeb..0000000000 --- a/Trigger/data/tprHelixDeM/main_tprHelixDeM_tcFilter.fcl +++ /dev/null @@ -1,2 +0,0 @@ -physics.filters.tprHelixDeMTCFilter.requireCaloCluster : false -physics.filters.tprHelixDeMTCFilter.minNStrawHits : 15 diff --git a/Trigger/data/tprHelixDeM_ipa/main_tprHelixDeM_ipa_eventPrescale.fcl b/Trigger/data/tprHelixDeM_ipa/main_tprHelixDeM_ipa_eventPrescale.fcl deleted file mode 100644 index aa5e9506b5..0000000000 --- a/Trigger/data/tprHelixDeM_ipa/main_tprHelixDeM_ipa_eventPrescale.fcl +++ /dev/null @@ -1,2 +0,0 @@ -physics.filters.tprHelixDeMIpaEventPrescale.nPrescale : 1000 - diff --git a/Trigger/data/tprHelixDeM_ipa/main_tprHelixDeM_ipa_hsFilter.fcl b/Trigger/data/tprHelixDeM_ipa/main_tprHelixDeM_ipa_hsFilter.fcl deleted file mode 100644 index dbee2aca91..0000000000 --- a/Trigger/data/tprHelixDeM_ipa/main_tprHelixDeM_ipa_hsFilter.fcl +++ /dev/null @@ -1,17 +0,0 @@ -physics.filters.tprHelixDeMIpaHSFilter.requireCaloCluster : false -physics.filters.tprHelixDeMIpaHSFilter.doHelicityCheck : true -physics.filters.tprHelixDeMIpaHSFilter.helicity : 1 -physics.filters.tprHelixDeMIpaHSFilter.minNStrawHits : 15 -physics.filters.tprHelixDeMIpaHSFilter.minHitRatio : 0.5 -physics.filters.tprHelixDeMIpaHSFilter.minMomentum : 30. -physics.filters.tprHelixDeMIpaHSFilter.maxMomentum : 70. -physics.filters.tprHelixDeMIpaHSFilter.minPt : 0 -physics.filters.tprHelixDeMIpaHSFilter.maxChi2XY : 8. -physics.filters.tprHelixDeMIpaHSFilter.maxChi2PhiZ : 8. -physics.filters.tprHelixDeMIpaHSFilter.maxD0 : 500. -physics.filters.tprHelixDeMIpaHSFilter.minD0 : 200. -physics.filters.tprHelixDeMIpaHSFilter.minAbsLambda : 40. -physics.filters.tprHelixDeMIpaHSFilter.maxAbsLambda : 500. -physics.filters.tprHelixDeMIpaHSFilter.minNLoops : 0 -physics.filters.tprHelixDeMIpaHSFilter.maxNLoops : 30 -physics.filters.tprHelixDeMIpaHSFilter.prescaleUsingD0Phi : false diff --git a/Trigger/data/tprHelixDeM_ipa/main_tprHelixDeM_ipa_sdCountFilter.fcl b/Trigger/data/tprHelixDeM_ipa/main_tprHelixDeM_ipa_sdCountFilter.fcl deleted file mode 100644 index 19dc1e1e04..0000000000 --- a/Trigger/data/tprHelixDeM_ipa/main_tprHelixDeM_ipa_sdCountFilter.fcl +++ /dev/null @@ -1,9 +0,0 @@ -physics.filters.tprHelixDeMIpaSDCountFilter.caloDigiCollection : notUsed -physics.filters.tprHelixDeMIpaSDCountFilter.useStrawDigi : true -physics.filters.tprHelixDeMIpaSDCountFilter.useCaloDigi : false -physics.filters.tprHelixDeMIpaSDCountFilter.minNStrawDigi : 10 -physics.filters.tprHelixDeMIpaSDCountFilter.maxNStrawDigi : 10000 -physics.filters.tprHelixDeMIpaSDCountFilter.minNCaloDigi : -1 -physics.filters.tprHelixDeMIpaSDCountFilter.maxNCaloDigi : -1 -physics.filters.tprHelixDeMIpaSDCountFilter.maxCaloEnergy : -1 - diff --git a/Trigger/data/tprHelixDeM_ipa/main_tprHelixDeM_ipa_tcFilter.fcl b/Trigger/data/tprHelixDeM_ipa/main_tprHelixDeM_ipa_tcFilter.fcl deleted file mode 100644 index 7d01f686b9..0000000000 --- a/Trigger/data/tprHelixDeM_ipa/main_tprHelixDeM_ipa_tcFilter.fcl +++ /dev/null @@ -1,2 +0,0 @@ -physics.filters.tprHelixDeMIpaTCFilter.requireCaloCluster : false -physics.filters.tprHelixDeMIpaTCFilter.minNStrawHits : 15 diff --git a/Trigger/data/tprHelixDeM_ipa_phiScaled/main_tprHelixDeM_ipa_phiScaled_eventPrescale.fcl b/Trigger/data/tprHelixDeM_ipa_phiScaled/main_tprHelixDeM_ipa_phiScaled_eventPrescale.fcl deleted file mode 100644 index 5b493f7764..0000000000 --- a/Trigger/data/tprHelixDeM_ipa_phiScaled/main_tprHelixDeM_ipa_phiScaled_eventPrescale.fcl +++ /dev/null @@ -1,2 +0,0 @@ -physics.filters.tprHelixDeMIpaPhiScaledEventPrescale.nPrescale : 1000 - diff --git a/Trigger/data/tprHelixDeM_ipa_phiScaled/main_tprHelixDeM_ipa_phiScaled_hsFilter.fcl b/Trigger/data/tprHelixDeM_ipa_phiScaled/main_tprHelixDeM_ipa_phiScaled_hsFilter.fcl deleted file mode 100644 index b1f9e30fdd..0000000000 --- a/Trigger/data/tprHelixDeM_ipa_phiScaled/main_tprHelixDeM_ipa_phiScaled_hsFilter.fcl +++ /dev/null @@ -1,19 +0,0 @@ -physics.filters.tprHelixDeMIpaPhiScaledHSFilter.requireCaloCluster : false -physics.filters.tprHelixDeMIpaPhiScaledHSFilter.doHelicityCheck : true -physics.filters.tprHelixDeMIpaPhiScaledHSFilter.helicity : 1 -physics.filters.tprHelixDeMIpaPhiScaledHSFilter.minNStrawHits : 15 -physics.filters.tprHelixDeMIpaPhiScaledHSFilter.minHitRatio : 0.5 -physics.filters.tprHelixDeMIpaPhiScaledHSFilter.minMomentum : 30. -physics.filters.tprHelixDeMIpaPhiScaledHSFilter.maxMomentum : 70. -physics.filters.tprHelixDeMIpaPhiScaledHSFilter.minPt : 0 -physics.filters.tprHelixDeMIpaPhiScaledHSFilter.maxChi2XY : 8. -physics.filters.tprHelixDeMIpaPhiScaledHSFilter.maxChi2PhiZ : 8. -physics.filters.tprHelixDeMIpaPhiScaledHSFilter.maxD0 : 500. -physics.filters.tprHelixDeMIpaPhiScaledHSFilter.minD0 : 200. -physics.filters.tprHelixDeMIpaPhiScaledHSFilter.minAbsLambda : 40. -physics.filters.tprHelixDeMIpaPhiScaledHSFilter.maxAbsLambda : 500. -physics.filters.tprHelixDeMIpaPhiScaledHSFilter.minNLoops : 0 -physics.filters.tprHelixDeMIpaPhiScaledHSFilter.maxNLoops : 30 -physics.filters.tprHelixDeMIpaPhiScaledHSFilter.prescaleUsingD0Phi : true -physics.filters.tprHelixDeMIpaPhiScaledHSFilter.prescalerPar : { amplitude: 6.2 frequency : 0.9675 phase : 0.1396} - diff --git a/Trigger/data/tprHelixDeM_ipa_phiScaled/main_tprHelixDeM_ipa_phiScaled_sdCountFilter.fcl b/Trigger/data/tprHelixDeM_ipa_phiScaled/main_tprHelixDeM_ipa_phiScaled_sdCountFilter.fcl deleted file mode 100644 index d98ea1294d..0000000000 --- a/Trigger/data/tprHelixDeM_ipa_phiScaled/main_tprHelixDeM_ipa_phiScaled_sdCountFilter.fcl +++ /dev/null @@ -1,9 +0,0 @@ -physics.filters.tprHelixIPAPhi0ScaledDeMsdCountFilter.caloDigiCollection : notUsed -physics.filters.tprHelixIPAPhi0ScaledDeMsdCountFilter.useStrawDigi : true -physics.filters.tprHelixIPAPhi0ScaledDeMsdCountFilter.useCaloDigi : false -physics.filters.tprHelixIPAPhi0ScaledDeMsdCountFilter.minNStrawDigi : 10 -physics.filters.tprHelixIPAPhi0ScaledDeMsdCountFilter.maxNStrawDigi : 10000 -physics.filters.tprHelixIPAPhi0ScaledDeMsdCountFilter.minNCaloDigi : -1 -physics.filters.tprHelixIPAPhi0ScaledDeMsdCountFilter.maxNCaloDigi : -1 -physics.filters.tprHelixIPAPhi0ScaledDeMsdCountFilter.maxCaloEnergy : -1 - diff --git a/Trigger/data/tprHelixDeM_ipa_phiScaled/main_tprHelixDeM_ipa_phiScaled_tcFilter.fcl b/Trigger/data/tprHelixDeM_ipa_phiScaled/main_tprHelixDeM_ipa_phiScaled_tcFilter.fcl deleted file mode 100644 index c057d92106..0000000000 --- a/Trigger/data/tprHelixDeM_ipa_phiScaled/main_tprHelixDeM_ipa_phiScaled_tcFilter.fcl +++ /dev/null @@ -1,2 +0,0 @@ -physics.filters.tprHelixDeMIpaPhiScaledTCFilter.requireCaloCluster : false -physics.filters.tprHelixDeMIpaPhiScaledTCFilter.minNStrawHits : 15 diff --git a/Trigger/data/tprHelixDeP/main_tprHelixDeP_eventPrescale.fcl b/Trigger/data/tprHelixDeP/main_tprHelixDeP_eventPrescale.fcl deleted file mode 100644 index 1262752bac..0000000000 --- a/Trigger/data/tprHelixDeP/main_tprHelixDeP_eventPrescale.fcl +++ /dev/null @@ -1,2 +0,0 @@ -physics.filters.tprHelixDePEventPrescale.nPrescale : 1 -physics.filters.tprHelixDePEventPrescale.triggerFlag : ["PrescaleRandom"] diff --git a/Trigger/data/tprHelixDeP/main_tprHelixDeP_hsFilter.fcl b/Trigger/data/tprHelixDeP/main_tprHelixDeP_hsFilter.fcl deleted file mode 100644 index 111d7c6dc9..0000000000 --- a/Trigger/data/tprHelixDeP/main_tprHelixDeP_hsFilter.fcl +++ /dev/null @@ -1,17 +0,0 @@ -physics.filters.tprHelixDePHSFilter.requireCaloCluster : false -physics.filters.tprHelixDePHSFilter.doHelicityCheck : true -physics.filters.tprHelixDePHSFilter.helicity : -1 -physics.filters.tprHelixDePHSFilter.minNStrawHits : 15 -physics.filters.tprHelixDePHSFilter.minHitRatio : 0.5 -physics.filters.tprHelixDePHSFilter.minMomentum : 70.0 -physics.filters.tprHelixDePHSFilter.maxMomentum : 300.0 -physics.filters.tprHelixDePHSFilter.minPt : 0.0 -physics.filters.tprHelixDePHSFilter.maxChi2XY : 8.0 -physics.filters.tprHelixDePHSFilter.maxChi2PhiZ : 8.0 -physics.filters.tprHelixDePHSFilter.maxD0 : 800.0 -physics.filters.tprHelixDePHSFilter.minD0 : -800.0 -physics.filters.tprHelixDePHSFilter.minAbsLambda : 50.0 -physics.filters.tprHelixDePHSFilter.maxAbsLambda : 1000.0 -physics.filters.tprHelixDePHSFilter.minNLoops : 0 -physics.filters.tprHelixDePHSFilter.maxNLoops : 30 -physics.filters.tprHelixDePHSFilter.prescaleUsingD0Phi : false diff --git a/Trigger/data/tprHelixDeP/main_tprHelixDeP_sdCountFilter.fcl b/Trigger/data/tprHelixDeP/main_tprHelixDeP_sdCountFilter.fcl deleted file mode 100644 index 918a34a67a..0000000000 --- a/Trigger/data/tprHelixDeP/main_tprHelixDeP_sdCountFilter.fcl +++ /dev/null @@ -1,9 +0,0 @@ -physics.filters.tprHelixDePSDCountFilter.caloDigiCollection : notUsed -physics.filters.tprHelixDePSDCountFilter.useStrawDigi : true -physics.filters.tprHelixDePSDCountFilter.useCaloDigi : false -physics.filters.tprHelixDePSDCountFilter.minNStrawDigi : 10 -physics.filters.tprHelixDePSDCountFilter.maxNStrawDigi : 10000 -physics.filters.tprHelixDePSDCountFilter.minNCaloDigi : -1 -physics.filters.tprHelixDePSDCountFilter.maxNCaloDigi : -1 -physics.filters.tprHelixDePSDCountFilter.maxCaloEnergy : -1 - diff --git a/Trigger/data/tprHelixDeP/main_tprHelixDeP_tcFilter.fcl b/Trigger/data/tprHelixDeP/main_tprHelixDeP_tcFilter.fcl deleted file mode 100644 index 9d3967c700..0000000000 --- a/Trigger/data/tprHelixDeP/main_tprHelixDeP_tcFilter.fcl +++ /dev/null @@ -1,2 +0,0 @@ -physics.filters.tprHelixDePTCFilter.requireCaloCluster : false -physics.filters.tprHelixDePTCFilter.minNStrawHits : 15 diff --git a/Trigger/data/tprHelixUeM/main_tprHelixUeM_eventPrescale.fcl b/Trigger/data/tprHelixUeM/main_tprHelixUeM_eventPrescale.fcl deleted file mode 100644 index 9cbb75a665..0000000000 --- a/Trigger/data/tprHelixUeM/main_tprHelixUeM_eventPrescale.fcl +++ /dev/null @@ -1,2 +0,0 @@ -physics.filters.tprHelixUeMEventPrescale.nPrescale : 1 -physics.filters.tprHelixUeMEventPrescale.triggerFlag : ["PrescaleRandom"] diff --git a/Trigger/data/tprHelixUeM/main_tprHelixUeM_hsFilter.fcl b/Trigger/data/tprHelixUeM/main_tprHelixUeM_hsFilter.fcl deleted file mode 100644 index 64c87f1d1f..0000000000 --- a/Trigger/data/tprHelixUeM/main_tprHelixUeM_hsFilter.fcl +++ /dev/null @@ -1,17 +0,0 @@ -physics.filters.tprHelixUeMHSFilter.requireCaloCluster : false -physics.filters.tprHelixUeMHSFilter.doHelicityCheck : true -physics.filters.tprHelixUeMHSFilter.helicity : -1 -physics.filters.tprHelixUeMHSFilter.minNStrawHits : 15 -physics.filters.tprHelixUeMHSFilter.minHitRatio : 0.4 -physics.filters.tprHelixUeMHSFilter.minMomentum : 30.0 -physics.filters.tprHelixUeMHSFilter.maxMomentum : 300.0 -physics.filters.tprHelixUeMHSFilter.minPt : 0.0 -physics.filters.tprHelixUeMHSFilter.maxChi2XY : 8.0 -physics.filters.tprHelixUeMHSFilter.maxChi2PhiZ : 8.0 -physics.filters.tprHelixUeMHSFilter.maxD0 : 800.0 -physics.filters.tprHelixUeMHSFilter.minD0 : -800.0 -physics.filters.tprHelixUeMHSFilter.minAbsLambda : 50.0 -physics.filters.tprHelixUeMHSFilter.maxAbsLambda : 1000.0 -physics.filters.tprHelixUeMHSFilter.minNLoops : 0 -physics.filters.tprHelixUeMHSFilter.maxNLoops : 30 -physics.filters.tprHelixUeMHSFilter.prescaleUsingD0Phi : false diff --git a/Trigger/data/tprHelixUeM/main_tprHelixUeM_sdCountFilter.fcl b/Trigger/data/tprHelixUeM/main_tprHelixUeM_sdCountFilter.fcl deleted file mode 100644 index f7b6c9bce1..0000000000 --- a/Trigger/data/tprHelixUeM/main_tprHelixUeM_sdCountFilter.fcl +++ /dev/null @@ -1,9 +0,0 @@ -physics.filters.tprHelixUeMSDCountFilter.caloDigiCollection : notUsed -physics.filters.tprHelixUeMSDCountFilter.useStrawDigi : true -physics.filters.tprHelixUeMSDCountFilter.useCaloDigi : false -physics.filters.tprHelixUeMSDCountFilter.minNStrawDigi : 10 -physics.filters.tprHelixUeMSDCountFilter.maxNStrawDigi : 10000 -physics.filters.tprHelixUeMSDCountFilter.minNCaloDigi : -1 -physics.filters.tprHelixUeMSDCountFilter.maxNCaloDigi : -1 -physics.filters.tprHelixUeMSDCountFilter.maxCaloEnergy : -1 - diff --git a/Trigger/data/tprHelixUeM/main_tprHelixUeM_tcFilter.fcl b/Trigger/data/tprHelixUeM/main_tprHelixUeM_tcFilter.fcl deleted file mode 100644 index 201ab6a188..0000000000 --- a/Trigger/data/tprHelixUeM/main_tprHelixUeM_tcFilter.fcl +++ /dev/null @@ -1,2 +0,0 @@ -physics.filters.tprHelixUeMTCFilter.requireCaloCluster : false -physics.filters.tprHelixUeMTCFilter.minNStrawHits : 15 diff --git a/Trigger/data/tprHelixUeP/main_tprHelixUeP_eventPrescale.fcl b/Trigger/data/tprHelixUeP/main_tprHelixUeP_eventPrescale.fcl deleted file mode 100644 index 069aa15e09..0000000000 --- a/Trigger/data/tprHelixUeP/main_tprHelixUeP_eventPrescale.fcl +++ /dev/null @@ -1,2 +0,0 @@ -physics.filters.tprHelixUePEventPrescale.nPrescale : 1 -physics.filters.tprHelixUePEventPrescale.triggerFlag : ["PrescaleRandom"] diff --git a/Trigger/data/tprHelixUeP/main_tprHelixUeP_hsFilter.fcl b/Trigger/data/tprHelixUeP/main_tprHelixUeP_hsFilter.fcl deleted file mode 100644 index 621cff989f..0000000000 --- a/Trigger/data/tprHelixUeP/main_tprHelixUeP_hsFilter.fcl +++ /dev/null @@ -1,17 +0,0 @@ -physics.filters.tprHelixUePHSFilter.requireCaloCluster : false -physics.filters.tprHelixUePHSFilter.doHelicityCheck : true -physics.filters.tprHelixUePHSFilter.helicity : 1 -physics.filters.tprHelixUePHSFilter.minNStrawHits : 15 -physics.filters.tprHelixUePHSFilter.minHitRatio : 0.4 -physics.filters.tprHelixUePHSFilter.minMomentum : 50.0 -physics.filters.tprHelixUePHSFilter.maxMomentum : 300.0 -physics.filters.tprHelixUePHSFilter.minPt : 0.0 -physics.filters.tprHelixUePHSFilter.maxChi2XY : 8.0 -physics.filters.tprHelixUePHSFilter.maxChi2PhiZ : 8.0 -physics.filters.tprHelixUePHSFilter.maxD0 : 800.0 -physics.filters.tprHelixUePHSFilter.minD0 : -800.0 -physics.filters.tprHelixUePHSFilter.minAbsLambda : 50.0 -physics.filters.tprHelixUePHSFilter.maxAbsLambda : 1000.0 -physics.filters.tprHelixUePHSFilter.minNLoops : 0 -physics.filters.tprHelixUePHSFilter.maxNLoops : 30 -physics.filters.tprHelixUePHSFilter.prescaleUsingD0Phi : false diff --git a/Trigger/data/tprHelixUeP/main_tprHelixUeP_sdCountFilter.fcl b/Trigger/data/tprHelixUeP/main_tprHelixUeP_sdCountFilter.fcl deleted file mode 100644 index bdb4c4ca20..0000000000 --- a/Trigger/data/tprHelixUeP/main_tprHelixUeP_sdCountFilter.fcl +++ /dev/null @@ -1,9 +0,0 @@ -physics.filters.tprHelixUePSDCountFilter.caloDigiCollection : notUsed -physics.filters.tprHelixUePSDCountFilter.useStrawDigi : true -physics.filters.tprHelixUePSDCountFilter.useCaloDigi : false -physics.filters.tprHelixUePSDCountFilter.minNStrawDigi : 10 -physics.filters.tprHelixUePSDCountFilter.maxNStrawDigi : 10000 -physics.filters.tprHelixUePSDCountFilter.minNCaloDigi : -1 -physics.filters.tprHelixUePSDCountFilter.maxNCaloDigi : -1 -physics.filters.tprHelixUePSDCountFilter.maxCaloEnergy : -1 - diff --git a/Trigger/data/tprHelixUeP/main_tprHelixUeP_tcFilter.fcl b/Trigger/data/tprHelixUeP/main_tprHelixUeP_tcFilter.fcl deleted file mode 100644 index f07e52a23f..0000000000 --- a/Trigger/data/tprHelixUeP/main_tprHelixUeP_tcFilter.fcl +++ /dev/null @@ -1,2 +0,0 @@ -physics.filters.tprHelixUePTCFilter.requireCaloCluster : false -physics.filters.tprHelixUePTCFilter.minNStrawHits : 15 diff --git a/Trigger/data/trkAll.config b/Trigger/data/trkAll.config deleted file mode 100644 index 38a0b97e6c..0000000000 --- a/Trigger/data/trkAll.config +++ /dev/null @@ -1,5 +0,0 @@ -tprSeedDeM -tprSeedDeP -cprSeedDeM -cprSeedDeP -tprHelixIPADeM diff --git a/Trigger/data/unbiased/main_unbiasedEventPrescale.fcl b/Trigger/data/unbiased/main_unbiasedEventPrescale.fcl deleted file mode 100644 index 1462b47d86..0000000000 --- a/Trigger/data/unbiased/main_unbiasedEventPrescale.fcl +++ /dev/null @@ -1,3 +0,0 @@ -physics.filters.unbiasedEventPrescale.nPrescale : 10000 -physics.filters.unbiasedEventPrescale.useFilteredEvents : true -physics.filters.unbiasedEventPrescale.triggerFlag : ["PrescaleRandom"] diff --git a/Trigger/python/SConscript b/Trigger/python/SConscript deleted file mode 100644 index 5303669fe3..0000000000 --- a/Trigger/python/SConscript +++ /dev/null @@ -1,33 +0,0 @@ -#!/usr/bin/env python -# -# Original author Rob Kutschke. -# - -# prevent creating pycache in repo area -import sys -wrtSave = sys.dont_write_bytecode -sys.dont_write_bytecode = True - -import os -Import('env') - -Import('mu2e_helper') -helper = mu2e_helper(env) - -# this python code generates Trigger fcl in gen/fcl/Trigger -import genTriggerFcl - -sys.dont_write_bytecode = wrtSave - -# run like this, it just generates the source and target file listss -menus=["OnSpillTrigMenu","OffSpillTrigMenu","ExtrPosTrigMenu"] -for m in menus: - sources,targets,command = genTriggerFcl.generate(m, False, False) - # this schedules it to run again to make the files - helper.make_generic(sources,targets,command+" -c "+m) - - -# this tells emacs to view this file in python mode. -# Local Variables: -# mode:python -# End: diff --git a/Trigger/python/genTriggerFcl.py b/Trigger/python/genTriggerFcl.py deleted file mode 100755 index 5aa4b10999..0000000000 --- a/Trigger/python/genTriggerFcl.py +++ /dev/null @@ -1,374 +0,0 @@ -#!/usr/bin/env python -################################################################################ -# HOW RUN THE TRIGGER-FCL GENERATOR SCRIPT # -#------------------------------------------------------------------------------# -# -# Trigger/python/genTriggerFcl.py -c Trigger/data/allPaths.config -# or just -# Trigger/python/genTriggerFcl.py -c allPaths -# - -import re -import sys -import string -import os -import shutil -from shutil import copyfile - -from argparse import ArgumentParser - -from codecs import open - -def capitalize(word): - if not word: - return word - nLetters=1 - nn = word[0].upper() - if word[0:2] == 'sd' or word[0:2] == 'cd' or word[0:2] == 'hs' or word[0:2] == 'tc' or word[0:2] == 'ts': - nLetters=2 - nn = word[0].upper() + word[1].upper() - return nn + word[nLetters:] - -# -# process one subdirectory (one path) -# - -def appendEpilog(trig_path, relProjectDir, outDir, srcDir, verbose, doWrite, sourceFiles, targetFiles): - - trk_filters = ['eventPrescale','tcFilter', 'hsFilter', 'tsFilter'] - helix_filters = ['eventPrescale','tcFilter', 'hsFilter'] - tc_filters = ['eventPrescale','tcFilter'] - calo_filters = ['eventPrescale','filter' ] - unbiased_filters = ['eventPrescale'] - minbias_filters = ['eventPrescale','filter' ] - cst_filters = ['eventPrescale','tcFilter', 'tsFilter'] - - filters = [] - - #understand which kind of trigger path are we dealing with - if trig_path == 'cst': - filters = cst_filters - elif "cprDe" in trig_path or 'tprDe' in trig_path: - filters = trk_filters - elif "Helix" in trig_path: - filters = helix_filters - elif "TimeCluster" in trig_path: - filters = tc_filters - elif "caloFast" in trig_path: - filters = calo_filters - elif "unbiased" in trig_path: - filters = unbiased_filters - elif "minBias" in trig_path: - filters = minbias_filters - - if len(filters) == 0 : - print("ERROR: path {} has no associated filters".format(trig_path)) - exit(1) - - #create the sub-epilog file - subEpilogDirName = outDir+relProjectDir + "/" + trig_path - relSubEpilogDirName = relProjectDir + "/" + trig_path - - if verbose : - print("Creating directory {}".format(subEpilogDirName)) - if doWrite : - if not os.path.exists(subEpilogDirName) : - os.makedirs(subEpilogDirName) - - subEpilogName = subEpilogDirName + ".fcl" - relSubEpilogName = relSubEpilogDirName + ".fcl" - if verbose : - print("Creating {}".format(subEpilogName)) - if doWrite : - subEpilogFile = open(subEpilogName,"w") - targetFiles.append(subEpilogName) - - for filter in filters : - filterName = trig_path+"_"+filter - - subSubEpilogInputFileName = srcDir+"Trigger/data/" + trig_path + "/main_"+ filterName + '.fcl' - sourceFiles.append(subSubEpilogInputFileName) - subSubEpilogFileName = subEpilogDirName + "/main_"+ filterName + '.fcl' - relSubSubEpilogFileName = relSubEpilogDirName + "/main_"+ filterName + '.fcl' - targetFiles.append(subSubEpilogFileName) - if verbose: - print("Creating {}".format(subSubEpilogFileName)) - - # first copy the fcl file - if doWrite : - shutil.copy(subSubEpilogInputFileName,subEpilogDirName) - - # then open it and append one line - if doWrite : - subSubEpilogFile = open(subSubEpilogFileName,"a") - if doWrite : - subSubEpilogFile.close() - - epilog=("\n#include \"Offline/"+relSubSubEpilogFileName +"\"") - - if doWrite : - subEpilogFile.write(epilog) - - #now create the instance for the TriggerInfo Merger - if doWrite : - trig_path_nu = "" - for n in trig_path.split("_"): - if n == trig_path.split("_")[0]: - trig_path_nu += n - else: - trig_path_nu += capitalize(n) - trigInfoMergerName = trig_path_nu + "TriggerInfoMerger" - subSubEpilogMergerFileName = subEpilogDirName + "/main_" + trigInfoMergerName + '.fcl' - if verbose: - print("Creating {}".format(subSubEpilogMergerFileName)) - subSubEpilogMergerFile = open(subSubEpilogMergerFileName,"w+") - subSubEpilogMergerFile.write("physics.producers."+trigInfoMergerName+" : { module_type : MergeTriggerInfo }"); - subSubEpilogMergerFile.close(); - - relSubSubEpilogFileName = relSubEpilogDirName + "/main_"+ trigInfoMergerName + '.fcl' - epilog=("\n#include \"Offline/"+relSubSubEpilogFileName +"\"") - - subEpilogFile.write(epilog) - subEpilogFile.close() - - # return a line to be added to the main epilog file - # so it can include the files we just wrote - subEpilogInclude=("\n#include \"Offline/"+relSubEpilogName+"\"") - - return subEpilogInclude - -# -# routine that drives the fcl generation -# -# returns the list of files input and output, for use in scons -# - -def generate(configFileText="allPaths", verbose=True, doWrite=True): - - if verbose : - print("configFileText = ",configFileText) - print("doWrite = ",doWrite) - - # when we run from SConscript to create the targets, - # we are in the subdir. When running in Offline scons, we are in Offline, - # when in Muse, we are in Offline parent dir - # This code makes this always run in the scons default dir, either - # Offline or its parent dir - srcDir="" - outDir="" - owd = os.getcwd() - if verbose: - print ("start owd= ",owd) - if 'MUSE_WORK_DIR' in os.environ: - # then we are running in Muse, make adjustments - if verbose: - print ("running in Muse mode ") - os.chdir(os.environ['MUSE_WORK_DIR']) - srcDir = "Offline/" - # like "build/sl7-prof-e20/Offline/" - outDir = os.environ['MUSE_BUILD_BASE']+"/Offline/" - else: - # when we run from SConscript, the owd is the python subdir - # but all file name are relative to Offline, so go there - words = owd.split("/") - if words[-1] == "python" : - os.chdir("../..") - # accept empty default srcDir and outDir, so build in Offline - - if verbose: - print ("owd = ",owd) - print ("pwd = ",os.getcwd()) - print ("srcDir = ",srcDir) - print ("outDir = ",outDir) - - # lists of files to send to scons for dependencies - sourceFiles = [] - targetFiles = [] - - # allow "Trigger/data/allPaths.config" or "allPaths.config" or "allPaths" - tempArr = configFileText.split("/") - if len(tempArr) > 1: - temp = "/".join (tempArr[:-1]) - if temp != "Trigger/data" : - print("ERROR config file must be in directory Trigger/data") - exit(1) - tempArr = tempArr[-1].split(".") - if len(tempArr) > 1: - if tempArr[1] != "config" or len(tempArr)>2 : - print("ERROR config file must of type .config") - exit(1) - configFileBaseName = tempArr[0]; - configFileName = srcDir+"Trigger/data/" + configFileBaseName + ".config" - sourceFiles.append(configFileName) - - trig_prolog_files = [ - srcDir+'Trigger/fcl/prolog_trigger.fcl', - srcDir+'TrkFilters/fcl/prolog_trigger.fcl', - srcDir+'CaloFilters/fcl/prolog_trigger.fcl', - srcDir+'CosmicReco/fcl/prolog_trigger.fcl' - ] - for fn in trig_prolog_files: - sourceFiles.append(fn) - - hasFilteroutput = False - - relProjectDir = "gen/fcl/Trigger/" + configFileBaseName - projectDir = outDir+relProjectDir - - if doWrite : - if not os.path.exists(projectDir) : - os.makedirs(projectDir) - - # this is the main fcl file, start with copy from template - mainFclFileName = projectDir+"/main.fcl" - targetFiles.append(mainFclFileName) - if verbose : - print("Creating {}".format(mainFclFileName)) - - templateFileName = srcDir+"Trigger/fcl/main.fcl" - sourceFiles.append(templateFileName) - - if doWrite : - copyfile(templateFileName, mainFclFileName) - - # now open main fcl file for appending paths - if doWrite : - mainFclFile = open(mainFclFileName,"a",encoding="utf-8") - - path_list = "" - #trig_list = "" - - mainEpilogFileName = projectDir + "/" + "{}.fcl".format(configFileBaseName) - mainEpilogTimingFileName = projectDir + "/" + "{}_timing.fcl".format(configFileBaseName) - - targetFiles.append(mainEpilogFileName) - if verbose : - print("Creating {}".format(mainEpilogFileName)) - if doWrite : - mainEpilogFile = open(mainEpilogFileName, "w"); - mainEpilogTimingFile = open(mainEpilogTimingFileName, "w"); - - # - # main loop over lines in the config file - # - - configFile = open(configFileName, "r") - for line in configFile: - - line = line.strip() # strip whitespace - if len(line)==0: - continue # skip empty lines - - # parse line: path [prescale] [prescale] - words = line.split() - pathName = words[0].split(":")[0] - pathID = words[0].split(":")[1] - pathNameNoTags = pathName#.split("_")[0] - if pathNameNoTags != "triggerOutput": - - # check if the name of the path is present in the prolog_trigger files - pathCheck=False - for i in range(0, len(trig_prolog_files)): - if pathNameNoTags in open(trig_prolog_files[i]).read(): - pathCheck = True - if pathCheck == False: - print ("{} NOT FOUND IN ANY PROLOG_TRIGGER.FCL FILES. PLEASE, CHECK THE INPUT FILE PROVIDED".format(pathNameNoTags)) - exit(1) - - if path_list != "": - path_list += ", " - #trig_list += ", " - path_list += pathName+"_trigger" - #trig_list += "\""+pathName+"\"" - - digi_path = "@sequence::Trigger.PrepareDigis, " - - new_path = ("\nphysics."+pathName+"_trigger"+" : [ "+ digi_path +"@sequence::Trigger.paths."+pathNameNoTags+" ] \nphysics.trigger_paths["+str(pathID)+"] : "+pathName+"_trigger \n") - timing_paths = [] - if "tprDe" in pathName or "cprDe" in pathName: - nFilters = 3 - if "cst" in pathName: - nFilters = 2 - for ind in range(nFilters): - timing_label = "_timing{:d}".format(ind) - timing_paths.append("\nphysics."+pathName+timing_label+"_trigger"+" : [ "+ digi_path +"@sequence::Trigger.paths."+pathNameNoTags+timing_label+" ] \n") - - #now append the epilog files for setting the filters in the path - subEpilogInclude = appendEpilog(pathNameNoTags, relProjectDir, - outDir, srcDir, verbose, - doWrite, sourceFiles, targetFiles) - - if doWrite : - mainEpilogFile.write(subEpilogInclude) - mainEpilogFile.write(new_path) - # - mainEpilogTimingFile.write(subEpilogInclude) - #mainEpilogTimingFile.write(new_path) - for l in range(len(timing_paths)): - mainEpilogTimingFile.write(timing_paths[l]) - - - else: - # triggerOutput keyword means create an output path - trigerOutput_line= ("\nphysics.out : [ readTriggerInfo, triggerOutput ]"+" \n\n") - if doWrite : - mainFclFile.write(trigerOutput_line) - hasFilteroutput = True - - if doWrite : - mainEpilogFile.write("\n") - mainEpilogTimingFile.write("\n") - - analyzer_line= ("physics.analyzers.readTriggerInfo.SelectEvents : [ "+path_list+" ]"+" \n") - if doWrite : - mainFclFile.write(analyzer_line) - analyzer_paths_list= ("physics.analyzers.readTriggerInfo.triggerPathsList : [ "+path_list+" ]"+" \n\n") - if doWrite : - mainFclFile.write(analyzer_paths_list) - - if hasFilteroutput : - triggerOutput_line= ("outputs.triggerOutput.SelectEvents : [ "+path_list+" ]"+" \n") - if doWrite : - mainFclFile.write(triggerOutput_line) - - if doWrite : - mainEpilogFile.close() - mainEpilogTimingFile.close() - - # include the main epilog file, which includes the others, in main fcl - if doWrite : - mainFclFile.write("\n#include \"Offline/"+relProjectDir+"/{}.fcl\"\n".format(configFileBaseName)) - mainFclFile.close() - - if verbose : - print("") - print("main fcl: {}".format(mainFclFileName)) - print("Top level epilog file: ".format(mainEpilogFileName)) - print("") - - # now cd back to where we started - os.chdir(owd) - - return sourceFiles, targetFiles,srcDir+"Trigger/python/genTriggerFcl.py" - -# -# main, runs if started at the command line -# - -if __name__ == "__main__": - - parser = ArgumentParser() - parser.add_argument("-c", "--config-file", dest="configFileText", - help="file with Trigger configuration. Paths available are: unbiased, minimumbiasSdCount,largeSdCount, minimumbiasCdCount,largeCdCount, caloOnly, caloMixed, caloCosmicMuon, tprDeMSeed, tprDePSeed, cprDeMSeed, cprDePSeed, triggerOutput", metavar="FILE") - parser.add_argument("-q", "--quiet", - action="store_false", dest="verbose", default=True, - help="don't print status messages to stdout") - - args = parser.parse_args() - if args.verbose : - print("Config file name: {}".format(args.configFileText)) - - generate(args.configFileText, args.verbose, True) - - - exit(0) From 2444dcf1231038e5fe4bb8ae29f63706f27ab208 Mon Sep 17 00:00:00 2001 From: Gianantonio Pezzullo Date: Wed, 24 Jan 2024 08:11:46 -0600 Subject: [PATCH 121/213] updated Trigger/CMakeLists and .muse file --- .muse | 2 -- Trigger/CMakeLists.txt | 5 ----- 2 files changed, 7 deletions(-) diff --git a/.muse b/.muse index 11108d9bf8..b4ac1d7eab 100644 --- a/.muse +++ b/.muse @@ -1,7 +1,5 @@ # prefer to build with this environment ENVSET p055 -# add these to python path -PYTHONPATH Trigger/python # add Offline/bin to path PATH bin # recent commits can take enforce these flags diff --git a/Trigger/CMakeLists.txt b/Trigger/CMakeLists.txt index 9e40ef2db9..f00641de26 100644 --- a/Trigger/CMakeLists.txt +++ b/Trigger/CMakeLists.txt @@ -38,9 +38,4 @@ cet_build_plugin(ReadTriggerInfo art::module Offline::TrackerGeom ) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/fcl/prolog_trigger.fcl ${CURRENT_BINARY_DIR} fcl/prolog_trigger.fcl COPYONLY) - -install(DIRECTORY data DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/Offline/Trigger) - install_source(SUBDIRS src) -install_fhicl(SUBDIRS fcl SUBDIRNAME Offline/Trigger/fcl) From 3ff0da3b8c8b3c1cf8a856dae1ea40eb9e1b2938 Mon Sep 17 00:00:00 2001 From: Gianantonio Pezzullo Date: Wed, 24 Jan 2024 08:27:29 -0600 Subject: [PATCH 122/213] new config for the prescaler module --- Trigger/src/PrescaleEvent_module.cc | 81 ++++++++++++++++++----------- 1 file changed, 52 insertions(+), 29 deletions(-) diff --git a/Trigger/src/PrescaleEvent_module.cc b/Trigger/src/PrescaleEvent_module.cc index c9a3075847..4903f70a5d 100644 --- a/Trigger/src/PrescaleEvent_module.cc +++ b/Trigger/src/PrescaleEvent_module.cc @@ -12,10 +12,13 @@ #include "art/Framework/Principal/Handle.h" #include "art/Framework/Principal/Run.h" #include "art/Framework/Principal/SubRun.h" +#include "fhiclcpp/types/Atom.h" +#include "fhiclcpp/types/Sequence.h" +#include "fhiclcpp/types/Table.h" #include "canvas/Utilities/InputTag.h" -#include "fhiclcpp/ParameterSet.h" #include "messagefacility/MessageLogger/MessageLogger.h" // #include "RecoDataProducts/inc/TriggerInfo.hh" +#include "artdaq-core-mu2e/Data/EventHeader.hh" #include #include @@ -25,48 +28,68 @@ namespace mu2e class PrescaleEvent : public art::EDFilter { - public: + public: - explicit PrescaleEvent(fhicl::ParameterSet const & p); + using Name = fhicl::Name; + using Comment = fhicl::Comment; - // The destructor generated by the compiler is fine for classes - // without bare pointers or other resource use. - // Plugins should not be copied or assigned. + struct EventModeConfig { + //fhicl::Atom eventMode{ Name("eventMode"), Comment("EventMode: OnSpill, OffSpill, Calib, ...")};//FIXME!! + fhicl::Atom eventMode{ Name("eventMode"), Comment("EventMode: OnSpill, OffSpill, Calib, ...")};//FIXME!! + fhicl::Atom prescale { Name("prescale") , Comment("Prescale factor")}; + }; - PrescaleEvent(PrescaleEvent const &) = delete; - PrescaleEvent(PrescaleEvent &&) = delete; - PrescaleEvent & operator = (PrescaleEvent const &) = delete; - PrescaleEvent & operator = (PrescaleEvent &&) = delete; + struct Config { + fhicl::Atom debug { Name("debugLevel") , Comment("Debug Level"), 0}; + fhicl::Sequence> eventMode { Name("eventModeConfig"), Comment("List of the Event modes with their PS factor")}; + }; + using Parameters = art::EDFilter::Table; + explicit PrescaleEvent(const Parameters& conf); - bool filter(art::Event & e) override; - virtual bool endRun(art::Run& run ) override; + // The destructor generated by the compiler is fine for classes + // without bare pointers or other resource use. + // Plugins should not be copied or assigned. - private: + PrescaleEvent(PrescaleEvent const &) = delete; + PrescaleEvent(PrescaleEvent &&) = delete; + PrescaleEvent & operator = (PrescaleEvent const &) = delete; + PrescaleEvent & operator = (PrescaleEvent &&) = delete; - uint32_t nPrescale_; - bool useFilteredEvts_; - int _debug; - // TriggerFlag _trigFlag; - unsigned _nevt, _npass; + bool filter(art::Event & e) override; + virtual bool endRun(art::Run& run ) override; + + private: + + std::vector _eventMode; + int _debug; + unsigned _nevt, _npass; }; - PrescaleEvent::PrescaleEvent(fhicl::ParameterSet const & p) : - art::EDFilter{p}, - nPrescale_ (p.get("nPrescale")), - useFilteredEvts_(p.get ("useFilteredEvents",false)), - _debug (p.get ("debugLevel",0)), - _nevt(0), _npass(0) - { - // produces(); - } + PrescaleEvent::PrescaleEvent(Parameters const & config) : + art::EDFilter{config}, + _eventMode (config().eventMode()), + _debug (config().debug()), + _nevt(0), _npass(0){} inline bool PrescaleEvent::filter(art::Event & e) { ++_nevt; + + // auto const& evtHH = e.getValidHandle("*"); + // uint8_t evtMode = evtHH->flags; + // int ps(0); + // for (size_t i=0; i<_eventMode.size(); ++i){ + // // if (_eventMode[i].eventMode() == evtMode){ + // if ((_eventMode[i].eventMode() & evtMode) == 1){ + // ps = _eventMode[i].prescale(); + // break; + // } + // } + int ps = _eventMode[0].prescale(); + bool retval(false); - bool condition = e.event() % nPrescale_ == 0; - if (useFilteredEvts_) condition = _nevt % nPrescale_ == 0; + bool condition = e.event() % ps == 0; if(condition) { ++_npass; From 0d67d1442d55cbd65d4ccf13c250c4abba6254a2 Mon Sep 17 00:00:00 2001 From: Gianantonio Pezzullo Date: Wed, 24 Jan 2024 08:54:16 -0600 Subject: [PATCH 123/213] fixed CMakeLists files --- Mu2eKinKal/CMakeLists.txt | 1 - Trigger/CMakeLists.txt | 2 +- TrkFilters/CMakeLists.txt | 2 -- TrkHitReco/CMakeLists.txt | 1 - TrkPatRec/CMakeLists.txt | 1 - 5 files changed, 1 insertion(+), 6 deletions(-) diff --git a/Mu2eKinKal/CMakeLists.txt b/Mu2eKinKal/CMakeLists.txt index e4d9f214bc..3cd6de9c7a 100644 --- a/Mu2eKinKal/CMakeLists.txt +++ b/Mu2eKinKal/CMakeLists.txt @@ -90,7 +90,6 @@ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/data/TrainSign_Stage0.dat ${CURRENT configure_file(${CMAKE_CURRENT_SOURCE_DIR}/data/TrainSign_Stage1.dat ${CURRENT_BINARY_DIR} data/TrainSign_Stage1.dat COPYONLY) configure_file(${CMAKE_CURRENT_SOURCE_DIR}/fcl/prolog.fcl ${CURRENT_BINARY_DIR} fcl/prolog.fcl COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/fcl/prolog_trigger.fcl ${CURRENT_BINARY_DIR} fcl/prolog_trigger.fcl COPYONLY) install(DIRECTORY data DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/Offline/Mu2eKinKal) diff --git a/Trigger/CMakeLists.txt b/Trigger/CMakeLists.txt index f00641de26..199f20b6b1 100644 --- a/Trigger/CMakeLists.txt +++ b/Trigger/CMakeLists.txt @@ -20,7 +20,7 @@ cet_build_plugin(MergeTriggerInfo art::module cet_build_plugin(PrescaleEvent art::module REG_SOURCE src/PrescaleEvent_module.cc LIBRARIES REG - + artdaq_core_mu2e::artdaq-core-mu2e_Data ) cet_build_plugin(ReadTriggerInfo art::module diff --git a/TrkFilters/CMakeLists.txt b/TrkFilters/CMakeLists.txt index 946f309be1..94cf97f7c0 100644 --- a/TrkFilters/CMakeLists.txt +++ b/TrkFilters/CMakeLists.txt @@ -22,7 +22,5 @@ cet_build_plugin(TimeClusterFilter art::module Offline::RecoDataProducts ) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/fcl/prolog_trigger.fcl ${CURRENT_BINARY_DIR} fcl/prolog_trigger.fcl COPYONLY) - install_source(SUBDIRS src) install_fhicl(SUBDIRS fcl SUBDIRNAME Offline/TrkFilters/fcl) diff --git a/TrkHitReco/CMakeLists.txt b/TrkHitReco/CMakeLists.txt index 0e13d87f1c..6ff8d3e7e3 100644 --- a/TrkHitReco/CMakeLists.txt +++ b/TrkHitReco/CMakeLists.txt @@ -104,7 +104,6 @@ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/fcl/epilog_plane.fcl ${CURRENT_BINA configure_file(${CMAKE_CURRENT_SOURCE_DIR}/fcl/epilog_station.fcl ${CURRENT_BINARY_DIR} fcl/epilog_station.fcl COPYONLY) configure_file(${CMAKE_CURRENT_SOURCE_DIR}/fcl/epilog_stereo.fcl ${CURRENT_BINARY_DIR} fcl/epilog_stereo.fcl COPYONLY) configure_file(${CMAKE_CURRENT_SOURCE_DIR}/fcl/prolog.fcl ${CURRENT_BINARY_DIR} fcl/prolog.fcl COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/fcl/prolog_trigger.fcl ${CURRENT_BINARY_DIR} fcl/prolog_trigger.fcl COPYONLY) install(DIRECTORY data DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/Offline/TrkHitReco) diff --git a/TrkPatRec/CMakeLists.txt b/TrkPatRec/CMakeLists.txt index 6ed685eae0..4fa71bd54b 100644 --- a/TrkPatRec/CMakeLists.txt +++ b/TrkPatRec/CMakeLists.txt @@ -169,7 +169,6 @@ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/fcl/DoubletAmbigResolver.fcl ${CURR configure_file(${CMAKE_CURRENT_SOURCE_DIR}/fcl/PanelAmbigResolver.fcl ${CURRENT_BINARY_DIR} fcl/PanelAmbigResolver.fcl COPYONLY) configure_file(${CMAKE_CURRENT_SOURCE_DIR}/fcl/Particle.fcl ${CURRENT_BINARY_DIR} fcl/Particle.fcl COPYONLY) configure_file(${CMAKE_CURRENT_SOURCE_DIR}/fcl/prolog.fcl ${CURRENT_BINARY_DIR} fcl/prolog.fcl COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/fcl/prolog_trigger.fcl ${CURRENT_BINARY_DIR} fcl/prolog_trigger.fcl COPYONLY) install(DIRECTORY data DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/Offline/TrkPatRec) From 9a37d074c504f3638ace3ec358e122d4fa506384 Mon Sep 17 00:00:00 2001 From: Gianantonio Pezzullo Date: Thu, 25 Jan 2024 11:21:57 -0600 Subject: [PATCH 124/213] updated paths to the menu config files --- Trigger/fcl/ExtractedTrigger.fcl | 15 ++++++++++----- Trigger/fcl/OffSpillTrigger.fcl | 16 +++++++++++----- Trigger/fcl/OnSpillTrigger.fcl | 16 +++++++++++----- 3 files changed, 32 insertions(+), 15 deletions(-) diff --git a/Trigger/fcl/ExtractedTrigger.fcl b/Trigger/fcl/ExtractedTrigger.fcl index 6cc611b469..78c0a1687c 100644 --- a/Trigger/fcl/ExtractedTrigger.fcl +++ b/Trigger/fcl/ExtractedTrigger.fcl @@ -2,15 +2,20 @@ # Run the Extracted trigger paths # #include "Offline/fcl/standardServices.fcl" -#include "Offline/Trigger/fcl/prolog_trigger.fcl" +#include "mu2e_trig_config/gen/trig_extrPosPSConfig_OffSpill.fcl" +#include "mu2e_trig_config/gen/trig_extrPos_OffSpill.fcl" process_name : OffSpillTrigger services : @local::Services.Reco source : { module_type : RootInput } physics : { - producers : { @table::Trigger.producers } - filters : { @table::Trigger.filters } - analyzers : { @table::Trigger.analyzers } + @table::TrigSequences + producers : { @table::TrigProducers.producers } + filters : { + @table::TrigFilters.filters + @table::Trig_extrPosPSConfig + } } -#include "Offline/gen/fcl/Trigger/ExtrPosTrigMenu/ExtrPosTrigMenu.fcl" +physics.trigger_paths : [@sequence::Trig_extrPos.trigger_paths] +#include "mu2e_trig_config/core/trigDigiInputsEpilog.fcl" physics.producers.EWMProducer.SpillType : 0 #include "Production/JobConfig/common/epilog.fcl" diff --git a/Trigger/fcl/OffSpillTrigger.fcl b/Trigger/fcl/OffSpillTrigger.fcl index c992568b99..1fb7eec3f9 100644 --- a/Trigger/fcl/OffSpillTrigger.fcl +++ b/Trigger/fcl/OffSpillTrigger.fcl @@ -2,15 +2,21 @@ # Run the OffSpill trigger paths # #include "Offline/fcl/standardServices.fcl" -#include "Offline/Trigger/fcl/prolog_trigger.fcl" +#include "mu2e_trig_config/gen/trig_physMenuPSConfig_OffSpill.fcl" +#include "mu2e_trig_config/gen/trig_physMenu_OffSpill.fcl" process_name : OffSpillTrigger services : @local::Services.Reco source : { module_type : RootInput } physics : { - producers : { @table::Trigger.producers } - filters : { @table::Trigger.filters } - analyzers : { @table::Trigger.analyzers } + @table::TrigSequences + producers : { @table::TrigProducers.producers } + filters : { + @table::TrigFilters.filters + @table::Trig_physMenuPSConfig + } } -#include "Offline/gen/fcl/Trigger/OffSpillTrigMenu/OffSpillTrigMenu.fcl" +physics.trigger_paths : [@sequence::Trig_physMenu.trigger_paths] +#include "mu2e_trig_config/core/trigDigiInputsEpilog.fcl" + physics.producers.EWMProducer.SpillType : 0 #include "Production/JobConfig/common/epilog.fcl" diff --git a/Trigger/fcl/OnSpillTrigger.fcl b/Trigger/fcl/OnSpillTrigger.fcl index f7214b1924..f35495c869 100644 --- a/Trigger/fcl/OnSpillTrigger.fcl +++ b/Trigger/fcl/OnSpillTrigger.fcl @@ -2,15 +2,21 @@ # Run the OnSpill trigger paths # #include "Offline/fcl/standardServices.fcl" -#include "Offline/Trigger/fcl/prolog_trigger.fcl" +#include "mu2e_trig_config/gen/trig_physMenuPSConfig_OnSpill.fcl" +#include "mu2e_trig_config/gen/trig_physMenu_OnSpill.fcl" process_name : OnSpillTrigger services : @local::Services.Reco source : { module_type : RootInput } physics : { - producers : { @table::Trigger.producers } - filters : { @table::Trigger.filters } - analyzers : { @table::Trigger.analyzers } + @table::TrigSequences + producers : { @table::TrigProducers.producers } + filters : { + @table::TrigFilters.filters + @table::Trig_physMenuPSConfig + } } -#include "Offline/gen/fcl/Trigger/OnSpillTrigMenu/OnSpillTrigMenu.fcl" +physics.trigger_paths : [@sequence::Trig_physMenu.trigger_paths] +#include "mu2e_trig_config/core/trigDigiInputsEpilog.fcl" + physics.producers.EWMProducer.SpillType : 1 #include "Production/JobConfig/common/epilog.fcl" From ca6195443e50139f67c75071063146755c5a8f11 Mon Sep 17 00:00:00 2001 From: Gianantonio Pezzullo Date: Wed, 31 Jan 2024 14:45:25 -0600 Subject: [PATCH 125/213] updated the paths to the trigger config files --- Mu2eKinKal/test/TTBTrk.fcl | 94 ++++++++----------- Mu2eKinKal/test/TTTA.fcl | 100 ++++++++++---------- Mu2eKinKal/test/TTTA_noMC.fcl | 64 +++++++------ Trigger/fcl/driver_Example.fcl | 163 --------------------------------- Trigger/fcl/main.fcl | 55 ----------- Trigger/fcl/main_online.fcl | 126 ------------------------- 6 files changed, 127 insertions(+), 475 deletions(-) delete mode 100644 Trigger/fcl/driver_Example.fcl delete mode 100644 Trigger/fcl/main.fcl delete mode 100644 Trigger/fcl/main_online.fcl diff --git a/Mu2eKinKal/test/TTBTrk.fcl b/Mu2eKinKal/test/TTBTrk.fcl index 845a081c98..3ab298b8e0 100644 --- a/Mu2eKinKal/test/TTBTrk.fcl +++ b/Mu2eKinKal/test/TTBTrk.fcl @@ -7,14 +7,8 @@ #include "Offline/fcl/minimalMessageService.fcl" #include "Offline/fcl/standardServices.fcl" #include "Production/JobConfig/reco/prolog.fcl" -#include "Offline/Mu2eKinKal/fcl/prolog_trigger.fcl" -#include "Offline/TrkHitReco/fcl/prolog_trigger.fcl" -#include "Offline/TrkReco/fcl/prolog_trigger.fcl" -#include "Offline/TrkPatRec/fcl/prolog_trigger.fcl" -#include "Offline/TrkFilters/fcl/prolog_trigger.fcl" -#include "Offline/CalPatRec/fcl/prolog.fcl" -#include "Offline/CalPatRec/fcl/prolog_trigger.fcl" -#include "Offline/Trigger/fcl/prolog_trigger.fcl" +#include "mu2e_trig_config/gen/trig_physMenuPSConfig_OnSpill.fcl" +#include "mu2e_trig_config/gen/trig_physMenu_OnSpill.fcl" #include "TrkAna/fcl/prolog.fcl" #include "Offline/CommonMC/fcl/prolog.fcl" @@ -23,59 +17,49 @@ source : { module_type : RootInput } services : @local::Services.Reco physics : { - producers : { - @table::CaloHitRecoTrigger.producers - @table::CaloClusterTrigger.producers - @table::TrkHitRecoTrigger.producers - @table::TrkRecoTrigger.producers - @table::TrkHitRecoTrigger.producers - @table::TprTrigger.producers - @table::CprTrigger.producers - @table::TTMu2eKinKal.producers - } - filters : { - @table::CprTrigger.filters - @table::CaloFilters.filters - @table::TrkFilters.filters - @table::CstTrigger.filters - @table::Trigger.filters - } + @table::TrigSequences + producers : { @table::TrigProducers.producers } - analyzers : { - TAtpr : @local::TrkAnaReco.analyzers.TrkAnaNeg - evtprint : { - module_type : RunSubrunEvent - printSam : false - printRun : false - printSubrun : false - printEvent : true - } - TAcpr : @local::TrkAnaReco.analyzers.TrkAnaNeg - evtprint : { - module_type : RunSubrunEvent - printSam : false - printRun : false - printSubrun : false - printEvent : true - } - } - EndPath : [TAtpr, TAcpr] + filters : { + @table::TrigFilters.filters + @table::Trig_physMenuPSConfig + } - tprDeM_highP_stopTarg : [ @sequence::CaloHitRecoTrigger.prepareHits, @sequence::CaloClusterTrigger.Reco, - @sequence::TrkHitRecoTrigger.sequences.TTprepareHits, - TTtimeClusterFinder, tprDeMHighPStopTargTCFilter, TThelixFinder, - TTHelixMergerDeM, tprDeMHighPStopTargHSFilter, - TTKSFDeM, tprDeMHighPStopTargTSFilter ] - cprDeM_highP_stopTarg : [ @sequence::CaloHitRecoTrigger.prepareHits, @sequence::CaloClusterTrigger.Reco, - @sequence::TrkHitRecoTrigger.sequences.TTprepareHits, - TTCalTimePeakFinder, cprDeMHighPStopTargTCFilter, TTCalHelixFinderDe, - TTCalHelixMergerDeM, cprDeMHighPStopTargHSFilter, - TTCalSeedFitDem, cprDeMHighPStopTargTSFilter] + analyzers : { + TAtpr : @local::TrkAnaReco.analyzers.TrkAnaNeg + evtprint : { + module_type : RunSubrunEvent + printSam : false + printRun : false + printSubrun : false + printEvent : true + } + TAcpr : @local::TrkAnaReco.analyzers.TrkAnaNeg + evtprint : { + module_type : RunSubrunEvent + printSam : false + printRun : false + printSubrun : false + printEvent : true + } + } + EndPath : [TAtpr, TAcpr] + + tprDeM_highP_stopTarg : [ @sequence::CaloHitRecoTrigger.prepareHits, @sequence::CaloClusterTrigger.Reco, + @sequence::TrkHitRecoTrigger.sequences.TTprepareHits, + TTtimeClusterFinder, tprDeMHighPStopTargTCFilter, TThelixFinder, + TTHelixMergerDeM, tprDeMHighPStopTargHSFilter, + TTKSFDeM, tprDeMHighPStopTargTSFilter ] + cprDeM_highP_stopTarg : [ @sequence::CaloHitRecoTrigger.prepareHits, @sequence::CaloClusterTrigger.Reco, + @sequence::TrkHitRecoTrigger.sequences.TTprepareHits, + TTCalTimePeakFinder, cprDeMHighPStopTargTCFilter, TTCalHelixFinderDe, + TTCalHelixMergerDeM, cprDeMHighPStopTargHSFilter, + TTCalSeedFitDem, cprDeMHighPStopTargTSFilter] } -#include "Offline/gen/fcl/Trigger/OnSpillTrigMenu/OnSpillTrigMenu.fcl" physics.trigger_paths : [tprDeM_highP_stopTarg, cprDeM_highP_stopTarg ] physics.end_paths : [ EndPath ] +#include "mu2e_trig_config/core/trigDigiInputsEpilog.fcl" physics.analyzers.TAtpr.SelectEvents : [ tprDeM_highP_stopTarg ] physics.analyzers.TAtpr.candidate.options : @local::AllOpt diff --git a/Mu2eKinKal/test/TTTA.fcl b/Mu2eKinKal/test/TTTA.fcl index 0e90bd9bdf..5c4986594b 100644 --- a/Mu2eKinKal/test/TTTA.fcl +++ b/Mu2eKinKal/test/TTTA.fcl @@ -5,63 +5,69 @@ # services.DbService.version: v1_0 # #include "Offline/fcl/standardServices.fcl" -#include "Offline/Trigger/fcl/prolog_trigger.fcl" +#include "mu2e_trig_config/gen/trig_physMenuPSConfig_OnSpill.fcl" +#include "mu2e_trig_config/gen/trig_physMenu_OnSpill.fcl" #include "Offline/CommonMC/fcl/prolog_trigger.fcl" #include "TrkAna/fcl/prolog_trigger.fcl" process_name : OnSpillTrigger services : @local::Services.Reco source : { - module_type : RootInput + module_type : RootInput } physics : { - producers : { - @table::Trigger.producers - SelectRecoMCDeMcpr : { - @table::CommonMCTrigger.TTSelectRecoMC - KalSeedCollections : [ "TTCalSeedFitDem" ] - HelixSeedCollections : ["TTCalHelixMergerDeM" ] - } - SelectRecoMCDeMtpr : { - @table::CommonMCTrigger.TTSelectRecoMC - KalSeedCollections : [ "TTKSFDeM" ] - HelixSeedCollections : ["TTHelixMergerDeM" ] - } - SelectRecoMCDePcpr : { - @table::CommonMCTrigger.TTSelectRecoMC - KalSeedCollections : [ "TTCalSeedFitDep" ] - HelixSeedCollections : ["TTCalHelixMergerDeP" ] - } - SelectRecoMCDePtpr : { - @table::CommonMCTrigger.TTSelectRecoMC - KalSeedCollections : [ "TTKSFDeP" ] - HelixSeedCollections : ["TTHelixMergerDeP" ] - } - } - filters : { @table::Trigger.filters } - analyzers : { - @table::Trigger.analyzers - TADeMtpr : { - @table::TrkAnaTrigger.TrkAnaDeMTT - FitType : LoopHelix - } + @table::TrigSequences + producers : { + @table::TrigProducers.producers + SelectRecoMCDeMcpr : { + @table::CommonMCTrigger.TTSelectRecoMC + KalSeedCollections : [ "TTCalSeedFitDem" ] + HelixSeedCollections : ["TTCalHelixMergerDeM" ] + } + SelectRecoMCDeMtpr : { + @table::CommonMCTrigger.TTSelectRecoMC + KalSeedCollections : [ "TTKSFDeM" ] + HelixSeedCollections : ["TTHelixMergerDeM" ] + } + SelectRecoMCDePcpr : { + @table::CommonMCTrigger.TTSelectRecoMC + KalSeedCollections : [ "TTCalSeedFitDep" ] + HelixSeedCollections : ["TTCalHelixMergerDeP" ] + } + SelectRecoMCDePtpr : { + @table::CommonMCTrigger.TTSelectRecoMC + KalSeedCollections : [ "TTKSFDeP" ] + HelixSeedCollections : ["TTHelixMergerDeP" ] + } + } + filters : { + @table::TrigFilters.filters + @table::Trig_physMenuPSConfig + } + analyzers : { + @table::Trigger.analyzers + TADeMtpr : { + @table::TrkAnaTrigger.TrkAnaDeMTT + FitType : LoopHelix + } - TADeMcpr : { - @table::TrkAnaTrigger.TrkAnaDeMTT - FitType : LoopHelix - } - TADePtpr : { - @table::TrkAnaTrigger.TrkAnaDePTT - FitType : LoopHelix - } - TADePcpr : { - @table::TrkAnaTrigger.TrkAnaDePTT - FitType : LoopHelix - } - } - EndPath : [TADeMtpr, TADeMcpr, TADePtpr, TADePcpr] + TADeMcpr : { + @table::TrkAnaTrigger.TrkAnaDeMTT + FitType : LoopHelix + } + TADePtpr : { + @table::TrkAnaTrigger.TrkAnaDePTT + FitType : LoopHelix + } + TADePcpr : { + @table::TrkAnaTrigger.TrkAnaDePTT + FitType : LoopHelix + } + } + EndPath : [TADeMtpr, TADeMcpr, TADePtpr, TADePcpr] } -#include "Offline/gen/fcl/Trigger/OnSpillTrigMenu/OnSpillTrigMenu.fcl" +physics.trigger_paths : [@sequence::Trig_physMenu.trigger_paths] +#include "mu2e_trig_config/core/trigDigiInputsEpilog.fcl" #physics.producers.EWMProducer.SpillType : 1 #include "Production/JobConfig/common/epilog.fcl" #include "Production/JobConfig/reco/drop_trigger.fcl" diff --git a/Mu2eKinKal/test/TTTA_noMC.fcl b/Mu2eKinKal/test/TTTA_noMC.fcl index 1fc186a62d..32eecdc3e2 100644 --- a/Mu2eKinKal/test/TTTA_noMC.fcl +++ b/Mu2eKinKal/test/TTTA_noMC.fcl @@ -6,7 +6,8 @@ # services.DbService.version: v1_0 # #include "Offline/fcl/standardServices.fcl" -#include "Offline/Trigger/fcl/prolog_trigger.fcl" +#include "mu2e_trig_config/gen/trig_physMenuPSConfig_OnSpill.fcl" +#include "mu2e_trig_config/gen/trig_physMenu_OnSpill.fcl" #include "TrkAna/fcl/prolog_trigger.fcl" process_name : OnSpillTrigger services : @local::Services.Reco @@ -15,37 +16,42 @@ source : { } physics : { - producers : { - @table::Trigger.producers - } - filters : { @table::Trigger.filters } - analyzers : { - @table::Trigger.analyzers - TADeMtpr : { - @table::TrkAnaTrigger.TrkAnaDeMTT - FitType : LoopHelix - FillMCInfo : false - } + @table::TrigSequences + producers : { + @table::TrigProducers.producers + } + filters : { + @table::TrigFilters.filters + @table::Trig_physMenuPSConfig + } + analyzers : { + @table::Trigger.analyzers + TADeMtpr : { + @table::TrkAnaTrigger.TrkAnaDeMTT + FitType : LoopHelix + FillMCInfo : false + } - TADeMcpr : { - @table::TrkAnaTrigger.TrkAnaDeMTT - FitType : LoopHelix - FillMCInfo : false - } - TADePtpr : { - @table::TrkAnaTrigger.TrkAnaDePTT - FitType : LoopHelix - FillMCInfo : false - } - TADePcpr : { - @table::TrkAnaTrigger.TrkAnaDePTT - FitType : LoopHelix - FillMCInfo : false + TADeMcpr : { + @table::TrkAnaTrigger.TrkAnaDeMTT + FitType : LoopHelix + FillMCInfo : false + } + TADePtpr : { + @table::TrkAnaTrigger.TrkAnaDePTT + FitType : LoopHelix + FillMCInfo : false + } + TADePcpr : { + @table::TrkAnaTrigger.TrkAnaDePTT + FitType : LoopHelix + FillMCInfo : false + } } - } - EndPath : [TADeMtpr, TADeMcpr, TADePtpr, TADePcpr] + EndPath : [TADeMtpr, TADeMcpr, TADePtpr, TADePcpr] } -#include "Offline/gen/fcl/Trigger/OnSpillTrigMenu/OnSpillTrigMenu.fcl" +physics.trigger_paths : [@sequence::Trig_physMenu.trigger_paths] +#include "mu2e_trig_config/core/trigDigiInputsEpilog.fcl" physics.producers.EWMProducer.SpillType : 1 #include "Production/JobConfig/common/epilog.fcl" #include "Production/JobConfig/reco/drop_trigger.fcl" diff --git a/Trigger/fcl/driver_Example.fcl b/Trigger/fcl/driver_Example.fcl deleted file mode 100644 index bacc4307b0..0000000000 --- a/Trigger/fcl/driver_Example.fcl +++ /dev/null @@ -1,163 +0,0 @@ -# -*- mode: tcl -*- -# FHiCL document used to run the "driver" executable. To learn more -# about the FHiCL language, please look at -# cdcvs.fnal.gov/redmine/documents/327 , the "FHiCL Quick Start Guide" - -#include "Offline/fcl/minimalMessageService.fcl" -#include "Offline/fcl/standardServices.fcl" -#include "Offline/fcl/standardProducers.fcl" -#include "Offline/TrkDiag/fcl/prolog.fcl" - -#include "Offline/Trigger/fcl/prolog_trigger.fcl" - - -events_to_generate: 5 -#events_to_generate: 25 - - -run_number: 101 - -fragment_receiver: { - - # Parameters defining and configuring the fragment generator to be used - generator: Mu2eReceiver - ring_0_roc_count: 1 - ring_0_timing_enabled: false - debug_print: false - verbose: false - raw_output_enable: false - raw_output_file: "mu2eReceiver.bin" - - load_sim_file: true - use_detector_emulator: true - - fragment_id: 0 - board_id: 0 -} - -event_builder: { - expected_fragments_per_event: 1 - use_art: true - print_event_store_stats: false - verbose: false - events_expected_in_SimpleQueueReader: @local::events_to_generate - - max_fragment_size_bytes: 522705344 - buffer_count: 20 - end_of_data_wait_s: 0 - - # 24 Cores Total (mu2edaq01) - # art_analyzer_count: 1 - # art_analyzer_count: 18 -} - -###################################################################### -# The ART code -###################################################################### - -#services : @local::Services.Reco -services : @local::Services.Reco - -producers : { @table::Trigger.producers } -filters : { @table::Trigger.filters } -analyzers : { @table::Trigger.analyzers } -paths : { @table::Trigger.paths } -outputs : { @table::Trigger.outputs } - -physics: -{ - - producers : { @table::producers - - makeSD: - { - module_type: Mu2eProducer - diagLevel: 0 - parseCAL: 0 - parseTRK: 1 - } - - CaloDigiMaker: - { - module_type: Mu2eProducer - diagLevel: 0 - parseCAL: 1 - parseTRK: 0 - } - - - } - - filters : { @table::filters } - - analyzers : { - - readTriggerInfo : { @table::analyzers.ReadTriggerInfo - nFilters : 70 - SelecEvents : [ unbiased_path, - minimumbiasSDCount_path, - largeSDCount_path, - caloOnly_path, - tprSeedDeM_path, tprSeedDeP_path, cprSeedDeM_path, cprSeedDeP_path ] - } - - } - - -# prod_sequence : [ makeSD, CaloDigiMaker ] - - #unbiased trigger path - unbiased_path : [ @sequence::paths.unbiased ] - - #minimum bias filters - minimumbiasSDCount_path : [ @sequence::paths.minimumbiasSDCount ] - - #path for selecting events with large ammount of strawDigis - largeSDCount_path : [ @sequence::paths.largeSDCount ] - - #path for the calorimeter only trigger - caloMVACE_path : [ CaloDigiMaker, @sequence::paths.caloMVACE ] - - #path for calorimeter cosmic muon calibration - caloCosmicMuon_path : [ CaloDigiMaker, @sequence::paths.caloCalibCosmic ] - - #paths for TrkPatRec downstream e- and e+ - tprSeedDeM_path : [ makeSD, @sequence::paths.tprSeedDeM ] - tprSeedDeP_path : [ makeSD, @sequence::paths.tprSeedDeP ] - - #paths for CalPatRec downstream e- and e+ - cprSeedDeM_path : [ makeSD, CaloDigiMaker, @sequence::paths.cprSeedDeM ] - cprSeedDeP_path : [ makeSD, CaloDigiMaker, @sequence::paths.cprSeedDeP ] - - - - e2: [ readTriggerInfo ] - - end_paths: [ e2 ] - -} - -outputs: -{ - @table::outputs - - out1: - { - module_type: FileDumperOutput - wantProductFriendlyClassName: true - } - -} - -source: -{ - module_type: OfflineFragmentReader - waiting_time: 900 - resume_after_timeout: true -} - -services.TFileService.fileName : "trig.root" -services.scheduler.wantSummary: true - -process_name: Driver - diff --git a/Trigger/fcl/main.fcl b/Trigger/fcl/main.fcl deleted file mode 100644 index a80914e2d0..0000000000 --- a/Trigger/fcl/main.fcl +++ /dev/null @@ -1,55 +0,0 @@ -# -*- mode:tcl -*- -#------------------------------------------------------------------------------ -# performs the calorimeter and track reconstruciton -#------------------------------------------------------------------------------ -# > mu2e --config CaloFilters/fcl/runGlobalFilter.fcl --source "your digis file" --TFile globalFilter.root --nevts=100 -#include "Offline/fcl/minimalMessageService.fcl" -#include "Offline/fcl/standardServices.fcl" -#include "Offline/fcl/standardProducers.fcl" - -#include "Offline/Trigger/fcl/prolog_trigger.fcl" - -process_name : globalTrigger - -source : -{ - module_type : RootInput -} -# we don't need any simulation services for this job -# services : @local::Services.Reco - -services : @local::Services.Reco - -# timing information -services.TimeTracker : { - dbOutput : { - filename : "" -# filename : "runGlobalTrigger.db" #uncomment to create the .db output - overwrite : true - } -} - -services.scheduler.wantSummary: true - -physics : { - producers : { @table::Trigger.producers } - - filters : { @table::Trigger.filters } - - analyzers : { @table::Trigger.analyzers - - readTriggerInfo : { @table::Trigger.analyzers.ReadTriggerInfo - nFilters : 35 - } - - } - - out : [ readTriggerInfo ] - end_paths : [ out ] -} - -outputs : { @table::Trigger.outputs } - - -services.TFileService.fileName : "globalTrigger.root" - diff --git a/Trigger/fcl/main_online.fcl b/Trigger/fcl/main_online.fcl deleted file mode 100644 index 33ad60752c..0000000000 --- a/Trigger/fcl/main_online.fcl +++ /dev/null @@ -1,126 +0,0 @@ -# -*- mode: tcl -*- -# FHiCL document used to run the "driver" executable. To learn more -# about the FHiCL language, please look at -# cdcvs.fnal.gov/redmine/documents/327 , the "FHiCL Quick Start Guide" - -#include "Offline/fcl/minimalMessageService.fcl" -#include "Offline/fcl/standardServices.fcl" -#include "Offline/fcl/standardProducers.fcl" -#include "Offline/TrkDiag/fcl/prolog.fcl" - -#include "Offline/Trigger/fcl/prolog_trigger.fcl" - - -events_to_generate: 5 -#events_to_generate: 25 - - -run_number: 101 - -fragment_receiver: { - - # Parameters defining and configuring the fragment generator to be used - generator: Mu2eReceiver - ring_0_roc_count: 1 - ring_0_timing_enabled: false - debug_print: false - verbose: false - raw_output_enable: false - raw_output_file: "mu2eReceiver.bin" - - load_sim_file: true - use_detector_emulator: true - - fragment_id: 0 - board_id: 0 -} - -event_builder: { - expected_fragments_per_event: 1 - use_art: true - print_event_store_stats: false - verbose: false - events_expected_in_SimpleQueueReader: @local::events_to_generate - - max_fragment_size_bytes: 522705344 - buffer_count: 20 - end_of_data_wait_s: 0 - - # 24 Cores Total (mu2edaq01) - # art_analyzer_count: 1 - # art_analyzer_count: 18 -} - -###################################################################### -# The ART code -###################################################################### - -#services : @local::Services.Reco - -services : @local::Services.Reco - -physics: -{ - - producers : { @table::Trigger.producers - - makeSD: - { - module_type: Mu2eProducer - diagLevel: 0 - parseCAL: 0 - parseTRK: 1 - } - - CaloDigiMaker: - { - module_type: Mu2eProducer - diagLevel: 0 - parseCAL: 1 - parseTRK: 0 - } - - - } - - filters : { @table::Trigger.filters } - - analyzers : { @table::Trigger.analyzers - - readTriggerInfo : { @table::Trigger.analyzers.ReadTriggerInfo - nFilters : 70 - } - - } - - - e2: [ readTriggerInfo ] - - end_paths: [ e2 ] - -} - -outputs: -{ - @table::Trigger.outputs - - out1: - { - module_type: FileDumperOutput - wantProductFriendlyClassName: true - } - -} - -source: -{ - module_type: OfflineFragmentReader - waiting_time: 900 - resume_after_timeout: true -} - -services.TFileService.fileName : "trig.root" -services.scheduler.wantSummary: true - -process_name: Driver - From d3d219d28ae5df35738d6e0a2f05cd3db3567420 Mon Sep 17 00:00:00 2001 From: Gianantonio Pezzullo Date: Wed, 31 Jan 2024 16:55:18 -0600 Subject: [PATCH 126/213] cleanup --- Trigger/fcl/ExtractedTrigger.fcl | 21 --------------------- Trigger/fcl/OffSpillTrigger.fcl | 22 ---------------------- Trigger/fcl/OnSpillTrigger.fcl | 22 ---------------------- 3 files changed, 65 deletions(-) delete mode 100644 Trigger/fcl/ExtractedTrigger.fcl delete mode 100644 Trigger/fcl/OffSpillTrigger.fcl delete mode 100644 Trigger/fcl/OnSpillTrigger.fcl diff --git a/Trigger/fcl/ExtractedTrigger.fcl b/Trigger/fcl/ExtractedTrigger.fcl deleted file mode 100644 index 78c0a1687c..0000000000 --- a/Trigger/fcl/ExtractedTrigger.fcl +++ /dev/null @@ -1,21 +0,0 @@ -# -# Run the Extracted trigger paths -# -#include "Offline/fcl/standardServices.fcl" -#include "mu2e_trig_config/gen/trig_extrPosPSConfig_OffSpill.fcl" -#include "mu2e_trig_config/gen/trig_extrPos_OffSpill.fcl" -process_name : OffSpillTrigger -services : @local::Services.Reco -source : { module_type : RootInput } -physics : { - @table::TrigSequences - producers : { @table::TrigProducers.producers } - filters : { - @table::TrigFilters.filters - @table::Trig_extrPosPSConfig - } -} -physics.trigger_paths : [@sequence::Trig_extrPos.trigger_paths] -#include "mu2e_trig_config/core/trigDigiInputsEpilog.fcl" -physics.producers.EWMProducer.SpillType : 0 -#include "Production/JobConfig/common/epilog.fcl" diff --git a/Trigger/fcl/OffSpillTrigger.fcl b/Trigger/fcl/OffSpillTrigger.fcl deleted file mode 100644 index 1fb7eec3f9..0000000000 --- a/Trigger/fcl/OffSpillTrigger.fcl +++ /dev/null @@ -1,22 +0,0 @@ -# -# Run the OffSpill trigger paths -# -#include "Offline/fcl/standardServices.fcl" -#include "mu2e_trig_config/gen/trig_physMenuPSConfig_OffSpill.fcl" -#include "mu2e_trig_config/gen/trig_physMenu_OffSpill.fcl" -process_name : OffSpillTrigger -services : @local::Services.Reco -source : { module_type : RootInput } -physics : { - @table::TrigSequences - producers : { @table::TrigProducers.producers } - filters : { - @table::TrigFilters.filters - @table::Trig_physMenuPSConfig - } -} -physics.trigger_paths : [@sequence::Trig_physMenu.trigger_paths] -#include "mu2e_trig_config/core/trigDigiInputsEpilog.fcl" - -physics.producers.EWMProducer.SpillType : 0 -#include "Production/JobConfig/common/epilog.fcl" diff --git a/Trigger/fcl/OnSpillTrigger.fcl b/Trigger/fcl/OnSpillTrigger.fcl deleted file mode 100644 index f35495c869..0000000000 --- a/Trigger/fcl/OnSpillTrigger.fcl +++ /dev/null @@ -1,22 +0,0 @@ -# -# Run the OnSpill trigger paths -# -#include "Offline/fcl/standardServices.fcl" -#include "mu2e_trig_config/gen/trig_physMenuPSConfig_OnSpill.fcl" -#include "mu2e_trig_config/gen/trig_physMenu_OnSpill.fcl" -process_name : OnSpillTrigger -services : @local::Services.Reco -source : { module_type : RootInput } -physics : { - @table::TrigSequences - producers : { @table::TrigProducers.producers } - filters : { - @table::TrigFilters.filters - @table::Trig_physMenuPSConfig - } -} -physics.trigger_paths : [@sequence::Trig_physMenu.trigger_paths] -#include "mu2e_trig_config/core/trigDigiInputsEpilog.fcl" - -physics.producers.EWMProducer.SpillType : 1 -#include "Production/JobConfig/common/epilog.fcl" From c7f2ec1baedbac17146f0cbf5a8b7443ca7994d6 Mon Sep 17 00:00:00 2001 From: Gianantonio Pezzullo Date: Thu, 15 Feb 2024 10:28:25 -0600 Subject: [PATCH 127/213] removed no-fragments message --- DAQ/src/ArtFragmentsFromDTCEvents_module.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DAQ/src/ArtFragmentsFromDTCEvents_module.cc b/DAQ/src/ArtFragmentsFromDTCEvents_module.cc index 11e7634b00..06787e4dcc 100644 --- a/DAQ/src/ArtFragmentsFromDTCEvents_module.cc +++ b/DAQ/src/ArtFragmentsFromDTCEvents_module.cc @@ -193,7 +193,7 @@ void art::ArtFragmentsFromDTCEvents::produce(Event& event) { } } - if (nFrags == 0) { + if ( (diagLevel_ > 0) && (nFrags == 0)) { std::cout << "[ArtFragmentsFromDTCEvents::produce] found no fragments!" << std::endl; } From bc793569a98a4ddc469865c1e0580448478d0756 Mon Sep 17 00:00:00 2001 From: Ray Culbertson Date: Thu, 15 Feb 2024 22:26:37 -0600 Subject: [PATCH 128/213] also make extracted --- scripts/build/bin/procs.sh | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/scripts/build/bin/procs.sh b/scripts/build/bin/procs.sh index 65bf911a77..0699cb0608 100755 --- a/scripts/build/bin/procs.sh +++ b/scripts/build/bin/procs.sh @@ -78,11 +78,23 @@ elif [ "$COMMAND" == "GDML" ]; then echo "save existing mu2e.gdml: mv mu2e.gdml mu2e.gdml.$STR" /bin/mv mu2e.gdml mu2e.gdml.$STR fi + # make the standard gdml file mu2e -c Offline/Mu2eG4/fcl/gdmldump.fcl; [ $? -ne 0 ] && RC=1 /bin/mv mu2e.gdml ${MUSE_BUILD_BASE}/Offline/gen/gdml/mu2e.gdml [ $? -ne 0 ] && RC=1 + + # make the extracted gdml file + TMPF=$(mktemp) + cp Offline/Mu2eG4/fcl/gdmldump.fcl $TMPF + echo "services.GeometryService.inputFile : \"Offline/Mu2eG4/geom/geom_common_extracted.txt\"" >> $TMPF + mu2e -c $TMPF + [ $? -ne 0 ] && RC=1 + /bin/mv mu2e.gdml ${MUSE_BUILD_BASE}/Offline/gen/gdml/mu2e_extracted.gdml + [ $? -ne 0 ] && RC=1 + rm -f $TMPF + elif [ "$COMMAND" == "TEST03" ]; then # see if this fcl runs mu2e -c Offline/Mu2eG4/fcl/g4test_03.fcl -o /dev/null -T /dev/null From 25cb4542c8ffe7e11eadc7a1152075a2e39de0e7 Mon Sep 17 00:00:00 2001 From: Ray Culbertson Date: Fri, 16 Feb 2024 17:54:03 -0600 Subject: [PATCH 129/213] follow change in OpenGL libraries --- Mu2eG4/src/SConscript | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Mu2eG4/src/SConscript b/Mu2eG4/src/SConscript index 9674446f62..189bdc7204 100644 --- a/Mu2eG4/src/SConscript +++ b/Mu2eG4/src/SConscript @@ -182,7 +182,10 @@ G4GLOBALIBS = [ if g4vis != 'none': G4GLOBALIBS.append('libG4OpenGL') - G4GLOBALIBS.append('libG4gl2ps') + if g4_version < '4111': + G4GLOBALIBS.append('libG4gl2ps') + else : + G4GLOBALIBS.append('libG4ToolsSG') if g4vg != 'off': G4GLOBALIBS.append('libvecgeom') From 78f17909c8595f79275c85a066a83824495fd1fb Mon Sep 17 00:00:00 2001 From: Andrei Gaponenko Date: Sat, 17 Feb 2024 10:35:38 -0600 Subject: [PATCH 130/213] More of the "shift includes" --- Mu2eG4/vis/visqtGUI.mac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Mu2eG4/vis/visqtGUI.mac b/Mu2eG4/vis/visqtGUI.mac index 4c7d0eadcf..3b530288c1 100644 --- a/Mu2eG4/vis/visqtGUI.mac +++ b/Mu2eG4/vis/visqtGUI.mac @@ -15,7 +15,7 @@ # # Start Here Menu/Button /gui/addMenu start "Start Here" -/gui/addButton start "Start by clicking Here Once" "/control/execute Mu2eG4/vis/vismqtm.mac" +/gui/addButton start "Start by clicking Here Once" "/control/execute Offline/Mu2eG4/vis/vismqtm.mac" # # Viewer menu : /gui/addMenu viewer Viewer From 480060223039b49f3fa7d0d714eaab7c242637a8 Mon Sep 17 00:00:00 2001 From: sophieMu2e Date: Sat, 17 Feb 2024 12:41:08 -0600 Subject: [PATCH 131/213] daves suggestions --- EventGenerator/src/GenFilter_module.cc | 3 +-- MCDataProducts/inc/KalSeedMC.hh | 5 ++--- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/EventGenerator/src/GenFilter_module.cc b/EventGenerator/src/GenFilter_module.cc index cc7c734eaa..4a65b448b4 100644 --- a/EventGenerator/src/GenFilter_module.cc +++ b/EventGenerator/src/GenFilter_module.cc @@ -94,8 +94,7 @@ namespace mu2e { mu2e::GeomHandle tracker; auto tracker_origin = det->toMu2e(tracker->origin()); //XYZVectorF pos3Vec = XYZVectorF(aParticle.position().x(),aParticle.position().y(),aParticle.position().z()); - XYZVectorF pos3Vec = XYZVectorF(tracker_origin.x(),tracker_origin.y(),tracker_origin.z()); - ROOT::Math::XYZVector bnom(bfmgr->getBField(pos3Vec).x(),bfmgr->getBField(pos3Vec).y(),bfmgr->getBField(pos3Vec).z()); + ROOT::Math::XYZVector bnom(bfmgr->getBField(tracker_origin)); // make the loophelix KinKal::LoopHelix lh(pos0, mom0, charge, bnom); diff --git a/MCDataProducts/inc/KalSeedMC.hh b/MCDataProducts/inc/KalSeedMC.hh index aad5a74d87..5f5e50bdf4 100644 --- a/MCDataProducts/inc/KalSeedMC.hh +++ b/MCDataProducts/inc/KalSeedMC.hh @@ -35,8 +35,7 @@ namespace mu2e { uint16_t _nhits; // number of associated StrawHits uint16_t _nactive; // number of associated active hits XYZTVectorF _mom; // initial momentum - XYZVectorF _pos; // initial position - double _time; //global start time + XYZTVectorF _pos; // initial position cet::map_vector_key _spkey; // key to the SimParticle // construct a Ptr from Handle and key SPPtr simParticle(SPCH spcH) const { return SPPtr(spcH,_spkey.asUint()); } @@ -44,7 +43,7 @@ namespace mu2e { // partial constructor from a SimParticle; SimPartStub(SPPtr const& spp) : _pdg(spp->pdgId()), _proc(spp->creationCode()), _gid(GenId::unknown), _rel(MCRelationship::none), - _nhits(0), _nactive(0), _mom(XYZTVectorF(spp->startMomentum())), _pos(CLHEP::Hep3Vector(spp->startPosition())), _time(spp->startGlobalTime()), _spkey(spp.key()){ + _nhits(0), _nactive(0), _mom(XYZTVectorF(spp->startMomentum())), _pos(CLHEP::Hep3Vector(spp->startPosition()).x(),CLHEP::Hep3Vector(spp->startPosition()).y(),CLHEP::Hep3Vector(spp->startPosition()).z(),spp->startGlobalTime() ), _spkey(spp.key()){ // dig down to the GenParticle auto simPtr = spp; while (simPtr->genParticle().isNull() && simPtr->parent().isNonnull()) { From 429fdcd3ecf7ef0e1a1b3737faf1a6af2e030058 Mon Sep 17 00:00:00 2001 From: sophieMu2e Date: Sat, 17 Feb 2024 13:31:32 -0600 Subject: [PATCH 132/213] daves suggestions --- MCDataProducts/inc/KalSeedMC.hh | 1 + 1 file changed, 1 insertion(+) diff --git a/MCDataProducts/inc/KalSeedMC.hh b/MCDataProducts/inc/KalSeedMC.hh index 5f5e50bdf4..8768603601 100644 --- a/MCDataProducts/inc/KalSeedMC.hh +++ b/MCDataProducts/inc/KalSeedMC.hh @@ -28,6 +28,7 @@ namespace mu2e { struct SimPartStub { typedef art::Ptr SPPtr; typedef art::Handle SPCH; + typedef ROOT::Math::LorentzVector > LVPM; PDGCode::type _pdg; // code of this particle ProcessCode _proc; // particle creation process GenId _gid; // generator code From fcc138be623929f53d5c3575c0afe13f0d720d30 Mon Sep 17 00:00:00 2001 From: sophieMu2e Date: Sat, 17 Feb 2024 13:37:08 -0600 Subject: [PATCH 133/213] daves suggestions --- MCDataProducts/inc/KalSeedMC.hh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/MCDataProducts/inc/KalSeedMC.hh b/MCDataProducts/inc/KalSeedMC.hh index 8768603601..8b8621b61e 100644 --- a/MCDataProducts/inc/KalSeedMC.hh +++ b/MCDataProducts/inc/KalSeedMC.hh @@ -35,7 +35,7 @@ namespace mu2e { MCRelationship _rel; // relationship of this particle to its primary uint16_t _nhits; // number of associated StrawHits uint16_t _nactive; // number of associated active hits - XYZTVectorF _mom; // initial momentum + LVPM _mom; // initial momentum XYZTVectorF _pos; // initial position cet::map_vector_key _spkey; // key to the SimParticle // construct a Ptr from Handle and key @@ -44,7 +44,7 @@ namespace mu2e { // partial constructor from a SimParticle; SimPartStub(SPPtr const& spp) : _pdg(spp->pdgId()), _proc(spp->creationCode()), _gid(GenId::unknown), _rel(MCRelationship::none), - _nhits(0), _nactive(0), _mom(XYZTVectorF(spp->startMomentum())), _pos(CLHEP::Hep3Vector(spp->startPosition()).x(),CLHEP::Hep3Vector(spp->startPosition()).y(),CLHEP::Hep3Vector(spp->startPosition()).z(),spp->startGlobalTime() ), _spkey(spp.key()){ + _nhits(0), _nactive(0), _mom(LVPM(spp->startMomentum())), _pos(CLHEP::Hep3Vector(spp->startPosition()).x(),CLHEP::Hep3Vector(spp->startPosition()).y(),CLHEP::Hep3Vector(spp->startPosition()).z(),spp->startGlobalTime() ), _spkey(spp.key()){ // dig down to the GenParticle auto simPtr = spp; while (simPtr->genParticle().isNull() && simPtr->parent().isNonnull()) { From 883f30db24e164cff70b5d6fc2ef0399e2a58b83 Mon Sep 17 00:00:00 2001 From: sophieMu2e Date: Sat, 17 Feb 2024 14:46:21 -0600 Subject: [PATCH 134/213] double to float --- MCDataProducts/inc/KalSeedMC.hh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/MCDataProducts/inc/KalSeedMC.hh b/MCDataProducts/inc/KalSeedMC.hh index 8b8621b61e..05ece48cb8 100644 --- a/MCDataProducts/inc/KalSeedMC.hh +++ b/MCDataProducts/inc/KalSeedMC.hh @@ -28,7 +28,7 @@ namespace mu2e { struct SimPartStub { typedef art::Ptr SPPtr; typedef art::Handle SPCH; - typedef ROOT::Math::LorentzVector > LVPM; + typedef ROOT::Math::LorentzVector > LVPM; PDGCode::type _pdg; // code of this particle ProcessCode _proc; // particle creation process GenId _gid; // generator code From 7386d3d319d01fb560d19cc82e88dd2bc03f0cfa Mon Sep 17 00:00:00 2001 From: Ray Culbertson Date: Sat, 17 Feb 2024 15:41:30 -0600 Subject: [PATCH 135/213] Remove uneeded lib --- Mu2eG4/src/SConscript | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Mu2eG4/src/SConscript b/Mu2eG4/src/SConscript index 189bdc7204..b971724012 100644 --- a/Mu2eG4/src/SConscript +++ b/Mu2eG4/src/SConscript @@ -176,8 +176,7 @@ G4GLOBALIBS = [ 'libG4track', 'libG4tracking', 'libG4visHepRep', - 'libG4vis_management', - 'libG4zlib' + 'libG4vis_management' ] if g4vis != 'none': From a0d1604f69fb7e36a58189dd12852b22ae089389 Mon Sep 17 00:00:00 2001 From: difalco Date: Sun, 18 Feb 2024 12:21:37 -0600 Subject: [PATCH 136/213] Gamma conversion generator --- Mu2eG4/src/GammaConvGenerator_module.cc | 214 ++++++++++++++++++++++++ Mu2eG4/src/SConscript | 1 + 2 files changed, 215 insertions(+) create mode 100644 Mu2eG4/src/GammaConvGenerator_module.cc diff --git a/Mu2eG4/src/GammaConvGenerator_module.cc b/Mu2eG4/src/GammaConvGenerator_module.cc new file mode 100644 index 0000000000..92090dd242 --- /dev/null +++ b/Mu2eG4/src/GammaConvGenerator_module.cc @@ -0,0 +1,214 @@ +// Generates e+/e- from converted photons. +// This generator uses ... +// +// S. Di Falco, 2023 + +#include +#include +#include +#include +#include + +#include "CLHEP/Vector/LorentzVector.h" +#include "CLHEP/Random/RandFlat.h" +#include "CLHEP/Units/PhysicalConstants.h" + +#include "fhiclcpp/types/Atom.h" +#include "fhiclcpp/types/Sequence.h" + +#include "art/Framework/Core/EDProducer.h" +#include "art/Framework/Principal/Event.h" +#include "art/Framework/Services/Registry/ServiceHandle.h" +#include "Offline/SeedService/inc/SeedService.hh" +#include "Offline/DataProducts/inc/PDGCode.hh" +#include "Offline/MCDataProducts/inc/StageParticle.hh" +#include "Offline/MCDataProducts/inc/PhysicalVolumeInfoMultiCollection.hh" +#include "Offline/Mu2eUtilities/inc/simParticleList.hh" +#include "Offline/MCDataProducts/inc/GenParticle.hh" +#include "Offline/Mu2eUtilities/inc/GammaPairConversionSpectrum.hh" +#include "Offline/Mu2eG4/inc/findMaterialOrThrow.hh" + +// Geant4 includes +#include "Geant4/G4Material.hh" + +namespace mu2e { + + //================================================================ + class GammaConvGenerator : public art::EDProducer { + public: + struct Config { + using Name=fhicl::Name; + using Comment=fhicl::Comment; + fhicl::Atom physVolModuleLabel{Name("physVolModuleLabel"),Comment("module creating physical volumes")}; + fhicl::Atom physVolProcessLabel{Name("physVolProcessLabel"),Comment("module creating physical volumes"),"Primary"}; + fhicl::Atom inputSimParticles{Name("inputSimParticles"),Comment("A SimParticleCollection with input converted photons.")}; + fhicl::Atom stopMaterial{Name("stopMaterial"),Comment("G4 name of the material where the photon has converted (temporary)."),"ST_Wires"}; + fhicl::Atom verbosity{Name("verbosity")}; + fhicl::Atom useCorrelatedAngleOverKE{Name("useCorrelatedAngleOverKE"), Comment("Flag to use correlated e+e- cos/KE"), false}; + }; + + using Parameters= art::EDProducer::Table; + explicit GammaConvGenerator(const Parameters& conf); + + virtual void produce(art::Event& event) override; + + //---------------------------------------------------------------- + private: + + double particleMass_; + + // Module label of the module that made the volume. + std::string physVolModuleLabel_; + // Module label of the last process that wrote the volume list. + std::string physVolProcessLabel_; + + art::ProductToken const simsToken_; + std::string stopMaterial_; + + unsigned verbosity_; + + art::RandomNumberGenerator::base_engine_t& eng_; + CLHEP::RandFlat randFlat_; + bool useCorrelatedAngleOverKE_; //correlate the cos/ke for the e+ and e- + + GammaPairConversionSpectrum* spectrum_; //pair production spectrum + enum {kMaxConversionMaterialElements = 10}; + ProcessCode process; + }; + + //================================================================ + GammaConvGenerator::GammaConvGenerator(const Parameters& conf) + : EDProducer{conf} + // , particleMass_(GlobalConstantsHandle()->particle(static_cast(PDGCode::e_minus)).mass()) + , physVolModuleLabel_{conf().physVolModuleLabel()} + , physVolProcessLabel_{conf().physVolProcessLabel()} + , simsToken_{consumes(conf().inputSimParticles())} + , stopMaterial_{conf().stopMaterial()} + , verbosity_{conf().verbosity()} + , eng_{createEngine(art::ServiceHandle()->getSeed())} + , randFlat_{eng_} + , useCorrelatedAngleOverKE_(conf().useCorrelatedAngleOverKE()) + , spectrum_ (new GammaPairConversionSpectrum(&randFlat_, useCorrelatedAngleOverKE_)) + { + produces(); + process = ProcessCode::mu2eGammaConversion; + } + + //================================================================ + void GammaConvGenerator::produce(art::Event& event) { + auto output{std::make_unique()}; + + const auto simh = event.getValidHandle(simsToken_); + const auto gammas = simParticleList(simh,PDGCode::gamma,ProcessCode::conv); + + if(gammas.empty()) { + throw cet::exception("NO GAMMAS") + <<"GammaConvGenerator::produce(): no suitable converted gamma in the input SimParticleCollection\n"; + } + + // Take the converted gamma as SimParticle + const auto gammapart = gammas.at(eng_.operator unsigned int() % gammas.size()); + const auto p4_gamma = gammapart->endMomentum(); + const auto t_gammastop = gammapart->endGlobalTime(); + if (verbosity_>2){ + std::cout << "GAMMA 4-MOMENTUM: " << p4_gamma << std::endl; + std::cout << "END VOLUME INDEX: " << gammapart->endVolumeIndex() << std::endl; + } + // + // Handle to information about G4 physical volumes. + bool PhysicalVolumeInfoFound=false; + std::string wantedbranch="mu2e::PhysicalVolumeInfomvs_"+physVolModuleLabel_+"_eventlevel_"+physVolProcessLabel_+"."; + if (verbosity_>2) std::cout << "Searching for " << wantedbranch << std::endl; + + std::vector< art::Handle > vah = event.getMany(); + art::Handle PhysicalVolumeInfos; + + for (auto const & ah : vah){ + std::string branchName = ah.provenance()->productDescription().branchName(); + if (verbosity_>2) std::cout << "PHYSICALVOLUMEINFO COLLECTION: " << branchName << std::endl; + if (branchName==wantedbranch){ + PhysicalVolumeInfoFound=true; + PhysicalVolumeInfos=ah; + if (verbosity_>2){ + std::cout << "PHYSICALVOLUMEINFO COLLECTION FOUND" << std::endl; + std::cout << PhysicalVolumeInfos << std::endl; + } + } + } + if (!PhysicalVolumeInfoFound){ + throw cet::exception("NO PHYSICALVOLUMEINFO COLLECTION") + <<"GammaConvGenerator::produce(): no suitable PhysicalVolume collection\n"; + } + if (PhysicalVolumeInfos->empty()){ + throw cet::exception("EMPTY PHYSICALVOLUMEINFO COLLECTION") + <<"GammaConvGenerator::produce(): PhysicalVolume collection is empty\n"; + } + //const auto& vols = PhysicalVolumeInfos->at(gammapart->simStage()); + /* + PhysicalVolumeInfoSingleStage const* vols = &PhysicalVolumeInfos->at(gammapart->simStage()); + if (verbosity_>2){ + std::cout << "VOLUME COLLECTION SIZE: " << vols->size() << std::endl; + for ( long unsigned int i=0;isize();i++){ + std::cout << i << " " << vols->at(cet::map_vector_key(i)).name() << " made of " << vols->at(cet::map_vector_key(i)).materialName() << std::endl; + //for (auto const & vol : vols){ + // std::cout << vol << " " << vol.name() << " made of " << vol.materialName() << std::endl; + } + } + //const auto& endInfo = vols.at(gammapart->endVolumeIndex()); + PhysicalVolumeInfo const& endInfo = vols->at(cet::map_vector_key(gammapart->endVolumeIndex())); + + if (verbosity_>1){ + std::cout << "Gamma stop found in: " << endInfo.materialName() << std::endl; + std::cout << "Requested material is:" << " " << stopMaterial_ << std::endl; + } + G4Material*stopMat = findMaterialOrThrow((G4String const& )endInfo.materialName()); + */ + G4Material*stopMat = findMaterialOrThrow((G4String const& )stopMaterial_); + auto elements= stopMat->GetElementVector(); + auto eleFracs= stopMat->GetFractionVector(); + int ele_size=elements->size(); + if (ele_size > kMaxConversionMaterialElements) { + throw cet::exception("TOO MANY MATERIAL ELEMENTS") + << ele_size << " while maximum allowed is " << kMaxConversionMaterialElements << "\n"; + } + //create a corresponding material + GammaPairConversionSpectrum::materialData material; + for (int iele=0;iele_elementMap[elements->at(iele)->GetZ()]); + material.elementFractions.push_back(eleFracs[iele]); + if (verbosity_>1){ + std::cout << "Z= " << elements->at(iele)->GetZ() << " frac=" << eleFracs[iele] << std::endl; + } + } + CLHEP::HepLorentzVector p4_eminus, p4_eplus; + //sample the spectrum + spectrum_->fire(p4_gamma, material, p4_eminus, p4_eplus); + + output->emplace_back(gammapart, + process, + PDGCode::e_minus, + gammapart->endPosition(), + p4_eminus, + t_gammastop + ); + output->emplace_back(gammapart, + process, + PDGCode::e_plus, + gammapart->endPosition(), + p4_eplus, + t_gammastop + ); + + if (verbosity_>1){ + std::cout << "p(gamma)=(" << p4_gamma.vect().x() << "," << p4_gamma.vect().y() << "," << p4_gamma.vect().z() << "," << p4_gamma.e() << ")" << std::endl; + std::cout << "p(eminus)=(" << p4_eminus.vect().x() << "," << p4_eminus.vect().y() << "," << p4_eminus.vect().z() << "," << p4_eminus.e() << ")" << std::endl; + std::cout << "p(eplus)=(" << p4_eplus.vect().x() << "," << p4_eplus.vect().y() << "," << p4_eplus.vect().z() << "," << p4_eplus.e() << ")" << std::endl; + } + + event.put(std::move(output)); + } + + //================================================================ +} // namespace mu2e + +DEFINE_ART_MODULE(mu2e::GammaConvGenerator) diff --git a/Mu2eG4/src/SConscript b/Mu2eG4/src/SConscript index 9674446f62..15fedccefa 100644 --- a/Mu2eG4/src/SConscript +++ b/Mu2eG4/src/SConscript @@ -280,6 +280,7 @@ helper.make_plugins( [ 'mu2e_Mu2eHallGeom', 'mu2e_MCDataProducts', 'mu2e_ConfigTools', + 'mu2e_DataProducts', 'art_Framework_Core', 'art_Framework_Principal', 'art_Framework_Services_Registry', From 293938e1398ccf6487608162dce136e89993d349 Mon Sep 17 00:00:00 2001 From: difalco Date: Mon, 19 Feb 2024 00:56:49 -0600 Subject: [PATCH 137/213] needed by Gamma conversion generator --- .../inc/GammaPairConversionSpectrum.hh | 82 ++++++ .../src/GammaPairConversionSpectrum.cc | 257 ++++++++++++++++++ 2 files changed, 339 insertions(+) create mode 100644 Mu2eUtilities/inc/GammaPairConversionSpectrum.hh create mode 100644 Mu2eUtilities/src/GammaPairConversionSpectrum.cc diff --git a/Mu2eUtilities/inc/GammaPairConversionSpectrum.hh b/Mu2eUtilities/inc/GammaPairConversionSpectrum.hh new file mode 100644 index 0000000000..570c95a599 --- /dev/null +++ b/Mu2eUtilities/inc/GammaPairConversionSpectrum.hh @@ -0,0 +1,82 @@ +#ifndef Mu2eUtilities_GammaPairConversionSpectrum_hh +#define Mu2eUtilities_GammaPairConversionSpectrum_hh + +// Mu2e includes +// #include "Mu2eUtilities/inc/Table.hh" + +// CLHEP includes +#include "CLHEP/Vector/ThreeVector.h" +#include "CLHEP/Vector/LorentzVector.h" + +// cetlib includes +#include "cetlib_except/exception.h" + +// C++ includes +#include +#include +#include +#include + + +namespace CLHEP { + class RandFlat; +} +namespace mu2e { + + class GammaPairConversionSpectrum { + + public: + struct elementData { + int z; + double z3; //z^(1/3) + double logZ3; //log(z)/3 + double deltaMaxLow; + double deltaMaxHigh; + double fCoulomb; + }; + struct materialData { + std::vector elements; + std::vector elementFractions; + }; + GammaPairConversionSpectrum(){ _correlateAngleOverKE = false;} + + GammaPairConversionSpectrum(CLHEP::RandFlat* randFlat, bool correlateAngleOverKE = false); + + // random number generators are owned by the callers, no memory cleanup needed + ~GammaPairConversionSpectrum(){} + void fire(const CLHEP::HepLorentzVector &photon, elementData &material, + CLHEP::HepLorentzVector &electron, CLHEP::HepLorentzVector &positron); + + void fire(const CLHEP::HepLorentzVector &photon, materialData &material, //will randomly select an element in the material + CLHEP::HepLorentzVector &electron, CLHEP::HepLorentzVector &positron); + + void betheHeitlerModel(const CLHEP::HepLorentzVector &photon, elementData &material, + CLHEP::HepLorentzVector &electron, CLHEP::HepLorentzVector &positron); + + double screenFunction1 (const double delta); + double screenFunction2 (const double delta); + void screenFunction12(const double delta, double &f1, double &f2); + + //angular distribution + void samplePairDirections(const CLHEP::HepLorentzVector &photon, double electron_ke, + double positron_ke, CLHEP::Hep3Vector &electron_dir, + CLHEP::Hep3Vector &positron_dir); + + double sampleCosTheta(double ke); + double sampleThetaU(double ke); + + void initializeElementData(); + + public: + std::map _elementMap; //map of element data by Z (standard A values assumed) + private: + + CLHEP::RandFlat* _rndFlat; + bool _correlateAngleOverKE; //add or remove correlation that disappeared in GEANT 4.10.4p03b --> 4.10.5.p01a + int _gMaxZet; //maximum element Z + double _me; // electron mass + }; + +} // end of namespace mu2e + +#endif /* Mu2eUtilities_GammaPairConversionSpectrum_hh */ diff --git a/Mu2eUtilities/src/GammaPairConversionSpectrum.cc b/Mu2eUtilities/src/GammaPairConversionSpectrum.cc new file mode 100644 index 0000000000..1198ad2918 --- /dev/null +++ b/Mu2eUtilities/src/GammaPairConversionSpectrum.cc @@ -0,0 +1,257 @@ +#include "Offline/Mu2eUtilities/inc/GammaPairConversionSpectrum.hh" +// Mu2e includes +#include "Offline/GlobalConstantsService/inc/GlobalConstantsHandle.hh" +#include "Offline/GlobalConstantsService/inc/PhysicsParams.hh" +//#include "Offline/GlobalConstantsService/inc/ParticleDataTable.hh" +#include "Offline/GlobalConstantsService/inc/ParticleDataList.hh" + +// Framework includes +#include "art/Framework/Services/Optional/RandomNumberGenerator.h" +#include "cetlib/pow.h" + +#include "CLHEP/Random/RandomEngine.h" +#include "CLHEP/Random/RandGeneral.h" +#include "CLHEP/Random/RandFlat.h" +#include "CLHEP/Units/PhysicalConstants.h" + + +namespace mu2e { + GammaPairConversionSpectrum::GammaPairConversionSpectrum(CLHEP::RandFlat* rndFlat, bool correlateAngleOverKE): + _rndFlat (rndFlat), + _correlateAngleOverKE(correlateAngleOverKE), + _gMaxZet (120){ + + GlobalConstantsHandle pdt; + // _me = pdt->particle(PDGCode::e_minus ).ref().mass().value(); + _me = pdt->particle(PDGCode::e_minus ).mass(); + //initialize some element data + GammaPairConversionSpectrum::initializeElementData(); + } + + //get a random conversion event + void GammaPairConversionSpectrum::fire(const CLHEP::HepLorentzVector &photon, + GammaPairConversionSpectrum::elementData &material, + CLHEP::HepLorentzVector &electron, + CLHEP::HepLorentzVector &positron) { + if(photon.e() < 2.*_me) + throw cet::exception("ERROR") << "GammaPairConversion::" << __func__ + << " Photon energy below conversion threshold!"; + if(material.z < 1) + throw cet::exception("ERROR") << "GammaPairConversion::" << __func__ + << " Conversion material has a Z < 1!"; + //sample the actual spectrum + betheHeitlerModel(photon, material, electron, positron); + } + + //select a random element and then get a random conversion event + void GammaPairConversionSpectrum::fire(const CLHEP::HepLorentzVector &photon, + GammaPairConversionSpectrum::materialData &material, + CLHEP::HepLorentzVector &electron, + CLHEP::HepLorentzVector &positron) { + if(photon.e() < 2.*_me) + throw cet::exception("ERROR") << "GammaPairConversion::" << __func__ + << " Photon energy below conversion threshold!"; + if(material.elements.size() < 1) + throw cet::exception("ERROR") << "GammaPairConversion::" << __func__ + << " Conversion material has no elements!"; + //select a random element + double r, frac; + unsigned nElements = material.elements.size(), index; + do { + r = _rndFlat->fire(); + index = (unsigned) nElements*_rndFlat->fire(); + frac = material.elementFractions[index]; + } while(r > frac); + //fire with the specific material + fire(photon, material.elements[index], electron, positron); + } + + //recommended spectrum to use for photon energies below 80 GeV + //From G4BetheHeitlerModel::SampleSecondaries + void GammaPairConversionSpectrum::betheHeitlerModel(const CLHEP::HepLorentzVector &photon, + GammaPairConversionSpectrum::elementData &material, + CLHEP::HepLorentzVector &electron, + CLHEP::HepLorentzVector &positron){ + + double photon_energy = photon.e(); + double eps0 = _me/photon_energy; + //must have at least 2*_me energy to convert + if(eps0 > 0.5) return; + + double eps; + double small_energy = 2.; //MeV + if(photon_energy < small_energy) { + //simple case if low energy conversion + eps = eps0 + (0.5-eps0)*_rndFlat->fire(); + } else { + //higher energy conversion (but BetheHeitlerModel used for < 80 GeV) + double middle_energy = 50.; // MeV + double deltaFactor = 136.*eps0/(material.z3); + double deltaMax = material.deltaMaxLow; + double FZ = 8.*(material.logZ3); + if(photon_energy > middle_energy) { + FZ += 8.*(material.fCoulomb); + deltaMax = material.deltaMaxHigh; + } + double deltaMin = 4.*deltaFactor; + //limits of esp + double epsp = 0.5 - 0.5*std::sqrt(1.-deltaMin/deltaMax); + double epsMin = std::max(eps0, epsp); + double epsRange = 0.5 - epsMin; + + //sample the energy rate (eps) of the created electron (or positron) + double F10, F20; + GammaPairConversionSpectrum::screenFunction12(deltaMin, F10, F20); + F10 -= FZ; + F20 -= FZ; + const double normF1 = std::max(F10 * epsRange * epsRange, 0.); + const double normF2 = std::max(1.5 * F20 , 0.); + const double normCond = normF1 / (normF1 + normF2); + //three random numbers per sampling + double greject = 0.; + double rndnum; + do { + rndnum = _rndFlat->fire(); + if(normCond > rndnum) { + rndnum = _rndFlat->fire(); + eps = 0.5 - epsRange * pow(rndnum,1./3.); //G4Pow::A13(rand) = rand^(1/3) + const double delta = deltaFactor/(eps*(1.-eps)); + greject = (GammaPairConversionSpectrum::screenFunction1(delta) - FZ)/F10; + } else { + rndnum = _rndFlat->fire(); + eps = epsMin + epsRange*rndnum; + const double delta = deltaFactor/(eps*(1.-eps)); + greject = (GammaPairConversionSpectrum::screenFunction2(delta) - FZ)/F20; + } + rndnum = _rndFlat->fire(); + } while (greject < rndnum); + + //randomly select charges + const int charge = (_rndFlat->fire() < 0.5) ? 1 : -1; + + //get kinematics + const double positron_energy = (charge > 0) ? eps*photon_energy : (1.-eps)*photon_energy; + const double electron_energy = photon_energy - positron_energy; + const double positron_ke = std::max(0., positron_energy - _me); + const double electron_ke = std::max(0., electron_energy - _me); + //get direction of e+e- + CLHEP::Hep3Vector positron_dir, electron_dir; + //sample from anglular distribution from Modified Tsai spectrum + GammaPairConversionSpectrum::samplePairDirections(photon, electron_ke, + positron_ke,electron_dir, positron_dir); + + //set electron and positron lorentz vectors + electron_dir.setMag(std::sqrt(electron_energy*electron_energy - _me*_me)); //use as p vector + positron_dir.setMag(std::sqrt(positron_energy*positron_energy - _me*_me)); + positron.setE(positron_energy); + positron.setVect(positron_dir); + electron.setE(electron_energy); + electron.setVect(electron_dir); + } + } + + //from G4BetheHeitlerModel::ScreenFunction1 + double GammaPairConversionSpectrum::screenFunction1(const double delta) { + return (delta > 1.4) ? 42.038 - 8.29*log(delta + 0.958) : 42.184 - delta*(7.444 - 1.623*delta); + } + //from G4BetheHeitlerModel::ScreenFunction2 + double GammaPairConversionSpectrum::screenFunction2(const double delta) { + return (delta > 1.4) ? 42.038 - 8.29*log(delta + 0.958) : 41.326 - delta*(5.848 - 0.902*delta); + } + //from G4BetheHeitlerModel::ScreenFunction12 + void GammaPairConversionSpectrum::screenFunction12(const double delta, double &f1, double &f2) { + if (delta > 1.4) { + f1 = 42.038 - 8.29*log(delta + 0.958); + f2 = f1; + } else { + f1 = 42.184 - delta*(7.444 - 1.623*delta); + f2 = 41.326 - delta*(5.848 - 0.902*delta); + } + } + + //From G4ModifiedTsai::SamplePairDirections + void GammaPairConversionSpectrum::samplePairDirections(const CLHEP::HepLorentzVector &photon, double electron_ke, + double positron_ke, CLHEP::Hep3Vector &electron_dir,CLHEP::Hep3Vector &positron_dir) { + CLHEP::Hep3Vector photon_dir(photon.vect()); + photon_dir.setMag(1.); + + double phi = CLHEP::twopi * _rndFlat->fire(); + double sinp = std::sin(phi); + double cosp = std::cos(phi); + + double u(0.), theta(0.), cost(0.), sint(0.); + if(_correlateAngleOverKE) { + u = GammaPairConversionSpectrum::sampleThetaU(electron_ke); + theta = u*_me/electron_ke; + cost = cos(theta); + } else + cost = GammaPairConversionSpectrum::sampleCosTheta(electron_ke); + sint = std::sqrt((1.-cost)*(1.+cost)); + + electron_dir.set(sint*cosp, sint*sinp, cost); + electron_dir.rotateUz(photon_dir); + + if(_correlateAngleOverKE) { + theta = u*_me/positron_ke; + cost = cos(theta); + } else + cost = GammaPairConversionSpectrum::sampleCosTheta(positron_ke); + sint = std::sqrt((1.-cost)*(1.+cost)); + + positron_dir.set(-sint*cosp, -sint*sinp, cost); + positron_dir.rotateUz(photon_dir); + } + + //From G4ModifiedTsai::SampleCosTheta(G4double kinEnergy) + double GammaPairConversionSpectrum::sampleCosTheta(double ke) { + double uMax = 2.*(1. + ke/_me); + static const double a1 = 1.6; + static const double a2 = a1/3.; + static const double border = 0.25; + double u(0.); + do { + double rndnum1 = _rndFlat->fire(); + const double rndnum2 = _rndFlat->fire(); + const double uu = -log(rndnum1*rndnum2); + rndnum1 = _rndFlat->fire(); + u = (border > rndnum1) ? uu*a1 : uu*a2; + } while(u > uMax); + //in GEANT 4.10.p03b used cos(u*me/ke) ~ 1 - (u*me/ke)^2 / 2 = 1 - 2*u^2/ (2 ke/me)^2 ~ 1 - 2*u^2/(2*(1+ke/me))^2 + return 1. - 2.*u*u/uMax/uMax; + } + + //From G4BetheHeitlerModel::SampleSecondaries, used in 4.10.4.p03b + double GammaPairConversionSpectrum::sampleThetaU(double ke) { + static const double a1 = 1.6; + static const double a2 = a1/3.; + static const double border = 0.25; + // double uMax = M_PI*ke/_me; //if above this angle > pi + double rndnum1 = _rndFlat->fire(), rndnum2 = _rndFlat->fire(); + const double uu = -log(rndnum1*rndnum2); + rndnum1 = _rndFlat->fire(); + const double u = (border > rndnum1) ? uu*a1 : uu*a2; + return u; + } + + void GammaPairConversionSpectrum::initializeElementData() { + for(int z = 1; z < 121; ++z) { + double z3 = pow(z, 1./3.); + //from G4Element::ComputeCoulombFactor() + const double k1 = 0.0083, k2 = 0.20206, k3 = 0.0020, k4 = 0.0369; + const double alpha = 1./137.036; //fine structure constant + double az2 = (alpha*z)*(alpha*z); //should use effective z! + double az4 = az2*az2; + double fCoulomb = (k1*az4 + k2 + 1./(1.+az2))*az2 - (k3*az4 + k4)*az4; + double FZLow = 8.*log(z3); + double FZHigh = FZLow + 8.*fCoulomb; + GammaPairConversionSpectrum::elementData data; + data.fCoulomb = fCoulomb; + data.z = z; + data.z3 = z3; + data.logZ3 = log(z)/3.; + data.deltaMaxLow = exp((42.038 - FZLow )/8.29) - 0.958; + data.deltaMaxHigh = exp((42.038 - FZHigh)/8.29) - 0.958; + _elementMap[z] = data; + } + } +} From b3fb581aea3789e3d2622903d6c740a3f7e79ea6 Mon Sep 17 00:00:00 2001 From: Ray Culbertson Date: Tue, 20 Feb 2024 22:07:36 -0600 Subject: [PATCH 138/213] also add current geometry --- scripts/build/bin/procs.sh | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/scripts/build/bin/procs.sh b/scripts/build/bin/procs.sh index 0699cb0608..ab98d6b337 100755 --- a/scripts/build/bin/procs.sh +++ b/scripts/build/bin/procs.sh @@ -93,6 +93,14 @@ elif [ "$COMMAND" == "GDML" ]; then [ $? -ne 0 ] && RC=1 /bin/mv mu2e.gdml ${MUSE_BUILD_BASE}/Offline/gen/gdml/mu2e_extracted.gdml [ $? -ne 0 ] && RC=1 + + # make the current gdml file + cp Offline/Mu2eG4/fcl/gdmldump.fcl $TMPF + echo "services.GeometryService.inputFile : \"Offline/Mu2eG4/geom/geom_common_current.txt\"" >> $TMPF + mu2e -c $TMPF + [ $? -ne 0 ] && RC=1 + /bin/mv mu2e.gdml ${MUSE_BUILD_BASE}/Offline/gen/gdml/mu2e_current.gdml + [ $? -ne 0 ] && RC=1 rm -f $TMPF elif [ "$COMMAND" == "TEST03" ]; then From 71d94e38e8121f31fdec4312bf1e00fffb880923 Mon Sep 17 00:00:00 2001 From: difalco Date: Thu, 22 Feb 2024 08:35:40 -0600 Subject: [PATCH 139/213] implementing PR hints and cleaning warnings --- Mu2eG4/src/GammaConvGenerator_module.cc | 95 ++++++-------- .../inc/GammaPairConversionSpectrum.hh | 25 +++- .../src/GammaPairConversionSpectrum.cc | 122 ++++++++---------- 3 files changed, 114 insertions(+), 128 deletions(-) diff --git a/Mu2eG4/src/GammaConvGenerator_module.cc b/Mu2eG4/src/GammaConvGenerator_module.cc index 92090dd242..570f6daf85 100644 --- a/Mu2eG4/src/GammaConvGenerator_module.cc +++ b/Mu2eG4/src/GammaConvGenerator_module.cc @@ -1,5 +1,6 @@ // Generates e+/e- from converted photons. -// This generator uses ... +// This generator uses Bethe Heitler model from G4 routines. +// First implementation by M. Mackenzie in SU2020 repository // // S. Di Falco, 2023 @@ -50,13 +51,12 @@ namespace mu2e { using Parameters= art::EDProducer::Table; explicit GammaConvGenerator(const Parameters& conf); - virtual void produce(art::Event& event) override; + void produce(art::Event& event) override; + void beginRun(art::Run& r) override; //---------------------------------------------------------------- private: - double particleMass_; - // Module label of the module that made the volume. std::string physVolModuleLabel_; // Module label of the last process that wrote the volume list. @@ -64,6 +64,7 @@ namespace mu2e { art::ProductToken const simsToken_; std::string stopMaterial_; + GammaPairConversionSpectrum::materialData materialData_; unsigned verbosity_; @@ -79,7 +80,6 @@ namespace mu2e { //================================================================ GammaConvGenerator::GammaConvGenerator(const Parameters& conf) : EDProducer{conf} - // , particleMass_(GlobalConstantsHandle()->particle(static_cast(PDGCode::e_minus)).mass()) , physVolModuleLabel_{conf().physVolModuleLabel()} , physVolProcessLabel_{conf().physVolProcessLabel()} , simsToken_{consumes(conf().inputSimParticles())} @@ -95,32 +95,15 @@ namespace mu2e { } //================================================================ - void GammaConvGenerator::produce(art::Event& event) { - auto output{std::make_unique()}; - - const auto simh = event.getValidHandle(simsToken_); - const auto gammas = simParticleList(simh,PDGCode::gamma,ProcessCode::conv); + void GammaConvGenerator::beginRun( art::Run &run){ - if(gammas.empty()) { - throw cet::exception("NO GAMMAS") - <<"GammaConvGenerator::produce(): no suitable converted gamma in the input SimParticleCollection\n"; - } - - // Take the converted gamma as SimParticle - const auto gammapart = gammas.at(eng_.operator unsigned int() % gammas.size()); - const auto p4_gamma = gammapart->endMomentum(); - const auto t_gammastop = gammapart->endGlobalTime(); - if (verbosity_>2){ - std::cout << "GAMMA 4-MOMENTUM: " << p4_gamma << std::endl; - std::cout << "END VOLUME INDEX: " << gammapart->endVolumeIndex() << std::endl; - } // // Handle to information about G4 physical volumes. bool PhysicalVolumeInfoFound=false; std::string wantedbranch="mu2e::PhysicalVolumeInfomvs_"+physVolModuleLabel_+"_eventlevel_"+physVolProcessLabel_+"."; if (verbosity_>2) std::cout << "Searching for " << wantedbranch << std::endl; - std::vector< art::Handle > vah = event.getMany(); + std::vector< art::Handle > vah = run.getMany(); art::Handle PhysicalVolumeInfos; for (auto const & ah : vah){ @@ -143,46 +126,50 @@ namespace mu2e { throw cet::exception("EMPTY PHYSICALVOLUMEINFO COLLECTION") <<"GammaConvGenerator::produce(): PhysicalVolume collection is empty\n"; } - //const auto& vols = PhysicalVolumeInfos->at(gammapart->simStage()); - /* - PhysicalVolumeInfoSingleStage const* vols = &PhysicalVolumeInfos->at(gammapart->simStage()); - if (verbosity_>2){ - std::cout << "VOLUME COLLECTION SIZE: " << vols->size() << std::endl; - for ( long unsigned int i=0;isize();i++){ - std::cout << i << " " << vols->at(cet::map_vector_key(i)).name() << " made of " << vols->at(cet::map_vector_key(i)).materialName() << std::endl; - //for (auto const & vol : vols){ - // std::cout << vol << " " << vol.name() << " made of " << vol.materialName() << std::endl; - } - } - //const auto& endInfo = vols.at(gammapart->endVolumeIndex()); - PhysicalVolumeInfo const& endInfo = vols->at(cet::map_vector_key(gammapart->endVolumeIndex())); - - if (verbosity_>1){ - std::cout << "Gamma stop found in: " << endInfo.materialName() << std::endl; - std::cout << "Requested material is:" << " " << stopMaterial_ << std::endl; - } - G4Material*stopMat = findMaterialOrThrow((G4String const& )endInfo.materialName()); - */ - G4Material*stopMat = findMaterialOrThrow((G4String const& )stopMaterial_); + G4String const& stopmat=stopMaterial_; + G4Material*stopMat = findMaterialOrThrow(stopmat); auto elements= stopMat->GetElementVector(); auto eleFracs= stopMat->GetFractionVector(); - int ele_size=elements->size(); + unsigned long ele_size=elements->size(); if (ele_size > kMaxConversionMaterialElements) { throw cet::exception("TOO MANY MATERIAL ELEMENTS") << ele_size << " while maximum allowed is " << kMaxConversionMaterialElements << "\n"; } //create a corresponding material - GammaPairConversionSpectrum::materialData material; - for (int iele=0;iele_elementMap[elements->at(iele)->GetZ()]); - material.elementFractions.push_back(eleFracs[iele]); - if (verbosity_>1){ - std::cout << "Z= " << elements->at(iele)->GetZ() << " frac=" << eleFracs[iele] << std::endl; - } + for (unsigned long iele=0;ieleGetElementMap()[(int)elements->at(iele)->GetZ()]); + materialData_.elementFractions.push_back(eleFracs[iele]); + if (verbosity_>1){ + std::cout << "Z= " << elements->at(iele)->GetZ() << " frac=" << eleFracs[iele] << std::endl; + } + } + + } + //================================================================ + void GammaConvGenerator::produce(art::Event& event) { + auto output{std::make_unique()}; + + const auto simh = event.getValidHandle(simsToken_); + const auto gammas = simParticleList(simh,PDGCode::gamma,ProcessCode::conv); + + if(gammas.empty()) { + throw cet::exception("NO GAMMAS") + <<"GammaConvGenerator::produce(): no suitable converted gamma in the input SimParticleCollection\n"; + } + + // Take the converted gamma as SimParticle + // + // const auto gammapart = gammas.at(eng_.operator unsigned int() % gammas.size()); + const auto gammapart = gammas.at(randFlat_.fireInt(gammas.size())); + const auto p4_gamma = gammapart->endMomentum(); + const auto t_gammastop = gammapart->endGlobalTime(); + if (verbosity_>2){ + std::cout << "GAMMA 4-MOMENTUM: " << p4_gamma << std::endl; + std::cout << "END VOLUME INDEX: " << gammapart->endVolumeIndex() << std::endl; } CLHEP::HepLorentzVector p4_eminus, p4_eplus; //sample the spectrum - spectrum_->fire(p4_gamma, material, p4_eminus, p4_eplus); + spectrum_->fire(p4_gamma, materialData_, p4_eminus, p4_eplus); output->emplace_back(gammapart, process, diff --git a/Mu2eUtilities/inc/GammaPairConversionSpectrum.hh b/Mu2eUtilities/inc/GammaPairConversionSpectrum.hh index 570c95a599..a428a66e39 100644 --- a/Mu2eUtilities/inc/GammaPairConversionSpectrum.hh +++ b/Mu2eUtilities/inc/GammaPairConversionSpectrum.hh @@ -35,15 +35,12 @@ namespace mu2e { double fCoulomb; }; struct materialData { - std::vector elements; + std::vector elementDatas; std::vector elementFractions; }; - GammaPairConversionSpectrum(){ _correlateAngleOverKE = false;} GammaPairConversionSpectrum(CLHEP::RandFlat* randFlat, bool correlateAngleOverKE = false); - // random number generators are owned by the callers, no memory cleanup needed - ~GammaPairConversionSpectrum(){} void fire(const CLHEP::HepLorentzVector &photon, elementData &material, CLHEP::HepLorentzVector &electron, CLHEP::HepLorentzVector &positron); @@ -66,15 +63,29 @@ namespace mu2e { double sampleThetaU(double ke); void initializeElementData(); + std::map GetElementMap(){return _elementMap;}; - public: - std::map _elementMap; //map of element data by Z (standard A values assumed) private: + std::map _elementMap; //map of element data by Z (standard A values assumed) + CLHEP::RandFlat* _rndFlat; bool _correlateAngleOverKE; //add or remove correlation that disappeared in GEANT 4.10.4p03b --> 4.10.5.p01a - int _gMaxZet; //maximum element Z double _me; // electron mass + const double nele = 2.; + const double eps0max = 0.5; // photon energy>2*me <=> me<= 0.5 * photonenergy + const double min_gamma_energy = 2.; //MeV + const double middle_energy = 50.; // MeV + const double DF_const=136.; // delta factor constant + const double FZ_const=8.; // FZ constant + const double DM_const=4.; // delta min constant + const double cubic_root=1./3.; + const double deltamin=1.4; + const double sf1a[3]={42.038,-8.29,0.958}; // screen 1 funtion pars for delta>deltamin + const double sf1b[3]={42.184,7.444,-1.623}; // screen 1 funtion pars for delta<=deltamin + const double sf2b[3]={41.326,5.848,-0.902}; // screen 1 funtion pars for delta<=deltamin + const double u_const=2.; + const int z_max=121; }; } // end of namespace mu2e diff --git a/Mu2eUtilities/src/GammaPairConversionSpectrum.cc b/Mu2eUtilities/src/GammaPairConversionSpectrum.cc index 1198ad2918..2ed2862be8 100644 --- a/Mu2eUtilities/src/GammaPairConversionSpectrum.cc +++ b/Mu2eUtilities/src/GammaPairConversionSpectrum.cc @@ -18,11 +18,9 @@ namespace mu2e { GammaPairConversionSpectrum::GammaPairConversionSpectrum(CLHEP::RandFlat* rndFlat, bool correlateAngleOverKE): _rndFlat (rndFlat), - _correlateAngleOverKE(correlateAngleOverKE), - _gMaxZet (120){ + _correlateAngleOverKE(correlateAngleOverKE){ GlobalConstantsHandle pdt; - // _me = pdt->particle(PDGCode::e_minus ).ref().mass().value(); _me = pdt->particle(PDGCode::e_minus ).mass(); //initialize some element data GammaPairConversionSpectrum::initializeElementData(); @@ -30,77 +28,68 @@ namespace mu2e { //get a random conversion event void GammaPairConversionSpectrum::fire(const CLHEP::HepLorentzVector &photon, - GammaPairConversionSpectrum::elementData &material, - CLHEP::HepLorentzVector &electron, - CLHEP::HepLorentzVector &positron) { - if(photon.e() < 2.*_me) - throw cet::exception("ERROR") << "GammaPairConversion::" << __func__ - << " Photon energy below conversion threshold!"; + GammaPairConversionSpectrum::elementData &material, + CLHEP::HepLorentzVector &electron, + CLHEP::HepLorentzVector &positron) { + if(photon.e() < nele*_me) + throw cet::exception("ERROR") << "GammaPairConversion::fire: Photon energy below conversion threshold!"; if(material.z < 1) - throw cet::exception("ERROR") << "GammaPairConversion::" << __func__ - << " Conversion material has a Z < 1!"; + throw cet::exception("ERROR") << "GammaPairConversion::fire: Conversion material has a Z < 1!"; //sample the actual spectrum betheHeitlerModel(photon, material, electron, positron); } //select a random element and then get a random conversion event void GammaPairConversionSpectrum::fire(const CLHEP::HepLorentzVector &photon, - GammaPairConversionSpectrum::materialData &material, - CLHEP::HepLorentzVector &electron, - CLHEP::HepLorentzVector &positron) { - if(photon.e() < 2.*_me) - throw cet::exception("ERROR") << "GammaPairConversion::" << __func__ - << " Photon energy below conversion threshold!"; - if(material.elements.size() < 1) - throw cet::exception("ERROR") << "GammaPairConversion::" << __func__ - << " Conversion material has no elements!"; + GammaPairConversionSpectrum::materialData &material, + CLHEP::HepLorentzVector &electron, + CLHEP::HepLorentzVector &positron) { + if(photon.e() < nele*_me) + throw cet::exception("ERROR") << "GammaPairConversion::fire: Photon energy below conversion threshold!"; + if(material.elementDatas.size() < 1) + throw cet::exception("ERROR") << "GammaPairConversion::fire: Conversion material has no elements!"; //select a random element - double r, frac; - unsigned nElements = material.elements.size(), index; + double r=0., frac=0.; + unsigned nElements = material.elementDatas.size(), index=0; do { r = _rndFlat->fire(); - index = (unsigned) nElements*_rndFlat->fire(); + index = (unsigned) _rndFlat->fireInt(nElements); frac = material.elementFractions[index]; } while(r > frac); //fire with the specific material - fire(photon, material.elements[index], electron, positron); + fire(photon, material.elementDatas[index], electron, positron); } //recommended spectrum to use for photon energies below 80 GeV //From G4BetheHeitlerModel::SampleSecondaries void GammaPairConversionSpectrum::betheHeitlerModel(const CLHEP::HepLorentzVector &photon, - GammaPairConversionSpectrum::elementData &material, - CLHEP::HepLorentzVector &electron, - CLHEP::HepLorentzVector &positron){ + GammaPairConversionSpectrum::elementData &material, + CLHEP::HepLorentzVector &electron, + CLHEP::HepLorentzVector &positron){ double photon_energy = photon.e(); double eps0 = _me/photon_energy; //must have at least 2*_me energy to convert - if(eps0 > 0.5) return; + if(eps0 > eps0max) return; - double eps; - double small_energy = 2.; //MeV - if(photon_energy < small_energy) { - //simple case if low energy conversion - eps = eps0 + (0.5-eps0)*_rndFlat->fire(); - } else { + double eps=0.; + if(photon_energy >= min_gamma_energy) { //higher energy conversion (but BetheHeitlerModel used for < 80 GeV) - double middle_energy = 50.; // MeV - double deltaFactor = 136.*eps0/(material.z3); + double deltaFactor = DF_const*eps0/(material.z3); double deltaMax = material.deltaMaxLow; - double FZ = 8.*(material.logZ3); + double FZ = FZ_const*(material.logZ3); if(photon_energy > middle_energy) { - FZ += 8.*(material.fCoulomb); + FZ += FZ_const*(material.fCoulomb); deltaMax = material.deltaMaxHigh; } - double deltaMin = 4.*deltaFactor; + double deltaMin = DM_const*deltaFactor; //limits of esp - double epsp = 0.5 - 0.5*std::sqrt(1.-deltaMin/deltaMax); + double epsp = eps0max - eps0max*std::sqrt(1.-deltaMin/deltaMax); double epsMin = std::max(eps0, epsp); - double epsRange = 0.5 - epsMin; + double epsRange = eps0max - epsMin; //sample the energy rate (eps) of the created electron (or positron) - double F10, F20; + double F10=0., F20=0.; GammaPairConversionSpectrum::screenFunction12(deltaMin, F10, F20); F10 -= FZ; F20 -= FZ; @@ -109,12 +98,12 @@ namespace mu2e { const double normCond = normF1 / (normF1 + normF2); //three random numbers per sampling double greject = 0.; - double rndnum; + double rndnum=0.; do { rndnum = _rndFlat->fire(); if(normCond > rndnum) { rndnum = _rndFlat->fire(); - eps = 0.5 - epsRange * pow(rndnum,1./3.); //G4Pow::A13(rand) = rand^(1/3) + eps = eps0max - epsRange * pow(rndnum,cubic_root); //G4Pow::A13(rand) = rand^(1/3) const double delta = deltaFactor/(eps*(1.-eps)); greject = (GammaPairConversionSpectrum::screenFunction1(delta) - FZ)/F10; } else { @@ -138,7 +127,7 @@ namespace mu2e { CLHEP::Hep3Vector positron_dir, electron_dir; //sample from anglular distribution from Modified Tsai spectrum GammaPairConversionSpectrum::samplePairDirections(photon, electron_ke, - positron_ke,electron_dir, positron_dir); + positron_ke,electron_dir, positron_dir); //set electron and positron lorentz vectors electron_dir.setMag(std::sqrt(electron_energy*electron_energy - _me*_me)); //use as p vector @@ -152,26 +141,26 @@ namespace mu2e { //from G4BetheHeitlerModel::ScreenFunction1 double GammaPairConversionSpectrum::screenFunction1(const double delta) { - return (delta > 1.4) ? 42.038 - 8.29*log(delta + 0.958) : 42.184 - delta*(7.444 - 1.623*delta); + return (delta > deltamin) ? sf1a[0]+sf1a[1]*log(delta + sf1a[2]) : sf1b[0] - delta*(sf1b[1] + sf1b[2]*delta); } //from G4BetheHeitlerModel::ScreenFunction2 double GammaPairConversionSpectrum::screenFunction2(const double delta) { - return (delta > 1.4) ? 42.038 - 8.29*log(delta + 0.958) : 41.326 - delta*(5.848 - 0.902*delta); + return (delta > deltamin) ? sf1a[0]+sf1a[1]*log(delta + sf1a[2]) : sf2b[0] - delta*(sf2b[1] + sf2b[2]*delta); } //from G4BetheHeitlerModel::ScreenFunction12 void GammaPairConversionSpectrum::screenFunction12(const double delta, double &f1, double &f2) { - if (delta > 1.4) { - f1 = 42.038 - 8.29*log(delta + 0.958); + if (delta > deltamin) { + f1 = sf1a[0]+sf1a[1]*log(delta + sf1a[2]); f2 = f1; } else { - f1 = 42.184 - delta*(7.444 - 1.623*delta); - f2 = 41.326 - delta*(5.848 - 0.902*delta); + f1 = sf1b[0] - delta*(sf1b[1] + sf1b[2]*delta); + f2 = sf2b[0] - delta*(sf2b[1] + sf2b[2]*delta); } } //From G4ModifiedTsai::SamplePairDirections void GammaPairConversionSpectrum::samplePairDirections(const CLHEP::HepLorentzVector &photon, double electron_ke, - double positron_ke, CLHEP::Hep3Vector &electron_dir,CLHEP::Hep3Vector &positron_dir) { + double positron_ke, CLHEP::Hep3Vector &electron_dir,CLHEP::Hep3Vector &positron_dir) { CLHEP::Hep3Vector photon_dir(photon.vect()); photon_dir.setMag(1.); @@ -204,7 +193,7 @@ namespace mu2e { //From G4ModifiedTsai::SampleCosTheta(G4double kinEnergy) double GammaPairConversionSpectrum::sampleCosTheta(double ke) { - double uMax = 2.*(1. + ke/_me); + double uMax = u_const*(1. + ke/_me); static const double a1 = 1.6; static const double a2 = a1/3.; static const double border = 0.25; @@ -217,7 +206,7 @@ namespace mu2e { u = (border > rndnum1) ? uu*a1 : uu*a2; } while(u > uMax); //in GEANT 4.10.p03b used cos(u*me/ke) ~ 1 - (u*me/ke)^2 / 2 = 1 - 2*u^2/ (2 ke/me)^2 ~ 1 - 2*u^2/(2*(1+ke/me))^2 - return 1. - 2.*u*u/uMax/uMax; + return 1. - u_const*u*u/uMax/uMax; } //From G4BetheHeitlerModel::SampleSecondaries, used in 4.10.4.p03b @@ -234,23 +223,22 @@ namespace mu2e { } void GammaPairConversionSpectrum::initializeElementData() { - for(int z = 1; z < 121; ++z) { - double z3 = pow(z, 1./3.); + for(int z = 1; z < z_max; ++z) { + double z3 = pow(z, cubic_root); //from G4Element::ComputeCoulombFactor() const double k1 = 0.0083, k2 = 0.20206, k3 = 0.0020, k4 = 0.0369; - const double alpha = 1./137.036; //fine structure constant - double az2 = (alpha*z)*(alpha*z); //should use effective z! + double az2 = (CLHEP::fine_structure_const*z)*(CLHEP::fine_structure_const*z); //should use effective z! double az4 = az2*az2; double fCoulomb = (k1*az4 + k2 + 1./(1.+az2))*az2 - (k3*az4 + k4)*az4; - double FZLow = 8.*log(z3); - double FZHigh = FZLow + 8.*fCoulomb; - GammaPairConversionSpectrum::elementData data; - data.fCoulomb = fCoulomb; - data.z = z; - data.z3 = z3; - data.logZ3 = log(z)/3.; - data.deltaMaxLow = exp((42.038 - FZLow )/8.29) - 0.958; - data.deltaMaxHigh = exp((42.038 - FZHigh)/8.29) - 0.958; + double FZLow = FZ_const*log(z3); + double FZHigh = FZLow + FZ_const*fCoulomb; + GammaPairConversionSpectrum::elementData data={ + z, + z3, + log(z)*cubic_root, + exp(-(sf1a[0] - FZLow )/sf1a[1]) - sf1a[2], + exp(-(sf1a[0] - FZHigh )/sf1a[1]) - sf1a[2], + fCoulomb}; _elementMap[z] = data; } } From 63356a16bd40e993eb34a10c431169233571d3e5 Mon Sep 17 00:00:00 2001 From: difalco Date: Thu, 22 Feb 2024 11:46:40 -0600 Subject: [PATCH 140/213] unnecessary call to PhysVol list deleted and more cleaning --- Mu2eG4/src/GammaConvGenerator_module.cc | 51 +++---------------------- 1 file changed, 6 insertions(+), 45 deletions(-) diff --git a/Mu2eG4/src/GammaConvGenerator_module.cc b/Mu2eG4/src/GammaConvGenerator_module.cc index 570f6daf85..fb4d502cef 100644 --- a/Mu2eG4/src/GammaConvGenerator_module.cc +++ b/Mu2eG4/src/GammaConvGenerator_module.cc @@ -23,7 +23,6 @@ #include "Offline/SeedService/inc/SeedService.hh" #include "Offline/DataProducts/inc/PDGCode.hh" #include "Offline/MCDataProducts/inc/StageParticle.hh" -#include "Offline/MCDataProducts/inc/PhysicalVolumeInfoMultiCollection.hh" #include "Offline/Mu2eUtilities/inc/simParticleList.hh" #include "Offline/MCDataProducts/inc/GenParticle.hh" #include "Offline/Mu2eUtilities/inc/GammaPairConversionSpectrum.hh" @@ -40,8 +39,6 @@ namespace mu2e { struct Config { using Name=fhicl::Name; using Comment=fhicl::Comment; - fhicl::Atom physVolModuleLabel{Name("physVolModuleLabel"),Comment("module creating physical volumes")}; - fhicl::Atom physVolProcessLabel{Name("physVolProcessLabel"),Comment("module creating physical volumes"),"Primary"}; fhicl::Atom inputSimParticles{Name("inputSimParticles"),Comment("A SimParticleCollection with input converted photons.")}; fhicl::Atom stopMaterial{Name("stopMaterial"),Comment("G4 name of the material where the photon has converted (temporary)."),"ST_Wires"}; fhicl::Atom verbosity{Name("verbosity")}; @@ -52,16 +49,11 @@ namespace mu2e { explicit GammaConvGenerator(const Parameters& conf); void produce(art::Event& event) override; - void beginRun(art::Run& r) override; + void beginSubRun(art::SubRun& subrun) override; //---------------------------------------------------------------- private: - // Module label of the module that made the volume. - std::string physVolModuleLabel_; - // Module label of the last process that wrote the volume list. - std::string physVolProcessLabel_; - art::ProductToken const simsToken_; std::string stopMaterial_; GammaPairConversionSpectrum::materialData materialData_; @@ -80,8 +72,6 @@ namespace mu2e { //================================================================ GammaConvGenerator::GammaConvGenerator(const Parameters& conf) : EDProducer{conf} - , physVolModuleLabel_{conf().physVolModuleLabel()} - , physVolProcessLabel_{conf().physVolProcessLabel()} , simsToken_{consumes(conf().inputSimParticles())} , stopMaterial_{conf().stopMaterial()} , verbosity_{conf().verbosity()} @@ -95,52 +85,23 @@ namespace mu2e { } //================================================================ - void GammaConvGenerator::beginRun( art::Run &run){ + void GammaConvGenerator::beginSubRun( art::SubRun &subrun){ - // - // Handle to information about G4 physical volumes. - bool PhysicalVolumeInfoFound=false; - std::string wantedbranch="mu2e::PhysicalVolumeInfomvs_"+physVolModuleLabel_+"_eventlevel_"+physVolProcessLabel_+"."; - if (verbosity_>2) std::cout << "Searching for " << wantedbranch << std::endl; - - std::vector< art::Handle > vah = run.getMany(); - art::Handle PhysicalVolumeInfos; - - for (auto const & ah : vah){ - std::string branchName = ah.provenance()->productDescription().branchName(); - if (verbosity_>2) std::cout << "PHYSICALVOLUMEINFO COLLECTION: " << branchName << std::endl; - if (branchName==wantedbranch){ - PhysicalVolumeInfoFound=true; - PhysicalVolumeInfos=ah; - if (verbosity_>2){ - std::cout << "PHYSICALVOLUMEINFO COLLECTION FOUND" << std::endl; - std::cout << PhysicalVolumeInfos << std::endl; - } - } - } - if (!PhysicalVolumeInfoFound){ - throw cet::exception("NO PHYSICALVOLUMEINFO COLLECTION") - <<"GammaConvGenerator::produce(): no suitable PhysicalVolume collection\n"; - } - if (PhysicalVolumeInfos->empty()){ - throw cet::exception("EMPTY PHYSICALVOLUMEINFO COLLECTION") - <<"GammaConvGenerator::produce(): PhysicalVolume collection is empty\n"; - } G4String const& stopmat=stopMaterial_; G4Material*stopMat = findMaterialOrThrow(stopmat); auto elements= stopMat->GetElementVector(); - auto eleFracs= stopMat->GetFractionVector(); - unsigned long ele_size=elements->size(); + auto const& eleFracs= stopMat->GetFractionVector(); + size_t ele_size=elements->size(); if (ele_size > kMaxConversionMaterialElements) { throw cet::exception("TOO MANY MATERIAL ELEMENTS") << ele_size << " while maximum allowed is " << kMaxConversionMaterialElements << "\n"; } //create a corresponding material - for (unsigned long iele=0;ieleGetElementMap()[(int)elements->at(iele)->GetZ()]); materialData_.elementFractions.push_back(eleFracs[iele]); if (verbosity_>1){ - std::cout << "Z= " << elements->at(iele)->GetZ() << " frac=" << eleFracs[iele] << std::endl; + std::cout << "Z= " << elements->at(iele)->GetZ() << " frac=" << eleFracs[iele] << std::endl; } } From 774de666a92995b6d39111834cef6f801123a504 Mon Sep 17 00:00:00 2001 From: difalco Date: Thu, 22 Feb 2024 12:22:55 -0600 Subject: [PATCH 141/213] unnecessary call to PhysVol list deleted and more cleaning --- Mu2eG4/src/GammaConvGenerator_module.cc | 2 +- Mu2eUtilities/inc/GammaPairConversionSpectrum.hh | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/Mu2eG4/src/GammaConvGenerator_module.cc b/Mu2eG4/src/GammaConvGenerator_module.cc index fb4d502cef..74d9244c9b 100644 --- a/Mu2eG4/src/GammaConvGenerator_module.cc +++ b/Mu2eG4/src/GammaConvGenerator_module.cc @@ -121,7 +121,7 @@ namespace mu2e { // Take the converted gamma as SimParticle // // const auto gammapart = gammas.at(eng_.operator unsigned int() % gammas.size()); - const auto gammapart = gammas.at(randFlat_.fireInt(gammas.size())); + const auto gammapart = gammas.at(randFlat_.fireInt((long)gammas.size())); const auto p4_gamma = gammapart->endMomentum(); const auto t_gammastop = gammapart->endGlobalTime(); if (verbosity_>2){ diff --git a/Mu2eUtilities/inc/GammaPairConversionSpectrum.hh b/Mu2eUtilities/inc/GammaPairConversionSpectrum.hh index a428a66e39..d21cd51623 100644 --- a/Mu2eUtilities/inc/GammaPairConversionSpectrum.hh +++ b/Mu2eUtilities/inc/GammaPairConversionSpectrum.hh @@ -13,6 +13,7 @@ // C++ includes #include +#include #include #include #include @@ -81,9 +82,9 @@ namespace mu2e { const double DM_const=4.; // delta min constant const double cubic_root=1./3.; const double deltamin=1.4; - const double sf1a[3]={42.038,-8.29,0.958}; // screen 1 funtion pars for delta>deltamin - const double sf1b[3]={42.184,7.444,-1.623}; // screen 1 funtion pars for delta<=deltamin - const double sf2b[3]={41.326,5.848,-0.902}; // screen 1 funtion pars for delta<=deltamin + std::array sf1a={42.038,-8.29,0.958}; // screen 1 function pars for delta>deltamin + std::array sf1b={42.184,7.444,-1.623};// screen 1 function pars for delta<=deltamin + std::array sf2b={41.326,5.848,-0.902}; // screen 2 function pars for delta<=deltamin const double u_const=2.; const int z_max=121; }; From 71e9a7b7b67a38026587ee789335f05d2579ff2a Mon Sep 17 00:00:00 2001 From: difalco Date: Thu, 22 Feb 2024 16:41:51 -0600 Subject: [PATCH 142/213] commented out code deleted --- Mu2eG4/src/GammaConvGenerator_module.cc | 1 - .../inc/GammaPairConversionSpectrum.hh | 3 --- .../src/GammaPairConversionSpectrum.cc | 20 +++++++++---------- 3 files changed, 10 insertions(+), 14 deletions(-) diff --git a/Mu2eG4/src/GammaConvGenerator_module.cc b/Mu2eG4/src/GammaConvGenerator_module.cc index 74d9244c9b..7564f2166e 100644 --- a/Mu2eG4/src/GammaConvGenerator_module.cc +++ b/Mu2eG4/src/GammaConvGenerator_module.cc @@ -120,7 +120,6 @@ namespace mu2e { // Take the converted gamma as SimParticle // - // const auto gammapart = gammas.at(eng_.operator unsigned int() % gammas.size()); const auto gammapart = gammas.at(randFlat_.fireInt((long)gammas.size())); const auto p4_gamma = gammapart->endMomentum(); const auto t_gammastop = gammapart->endGlobalTime(); diff --git a/Mu2eUtilities/inc/GammaPairConversionSpectrum.hh b/Mu2eUtilities/inc/GammaPairConversionSpectrum.hh index d21cd51623..5fbaf26098 100644 --- a/Mu2eUtilities/inc/GammaPairConversionSpectrum.hh +++ b/Mu2eUtilities/inc/GammaPairConversionSpectrum.hh @@ -1,9 +1,6 @@ #ifndef Mu2eUtilities_GammaPairConversionSpectrum_hh #define Mu2eUtilities_GammaPairConversionSpectrum_hh -// Mu2e includes -// #include "Mu2eUtilities/inc/Table.hh" - // CLHEP includes #include "CLHEP/Vector/ThreeVector.h" #include "CLHEP/Vector/LorentzVector.h" diff --git a/Mu2eUtilities/src/GammaPairConversionSpectrum.cc b/Mu2eUtilities/src/GammaPairConversionSpectrum.cc index 2ed2862be8..9b5aebf60d 100644 --- a/Mu2eUtilities/src/GammaPairConversionSpectrum.cc +++ b/Mu2eUtilities/src/GammaPairConversionSpectrum.cc @@ -2,7 +2,6 @@ // Mu2e includes #include "Offline/GlobalConstantsService/inc/GlobalConstantsHandle.hh" #include "Offline/GlobalConstantsService/inc/PhysicsParams.hh" -//#include "Offline/GlobalConstantsService/inc/ParticleDataTable.hh" #include "Offline/GlobalConstantsService/inc/ParticleDataList.hh" // Framework includes @@ -28,9 +27,9 @@ namespace mu2e { //get a random conversion event void GammaPairConversionSpectrum::fire(const CLHEP::HepLorentzVector &photon, - GammaPairConversionSpectrum::elementData &material, - CLHEP::HepLorentzVector &electron, - CLHEP::HepLorentzVector &positron) { + GammaPairConversionSpectrum::elementData &material, + CLHEP::HepLorentzVector &electron, + CLHEP::HepLorentzVector &positron) { if(photon.e() < nele*_me) throw cet::exception("ERROR") << "GammaPairConversion::fire: Photon energy below conversion threshold!"; if(material.z < 1) @@ -41,9 +40,9 @@ namespace mu2e { //select a random element and then get a random conversion event void GammaPairConversionSpectrum::fire(const CLHEP::HepLorentzVector &photon, - GammaPairConversionSpectrum::materialData &material, - CLHEP::HepLorentzVector &electron, - CLHEP::HepLorentzVector &positron) { + GammaPairConversionSpectrum::materialData &material, + CLHEP::HepLorentzVector &electron, + CLHEP::HepLorentzVector &positron) { if(photon.e() < nele*_me) throw cet::exception("ERROR") << "GammaPairConversion::fire: Photon energy below conversion threshold!"; if(material.elementDatas.size() < 1) @@ -127,7 +126,7 @@ namespace mu2e { CLHEP::Hep3Vector positron_dir, electron_dir; //sample from anglular distribution from Modified Tsai spectrum GammaPairConversionSpectrum::samplePairDirections(photon, electron_ke, - positron_ke,electron_dir, positron_dir); + positron_ke,electron_dir, positron_dir); //set electron and positron lorentz vectors electron_dir.setMag(std::sqrt(electron_energy*electron_energy - _me*_me)); //use as p vector @@ -159,8 +158,9 @@ namespace mu2e { } //From G4ModifiedTsai::SamplePairDirections - void GammaPairConversionSpectrum::samplePairDirections(const CLHEP::HepLorentzVector &photon, double electron_ke, - double positron_ke, CLHEP::Hep3Vector &electron_dir,CLHEP::Hep3Vector &positron_dir) { + void GammaPairConversionSpectrum::samplePairDirections(const CLHEP::HepLorentzVector &photon, + double electron_ke,double positron_ke, CLHEP::Hep3Vector &electron_dir, + CLHEP::Hep3Vector &positron_dir) { CLHEP::Hep3Vector photon_dir(photon.vect()); photon_dir.setMag(1.); From 5feebc638820c8d3f3c6998202d7abec67dd1347 Mon Sep 17 00:00:00 2001 From: difalco Date: Thu, 22 Feb 2024 17:11:50 -0600 Subject: [PATCH 143/213] memory leak fixed --- Mu2eG4/src/GammaConvGenerator_module.cc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Mu2eG4/src/GammaConvGenerator_module.cc b/Mu2eG4/src/GammaConvGenerator_module.cc index 7564f2166e..989d3ffd9f 100644 --- a/Mu2eG4/src/GammaConvGenerator_module.cc +++ b/Mu2eG4/src/GammaConvGenerator_module.cc @@ -64,7 +64,7 @@ namespace mu2e { CLHEP::RandFlat randFlat_; bool useCorrelatedAngleOverKE_; //correlate the cos/ke for the e+ and e- - GammaPairConversionSpectrum* spectrum_; //pair production spectrum + GammaPairConversionSpectrum spectrum_; //pair production spectrum enum {kMaxConversionMaterialElements = 10}; ProcessCode process; }; @@ -78,7 +78,7 @@ namespace mu2e { , eng_{createEngine(art::ServiceHandle()->getSeed())} , randFlat_{eng_} , useCorrelatedAngleOverKE_(conf().useCorrelatedAngleOverKE()) - , spectrum_ (new GammaPairConversionSpectrum(&randFlat_, useCorrelatedAngleOverKE_)) + , spectrum_ (GammaPairConversionSpectrum(&randFlat_, useCorrelatedAngleOverKE_)) { produces(); process = ProcessCode::mu2eGammaConversion; @@ -98,7 +98,7 @@ namespace mu2e { } //create a corresponding material for (size_t iele=0;ieleGetElementMap()[(int)elements->at(iele)->GetZ()]); + materialData_.elementDatas.push_back(spectrum_.GetElementMap()[(int)elements->at(iele)->GetZ()]); materialData_.elementFractions.push_back(eleFracs[iele]); if (verbosity_>1){ std::cout << "Z= " << elements->at(iele)->GetZ() << " frac=" << eleFracs[iele] << std::endl; @@ -129,7 +129,7 @@ namespace mu2e { } CLHEP::HepLorentzVector p4_eminus, p4_eplus; //sample the spectrum - spectrum_->fire(p4_gamma, materialData_, p4_eminus, p4_eplus); + spectrum_.fire(p4_gamma, materialData_, p4_eminus, p4_eplus); output->emplace_back(gammapart, process, From 248818a79fc7b8d6d066bd4ff4654389954a014f Mon Sep 17 00:00:00 2001 From: difalco Date: Thu, 22 Feb 2024 17:21:35 -0600 Subject: [PATCH 144/213] changed const to static constexpr --- .../inc/GammaPairConversionSpectrum.hh | 28 +++++++++---------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/Mu2eUtilities/inc/GammaPairConversionSpectrum.hh b/Mu2eUtilities/inc/GammaPairConversionSpectrum.hh index 5fbaf26098..b8755ca15d 100644 --- a/Mu2eUtilities/inc/GammaPairConversionSpectrum.hh +++ b/Mu2eUtilities/inc/GammaPairConversionSpectrum.hh @@ -70,20 +70,20 @@ namespace mu2e { CLHEP::RandFlat* _rndFlat; bool _correlateAngleOverKE; //add or remove correlation that disappeared in GEANT 4.10.4p03b --> 4.10.5.p01a double _me; // electron mass - const double nele = 2.; - const double eps0max = 0.5; // photon energy>2*me <=> me<= 0.5 * photonenergy - const double min_gamma_energy = 2.; //MeV - const double middle_energy = 50.; // MeV - const double DF_const=136.; // delta factor constant - const double FZ_const=8.; // FZ constant - const double DM_const=4.; // delta min constant - const double cubic_root=1./3.; - const double deltamin=1.4; - std::array sf1a={42.038,-8.29,0.958}; // screen 1 function pars for delta>deltamin - std::array sf1b={42.184,7.444,-1.623};// screen 1 function pars for delta<=deltamin - std::array sf2b={41.326,5.848,-0.902}; // screen 2 function pars for delta<=deltamin - const double u_const=2.; - const int z_max=121; + static constexpr double nele = 2.; + static constexpr double eps0max = 0.5; // photon energy>2*me <=> me<= 0.5 * photonenergy + static constexpr double min_gamma_energy = 2.; //MeV + static constexpr double middle_energy = 50.; // MeV + static constexpr double DF_const=136.; // delta factor constant + static constexpr double FZ_const=8.; // FZ constant + static constexpr double DM_const=4.; // delta min constant + static constexpr double cubic_root=1./3.; + static constexpr double deltamin=1.4; + static constexpr std::array sf1a={42.038,-8.29,0.958}; // screen 1 function pars for delta>deltamin + static constexpr std::array sf1b={42.184,7.444,-1.623};// screen 1 function pars for delta<=deltamin + static constexpr std::array sf2b={41.326,5.848,-0.902}; // screen 2 function pars for delta<=deltamin + static constexpr double u_const=2.; + static constexpr int z_max=121; }; } // end of namespace mu2e From a6ea179da20a3298430c247b575d5918fc9ed009 Mon Sep 17 00:00:00 2001 From: difalco Date: Thu, 22 Feb 2024 17:29:15 -0600 Subject: [PATCH 145/213] memory leak fixed --- Mu2eG4/src/GammaConvGenerator_module.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Mu2eG4/src/GammaConvGenerator_module.cc b/Mu2eG4/src/GammaConvGenerator_module.cc index 989d3ffd9f..ef32ce604d 100644 --- a/Mu2eG4/src/GammaConvGenerator_module.cc +++ b/Mu2eG4/src/GammaConvGenerator_module.cc @@ -78,7 +78,7 @@ namespace mu2e { , eng_{createEngine(art::ServiceHandle()->getSeed())} , randFlat_{eng_} , useCorrelatedAngleOverKE_(conf().useCorrelatedAngleOverKE()) - , spectrum_ (GammaPairConversionSpectrum(&randFlat_, useCorrelatedAngleOverKE_)) + , spectrum_ (&randFlat_, useCorrelatedAngleOverKE_) { produces(); process = ProcessCode::mu2eGammaConversion; From 2c7c6aa76b9ca445db02e2e866d38b75b5ba95d6 Mon Sep 17 00:00:00 2001 From: David Nathan Brown Date: Fri, 23 Feb 2024 11:20:31 -0800 Subject: [PATCH 146/213] Add cut on NDOF for stereoline fit and propagate --- RecoDataProducts/inc/StrawHitFlag.hh | 2 +- RecoDataProducts/src/StrawHitFlag.cc | 1 + TrkDiag/src/ComboHitDiag_module.cc | 4 +++- .../data/TrainBkgDiagStationSpatial_SLine.dat | 17 ----------------- TrkHitReco/fcl/prolog.fcl | 1 + TrkHitReco/src/MakeStereoHits_module.cc | 12 +++++++++--- 6 files changed, 15 insertions(+), 22 deletions(-) delete mode 100644 TrkHitReco/data/TrainBkgDiagStationSpatial_SLine.dat diff --git a/RecoDataProducts/inc/StrawHitFlag.hh b/RecoDataProducts/inc/StrawHitFlag.hh index 192378660f..aa72b9ed5e 100644 --- a/RecoDataProducts/inc/StrawHitFlag.hh +++ b/RecoDataProducts/inc/StrawHitFlag.hh @@ -20,7 +20,7 @@ namespace mu2e { calosel=12, strawxtalk=13, elecxtalk=14, trksel=15, active=16,doca=17, resolvedphi=18, calopresel=19, intime=20, panelcombo=21, track=22, - dead=23, noisy=24, nhitsel=25}; + dead=23, noisy=24, nhitsel=25, sline=26}; // functions needed for the BitMap template static std::string const& typeName(); static std::map const& bitNames(); diff --git a/RecoDataProducts/src/StrawHitFlag.cc b/RecoDataProducts/src/StrawHitFlag.cc index 6b7723f65b..44f5c56398 100644 --- a/RecoDataProducts/src/StrawHitFlag.cc +++ b/RecoDataProducts/src/StrawHitFlag.cc @@ -46,6 +46,7 @@ namespace mu2e { bitnames[std::string("Dead")] = bit_to_mask(dead); bitnames[std::string("Noisy")] = bit_to_mask(noisy); bitnames[std::string("NHitSelection")] = bit_to_mask(nhitsel); + bitnames[std::string("StereoLineFit")] = bit_to_mask(sline); } return bitnames; } diff --git a/TrkDiag/src/ComboHitDiag_module.cc b/TrkDiag/src/ComboHitDiag_module.cc index 1995393089..523c29f9af 100644 --- a/TrkDiag/src/ComboHitDiag_module.cc +++ b/TrkDiag/src/ComboHitDiag_module.cc @@ -96,7 +96,7 @@ namespace mu2e int _nsh, _nch; // number of associated straw hits int _strawid, _straw, _panel, _plane, _level; // strawid info int _eend; - int _esel,_rsel, _tsel, _nsel, _bkgclust, _bkg, _sth, _ph, _tdiv, _isolated, _strawxtalk, _elecxtalk, _calosel; + int _esel,_rsel, _tsel, _nsel, _bkgclust, _bkg, _sth, _ph, _tdiv, _isolated, _strawxtalk, _elecxtalk, _calosel, _sline; // mc diag XYZVectorF _mcpos, _mcmom; float _mctime, _mcwdist; @@ -173,6 +173,7 @@ namespace mu2e _chdiag->Branch("elecxtalk",&_elecxtalk,"elecxtalk/I"); _chdiag->Branch("isolated",&_isolated,"isolated/I"); _chdiag->Branch("calosel",&_calosel,"calosel/I"); + _chdiag->Branch("sline",&_sline,"sline/I"); _chdiag->Branch("strawid",&_strawid,"strawid/I"); _chdiag->Branch("straw",&_straw,"straw/I"); _chdiag->Branch("panel",&_panel,"panel/I"); @@ -252,6 +253,7 @@ namespace mu2e _tsel = flag.hasAllProperties(StrawHitFlag::timesel); _nsel = flag.hasAllProperties(StrawHitFlag::nhitsel); _calosel = flag.hasAllProperties(StrawHitFlag::calosel); + _sline = flag.hasAllProperties(StrawHitFlag::sline); _strawxtalk = flag.hasAllProperties(StrawHitFlag::strawxtalk); _elecxtalk = flag.hasAllProperties(StrawHitFlag::elecxtalk); _isolated = flag.hasAllProperties(StrawHitFlag::isolated); diff --git a/TrkHitReco/data/TrainBkgDiagStationSpatial_SLine.dat b/TrkHitReco/data/TrainBkgDiagStationSpatial_SLine.dat deleted file mode 100644 index 7653c45ed7..0000000000 --- a/TrkHitReco/data/TrainBkgDiagStationSpatial_SLine.dat +++ /dev/null @@ -1,17 +0,0 @@ -tensor_dense3kernel0 18 --0.073272787 0.0978089198 -0.104029208 -0.29485476 -0.124046102 0.334590226 0.388348192 -0.136069655 -0.511074543 -0.105709903 0.000908014015 -0.453948945 0.244288489 -0.375525028 -0.219088212 -0.0706026629 0.0952798203 0.0248482823 -tensor_dense2bias0 18 --0.0608826727 -0.173605815 0.0151254544 -0.107946783 -0.160998687 -1.0553726 -0.858537674 0.0343997292 0 1.07617927 -1.14818835 0.355332226 -1.10271871 -0.141217217 0.99751997 1.00591958 0.133207262 0 -tensor_densebias0 18 -0.996250391 0 -0.953353226 -0.118971065 0 0 0 0.907661736 -1.91521752 -1.40880477 -1.31188631 0 1.02157688 -1.19246352 0 0 0.94493407 0 -tensor_densekernel0 162 -0.237582907 -0.338114142 -0.000987342326 0.18030037 -0.0544456244 -0.150726676 -0.392378747 0.198864698 0.0219259057 0.321132571 0.17300266 -0.160468221 0.0565257296 0.0120839076 -0.0596049726 -0.154166311 0.247620329 -0.250395894 -1.2578485 -0.383267134 0.037854977 0.670674622 0.000494748354 0.159648865 0.306595176 -0.188943446 -0.481506914 0.108944878 0.272550166 -0.120880872 -0.706038237 -0.172178179 -0.232811332 0.254093796 -0.323794842 -0.168923885 0.577651322 -0.243460089 0.0687387437 -0.672371209 -0.250133574 -0.115869999 -0.288632631 -0.0429469049 -0.571347117 -0.329337806 -0.551994503 0.113058954 0.145634055 0.118817583 -0.179108381 0.424469203 0.685199678 -0.147629857 0.443984985 0.12521717 -1.12148011 -1.37973905 0.337865978 -0.291082561 -0.468009293 0.0227235872 0.416201681 0.0398242474 -0.39945519 0.371359497 -0.94106847 -0.0361566059 0.0436781943 -0.113875151 -0.0391744785 -0.0201506913 -1.86140811 0.466106147 1.91868913 0.268382221 0.264378399 -0.0349995196 0.0792139471 -2.87181711 2.41427064 1.65877414 1.83149564 -0.366973639 -1.24701619 2.08745885 -0.183281809 -0.347004771 -2.16105652 -0.0750851035 0.89319241 -0.405291408 -1.22111082 -2.15270352 -0.33656776 0.0970840752 -0.154896855 1.95982409 -0.178261608 -1.40112567 -1.96888196 -0.0413707793 1.1193037 -0.978088677 0.0634376109 0.0718326271 1.36185789 -0.182117552 -0.0190352239 -0.409866989 0.216486007 -0.739376545 0.11504212 -0.245147198 -0.309642434 -0.265233368 0.379894704 -0.183324441 0.0971908495 0.210021347 0.332819194 -1.34440303 -0.0931295753 0.445452303 -0.00677574519 0.0469819605 -0.487212539 0.447737128 -0.0322357118 -0.352792144 0.123024374 -0.29872191 -0.146769822 0.0905542448 -0.101906136 0.0715721995 -0.612879276 0.455553621 -0.266217113 0.0511021204 0.244313508 -0.255902171 0.048614312 -0.320337176 -0.0358749479 -0.158284456 0.40615046 0.11524009 0.224121898 -0.360729247 -0.0677277446 -0.0379912183 -0.375006616 0.450368762 -0.0593438856 -0.07786569 0.129689306 -0.0306660999 -0.378324389 -0.302997857 0.119612508 -0.0319931805 -tensor_dense1kernel0 324 --0.205005005 0.140734956 0.310978234 0.182784036 -0.069365263 -0.404529363 -0.365451515 -0.0228298903 0.116743684 -0.313772768 0.0692059249 -0.249846935 -0.318941712 0.0922697783 -0.150004208 -0.244321629 -0.226229802 -0.0262513757 0.226985872 -0.395366639 -0.0333246291 0.0813309252 0.17320025 -0.287894845 -0.316546261 -0.199333176 -0.0774299502 0.0904967487 0.0638242364 0.177930236 -0.155815542 0.223292708 0.295013249 0.0169744492 -0.0356493592 0.38119328 -0.348898947 -0.929331541 -0.0674283206 -0.0387933813 -0.159590453 0.326727808 -0.0781253651 -0.261545837 0.565432429 -0.317547023 0.213937074 0.405067235 0.204790369 -0.0364037752 -0.301062435 0.0414654315 -0.165056586 -0.332698941 -0.185643107 -0.309144557 0.343083173 0.286258548 -0.303955048 0.121857345 0.238854676 -0.189732343 -0.255411297 0.0801578611 -0.0066538807 0.270449221 -0.159728378 -0.328722268 -0.326680988 -0.280370831 0.457631409 0.25291729 0.0519016981 0.230772436 -0.154503673 -0.383465528 -0.29624638 0.190506935 0.0553899407 0.0705386102 -0.104590327 0.346268475 -0.380987883 -0.197345227 -0.294914961 0.00457304716 -0.335101128 0.240878344 0.341112494 0.36594981 -0.224263623 -0.29713583 0.128412127 -0.375223279 0.0036971271 0.311718524 -0.255717874 0.218686283 0.374656379 0.197907805 -0.0726987422 -0.164763063 -0.344200611 -0.108971328 -0.108485937 -0.307326317 0.367442131 0.0915782452 -0.395517111 -0.377660036 0.0798842311 -0.377440065 0.382091939 -0.320500851 -0.262684762 -0.317281038 -0.371804416 0.385086715 0.156147838 -0.155829757 -0.285376132 0.206952751 0.0189986229 -0.0977791846 0.38637358 -0.135388345 0.322065771 0.336253077 0.401966512 -0.225724891 -0.278620839 -0.219117671 0.337905824 -0.224636212 -0.73541373 -0.0993211642 0.133828804 -0.237747446 0.0653230622 -0.0109936893 -0.0710237101 -0.306756705 -0.0228586048 0.0234235227 -0.0499965698 -0.180722684 -0.530621231 -0.285125732 -0.320313662 -0.114269793 -0.252939343 0.312673271 -0.263101399 -0.377859473 0.226296917 -0.196721643 0.322763801 -0.299177021 -0.182135135 0.00063598156 0.0139431832 0.369646013 -0.206468984 -0.195390999 -0.320697129 0.0798059851 -0.107455254 -0.0356816649 -0.159540087 -0.150166571 -0.199622974 0.125742316 0.2578713 0.247550189 0.128494427 -0.0599073172 0.100935817 -0.394471258 0.0999470875 -0.330660671 -0.323102772 0.228631839 -0.456789464 0.232891366 -0.0734387934 -0.14948836 -0.102452874 -0.058150053 0.214003667 -0.470484793 0.0186967142 0.337450415 0.244545355 -0.175367311 0.00252651749 0.130408823 0.227972195 -0.254775196 0.401957035 0.168204427 0.15517509 -0.257649064 0.214580238 0.312456012 0.191427529 -0.33080405 0.215468943 0.0812260807 0.336325526 -0.170630455 -0.341049701 -0.352353394 0.259355366 -0.134992391 0.0464166403 0.163887382 -0.192957789 -0.344841272 0.083393462 0.263362497 0.062218219 0.307836413 -0.0936445743 0.126904309 -0.124799065 -0.12712276 -0.315318048 -0.11203225 -0.370777071 0.377043605 0.0551990904 -0.399407178 -0.234565333 0.276249826 -0.393211961 -0.896009505 -0.891659141 -0.82550025 -0.349671543 0.287009001 -1.05421448 0.380967259 0.299229741 0.013231731 1.51716423 1.0066148 0.408260971 0.280097723 -0.731692553 -0.0932860672 -0.1653703 0.181166112 -0.0478743911 -0.380016595 0.344198167 0.160526693 0.338709891 -0.114311546 0.395919502 -0.05304721 -0.384483814 0.0310989022 0.0832063556 0.0201545656 -0.370850921 -0.0446012616 -0.387604535 -0.406283528 0.169260204 -0.114071637 0.0817638636 0.241184473 -0.240458831 0.311901391 0.291323245 -0.175064892 -0.21232006 -0.111585438 0.124622703 0.173502386 -0.00603500009 0.056725651 0.238428712 0.0429034531 0.380455434 0.37637347 -0.357751638 0.153228879 0.19238773 0.0170852281 0.013503206 -0.229724064 -0.235314041 0.178479791 0.326171339 -0.08346048 0.000966760388 0.0692466721 -0.238825396 -0.166895285 -0.179939434 -0.15281862 0.0152956266 0.201009631 -0.190651536 0.0413598418 -0.256234646 0.24359709 -0.372821271 0.276614428 0.355332911 -0.236930564 -0.0568404198 -0.398604363 0.0283097923 -0.333044767 0.0461567342 0.389699876 -0.297717094 0.373115718 0.371414721 -0.180682719 0.331674695 0.282705188 -tensor_dense3bias0 1 --1.04080796 -tensor_dense1bias0 18 --0.0525381789 1.15266132 1.09361911 1.48139083 0 0 1.38354731 0 0.51004535 -0.348183036 -1.35194218 -0.86442858 -0.576754868 0 0.619490921 0 -0.780703843 0 -tensor_dense2kernel0 324 --0.278805107 -0.02553159 0.419758528 0.0316974819 0.331600815 -0.252318472 -0.0575456172 -0.0256447792 0.396894276 -0.137493044 0.024723975 -0.367198765 0.0405150279 0.197597802 0.100301996 -0.325175703 0.363137394 0.0634557307 -0.405074447 0.0282097068 0.255843997 -0.328221202 0.328950703 0.0889994949 -0.530417979 0.172746241 0.0237902701 0.238332987 -0.151499182 0.0469378978 0.18915695 0.097231634 0.310367733 0.084304966 0.272161812 -0.0674240291 0.246650487 0.0926702917 0.312669486 -0.330225378 -0.0229215585 -0.0634295642 0.0291303359 0.218149006 0.183407485 0.0801383853 -0.358243704 0.301057428 -0.0317772515 -0.0469029397 0.503890872 0.117889993 0.322446734 -0.268181801 -0.0214086305 0.26816377 -0.129492417 -0.18372786 -0.476562202 -0.0124217086 0.216907769 0.274182171 -0.360720605 0.0344108865 -0.197753161 0.193419933 -0.129559457 -0.198689297 0.0561916046 -0.288481951 -0.328372926 -0.340355694 -0.194900692 -0.24345535 0.0304820836 -0.195243105 -0.0674996674 0.239546716 0.00876393914 -0.0399485826 0.0116732717 -0.0929856896 0.250921547 0.192966104 -0.0269827247 0.109571874 0.31913358 0.213441372 0.205549002 -0.126630545 -0.322146475 0.236982644 -0.186307356 -0.272782266 -0.0662263334 -0.105624318 -0.39786461 0.342791498 0.16085422 0.315785289 0.319146633 0.238508761 0.328333914 -0.200381666 0.318356872 0.00735631585 0.216403902 -0.0426596403 -0.197576389 -0.160815239 -0.526712477 0.162161067 -0.638297021 -0.221142426 0.319907665 -0.138952017 -0.143697947 -0.397462875 -0.492459863 -0.0691770688 -0.357488662 -0.279351383 0.122759953 -0.331822395 -0.438922822 -0.14781177 -0.283971786 0.0911063552 -0.0196602046 0.126570702 -0.15650633 0.089731425 -0.314277112 0.244750261 0.31551832 -0.342379093 0.26803571 0.051966697 0.205251276 -0.299434185 -0.357271582 0.250412285 0.191059411 0.347313046 -0.375173628 -0.0644958168 -0.0259857271 -0.0596879125 0.174731836 -0.299138427 -0.166583508 0.0974591374 -0.229742169 -0.138317898 0.19959113 -0.164071307 0.272657722 -0.15569222 0.190350041 -0.111013696 -0.631922245 0.109600902 -0.141283303 -0.10052672 -0.170393497 -0.343746245 0.0445401371 -0.0221132506 -0.21375224 -0.406430602 0.381767511 0.199660569 0.34756273 0.264422059 0.10497506 0.236455679 -0.362880409 0.306964338 -0.0451193191 0.120129585 -0.297097296 -0.260639012 -0.110448234 -0.227098063 -0.0252628159 0.344424307 -0.0162354354 -0.374590218 -0.351974845 0.12335299 0.14214021 -0.160378784 0.302752942 -0.0943992659 0.341502815 0.180975601 -0.318568289 -0.375406444 0.264434814 0.0855814815 -0.0579609424 0.0541094244 -0.243454486 0.253005296 0.0562459677 -0.451382428 -0.394860983 0.241207376 0.00578531204 -0.0478218198 0.22410877 -0.272149324 0.244601279 0.27665025 0.300410211 -0.160692275 -0.0113714254 0.181466296 -0.243084028 -0.0626065284 -0.146455511 -0.253220469 0.274903327 -0.114240319 -0.0450842381 0.197886541 -0.446484387 -0.188193947 -0.25115028 -0.265383691 -0.157036811 0.143857405 0.204778373 0.209899247 -0.366365492 -0.393422693 0.093793869 -0.176353693 -0.393235624 -0.0648327172 0.304717481 0.105196893 0.337502062 -0.320254087 -0.0653326213 -0.39839372 0.0585657656 -0.337453693 -0.374582708 0.333527267 -0.117036521 -0.127605438 0.334097445 0.0929544345 -0.0282137096 0.296254009 -0.493108213 -0.184789494 0.36978659 0.013386935 0.189683855 0.306415886 0.0626352802 -0.420681149 0.0402796492 -0.364071459 0.22430034 0.100215636 0.120582186 -0.356043994 -0.385984331 -0.014264971 0.000578641891 0.374631584 -0.398081183 -0.0724616349 0.240082145 0.234708607 -0.0356780589 -0.38605985 -0.136482477 0.350837886 0.40657717 0.135588646 -0.360465497 0.315894544 0.289385915 -0.292017519 0.0262624398 0.399054468 0.367937118 -0.173044339 -0.376592606 0.121605888 0.209835276 0.14982827 -0.203795552 -0.445402831 0.27194947 -0.543711185 0.162537217 -0.256446034 0.243643522 0.0930218175 -0.219607189 0.40135473 -0.27177155 -0.347262055 0.0373212695 -0.369010746 0.380417526 -0.0214197934 0.400712907 -0.313281983 0.288750708 -0.0915758908 -0.321726859 -0.240639582 0.0438744724 0.199300885 0.274990022 0.00221949816 -0.311299562 0.312379479 - diff --git a/TrkHitReco/fcl/prolog.fcl b/TrkHitReco/fcl/prolog.fcl index f7094dcd3c..d061af4275 100644 --- a/TrkHitReco/fcl/prolog.fcl +++ b/TrkHitReco/fcl/prolog.fcl @@ -65,6 +65,7 @@ makeSTH : { TestFlag : true FilterHits : false StereoLine : false + StereoLineNDOF : 1 # require at least ComboHitCollection : "makePH" EventWindowMarker : EWMProducer StrawHitSelectionBits : ["RadiusSelection","EnergySelection","TimeSelection"] diff --git a/TrkHitReco/src/MakeStereoHits_module.cc b/TrkHitReco/src/MakeStereoHits_module.cc index b78f36a6a9..29f80af23d 100644 --- a/TrkHitReco/src/MakeStereoHits_module.cc +++ b/TrkHitReco/src/MakeStereoHits_module.cc @@ -61,6 +61,7 @@ namespace mu2e { fhicl::Atom testflag { Name("TestFlag"), Comment("Test input hit flags") }; fhicl::Atom filter { Name("FilterHits"), Comment("Filter hits (alternative is to just flag)") }; fhicl::Atom sline { Name("StereoLine"), Comment("Fit stereohit ComboHit daughters to a line") }; + fhicl::Atom slinendof{ Name("StereoLineNDOF"), Comment("Minimum NDOF for stereo line fit to be used in output ComboHits") }; fhicl::Atom smask { Name("SelectionMask"), Comment("define the mask to select hits") }; }; @@ -89,6 +90,7 @@ namespace mu2e { bool _testflag; // test the flag or not bool _filter; bool _sline; // fit to a line + unsigned _slinendof; // minimum NDOF to use the sline fit when producing output ComboHits StrawIdMask _smask; // mask for combining hits std::array,StrawId::_nupanels > _panelOverlap; // which panels overlap each other @@ -117,6 +119,7 @@ namespace mu2e { _testflag(config().testflag()), _filter(config().filter()), _sline(config().sline()), + _slinendof(config().slinendof()), _smask(config().smask()) { produces(); @@ -248,7 +251,8 @@ namespace mu2e { if(sth){ // solve for the line StereoLine sline; - sth = cpts.stereoLine(sline); + sth = cpts.stereoLine(sline) && sline.ndof_ >= _slinendof; + // if the fit succeeded and has enough NDOF use it to fill the ComboHit if(sth){ combohit._pos = sline.pos(sline.z0()); // create a 2-D point from the upper component of this @@ -270,11 +274,13 @@ namespace mu2e { combohit._hphivar = ROOT::Math::Similarity(dPhidR,dmat); // fit quality combohit._qual = TMath::Prob(sline.chisq(),sline.ndof()); + // flag this hit as having stereo line information + combohit._flag.merge(StrawHitFlag::sline); } } + // otherwise, fall back to the 2D projection + // fill position and variance from combined info if(!sth){ - // fall back to the 2D projection - // fill position and variance from combined info auto const& pt = cpts.point(); combohit._pos = pt.pos3(); combohit._udir = pt.udir(); From 21de85e98768356df004280c359f3e827ae193fd Mon Sep 17 00:00:00 2001 From: Andrei Gaponenko Date: Fri, 23 Feb 2024 15:20:16 -0600 Subject: [PATCH 147/213] Fix a typo in PTM geometry --- Mu2eG4/geom/PTM_v02.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Mu2eG4/geom/PTM_v02.txt b/Mu2eG4/geom/PTM_v02.txt index 8b352537a6..dc02311c01 100644 --- a/Mu2eG4/geom/PTM_v02.txt +++ b/Mu2eG4/geom/PTM_v02.txt @@ -132,7 +132,7 @@ double PTM.wedge.width = 355.6; double PTM.wedge.minHeight = 10.0; //double PTM.wedge.maxHeight = 50.782; double PTM.wedge.maxHeight = 50.3; -double PTM.wedge.materialName = "A1100"; +string PTM.wedge.materialName = "A1100"; // cutout for cables double PTM.wedge.cutoutLength = 197.6; // actual length 197.5; added 0.1 so the subtraction includes the edge instead of stopping there double PTM.wedge.cutoutWidth = 146.051; From b4e2cb6a64370354e124b6aefdbdfebff8d62540 Mon Sep 17 00:00:00 2001 From: Andrei Gaponenko Date: Fri, 23 Feb 2024 17:53:42 -0600 Subject: [PATCH 148/213] We will not have muonID, remove the large chunk of iron for the shielding assessment. The current implementation is literally a large piece of iron, so this commit simplifies things by removing the code instead of complicating things by adding an enable/disable switch. --- ExtinctionMonitorFNAL/Geometry/CMakeLists.txt | 1 - .../Geometry/inc/ExtMonFNAL.hh | 7 -- .../Geometry/inc/ExtMonFNALMuonID.hh | 65 ----------------- .../Geometry/src/ExtMonFNALMuonID.cc | 25 ------- GeometryService/CMakeLists.txt | 1 - GeometryService/inc/ExtMonFNALMuonIDMaker.hh | 39 ---------- GeometryService/src/ExtMonFNALMuonIDMaker.cc | 73 ------------------- GeometryService/src/ExtMonFNAL_Maker.cc | 29 -------- GeometryService/src/GeometryService.cc | 3 - Mu2eG4/geom/extmon_fnal_v02.txt | 17 ----- Mu2eG4/geom/geom_common_trackerVST.txt | 1 - Mu2eG4/inc/constructExtMonFNAL.hh | 9 --- Mu2eG4/src/constructExtMonFNAL.cc | 66 ----------------- 13 files changed, 336 deletions(-) delete mode 100644 ExtinctionMonitorFNAL/Geometry/inc/ExtMonFNALMuonID.hh delete mode 100644 ExtinctionMonitorFNAL/Geometry/src/ExtMonFNALMuonID.cc delete mode 100644 GeometryService/inc/ExtMonFNALMuonIDMaker.hh delete mode 100644 GeometryService/src/ExtMonFNALMuonIDMaker.cc diff --git a/ExtinctionMonitorFNAL/Geometry/CMakeLists.txt b/ExtinctionMonitorFNAL/Geometry/CMakeLists.txt index 32056d1951..ccba14f93f 100644 --- a/ExtinctionMonitorFNAL/Geometry/CMakeLists.txt +++ b/ExtinctionMonitorFNAL/Geometry/CMakeLists.txt @@ -5,7 +5,6 @@ cet_make_library( src/ExtMonFNALMagnet.cc src/ExtMonFNALModule.cc src/ExtMonFNALModuleIdConverter.cc - src/ExtMonFNALMuonID.cc src/ExtMonFNALPixelChip.cc src/ExtMonFNALPixelIdConverter.cc src/ExtMonFNALPlane.cc diff --git a/ExtinctionMonitorFNAL/Geometry/inc/ExtMonFNAL.hh b/ExtinctionMonitorFNAL/Geometry/inc/ExtMonFNAL.hh index 4b59eee6b2..5f8af7fab9 100644 --- a/ExtinctionMonitorFNAL/Geometry/inc/ExtMonFNAL.hh +++ b/ExtinctionMonitorFNAL/Geometry/inc/ExtMonFNAL.hh @@ -20,7 +20,6 @@ #include "Offline/ExtinctionMonitorFNAL/Geometry/inc/ExtMonFNALPlane.hh" #include "Offline/ExtinctionMonitorFNAL/Geometry/inc/ExtMonFNALPlaneStack.hh" #include "Offline/ExtinctionMonitorFNAL/Geometry/inc/ExtMonFNALMagnet.hh" -#include "Offline/ExtinctionMonitorFNAL/Geometry/inc/ExtMonFNALMuonID.hh" namespace mu2e { @@ -51,8 +50,6 @@ namespace mu2e { const ExtMonFNALMagnet& spectrometerMagnet() const { return spectrometerMagnet_; } - const ExtMonFNALMuonID& muonID() const { return muonID_; } - // Location of the detector == that of the upstream stack. CLHEP::Hep3Vector detectorCenterInMu2e() const; const CLHEP::HepRotation& detectorRotationInMu2e() const; @@ -86,9 +83,6 @@ namespace mu2e { CLHEP::Hep3Vector stackToExtMon_position(const CLHEP::Hep3Vector& pos) const { return (pos.z() < 0) ? dnStackToExtMon_position(pos) : upStackToExtMon_position(pos); } - CLHEP::Hep3Vector muonIDToExtMon_position(const CLHEP::Hep3Vector& muonIDpos) const { - return dnToExtMonCoordinateRotation_ * muonIDpos; - } //---------------------------------------------------------------- // Pixel center in the coordinate system of its PlaneStack @@ -127,7 +121,6 @@ namespace mu2e { ExtMonFNALPlaneStack up_; ExtMonFNALPlaneStack dn_; ExtMonFNALMagnet spectrometerMagnet_; - ExtMonFNALMuonID muonID_; CLHEP::HepRotationX dnToExtMonCoordinateRotation_; }; diff --git a/ExtinctionMonitorFNAL/Geometry/inc/ExtMonFNALMuonID.hh b/ExtinctionMonitorFNAL/Geometry/inc/ExtMonFNALMuonID.hh deleted file mode 100644 index befa5301c6..0000000000 --- a/ExtinctionMonitorFNAL/Geometry/inc/ExtMonFNALMuonID.hh +++ /dev/null @@ -1,65 +0,0 @@ -//Building the Muon ID detector-using code from ExtMonFNALMagnet.hh and DetectorSolenoidShieldingMaker.hh -//As of now it is a rectangular box with half sizes, rotation, and center defined - -//Jackson Waters, 2018 - -#ifndef EXTMONFNALMUONID_HH -#define EXTMONFNALMUONID_HH - -#include "Offline/Mu2eInterfaces/inc/Detector.hh" - -#include -#include -#include - -#include "CLHEP/Vector/ThreeVector.h" -#include "CLHEP/Vector/Rotation.h" - -namespace mu2e { - - namespace ExtMonFNAL { class ExtMonMaker; } - namespace ExtMonFNAL { class ExtMon; } - - class ExtMonFNALMuonIDMaker; - - class ExtMonFNALMuonID : virtual public Detector { - public: - //Transverse size and Z-position similar to plane stack mother volume - const std::vector& motherTransverseHalfSize() const { return m_motherTransverseHalfSize; } - const double motherStartZ() const { return m_motherStartZ; } - const double motherEndZ() const { return m_motherEndZ; } - //Positioning of Muon ID Detector - CLHEP::Hep3Vector refPointInMu2e() const { return refPointInMu2e_; } - CLHEP::HepRotation const& muonIDRotationInMu2e() const { return muonIDRotationInMu2e_; } - - double nominalMomentum() const { return nominalMomentum_; } - - private: - ExtMonFNALMuonID(); - // An initialized instance of this class should be obtained via ExtMonFNALMuonIDMaker - // Included these first two classes to make it similar to ExtMonFNALPlaneStack files - friend class ExtMonFNAL::ExtMon; - friend class ExtMonFNAL::ExtMonMaker; - friend class ExtMonFNALMuonIDMaker; - - - // Mother Volume based off of ExtMonFNALPlaneStack - std::vector m_motherTransverseHalfSize; - double m_motherStartZ; - double m_motherEndZ; - - //Momentum, Reference point, and Rotation - - double nominalMomentum_; - - CLHEP::Hep3Vector refPointInMu2e_; - CLHEP::HepRotation muonIDRotationInMu2e_; - - - }; - - // std::ostream& operator<<(std::ostream& os, const ExtMonFNALMuonID& muid); - -}// namespace mu2e*/ - -#endif/*EXTMONFNALMUONID_HH*/ diff --git a/ExtinctionMonitorFNAL/Geometry/src/ExtMonFNALMuonID.cc b/ExtinctionMonitorFNAL/Geometry/src/ExtMonFNALMuonID.cc deleted file mode 100644 index e18fa81f22..0000000000 --- a/ExtinctionMonitorFNAL/Geometry/src/ExtMonFNALMuonID.cc +++ /dev/null @@ -1,25 +0,0 @@ -//Source file for new Muon ID Detector - -//Jackson Waters, 2018 - -#include "Offline/ExtinctionMonitorFNAL/Geometry/inc/ExtMonFNALMuonID.hh" - - -#include "CLHEP/Units/SystemOfUnits.h" - -#include "cetlib_except/exception.h" - -//================================================================ -namespace mu2e { - -mu2e::ExtMonFNALMuonID::ExtMonFNALMuonID() - : m_motherTransverseHalfSize() - , nominalMomentum_() -{} - - /*std::ostream& operator<<(std::ostream& os, const ExtMonFNALMuonID& muid) { - return os<<"ExtMonFNALMuonID(halfsize="< -#include - -#include "Offline/ExtinctionMonitorFNAL/Geometry/inc/ExtMonFNAL.hh" -#include "Offline/ExtinctionMonitorFNAL/Geometry/inc/ExtMonFNALMuonID.hh" - -namespace CLHEP { class Hep3Vector; } -namespace CLHEP { class HepRotation; } - -namespace mu2e { class SimpleConfig; } -namespace mu2e { class ExtMonFNALMuonID; } -namespace mu2e { namespace ExtMonFNAL { class ExtMon; } } - -namespace mu2e { - - class ExtMonFNALMuonIDMaker { - public: - - static ExtMonFNALMuonID read(const SimpleConfig& c, - const std::string& prefix, - const CLHEP::HepRotation& muonIDInRotationInMu2e, - const CLHEP::Hep3Vector& refTrajmuonIDEntranceInMu2e, - double nominalMomentum); - - static std::unique_ptr make(const SimpleConfig& config); - }; - - } - -#endif/*EXTMONFNALMUONIDMAKER_HH*/ - - diff --git a/GeometryService/src/ExtMonFNALMuonIDMaker.cc b/GeometryService/src/ExtMonFNALMuonIDMaker.cc deleted file mode 100644 index 3f2cf3ced5..0000000000 --- a/GeometryService/src/ExtMonFNALMuonIDMaker.cc +++ /dev/null @@ -1,73 +0,0 @@ -// Jackson Waters, 2018 -//Maker source file for Muon ID detector geometry - -// Mu2e includes -#include "Offline/ConfigTools/inc/SimpleConfig.hh" -#include "Offline/ExtinctionMonitorFNAL/Geometry/inc/ExtMonFNAL.hh" -#include "Offline/ExtinctionMonitorFNAL/Geometry/inc/ExtMonFNALMuonID.hh" -#include "Offline/GeometryService/inc/ExtMonFNALMuonIDMaker.hh" - -// C++ includes -#include -#include -#include -#include - -//Framework includes -#include "cetlib_except/exception.h" - -// CLHEP includes -#include "CLHEP/Vector/ThreeVector.h" -#include "CLHEP/Vector/Rotation.h" -#include "CLHEP/Units/SystemOfUnits.h" - - - -//#define AGDEBUG(stuff) std::cerr<<"AG: "<<__FILE__<<", line "<<__LINE__<<": "< ExtMonFNALMuonIDMaker::make(const SimpleConfig& c) { - std::unique_ptr muid ( new ExtMonFNALMuonID() ); - - return muid; - } - - ExtMonFNALMuonID - ExtMonFNALMuonIDMaker::read(const SimpleConfig& c, const std::string& prefix, - const CLHEP::HepRotation& muonIDInRotationInMu2e, // of the input arm of ref trajectory - const CLHEP::Hep3Vector& refTrajmuonIDEntranceInMu2e, - double nominalMomentum) - { - ExtMonFNALMuonID muid; - muid.muonIDRotationInMu2e_ = muonIDInRotationInMu2e; - muid.nominalMomentum_ = nominalMomentum; - - c.getVectorDouble(prefix + ".motherTransverseHalfSize", muid.m_motherTransverseHalfSize, 2); - - // distance between the points - //const double MuonIDEntranceToBendPointDistance = muid.outerHalfSize_[2]/cos(trackBendHalfAngle); - - muid.refPointInMu2e_ = refTrajmuonIDEntranceInMu2e; - muid.m_motherStartZ = c.getDouble(prefix+".motherStartZ"); - muid.m_motherEndZ = c.getDouble(prefix+".motherEndZ"); - // muid.geometricCenterInMu2e_ = muid.refPointInMu2e_ + muid.muonIDRotationInMu2e_ * CLHEP::Hep3Vector(0, 0, -2000); - - if(c.getInt("extMonFNAL.verbosityLevel") > 0) { - std::cout<<"ExtMonFNALMuonID "<dn_.planeNumberOffset_ = 0; det->up_.planeNumberOffset_ = det->dn_.nplanes(); - //---------------------------------------------------------------- - //Muon ID Detector Addition - /* det->muonID_ = ExtMonFNALMuonIDMaker::read(config, - "extMonFNAL.muonID", - room.collimator2RotationInMu2e(), - refEntranceToMagnet, - room.filterMagnet().nominalMomentum() + dp - );*/ - const CLHEP::Hep3Vector muonIDRefPointInMu2e = det->dn_.refPointInMu2e(); - det->muonID_ = ExtMonFNALMuonIDMaker::read(config, - "extMonFNAL.muonID", - det->dn_.rotationInMu2e(), - muonIDRefPointInMu2e, - room.filterMagnet().nominalMomentum() + dp - ); - /*ExtMonFNALMuonID ExtMonFNALMuonIDMaker::read(const SimpleConfig& c, const std::string& prefix) - { - ExtMonFNALMuonID muid; - - c. getVectorDouble(prefix + ".outerHalfSize", muid.outerHalfSize_, 3); - if(verbose){ - std::cout<<"ExtMonFNALMuonID " <getBool("hasExtMonFNAL",false)){ addDetector(ExtMonFNAL::ExtMonMaker::make(*_config, emfb)); - addDetector(ExtMonFNALMuonIDMaker::make(*_config)); } diff --git a/Mu2eG4/geom/extmon_fnal_v02.txt b/Mu2eG4/geom/extmon_fnal_v02.txt index b3615375a9..9e8d32639e 100644 --- a/Mu2eG4/geom/extmon_fnal_v02.txt +++ b/Mu2eG4/geom/extmon_fnal_v02.txt @@ -201,23 +201,6 @@ vector extMonFNAL.dn.module_yoffset = { 16.7, 0., -16.7 }; vector extMonFNAL.dn.module_zoffset = { 1., -1., 1. }; // just determines which side of the plane; all math is handed in constructExMonFNAL vector extMonFNAL.dn.module_rotation = { 0., 0., 180. }; - - -//Addition of the Muon ID detector will be placed here -// Jackson Waters 2018 -//Right now it will be a rectangular box with 3D rotation - -vector extMonFNAL.muonID.motherTransverseHalfSize = {200, 200};//mm x, y -string extMonFNAL.muonID.material = "G4_Fe"; - -bool extMonFNAL.muonID.iron.visible = true; -bool extMonFNAL.muonID.iron.solid = true; - -// Placing the box in the z-position based off of the start and end points of the z-position of the downstream pixel planes - -double extMonFNAL.muonID.motherStartZ = -2500.; -double extMonFNAL.muonID.motherEndZ = -700.; - //---------------------------------------------------------------- // These are detector VDs (not filter ones) // diff --git a/Mu2eG4/geom/geom_common_trackerVST.txt b/Mu2eG4/geom/geom_common_trackerVST.txt index 5a49ddf662..8c388b8953 100644 --- a/Mu2eG4/geom/geom_common_trackerVST.txt +++ b/Mu2eG4/geom/geom_common_trackerVST.txt @@ -418,7 +418,6 @@ string extMonFNAL.concreteMaterial = "G4_AIR"; string extMonFNAL.filter.magnet.material = "G4_AIR"; string extMonFNAL.spectrometer.magnet.material = "G4_AIR"; string extMonFNAL.planeMaterial = "G4_AIR"; -string extMonFNAL.muonID.material = "G4_AIR"; string extMonFNAL.room.materialName = "G4_AIR"; string extMonFNAL.room.wall.materialName = "G4_AIR"; string ExtShieldDownstream.materialType1 = "G4_AIR"; diff --git a/Mu2eG4/inc/constructExtMonFNAL.hh b/Mu2eG4/inc/constructExtMonFNAL.hh index 21b8b879ea..b7f144dd5f 100644 --- a/Mu2eG4/inc/constructExtMonFNAL.hh +++ b/Mu2eG4/inc/constructExtMonFNAL.hh @@ -15,7 +15,6 @@ namespace mu2e { class SimpleConfig; class ExtMonFNALMagnet; - class ExtMonFNALMuonID; void constructExtMonFNAL(const VolumeInfo& collimator1Parent, const CLHEP::HepRotation& collimator1ParentRotationInMu2e, @@ -60,14 +59,6 @@ namespace mu2e { bool const placePV ); - void constructExtMonFNALMuonID(const ExtMonFNALModule& module, - const ExtMonFNALMuonID& muid, - const std::string& volNameSuffix, - const VolumeInfo& parent, - const CLHEP::HepRotation& parentRotationInMu2e, - const SimpleConfig& config - ); - } #endif /* CONSTRUCTEXTMONFNAL_HH */ diff --git a/Mu2eG4/src/constructExtMonFNAL.cc b/Mu2eG4/src/constructExtMonFNAL.cc index 5ba177c8f2..6a7f425c1f 100644 --- a/Mu2eG4/src/constructExtMonFNAL.cc +++ b/Mu2eG4/src/constructExtMonFNAL.cc @@ -463,65 +463,6 @@ namespace mu2e { addBoxVDPlane(VirtualDetectorId::EMFBoxBottom, boxZX, -zxOffset, extmon, parentRotationInMu2e, parent, config); } } - //=============================================================== - void constructExtMonFNALMuonID(const ExtMonFNALModule& module, - const ExtMonFNALMuonID& muid, - const std::string& volNameSuffix, - const VolumeInfo& parent, - const CLHEP::HepRotation& parentRotationInMu2e, - const SimpleConfig& config - ) - { - bool const forceAuxEdgeVisible = config.getBool("g4.forceAuxEdgeVisible"); - bool const doSurfaceCheck = config.getBool("g4.doSurfaceCheck"); - bool const placePV = true; - - MaterialFinder materialFinder(config); - AntiLeakRegistry& reg = art::ServiceHandle()->antiLeakRegistry(); - - - //---------------------------------------------------------------- - - CLHEP::HepRotation *muidRotationInRoomInv = - reg.add(muid.muonIDRotationInMu2e().inverse() * parentRotationInMu2e); - - const CLHEP::HepRotation muidRotationInRoom(muidRotationInRoomInv->inverse()); - - const CLHEP::Hep3Vector muidRefPointInRoom(parentRotationInMu2e.inverse()*(muid.refPointInMu2e() - parent.centerInMu2e())); - - - - //---------------------------------------------------------------- - // Mother volume for planeStack - - double muidpx = muid.motherTransverseHalfSize()[0]; - double muidpy = muid.motherTransverseHalfSize()[1]; - std::vector polygon; - polygon.push_back({+muidpx,+muidpy}); - polygon.push_back({-muidpx,+muidpy}); - polygon.push_back({-muidpx,-muidpy}); - polygon.push_back({+muidpx,-muidpy}); - - std::vector zsections; - zsections.emplace_back(muid.motherStartZ(), G4TwoVector(), 1.); - zsections.emplace_back(muid.motherEndZ(), G4TwoVector(), 1.); - VolumeInfo mother = nestExtrudedSolid("ExtMonMuonIDMother"+volNameSuffix, - polygon, - zsections, - findMaterialOrThrow("G4_Fe"), - muidRotationInRoomInv, - muidRefPointInRoom, - parent, - 0, - config.getBool("extMonFNAL."+volNameSuffix+".iron.visible"), - G4Colour::Magenta(), - config.getBool("extMonFNAL."+volNameSuffix+".iron.solid"), - forceAuxEdgeVisible, - placePV, - doSurfaceCheck - ); - } - //================================================================ VolumeInfo constructExtMonFNALDetectorRoom(const VolumeInfo& parent, const CLHEP::HepRotation& parentRotationInMu2e, @@ -610,13 +551,6 @@ namespace mu2e { emfb->detectorRoomRotationInMu2e(), config); - constructExtMonFNALMuonID(extmon->module(), - extmon->muonID(), - "muonID", - detectorRoom, - emfb->detectorRoomRotationInMu2e(), - config); - // enclose whole ExtMon magnet+sensors in a set of VDs constructExtMonFNALBoxVirtualDetectors(*extmon, detectorRoom, From bc1b3e7c86ba40803a53debe4b005f899a1d5e3d Mon Sep 17 00:00:00 2001 From: David Nathan Brown Date: Fri, 23 Feb 2024 16:36:33 -0800 Subject: [PATCH 149/213] Fix TTTA scripts to work with mu2e_trig_config --- Mu2eKinKal/test/TTBTrk.fcl | 95 ------------------------- Mu2eKinKal/test/TTOffline.fcl | 126 ---------------------------------- Mu2eKinKal/test/TTTA.fcl | 34 +++++---- Mu2eKinKal/test/TTTA_noMC.fcl | 89 ------------------------ 4 files changed, 22 insertions(+), 322 deletions(-) delete mode 100644 Mu2eKinKal/test/TTBTrk.fcl delete mode 100644 Mu2eKinKal/test/TTOffline.fcl delete mode 100644 Mu2eKinKal/test/TTTA_noMC.fcl diff --git a/Mu2eKinKal/test/TTBTrk.fcl b/Mu2eKinKal/test/TTBTrk.fcl deleted file mode 100644 index 3ab298b8e0..0000000000 --- a/Mu2eKinKal/test/TTBTrk.fcl +++ /dev/null @@ -1,95 +0,0 @@ -# Minimal KinKal job that fits digis to a downstream electron as a trigger seed fit , and analyzes the output with TrkAna -# To create a functional job you must add database purpose and version; ie create a fcl stub that #includes this file and -# adds (for instance): -# services.DbService.purpose: MDC2020_perfect -# services.DbService.version: v1_0 -# -#include "Offline/fcl/minimalMessageService.fcl" -#include "Offline/fcl/standardServices.fcl" -#include "Production/JobConfig/reco/prolog.fcl" -#include "mu2e_trig_config/gen/trig_physMenuPSConfig_OnSpill.fcl" -#include "mu2e_trig_config/gen/trig_physMenu_OnSpill.fcl" -#include "TrkAna/fcl/prolog.fcl" -#include "Offline/CommonMC/fcl/prolog.fcl" - -process_name: TTBTrk -source : { module_type : RootInput } -services : @local::Services.Reco -physics : -{ - @table::TrigSequences - producers : { @table::TrigProducers.producers } - - filters : { - @table::TrigFilters.filters - @table::Trig_physMenuPSConfig - } - - analyzers : { - TAtpr : @local::TrkAnaReco.analyzers.TrkAnaNeg - evtprint : { - module_type : RunSubrunEvent - printSam : false - printRun : false - printSubrun : false - printEvent : true - } - TAcpr : @local::TrkAnaReco.analyzers.TrkAnaNeg - evtprint : { - module_type : RunSubrunEvent - printSam : false - printRun : false - printSubrun : false - printEvent : true - } - } - EndPath : [TAtpr, TAcpr] - - tprDeM_highP_stopTarg : [ @sequence::CaloHitRecoTrigger.prepareHits, @sequence::CaloClusterTrigger.Reco, - @sequence::TrkHitRecoTrigger.sequences.TTprepareHits, - TTtimeClusterFinder, tprDeMHighPStopTargTCFilter, TThelixFinder, - TTHelixMergerDeM, tprDeMHighPStopTargHSFilter, - TTKSFDeM, tprDeMHighPStopTargTSFilter ] - cprDeM_highP_stopTarg : [ @sequence::CaloHitRecoTrigger.prepareHits, @sequence::CaloClusterTrigger.Reco, - @sequence::TrkHitRecoTrigger.sequences.TTprepareHits, - TTCalTimePeakFinder, cprDeMHighPStopTargTCFilter, TTCalHelixFinderDe, - TTCalHelixMergerDeM, cprDeMHighPStopTargHSFilter, - TTCalSeedFitDem, cprDeMHighPStopTargTSFilter] - -} -physics.trigger_paths : [tprDeM_highP_stopTarg, cprDeM_highP_stopTarg ] -physics.end_paths : [ EndPath ] -#include "mu2e_trig_config/core/trigDigiInputsEpilog.fcl" - -physics.analyzers.TAtpr.SelectEvents : [ tprDeM_highP_stopTarg ] -physics.analyzers.TAtpr.candidate.options : @local::AllOpt -physics.analyzers.TAtpr.diagLevel : 2 -physics.analyzers.TAtpr.FillCRVHits : false -physics.analyzers.TAtpr.FillMCInfo : false -physics.analyzers.TAtpr.RecoCountTag : "" -physics.analyzers.TAtpr.FillTriggerInfo : true -physics.analyzers.TAtpr.FillTrkPIDInfo : false -physics.analyzers.TAtpr.FillHitInfo : true -physics.analyzers.TAtpr.FillTriggerInfo : false -physics.analyzers.TAtpr.candidate.input : "TTKSF" -physics.analyzers.TAtpr.candidate.suffix : "DeM" -physics.analyzers.TAtpr.candidate.options.fillHits : true -physics.analyzers.TAtpr.supplements : [] - -physics.analyzers.TAcpr.SelectEvents : [ cprDeM_highP_stopTarg ] -physics.analyzers.TAcpr.candidate.options : @local::AllOpt -physics.analyzers.TAcpr.diagLevel : 2 -physics.analyzers.TAcpr.FillCRVHits : false -physics.analyzers.TAcpr.FillMCInfo : false -physics.analyzers.TAcpr.RecoCountTag : "" -physics.analyzers.TAcpr.FillTriggerInfo : true -physics.analyzers.TAcpr.FillTrkPIDInfo : false -physics.analyzers.TAcpr.FillHitInfo : true -physics.analyzers.TAcpr.FillTriggerInfo : false -physics.analyzers.TAcpr.candidate.input : "TTCalSeedFit" -physics.analyzers.TAcpr.candidate.suffix : "Dem" -physics.analyzers.TAcpr.candidate.options.fillHits : true -physics.analyzers.TAcpr.supplements : [] - -services.TimeTracker.printSummary: true -services.TFileService.fileName: "nts.owner.TTBTrk.version.sequence.root" diff --git a/Mu2eKinKal/test/TTOffline.fcl b/Mu2eKinKal/test/TTOffline.fcl deleted file mode 100644 index 7445f24173..0000000000 --- a/Mu2eKinKal/test/TTOffline.fcl +++ /dev/null @@ -1,126 +0,0 @@ -# Minimal KinKal job that fits digis to a downstream electron as a seed fit , and analyzes the output with TrkAna -# To create a functional job you must add database purpose and version; ie create a fcl stub that #includes this file and -# adds (for instance): -# services.DbService.purpose: MDC2020_perfect -# services.DbService.version: v1_0 -# -# To convert the fit to use CentralHelix instead of LoopHelix, add the following line to the stub: -# physics.producers.KKDeMDriftFit.module_type : CentralHelixFit - -#include "Offline/fcl/minimalMessageService.fcl" -#include "Offline/fcl/standardServices.fcl" -#include "Production/JobConfig/reco/prolog.fcl" -#include "Offline/Mu2eKinKal/fcl/prolog.fcl" -#include "TrkAna/fcl/prolog.fcl" - -process_name: KKSeed -source : { module_type : RootInput } -services : @local::Services.Reco -physics : -{ - producers : { - @table::TrkHitReco.producers - @table::Tracking.producers - @table::CalPatRec.producers - @table::CaloReco.producers - @table::CaloCluster.producers - @table::CaloMC.TruthProducers - @table::CrvResponsePackage.producers - @table::Reconstruction.producers - @table::TrkAnaReco.producers - @table::Mu2eKinKal.producers - } - filters : { - @table::CalPatRec.filters - } - RecoPath : [ - @sequence::Reconstruction.CaloReco, - @sequence::Reconstruction.TrkReco, - @sequence::Reconstruction.CrvReco, - TimeClusterFinderDe, HelixFinderDe, - CalTimePeakFinder, CalHelixFinderDe, - MHDeM, - KKDeMSeedFit, - @sequence::Reconstruction.MCReco - ] - analyzers : { - TAKK : @local::TrkAnaReco.analyzers.TrkAnaNeg - evtprint : { - module_type : RunSubrunEvent - printSam : false - printRun : false - printSubrun : false - printEvent : true - } - } - EndPath : [TAKK] -} -outputs : { - Output : { - @table::Reconstruction.Output - SelectEvents : [ "RecoPath" ] - } -} -physics.producers.KKDeMSeedFit.KKFitSettings.AddHits : false -physics.producers.KKDeMSeedFit.KKFitSettings.AddMaterial : false -physics.producers.KKDeMSeedFit.KKFitSettings.MaterialCorrection : false - -physics.producers.KKDeMSeedFit.FitSettings.MaxNIter : 2 -physics.producers.KKDeMSeedFit.FitSettings.MetaIterationSettings : [ - [ 4.0, "CADSHU" ] -] -physics.producers.KKDeMSeedFit.FitSettings.CADSHUSettings : [ - [ 60.0, 1e6, 5.0, 5.0, "TOT", "Null:Inactive", "", 0 ] -] -physics.producers.KKDeMSeedFit.FitSettings.StrawXingUpdaterSettings : [ - [10.0, -1.0, -1.0, true, 0 ] -] - -physics.producers.KKDeMSeedFit.ExtensionSettings.MaxNIter : 2 -physics.producers.KKDeMSeedFit.ExtensionSettings.BFieldCorrection : false -physics.producers.KKDeMSeedFit.ExtensionSettings.CADSHUSettings : [ - ] -physics.producers.KKDeMSeedFit.ExtensionSettings.MetaIterationSettings : [ - ] -physics.producers.KKDeMSeedFit.ExtensionSettings.StrawXingUpdaterSettings : [ - ] -physics.producers.KKDeMSeedFit.ExtensionSettings.BkgANNSHUSettings : [ - ] - -physics.producers.KKDeMSeedFit.ModuleSettings.ZSavePositions: [ 0 ] -physics.producers.KKDeMSeedFit.ModuleSettings.SaveFullFit : false -physics.producers.KKDeMSeedFit.ModuleSettings.SeedErrors: [ 5, 5, 5, 5, 2e-2, 5 ] - - - -#include "Production/JobConfig/reco/epilog.fcl" -physics.producers.CaloHitTruthMatch.primaryParticle : "compressDigiMCs" -physics.producers.CaloHitTruthMatch.caloShowerSimCollection : "compressDigiMCs" -physics.filters.CalHelixFinderDe.StrawHitFlagCollectionLabel : "FlagBkgHits:ComboHits" -physics.producers.SelectRecoMC.KalSeedCollections : ["KKDeMSeedFit"] -physics.producers.SelectRecoMC.HelixSeedCollections : ["MHDeM"] -physics.producers.SelectRecoMC.debugLevel : 0 - -physics.producers.KKDeMSeedFit.ModuleSettings.HelixSeedCollections : [ "MHDeM" ] -physics.producers.KKDeMSeedFit.ModuleSettings.ComboHitCollection : "makeSH" -physics.producers.KKDeMSeedFit.ModuleSettings.CaloClusterCollection : "CaloClusterMaker" -physics.producers.KKDeMSeedFit.ModuleSettings.StrawHitFlagCollection : "FlagBkgHits:StrawHits" -physics.producers.KKDeMSeedFit.ModuleSettings.PrintLevel : 0 -physics.producers.KKDeMSeedFit.ModuleSettings.SaveAllFits : true - -physics.analyzers.TAKK.candidate.options : @local::AllOpt -physics.analyzers.TAKK.diagLevel : 2 -physics.analyzers.TAKK.FillCRVHits : false -physics.analyzers.TAKK.FillMCInfo : true -physics.analyzers.TAKK.FillTriggerInfo : true -physics.analyzers.TAKK.FillTrkPIDInfo : false -physics.analyzers.TAKK.FillHitInfo : true -physics.analyzers.TAKK.FillTriggerInfo : false -physics.analyzers.TAKK.candidate.input : "KK" -physics.analyzers.TAKK.candidate.suffix : "DeMSeedFit" -physics.analyzers.TAKK.candidate.options.fillHits : true -physics.analyzers.TAKK.supplements : [] - -physics.end_paths : [ EndPath ] # needed for generate_fcl -services.TimeTracker.printSummary: true -services.TFileService.fileName: "nts.owner.KKSeed.version.sequence.root" diff --git a/Mu2eKinKal/test/TTTA.fcl b/Mu2eKinKal/test/TTTA.fcl index 5c4986594b..17494f401d 100644 --- a/Mu2eKinKal/test/TTTA.fcl +++ b/Mu2eKinKal/test/TTTA.fcl @@ -1,12 +1,18 @@ # Run trigger, add MC truth matching, and write TrkAna tree output # To create a functional job you must add database purpose and version; ie create a fcl stub that #includes this file and # adds (for instance): -# services.DbService.purpose: MDC2020_perfect -# services.DbService.version: v1_0 +# services.DbService.purpose: MDC2020_best +# services.DbService.version: v1_1 # #include "Offline/fcl/standardServices.fcl" +#include "mu2e_trig_config/core/trigProducers.fcl" +#include "mu2e_trig_config/core/trigFilters.fcl" +#include "mu2e_trig_config/core/trigRecoSequences.fcl" +#include "mu2e_trig_config/core/trigSequences.fcl" +BEGIN_PROLOG #include "mu2e_trig_config/gen/trig_physMenuPSConfig_OnSpill.fcl" #include "mu2e_trig_config/gen/trig_physMenu_OnSpill.fcl" +END_PROLOG #include "Offline/CommonMC/fcl/prolog_trigger.fcl" #include "TrkAna/fcl/prolog_trigger.fcl" process_name : OnSpillTrigger @@ -16,8 +22,11 @@ source : { } physics : { - @table::TrigSequences producers : { + EWMProducer : { module_type : NullProducer } + CaloShowerROMaker : { module_type : NullProducer } + CaloDigiMaker : { module_type : NullProducer } + makeSD : { module_type : NullProducer } @table::TrigProducers.producers SelectRecoMCDeMcpr : { @table::CommonMCTrigger.TTSelectRecoMC @@ -45,7 +54,6 @@ physics : { @table::Trig_physMenuPSConfig } analyzers : { - @table::Trigger.analyzers TADeMtpr : { @table::TrkAnaTrigger.TrkAnaDeMTT FitType : LoopHelix @@ -64,6 +72,8 @@ physics : { FitType : LoopHelix } } + @table::TrigRecoSequences + @table::TrigSequences EndPath : [TADeMtpr, TADeMcpr, TADePtpr, TADePcpr] } physics.trigger_paths : [@sequence::Trig_physMenu.trigger_paths] @@ -73,27 +83,27 @@ physics.trigger_paths : [@sequence::Trig_physMenu.trigger_paths] #include "Production/JobConfig/reco/drop_trigger.fcl" physics.end_paths : [ EndPath ] # add MC truth matching to the relevant paths -physics.tprDeM_highP_stopTarg_trigger : [ @sequence::physics.tprDeM_highP_stopTarg_trigger, SelectRecoMCDeMtpr] -physics.cprDeM_highP_stopTarg_trigger : [ @sequence::physics.cprDeM_highP_stopTarg_trigger, SelectRecoMCDeMcpr] -physics.tprDeP_highP_stopTarg_trigger : [ @sequence::physics.tprDeP_highP_stopTarg_trigger, SelectRecoMCDePtpr] -physics.cprDeP_highP_stopTarg_trigger : [ @sequence::physics.cprDeP_highP_stopTarg_trigger, SelectRecoMCDePcpr] +physics.tprDeM_highP_stopTarg : [ @sequence::physics.tprDeM_highP_stopTarg, SelectRecoMCDeMtpr] +physics.cprDeM_highP_stopTarg : [ @sequence::physics.cprDeM_highP_stopTarg, SelectRecoMCDeMcpr] +physics.tprDeP_highP_stopTarg : [ @sequence::physics.tprDeP_highP_stopTarg, SelectRecoMCDePtpr] +physics.cprDeP_highP_stopTarg : [ @sequence::physics.cprDeP_highP_stopTarg, SelectRecoMCDePcpr] -physics.analyzers.TADeMtpr.SelectEvents : [ tprDeM_highP_stopTarg_trigger ] +physics.analyzers.TADeMtpr.SelectEvents : [ tprDeM_highP_stopTarg ] physics.analyzers.TADeMtpr.candidate.input : "TTKSF" physics.analyzers.TADeMtpr.candidate.suffix : "DeM" physics.analyzers.TADeMtpr.KalSeedMCAssns: "SelectRecoMCDeMtpr" -physics.analyzers.TADeMcpr.SelectEvents : [ cprDeM_highP_stopTarg_trigger ] +physics.analyzers.TADeMcpr.SelectEvents : [ cprDeM_highP_stopTarg ] physics.analyzers.TADeMcpr.candidate.input : "TTCalSeedFit" physics.analyzers.TADeMcpr.candidate.suffix : "Dem" physics.analyzers.TADeMcpr.KalSeedMCAssns: "SelectRecoMCDeMcpr" -physics.analyzers.TADePtpr.SelectEvents : [ tprDeP_highP_stopTarg_trigger ] +physics.analyzers.TADePtpr.SelectEvents : [ tprDeP_highP_stopTarg ] physics.analyzers.TADePtpr.candidate.input : "TTKSF" physics.analyzers.TADePtpr.candidate.suffix : "DeP" physics.analyzers.TADePtpr.KalSeedMCAssns: "SelectRecoMCDePtpr" -physics.analyzers.TADePcpr.SelectEvents : [ cprDeP_highP_stopTarg_trigger ] +physics.analyzers.TADePcpr.SelectEvents : [ cprDeP_highP_stopTarg ] physics.analyzers.TADePcpr.candidate.input : "TTCalSeedFit" physics.analyzers.TADePcpr.candidate.suffix : "Dep" physics.analyzers.TADePcpr.KalSeedMCAssns: "SelectRecoMCDePcpr" diff --git a/Mu2eKinKal/test/TTTA_noMC.fcl b/Mu2eKinKal/test/TTTA_noMC.fcl deleted file mode 100644 index 32eecdc3e2..0000000000 --- a/Mu2eKinKal/test/TTTA_noMC.fcl +++ /dev/null @@ -1,89 +0,0 @@ - -# Run trigger and write TrkAna tree output -# To create a functional job you must add database purpose and version; ie create a fcl stub that #includes this file and -# adds (for instance): -# services.DbService.purpose: MDC2020_perfect -# services.DbService.version: v1_0 -# -#include "Offline/fcl/standardServices.fcl" -#include "mu2e_trig_config/gen/trig_physMenuPSConfig_OnSpill.fcl" -#include "mu2e_trig_config/gen/trig_physMenu_OnSpill.fcl" -#include "TrkAna/fcl/prolog_trigger.fcl" -process_name : OnSpillTrigger -services : @local::Services.Reco -source : { - module_type : RootInput -} - -physics : { - @table::TrigSequences - producers : { - @table::TrigProducers.producers - } - filters : { - @table::TrigFilters.filters - @table::Trig_physMenuPSConfig - } - analyzers : { - @table::Trigger.analyzers - TADeMtpr : { - @table::TrkAnaTrigger.TrkAnaDeMTT - FitType : LoopHelix - FillMCInfo : false - } - - TADeMcpr : { - @table::TrkAnaTrigger.TrkAnaDeMTT - FitType : LoopHelix - FillMCInfo : false - } - TADePtpr : { - @table::TrkAnaTrigger.TrkAnaDePTT - FitType : LoopHelix - FillMCInfo : false - } - TADePcpr : { - @table::TrkAnaTrigger.TrkAnaDePTT - FitType : LoopHelix - FillMCInfo : false - } - } - EndPath : [TADeMtpr, TADeMcpr, TADePtpr, TADePcpr] -} -physics.trigger_paths : [@sequence::Trig_physMenu.trigger_paths] -#include "mu2e_trig_config/core/trigDigiInputsEpilog.fcl" -physics.producers.EWMProducer.SpillType : 1 -#include "Production/JobConfig/common/epilog.fcl" -#include "Production/JobConfig/reco/drop_trigger.fcl" -physics.end_paths : [ EndPath ] - -physics.analyzers.TADeMtpr.SelectEvents : [ tprDeM_highP_stopTarg_trigger ] -physics.analyzers.TADeMtpr.candidate.input : "TTKSF" -physics.analyzers.TADeMtpr.candidate.suffix : "DeM" - -physics.analyzers.TADeMcpr.SelectEvents : [ cprDeM_highP_stopTarg_trigger ] -physics.analyzers.TADeMcpr.candidate.input : "TTCalSeedFit" -physics.analyzers.TADeMcpr.candidate.suffix : "Dem" - -physics.analyzers.TADePtpr.SelectEvents : [ tprDeP_highP_stopTarg_trigger ] -physics.analyzers.TADePtpr.candidate.input : "TTKSF" -physics.analyzers.TADePtpr.candidate.suffix : "DeP" - -physics.analyzers.TADePcpr.SelectEvents : [ cprDeP_highP_stopTarg_trigger ] -physics.analyzers.TADePcpr.candidate.input : "TTCalSeedFit" -physics.analyzers.TADePcpr.candidate.suffix : "Dep" - -services.TimeTracker.printSummary: true -services.TFileService.fileName: "nts.owner.TTKKSeed.version.sequence.root" - -# minimal BField map -services.GeometryService.bFieldFile : "Offline/Mu2eG4/geom/bfgeom_reco_v01.txt" -# setup proditions; as new proditions are added to the database this file MUST be updated or reco won't see them -services.ProditionsService.alignedTracker.useDb: true -services.ProditionsService.alignedTracker.verbose: 0 -services.ProditionsService.trackerStatus.Settings.useDb: true -services.ProditionsService.trackerStatus.Settings.verbose: 0 -services.ProditionsService.strawElectronics.useDb: true -services.ProditionsService.strawElectronics.verbose: 0 -# don't use database time offsets in digitization -services.ProditionsService.strawElectronics.overrideDbTimeOffsets : true From ecb339ebcfb864e67639c2460cf984961fd97ea4 Mon Sep 17 00:00:00 2001 From: Richard Bonventre Date: Tue, 13 Feb 2024 14:12:28 -0800 Subject: [PATCH 150/213] Updated strawdigi to use new alignedTrackerSim wire positions --- TrackerConditions/fcl/prolog.fcl | 2 + TrackerConditions/src/AlignedTrackerMaker.cc | 21 ++- TrackerConfig/inc/AlignedTrackerConfig.hh | 2 + TrackerMC/fcl/prolog.fcl | 1 + TrackerMC/inc/IonCluster.hh | 4 +- TrackerMC/inc/StrawCluster.hh | 10 +- TrackerMC/inc/StrawPosition.hh | 4 + TrackerMC/src/MakeStrawGasSteps_module.cc | 8 +- TrackerMC/src/StrawCluster.cc | 6 +- .../src/StrawDigisFromStrawGasSteps_module.cc | 121 +++++++++++------- 10 files changed, 116 insertions(+), 63 deletions(-) diff --git a/TrackerConditions/fcl/prolog.fcl b/TrackerConditions/fcl/prolog.fcl index ec07ae41b8..6882bdf427 100644 --- a/TrackerConditions/fcl/prolog.fcl +++ b/TrackerConditions/fcl/prolog.fcl @@ -22,11 +22,13 @@ Mu2eDetector : { AlignedTracker : { verbose : 0 useDb : true + onlyWireOffsets : false } AlignedTrackerSim : { verbose : 0 useDb : false + onlyWireOffsets : true } FullReadoutStraw : { diff --git a/TrackerConditions/src/AlignedTrackerMaker.cc b/TrackerConditions/src/AlignedTrackerMaker.cc index dfa47eedef..1dc0d36028 100644 --- a/TrackerConditions/src/AlignedTrackerMaker.cc +++ b/TrackerConditions/src/AlignedTrackerMaker.cc @@ -50,8 +50,15 @@ namespace mu2e { std::array wireends, strawends; for(int iend=0;iend < StrawEnd::nends; iend++){ auto end = static_cast(iend); - auto wireend_UVW = ds_to_panel*straw.wireEnd(end) + straw_align.wireDeltaUVW(end); - auto strawend_UVW = ds_to_panel*straw.strawEnd(end) + straw_align.strawDeltaUVW(end); + auto wireend_UVW = ds_to_panel*straw.wireEnd(end); + auto strawend_UVW = ds_to_panel*straw.strawEnd(end); + if ( _config.wireOnly() ){ + wireend_UVW += (straw_align.wireDeltaUVW(end) - straw_align.strawDeltaUVW(end)); + }else{ + wireend_UVW += straw_align.wireDeltaUVW(end); + strawend_UVW += straw_align.strawDeltaUVW(end); + } + // Transform back to global coordinates, including all the alignment corrections wireends[iend] = aligned_panel_to_ds*wireend_UVW; strawends[iend] = aligned_panel_to_ds*strawend_UVW; @@ -117,7 +124,15 @@ namespace mu2e { cout << "AlignedTrackerMaker::fromDb now aligning Tracker " << endl; } - alignTracker(ptr, tatr_p->rows(), tapl_p->rows(), tapa_p->rows(), tast_p->rows()); + if ( _config.wireOnly() ) { + std::vector tracker_align_params(1,TrkAlignParams(0,StrawId(0,0,0),0,0,0,0,0,0)); + std::vector plane_align_params(StrawId::_nplanes,TrkAlignParams(0,StrawId(0,0,0),0,0,0,0,0,0)); + std::vector panel_align_params(StrawId::_nupanels,TrkAlignParams(0,StrawId(0,0,0),0,0,0,0,0,0)); + + alignTracker(ptr, tracker_align_params, plane_align_params, panel_align_params, tast_p->rows()); + } else { + alignTracker(ptr, tatr_p->rows(), tapl_p->rows(), tapa_p->rows(), tast_p->rows()); + } if ( _config.verbose() > 0 ) cout << "AlignedTrackerMaker::fromDb made Tracker with nStraws = " << ptr->nStraws() << endl; return ptr; diff --git a/TrackerConfig/inc/AlignedTrackerConfig.hh b/TrackerConfig/inc/AlignedTrackerConfig.hh index 46d3b41c13..4131ddbdab 100644 --- a/TrackerConfig/inc/AlignedTrackerConfig.hh +++ b/TrackerConfig/inc/AlignedTrackerConfig.hh @@ -16,6 +16,8 @@ namespace mu2e { Name("verbose"), Comment("verbosity: 0,1,2")}; fhicl::Atom useDb{ Name("useDb"), Comment("use database or fcl")}; + fhicl::Atom wireOnly{ + Name("onlyWireOffsets"), Comment("sim geometry only includes wire offsets")}; }; } diff --git a/TrackerMC/fcl/prolog.fcl b/TrackerMC/fcl/prolog.fcl index 6fa4a6c561..c37d3ccf22 100644 --- a/TrackerMC/fcl/prolog.fcl +++ b/TrackerMC/fcl/prolog.fcl @@ -17,6 +17,7 @@ TrackerMC : { # set to digitize all hits in outer straws of the first 2 planes AllHitsPlanes : [0,1] AllHitsStraw : 91 # this straw and higher are always digitized + SimWireOffsets : false } } StepSim : [ StrawGasStepMaker ] diff --git a/TrackerMC/inc/IonCluster.hh b/TrackerMC/inc/IonCluster.hh index 9a6591f332..7a931c51bb 100644 --- a/TrackerMC/inc/IonCluster.hh +++ b/TrackerMC/inc/IonCluster.hh @@ -6,12 +6,12 @@ namespace mu2e { namespace TrackerMC { struct IonCluster { // ion charge cluster before drift or amplification - StrawPosition _pos; // position in straw coordinates + StrawCoordinates _pos; // position in straw coordinates // Float_t _phi; // initial angle of the cluster WRT the wire and the BField Float_t _charge; // charge of this cluster, in pC. Note: this is pre-gain!!! Float_t _eion; // ionization energy of this cluster, in MeV UInt_t _ne; // number of electrons in this cluster - IonCluster(StrawPosition const& pos, double charge, double eion, unsigned ne): + IonCluster(StrawCoordinates const& pos, double charge, double eion, unsigned ne): _pos(pos), _charge(charge),_eion(eion),_ne(ne) {} IonCluster() : _charge(0.0), _eion(0.0), _ne(0) {} }; diff --git a/TrackerMC/inc/StrawCluster.hh b/TrackerMC/inc/StrawCluster.hh index 29ff84f5f9..a7fb9c312d 100644 --- a/TrackerMC/inc/StrawCluster.hh +++ b/TrackerMC/inc/StrawCluster.hh @@ -37,7 +37,7 @@ namespace mu2e { float time, float charge, float wdist, - StrawPosition const& pos, + StrawCoordinates const& pos, float drifttime, float proptime, art::Ptr const& sgs, @@ -49,10 +49,10 @@ namespace mu2e { StrawEnd strawEnd() const { return _end; } double time() const { return _time;} float charge() const { return _charge; } - StrawPosition const& cluPos() const { return _pos; } + StrawCoordinates const& cluPos() const { return _pos; } float wireDistance() const { return _wdist; } - float driftDistance() const { return _pos.Rho(); } - float driftPhi() const { return _pos.Phi(); } + float driftDistance() const { return _pos._wirePosition.Rho(); } + float driftPhi() const { return _pos._wirePosition.Phi(); } float driftTime() const { return _drifttime; } float propTime() const { return _proptime; } art::Ptr const& strawGasStep() const { return _sgsptr; } @@ -66,7 +66,7 @@ namespace mu2e { float _time; // microbunch time at the wire end, in ns since EventWindowMarker, offsets and wrapping applied float _charge; // charge at the wire end, in units of pC float _wdist; // propagation distance from cluster to the wire end - StrawPosition _pos; // cluster position WRT the straw + StrawCoordinates _pos; // cluster position WRT the straw float _drifttime; // drift time to the wire float _proptime; // propagation time to the wire end art::Ptr _sgsptr; diff --git a/TrackerMC/inc/StrawPosition.hh b/TrackerMC/inc/StrawPosition.hh index 89835133b3..d1df17f071 100644 --- a/TrackerMC/inc/StrawPosition.hh +++ b/TrackerMC/inc/StrawPosition.hh @@ -4,6 +4,10 @@ namespace mu2e { namespace TrackerMC { typedef ROOT::Math::Cylindrical3D StrawPosition; // position WRT the straw. + struct StrawCoordinates { + StrawPosition _strawPosition; + StrawPosition _wirePosition; + }; } } #endif diff --git a/TrackerMC/src/MakeStrawGasSteps_module.cc b/TrackerMC/src/MakeStrawGasSteps_module.cc index 54c438da9b..314b1e335b 100644 --- a/TrackerMC/src/MakeStrawGasSteps_module.cc +++ b/TrackerMC/src/MakeStrawGasSteps_module.cc @@ -265,7 +265,7 @@ namespace mu2e { const Straw& straw = tracker.getStraw(sgs.strawId()); static double r2 = tracker.strawProperties()._strawInnerRadius * tracker.strawProperties()._strawInnerRadius; Hep3Vector hend = GenVector::Hep3Vec(sgs.endPosition()); - double rd2 = (hend-straw.getMidPoint()).perpPart(straw.getDirection()).mag2(); + double rd2 = (hend-straw.strawPosition()).perpPart(straw.strawDirection()).mag2(); if(rd2 - r2 > 1e-5 ) cout << "End outside straw, radius " << sqrt(rd2) << endl; } } // end of pair loop @@ -346,7 +346,7 @@ namespace mu2e { // Skip straws that can't give signals, if (!trackerStatus.noSignal(sid)) { Straw const& straw = tracker.getStraw(sid); - double wpos = fabs((step.position()-straw.getMidPoint()).dot(straw.getDirection())); + double wpos = fabs((step.position()-straw.strawPosition()).dot(straw.strawDirection())); //skip steps that occur in the deadened region near the end of each wire if( wpos < straw.halfLength()){ cet::map_vector_key tid = step.simParticle().get()->id(); @@ -441,7 +441,7 @@ namespace mu2e { } void MakeStrawGasSteps::fillStepDiag(Straw const& straw, StrawGasStep const& sgs, SPMCPV const& spmcptrs) { - _erad = sqrt((GenVector::Hep3Vec(sgs.endPosition())-straw.getMidPoint()).perpPart(straw.getDirection()).mag2()); + _erad = sqrt((GenVector::Hep3Vec(sgs.endPosition())-straw.strawPosition()).perpPart(straw.strawDirection()).mag2()); _hendrad->Fill(_erad); _hphi->Fill(_brot); if(_diag > 1){ @@ -456,7 +456,7 @@ namespace mu2e { _width = sgs.width(); // compute DOCA to the wire TwoLinePCA poca(GenVector::Hep3Vec(sgs.startPosition()),GenVector::Hep3Vec(sgs.endPosition()-sgs.startPosition()), - straw.getMidPoint(),straw.getDirection()); + straw.wirePosition(),straw.wireDirection()); _doca = poca.dca(); _sdist.clear(); _sdot.clear(); diff --git a/TrackerMC/src/StrawCluster.cc b/TrackerMC/src/StrawCluster.cc index 175d08e2c1..fa80678495 100644 --- a/TrackerMC/src/StrawCluster.cc +++ b/TrackerMC/src/StrawCluster.cc @@ -18,7 +18,7 @@ namespace mu2e { float time, float charge, float wdist, - StrawPosition const& pos, + StrawCoordinates const& pos, float drifttime, float proptime, art::Ptr const& sgsptr, @@ -43,8 +43,8 @@ namespace mu2e { << " end " << _end << " time " << _time << " charge " << _charge - << " drift distance " << _pos.Rho() - << " phi " << _pos.Phi() + << " drift distance " << _pos._wirePosition.Rho() + << " phi " << _pos._wirePosition.Phi() << " wire propagation distance " << _wdist << " " << *_sgsptr << std::endl; } diff --git a/TrackerMC/src/StrawDigisFromStrawGasSteps_module.cc b/TrackerMC/src/StrawDigisFromStrawGasSteps_module.cc index db8793f716..5f97f9e2da 100644 --- a/TrackerMC/src/StrawDigisFromStrawGasSteps_module.cc +++ b/TrackerMC/src/StrawDigisFromStrawGasSteps_module.cc @@ -71,7 +71,7 @@ namespace mu2e { struct WireCharge { // charge at the wire after drift float _charge; // charge at the wire, in units of pC float _time; // relative time at the wire, relative to ionzation time (ns) - StrawPosition _pos; // cylindrical coordinates WRT straw + StrawCoordinates _pos; // cylindrical coordinates WRT straw }; struct WireEndCharge { // charge at one end of the wire after propagation @@ -113,6 +113,7 @@ namespace mu2e { fhicl::Atom diagpath{ Name("DiagPath"), Comment("Digitization Path for waveform diagnostics") ,0 }; fhicl::Atom spinstance { Name("StrawGasStepInstance"), Comment("StrawGasStep Instance name"),""}; fhicl::Atom spmodule { Name("StrawGasStepModule"), Comment("StrawGasStep Module name"),""}; + fhicl::Atom wireoffsets { Name("SimWireOffsets"), Comment("Use wire offsets in sim")}; }; @@ -159,6 +160,7 @@ namespace mu2e { std::vector _allPlanes; unsigned _maxnclu; StrawElectronics::Path _diagpath; + bool _simWireOffsets; // Random number distributions art::RandomNumberGenerator::base_engine_t& _engine; CLHEP::RandGaussQ _randgauss; @@ -172,6 +174,8 @@ namespace mu2e { // Proditions ProditionsHandle _strawphys_h; ProditionsHandle _strawele_h; + ProditionsHandle _alignedTrackerSim_h; + const Tracker *_tracker; art::Selector _selector; double _rstraw; // cache // diagnostics @@ -194,6 +198,7 @@ namespace mu2e { Double_t _mctime; Int_t _mcthreshpdg, _mcthreshproc, _mcnstep; Float_t _mcdca, _mcdcaphi, _mcdcadtime; + Float_t _mcstrawdca, _mcstrawdcaphi, _mcstrawdcadtime; Int_t _dmcpdg, _dmcproc, _dmcgen; Float_t _dmcmom; Bool_t _xtalk; @@ -215,7 +220,7 @@ namespace mu2e { // helper functions void fillClusterMap(StrawPhysics const& strawphys, - StrawElectronics const& strawele,Tracker const& tracker, + StrawElectronics const& strawele, art::Event const& event, StrawClusterMap & hmap); void addStep(StrawPhysics const& strawphys, StrawElectronics const& strawele, @@ -237,21 +242,19 @@ namespace mu2e { void findThresholdCrossings(StrawElectronics const& strawele, SWFP const& swfp, WFXPList& xings); void createDigis(StrawPhysics const& strawphys, StrawElectronics const& strawele, - Tracker const& tracker, Straw const& straw, StrawClusterSequencePair const& hsp, XTalk const& xtalk, StrawDigiCollection* digis, StrawDigiADCWaveformCollection* digiadcs, StrawDigiMCCollection* mcdigis); void fillDigis(StrawPhysics const& strawphys, StrawElectronics const& strawele, - Tracker const& tracker, WFXPList const& xings,SWFP const& swfp , StrawId sid, StrawDigiCollection* digis, StrawDigiADCWaveformCollection* digiadcs, StrawDigiMCCollection* mcdigis); bool createDigi(StrawElectronics const& strawele,WFXP const& xpair, SWFP const& wf, StrawId sid, StrawDigiCollection* digis, StrawDigiADCWaveformCollection* digiadcs, double &digitization_ready_time); void findCrossTalkStraws(Straw const& straw,vector& xtalk); void fillClusterNe(StrawPhysics const& strawphys,std::vector& me); - void fillClusterPositions(StrawGasStep const& step, Straw const& straw, std::vector& cpos); + void fillClusterPositions(StrawGasStep const& step, Straw const& straw, std::vector& cpos); void fillClusterMinion(StrawPhysics const& strawphys, StrawGasStep const& step, std::vector& me, std::vector& cen); bool readAll(StrawId const& sid) const; // diagnostic functions @@ -261,8 +264,8 @@ namespace mu2e { SWFP const& wf, WFXPList const& xings); void digiDiag(StrawPhysics const& strawphys, SWFP const& wf, WFXP const& xpair, StrawDigi const& digi, StrawDigiADCWaveform const& digiadc, StrawDigiMC const& mcdigi); void stepDiag(StrawPhysics const& strawphys, StrawElectronics const& strawele, StrawGasStep const& sgs); - StrawPosition strawPosition( XYZVectorF const& cpos,Straw const& straw) const; - XYZVectorF strawPosition( StrawPosition const& cpos, Straw const& straw) const; + StrawCoordinates strawCoordinates(XYZVectorF const& cpos, Straw const& straw) const; + XYZVectorF strawCoordinatesToXYZ(StrawCoordinates const& cpos, Straw const& straw) const; }; StrawDigisFromStrawGasSteps::StrawDigisFromStrawGasSteps(const Parameters& config) : @@ -292,6 +295,7 @@ namespace mu2e { _allPlanes(config().allPlanes()), _maxnclu(config().maxnclu()), _diagpath(static_cast(config().diagpath())), + _simWireOffsets(config().wireoffsets()), // Random number distributions _engine(createEngine( art::ServiceHandle()->getSeed())), _randgauss( _engine ), @@ -406,6 +410,9 @@ namespace mu2e { _sddiag->Branch("mcdca",&_mcdca,"mcdca/F"); _sddiag->Branch("mcdcaphi",&_mcdcaphi,"mcdcaphi/F"); _sddiag->Branch("mcdcadtime",&_mcdcadtime,"mcdcadtime/F"); + _sddiag->Branch("mcstrawdca",&_mcstrawdca,"mcstrawdca/F"); + _sddiag->Branch("mcstrawdcaphi",&_mcstrawdcaphi,"mcstrawdcaphi/F"); + _sddiag->Branch("mcstrawdcadtime",&_mcstrawdcadtime,"mcstrawdcadtime/F"); _sddiag->Branch("mcpdg",&_dmcpdg,"mcpdg/I"); _sddiag->Branch("mcproc",&_dmcproc,"mcproc/I"); _sddiag->Branch("mcgen",&_dmcgen,"mcgen/I"); @@ -414,6 +421,7 @@ namespace mu2e { } } + _alignedTrackerSim_h = ProditionsHandle("Sim"); } void StrawDigisFromStrawGasSteps::beginRun( art::Run& run ){ @@ -432,7 +440,7 @@ namespace mu2e { // update conditions caches, etc StrawPhysics const& strawphys = _strawphys_h.get(event.id()); StrawElectronics const& strawele = _strawele_h.get(event.id()); - const Tracker& tracker = *GeomHandle(); + _tracker = _alignedTrackerSim_h.getPtr(event.id()).get(); _mbtime = GlobalConstantsHandle()->getNominalDRPeriod(); art::Handle ewMarkerHandle; event.getByLabel(_ewMarkerTag, ewMarkerHandle); @@ -468,16 +476,16 @@ namespace mu2e { // this is a map from straw ids to a list of all clusters on that straw from this event StrawClusterMap hmap; // fill this from the event - fillClusterMap(strawphys,strawele,tracker,event,hmap); + fillClusterMap(strawphys,strawele,event,hmap); // add noise clusts if(_addNoise)addNoise(hmap); // loop over the clust sequences (i.e. loop over straws, and for each get their list of clusters) for(auto ihsp=hmap.begin();ihsp!= hmap.end();++ihsp){ StrawClusterSequencePair const& hsp = ihsp->second; - Straw const& straw = tracker.getStraw(hsp.strawId()); + Straw const& straw = _tracker->getStraw(hsp.strawId()); // create primary digis from this clust sequence XTalk self(hsp.strawId()); // this object represents the straws coupling to itself, ie 100% - createDigis(strawphys,strawele,tracker,straw,hsp,self,digis.get(),digiadcs.get(),mcdigis.get()); + createDigis(strawphys,strawele,straw,hsp,self,digis.get(),digiadcs.get(),mcdigis.get()); // if we're applying x-talk, look for nearby coupled straws if(_addXtalk) { // only apply if the charge is above a threshold @@ -489,7 +497,7 @@ namespace mu2e { vector xtalk; findCrossTalkStraws(straw,xtalk); for(auto ixtalk=xtalk.begin();ixtalk!=xtalk.end();++ixtalk){ - createDigis(strawphys,strawele,tracker,straw,hsp,*ixtalk,digis.get(),digiadcs.get(),mcdigis.get()); + createDigis(strawphys,strawele,straw,hsp,*ixtalk,digis.get(),digiadcs.get(),mcdigis.get()); } } } @@ -508,7 +516,6 @@ namespace mu2e { void StrawDigisFromStrawGasSteps::createDigis( StrawPhysics const& strawphys, StrawElectronics const& strawele, - Tracker const& tracker, Straw const& straw, StrawClusterSequencePair const& hsp, XTalk const& xtalk, @@ -522,12 +529,11 @@ namespace mu2e { // find the threshold crossings findThresholdCrossings(strawele,waveforms,xings); // convert the crossing points into digis, and add them to the event data - fillDigis(strawphys,strawele,tracker,xings,waveforms,xtalk._dest,digis,digiadcs,mcdigis); + fillDigis(strawphys,strawele,xings,waveforms,xtalk._dest,digis,digiadcs,mcdigis); } void StrawDigisFromStrawGasSteps::fillClusterMap(StrawPhysics const& strawphys, StrawElectronics const& strawele, - const Tracker& tracker, art::Event const& event, StrawClusterMap & hmap){ // Get all of the tracker StrawGasStep collections from the event: typedef vector< art::Handle > HandleVector; @@ -554,7 +560,7 @@ namespace mu2e { auto const& sgs = steps[isgs]; // lookup straw here, to avoid having to find the tracker for every step StrawId const & sid = sgs.strawId(); - Straw const& straw = tracker.getStraw(sid); + Straw const& straw = _tracker->getStraw(sid); if(sgs.ionizingEdep() > _minstepE){ auto sgsptr = SGSPtr(sgsch,isgs); // create a clust from this step, and add it to the clust map @@ -616,7 +622,7 @@ namespace mu2e { float cen = sgs.ionizingEdep(); float fne = cen/strawphys.meanElectronEnergy(); unsigned ne = std::max( static_cast(_randP(fne)),(unsigned)1); - auto spos = strawPosition(sgs.startPosition(),straw); + auto spos = strawCoordinates(sgs.startPosition(),straw); if(_drift1e){ for (size_t i=0;i(floor(sgs.ionizingEdep()/strawphys.ionizationEnergy((unsigned)1)))); if(nc>0){ // generate random positions for the clusters - std::vector cposv(nc); + std::vector cposv(nc); fillClusterPositions(sgs,straw,cposv); // generate electron counts and energies for these clusters: minion model is more detailed std::vector ne(nc); @@ -679,9 +685,9 @@ namespace mu2e { double gain = strawphys.clusterGain(_randgauss, _randflat, cluster._ne); wireq._charge = cluster._charge*(gain); // compute drift time for this cluster - double dt = strawphys.driftDistanceToTime(cluster._pos.Rho(),cluster._pos.Phi()); // this is now from the lorentz corrected r-component of the drift + double dt = strawphys.driftDistanceToTime(cluster._pos._wirePosition.Rho(),cluster._pos._wirePosition.Phi()); // this is now from the lorentz corrected r-component of the drift wireq._pos = cluster._pos; - wireq._time = _randgauss.fire(dt,strawphys.driftTimeSpread(cluster._pos.Rho())); + wireq._time = _randgauss.fire(dt,strawphys.driftTimeSpread(cluster._pos._wirePosition.Rho())); } void StrawDigisFromStrawGasSteps::propagateCharge( @@ -690,9 +696,9 @@ namespace mu2e { // compute distance to the appropriate end; note that the straw always points from HV to cal (Duke convention) double wlen = straw.halfLength(); // use the full length, not the active length if(end == StrawEnd::cal) - weq._wdist = wlen - wireq._pos.Z(); + weq._wdist = wlen - wireq._pos._wirePosition.Z(); else - weq._wdist = wlen + wireq._pos.Z(); + weq._wdist = wlen + wireq._pos._wirePosition.Z(); // split the charge weq._charge = 0.5*wireq._charge; weq._time = strawphys.propagationTime(weq._wdist); @@ -774,13 +780,12 @@ namespace mu2e { void StrawDigisFromStrawGasSteps::fillDigis(StrawPhysics const& strawphys, StrawElectronics const& strawele, - Tracker const& tracker, WFXPList const& xings, SWFP const& wf, StrawId sid, StrawDigiCollection* digis, StrawDigiADCWaveformCollection* digiadcs, StrawDigiMCCollection* mcdigis ) { // - Straw const& straw = tracker.getStraw(sid); + Straw const& straw = _tracker->getStraw(sid); double digitization_ready_time = -9e9; //FIXME no deadtime for first hit of a microbunch // loop over crossings for(auto xpair : xings) { @@ -795,7 +800,7 @@ namespace mu2e { StrawCluster const& sc = *(xpair[iend]._iclust); wetime[iend] = sc.time(); ctime[iend] = sc.cluTime(); - cpos[iend] = strawPosition(sc.cluPos(),straw); + cpos[iend] = strawCoordinatesToXYZ(sc.cluPos(),straw); sgspa[iend] = sc.strawGasStep(); } // choose the minimum time from either end, as the ADC sums both @@ -909,7 +914,7 @@ namespace mu2e { // create random noise clusts and add them to the sequences of random straws. } - void StrawDigisFromStrawGasSteps::fillClusterPositions(StrawGasStep const& sgs, Straw const& straw, std::vector& cposv) { + void StrawDigisFromStrawGasSteps::fillClusterPositions(StrawGasStep const& sgs, Straw const& straw, std::vector& cposv) { // generate a random position between the start and end points. XYZVectorF path = sgs.endPosition() - sgs.startPosition(); for(auto& cpos : cposv) { @@ -922,7 +927,7 @@ namespace mu2e { pos += p1*_randgauss.fire()*sgs.width(); pos += p2*_randgauss.fire()*sgs.width(); } - cpos = strawPosition(pos,straw); + cpos = strawCoordinates(pos,straw); } } @@ -983,8 +988,7 @@ namespace mu2e { void StrawDigisFromStrawGasSteps::waveformDiag( StrawElectronics const& strawele, SWFP const& wfs, WFXPList const& xings) { - const Tracker& tracker = *GeomHandle(); - const Straw& straw = tracker.getStraw( wfs[0].clusts().strawId() ); + const Straw& straw = _tracker->getStraw( wfs[0].clusts().strawId() ); _swplane = straw.id().getPlane(); _swpanel = straw.id().getPanel(); _swlayer = straw.id().getLayer(); @@ -1108,8 +1112,7 @@ namespace mu2e { void StrawDigisFromStrawGasSteps::digiDiag(StrawPhysics const& strawphys, SWFP const& wfs, WFXP const& xpair, StrawDigi const& digi, StrawDigiADCWaveform const& digiadc, StrawDigiMC const& mcdigi) { - const Tracker& tracker = *GeomHandle(); - const Straw& straw = tracker.getStraw( digi.strawId() ); + const Straw& straw = _tracker->getStraw( digi.strawId() ); _sdplane = straw.id().getPlane(); _sdpanel = straw.id().getPanel(); _sdlayer = straw.id().getLayer(); @@ -1176,12 +1179,19 @@ namespace mu2e { auto const& sgs = *sgsptr; _mctime = sgs.time() + _pbtimemc; // compute the doca for this step - TwoLinePCA pca( straw.getMidPoint(), straw.getDirection(), + TwoLinePCA wirepca( straw.wirePosition(), straw.wireDirection(), GenVector::Hep3Vec(sgs.startPosition()), GenVector::Hep3Vec(sgs.endPosition()-sgs.startPosition()) ); - _mcdca = pca.dca(); - auto spos = strawPosition(XYZVectorF(pca.point2()),straw); - _mcdcaphi = spos.Phi(); + _mcdca = wirepca.dca(); + auto spos = strawCoordinates(XYZVectorF(wirepca.point2()),straw); + _mcdcaphi = spos._wirePosition.Phi(); _mcdcadtime = strawphys.driftDistanceToTime(_mcdca,_mcdcaphi); + + TwoLinePCA strawpca( straw.strawPosition(), straw.strawDirection(), + GenVector::Hep3Vec(sgs.startPosition()), GenVector::Hep3Vec(sgs.endPosition()-sgs.startPosition()) ); + _mcstrawdca = strawpca.dca(); + auto strawspos = strawCoordinates(XYZVectorF(strawpca.point2()),straw); + _mcstrawdcaphi = strawspos._strawPosition.Phi(); + _mcstrawdcadtime = strawphys.driftDistanceToTime(_mcstrawdca,_mcstrawdcaphi); _dmcmom = sqrt(sgs.momentum().mag2()); auto const& sp = *sgs.simParticle(); _dmcpdg = sp.pdgId(); @@ -1225,28 +1235,47 @@ namespace mu2e { _sdiag->Fill(); } - StrawPosition StrawDigisFromStrawGasSteps::strawPosition( XYZVectorF const& cpos,Straw const& straw) const { + StrawCoordinates StrawDigisFromStrawGasSteps::strawCoordinates( XYZVectorF const& cpos, Straw const& straw) const { + StrawCoordinates retval; static XYZVectorF zdir(0.0,0.0,1.0); - XYZVectorF smid = XYZVectorF(straw.getMidPoint()); - XYZVectorF delta = cpos - smid; // cluster position WRT straw middle - XYZVectorF sdir = XYZVectorF(straw.getDirection()); + XYZVectorF smid = XYZVectorF(straw.strawPosition()); + XYZVectorF delta = cpos - smid; // cluster position WRT nominal straw middle + XYZVectorF sdir = XYZVectorF(straw.strawDirection()); XYZVectorF pdir = sdir.Cross(zdir); // radial direction if(pdir.Dot(smid) < 0.0)pdir *= -1.0; // sign radially outwards float dw = delta.Dot(sdir); XYZVectorF cperp = delta - dw*sdir; // just perp part - float phi = atan2(cperp.Dot(pdir),cperp.Dot(zdir));// angle around wire WRT Z axis in range -pi,pi + float phi = atan2(cperp.Dot(pdir),cperp.Dot(zdir)); // angle around wire WRT z axis in range -pi,pi float rho = min(sqrt(cperp.mag2()),(float)_rstraw); // truncate! - return StrawPosition(rho,dw,phi); + retval._strawPosition = StrawPosition(rho,dw,phi); + if (_simWireOffsets){ + // now we get the wire position by calculating a position relative to the misaligned straw envelope + //XYZVectorF simAlignedPos = strawPositionToXYZ(retval._strawPosition, simStraw); + // calculate cylidrical coordinates relative to misaligned wire + smid = XYZVectorF(straw.wirePosition()); + delta = cpos - smid; // cluster position WRT wire middle + sdir = XYZVectorF(straw.wireDirection()); + pdir = sdir.Cross(zdir); // radial direction + if(pdir.Dot(smid) < 0.0)pdir *= -1.0; // sign radially outwards + dw = delta.Dot(sdir); + cperp = delta - dw*sdir; // just perp part + phi = atan2(cperp.Dot(pdir),cperp.Dot(zdir));// angle around wire WRT Z axis in range -pi,pi + rho = sqrt(cperp.mag2()); + retval._wirePosition = StrawPosition(rho,dw,phi); + }else{ + retval._wirePosition = retval._strawPosition; + } + return retval; } - XYZVectorF StrawDigisFromStrawGasSteps::strawPosition( StrawPosition const& cpos, Straw const& straw) const { + XYZVectorF StrawDigisFromStrawGasSteps::strawCoordinatesToXYZ( StrawCoordinates const& cpos, Straw const& straw) const { static XYZVectorF zdir(0.0,0.0,1.0); - XYZVectorF smid = XYZVectorF(straw.getMidPoint()); - XYZVectorF sdir = XYZVectorF(straw.getDirection()); + XYZVectorF smid = XYZVectorF(straw.wirePosition()); + XYZVectorF sdir = XYZVectorF(straw.wireDirection()); XYZVectorF pdir = sdir.Cross(zdir); if(pdir.Dot(smid) < 0.0)pdir *= -1.0; // sign radially outwards - XYZVectorF cdir = cos(cpos.Phi())*zdir + sin(cpos.Phi())*pdir; // cluster direction perp to wire - XYZVectorF retval = smid + cpos.Z()*sdir + cpos.Rho()*cdir; + XYZVectorF cdir = cos(cpos._wirePosition.Phi())*zdir + sin(cpos._wirePosition.Phi())*pdir; // cluster direction perp to wire + XYZVectorF retval = smid + cpos._wirePosition.Z()*sdir + cpos._wirePosition.Rho()*cdir; return retval; } From a9ef6ae4b6abebcc5acdc8148d9690afaff48585 Mon Sep 17 00:00:00 2001 From: Gianantonio Pezzullo Date: Tue, 27 Feb 2024 17:10:40 -0600 Subject: [PATCH 151/213] updates in the trigger code --- DAQ/test/generateBinaryFromDigi.fcl | 10 +++++----- Trigger/src/PrescaleEvent_module.cc | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/DAQ/test/generateBinaryFromDigi.fcl b/DAQ/test/generateBinaryFromDigi.fcl index 88a0d131a9..045e918a90 100644 --- a/DAQ/test/generateBinaryFromDigi.fcl +++ b/DAQ/test/generateBinaryFromDigi.fcl @@ -7,7 +7,7 @@ #include "Offline/fcl/minimalMessageService.fcl" #include "Offline/fcl/standardServices.fcl" -#include "Offline/DAQ/fcl/prolog_trigger.fcl" +#include "mu2e_trig_config/core/trigProducers.fcl" process_name : BinaryFromDigi @@ -26,7 +26,7 @@ physics : { producers : { binaryOutput: { - @table::DAQ.producers.binaryOutput + @table::TrigDAQProducers.binaryOutput generateTimestampTable : 1 } } @@ -55,8 +55,8 @@ physics : { } t1 : [ binaryOutput ] - #e1 : [ readSD, readCD ] - e1 : [ readSD, readCD, readFragments ] + e1 : [ readSD, readCD ] + #e1 : [ readSD, readCD, readFragments ] trigger_paths : [t1] end_paths : [e1] @@ -64,7 +64,7 @@ physics : { } physics.producers.binaryOutput.includeTracker : 1 -physics.producers.binaryOutput.includeCalorimeter : 1 +#physics.producers.binaryOutput.includeCalorimeter : 1 physics.producers.binaryOutput.outputFile : "DTC_packets.bin" services.TFileService.fileName : "generateBinaryFromDigi_test.root" diff --git a/Trigger/src/PrescaleEvent_module.cc b/Trigger/src/PrescaleEvent_module.cc index 4903f70a5d..6866f6b8ac 100644 --- a/Trigger/src/PrescaleEvent_module.cc +++ b/Trigger/src/PrescaleEvent_module.cc @@ -91,7 +91,7 @@ namespace mu2e bool retval(false); bool condition = e.event() % ps == 0; - if(condition) { + if(condition && (ps > 0)) { ++_npass; retval = true; } From 63518c83a87e1427c7bfbde09b4e9102dc8501cb Mon Sep 17 00:00:00 2001 From: Richard Bonventre Date: Thu, 29 Feb 2024 13:03:21 -0800 Subject: [PATCH 152/213] Added all tracker geom dependent info to TrkStrawHit(MC) --- CommonMC/src/SelectRecoMC_module.cc | 33 ++++++++++++++-- CosmicReco/src/CosmicTrackFit.cc | 2 + CosmicReco/src/LineFinder_module.cc | 2 + MCDataProducts/inc/KalSeedMC.hh | 7 ++++ Mu2eKinKal/inc/KKFit.hh | 3 +- Mu2eKinKal/inc/KKFitUtilities.hh | 1 + Mu2eKinKal/src/KKFitUtilities.cc | 5 ++- RecoDataProducts/inc/TrkStrawHitSeed.hh | 38 ++++++++++++++++++- .../src/StrawDigisFromStrawGasSteps_module.cc | 8 ++-- TrkDiag/src/StrawHitDiag_module.cc | 2 +- 10 files changed, 88 insertions(+), 13 deletions(-) diff --git a/CommonMC/src/SelectRecoMC_module.cc b/CommonMC/src/SelectRecoMC_module.cc index 3d0f8f7a9b..6bf633d74d 100644 --- a/CommonMC/src/SelectRecoMC_module.cc +++ b/CommonMC/src/SelectRecoMC_module.cc @@ -45,6 +45,7 @@ #include "Offline/GeometryService/inc/DetectorSystem.hh" #include "Offline/GlobalConstantsService/inc/GlobalConstantsHandle.hh" #include "Offline/GlobalConstantsService/inc/PhysicsParams.hh" +#include "Offline/Mu2eUtilities/inc/TwoLinePCA_XYZ.hh" // C++ #include @@ -110,6 +111,7 @@ namespace mu2e { double _pbtimemc; // mc true proton bunch time bool _onSpill; ProditionsHandle _strawResponse_h; + ProditionsHandle _alignedTrackerSim_h; }; SelectRecoMC::SelectRecoMC(const Parameters& config ) : @@ -174,6 +176,7 @@ namespace mu2e { std::cout << "Using HelixSeed collections from "; for (auto const& hsc : _hscs) std::cout << hsc << " " << std::endl; } + _alignedTrackerSim_h = ProditionsHandle("Sim"); } void SelectRecoMC::produce(art::Event& event) { @@ -300,10 +303,32 @@ namespace mu2e { tshmc._tdrift = sdmc.wireEndTime(sdmc.earlyEnd()) -tshmc._time - tshmc._tprop - _pbtimemc - 2.4; // temporary kludge offset FIXME! if (_onSpill) tshmc._tdrift = fmod(tshmc._tdrift,_mbtime); - auto tperp = (tdir - tdir.Dot(wdir)*wdir).Unit(); const static XYZVectorF bdir(0.0,0.0,1.0); - double phi = acos(tperp.Dot(bdir)); // Lorentz angle - tshmc._rdrift = srep->strawDrift().T2D(tshmc._tdrift,phi); + + TwoLinePCA_XYZ wirepca( XYZVectorF(straw.wirePosition()), XYZVectorF(straw.wireDirection()), + tshmc._cpos, tdir ); + TwoLinePCA_XYZ strawpca( XYZVectorF(straw.strawPosition()), XYZVectorF(straw.strawDirection()), + tshmc._cpos, tdir ); + + auto mcsep = wirepca.point2() - wirepca.point1(); + tshmc._wireLen = mcsep.Dot(wdir); + auto mcperp = tdir.Cross(wdir).Unit(); + tshmc._wireDOCA = -1*mcperp.Dot(mcsep); + auto pdir = wdir.Cross(bdir); + if (pdir.Dot(XYZVectorF(straw.wirePosition())) < 0.0) pdir *= -1.0; //sign radially out + tshmc._wirePhi = atan2(mcsep.Dot(pdir),mcsep.Dot(bdir)); + tshmc._wireDot = tdir.Dot(wdir); + auto wperp = wdir.Cross(mcperp); + tshmc._wireTau = mcsep.Dot(wperp); + tshmc._rdrift = srep->strawDrift().T2D(tshmc._tdrift,tshmc._wirePhi); + + auto sdir = XYZVectorF(straw.strawDirection()); + mcsep = strawpca.point2() - strawpca.point1(); + mcperp = tdir.Cross(sdir).Unit(); + tshmc._strawDOCA = -1*mcperp.Dot(mcsep); + pdir = sdir.Cross(bdir); + if (pdir.Dot(XYZVectorF(straw.strawPosition())) < 0.0) pdir *= -1.0; //sign radially out + tshmc._strawPhi = atan2(mcsep.Dot(pdir),mcsep.Dot(bdir)); } void SelectRecoMC::fillSDMCI(KalSeedMC const& mcseed, SDIS& sdindices) { @@ -350,7 +375,7 @@ namespace mu2e { PrimaryParticle const& pp, RecoCount& nrec) { GeomHandle det; auto srep = _strawResponse_h.getPtr(event.id()); - Tracker const & tracker = *(GeomHandle()); + Tracker const& tracker = *(_alignedTrackerSim_h.getPtr(event.id()).get()); // Tracker-reated data products auto sdch = event.getValidHandle(_sdc); diff --git a/CosmicReco/src/CosmicTrackFit.cc b/CosmicReco/src/CosmicTrackFit.cc index bc93333605..c7a34aef2a 100644 --- a/CosmicReco/src/CosmicTrackFit.cc +++ b/CosmicReco/src/CosmicTrackFit.cc @@ -168,6 +168,7 @@ namespace mu2e std::vector shitids; tseed._straw_chits.fillStrawHitIndices(ich, shitids); + /* for(auto const& ids : shitids){ size_t istraw = (ids); TrkStrawHitSeed tshs; @@ -175,6 +176,7 @@ namespace mu2e tshs._t0 = tseed._t0; tseed._trkstrawhits.push_back(tshs); } + */ } } diff --git a/CosmicReco/src/LineFinder_module.cc b/CosmicReco/src/LineFinder_module.cc index 90b1c17ed6..c596ed0791 100644 --- a/CosmicReco/src/LineFinder_module.cc +++ b/CosmicReco/src/LineFinder_module.cc @@ -263,6 +263,7 @@ int LineFinder::findLine(const ComboHitCollection& shC, art::Event const& event, std::vector shitids; tseed._straw_chits.fillStrawHitIndices(ich, shitids); + /* for(auto const& ids : shitids){ size_t istraw = (ids); TrkStrawHitSeed tshs; @@ -270,6 +271,7 @@ int LineFinder::findLine(const ComboHitCollection& shC, art::Event const& event, tshs._t0 = tseed._t0; tseed._trkstrawhits.push_back(tshs); } + */ } return good_hits; diff --git a/MCDataProducts/inc/KalSeedMC.hh b/MCDataProducts/inc/KalSeedMC.hh index 05ece48cb8..98ebc0ad64 100644 --- a/MCDataProducts/inc/KalSeedMC.hh +++ b/MCDataProducts/inc/KalSeedMC.hh @@ -88,6 +88,13 @@ namespace mu2e { float _tprop; // signal propagation time of from the wire crossing point to the nearest end XYZVectorF _cpos; // trigger cluster position in detector coordinates XYZVectorF _mom; // momentum of particle at point where digi created + float _wireDOCA; // signed doca to wire + float _wirePhi; // cylindrical phi from -pi to pi with 0 in Z direction + float _wireLen; // longitudinal position along wire from middle + float _wireDot; // cosine of angle between track and wire + float _wireTau; // threshold cluster distance to the wire along the perpedicular particle path + float _strawDOCA; // signed doca to straw + float _strawPhi; // cylindrical phi from -pi to pi with 0 in Z direction }; struct KalSeedMC { diff --git a/Mu2eKinKal/inc/KKFit.hh b/Mu2eKinKal/inc/KKFit.hh index dbdadf1708..e88001c9eb 100644 --- a/Mu2eKinKal/inc/KKFit.hh +++ b/Mu2eKinKal/inc/KKFit.hh @@ -515,7 +515,8 @@ namespace mu2e { strawhit->refResidual(Mu2eKinKal::tresid), strawhit->refResidual(Mu2eKinKal::dresid), strawhit->fillDriftInfo(), - strawhit->hitState()); + strawhit->hitState(), + strawhit->straw()); } if(kktrk.caloHits().size() > 0){ auto const& calohit = kktrk.caloHits().front(); // for now take the front: not sure if there will ever be >1 TODO diff --git a/Mu2eKinKal/inc/KKFitUtilities.hh b/Mu2eKinKal/inc/KKFitUtilities.hh index 9f2f841a44..ba9a33d7e6 100644 --- a/Mu2eKinKal/inc/KKFitUtilities.hh +++ b/Mu2eKinKal/inc/KKFitUtilities.hh @@ -20,6 +20,7 @@ namespace mu2e { KinKal::Line hitLine(ComboHit const& ch, Straw const& straw,StrawResponse const& strawresponse); // test whether a point is inside the detector bool inDetector(KinKal::VEC3 const& point); + // returns phi angle from 0 to pi/2, where 0 is in B field direction double LorentzAngle(KinKal::ClosestApproachData const& ptca, KinKal::VEC3 const& bdir); // this finds the time at which the traj crosses the given z value diff --git a/Mu2eKinKal/src/KKFitUtilities.cc b/Mu2eKinKal/src/KKFitUtilities.cc index 29a2126d6b..35c209bc1e 100644 --- a/Mu2eKinKal/src/KKFitUtilities.cc +++ b/Mu2eKinKal/src/KKFitUtilities.cc @@ -15,8 +15,9 @@ namespace mu2e { return point.Rho() < 900.0 && fabs(point.Z()) < 1800; // numbers should come from Tracker TODO } double LorentzAngle(KinKal::ClosestApproachData const& ptca, KinKal::VEC3 const& bdir) { - auto tperp = (ptca.particleDirection() - ptca.particleDirection().Dot(ptca.sensorDirection())*ptca.sensorDirection()).unit(); - return acos(tperp.Dot(bdir)); + auto delta = ptca.particlePoca().Vect() - ptca.sensorPoca().Vect(); + auto raddir = ptca.sensorDirection().Cross(bdir); + return atan(fabs(delta.Dot(raddir)/delta.Dot(bdir))); } bool insideStraw(KinKal::ClosestApproachData const& ca,Straw const& straw,double ubuffer) { // compute the position along the wire and compare to the 1/2 length diff --git a/RecoDataProducts/inc/TrkStrawHitSeed.hh b/RecoDataProducts/inc/TrkStrawHitSeed.hh index 40749c4336..a635039c48 100644 --- a/RecoDataProducts/inc/TrkStrawHitSeed.hh +++ b/RecoDataProducts/inc/TrkStrawHitSeed.hh @@ -15,6 +15,7 @@ #include "KinKal/Trajectory/ClosestApproachData.hh" #include "Offline/TrackerConditions/inc/DriftInfo.hh" #include "Offline/Mu2eKinKal/inc/WireHitState.hh" +#include "Offline/TrackerGeom/inc/Straw.hh" #include namespace mu2e { struct TrkStrawHitSeed { @@ -27,7 +28,8 @@ namespace mu2e { KinKal::Residual const& utresid, KinKal::Residual const& udresid, KinKal::Residual const& rtresid, KinKal::Residual const& rdresid, DriftInfo const& dinfo, - WireHitState const& whs) : + WireHitState const& whs, + Straw const& straw) : _index(index), _sid(chit.strawId()),_eend(chit.earlyEnd()), _flag(chit.flag()),_kkshflag(whs.flag_), _ambig(whs.state_), _algo(whs.algo_), _frozen(whs.frozen_), @@ -47,7 +49,8 @@ namespace mu2e { _utresid(utresid.value()),_utresidmvar(utresid.measurementVariance()),_utresidpvar(utresid.parameterVariance()), _udresid(udresid.value()),_udresidmvar(udresid.measurementVariance()),_udresidpvar(udresid.parameterVariance()), _rtresid(rtresid.value()),_rtresidmvar(rtresid.measurementVariance()),_rtresidpvar(rtresid.parameterVariance()), - _rdresid(rdresid.value()),_rdresidmvar(rdresid.measurementVariance()),_rdresidpvar(rdresid.parameterVariance()) + _rdresid(rdresid.value()),_rdresidmvar(rdresid.measurementVariance()),_rdresidpvar(rdresid.parameterVariance()), + _rpoca(XYZVectorF(rptca.particlePoca().Vect())) { // compute position along wire according to Mu2e convention double endsign = chit.earlyEnd().endSign(); @@ -59,6 +62,31 @@ namespace mu2e { // correct flag _flag.merge(StrawHitFlag::track); if(whs.active())_flag.merge(StrawHitFlag::active); + + // calculate the doca and phi relative to the straw envelope at POCA to wire + auto ppoca = XYZVectorF(rptca.particlePoca().Vect()); + + static XYZVectorF zdir(0.0,0.0,1.0); // relative to Z + auto wmid = XYZVectorF(straw.wirePosition()); + auto wdir = XYZVectorF(straw.wireDirection()); + auto delta = ppoca - wmid; + auto raddir = wdir.Cross(zdir); + if (raddir.Dot(wmid) < 0.0) raddir *= -1.0; // sign radially outwards + float dw = delta.Dot(wdir); + XYZVectorF cperp = delta - dw*wdir; // just perp part + _rwirephi = atan2(cperp.Dot(raddir),cperp.Dot(zdir)); + + auto smid = XYZVectorF(straw.strawPosition()); + auto sdir = XYZVectorF(straw.strawDirection()); + delta = ppoca - smid; // particle poca to wire WRT straw middle + raddir = sdir.Cross(zdir); + if(raddir.Dot(smid) < 0.0)raddir *= -1.0; // sign radially outwards + dw = delta.Dot(sdir); + cperp = delta - dw*sdir; // just perp part + _rstrawphi = atan2(cperp.Dot(raddir),cperp.Dot(zdir)); // angle around wire WRT z axis in range -pi,pi + _rstrawdist = sqrt(cperp.mag2()); + + _wdot = rptca.particleDirection().Dot(straw.wireDirection()); } //Legacy constructor for BTrk @@ -73,6 +101,7 @@ namespace mu2e { _rdoca(wdoca), _rdocavar(rerr*rerr), _rdt(dt), _rtocavar(t0._t0err*t0._t0err), _udoca(wdoca), _udocavar(rerr*rerr), _udt(dt), _utocavar(t0._t0err*t0._t0err), _rupos(upos),_uupos(upos), _rdrift(rdrift),_cdrift(rdrift), _sderr(rerr), _dvel(0), _lang(0), + _rstrawdist(0), _rstrawphi(0), _rwirephi(0), _wdot(0), _t0(t0), _trklen(trklen), _hitlen(hitlen), _stime(stime){ _etime[chit.earlyEnd()] = chit.time(); } @@ -147,6 +176,11 @@ namespace mu2e { float _udresid=0, _udresidmvar=0, _udresidpvar =0; // unbiased distance residual and associated measurement and parameter variances float _rtresid=0, _rtresidmvar=0, _rtresidpvar =0; // reference time residual and associated measurement and parameter variances float _rdresid=0, _rdresidmvar=0, _rdresidpvar =0; // reference distance residual and associated measurement and parameter variances + float _rstrawdist = 0; + float _rstrawphi = 0; + float _rwirephi = 0; + float _wdot = 0; + XYZVectorF _rpoca; // BTrk legacy payload HitT0 _t0; // time origin for this hit = track t0 + particle propagation time to this straw diff --git a/TrackerMC/src/StrawDigisFromStrawGasSteps_module.cc b/TrackerMC/src/StrawDigisFromStrawGasSteps_module.cc index 5f97f9e2da..75702ffbf4 100644 --- a/TrackerMC/src/StrawDigisFromStrawGasSteps_module.cc +++ b/TrackerMC/src/StrawDigisFromStrawGasSteps_module.cc @@ -190,7 +190,7 @@ namespace mu2e { Int_t _sdplane, _sdpanel, _sdlayer, _sdstraw; Int_t _ncludd[2], _iclust[2]; Int_t _nstep; - Float_t _ectime[2], _ecddist[2], _ecdtime[2], _ecptime[2]; + Float_t _ectime[2], _ecddist[2], _ecdtime[2], _ecptime[2], _ecphi[2]; Float_t _xtime[2], _tctime[2], _charge[2], _acharge[2], _ddist[2], _dtime[2], _ptime[2]; Float_t _wdist[2], _vstart[2], _vcross[2]; Float_t _phi[2]; @@ -318,6 +318,7 @@ namespace mu2e { produces(); produces(); produces(); + _alignedTrackerSim_h = ProditionsHandle("Sim"); } void StrawDigisFromStrawGasSteps::beginJob(){ @@ -381,6 +382,7 @@ namespace mu2e { _sddiag->Branch("ectime",&_ectime,"ectimecal/F:ectimehv/F"); _sddiag->Branch("ecdtime",&_ecdtime,"ecdtimecal/F:ecdtimehv/F"); _sddiag->Branch("ecptime",&_ecptime,"ecptimecal/F:ecptimehv/F"); + _sddiag->Branch("ecphi",&_ecphi,"ecphical/F:ecphihv/F"); _sddiag->Branch("charge",&_charge,"chargecal/F:chargehv/F"); _sddiag->Branch("acharge",&_acharge,"achargecal/F:achargehv/F"); _sddiag->Branch("wdist",&_wdist,"wdistcal/F:wdisthv/F"); @@ -421,7 +423,6 @@ namespace mu2e { } } - _alignedTrackerSim_h = ProditionsHandle("Sim"); } void StrawDigisFromStrawGasSteps::beginRun( art::Run& run ){ @@ -1145,6 +1146,7 @@ namespace mu2e { _ecddist[iend] = iclu->driftDistance(); _ecdtime[iend] = iclu->driftTime(); _ecptime[iend] = iclu->propTime(); + _ecphi[iend] = iclu->driftPhi(); // count how many clusters till we get to the trigger cluster size_t iclust(0); while( iclu != clist.end() && iclu != ctrig){ @@ -1180,7 +1182,7 @@ namespace mu2e { _mctime = sgs.time() + _pbtimemc; // compute the doca for this step TwoLinePCA wirepca( straw.wirePosition(), straw.wireDirection(), - GenVector::Hep3Vec(sgs.startPosition()), GenVector::Hep3Vec(sgs.endPosition()-sgs.startPosition()) ); + GenVector::Hep3Vec(sgs.startPosition()), GenVector::Hep3Vec((sgs.endPosition()-sgs.startPosition()).Unit()) ); _mcdca = wirepca.dca(); auto spos = strawCoordinates(XYZVectorF(wirepca.point2()),straw); _mcdcaphi = spos._wirePosition.Phi(); diff --git a/TrkDiag/src/StrawHitDiag_module.cc b/TrkDiag/src/StrawHitDiag_module.cc index e45283034c..f46b2dbd25 100644 --- a/TrkDiag/src/StrawHitDiag_module.cc +++ b/TrkDiag/src/StrawHitDiag_module.cc @@ -274,7 +274,7 @@ namespace mu2e void StrawHitDiag::fillStrawHitDiag(StrawElectronics const& strawele) { GeomHandle det; - const Tracker& tracker = *GeomHandle(); + const Tracker& tracker = *GeomHandle(); //FIXME switch to aligned static const double rstraw = tracker.strawOuterRadius(); unsigned nstrs = _chcol->size(); for(unsigned istr=0; istr Date: Thu, 29 Feb 2024 16:52:17 -0600 Subject: [PATCH 153/213] Move TrackerStatus check from step making to digi making --- TrackerMC/src/MakeStrawGasSteps_module.cc | 47 ++++++++----------- .../src/StrawDigisFromStrawGasSteps_module.cc | 17 +++++-- 2 files changed, 32 insertions(+), 32 deletions(-) diff --git a/TrackerMC/src/MakeStrawGasSteps_module.cc b/TrackerMC/src/MakeStrawGasSteps_module.cc index 54c438da9b..b31f30c392 100644 --- a/TrackerMC/src/MakeStrawGasSteps_module.cc +++ b/TrackerMC/src/MakeStrawGasSteps_module.cc @@ -19,7 +19,6 @@ #include "Offline/GlobalConstantsService/inc/GlobalConstantsHandle.hh" #include "Offline/GlobalConstantsService/inc/ParticleDataList.hh" #include "Offline/ProditionsService/inc/ProditionsHandle.hh" -#include "Offline/TrackerConditions/inc/TrackerStatus.hh" #include "Offline/BFieldGeom/inc/BFieldManager.hh" #include "BTrk/BField/BField.hh" #include "Offline/Mu2eUtilities/inc/TwoLinePCA.hh" @@ -83,8 +82,7 @@ namespace mu2e { typedef map< SSPair , SPMCPV > SPSMap; // steps by straw, SimParticle typedef art::Handle SPMCCH; typedef vector< SPMCCH > SPMCCHV; - void fillMap(Tracker const& tracker,TrackerStatus const& trackerStatus, - SPMCCH const& spmcch, SPSMap& spsmap); + void fillMap(Tracker const& tracker, SPMCCH const& spmcch, SPSMap& spsmap); void compressDeltas(SPSMap& spsmap); void setStepType(SPMCP const& spmcptr, ParticleData const& pdata, StrawGasStep::StepType& stype); void fillStep(SPMCPV const& spmcptrs, Straw const& straw, @@ -107,7 +105,6 @@ namespace mu2e { Hep3Vector _bdir; float _bnom; // BField in units of (MeV/c)/mm double _rstraw; // straw radius cache - ProditionsHandle _trackerStatus_h; // tracker element status // diagnostic histograms TH1F *_hendrad, *_hphi; TTree* _sgsdiag; @@ -190,7 +187,6 @@ namespace mu2e { // setup conditions, etc const Tracker& tracker = *GeomHandle(); GlobalConstantsHandle pdt; - TrackerStatus const& trackerStatus = _trackerStatus_h.get(event.id()); // create output unique_ptr sgsc(new StrawGasStepCollection); unique_ptr sgsa(new StrawGasStepAssns); @@ -234,7 +230,7 @@ namespace mu2e { } // Loop over the StepPointMCs in this collection and sort them by straw and SimParticle SPSMap spsmap; // map of step points by straw,sim particle - fillMap(tracker,trackerStatus,handle, spsmap); + fillMap(tracker,handle, spsmap); // optionally combine delta-rays that never leave the straw with their parent particle if(dcomp)compressDeltas(spsmap); nspss += spsmap.size(); @@ -337,33 +333,28 @@ namespace mu2e { start, end, momvec, first->simParticle()); } - void MakeStrawGasSteps::fillMap(Tracker const& tracker,TrackerStatus const& trackerStatus, + void MakeStrawGasSteps::fillMap(Tracker const& tracker, SPMCCH const& spmcch, SPSMap& spsmap) { StepPointMCCollection const& steps(*spmcch); for (size_t ispmc =0; ispmcid(); - // create key - SSPair stpair(sid,tid); - // create ptr to this step - SPMCP spmcptr(spmcch,ispmc); - vector spmcptrv; - spmcptrv.reserve(_ssize); - spmcptrv.push_back(spmcptr); - // check if this key exists and add it if not - auto ssp = spsmap.emplace(stpair,spmcptrv); - // if the key already exists, just add this Ptr to the vector - if(!ssp.second)ssp.first->second.push_back(spmcptr); - } - } else if ( _debug>1 ) { - std::cout << "No Signal, StrawId " << sid << endl; + Straw const& straw = tracker.getStraw(sid); + double wpos = fabs((step.position()-straw.getMidPoint()).dot(straw.getDirection())); + //skip steps that occur in the deadened region near the end of each wire + if( wpos < straw.halfLength()){ + cet::map_vector_key tid = step.simParticle().get()->id(); + // create key + SSPair stpair(sid,tid); + // create ptr to this step + SPMCP spmcptr(spmcch,ispmc); + vector spmcptrv; + spmcptrv.reserve(_ssize); + spmcptrv.push_back(spmcptr); + // check if this key exists and add it if not + auto ssp = spsmap.emplace(stpair,spmcptrv); + // if the key already exists, just add this Ptr to the vector + if(!ssp.second)ssp.first->second.push_back(spmcptr); } } } diff --git a/TrackerMC/src/StrawDigisFromStrawGasSteps_module.cc b/TrackerMC/src/StrawDigisFromStrawGasSteps_module.cc index db8793f716..1b3a6b30c7 100644 --- a/TrackerMC/src/StrawDigisFromStrawGasSteps_module.cc +++ b/TrackerMC/src/StrawDigisFromStrawGasSteps_module.cc @@ -26,6 +26,7 @@ #include "Offline/TrackerConditions/inc/StrawPhysics.hh" #include "Offline/GeometryService/inc/DetectorSystem.hh" #include "Offline/BFieldGeom/inc/BFieldManager.hh" +#include "Offline/TrackerConditions/inc/TrackerStatus.hh" #include "BTrk/BField/BField.hh" // utiliities #include "Offline/Mu2eUtilities/inc/TwoLinePCA.hh" @@ -172,6 +173,7 @@ namespace mu2e { // Proditions ProditionsHandle _strawphys_h; ProditionsHandle _strawele_h; + ProditionsHandle _trackerStatus_h; art::Selector _selector; double _rstraw; // cache // diagnostics @@ -215,7 +217,9 @@ namespace mu2e { // helper functions void fillClusterMap(StrawPhysics const& strawphys, - StrawElectronics const& strawele,Tracker const& tracker, + StrawElectronics const& strawele, + TrackerStatus const& trackerStatus, + Tracker const& tracker, art::Event const& event, StrawClusterMap & hmap); void addStep(StrawPhysics const& strawphys, StrawElectronics const& strawele, @@ -432,6 +436,7 @@ namespace mu2e { // update conditions caches, etc StrawPhysics const& strawphys = _strawphys_h.get(event.id()); StrawElectronics const& strawele = _strawele_h.get(event.id()); + TrackerStatus const& trackerStatus = _trackerStatus_h.get(event.id()); const Tracker& tracker = *GeomHandle(); _mbtime = GlobalConstantsHandle()->getNominalDRPeriod(); art::Handle ewMarkerHandle; @@ -468,7 +473,7 @@ namespace mu2e { // this is a map from straw ids to a list of all clusters on that straw from this event StrawClusterMap hmap; // fill this from the event - fillClusterMap(strawphys,strawele,tracker,event,hmap); + fillClusterMap(strawphys,strawele,trackerStatus,tracker,event,hmap); // add noise clusts if(_addNoise)addNoise(hmap); // loop over the clust sequences (i.e. loop over straws, and for each get their list of clusters) @@ -527,6 +532,7 @@ namespace mu2e { void StrawDigisFromStrawGasSteps::fillClusterMap(StrawPhysics const& strawphys, StrawElectronics const& strawele, + TrackerStatus const& trackerStatus, const Tracker& tracker, art::Event const& event, StrawClusterMap & hmap){ // Get all of the tracker StrawGasStep collections from the event: @@ -554,11 +560,14 @@ namespace mu2e { auto const& sgs = steps[isgs]; // lookup straw here, to avoid having to find the tracker for every step StrawId const & sid = sgs.strawId(); - Straw const& straw = tracker.getStraw(sid); - if(sgs.ionizingEdep() > _minstepE){ + //temporary test + if ( (!trackerStatus.noSignal(sid)) && sgs.ionizingEdep() > _minstepE){ + Straw const& straw = tracker.getStraw(sid); auto sgsptr = SGSPtr(sgsch,isgs); // create a clust from this step, and add it to the clust map addStep(strawphys,strawele,straw,sgsptr,hmap[sid]); + } else if(_debug > 0) { + std::cout << "Suppressing sid " << sid << " Status " << trackerStatus.strawStatus(sid) << " energy " << sgs.ionizingEdep() << std::endl; } } } From 9e1a8c706566747a6f8fdb615ab3a73a7a541847 Mon Sep 17 00:00:00 2001 From: David Nathan Brown Date: Thu, 29 Feb 2024 16:55:10 -0600 Subject: [PATCH 154/213] Follow mu2e_trig_config change --- Mu2eKinKal/test/TTTA.fcl | 2 -- 1 file changed, 2 deletions(-) diff --git a/Mu2eKinKal/test/TTTA.fcl b/Mu2eKinKal/test/TTTA.fcl index 17494f401d..3a6c22834f 100644 --- a/Mu2eKinKal/test/TTTA.fcl +++ b/Mu2eKinKal/test/TTTA.fcl @@ -9,10 +9,8 @@ #include "mu2e_trig_config/core/trigFilters.fcl" #include "mu2e_trig_config/core/trigRecoSequences.fcl" #include "mu2e_trig_config/core/trigSequences.fcl" -BEGIN_PROLOG #include "mu2e_trig_config/gen/trig_physMenuPSConfig_OnSpill.fcl" #include "mu2e_trig_config/gen/trig_physMenu_OnSpill.fcl" -END_PROLOG #include "Offline/CommonMC/fcl/prolog_trigger.fcl" #include "TrkAna/fcl/prolog_trigger.fcl" process_name : OnSpillTrigger From af202f7a3d56bd7c2346b1abca03773b21f87ed5 Mon Sep 17 00:00:00 2001 From: David Nathan Brown Date: Thu, 29 Feb 2024 16:58:39 -0600 Subject: [PATCH 155/213] Fix comment --- TrackerMC/src/StrawDigisFromStrawGasSteps_module.cc | 1 - 1 file changed, 1 deletion(-) diff --git a/TrackerMC/src/StrawDigisFromStrawGasSteps_module.cc b/TrackerMC/src/StrawDigisFromStrawGasSteps_module.cc index 1b3a6b30c7..5db881dd44 100644 --- a/TrackerMC/src/StrawDigisFromStrawGasSteps_module.cc +++ b/TrackerMC/src/StrawDigisFromStrawGasSteps_module.cc @@ -560,7 +560,6 @@ namespace mu2e { auto const& sgs = steps[isgs]; // lookup straw here, to avoid having to find the tracker for every step StrawId const & sid = sgs.strawId(); - //temporary test if ( (!trackerStatus.noSignal(sid)) && sgs.ionizingEdep() > _minstepE){ Straw const& straw = tracker.getStraw(sid); auto sgsptr = SGSPtr(sgsch,isgs); From 08d976ddabd41d674382a4756f388db021818821 Mon Sep 17 00:00:00 2001 From: ehrlich-uva Date: Sun, 3 Mar 2024 11:58:08 -0600 Subject: [PATCH 156/213] changed CRV digi period to 12.5ns and changed CRV coincidence criteria for extracted position --- CRVConditions/inc/CRVDigitizationPeriod.hh | 2 +- CRVResponse/fcl/epilog_extracted_v03.fcl | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/CRVConditions/inc/CRVDigitizationPeriod.hh b/CRVConditions/inc/CRVDigitizationPeriod.hh index 2bbe4fb9c4..a4f5894f49 100644 --- a/CRVConditions/inc/CRVDigitizationPeriod.hh +++ b/CRVConditions/inc/CRVDigitizationPeriod.hh @@ -3,7 +3,7 @@ namespace mu2e { - constexpr double CRVDigitizationPeriod = 12.55; // ns + constexpr double CRVDigitizationPeriod = 12.5; // ns } // namespace mu2e diff --git a/CRVResponse/fcl/epilog_extracted_v03.fcl b/CRVResponse/fcl/epilog_extracted_v03.fcl index 64f941f403..229bb1b48f 100644 --- a/CRVResponse/fcl/epilog_extracted_v03.fcl +++ b/CRVResponse/fcl/epilog_extracted_v03.fcl @@ -13,7 +13,7 @@ physics.producers.CrvCoincidenceClusterFinder.sectorConfig : [ { CRVSector : "EX" - PEthreshold : 20 //PEs + PEthreshold : 10 //PEs maxTimeDifferenceAdjacentPulses : 10 //ns maxTimeDifference : 20 //ns minOverlapTimeAdjacentPulses : 30 //ns @@ -21,12 +21,12 @@ physics.producers.CrvCoincidenceClusterFinder.sectorConfig : minSlope :-11 maxSlope : 11 //width direction over thickness direction maxSlopeDifference : 4 - coincidenceLayers : 3 + coincidenceLayers : 2 minClusterPEs : 0 }, { CRVSector : "T1" - PEthreshold : 20 + PEthreshold : 10 maxTimeDifferenceAdjacentPulses : 10 maxTimeDifference : 20 minOverlapTimeAdjacentPulses : 30 @@ -34,12 +34,12 @@ physics.producers.CrvCoincidenceClusterFinder.sectorConfig : minSlope :-11 maxSlope : 11 maxSlopeDifference : 4 - coincidenceLayers : 4 + coincidenceLayers : 2 minClusterPEs : 0 }, { CRVSector : "T2" - PEthreshold : 20 + PEthreshold : 10 maxTimeDifferenceAdjacentPulses : 10 maxTimeDifference : 20 minOverlapTimeAdjacentPulses : 30 @@ -47,7 +47,7 @@ physics.producers.CrvCoincidenceClusterFinder.sectorConfig : minSlope :-11 maxSlope : 11 maxSlopeDifference : 4 - coincidenceLayers : 4 + coincidenceLayers : 2 minClusterPEs : 0 } ] From dd74ead8a5f1241bf1a2086487a70eedd8daedd4 Mon Sep 17 00:00:00 2001 From: Richard Bonventre Date: Mon, 4 Mar 2024 13:40:52 -0800 Subject: [PATCH 157/213] Removed fcl overrides --- CommonMC/src/SelectRecoMC_module.cc | 3 +- TrackerConditions/src/AlignedTrackerMaker.cc | 9 ++--- TrackerMC/fcl/prolog.fcl | 1 - .../src/StrawDigisFromStrawGasSteps_module.cc | 36 ++++++++----------- 4 files changed, 20 insertions(+), 29 deletions(-) diff --git a/CommonMC/src/SelectRecoMC_module.cc b/CommonMC/src/SelectRecoMC_module.cc index 6bf633d74d..8fd2657b96 100644 --- a/CommonMC/src/SelectRecoMC_module.cc +++ b/CommonMC/src/SelectRecoMC_module.cc @@ -111,7 +111,7 @@ namespace mu2e { double _pbtimemc; // mc true proton bunch time bool _onSpill; ProditionsHandle _strawResponse_h; - ProditionsHandle _alignedTrackerSim_h; + ProditionsHandle _alignedTrackerSim_h{"Sim"}; }; SelectRecoMC::SelectRecoMC(const Parameters& config ) : @@ -176,7 +176,6 @@ namespace mu2e { std::cout << "Using HelixSeed collections from "; for (auto const& hsc : _hscs) std::cout << hsc << " " << std::endl; } - _alignedTrackerSim_h = ProditionsHandle("Sim"); } void SelectRecoMC::produce(art::Event& event) { diff --git a/TrackerConditions/src/AlignedTrackerMaker.cc b/TrackerConditions/src/AlignedTrackerMaker.cc index 1dc0d36028..a0fcd830a1 100644 --- a/TrackerConditions/src/AlignedTrackerMaker.cc +++ b/TrackerConditions/src/AlignedTrackerMaker.cc @@ -53,11 +53,12 @@ namespace mu2e { auto wireend_UVW = ds_to_panel*straw.wireEnd(end); auto strawend_UVW = ds_to_panel*straw.strawEnd(end); if ( _config.wireOnly() ){ - wireend_UVW += (straw_align.wireDeltaUVW(end) - straw_align.strawDeltaUVW(end)); - }else{ - wireend_UVW += straw_align.wireDeltaUVW(end); - strawend_UVW += straw_align.strawDeltaUVW(end); + if (straw_align.strawDeltaUVW(end).mag() != 0.0){ + cout << "AlignedTrackerMaker::fromDb Warning " << straw.id() << " StrawEnd alignment not zero." << std::endl; + } } + wireend_UVW += straw_align.wireDeltaUVW(end); + strawend_UVW += straw_align.strawDeltaUVW(end); // Transform back to global coordinates, including all the alignment corrections wireends[iend] = aligned_panel_to_ds*wireend_UVW; diff --git a/TrackerMC/fcl/prolog.fcl b/TrackerMC/fcl/prolog.fcl index c37d3ccf22..6fa4a6c561 100644 --- a/TrackerMC/fcl/prolog.fcl +++ b/TrackerMC/fcl/prolog.fcl @@ -17,7 +17,6 @@ TrackerMC : { # set to digitize all hits in outer straws of the first 2 planes AllHitsPlanes : [0,1] AllHitsStraw : 91 # this straw and higher are always digitized - SimWireOffsets : false } } StepSim : [ StrawGasStepMaker ] diff --git a/TrackerMC/src/StrawDigisFromStrawGasSteps_module.cc b/TrackerMC/src/StrawDigisFromStrawGasSteps_module.cc index 75702ffbf4..8d289f98da 100644 --- a/TrackerMC/src/StrawDigisFromStrawGasSteps_module.cc +++ b/TrackerMC/src/StrawDigisFromStrawGasSteps_module.cc @@ -113,7 +113,6 @@ namespace mu2e { fhicl::Atom diagpath{ Name("DiagPath"), Comment("Digitization Path for waveform diagnostics") ,0 }; fhicl::Atom spinstance { Name("StrawGasStepInstance"), Comment("StrawGasStep Instance name"),""}; fhicl::Atom spmodule { Name("StrawGasStepModule"), Comment("StrawGasStep Module name"),""}; - fhicl::Atom wireoffsets { Name("SimWireOffsets"), Comment("Use wire offsets in sim")}; }; @@ -160,7 +159,6 @@ namespace mu2e { std::vector _allPlanes; unsigned _maxnclu; StrawElectronics::Path _diagpath; - bool _simWireOffsets; // Random number distributions art::RandomNumberGenerator::base_engine_t& _engine; CLHEP::RandGaussQ _randgauss; @@ -174,7 +172,7 @@ namespace mu2e { // Proditions ProditionsHandle _strawphys_h; ProditionsHandle _strawele_h; - ProditionsHandle _alignedTrackerSim_h; + ProditionsHandle _alignedTrackerSim_h{"Sim"}; const Tracker *_tracker; art::Selector _selector; double _rstraw; // cache @@ -295,7 +293,6 @@ namespace mu2e { _allPlanes(config().allPlanes()), _maxnclu(config().maxnclu()), _diagpath(static_cast(config().diagpath())), - _simWireOffsets(config().wireoffsets()), // Random number distributions _engine(createEngine( art::ServiceHandle()->getSeed())), _randgauss( _engine ), @@ -318,7 +315,6 @@ namespace mu2e { produces(); produces(); produces(); - _alignedTrackerSim_h = ProditionsHandle("Sim"); } void StrawDigisFromStrawGasSteps::beginJob(){ @@ -1250,23 +1246,19 @@ namespace mu2e { float phi = atan2(cperp.Dot(pdir),cperp.Dot(zdir)); // angle around wire WRT z axis in range -pi,pi float rho = min(sqrt(cperp.mag2()),(float)_rstraw); // truncate! retval._strawPosition = StrawPosition(rho,dw,phi); - if (_simWireOffsets){ - // now we get the wire position by calculating a position relative to the misaligned straw envelope - //XYZVectorF simAlignedPos = strawPositionToXYZ(retval._strawPosition, simStraw); - // calculate cylidrical coordinates relative to misaligned wire - smid = XYZVectorF(straw.wirePosition()); - delta = cpos - smid; // cluster position WRT wire middle - sdir = XYZVectorF(straw.wireDirection()); - pdir = sdir.Cross(zdir); // radial direction - if(pdir.Dot(smid) < 0.0)pdir *= -1.0; // sign radially outwards - dw = delta.Dot(sdir); - cperp = delta - dw*sdir; // just perp part - phi = atan2(cperp.Dot(pdir),cperp.Dot(zdir));// angle around wire WRT Z axis in range -pi,pi - rho = sqrt(cperp.mag2()); - retval._wirePosition = StrawPosition(rho,dw,phi); - }else{ - retval._wirePosition = retval._strawPosition; - } + // now we get the wire position by calculating a position relative to the misaligned straw envelope + //XYZVectorF simAlignedPos = strawPositionToXYZ(retval._strawPosition, simStraw); + // calculate cylidrical coordinates relative to misaligned wire + smid = XYZVectorF(straw.wirePosition()); + delta = cpos - smid; // cluster position WRT wire middle + sdir = XYZVectorF(straw.wireDirection()); + pdir = sdir.Cross(zdir); // radial direction + if(pdir.Dot(smid) < 0.0)pdir *= -1.0; // sign radially outwards + dw = delta.Dot(sdir); + cperp = delta - dw*sdir; // just perp part + phi = atan2(cperp.Dot(pdir),cperp.Dot(zdir));// angle around wire WRT Z axis in range -pi,pi + rho = sqrt(cperp.mag2()); + retval._wirePosition = StrawPosition(rho,dw,phi); return retval; } From a4e11c3007ed1804658c1252bf77c2dcb0e80110 Mon Sep 17 00:00:00 2001 From: Gianantonio Pezzullo Date: Tue, 5 Mar 2024 09:58:15 -0600 Subject: [PATCH 158/213] updates --- Trigger/src/PrescaleEvent_module.cc | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/Trigger/src/PrescaleEvent_module.cc b/Trigger/src/PrescaleEvent_module.cc index 6866f6b8ac..e02ad8cbc0 100644 --- a/Trigger/src/PrescaleEvent_module.cc +++ b/Trigger/src/PrescaleEvent_module.cc @@ -89,11 +89,12 @@ namespace mu2e int ps = _eventMode[0].prescale(); bool retval(false); - bool condition = e.event() % ps == 0; - if(condition && (ps > 0)) { - ++_npass; - retval = true; + if(ps > 0) { + retval = e.event() % ps == 0; + if (retval){ + ++_npass; + } } return retval; } From 51a2120e2138f97af0f54572323e68760504d44b Mon Sep 17 00:00:00 2001 From: Richard Bonventre Date: Tue, 5 Mar 2024 17:59:03 -0800 Subject: [PATCH 159/213] Change prodition call --- CommonMC/src/SelectRecoMC_module.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CommonMC/src/SelectRecoMC_module.cc b/CommonMC/src/SelectRecoMC_module.cc index 8fd2657b96..4e289ea984 100644 --- a/CommonMC/src/SelectRecoMC_module.cc +++ b/CommonMC/src/SelectRecoMC_module.cc @@ -374,7 +374,7 @@ namespace mu2e { PrimaryParticle const& pp, RecoCount& nrec) { GeomHandle det; auto srep = _strawResponse_h.getPtr(event.id()); - Tracker const& tracker = *(_alignedTrackerSim_h.getPtr(event.id()).get()); + Tracker const& tracker = _alignedTrackerSim_h.get(event.id()); // Tracker-reated data products auto sdch = event.getValidHandle(_sdc); From d6fb64a29fb472e31d2cfb2c421b1082b68b1dc9 Mon Sep 17 00:00:00 2001 From: ehrlich-uva Date: Tue, 5 Mar 2024 20:23:45 -0600 Subject: [PATCH 160/213] updated photon yields of CRV sectors --- CRVResponse/fcl/epilog_extracted_v03.fcl | 2 +- CRVResponse/fcl/prolog_v11.fcl | 37 +++++++++++++++--------- 2 files changed, 25 insertions(+), 14 deletions(-) diff --git a/CRVResponse/fcl/epilog_extracted_v03.fcl b/CRVResponse/fcl/epilog_extracted_v03.fcl index 229bb1b48f..48a1a8b12f 100644 --- a/CRVResponse/fcl/epilog_extracted_v03.fcl +++ b/CRVResponse/fcl/epilog_extracted_v03.fcl @@ -2,7 +2,7 @@ physics.producers.CrvPhotons.crvStepModuleLabels : ["CrvSteps"] physics.producers.CrvPhotons.crvStepProcessNames : ["CrvStepsConverter"] physics.producers.CrvPhotons.CRVSectors : ["EX","T1","T2"] physics.producers.CrvPhotons.reflectors : [ 0, 1, 0 ] -physics.producers.CrvPhotons.scintillationYields : [39400,39400,39400] +physics.producers.CrvPhotons.scintillationYields : [39794,28573,28573] //assuming modules from CRV-T(1.8mm),CRV-DS,CRV-L physics.producers.CrvPhotons.lookupTableFileNames : [ "CRVConditions/v6_0/LookupTable_6000_0", "CRVConditions/v6_0/LookupTable_2370_1", diff --git a/CRVResponse/fcl/prolog_v11.fcl b/CRVResponse/fcl/prolog_v11.fcl index e2b9ecc53d..cff890775f 100644 --- a/CRVResponse/fcl/prolog_v11.fcl +++ b/CRVResponse/fcl/prolog_v11.fcl @@ -51,19 +51,30 @@ BEGIN_PROLOG "CRVConditions/v6_0/LookupTable_2100_1", //C3 "CRVConditions/v6_0/LookupTable_1550_1"] //C4 - //number of photons per MeV visible energy deposited - //for 68 PE/SiPM @ 1 m away from SiPM (Test beam June 2017) - //using the pulse height calibration, this value gives 45 PE/SiPM @ 1 m away from SiPM - scintillationYields : [39400,39400,39400,39400,39400,39400, //R1...6 - 39400,39400,39400, //L1...3 - 39400,39400,39400,39400,39400, //T1...5 - 39400,39400, //E1,E2 - 39400, //U - 39400,39400,39400,39400, //D1...4 - 0,0,39400,39400] //C1...4 + //all measurements were done at 1m away from SiPM with a reference date of 12/2023 + //CRV-Top (1.8mm) modules: 39794 - based on comparison between Wideband measurements and fined-tuned simulation + // (all counters come from scintillator batch 1) + //CRV-Top (1.4mm) modules: 30442 - based on comparions between UVA measurements of 1.4mm and 1.8mm CRV-Top modules (adjusted for age) + // (most counters come from scintillator batch 1) + // assuming 3% aging per year + // T (1.4mm) measured 2/2022 at 44.5 PEs, 1.83 years to 12/2023, aging factor 0.946, --> 42.1 PEs + // T (1.8mm) measured 8/2022 at 57.3 PEs, 1.33 years to 12/2023, aging factor 0.960, --> 55.0 PEs + // --> photon yield ratio: 0.765 + //CRV-TS modules: 30442 - same as CRV-Top (1.4mm), because all counters come from scintillator batch 1 + //CRV-R19-T module: 30442 - same as CRV-Top (1.4mm), because all counters come from scintillator batch 1 + //all other modules: 28573 - counters come from scintillator batch 2, with a photon yield ratio of 1.07/1.14 + //CRV-U, CRV-TS-Ext: 23811 - reference CRV-Top (1.8mm) was measured at 3.0V overvoltage, + but CRV-U/CRV-TS-Ext will run at 2.5V --> scale to 2.5/3.0 + scintillationYields : [28573,28573,30442,28573,28573,28573, //R1...6 + 28573,28573,28573, //L1...3 + 30442,30442,39794,39794,30442, //T1...5 + 23811,23811, //E1,E2 + 23811, //U + 28573,28573,28573,28573, //D1...4 + 0,0,28573,28573] //C1...4 - photonYieldScaleFactor : 0.42 //scale factor applied to photon yields to mimic aging - //0.42 results in 28.6 PE/SiPM @ 1 m away from SiPM (expected in 2025) + photonYieldScaleFactor : 0.91 //scale factor applied to photon yields to mimic aging + //of 3 years with a rate 3% per year (from 12/2023 to 12/2026) //used in SU2020 photonYieldVariationScale : 0.05 //scale factor for the photon yield variation //examples: @@ -108,7 +119,7 @@ BEGIN_PROLOG TrapType1Lifetime : 50.0 //ns ???? ThermalRate : 3.0e-4 //ns^-1 0.3MHz for entire SiPM - CrossTalkProb : 0.05 // + CrossTalkProb : 0.04 // } CrvWaveforms: { From c86471f253df8f69e429c8d2c62431cfa1940e06 Mon Sep 17 00:00:00 2001 From: ehrlich-uva Date: Tue, 5 Mar 2024 20:48:39 -0600 Subject: [PATCH 161/213] fixed typo --- CRVResponse/fcl/prolog_v11.fcl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CRVResponse/fcl/prolog_v11.fcl b/CRVResponse/fcl/prolog_v11.fcl index cff890775f..60f486db90 100644 --- a/CRVResponse/fcl/prolog_v11.fcl +++ b/CRVResponse/fcl/prolog_v11.fcl @@ -64,7 +64,7 @@ BEGIN_PROLOG //CRV-R19-T module: 30442 - same as CRV-Top (1.4mm), because all counters come from scintillator batch 1 //all other modules: 28573 - counters come from scintillator batch 2, with a photon yield ratio of 1.07/1.14 //CRV-U, CRV-TS-Ext: 23811 - reference CRV-Top (1.8mm) was measured at 3.0V overvoltage, - but CRV-U/CRV-TS-Ext will run at 2.5V --> scale to 2.5/3.0 + // but CRV-U/CRV-TS-Ext will run at 2.5V --> scale to 2.5/3.0 scintillationYields : [28573,28573,30442,28573,28573,28573, //R1...6 28573,28573,28573, //L1...3 30442,30442,39794,39794,30442, //T1...5 From 811b7f4fab67a0d5fdf8314d32145a14dc14f400 Mon Sep 17 00:00:00 2001 From: Krzysztof L Genser Date: Wed, 6 Mar 2024 12:36:14 -0600 Subject: [PATCH 162/213] Adding Offline prefix to vis file paths in fcl files to be in sync with the old migration to muse --- Analyses/test/ConversionEnergyLoss.fcl | 2 +- Analyses/test/isoRPCtest.fcl | 2 +- Mu2eG4/fcl/prolog.fcl | 2 +- Mu2eG4/fcl/rantest.fcl | 2 +- Mu2eG4/g4study/g4study.fcl | 4 ++-- Mu2eG4/g4study/g4study_Box.fcl | 4 ++-- Mu2eG4/g4study/g4study_Calo01.fcl | 4 ++-- Mu2eG4/g4study/g4study_MuCapture.fcl | 4 ++-- Mu2eG4/g4study/g4study_NBoxes.fcl | 4 ++-- Mu2eG4/g4study/g4study_Tube.fcl | 4 ++-- 10 files changed, 16 insertions(+), 16 deletions(-) diff --git a/Analyses/test/ConversionEnergyLoss.fcl b/Analyses/test/ConversionEnergyLoss.fcl index 6c83275ff4..715ff55e73 100644 --- a/Analyses/test/ConversionEnergyLoss.fcl +++ b/Analyses/test/ConversionEnergyLoss.fcl @@ -70,7 +70,7 @@ physics : { module_type : G4 generatorModuleLabel : generate - # visMacro : "Mu2eG4/vis/visyz.mac" + # visMacro : "Offline/Mu2eG4/vis/visyz.mac" stepsSizeLimit : 10000 # StepPoint particlesSizeLimit : 10000 # SimParticle seed : [9877] diff --git a/Analyses/test/isoRPCtest.fcl b/Analyses/test/isoRPCtest.fcl index 754f54632d..1d2d44c605 100644 --- a/Analyses/test/isoRPCtest.fcl +++ b/Analyses/test/isoRPCtest.fcl @@ -67,7 +67,7 @@ physics : { module_type : G4 generatorModuleLabel : generate - # visMacro : "Mu2eG4/vis/visyz.mac" + # visMacro : "Offline/Mu2eG4/vis/visyz.mac" stepsSizeLimit : 10000 # StepPoint particlesSizeLimit : 10000 # SimParticle seed : [9877] diff --git a/Mu2eG4/fcl/prolog.fcl b/Mu2eG4/fcl/prolog.fcl index 5461076793..cae71d6b2a 100644 --- a/Mu2eG4/fcl/prolog.fcl +++ b/Mu2eG4/fcl/prolog.fcl @@ -113,7 +113,7 @@ mu2eg4DefaultResourceLimits: { #---------------- mu2eg4NoVisualization: { initMacro : "" - GUIMacro : "Mu2eG4/vis/visqtGUI.mac" + GUIMacro : "Offline/Mu2eG4/vis/visqtGUI.mac" } #---------------- mu2eg4NoTrajectories: { diff --git a/Mu2eG4/fcl/rantest.fcl b/Mu2eG4/fcl/rantest.fcl index 2b1bc6f129..9e9eb7cfa0 100644 --- a/Mu2eG4/fcl/rantest.fcl +++ b/Mu2eG4/fcl/rantest.fcl @@ -60,7 +60,7 @@ physics : #{ # module_type : G4 # generatorModuleLabel : generate - # visMacro : "Mu2eG4/vis/visxy.mac" + # visMacro : "Offline/Mu2eG4/vis/visxy.mac" # seed : [9877] # } diff --git a/Mu2eG4/g4study/g4study.fcl b/Mu2eG4/g4study/g4study.fcl index bfadbd8f5e..95092273ab 100644 --- a/Mu2eG4/g4study/g4study.fcl +++ b/Mu2eG4/g4study/g4study.fcl @@ -104,8 +104,8 @@ services.SeedService.maxUniqueEngines : 20 #services.message.destinations.log.noTimeStamps : true # inform the geometry service it is not the standard Mu2e Detector # done via the tool_type above now -#physics.producers.g4run.visualization.initMacro : "Mu2eG4/vis/visxz.mac" -#physics.producers.g4run.visualization.initMacro : "Mu2eG4/vis/vismqt.mac" +#physics.producers.g4run.visualization.initMacro : "Offline/Mu2eG4/vis/visxz.mac" +#physics.producers.g4run.visualization.initMacro : "Offline/Mu2eG4/vis/vismqt.mac" physics.producers.g4run.physics.physicsListName : "ShieldingM" #physics.producers.g4run.physics.bfieldMaxStep : 500000. // not implemented (no field) diff --git a/Mu2eG4/g4study/g4study_Box.fcl b/Mu2eG4/g4study/g4study_Box.fcl index 6fe8a5c91e..9f7d54a66c 100644 --- a/Mu2eG4/g4study/g4study_Box.fcl +++ b/Mu2eG4/g4study/g4study_Box.fcl @@ -104,8 +104,8 @@ services.SeedService.maxUniqueEngines : 20 #services.message.destinations.log.noTimeStamps : true # inform the geometry service it is not the standard Mu2e Detector # done via the tool_type above now -#physics.producers.g4run.visualization.initMacro : "Mu2eG4/vis/visxz.mac" -#physics.producers.g4run.visualization.initMacro : "Mu2eG4/vis/vismqt.mac" +#physics.producers.g4run.visualization.initMacro : "Offline/Mu2eG4/vis/visxz.mac" +#physics.producers.g4run.visualization.initMacro : "Offline/Mu2eG4/vis/vismqt.mac" physics.producers.g4run.physics.physicsListName : "ShieldingM" #physics.producers.g4run.physics.bfieldMaxStep : 500000. // not implemented (no field) diff --git a/Mu2eG4/g4study/g4study_Calo01.fcl b/Mu2eG4/g4study/g4study_Calo01.fcl index 741d1f3147..9be15ecc64 100644 --- a/Mu2eG4/g4study/g4study_Calo01.fcl +++ b/Mu2eG4/g4study/g4study_Calo01.fcl @@ -104,8 +104,8 @@ services.SeedService.maxUniqueEngines : 20 #services.message.destinations.log.noTimeStamps : true # inform the geometry service it is not the standard Mu2e Detector # done via the tool_type above now -#physics.producers.g4run.visualization.initMacro : "Mu2eG4/vis/visxz.mac" -#physics.producers.g4run.visualization.initMacro : "Mu2eG4/vis/vismqt.mac" +#physics.producers.g4run.visualization.initMacro : "Offline/Mu2eG4/vis/visxz.mac" +#physics.producers.g4run.visualization.initMacro : "Offline/Mu2eG4/vis/vismqt.mac" physics.producers.g4run.physics.physicsListName : "ShieldingM" #physics.producers.g4run.physics.bfieldMaxStep : 500000. // not implemented (no field) diff --git a/Mu2eG4/g4study/g4study_MuCapture.fcl b/Mu2eG4/g4study/g4study_MuCapture.fcl index 2984848362..d264ca066b 100644 --- a/Mu2eG4/g4study/g4study_MuCapture.fcl +++ b/Mu2eG4/g4study/g4study_MuCapture.fcl @@ -104,8 +104,8 @@ services.SeedService.maxUniqueEngines : 20 #services.message.destinations.log.noTimeStamps : true # inform the geometry service it is not the standard Mu2e Detector # done via the tool_type above now -#physics.producers.g4run.visualization.initMacro : "Mu2eG4/vis/visxz.mac" -#physics.producers.g4run.visualization.initMacro : "Mu2eG4/vis/vismqt.mac" +#physics.producers.g4run.visualization.initMacro : "Offline/Mu2eG4/vis/visxz.mac" +#physics.producers.g4run.visualization.initMacro : "Offline/Mu2eG4/vis/vismqt.mac" physics.producers.g4run.physics.physicsListName : "ShieldingM" #physics.producers.g4run.physics.bfieldMaxStep : 500000. // not implemented (no field) diff --git a/Mu2eG4/g4study/g4study_NBoxes.fcl b/Mu2eG4/g4study/g4study_NBoxes.fcl index 8c1f5a2859..48816cad65 100644 --- a/Mu2eG4/g4study/g4study_NBoxes.fcl +++ b/Mu2eG4/g4study/g4study_NBoxes.fcl @@ -156,8 +156,8 @@ services.SeedService.maxUniqueEngines : 20 #services.message.destinations.log.noTimeStamps : true # inform the geometry service it is not the standard Mu2e Detector # done via the tool_type above now -#physics.producers.g4run.visualization.initMacro : "Mu2eG4/vis/visxz.mac" -#physics.producers.g4run.visualization.initMacro : "Mu2eG4/vis/vismqt.mac" +#physics.producers.g4run.visualization.initMacro : "Offline/Mu2eG4/vis/visxz.mac" +#physics.producers.g4run.visualization.initMacro : "Offline/Mu2eG4/vis/vismqt.mac" #physics.producers.g4run.physics.physicsListName : "ShieldingM_EMZ" #physics.producers.g4run.physics.physicsListName : "QGSP_BERT_EMZ" #physics.producers.g4run.physics.physicsListName : "QGSP_BERT" diff --git a/Mu2eG4/g4study/g4study_Tube.fcl b/Mu2eG4/g4study/g4study_Tube.fcl index bfadbd8f5e..95092273ab 100644 --- a/Mu2eG4/g4study/g4study_Tube.fcl +++ b/Mu2eG4/g4study/g4study_Tube.fcl @@ -104,8 +104,8 @@ services.SeedService.maxUniqueEngines : 20 #services.message.destinations.log.noTimeStamps : true # inform the geometry service it is not the standard Mu2e Detector # done via the tool_type above now -#physics.producers.g4run.visualization.initMacro : "Mu2eG4/vis/visxz.mac" -#physics.producers.g4run.visualization.initMacro : "Mu2eG4/vis/vismqt.mac" +#physics.producers.g4run.visualization.initMacro : "Offline/Mu2eG4/vis/visxz.mac" +#physics.producers.g4run.visualization.initMacro : "Offline/Mu2eG4/vis/vismqt.mac" physics.producers.g4run.physics.physicsListName : "ShieldingM" #physics.producers.g4run.physics.bfieldMaxStep : 500000. // not implemented (no field) From e5174acae4665b57485eea61184ac2f9a9748204 Mon Sep 17 00:00:00 2001 From: Krzysztof L Genser Date: Wed, 6 Mar 2024 12:39:03 -0600 Subject: [PATCH 163/213] Adding processes needed for Geant4 11.2 and adding a commented out line with physics list using them --- MCDataProducts/inc/ProcessCode.hh | 10 +++++----- Mu2eG4/fcl/g4test_03.fcl | 2 ++ 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/MCDataProducts/inc/ProcessCode.hh b/MCDataProducts/inc/ProcessCode.hh index c24b5d17ee..2098b60402 100644 --- a/MCDataProducts/inc/ProcessCode.hh +++ b/MCDataProducts/inc/ProcessCode.hh @@ -85,10 +85,10 @@ namespace mu2e { truncated, mu2eMuonCaptureAtRest, mu2eMuonDecayAtRest, mu2eCeMinusEndpoint, // 167 mu2eCeMinusLeadingLog, mu2eCePlusEndpoint, mu2eDIOLeadingLog, mu2eInternalRMC, // 171 mu2eExternalRMC, mu2eFlateMinus, mu2eFlatePlus, mu2eFlatPhoton, // 175 - mu2eCePlusLeadingLog, mu2ePionCaptureAtRest, mu2eExternalRPC, mu2eInternalRPC, - mu2eCaloCalib, mu2eunused6, mu2eunused7, mu2eunused8, - uninitialized, NoProcess, GammaGeneralProc, - mu2eGammaConversion, Radioactivation, + mu2eCePlusLeadingLog, mu2ePionCaptureAtRest, mu2eExternalRPC, mu2eInternalRPC, // 179 + mu2eCaloCalib, mu2eunused6, mu2eunused7, mu2eunused8, // 183 + uninitialized, NoProcess, GammaGeneralProc, // 187 + mu2eGammaConversion, Radioactivation, nCaptureHP, nFissionHP, // 191 lastEnum, // An alias for backward compatibility mu2eHallAir = mu2eKillerVolume @@ -145,7 +145,7 @@ namespace mu2e { "mu2eCePlusLeadingLog", "mu2ePionCaptureAtRest", "mu2eExternalRPC", "mu2eInternalRPC", \ "mu2eCaloCalib", "mu2eunused6", "mu2eunused7", "mu2eunused8", \ "uninitialized", "NoProcess", "GammaGeneralProc", \ - "mu2eGammaConversion","Radioactivation" + "mu2eGammaConversion","Radioactivation", "nCaptureHP", "nFissionHP" #endif public: diff --git a/Mu2eG4/fcl/g4test_03.fcl b/Mu2eG4/fcl/g4test_03.fcl index 6476f4e212..bb8b3a5298 100644 --- a/Mu2eG4/fcl/g4test_03.fcl +++ b/Mu2eG4/fcl/g4test_03.fcl @@ -92,3 +92,5 @@ physics.producers.generate.muonStops.inputFiles : @local::mergedMuon_tgtStops_md // Enable diagnsotic printout for pedagogical purposes. #physics.producers.g4run.debug.diagLevel : 1 +// Demonstrate how to change the physics list +// physics.producers.g4run.physics.physicsListName : "QGSP_BERT_HP" \ No newline at end of file From 148ad306757f8d6d7a8f2d072559c09061d36c89 Mon Sep 17 00:00:00 2001 From: Richard Bonventre Date: Wed, 6 Mar 2024 10:49:10 -0800 Subject: [PATCH 164/213] Revert LorentzAngle redefinition for now --- Mu2eKinKal/src/KKFitUtilities.cc | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/Mu2eKinKal/src/KKFitUtilities.cc b/Mu2eKinKal/src/KKFitUtilities.cc index 35c209bc1e..29a2126d6b 100644 --- a/Mu2eKinKal/src/KKFitUtilities.cc +++ b/Mu2eKinKal/src/KKFitUtilities.cc @@ -15,9 +15,8 @@ namespace mu2e { return point.Rho() < 900.0 && fabs(point.Z()) < 1800; // numbers should come from Tracker TODO } double LorentzAngle(KinKal::ClosestApproachData const& ptca, KinKal::VEC3 const& bdir) { - auto delta = ptca.particlePoca().Vect() - ptca.sensorPoca().Vect(); - auto raddir = ptca.sensorDirection().Cross(bdir); - return atan(fabs(delta.Dot(raddir)/delta.Dot(bdir))); + auto tperp = (ptca.particleDirection() - ptca.particleDirection().Dot(ptca.sensorDirection())*ptca.sensorDirection()).unit(); + return acos(tperp.Dot(bdir)); } bool insideStraw(KinKal::ClosestApproachData const& ca,Straw const& straw,double ubuffer) { // compute the position along the wire and compare to the 1/2 length From 30e1f5c579a1ed5c85a17730f526a64be0e11270 Mon Sep 17 00:00:00 2001 From: Krzysztof L Genser Date: Wed, 6 Mar 2024 13:26:38 -0600 Subject: [PATCH 165/213] fixing white space --- Mu2eG4/fcl/g4test_03.fcl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Mu2eG4/fcl/g4test_03.fcl b/Mu2eG4/fcl/g4test_03.fcl index bb8b3a5298..62ad4bcd40 100644 --- a/Mu2eG4/fcl/g4test_03.fcl +++ b/Mu2eG4/fcl/g4test_03.fcl @@ -93,4 +93,4 @@ physics.producers.generate.muonStops.inputFiles : @local::mergedMuon_tgtStops_md // Enable diagnsotic printout for pedagogical purposes. #physics.producers.g4run.debug.diagLevel : 1 // Demonstrate how to change the physics list -// physics.producers.g4run.physics.physicsListName : "QGSP_BERT_HP" \ No newline at end of file +// physics.producers.g4run.physics.physicsListName : "QGSP_BERT_HP" From 935c518e87fe2ed449aca753ae1e1521d9a28594 Mon Sep 17 00:00:00 2001 From: David Nathan Brown Date: Wed, 6 Mar 2024 17:09:12 -0600 Subject: [PATCH 166/213] Make straw status testing in digi making optional, default off --- .../src/StrawDigisFromStrawGasSteps_module.cc | 21 ++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/TrackerMC/src/StrawDigisFromStrawGasSteps_module.cc b/TrackerMC/src/StrawDigisFromStrawGasSteps_module.cc index 378605b40a..560d2ce68f 100644 --- a/TrackerMC/src/StrawDigisFromStrawGasSteps_module.cc +++ b/TrackerMC/src/StrawDigisFromStrawGasSteps_module.cc @@ -114,6 +114,7 @@ namespace mu2e { fhicl::Atom diagpath{ Name("DiagPath"), Comment("Digitization Path for waveform diagnostics") ,0 }; fhicl::Atom spinstance { Name("StrawGasStepInstance"), Comment("StrawGasStep Instance name"),""}; fhicl::Atom spmodule { Name("StrawGasStepModule"), Comment("StrawGasStep Module name"),""}; + fhicl::Atom usestatus { Name("UseStatus"), Comment("Use TrackerStatus when making digis"), false}; }; @@ -160,6 +161,7 @@ namespace mu2e { std::vector _allPlanes; unsigned _maxnclu; StrawElectronics::Path _diagpath; + bool _usestatus; // Random number distributions art::RandomNumberGenerator::base_engine_t& _engine; CLHEP::RandGaussQ _randgauss; @@ -175,7 +177,6 @@ namespace mu2e { ProditionsHandle _strawele_h; ProditionsHandle _alignedTrackerSim_h{"Sim"}; const Tracker *_tracker; - ProditionsHandle _trackerStatus_h; art::Selector _selector; double _rstraw; // cache // diagnostics @@ -221,7 +222,6 @@ namespace mu2e { // helper functions void fillClusterMap(StrawPhysics const& strawphys, StrawElectronics const& strawele, - TrackerStatus const& trackerStatus, art::Event const& event, StrawClusterMap & hmap); void addStep(StrawPhysics const& strawphys, StrawElectronics const& strawele, @@ -296,6 +296,7 @@ namespace mu2e { _allPlanes(config().allPlanes()), _maxnclu(config().maxnclu()), _diagpath(static_cast(config().diagpath())), + _usestatus(config().usestatus()), // Random number distributions _engine(createEngine( art::ServiceHandle()->getSeed())), _randgauss( _engine ), @@ -441,7 +442,6 @@ namespace mu2e { StrawPhysics const& strawphys = _strawphys_h.get(event.id()); StrawElectronics const& strawele = _strawele_h.get(event.id()); _tracker = _alignedTrackerSim_h.getPtr(event.id()).get(); - TrackerStatus const& trackerStatus = _trackerStatus_h.get(event.id()); _mbtime = GlobalConstantsHandle()->getNominalDRPeriod(); art::Handle ewMarkerHandle; event.getByLabel(_ewMarkerTag, ewMarkerHandle); @@ -477,7 +477,7 @@ namespace mu2e { // this is a map from straw ids to a list of all clusters on that straw from this event StrawClusterMap hmap; // fill this from the event - fillClusterMap(strawphys,strawele,trackerStatus,event,hmap); + fillClusterMap(strawphys,strawele,event,hmap); // add noise clusts if(_addNoise)addNoise(hmap); // loop over the clust sequences (i.e. loop over straws, and for each get their list of clusters) @@ -535,8 +535,13 @@ namespace mu2e { void StrawDigisFromStrawGasSteps::fillClusterMap(StrawPhysics const& strawphys, StrawElectronics const& strawele, - TrackerStatus const& trackerStatus, art::Event const& event, StrawClusterMap & hmap){ +// get status if needed + std::shared_ptr trackerStatus; + if(_usestatus) { + ProditionsHandle _trackerStatus_h; + trackerStatus = _trackerStatus_h.getPtr(event.id()); + } // Get all of the tracker StrawGasStep collections from the event: typedef vector< art::Handle > HandleVector; HandleVector stepsHandles = event.getMany( _selector); @@ -562,13 +567,15 @@ namespace mu2e { auto const& sgs = steps[isgs]; // lookup straw here, to avoid having to find the tracker for every step StrawId const & sid = sgs.strawId(); - if ( (!trackerStatus.noSignal(sid)) && sgs.ionizingEdep() > _minstepE){ + if ( ((!_usestatus) || (!trackerStatus->noSignal(sid))) && sgs.ionizingEdep() > _minstepE){ Straw const& straw = _tracker->getStraw(sid); auto sgsptr = SGSPtr(sgsch,isgs); // create a clust from this step, and add it to the clust map addStep(strawphys,strawele,straw,sgsptr,hmap[sid]); } else if(_debug > 0) { - std::cout << "Suppressing sid " << sid << " Status " << trackerStatus.strawStatus(sid) << " energy " << sgs.ionizingEdep() << std::endl; + StrawStatus stat; + if(_usestatus) stat = trackerStatus->strawStatus(sid); + std::cout << "Suppressing sid " << sid << " Status " << stat << " energy " << sgs.ionizingEdep() << std::endl; } } } From e083a24a87dd3aa6f7cb04ea307bf1590a62f301 Mon Sep 17 00:00:00 2001 From: David Nathan Brown Date: Wed, 6 Mar 2024 17:51:25 -0600 Subject: [PATCH 167/213] Move handle constructor --- TrackerMC/src/StrawDigisFromStrawGasSteps_module.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/TrackerMC/src/StrawDigisFromStrawGasSteps_module.cc b/TrackerMC/src/StrawDigisFromStrawGasSteps_module.cc index 560d2ce68f..f3c472a381 100644 --- a/TrackerMC/src/StrawDigisFromStrawGasSteps_module.cc +++ b/TrackerMC/src/StrawDigisFromStrawGasSteps_module.cc @@ -176,6 +176,7 @@ namespace mu2e { ProditionsHandle _strawphys_h; ProditionsHandle _strawele_h; ProditionsHandle _alignedTrackerSim_h{"Sim"}; + ProditionsHandle _trackerStatus_h; const Tracker *_tracker; art::Selector _selector; double _rstraw; // cache @@ -539,7 +540,6 @@ namespace mu2e { // get status if needed std::shared_ptr trackerStatus; if(_usestatus) { - ProditionsHandle _trackerStatus_h; trackerStatus = _trackerStatus_h.getPtr(event.id()); } // Get all of the tracker StrawGasStep collections from the event: From 44852385be05125983d6544c6b43be9cf6c741b9 Mon Sep 17 00:00:00 2001 From: Krzysztof L Genser Date: Wed, 6 Mar 2024 21:42:46 -0600 Subject: [PATCH 168/213] fixing typos in comments --- MCDataProducts/inc/ProcessCode.hh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/MCDataProducts/inc/ProcessCode.hh b/MCDataProducts/inc/ProcessCode.hh index 2098b60402..f91045c9eb 100644 --- a/MCDataProducts/inc/ProcessCode.hh +++ b/MCDataProducts/inc/ProcessCode.hh @@ -87,8 +87,8 @@ namespace mu2e { mu2eExternalRMC, mu2eFlateMinus, mu2eFlatePlus, mu2eFlatPhoton, // 175 mu2eCePlusLeadingLog, mu2ePionCaptureAtRest, mu2eExternalRPC, mu2eInternalRPC, // 179 mu2eCaloCalib, mu2eunused6, mu2eunused7, mu2eunused8, // 183 - uninitialized, NoProcess, GammaGeneralProc, // 187 - mu2eGammaConversion, Radioactivation, nCaptureHP, nFissionHP, // 191 + uninitialized, NoProcess, GammaGeneralProc, // 186 + mu2eGammaConversion, Radioactivation, nCaptureHP, nFissionHP, // 190 lastEnum, // An alias for backward compatibility mu2eHallAir = mu2eKillerVolume From d41595f3906614dc27f1a242674b4662c9452d04 Mon Sep 17 00:00:00 2001 From: Ray Culbertson Date: Thu, 7 Mar 2024 13:41:45 -0600 Subject: [PATCH 169/213] dev moved --- DbService/data/connections.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DbService/data/connections.txt b/DbService/data/connections.txt index bfe595a521..1b7563594e 100644 --- a/DbService/data/connections.txt +++ b/DbService/data/connections.txt @@ -19,7 +19,7 @@ database mu2e_conditions_prd nocache https://dbdata0vm.fnal.gov:9443/QE/mu2e/prod/app/SQ/query? database mu2e_conditions_dev - host ifdb07 + host ifdb10 port 5444 cache https://dbdata0vm.fnal.gov:8444/QE/mu2e/dev/app/SQ/query? nocache https://dbdata0vm.fnal.gov:9443/QE/mu2e/dev/app/SQ/query? From 45ebf37ace1a90f950087cc03b477cfd14f90595 Mon Sep 17 00:00:00 2001 From: Richard Bonventre Date: Thu, 7 Mar 2024 18:55:05 -0800 Subject: [PATCH 170/213] Fix hit truncation --- CommonMC/src/SelectRecoMC_module.cc | 4 ++-- TrackerMC/src/StrawDigisFromStrawGasSteps_module.cc | 11 +++++++++-- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/CommonMC/src/SelectRecoMC_module.cc b/CommonMC/src/SelectRecoMC_module.cc index 4e289ea984..2bc7d26ace 100644 --- a/CommonMC/src/SelectRecoMC_module.cc +++ b/CommonMC/src/SelectRecoMC_module.cc @@ -310,7 +310,7 @@ namespace mu2e { tshmc._cpos, tdir ); auto mcsep = wirepca.point2() - wirepca.point1(); - tshmc._wireLen = mcsep.Dot(wdir); + tshmc._wireLen = (wirepca.point2()-XYZVectorF(straw.wirePosition())).Dot(wdir); auto mcperp = tdir.Cross(wdir).Unit(); tshmc._wireDOCA = -1*mcperp.Dot(mcsep); auto pdir = wdir.Cross(bdir); @@ -318,7 +318,7 @@ namespace mu2e { tshmc._wirePhi = atan2(mcsep.Dot(pdir),mcsep.Dot(bdir)); tshmc._wireDot = tdir.Dot(wdir); auto wperp = wdir.Cross(mcperp); - tshmc._wireTau = mcsep.Dot(wperp); + tshmc._wireTau = (tshmc._cpos-XYZVectorF(straw.wirePosition())).Dot(wperp); tshmc._rdrift = srep->strawDrift().T2D(tshmc._tdrift,tshmc._wirePhi); auto sdir = XYZVectorF(straw.strawDirection()); diff --git a/TrackerMC/src/StrawDigisFromStrawGasSteps_module.cc b/TrackerMC/src/StrawDigisFromStrawGasSteps_module.cc index f3c472a381..b8d50892d7 100644 --- a/TrackerMC/src/StrawDigisFromStrawGasSteps_module.cc +++ b/TrackerMC/src/StrawDigisFromStrawGasSteps_module.cc @@ -1258,13 +1258,20 @@ namespace mu2e { float dw = delta.Dot(sdir); XYZVectorF cperp = delta - dw*sdir; // just perp part float phi = atan2(cperp.Dot(pdir),cperp.Dot(zdir)); // angle around wire WRT z axis in range -pi,pi - float rho = min(sqrt(cperp.mag2()),(float)_rstraw); // truncate! + float rho = sqrt(cperp.mag2()); + XYZVectorF truncpos = cpos; // if outside straw, move inside + if (rho > (float)_rstraw){ + truncpos = cpos - cperp.Unit()*(rho-(float)_rstraw); + rho = (float) _rstraw; + } +// float rho = min(sqrt(cperp.mag2()),(float)_rstraw); // truncate! + retval._strawPosition = StrawPosition(rho,dw,phi); // now we get the wire position by calculating a position relative to the misaligned straw envelope //XYZVectorF simAlignedPos = strawPositionToXYZ(retval._strawPosition, simStraw); // calculate cylidrical coordinates relative to misaligned wire smid = XYZVectorF(straw.wirePosition()); - delta = cpos - smid; // cluster position WRT wire middle + delta = truncpos - smid; // cluster position WRT wire middle sdir = XYZVectorF(straw.wireDirection()); pdir = sdir.Cross(zdir); // radial direction if(pdir.Dot(smid) < 0.0)pdir *= -1.0; // sign radially outwards From 482ce07266e2d2030925dfe0f903bfa5d04466ba Mon Sep 17 00:00:00 2001 From: Richard Bonventre Date: Thu, 7 Mar 2024 19:35:19 -0800 Subject: [PATCH 171/213] Change to unbiased in TrkStrawHitSeed --- RecoDataProducts/inc/TrkStrawHitSeed.hh | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/RecoDataProducts/inc/TrkStrawHitSeed.hh b/RecoDataProducts/inc/TrkStrawHitSeed.hh index a635039c48..3abe586a56 100644 --- a/RecoDataProducts/inc/TrkStrawHitSeed.hh +++ b/RecoDataProducts/inc/TrkStrawHitSeed.hh @@ -50,7 +50,7 @@ namespace mu2e { _udresid(udresid.value()),_udresidmvar(udresid.measurementVariance()),_udresidpvar(udresid.parameterVariance()), _rtresid(rtresid.value()),_rtresidmvar(rtresid.measurementVariance()),_rtresidpvar(rtresid.parameterVariance()), _rdresid(rdresid.value()),_rdresidmvar(rdresid.measurementVariance()),_rdresidpvar(rdresid.parameterVariance()), - _rpoca(XYZVectorF(rptca.particlePoca().Vect())) + _upoca(XYZVectorF(uptca.particlePoca().Vect())) { // compute position along wire according to Mu2e convention double endsign = chit.earlyEnd().endSign(); @@ -64,7 +64,7 @@ namespace mu2e { if(whs.active())_flag.merge(StrawHitFlag::active); // calculate the doca and phi relative to the straw envelope at POCA to wire - auto ppoca = XYZVectorF(rptca.particlePoca().Vect()); + auto ppoca = XYZVectorF(uptca.particlePoca().Vect()); static XYZVectorF zdir(0.0,0.0,1.0); // relative to Z auto wmid = XYZVectorF(straw.wirePosition()); @@ -74,7 +74,7 @@ namespace mu2e { if (raddir.Dot(wmid) < 0.0) raddir *= -1.0; // sign radially outwards float dw = delta.Dot(wdir); XYZVectorF cperp = delta - dw*wdir; // just perp part - _rwirephi = atan2(cperp.Dot(raddir),cperp.Dot(zdir)); + _uwirephi = atan2(cperp.Dot(raddir),cperp.Dot(zdir)); auto smid = XYZVectorF(straw.strawPosition()); auto sdir = XYZVectorF(straw.strawDirection()); @@ -83,10 +83,10 @@ namespace mu2e { if(raddir.Dot(smid) < 0.0)raddir *= -1.0; // sign radially outwards dw = delta.Dot(sdir); cperp = delta - dw*sdir; // just perp part - _rstrawphi = atan2(cperp.Dot(raddir),cperp.Dot(zdir)); // angle around wire WRT z axis in range -pi,pi - _rstrawdist = sqrt(cperp.mag2()); + _ustrawphi = atan2(cperp.Dot(raddir),cperp.Dot(zdir)); // angle around wire WRT z axis in range -pi,pi + _ustrawdist = sqrt(cperp.mag2()); - _wdot = rptca.particleDirection().Dot(straw.wireDirection()); + _wdot = uptca.particleDirection().Dot(straw.wireDirection()); } //Legacy constructor for BTrk @@ -101,7 +101,7 @@ namespace mu2e { _rdoca(wdoca), _rdocavar(rerr*rerr), _rdt(dt), _rtocavar(t0._t0err*t0._t0err), _udoca(wdoca), _udocavar(rerr*rerr), _udt(dt), _utocavar(t0._t0err*t0._t0err), _rupos(upos),_uupos(upos), _rdrift(rdrift),_cdrift(rdrift), _sderr(rerr), _dvel(0), _lang(0), - _rstrawdist(0), _rstrawphi(0), _rwirephi(0), _wdot(0), + _ustrawdist(0), _ustrawphi(0), _uwirephi(0), _wdot(0), _t0(t0), _trklen(trklen), _hitlen(hitlen), _stime(stime){ _etime[chit.earlyEnd()] = chit.time(); } @@ -176,11 +176,11 @@ namespace mu2e { float _udresid=0, _udresidmvar=0, _udresidpvar =0; // unbiased distance residual and associated measurement and parameter variances float _rtresid=0, _rtresidmvar=0, _rtresidpvar =0; // reference time residual and associated measurement and parameter variances float _rdresid=0, _rdresidmvar=0, _rdresidpvar =0; // reference distance residual and associated measurement and parameter variances - float _rstrawdist = 0; - float _rstrawphi = 0; - float _rwirephi = 0; + float _ustrawdist = 0; + float _ustrawphi = 0; + float _uwirephi = 0; float _wdot = 0; - XYZVectorF _rpoca; + XYZVectorF _upoca; // BTrk legacy payload HitT0 _t0; // time origin for this hit = track t0 + particle propagation time to this straw From 365a585cee15e8806170c2f0af1a2ed7a3660668 Mon Sep 17 00:00:00 2001 From: David Nathan Brown Date: Thu, 7 Mar 2024 19:54:55 -0800 Subject: [PATCH 172/213] Minor tweaks to updaters --- Mu2eKinKal/fcl/prolog.fcl | 6 +++--- Mu2eKinKal/inc/KKStrawHit.hh | 2 +- Mu2eKinKal/src/BkgANNSHU.cc | 15 +++++++++------ Mu2eKinKal/src/CADSHU.cc | 4 +++- Mu2eKinKal/src/DriftANNSHU.cc | 9 ++++++--- Mu2eKinKal/src/WireHitState.cc | 1 + 6 files changed, 23 insertions(+), 14 deletions(-) diff --git a/Mu2eKinKal/fcl/prolog.fcl b/Mu2eKinKal/fcl/prolog.fcl index 377322e93c..2669451bc6 100644 --- a/Mu2eKinKal/fcl/prolog.fcl +++ b/Mu2eKinKal/fcl/prolog.fcl @@ -219,7 +219,7 @@ Mu2eKinKal : { [ 0.0, "CADSHU:DriftANNSHU" ], [ 0.0, "CADSHU:DriftANNSHU" ], [ 0.0, "CADSHU:DriftANNSHU" ], - [ 0.0, "CADSHU:DriftANNSHU:BkgANNSHU" ], + [ 0.0, "CADSHU:BkgANNSHU:DriftANNSHU" ], [ 0.0, "CADSHU:DriftANNSHU" ] ] CADSHUSettings : [ @@ -236,8 +236,8 @@ Mu2eKinKal : { ] BkgANNSHUSettings : [ - [ "Offline/Mu2eKinKal/data/TrainBkgSeed.dat",0.1,"Inactive", 1], - [ "Offline/Mu2eKinKal/data/TrainBkgFinal.dat",0.1,"Inactive", 1] + [ "Offline/Mu2eKinKal/data/TrainBkgSeed.dat",0.2,"Inactive", 1], + [ "Offline/Mu2eKinKal/data/TrainBkgFinal.dat",0.2,"Inactive", 1] ] DriftANNSHUSettings : [ diff --git a/Mu2eKinKal/inc/KKStrawHit.hh b/Mu2eKinKal/inc/KKStrawHit.hh index 4b038d4518..f44cc35255 100644 --- a/Mu2eKinKal/inc/KKStrawHit.hh +++ b/Mu2eKinKal/inc/KKStrawHit.hh @@ -148,8 +148,8 @@ namespace mu2e { if(ca.usable()){ auto dinfo = fillDriftInfo(); // there can be multiple updaters: apply them all - if(bkgshu)whstate_ = bkgshu->wireHitState(whstate_,ca.tpData(),dinfo,chit_); if(cashu)whstate_ = cashu->wireHitState(whstate_,ca.tpData(),dinfo); + if(bkgshu)whstate_ = bkgshu->wireHitState(whstate_,ca.tpData(),dinfo,chit_); if(driftshu)whstate_ = driftshu->wireHitState(whstate_,ca.tpData(),dinfo,chit_); if(whstate_.driftConstraint()){ dVar_ = dinfo.driftHitVar(); diff --git a/Mu2eKinKal/src/BkgANNSHU.cc b/Mu2eKinKal/src/BkgANNSHU.cc index 37c277ddc6..6bdf1d68c7 100644 --- a/Mu2eKinKal/src/BkgANNSHU.cc +++ b/Mu2eKinKal/src/BkgANNSHU.cc @@ -17,7 +17,7 @@ namespace mu2e { std::string freeze = std::get<2>(config); diag_ = std::get<3>(config); freeze_ = WHSMask(freeze); - if(diag_ > 0)std::cout << "BkgANNSHU weights " << std::get<0>(config) << " cut " << mvacut_ << " freeze " << freeze_ << std::endl; + if(diag_ > 0)std::cout << "BkgANNSHU weights " << std::get<0>(config) << " cut " << mvacut_ << " freezing " << freeze_ << std::endl; } WireHitState BkgANNSHU::wireHitState(WireHitState const& input, ClosestApproachData const& tpdata, DriftInfo const& dinfo, ComboHit const& chit) const { @@ -37,14 +37,17 @@ namespace mu2e { pars[5] = tpdata.particlePoca().Vect().Rho(); auto mvaout = mva_->infer(pars.data()); whstate.quality_[WireHitState::bkg] = mvaout[0]; - if(diag_ > 2){ - whstate.algo_ = StrawHitUpdaters::BkgANN; - } + whstate.algo_ = StrawHitUpdaters::BkgANN; if(mvaout[0] < mvacut_){ - whstate.algo_ = StrawHitUpdaters::BkgANN; whstate.state_ = WireHitState::inactive; - whstate.frozen_ = whstate.isIn(freeze_); + } else { + // re-activate the hit if it was inactive + if(whstate.isInactive())whstate.state_ = WireHitState::null; } + whstate.frozen_ = whstate.isIn(freeze_); + if (diag_ > 1)std::cout << "BkgANNSHU set hit " << whstate << std::endl; + } else if (diag_ > 1) { + std::cout << "BkgANNSHU skipping hit " << whstate << std::endl; } return whstate; } diff --git a/Mu2eKinKal/src/CADSHU.cc b/Mu2eKinKal/src/CADSHU.cc index 6174550791..d97be03cd8 100644 --- a/Mu2eKinKal/src/CADSHU.cc +++ b/Mu2eKinKal/src/CADSHU.cc @@ -48,7 +48,9 @@ namespace mu2e { whstate.flag_ = flag_; whstate.frozen_ = whstate.isIn(freeze_); } - } + if (diag_ > 1)std::cout << "CADSHU set hit " << whstate << std::endl; + } else if (diag_ > 1) { + std::cout << "CADSHU skipping hit " << whstate << std::endl; } return whstate; } diff --git a/Mu2eKinKal/src/DriftANNSHU.cc b/Mu2eKinKal/src/DriftANNSHU.cc index b25eda64d4..704152b760 100644 --- a/Mu2eKinKal/src/DriftANNSHU.cc +++ b/Mu2eKinKal/src/DriftANNSHU.cc @@ -34,7 +34,7 @@ namespace mu2e { WireHitState DriftANNSHU::wireHitState(WireHitState const& input, ClosestApproachData const& tpdata, DriftInfo const& dinfo, ComboHit const& chit) const { WireHitState whstate = input; - if(input.updateable(StrawHitUpdaters::DriftANN)){ + if(whstate.updateable(StrawHitUpdaters::DriftANN) && whstate.active()){ // infer the ANN values std::array spars; std::array cpars; @@ -55,8 +55,8 @@ namespace mu2e { double plen = sqrt(std::max(0.25, 6.25-dinfo.rDrift_*dinfo.rDrift_))/sint; cpars[3] = chit.energyDep()/plen; auto clustermvaout = clustermva_->infer(cpars.data()); - if(diag_ > 1)std::cout << std::setw(8) << std::setprecision(5) - << "ANN inputs: doca, cdrift, sigdoca, TOTdrift, EDep " + if(diag_ > 2)std::cout << std::setw(8) << std::setprecision(5) + << "Drift ANN inputs: doca, cdrift, sigdoca, TOTdrift, EDep " << spars[0] << " , " << spars[1] << " , " << spars[2] << " , " @@ -100,6 +100,9 @@ namespace mu2e { whstate.state_ = WireHitState::null; } whstate.frozen_ = whstate.isIn(freeze_); + if (diag_ > 1)std::cout << "DriftANNSHU set hit " << whstate << std::endl; + } else if (diag_ > 1) { + std::cout << "DriftANNSHU skipping hit " << whstate << std::endl; } return whstate; } diff --git a/Mu2eKinKal/src/WireHitState.cc b/Mu2eKinKal/src/WireHitState.cc index 8a777a0840..d23095d393 100644 --- a/Mu2eKinKal/src/WireHitState.cc +++ b/Mu2eKinKal/src/WireHitState.cc @@ -7,6 +7,7 @@ namespace mu2e { if(whs.frozen()) ost << " Frozen "; ost << WireHitState::StateNames_[whs.state_+3]; ost << " Flags " << whs.flag_; + ost << " algo " << StrawHitUpdaters::name(whs.algo_); return ost; } From 62e241b4b2dfc33f8f905a099757257be2e825f7 Mon Sep 17 00:00:00 2001 From: Andrei Gaponenko Date: Thu, 7 Mar 2024 22:57:46 -0600 Subject: [PATCH 173/213] Throw an exception rather than do nothing on a configuration mistake. --- Mu2eG4/src/Mu2eStudyWorld.cc | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/Mu2eG4/src/Mu2eStudyWorld.cc b/Mu2eG4/src/Mu2eStudyWorld.cc index 0aaca834e4..ac7625b0a0 100644 --- a/Mu2eG4/src/Mu2eStudyWorld.cc +++ b/Mu2eG4/src/Mu2eStudyWorld.cc @@ -144,17 +144,16 @@ namespace mu2e { placePV, doSurfaceCheck)); - std::string simulatedDetector = _geom.simulatedDetector().get("tool_type"); + constructEnv_ = art::make_tool(_geom.simulatedDetector()); - if (simulatedDetector != "Mu2e") { - - constructEnv_ = art::make_tool(_geom.simulatedDetector()); - - if (constructEnv_) constructEnv_->construct(boxInTheWorldVInfo,_config); - else { - throw cet::exception("CONFIG") << __func__ << ": unknown study environment: " << simulatedDetector << "\n"; - } + if (constructEnv_) { + constructEnv_->construct(boxInTheWorldVInfo,_config); } + else { + std::string simulatedDetector = _geom.simulatedDetector().get("tool_type"); + throw cet::exception("CONFIG") << __func__ << ": unknown study environment: " << simulatedDetector << "\n"; + } + if ( _verbosityLevel > 0) { cout << __func__ << " world half dimensions : " << worldBoundaries[0] << ", " From 1560c76110e7f28367fb02993706460f1c1c4bd3 Mon Sep 17 00:00:00 2001 From: Eric Flumerfelt Date: Fri, 8 Mar 2024 17:48:40 -0600 Subject: [PATCH 174/213] Update CMakeLists.txt as needed. Add script to show when files have been added or removed --- .gitignore | 1 + CMakeLists.txt | 3 +- CRVConditions/CMakeLists.txt | 1 + CRVReco/CMakeLists.txt | 22 + CRVResponse/CMakeLists.txt | 29 +- CaloConditions/CMakeLists.txt | 3 - EventGenerator/CMakeLists.txt | 8 + Mu2eG4/CMakeLists.txt | 710 +----------------------- Mu2eUtilities/CMakeLists.txt | 1 + TrkHitReco/CMakeLists.txt | 21 +- TrkPatRec/CMakeLists.txt | 14 - TrkReco/CMakeLists.txt | 3 - Validation/CMakeLists.txt | 2 - check_cmake.sh | 31 ++ fcl/CMakeLists.txt | 10 +- ups/product_deps | 33 +- ups_install/CMakeLists.txt | 12 - ups_install/install.sh | 115 ---- ups_install/installFQFile.sh | 46 -- ups_install/installTableFile.sh | 123 ---- ups_install/tar_exclude_for_config.txt | 35 -- ups_install/tar_exclude_for_include.txt | 46 -- ups_install/tar_exclude_for_source.txt | 43 -- 23 files changed, 102 insertions(+), 1210 deletions(-) create mode 100755 check_cmake.sh delete mode 100644 ups_install/CMakeLists.txt delete mode 100644 ups_install/install.sh delete mode 100755 ups_install/installFQFile.sh delete mode 100755 ups_install/installTableFile.sh delete mode 100644 ups_install/tar_exclude_for_config.txt delete mode 100644 ups_install/tar_exclude_for_include.txt delete mode 100644 ups_install/tar_exclude_for_source.txt diff --git a/.gitignore b/.gitignore index 4f83a42bac..80de677e86 100644 --- a/.gitignore +++ b/.gitignore @@ -44,3 +44,4 @@ tags .clangd/* compile_commands.json spack-* +Offline diff --git a/CMakeLists.txt b/CMakeLists.txt index b3410a2a2d..cf12d9029b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -3,7 +3,7 @@ cmake_minimum_required (VERSION 3.19 FATAL_ERROR) find_package(cetmodules) -project(Offline VERSION 11.00.00) +project(Offline VERSION 11.01.00) include(CetCMakeEnv) cet_cmake_env() @@ -157,7 +157,6 @@ add_subdirectory(TrkFilters) add_subdirectory(TrkHitReco) add_subdirectory(TrkPatRec) add_subdirectory(TrkReco) -add_subdirectory(ups_install) add_subdirectory(UtilityModules) add_subdirectory(Validation) diff --git a/CRVConditions/CMakeLists.txt b/CRVConditions/CMakeLists.txt index d5e7bc1fa6..261508a69c 100644 --- a/CRVConditions/CMakeLists.txt +++ b/CRVConditions/CMakeLists.txt @@ -2,6 +2,7 @@ cet_make_library( SOURCE src/CRVCalibMaker.cc src/CRVOrdinalMaker.cc + src/CRVPhotonYieldMaker.cc src/CRVStatusMaker.cc LIBRARIES PUBLIC diff --git a/CRVReco/CMakeLists.txt b/CRVReco/CMakeLists.txt index ea2d64990a..75ffdd8007 100644 --- a/CRVReco/CMakeLists.txt +++ b/CRVReco/CMakeLists.txt @@ -10,6 +10,13 @@ cet_make_library( ROOT::Hist ) +cet_build_plugin(CrvCalibration art::module + REG_SOURCE src/CrvCalibration_module.cc + LIBRARIES REG + Offline::CRVReco + art_root_io::TFileService_service +) + cet_build_plugin(CrvCoincidenceFinder art::module REG_SOURCE src/CrvCoincidenceFinder_module.cc LIBRARIES REG @@ -21,6 +28,21 @@ cet_build_plugin(CrvCoincidenceFinder art::module Offline::RecoDataProducts ) + +cet_build_plugin(CrvFPGArate art::module + REG_SOURCE src/CrvFPGArate_module.cc + LIBRARIES REG + Offline::CRVReco + art_root_io::TFileService_service +) + +cet_build_plugin(CrvPedestalFinder art::module + REG_SOURCE src/CrvPedestalFinder_module.cc + LIBRARIES REG + Offline::CRVReco + art_root_io::TFileService_service +) + cet_build_plugin(CrvRecoPulsesFinder art::module REG_SOURCE src/CrvRecoPulsesFinder_module.cc LIBRARIES REG diff --git a/CRVResponse/CMakeLists.txt b/CRVResponse/CMakeLists.txt index f223aff00d..d90dff6c26 100644 --- a/CRVResponse/CMakeLists.txt +++ b/CRVResponse/CMakeLists.txt @@ -12,17 +12,6 @@ cet_make_library( Offline::RecoDataProducts ) -cet_build_plugin(CrvCalibration art::module - REG_SOURCE src/CrvCalibration_module.cc - LIBRARIES REG - art_root_io::TFileService_service - Offline::CRVResponse - - Offline::CosmicRayShieldGeom - Offline::GeometryService - Offline::RecoDataProducts -) - cet_build_plugin(CrvCoincidenceClusterMatchMC art::module REG_SOURCE src/CrvCoincidenceClusterMatchMC_module.cc LIBRARIES REG @@ -52,17 +41,6 @@ cet_build_plugin(CrvDigitizer art::module Offline::RecoDataProducts ) -cet_build_plugin(CrvPedestalFinder art::module - REG_SOURCE src/CrvPedestalFinder_module.cc - LIBRARIES REG - art_root_io::TFileService_service - Offline::CRVResponse - - Offline::CosmicRayShieldGeom - Offline::GeometryService - Offline::RecoDataProducts -) - cet_build_plugin(CrvPhotonGenerator art::module REG_SOURCE src/CrvPhotonGenerator_module.cc LIBRARIES REG @@ -154,6 +132,13 @@ cet_build_plugin(CrvWaveformsGenerator art::module Offline::SeedService ) +cet_build_plugin(CrvWidebandTest art::module + REG_SOURCE src/CrvWidebandTest_module.cc + LIBRARIES REG + Offline::CRVResponse + art_root_io::TFileService_service +) + cet_build_plugin(MakeCrvCoincidenceClusterMCAssns art::module REG_SOURCE src/MakeCrvCoincidenceClusterMCAssns_module.cc LIBRARIES REG diff --git a/CaloConditions/CMakeLists.txt b/CaloConditions/CMakeLists.txt index bf75c1502e..b5677cab04 100644 --- a/CaloConditions/CMakeLists.txt +++ b/CaloConditions/CMakeLists.txt @@ -16,9 +16,6 @@ cet_make_library( Offline::ProditionsService ) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/fcl/prolog.fcl ${CURRENT_BINARY_DIR} fcl/prolog.fcl) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/data/nominal.txt ${CURRENT_BINARY_DIR} data/nominal.txt) - install(DIRECTORY data DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/Offline/CaloConditions) install_source(SUBDIRS src) diff --git a/EventGenerator/CMakeLists.txt b/EventGenerator/CMakeLists.txt index 32d42b7664..9047bd7bee 100644 --- a/EventGenerator/CMakeLists.txt +++ b/EventGenerator/CMakeLists.txt @@ -292,6 +292,14 @@ cet_build_plugin(GenEventCounter art::module Offline::MCDataProducts ) +cet_build_plugin(GenFilter art::module + REG_SOURCE src/GenFilter_module.cc + LIBRARIES REG + Offline::EventGenerator + + Offline::MCDataProducts +) + cet_build_plugin(InFlightParticleSampler art::module REG_SOURCE src/InFlightParticleSampler_module.cc LIBRARIES REG diff --git a/Mu2eG4/CMakeLists.txt b/Mu2eG4/CMakeLists.txt index b3a97e7480..1f8760a696 100644 --- a/Mu2eG4/CMakeLists.txt +++ b/Mu2eG4/CMakeLists.txt @@ -236,705 +236,19 @@ cet_build_plugin(ConstructEnvTube art::tool Offline::Mu2eG4Helper ) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/fcl/g4test_03.fcl ${CURRENT_BINARY_DIR} fcl/g4test_03.fcl COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/fcl/g4test_03MT.fcl ${CURRENT_BINARY_DIR} fcl/g4test_03MT.fcl COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/fcl/g4test_mix1MT.fcl ${CURRENT_BINARY_DIR} fcl/g4test_mix1MT.fcl COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/fcl/g4test_mix1ST.fcl ${CURRENT_BINARY_DIR} fcl/g4test_mix1ST.fcl COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/fcl/g4test_mustops.fcl ${CURRENT_BINARY_DIR} fcl/g4test_mustops.fcl COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/fcl/g4test_stage0MT.fcl ${CURRENT_BINARY_DIR} fcl/g4test_stage0MT.fcl COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/fcl/g4test_stage0ST.fcl ${CURRENT_BINARY_DIR} fcl/g4test_stage0ST.fcl COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/fcl/g4test_stage1MT.fcl ${CURRENT_BINARY_DIR} fcl/g4test_stage1MT.fcl COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/fcl/g4test_stage1ST.fcl ${CURRENT_BINARY_DIR} fcl/g4test_stage1ST.fcl COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/fcl/gdmldump.fcl ${CURRENT_BINARY_DIR} fcl/gdmldump.fcl COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/fcl/prolog.fcl ${CURRENT_BINARY_DIR} fcl/prolog.fcl COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/fcl/rantest.fcl ${CURRENT_BINARY_DIR} fcl/rantest.fcl COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/fcl/replayAll.fcl ${CURRENT_BINARY_DIR} fcl/replayAll.fcl COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/fcl/replayWithSkip.fcl ${CURRENT_BINARY_DIR} fcl/replayWithSkip.fcl COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/fcl/surfaceCheck.fcl ${CURRENT_BINARY_DIR} fcl/surfaceCheck.fcl COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/fcl/transportOnly.fcl ${CURRENT_BINARY_DIR} fcl/transportOnly.fcl COPYONLY) - -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/g4study/g4study_Box.fcl ${CURRENT_BINARY_DIR} g4study/g4study_Box.fcl COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/g4study/g4study_Box_geom.txt ${CURRENT_BINARY_DIR} g4study/g4study_Box_geom.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/g4study/g4study_Calo01.fcl ${CURRENT_BINARY_DIR} g4study/g4study_Calo01.fcl COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/g4study/g4study_Calo01_geom.txt ${CURRENT_BINARY_DIR} g4study/g4study_Calo01_geom.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/g4study/g4studyCalo01helper.C ${CURRENT_BINARY_DIR} g4study/g4studyCalo01helper.C COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/g4study/g4studyCalo_01ParticleGun.txt ${CURRENT_BINARY_DIR} g4study/g4studyCalo_01ParticleGun.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/g4study/g4studyCalo01Selector.C ${CURRENT_BINARY_DIR} g4study/g4studyCalo01Selector.C COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/g4study/g4studyCalo01Selector.h ${CURRENT_BINARY_DIR} g4study/g4studyCalo01Selector.h COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/g4study/g4study.fcl ${CURRENT_BINARY_DIR} g4study/g4study.fcl COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/g4study/g4study_MuCapture.fcl ${CURRENT_BINARY_DIR} g4study/g4study_MuCapture.fcl COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/g4study/g4study_MuCapture_geom.txt ${CURRENT_BINARY_DIR} g4study/g4study_MuCapture_geom.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/g4study/g4studyMuonGun.txt ${CURRENT_BINARY_DIR} g4study/g4studyMuonGun.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/g4study/g4study_NBoxes.fcl ${CURRENT_BINARY_DIR} g4study/g4study_NBoxes.fcl COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/g4study/g4study_NBoxes_geom.txt ${CURRENT_BINARY_DIR} g4study/g4study_NBoxes_geom.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/g4study/g4studyParticleGunMuCapture.txt ${CURRENT_BINARY_DIR} g4study/g4studyParticleGunMuCapture.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/g4study/g4studyParticleGun.txt ${CURRENT_BINARY_DIR} g4study/g4studyParticleGun.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/g4study/g4study_Tube.fcl ${CURRENT_BINARY_DIR} g4study/g4study_Tube.fcl COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/g4study/g4study_Tube_geom.txt ${CURRENT_BINARY_DIR} g4study/g4study_Tube_geom.txt COPYONLY) - -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bfgeom_altDS11_helical_v01.txt ${CURRENT_BINARY_DIR} geom/bfgeom_altDS11_helical_v01.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bfgeom_constant.txt ${CURRENT_BINARY_DIR} geom/bfgeom_constant.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bfgeom_DS50_no_ds_v01.txt ${CURRENT_BINARY_DIR} geom/bfgeom_DS50_no_ds_v01.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bfgeom_DS50_no_tsu_ps_v01.txt ${CURRENT_BINARY_DIR} geom/bfgeom_DS50_no_tsu_ps_v01.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bfgeom_DS50_reco_v01.txt ${CURRENT_BINARY_DIR} geom/bfgeom_DS50_reco_v01.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bfgeom_DS50_v01.txt ${CURRENT_BINARY_DIR} geom/bfgeom_DS50_v01.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bfgeom_DS70_no_tsu_ps_v01.txt ${CURRENT_BINARY_DIR} geom/bfgeom_DS70_no_tsu_ps_v01.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bfgeom_DSMap_DS8_DS9_split_dZ_3mm.txt ${CURRENT_BINARY_DIR} geom/bfgeom_DSMap_DS8_DS9_split_dZ_3mm.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bfgeom_DSMap_dXYZ_ensemble_v01_exp_17.txt ${CURRENT_BINARY_DIR} geom/bfgeom_DSMap_dXYZ_ensemble_v01_exp_17.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bfgeom_DSMap_dXYZ_ensemble_v01_exp_8.txt ${CURRENT_BINARY_DIR} geom/bfgeom_DSMap_dXYZ_ensemble_v01_exp_8.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bfgeom_DSMap_yaw_10mm.txt ${CURRENT_BINARY_DIR} geom/bfgeom_DSMap_yaw_10mm.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bfgeom_DSMap_Z_scale_dZ_5mm.txt ${CURRENT_BINARY_DIR} geom/bfgeom_DSMap_Z_scale_dZ_5mm.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bfgeom_no_ds_v01.txt ${CURRENT_BINARY_DIR} geom/bfgeom_no_ds_v01.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bfgeom_no_field.txt ${CURRENT_BINARY_DIR} geom/bfgeom_no_field.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bfgeom_no_tsu_ps_altDS11_helical_v01.txt ${CURRENT_BINARY_DIR} geom/bfgeom_no_tsu_ps_altDS11_helical_v01.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bfgeom_no_tsu_ps_v01.txt ${CURRENT_BINARY_DIR} geom/bfgeom_no_tsu_ps_v01.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bfgeom_reco_altDS11_helical_v01.txt ${CURRENT_BINARY_DIR} geom/bfgeom_reco_altDS11_helical_v01.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bfgeom_reco_v01.txt ${CURRENT_BINARY_DIR} geom/bfgeom_reco_v01.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bfgeom_v01.txt ${CURRENT_BINARY_DIR} geom/bfgeom_v01.txt COPYONLY) - -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/backfillBeamlineFoundationS01.txt ${CURRENT_BINARY_DIR} geom/bldg/backfillBeamlineFoundationS01.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/backfillBeamlineFoundationS02.txt ${CURRENT_BINARY_DIR} geom/bldg/backfillBeamlineFoundationS02.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/backfillBeamlineFoundationS03.txt ${CURRENT_BINARY_DIR} geom/bldg/backfillBeamlineFoundationS03.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/backfillBeamlineFoundationS04.txt ${CURRENT_BINARY_DIR} geom/bldg/backfillBeamlineFoundationS04.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/backfillBeamlineFoundationS05.txt ${CURRENT_BINARY_DIR} geom/bldg/backfillBeamlineFoundationS05.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/backfillBeamlineFoundationS06.txt ${CURRENT_BINARY_DIR} geom/bldg/backfillBeamlineFoundationS06.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/backfillBeamlineNorth.txt ${CURRENT_BINARY_DIR} geom/bldg/backfillBeamlineNorth.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/backfillBeamlineSouth.txt ${CURRENT_BINARY_DIR} geom/bldg/backfillBeamlineSouth.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/backfillBeamline.txt ${CURRENT_BINARY_DIR} geom/bldg/backfillBeamline.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/backfillEscapeInner01.txt ${CURRENT_BINARY_DIR} geom/bldg/backfillEscapeInner01.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/backfillEscapeInner02.txt ${CURRENT_BINARY_DIR} geom/bldg/backfillEscapeInner02.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/backfillEscapeInner03.txt ${CURRENT_BINARY_DIR} geom/bldg/backfillEscapeInner03.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/backfillEscapeStair01.txt ${CURRENT_BINARY_DIR} geom/bldg/backfillEscapeStair01.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/backfillEscapeStair02.txt ${CURRENT_BINARY_DIR} geom/bldg/backfillEscapeStair02.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/backfillEscapeStair03.txt ${CURRENT_BINARY_DIR} geom/bldg/backfillEscapeStair03.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/backfillEscapeStairE01.txt ${CURRENT_BINARY_DIR} geom/bldg/backfillEscapeStairE01.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/backfillEscapeStairE02.txt ${CURRENT_BINARY_DIR} geom/bldg/backfillEscapeStairE02.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/backfillEscapeStairE03.txt ${CURRENT_BINARY_DIR} geom/bldg/backfillEscapeStairE03.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/backfillEscapeStairE04.txt ${CURRENT_BINARY_DIR} geom/bldg/backfillEscapeStairE04.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/backfillEscapeStairW01.txt ${CURRENT_BINARY_DIR} geom/bldg/backfillEscapeStairW01.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/backfillEscapeStairW02.txt ${CURRENT_BINARY_DIR} geom/bldg/backfillEscapeStairW02.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/backfillEscapeStairW03.txt ${CURRENT_BINARY_DIR} geom/bldg/backfillEscapeStairW03.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/backfillEscapeStairW04.txt ${CURRENT_BINARY_DIR} geom/bldg/backfillEscapeStairW04.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/backfillFoundationN.txt ${CURRENT_BINARY_DIR} geom/bldg/backfillFoundationN.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/backfillPsAreaBaselevel.txt ${CURRENT_BINARY_DIR} geom/bldg/backfillPsAreaBaselevel.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/backfillPsAreaBaselevel_v02.txt ${CURRENT_BINARY_DIR} geom/bldg/backfillPsAreaBaselevel_v02.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/backfillPsAreaInter.txt ${CURRENT_BINARY_DIR} geom/bldg/backfillPsAreaInter.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/backfillPsAreaInter_v02.txt ${CURRENT_BINARY_DIR} geom/bldg/backfillPsAreaInter_v02.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/backfillPsAreaLower.txt ${CURRENT_BINARY_DIR} geom/bldg/backfillPsAreaLower.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/backfillPsAreaLower_v02.txt ${CURRENT_BINARY_DIR} geom/bldg/backfillPsAreaLower_v02.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/backfillPsAreaRWallFootLevel.txt ${CURRENT_BINARY_DIR} geom/bldg/backfillPsAreaRWallFootLevel.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/backfillPsAreaRWallFootLevel_v02.txt ${CURRENT_BINARY_DIR} geom/bldg/backfillPsAreaRWallFootLevel_v02.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/backfillPsAreaTopLayer.txt ${CURRENT_BINARY_DIR} geom/bldg/backfillPsAreaTopLayer.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/backfillPsAreaTopLayer_v02.txt ${CURRENT_BINARY_DIR} geom/bldg/backfillPsAreaTopLayer_v02.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/backfillPsHatchE.txt ${CURRENT_BINARY_DIR} geom/bldg/backfillPsHatchE.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/backfillPsHatchS.txt ${CURRENT_BINARY_DIR} geom/bldg/backfillPsHatchS.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/backfillTSarea-W1Lower.txt ${CURRENT_BINARY_DIR} geom/bldg/backfillTSarea-W1Lower.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/backfillTSarea-W1.txt ${CURRENT_BINARY_DIR} geom/bldg/backfillTSarea-W1.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/backfillTSarea-W1UpperNotch2.txt ${CURRENT_BINARY_DIR} geom/bldg/backfillTSarea-W1UpperNotch2.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/backfillTSarea-W1UpperNotchLower.txt ${CURRENT_BINARY_DIR} geom/bldg/backfillTSarea-W1UpperNotchLower.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/backfillTSarea-W1UpperNotchUpper1.txt ${CURRENT_BINARY_DIR} geom/bldg/backfillTSarea-W1UpperNotchUpper1.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/backfillTSarea-W1UpperNotchUpper2.txt ${CURRENT_BINARY_DIR} geom/bldg/backfillTSarea-W1UpperNotchUpper2.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/backfillTSarea-W1UpperNotchUpper3.txt ${CURRENT_BINARY_DIR} geom/bldg/backfillTSarea-W1UpperNotchUpper3.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/backfillTSarea-W2.txt ${CURRENT_BINARY_DIR} geom/bldg/backfillTSarea-W2.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/backfillTSarea-W2Upper.txt ${CURRENT_BINARY_DIR} geom/bldg/backfillTSarea-W2Upper.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/beamlineBlockWallE.txt ${CURRENT_BINARY_DIR} geom/bldg/beamlineBlockWallE.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/beamlineBlockWallS.txt ${CURRENT_BINARY_DIR} geom/bldg/beamlineBlockWallS.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/beamlineBlockWallTop.txt ${CURRENT_BINARY_DIR} geom/bldg/beamlineBlockWallTop.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/beamlineCeilingE.txt ${CURRENT_BINARY_DIR} geom/bldg/beamlineCeilingE.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/beamlineCeiling.txt ${CURRENT_BINARY_DIR} geom/bldg/beamlineCeiling.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/beamlineCeiling_v02.txt ${CURRENT_BINARY_DIR} geom/bldg/beamlineCeiling_v02.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/beamlineEscapeDoorHeader.txt ${CURRENT_BINARY_DIR} geom/bldg/beamlineEscapeDoorHeader.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/beamlineFoundationS01.txt ${CURRENT_BINARY_DIR} geom/bldg/beamlineFoundationS01.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/beamlineFoundationS02.txt ${CURRENT_BINARY_DIR} geom/bldg/beamlineFoundationS02.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/beamlineFoundationS03.txt ${CURRENT_BINARY_DIR} geom/bldg/beamlineFoundationS03.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/beamlineFoundationS04.txt ${CURRENT_BINARY_DIR} geom/bldg/beamlineFoundationS04.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/beamlineFoundationS05.txt ${CURRENT_BINARY_DIR} geom/bldg/beamlineFoundationS05.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/beamlineFoundationS06.txt ${CURRENT_BINARY_DIR} geom/bldg/beamlineFoundationS06.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/beamlineFoundationUpper.txt ${CURRENT_BINARY_DIR} geom/bldg/beamlineFoundationUpper.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/beamlineLowerSouth.txt ${CURRENT_BINARY_DIR} geom/bldg/beamlineLowerSouth.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/beamlineNW.txt ${CURRENT_BINARY_DIR} geom/bldg/beamlineNW.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/beamline.txt ${CURRENT_BINARY_DIR} geom/bldg/beamline.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/beamlineUpperE.txt ${CURRENT_BINARY_DIR} geom/bldg/beamlineUpperE.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/beamlineUpperN.txt ${CURRENT_BINARY_DIR} geom/bldg/beamlineUpperN.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/beamlineUpperNW.txt ${CURRENT_BINARY_DIR} geom/bldg/beamlineUpperNW.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/beamlineUpperS.txt ${CURRENT_BINARY_DIR} geom/bldg/beamlineUpperS.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/beamlineUpper.txt ${CURRENT_BINARY_DIR} geom/bldg/beamlineUpper.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/beamlineUpper_v02.txt ${CURRENT_BINARY_DIR} geom/bldg/beamlineUpper_v02.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/beamline_v02.txt ${CURRENT_BINARY_DIR} geom/bldg/beamline_v02.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/dirtBeamlineBermSW.txt ${CURRENT_BINARY_DIR} geom/bldg/dirtBeamlineBermSW.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/dirtBeamlineBerm.txt ${CURRENT_BINARY_DIR} geom/bldg/dirtBeamlineBerm.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/dirtBeamlineBerm_v02.txt ${CURRENT_BINARY_DIR} geom/bldg/dirtBeamlineBerm_v02.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/dirtBeamlineBerm_v03.txt ${CURRENT_BINARY_DIR} geom/bldg/dirtBeamlineBerm_v03.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/dirtBeamlineBermWest.txt ${CURRENT_BINARY_DIR} geom/bldg/dirtBeamlineBermWest.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/dirtBeamlineCeilingE.txt ${CURRENT_BINARY_DIR} geom/bldg/dirtBeamlineCeilingE.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/dirtBeamlineCeilingW.txt ${CURRENT_BINARY_DIR} geom/bldg/dirtBeamlineCeilingW.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/dirtBeamlineSlab2NC.txt ${CURRENT_BINARY_DIR} geom/bldg/dirtBeamlineSlab2NC.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/dirtBeamlineSlab2NE.txt ${CURRENT_BINARY_DIR} geom/bldg/dirtBeamlineSlab2NE.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/dirtBeamlineSlab2N.txt ${CURRENT_BINARY_DIR} geom/bldg/dirtBeamlineSlab2N.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/dirtBeamlineSlab2N_v02.txt ${CURRENT_BINARY_DIR} geom/bldg/dirtBeamlineSlab2N_v02.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/dirtBeamlineSlab2NW.txt ${CURRENT_BINARY_DIR} geom/bldg/dirtBeamlineSlab2NW.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/dirtBeamlineSlabE.txt ${CURRENT_BINARY_DIR} geom/bldg/dirtBeamlineSlabE.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/dirtBeamlineSlabNC.txt ${CURRENT_BINARY_DIR} geom/bldg/dirtBeamlineSlabNC.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/dirtBeamlineSlab.txt ${CURRENT_BINARY_DIR} geom/bldg/dirtBeamlineSlab.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/dirtBeamlineSlab_v02.txt ${CURRENT_BINARY_DIR} geom/bldg/dirtBeamlineSlab_v02.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/dirtBeamlineSlabW.txt ${CURRENT_BINARY_DIR} geom/bldg/dirtBeamlineSlabW.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/dirtBeamline.txt ${CURRENT_BINARY_DIR} geom/bldg/dirtBeamline.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/dirtBeamlineUpper.txt ${CURRENT_BINARY_DIR} geom/bldg/dirtBeamlineUpper.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/dirtBeamlineUpper_v02.txt ${CURRENT_BINARY_DIR} geom/bldg/dirtBeamlineUpper_v02.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/dirtBeamline_v02.txt ${CURRENT_BINARY_DIR} geom/bldg/dirtBeamline_v02.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/dirtDsAreaAlcove1.txt ${CURRENT_BINARY_DIR} geom/bldg/dirtDsAreaAlcove1.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/dirtDsAreaAlcove2.txt ${CURRENT_BINARY_DIR} geom/bldg/dirtDsAreaAlcove2.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/dirtDsAreaAlcove3.txt ${CURRENT_BINARY_DIR} geom/bldg/dirtDsAreaAlcove3.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/dirtDsAreaDownstreamCeilingVslab1.txt ${CURRENT_BINARY_DIR} geom/bldg/dirtDsAreaDownstreamCeilingVslab1.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/dirtDsAreaDownstreamCeilingVslab2.txt ${CURRENT_BINARY_DIR} geom/bldg/dirtDsAreaDownstreamCeilingVslab2.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/dirtDsAreaDownstreamCeilingVslab3.txt ${CURRENT_BINARY_DIR} geom/bldg/dirtDsAreaDownstreamCeilingVslab3.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/dirtDsAreaDownstreamCeilingVslab4.txt ${CURRENT_BINARY_DIR} geom/bldg/dirtDsAreaDownstreamCeilingVslab4.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/dirtDsAreaDownstreamCeilingVslab5.txt ${CURRENT_BINARY_DIR} geom/bldg/dirtDsAreaDownstreamCeilingVslab5.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/dirtDsAreaDownstreamCeilingVslab6.txt ${CURRENT_BINARY_DIR} geom/bldg/dirtDsAreaDownstreamCeilingVslab6.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/dirtDsAreaElevator.txt ${CURRENT_BINARY_DIR} geom/bldg/dirtDsAreaElevator.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/dirtDsAreaElevatorUpper.txt ${CURRENT_BINARY_DIR} geom/bldg/dirtDsAreaElevatorUpper.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/dirtDsAreaFirstFloorS.txt ${CURRENT_BINARY_DIR} geom/bldg/dirtDsAreaFirstFloorS.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/dirtDsArea.txt ${CURRENT_BINARY_DIR} geom/bldg/dirtDsArea.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/dirtDsAreaUpperSE.txt ${CURRENT_BINARY_DIR} geom/bldg/dirtDsAreaUpperSE.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/dirtDsAreaUpper.txt ${CURRENT_BINARY_DIR} geom/bldg/dirtDsAreaUpper.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/dirtEscapeCeiling.txt ${CURRENT_BINARY_DIR} geom/bldg/dirtEscapeCeiling.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/dirtEscapeStair04.txt ${CURRENT_BINARY_DIR} geom/bldg/dirtEscapeStair04.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/dirtEscapeStair07.txt ${CURRENT_BINARY_DIR} geom/bldg/dirtEscapeStair07.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/dirtEscapeStair11.txt ${CURRENT_BINARY_DIR} geom/bldg/dirtEscapeStair11.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/dirtExtMonCeiling.txt ${CURRENT_BINARY_DIR} geom/bldg/dirtExtMonCeiling.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/dirtExtMonCeiling_v02.txt ${CURRENT_BINARY_DIR} geom/bldg/dirtExtMonCeiling_v02.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/dirtExtMon.txt ${CURRENT_BINARY_DIR} geom/bldg/dirtExtMon.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/dirtExtMonUpper.txt ${CURRENT_BINARY_DIR} geom/bldg/dirtExtMonUpper.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/dirtExtMonUpper_v02.txt ${CURRENT_BINARY_DIR} geom/bldg/dirtExtMonUpper_v02.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/dirtExtMon_v02.txt ${CURRENT_BINARY_DIR} geom/bldg/dirtExtMon_v02.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/dirtFoundationE.txt ${CURRENT_BINARY_DIR} geom/bldg/dirtFoundationE.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/dirtFoundationExtMonPSarea10.txt ${CURRENT_BINARY_DIR} geom/bldg/dirtFoundationExtMonPSarea10.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/dirtFoundationExtMonPSarea11.txt ${CURRENT_BINARY_DIR} geom/bldg/dirtFoundationExtMonPSarea11.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/dirtFoundationExtMonPSarea1.txt ${CURRENT_BINARY_DIR} geom/bldg/dirtFoundationExtMonPSarea1.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/dirtFoundationExtMonPSarea2.txt ${CURRENT_BINARY_DIR} geom/bldg/dirtFoundationExtMonPSarea2.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/dirtFoundationExtMonPSarea3.txt ${CURRENT_BINARY_DIR} geom/bldg/dirtFoundationExtMonPSarea3.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/dirtFoundationExtMonPSarea4.txt ${CURRENT_BINARY_DIR} geom/bldg/dirtFoundationExtMonPSarea4.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/dirtFoundationExtMonPSarea5.txt ${CURRENT_BINARY_DIR} geom/bldg/dirtFoundationExtMonPSarea5.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/dirtFoundationExtMonPSarea6.txt ${CURRENT_BINARY_DIR} geom/bldg/dirtFoundationExtMonPSarea6.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/dirtFoundationExtMonPSarea7.txt ${CURRENT_BINARY_DIR} geom/bldg/dirtFoundationExtMonPSarea7.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/dirtFoundationExtMonPSarea8.txt ${CURRENT_BINARY_DIR} geom/bldg/dirtFoundationExtMonPSarea8.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/dirtFoundationExtMonPSarea9.txt ${CURRENT_BINARY_DIR} geom/bldg/dirtFoundationExtMonPSarea9.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/dirtFoundationExtMonPSarea.txt ${CURRENT_BINARY_DIR} geom/bldg/dirtFoundationExtMonPSarea.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/dirtFoundationExtMonPSarea_v02.txt ${CURRENT_BINARY_DIR} geom/bldg/dirtFoundationExtMonPSarea_v02.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/dirtFoundationExtMon.txt ${CURRENT_BINARY_DIR} geom/bldg/dirtFoundationExtMon.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/dirtFoundationExtMon_v02.txt ${CURRENT_BINARY_DIR} geom/bldg/dirtFoundationExtMon_v02.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/dirtFoundationIsland.txt ${CURRENT_BINARY_DIR} geom/bldg/dirtFoundationIsland.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/dirtFoundationN.txt ${CURRENT_BINARY_DIR} geom/bldg/dirtFoundationN.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/dirtFoundationN_v02.txt ${CURRENT_BINARY_DIR} geom/bldg/dirtFoundationN_v02.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/dirtFoundationSd.txt ${CURRENT_BINARY_DIR} geom/bldg/dirtFoundationSd.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/dirtFoundationSmid.txt ${CURRENT_BINARY_DIR} geom/bldg/dirtFoundationSmid.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/dirtFoundationSu.txt ${CURRENT_BINARY_DIR} geom/bldg/dirtFoundationSu.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/dirtIsland.txt ${CURRENT_BINARY_DIR} geom/bldg/dirtIsland.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/dirtIslandUpper.txt ${CURRENT_BINARY_DIR} geom/bldg/dirtIslandUpper.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/dirtIslandUpper_v02.txt ${CURRENT_BINARY_DIR} geom/bldg/dirtIslandUpper_v02.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/dirtPassageE.txt ${CURRENT_BINARY_DIR} geom/bldg/dirtPassageE.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/dirtPsAreaDirtSlab2NBeyond.txt ${CURRENT_BINARY_DIR} geom/bldg/dirtPsAreaDirtSlab2NBeyond.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/dirtPsAreaDirtSlab2N.txt ${CURRENT_BINARY_DIR} geom/bldg/dirtPsAreaDirtSlab2N.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/dirtPsAreaDirtSlab2N_v02.txt ${CURRENT_BINARY_DIR} geom/bldg/dirtPsAreaDirtSlab2N_v02.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/dirtPsAreaDirtSlab2S.txt ${CURRENT_BINARY_DIR} geom/bldg/dirtPsAreaDirtSlab2S.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/dirtPsAreaDirtSlabN.txt ${CURRENT_BINARY_DIR} geom/bldg/dirtPsAreaDirtSlabN.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/dirtPsAreaDirtSlabN_v02.txt ${CURRENT_BINARY_DIR} geom/bldg/dirtPsAreaDirtSlabN_v02.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/dirtPsAreaDirtSlabS.txt ${CURRENT_BINARY_DIR} geom/bldg/dirtPsAreaDirtSlabS.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/dirtPsArea.txt ${CURRENT_BINARY_DIR} geom/bldg/dirtPsArea.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/dirtPsAreaUpper2N.txt ${CURRENT_BINARY_DIR} geom/bldg/dirtPsAreaUpper2N.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/dirtPsAreaUpper2N_v02.txt ${CURRENT_BINARY_DIR} geom/bldg/dirtPsAreaUpper2N_v02.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/dirtPsAreaUpper2SliverN.txt ${CURRENT_BINARY_DIR} geom/bldg/dirtPsAreaUpper2SliverN.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/dirtPsAreaUpper2SliverN_v02.txt ${CURRENT_BINARY_DIR} geom/bldg/dirtPsAreaUpper2SliverN_v02.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/dirtPsAreaUpperN.txt ${CURRENT_BINARY_DIR} geom/bldg/dirtPsAreaUpperN.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/dirtPsAreaUpperN_v02.txt ${CURRENT_BINARY_DIR} geom/bldg/dirtPsAreaUpperN_v02.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/dirtPsAreaUpperSliverS.txt ${CURRENT_BINARY_DIR} geom/bldg/dirtPsAreaUpperSliverS.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/dirtPsAreaUpperS.txt ${CURRENT_BINARY_DIR} geom/bldg/dirtPsAreaUpperS.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/dirtPsAreaWLower.txt ${CURRENT_BINARY_DIR} geom/bldg/dirtPsAreaWLower.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/dirtPsAreaW.txt ${CURRENT_BINARY_DIR} geom/bldg/dirtPsAreaW.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/dirtPsAreaW_v02.txt ${CURRENT_BINARY_DIR} geom/bldg/dirtPsAreaW_v02.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/dirtPsWallUpperSliver.txt ${CURRENT_BINARY_DIR} geom/bldg/dirtPsWallUpperSliver.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/dirtPsWallUpper.txt ${CURRENT_BINARY_DIR} geom/bldg/dirtPsWallUpper.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/dirtRemoteHandlingCeiling.txt ${CURRENT_BINARY_DIR} geom/bldg/dirtRemoteHandlingCeiling.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/dirtRemoteHandling.txt ${CURRENT_BINARY_DIR} geom/bldg/dirtRemoteHandling.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/dirtRemoteHandling_v02.txt ${CURRENT_BINARY_DIR} geom/bldg/dirtRemoteHandling_v02.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/dirtRetainingWallBermEast.txt ${CURRENT_BINARY_DIR} geom/bldg/dirtRetainingWallBermEast.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/dirtRetainingWallBermWest.txt ${CURRENT_BINARY_DIR} geom/bldg/dirtRetainingWallBermWest.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/dirtSRetainingWallFoot.txt ${CURRENT_BINARY_DIR} geom/bldg/dirtSRetainingWallFoot.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/dirtTempDirtBackfillPsAreaBaselevel.txt ${CURRENT_BINARY_DIR} geom/bldg/dirtTempDirtBackfillPsAreaBaselevel.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/dirtTempDirtBackfillPsAreaBaselevel_v02.txt ${CURRENT_BINARY_DIR} geom/bldg/dirtTempDirtBackfillPsAreaBaselevel_v02.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/dirtTempDirtBackfillPsAreaInter.txt ${CURRENT_BINARY_DIR} geom/bldg/dirtTempDirtBackfillPsAreaInter.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/dirtTempDirtBackfillPsAreaInter_v02.txt ${CURRENT_BINARY_DIR} geom/bldg/dirtTempDirtBackfillPsAreaInter_v02.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/dirtTempDirtBackfillPsAreaLower.txt ${CURRENT_BINARY_DIR} geom/bldg/dirtTempDirtBackfillPsAreaLower.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/dirtTempDirtBackfillPsAreaLower_v02.txt ${CURRENT_BINARY_DIR} geom/bldg/dirtTempDirtBackfillPsAreaLower_v02.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/dirtTempDirtBackfillPsAreaRWallFootLevel.txt ${CURRENT_BINARY_DIR} geom/bldg/dirtTempDirtBackfillPsAreaRWallFootLevel.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/dirtTempDirtBackfillPsAreaRWallFootLevel_v02.txt ${CURRENT_BINARY_DIR} geom/bldg/dirtTempDirtBackfillPsAreaRWallFootLevel_v02.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/dirtTempSofRetWallTop.txt ${CURRENT_BINARY_DIR} geom/bldg/dirtTempSofRetWallTop.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/dirtTempSofRetWallTop_v02.txt ${CURRENT_BINARY_DIR} geom/bldg/dirtTempSofRetWallTop_v02.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/dirtTsAreaAlcove.txt ${CURRENT_BINARY_DIR} geom/bldg/dirtTsAreaAlcove.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/dirtTsAreaStairwell.txt ${CURRENT_BINARY_DIR} geom/bldg/dirtTsAreaStairwell.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/dirtTsAreaUpper2W.txt ${CURRENT_BINARY_DIR} geom/bldg/dirtTsAreaUpper2W.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/dirtTsAreaUpperW.txt ${CURRENT_BINARY_DIR} geom/bldg/dirtTsAreaUpperW.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/dirtTsAreaW.txt ${CURRENT_BINARY_DIR} geom/bldg/dirtTsAreaW.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/dirtTsDsAreaFirstFloorEdgeN.txt ${CURRENT_BINARY_DIR} geom/bldg/dirtTsDsAreaFirstFloorEdgeN.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/dirtTsDsAreaFirstFloorEdgeN_v02.txt ${CURRENT_BINARY_DIR} geom/bldg/dirtTsDsAreaFirstFloorEdgeN_v02.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/dirtUpToGradeLevelW.txt ${CURRENT_BINARY_DIR} geom/bldg/dirtUpToGradeLevelW.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/dirtUpToGradeLevelW_v02.txt ${CURRENT_BINARY_DIR} geom/bldg/dirtUpToGradeLevelW_v02.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/dirtWallFill1.txt ${CURRENT_BINARY_DIR} geom/bldg/dirtWallFill1.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/dirtWallFill2.txt ${CURRENT_BINARY_DIR} geom/bldg/dirtWallFill2.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/dirtWTSareaCF2notch.txt ${CURRENT_BINARY_DIR} geom/bldg/dirtWTSareaCF2notch.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/dirtWTSareaCF2.txt ${CURRENT_BINARY_DIR} geom/bldg/dirtWTSareaCF2.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/dirtWTSareaCFbeam.txt ${CURRENT_BINARY_DIR} geom/bldg/dirtWTSareaCFbeam.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/dsAreaAlcove1Ceiling.txt ${CURRENT_BINARY_DIR} geom/bldg/dsAreaAlcove1Ceiling.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/dsAreaAlcove2Ceiling.txt ${CURRENT_BINARY_DIR} geom/bldg/dsAreaAlcove2Ceiling.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/dsAreaAlcove3Ceiling.txt ${CURRENT_BINARY_DIR} geom/bldg/dsAreaAlcove3Ceiling.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/dsAreaAlcove4Ceiling.txt ${CURRENT_BINARY_DIR} geom/bldg/dsAreaAlcove4Ceiling.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/dsAreaAlcove5Ceiling.txt ${CURRENT_BINARY_DIR} geom/bldg/dsAreaAlcove5Ceiling.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/dsAreaDownstreamCeiling.txt ${CURRENT_BINARY_DIR} geom/bldg/dsAreaDownstreamCeiling.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/dsAreaDownstreamCeilingVslab1.txt ${CURRENT_BINARY_DIR} geom/bldg/dsAreaDownstreamCeilingVslab1.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/dsAreaDownstreamCeilingVslab2.txt ${CURRENT_BINARY_DIR} geom/bldg/dsAreaDownstreamCeilingVslab2.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/dsAreaDownstreamCeilingVslab3.txt ${CURRENT_BINARY_DIR} geom/bldg/dsAreaDownstreamCeilingVslab3.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/dsAreaDownstreamCeilingVslab4.txt ${CURRENT_BINARY_DIR} geom/bldg/dsAreaDownstreamCeilingVslab4.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/dsAreaDownstreamCeilingVslab5.txt ${CURRENT_BINARY_DIR} geom/bldg/dsAreaDownstreamCeilingVslab5.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/dsAreaDownstreamCeilingVslab6.txt ${CURRENT_BINARY_DIR} geom/bldg/dsAreaDownstreamCeilingVslab6.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/dsAreaDownstreamUpstairsFloor.txt ${CURRENT_BINARY_DIR} geom/bldg/dsAreaDownstreamUpstairsFloor.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/dsAreaElevatorCeiling.txt ${CURRENT_BINARY_DIR} geom/bldg/dsAreaElevatorCeiling.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/dsAreaElevatorInteriorLower.txt ${CURRENT_BINARY_DIR} geom/bldg/dsAreaElevatorInteriorLower.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/dsAreaElevatorInterior.txt ${CURRENT_BINARY_DIR} geom/bldg/dsAreaElevatorInterior.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/dsAreaElevatorUpper.txt ${CURRENT_BINARY_DIR} geom/bldg/dsAreaElevatorUpper.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/dsAreaFirstFloorHatchGap.txt ${CURRENT_BINARY_DIR} geom/bldg/dsAreaFirstFloorHatchGap.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/dsAreaFirstFloorS.txt ${CURRENT_BINARY_DIR} geom/bldg/dsAreaFirstFloorS.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/dsAreaHatchBlock.txt ${CURRENT_BINARY_DIR} geom/bldg/dsAreaHatchBlock.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/dsAreaHatchELedge.txt ${CURRENT_BINARY_DIR} geom/bldg/dsAreaHatchELedge.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/dsAreaHatchNEdge.txt ${CURRENT_BINARY_DIR} geom/bldg/dsAreaHatchNEdge.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/dsAreaHatchNLedge.txt ${CURRENT_BINARY_DIR} geom/bldg/dsAreaHatchNLedge.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/dsAreaHatchSEdge.txt ${CURRENT_BINARY_DIR} geom/bldg/dsAreaHatchSEdge.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/dsAreaHatchSLedge.txt ${CURRENT_BINARY_DIR} geom/bldg/dsAreaHatchSLedge.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/dsAreaHatchWLedge.txt ${CURRENT_BINARY_DIR} geom/bldg/dsAreaHatchWLedge.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/dsAreaTrenchCover.txt ${CURRENT_BINARY_DIR} geom/bldg/dsAreaTrenchCover.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/dsAreaTrenchFloor.txt ${CURRENT_BINARY_DIR} geom/bldg/dsAreaTrenchFloor.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/dsArea.txt ${CURRENT_BINARY_DIR} geom/bldg/dsArea.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/dsAreaUpper.txt ${CURRENT_BINARY_DIR} geom/bldg/dsAreaUpper.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/dsAreaUpstreamCeiling.txt ${CURRENT_BINARY_DIR} geom/bldg/dsAreaUpstreamCeiling.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/escapeCeilingE.txt ${CURRENT_BINARY_DIR} geom/bldg/escapeCeilingE.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/escapeCeilingW.txt ${CURRENT_BINARY_DIR} geom/bldg/escapeCeilingW.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/escapeHatchLid.txt ${CURRENT_BINARY_DIR} geom/bldg/escapeHatchLid.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/escapeHatchN.txt ${CURRENT_BINARY_DIR} geom/bldg/escapeHatchN.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/escapeHatchS.txt ${CURRENT_BINARY_DIR} geom/bldg/escapeHatchS.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/escapeStair01.txt ${CURRENT_BINARY_DIR} geom/bldg/escapeStair01.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/escapeStair02.txt ${CURRENT_BINARY_DIR} geom/bldg/escapeStair02.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/escapeStair03.txt ${CURRENT_BINARY_DIR} geom/bldg/escapeStair03.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/escapeStair04.txt ${CURRENT_BINARY_DIR} geom/bldg/escapeStair04.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/escapeStair05.txt ${CURRENT_BINARY_DIR} geom/bldg/escapeStair05.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/escapeStair06.txt ${CURRENT_BINARY_DIR} geom/bldg/escapeStair06.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/escapeStair07.txt ${CURRENT_BINARY_DIR} geom/bldg/escapeStair07.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/escapeStair08.txt ${CURRENT_BINARY_DIR} geom/bldg/escapeStair08.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/escapeStair09.txt ${CURRENT_BINARY_DIR} geom/bldg/escapeStair09.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/escapeStair10.txt ${CURRENT_BINARY_DIR} geom/bldg/escapeStair10.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/escapeStair11.txt ${CURRENT_BINARY_DIR} geom/bldg/escapeStair11.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/escapeStair12.txt ${CURRENT_BINARY_DIR} geom/bldg/escapeStair12.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/escapeStair13.txt ${CURRENT_BINARY_DIR} geom/bldg/escapeStair13.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/escapeStairBrick.txt ${CURRENT_BINARY_DIR} geom/bldg/escapeStairBrick.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/escapeStairFoundation01.txt ${CURRENT_BINARY_DIR} geom/bldg/escapeStairFoundation01.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/escapeStairFoundation02.txt ${CURRENT_BINARY_DIR} geom/bldg/escapeStairFoundation02.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/escapeStairFoundation03.txt ${CURRENT_BINARY_DIR} geom/bldg/escapeStairFoundation03.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/escapeStairFoundation04.txt ${CURRENT_BINARY_DIR} geom/bldg/escapeStairFoundation04.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/escapeStairWallE01.txt ${CURRENT_BINARY_DIR} geom/bldg/escapeStairWallE01.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/escapeStairWallE02.txt ${CURRENT_BINARY_DIR} geom/bldg/escapeStairWallE02.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/escapeStairWallE03.txt ${CURRENT_BINARY_DIR} geom/bldg/escapeStairWallE03.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/escapeStairWallE04.txt ${CURRENT_BINARY_DIR} geom/bldg/escapeStairWallE04.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/escapeStairWallW01.txt ${CURRENT_BINARY_DIR} geom/bldg/escapeStairWallW01.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/escapeStairWallW02.txt ${CURRENT_BINARY_DIR} geom/bldg/escapeStairWallW02.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/escapeStairWallW03.txt ${CURRENT_BINARY_DIR} geom/bldg/escapeStairWallW03.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/escapeStairWallW04.txt ${CURRENT_BINARY_DIR} geom/bldg/escapeStairWallW04.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/escapeWallE.txt ${CURRENT_BINARY_DIR} geom/bldg/escapeWallE.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/exteriorWallE.txt ${CURRENT_BINARY_DIR} geom/bldg/exteriorWallE.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/exteriorWallN.txt ${CURRENT_BINARY_DIR} geom/bldg/exteriorWallN.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/exteriorWallN_v02.txt ${CURRENT_BINARY_DIR} geom/bldg/exteriorWallN_v02.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/exteriorWallS.txt ${CURRENT_BINARY_DIR} geom/bldg/exteriorWallS.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/extMonBitN.txt ${CURRENT_BINARY_DIR} geom/bldg/extMonBitN.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/extMonBitS.txt ${CURRENT_BINARY_DIR} geom/bldg/extMonBitS.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/extMonCeiling.txt ${CURRENT_BINARY_DIR} geom/bldg/extMonCeiling.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/extMonCeiling_v02.txt ${CURRENT_BINARY_DIR} geom/bldg/extMonCeiling_v02.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/extMonExteriorWall.txt ${CURRENT_BINARY_DIR} geom/bldg/extMonExteriorWall.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/extMonExteriorWall_v02.txt ${CURRENT_BINARY_DIR} geom/bldg/extMonExteriorWall_v02.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/extMonUpper.txt ${CURRENT_BINARY_DIR} geom/bldg/extMonUpper.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/extMonUpper_v02.txt ${CURRENT_BINARY_DIR} geom/bldg/extMonUpper_v02.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/firstFloorWallExtension.txt ${CURRENT_BINARY_DIR} geom/bldg/firstFloorWallExtension.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/firstFloorWall.txt ${CURRENT_BINARY_DIR} geom/bldg/firstFloorWall.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/firstFloorWall_v02.txt ${CURRENT_BINARY_DIR} geom/bldg/firstFloorWall_v02.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/floorN.txt ${CURRENT_BINARY_DIR} geom/bldg/floorN.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/floorN_v02.txt ${CURRENT_BINARY_DIR} geom/bldg/floorN_v02.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/floorPassage.txt ${CURRENT_BINARY_DIR} geom/bldg/floorPassage.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/floorRemote.txt ${CURRENT_BINARY_DIR} geom/bldg/floorRemote.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/floorRemote_v02.txt ${CURRENT_BINARY_DIR} geom/bldg/floorRemote_v02.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/floorSd.txt ${CURRENT_BINARY_DIR} geom/bldg/floorSd.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/floorSd_v02.txt ${CURRENT_BINARY_DIR} geom/bldg/floorSd_v02.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/floorSu.txt ${CURRENT_BINARY_DIR} geom/bldg/floorSu.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/foundationExtMonPSarea10.txt ${CURRENT_BINARY_DIR} geom/bldg/foundationExtMonPSarea10.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/foundationExtMonPSarea11.txt ${CURRENT_BINARY_DIR} geom/bldg/foundationExtMonPSarea11.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/foundationExtMonPSarea1.txt ${CURRENT_BINARY_DIR} geom/bldg/foundationExtMonPSarea1.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/foundationExtMonPSarea2.txt ${CURRENT_BINARY_DIR} geom/bldg/foundationExtMonPSarea2.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/foundationExtMonPSarea3.txt ${CURRENT_BINARY_DIR} geom/bldg/foundationExtMonPSarea3.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/foundationExtMonPSarea4.txt ${CURRENT_BINARY_DIR} geom/bldg/foundationExtMonPSarea4.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/foundationExtMonPSarea5.txt ${CURRENT_BINARY_DIR} geom/bldg/foundationExtMonPSarea5.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/foundationExtMonPSarea6.txt ${CURRENT_BINARY_DIR} geom/bldg/foundationExtMonPSarea6.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/foundationExtMonPSarea7.txt ${CURRENT_BINARY_DIR} geom/bldg/foundationExtMonPSarea7.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/foundationExtMonPSarea8.txt ${CURRENT_BINARY_DIR} geom/bldg/foundationExtMonPSarea8.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/foundationExtMonPSarea9.txt ${CURRENT_BINARY_DIR} geom/bldg/foundationExtMonPSarea9.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/foundationExtMonPSarea.txt ${CURRENT_BINARY_DIR} geom/bldg/foundationExtMonPSarea.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/foundationExtMon.txt ${CURRENT_BINARY_DIR} geom/bldg/foundationExtMon.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/foundationExtMon_v02.txt ${CURRENT_BINARY_DIR} geom/bldg/foundationExtMon_v02.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/foundationN.txt ${CURRENT_BINARY_DIR} geom/bldg/foundationN.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/foundationN_v02.txt ${CURRENT_BINARY_DIR} geom/bldg/foundationN_v02.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/foundationSd.txt ${CURRENT_BINARY_DIR} geom/bldg/foundationSd.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/foundationSmid.txt ${CURRENT_BINARY_DIR} geom/bldg/foundationSmid.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/foundationSu.txt ${CURRENT_BINARY_DIR} geom/bldg/foundationSu.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/islandN.txt ${CURRENT_BINARY_DIR} geom/bldg/islandN.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/islandNUpper.txt ${CURRENT_BINARY_DIR} geom/bldg/islandNUpper.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/islandNUpper_v02.txt ${CURRENT_BINARY_DIR} geom/bldg/islandNUpper_v02.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/islandS.txt ${CURRENT_BINARY_DIR} geom/bldg/islandS.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/islandSUpper.txt ${CURRENT_BINARY_DIR} geom/bldg/islandSUpper.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/NRetainingWallAboveRH.txt ${CURRENT_BINARY_DIR} geom/bldg/NRetainingWallAboveRH.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/NRetainingWallExtensionFoot1.txt ${CURRENT_BINARY_DIR} geom/bldg/NRetainingWallExtensionFoot1.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/NRetainingWallWExtension.txt ${CURRENT_BINARY_DIR} geom/bldg/NRetainingWallWExtension.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/NRetainingWallWExtension_v02.txt ${CURRENT_BINARY_DIR} geom/bldg/NRetainingWallWExtension_v02.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/passageCeiling.txt ${CURRENT_BINARY_DIR} geom/bldg/passageCeiling.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/passageE.txt ${CURRENT_BINARY_DIR} geom/bldg/passageE.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/passageW.txt ${CURRENT_BINARY_DIR} geom/bldg/passageW.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/psAreaCeilingE.txt ${CURRENT_BINARY_DIR} geom/bldg/psAreaCeilingE.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/psAreaCeilingN.txt ${CURRENT_BINARY_DIR} geom/bldg/psAreaCeilingN.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/psAreaCeilingSW.txt ${CURRENT_BINARY_DIR} geom/bldg/psAreaCeilingSW.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/psAreaCeiling.txt ${CURRENT_BINARY_DIR} geom/bldg/psAreaCeiling.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/psAreaCeiling_v02.txt ${CURRENT_BINARY_DIR} geom/bldg/psAreaCeiling_v02.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/psAreaCeiling_v03.txt ${CURRENT_BINARY_DIR} geom/bldg/psAreaCeiling_v03.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/psAreaCF1.txt ${CURRENT_BINARY_DIR} geom/bldg/psAreaCF1.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/psAreaCF1_v02.txt ${CURRENT_BINARY_DIR} geom/bldg/psAreaCF1_v02.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/psAreaCF2.txt ${CURRENT_BINARY_DIR} geom/bldg/psAreaCF2.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/psAreaCF2_v02.txt ${CURRENT_BINARY_DIR} geom/bldg/psAreaCF2_v02.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/psAreaCF3.txt ${CURRENT_BINARY_DIR} geom/bldg/psAreaCF3.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/psAreaCF4.txt ${CURRENT_BINARY_DIR} geom/bldg/psAreaCF4.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/psAreaHatchBlock.txt ${CURRENT_BINARY_DIR} geom/bldg/psAreaHatchBlock.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/psAreaHatchBlock_v02.txt ${CURRENT_BINARY_DIR} geom/bldg/psAreaHatchBlock_v02.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/psAreaHatchBlock_v03.txt ${CURRENT_BINARY_DIR} geom/bldg/psAreaHatchBlock_v03.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/psAreaHatchLid.txt ${CURRENT_BINARY_DIR} geom/bldg/psAreaHatchLid.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/psAreaHatchLid_v02.txt ${CURRENT_BINARY_DIR} geom/bldg/psAreaHatchLid_v02.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/psAreaHatchLipN.txt ${CURRENT_BINARY_DIR} geom/bldg/psAreaHatchLipN.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/psAreaHatchLipS.txt ${CURRENT_BINARY_DIR} geom/bldg/psAreaHatchLipS.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/psAreaHatchLower.txt ${CURRENT_BINARY_DIR} geom/bldg/psAreaHatchLower.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/psAreaHatchUpper.txt ${CURRENT_BINARY_DIR} geom/bldg/psAreaHatchUpper.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/psAreaRemoteHandlingWall.txt ${CURRENT_BINARY_DIR} geom/bldg/psAreaRemoteHandlingWall.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/psAreaShieldingBlock.txt ${CURRENT_BINARY_DIR} geom/bldg/psAreaShieldingBlock.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/psAreaShieldingBlock_v02.txt ${CURRENT_BINARY_DIR} geom/bldg/psAreaShieldingBlock_v02.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/psArea.txt ${CURRENT_BINARY_DIR} geom/bldg/psArea.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/psAreaUpper2N.txt ${CURRENT_BINARY_DIR} geom/bldg/psAreaUpper2N.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/psAreaUpperNotch.txt ${CURRENT_BINARY_DIR} geom/bldg/psAreaUpperNotch.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/psAreaUpperN.txt ${CURRENT_BINARY_DIR} geom/bldg/psAreaUpperN.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/psAreaUpperN_v02.txt ${CURRENT_BINARY_DIR} geom/bldg/psAreaUpperN_v02.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/psAreaUpperS.txt ${CURRENT_BINARY_DIR} geom/bldg/psAreaUpperS.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/psAreaUpperS_v02.txt ${CURRENT_BINARY_DIR} geom/bldg/psAreaUpperS_v02.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/psArea_v02.txt ${CURRENT_BINARY_DIR} geom/bldg/psArea_v02.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/psWallUpper.txt ${CURRENT_BINARY_DIR} geom/bldg/psWallUpper.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/psWallUpper_v02.txt ${CURRENT_BINARY_DIR} geom/bldg/psWallUpper_v02.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/radiationSlab1.txt ${CURRENT_BINARY_DIR} geom/bldg/radiationSlab1.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/radiationSlab1_v02.txt ${CURRENT_BINARY_DIR} geom/bldg/radiationSlab1_v02.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/radiationSlab2.txt ${CURRENT_BINARY_DIR} geom/bldg/radiationSlab2.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/radiationSlab2_v02.txt ${CURRENT_BINARY_DIR} geom/bldg/radiationSlab2_v02.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/radiationSlab3.txt ${CURRENT_BINARY_DIR} geom/bldg/radiationSlab3.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/radiationSlab3_v02.txt ${CURRENT_BINARY_DIR} geom/bldg/radiationSlab3_v02.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/radiationSlab4.txt ${CURRENT_BINARY_DIR} geom/bldg/radiationSlab4.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/radiationSlabNE1.txt ${CURRENT_BINARY_DIR} geom/bldg/radiationSlabNE1.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/radiationSlabNE2.txt ${CURRENT_BINARY_DIR} geom/bldg/radiationSlabNE2.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/radiationSlabNE3.txt ${CURRENT_BINARY_DIR} geom/bldg/radiationSlabNE3.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/radiationSlabNE4.txt ${CURRENT_BINARY_DIR} geom/bldg/radiationSlabNE4.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/radiationSlabNE5.txt ${CURRENT_BINARY_DIR} geom/bldg/radiationSlabNE5.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/remoteHandlingCeilingSliver.txt ${CURRENT_BINARY_DIR} geom/bldg/remoteHandlingCeilingSliver.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/remoteHandlingCeilingSliver_v02.txt ${CURRENT_BINARY_DIR} geom/bldg/remoteHandlingCeilingSliver_v02.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/remoteHandlingCeilingStrip.txt ${CURRENT_BINARY_DIR} geom/bldg/remoteHandlingCeilingStrip.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/remoteHandlingCeiling.txt ${CURRENT_BINARY_DIR} geom/bldg/remoteHandlingCeiling.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/remoteHandlingCeiling_v02.txt ${CURRENT_BINARY_DIR} geom/bldg/remoteHandlingCeiling_v02.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/remoteHandlingCeiling_v03.txt ${CURRENT_BINARY_DIR} geom/bldg/remoteHandlingCeiling_v03.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/remoteHandlingDoorFrame.txt ${CURRENT_BINARY_DIR} geom/bldg/remoteHandlingDoorFrame.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/remoteHandlingHatchBlock.txt ${CURRENT_BINARY_DIR} geom/bldg/remoteHandlingHatchBlock.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/remoteHandlingHatchBlock_v02.txt ${CURRENT_BINARY_DIR} geom/bldg/remoteHandlingHatchBlock_v02.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/remoteHandlingHatchLid.txt ${CURRENT_BINARY_DIR} geom/bldg/remoteHandlingHatchLid.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/remoteHandlingHatchLid_v02.txt ${CURRENT_BINARY_DIR} geom/bldg/remoteHandlingHatchLid_v02.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/remoteHandlingHatchLower.txt ${CURRENT_BINARY_DIR} geom/bldg/remoteHandlingHatchLower.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/remoteHandlingHatchUpper.txt ${CURRENT_BINARY_DIR} geom/bldg/remoteHandlingHatchUpper.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/remoteHandlingInteriorBeam.txt ${CURRENT_BINARY_DIR} geom/bldg/remoteHandlingInteriorBeam.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/remoteHandlingInteriorWall1.txt ${CURRENT_BINARY_DIR} geom/bldg/remoteHandlingInteriorWall1.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/remoteHandlingInteriorWall2.txt ${CURRENT_BINARY_DIR} geom/bldg/remoteHandlingInteriorWall2.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/remoteHandlingInteriorWall3.txt ${CURRENT_BINARY_DIR} geom/bldg/remoteHandlingInteriorWall3.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/remoteHandlingInteriorWall4.txt ${CURRENT_BINARY_DIR} geom/bldg/remoteHandlingInteriorWall4.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/remoteHandlingInteriorWall5.txt ${CURRENT_BINARY_DIR} geom/bldg/remoteHandlingInteriorWall5.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/remoteHandlingInteriorWall6.txt ${CURRENT_BINARY_DIR} geom/bldg/remoteHandlingInteriorWall6.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/remoteHandlingInteriorWall7.txt ${CURRENT_BINARY_DIR} geom/bldg/remoteHandlingInteriorWall7.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/remoteHandlingInteriorWallNotch1.txt ${CURRENT_BINARY_DIR} geom/bldg/remoteHandlingInteriorWallNotch1.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/remoteHandlingInteriorWallNotch2.txt ${CURRENT_BINARY_DIR} geom/bldg/remoteHandlingInteriorWallNotch2.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/remoteHandlingSteelDoor1.txt ${CURRENT_BINARY_DIR} geom/bldg/remoteHandlingSteelDoor1.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/remoteHandlingSteelDoor2.txt ${CURRENT_BINARY_DIR} geom/bldg/remoteHandlingSteelDoor2.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/remoteHandling.txt ${CURRENT_BINARY_DIR} geom/bldg/remoteHandling.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/remoteHandling_v02.txt ${CURRENT_BINARY_DIR} geom/bldg/remoteHandling_v02.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/SRetainingWallFoot.txt ${CURRENT_BINARY_DIR} geom/bldg/SRetainingWallFoot.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/SRetainingWall.txt ${CURRENT_BINARY_DIR} geom/bldg/SRetainingWall.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/tempDirtBackfillPsAreaBaselevel.txt ${CURRENT_BINARY_DIR} geom/bldg/tempDirtBackfillPsAreaBaselevel.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/tempDirtBackfillPsAreaInter.txt ${CURRENT_BINARY_DIR} geom/bldg/tempDirtBackfillPsAreaInter.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/tempDirtBackfillPsAreaLower.txt ${CURRENT_BINARY_DIR} geom/bldg/tempDirtBackfillPsAreaLower.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/tempDirtBackfillPsAreaRWallFootLevel.txt ${CURRENT_BINARY_DIR} geom/bldg/tempDirtBackfillPsAreaRWallFootLevel.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/tempDirtBackfillPsAreaTopLayer.txt ${CURRENT_BINARY_DIR} geom/bldg/tempDirtBackfillPsAreaTopLayer.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/tsAreaAlcoveLowerRoof.txt ${CURRENT_BINARY_DIR} geom/bldg/tsAreaAlcoveLowerRoof.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/tsAreaAlcoveVerticalN.txt ${CURRENT_BINARY_DIR} geom/bldg/tsAreaAlcoveVerticalN.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/tsAreaAlcoveVerticalS.txt ${CURRENT_BINARY_DIR} geom/bldg/tsAreaAlcoveVerticalS.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/tsAreaHatchBlockNBot.txt ${CURRENT_BINARY_DIR} geom/bldg/tsAreaHatchBlockNBot.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/tsAreaHatchBlockNTop.txt ${CURRENT_BINARY_DIR} geom/bldg/tsAreaHatchBlockNTop.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/tsAreaHatchBlockSBot.txt ${CURRENT_BINARY_DIR} geom/bldg/tsAreaHatchBlockSBot.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/tsAreaHatchBlockSTop.txt ${CURRENT_BINARY_DIR} geom/bldg/tsAreaHatchBlockSTop.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/tsAreaHatchELedge.txt ${CURRENT_BINARY_DIR} geom/bldg/tsAreaHatchELedge.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/tsAreaHatchWEdge.txt ${CURRENT_BINARY_DIR} geom/bldg/tsAreaHatchWEdge.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/tsAreaHatchWLedge.txt ${CURRENT_BINARY_DIR} geom/bldg/tsAreaHatchWLedge.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/tsAreaStairwellCeiling.txt ${CURRENT_BINARY_DIR} geom/bldg/tsAreaStairwellCeiling.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/tsAreaStairwell.txt ${CURRENT_BINARY_DIR} geom/bldg/tsAreaStairwell.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/tsAreaTrenchFloor.txt ${CURRENT_BINARY_DIR} geom/bldg/tsAreaTrenchFloor.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/tsAreaUpper2W.txt ${CURRENT_BINARY_DIR} geom/bldg/tsAreaUpper2W.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/tsAreaUpper2W_v02.txt ${CURRENT_BINARY_DIR} geom/bldg/tsAreaUpper2W_v02.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/tsAreaUpperW.txt ${CURRENT_BINARY_DIR} geom/bldg/tsAreaUpperW.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/tsAreaW.txt ${CURRENT_BINARY_DIR} geom/bldg/tsAreaW.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/tsDsAreaFirstFloorEdgeN.txt ${CURRENT_BINARY_DIR} geom/bldg/tsDsAreaFirstFloorEdgeN.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/tsDsAreaFirstFloorEdgeN_v02.txt ${CURRENT_BINARY_DIR} geom/bldg/tsDsAreaFirstFloorEdgeN_v02.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/tsDsAreaWallinsertN.txt ${CURRENT_BINARY_DIR} geom/bldg/tsDsAreaWallinsertN.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/tsDsAreaWallinsertN_v02.txt ${CURRENT_BINARY_DIR} geom/bldg/tsDsAreaWallinsertN_v02.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/WTSareaCF1notch.txt ${CURRENT_BINARY_DIR} geom/bldg/WTSareaCF1notch.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/WTSareaCF1.txt ${CURRENT_BINARY_DIR} geom/bldg/WTSareaCF1.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/WTSareaCF2notch.txt ${CURRENT_BINARY_DIR} geom/bldg/WTSareaCF2notch.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/WTSareaCF2.txt ${CURRENT_BINARY_DIR} geom/bldg/WTSareaCF2.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/bldg/WTSareaCFbeam.txt ${CURRENT_BINARY_DIR} geom/bldg/WTSareaCFbeam.txt COPYONLY) - - - -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/calorimeter_BaF2.txt ${CURRENT_BINARY_DIR} geom/calorimeter_BaF2.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/calorimeter_CsI.txt ${CURRENT_BINARY_DIR} geom/calorimeter_CsI.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/crv_counters_extracted_v01.txt ${CURRENT_BINARY_DIR} geom/crv_counters_extracted_v01.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/crv_counters.txt ${CURRENT_BINARY_DIR} geom/crv_counters.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/crv_counters_v02.txt ${CURRENT_BINARY_DIR} geom/crv_counters_v02.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/crv_counters_v03_split_top.txt ${CURRENT_BINARY_DIR} geom/crv_counters_v03_split_top.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/crv_counters_v03.txt ${CURRENT_BINARY_DIR} geom/crv_counters_v03.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/crv_counters_v07.txt ${CURRENT_BINARY_DIR} geom/crv_counters_v07.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/crv_counters_v08.txt ${CURRENT_BINARY_DIR} geom/crv_counters_v08.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/crv_counters_v09.txt ${CURRENT_BINARY_DIR} geom/crv_counters_v09.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/degrader_v01.txt ${CURRENT_BINARY_DIR} geom/degrader_v01.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/degrader_v02.txt ${CURRENT_BINARY_DIR} geom/degrader_v02.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/DetectorSolenoid_v02.txt ${CURRENT_BINARY_DIR} geom/DetectorSolenoid_v02.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/DetectorSolenoid_v03.txt ${CURRENT_BINARY_DIR} geom/DetectorSolenoid_v03.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/DetectorSolenoid_v04.txt ${CURRENT_BINARY_DIR} geom/DetectorSolenoid_v04.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/DetectorSolenoid_v05.txt ${CURRENT_BINARY_DIR} geom/DetectorSolenoid_v05.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/DSShielding_STM.txt ${CURRENT_BINARY_DIR} geom/DSShielding_STM.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/DSShielding_v01.txt ${CURRENT_BINARY_DIR} geom/DSShielding_v01.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/DSShielding_v02.txt ${CURRENT_BINARY_DIR} geom/DSShielding_v02.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/DSShielding_v03.txt ${CURRENT_BINARY_DIR} geom/DSShielding_v03.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/ElectronicRack_v01.txt ${CURRENT_BINARY_DIR} geom/ElectronicRack_v01.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/ElectronicRack_v02.txt ${CURRENT_BINARY_DIR} geom/ElectronicRack_v02.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/extmon_fnal_v02.txt ${CURRENT_BINARY_DIR} geom/extmon_fnal_v02.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/ExtShieldDownstream_cd3.txt ${CURRENT_BINARY_DIR} geom/ExtShieldDownstream_cd3.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/ExtShieldDownstream_NoShields.txt ${CURRENT_BINARY_DIR} geom/ExtShieldDownstream_NoShields.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/ExtShieldDownstream_v01.txt ${CURRENT_BINARY_DIR} geom/ExtShieldDownstream_v01.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/ExtShieldDownstream_v02.txt ${CURRENT_BINARY_DIR} geom/ExtShieldDownstream_v02.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/ExtShieldDownstream_v03.txt ${CURRENT_BINARY_DIR} geom/ExtShieldDownstream_v03.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/ExtShieldDownstream_v04.txt ${CURRENT_BINARY_DIR} geom/ExtShieldDownstream_v04.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/ExtShieldDownstream_v05.txt ${CURRENT_BINARY_DIR} geom/ExtShieldDownstream_v05.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/ExtShieldDownstream_v06.txt ${CURRENT_BINARY_DIR} geom/ExtShieldDownstream_v06.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/ExtShieldUpstream_cd3.txt ${CURRENT_BINARY_DIR} geom/ExtShieldUpstream_cd3.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/ExtShieldUpstream_NoShields.txt ${CURRENT_BINARY_DIR} geom/ExtShieldUpstream_NoShields.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/ExtShieldUpstream_v01.txt ${CURRENT_BINARY_DIR} geom/ExtShieldUpstream_v01.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/ExtShieldUpstream_v02.txt ${CURRENT_BINARY_DIR} geom/ExtShieldUpstream_v02.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/ExtShieldUpstream_v03.txt ${CURRENT_BINARY_DIR} geom/ExtShieldUpstream_v03.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/ExtShieldUpstream_v04.txt ${CURRENT_BINARY_DIR} geom/ExtShieldUpstream_v04.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/ExtShieldUpstream_v05.txt ${CURRENT_BINARY_DIR} geom/ExtShieldUpstream_v05.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/ExtShieldUpstream_v06.txt ${CURRENT_BINARY_DIR} geom/ExtShieldUpstream_v06.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/g4_visOptions.txt ${CURRENT_BINARY_DIR} geom/g4_visOptions.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/geom_2019_PhaseI_hayman_v2.txt ${CURRENT_BINARY_DIR} geom/geom_2019_PhaseI_hayman_v2.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/geom_2019_PhaseII.txt ${CURRENT_BINARY_DIR} geom/geom_2019_PhaseII.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/geom_2019_PhaseI.txt ${CURRENT_BINARY_DIR} geom/geom_2019_PhaseI.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/geom_2021_PhaseI.txt ${CURRENT_BINARY_DIR} geom/geom_2021_PhaseI.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/geom_2021_PhaseI_v02.txt ${CURRENT_BINARY_DIR} geom/geom_2021_PhaseI_v02.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/geom_2021_PhaseI_v03.txt ${CURRENT_BINARY_DIR} geom/geom_2021_PhaseI_v03.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/geom_common_cd3_s3p2.txt ${CURRENT_BINARY_DIR} geom/geom_common_cd3_s3p2.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/geom_common_cd3_s4p2_backgroundSim.txt ${CURRENT_BINARY_DIR} geom/geom_common_cd3_s4p2_backgroundSim.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/geom_common_cd3_s4p2.txt ${CURRENT_BINARY_DIR} geom/geom_common_cd3_s4p2.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/geom_common_crv_v07.txt ${CURRENT_BINARY_DIR} geom/geom_common_crv_v07.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/geom_common_current_ExtendedDiffusionPump.txt ${CURRENT_BINARY_DIR} geom/geom_common_current_ExtendedDiffusionPump.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/geom_common_current.txt ${CURRENT_BINARY_DIR} geom/geom_common_current.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/geom_common_DOE_review_2017.txt ${CURRENT_BINARY_DIR} geom/geom_common_DOE_review_2017.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/geom_common_extracted.txt ${CURRENT_BINARY_DIR} geom/geom_common_extracted.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/geom_common_haymanLowerDensity.txt ${CURRENT_BINARY_DIR} geom/geom_common_haymanLowerDensity.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/geom_common_hayman_v2_TS06.txt ${CURRENT_BINARY_DIR} geom/geom_common_hayman_v2_TS06.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/geom_common_hayman_v2.txt ${CURRENT_BINARY_DIR} geom/geom_common_hayman_v2.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/geom_common_MARSrunMay17.txt ${CURRENT_BINARY_DIR} geom/geom_common_MARSrunMay17.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/geom_common_muplus.txt ${CURRENT_BINARY_DIR} geom/geom_common_muplus.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/geom_common_newTargPS.txt ${CURRENT_BINARY_DIR} geom/geom_common_newTargPS.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/geom_common_newTargPS_v3.txt ${CURRENT_BINARY_DIR} geom/geom_common_newTargPS_v3.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/geom_common_TrackerShldStdyJun17.txt ${CURRENT_BINARY_DIR} geom/geom_common_TrackerShldStdyJun17.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/geom_common_trackerVST.txt ${CURRENT_BINARY_DIR} geom/geom_common_trackerVST.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/geom_common.txt ${CURRENT_BINARY_DIR} geom/geom_common.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/geom_CRY_Summer2020.txt ${CURRENT_BINARY_DIR} geom/geom_CRY_Summer2020.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/geom_MARS_2019.txt ${CURRENT_BINARY_DIR} geom/geom_MARS_2019.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/geom_SurfaceCheck_Select.txt ${CURRENT_BINARY_DIR} geom/geom_SurfaceCheck_Select.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/geom_SurfaceCheck.txt ${CURRENT_BINARY_DIR} geom/geom_SurfaceCheck.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/geom_Wideband_1CrvModule.txt ${CURRENT_BINARY_DIR} geom/geom_Wideband_1CrvModule.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/MSTM_v01.txt ${CURRENT_BINARY_DIR} geom/MSTM_v01.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/mu2eBuilding.txt ${CURRENT_BINARY_DIR} geom/mu2eBuilding.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/mu2eHall.txt ${CURRENT_BINARY_DIR} geom/mu2eHall.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/mu2eHall_v02.txt ${CURRENT_BINARY_DIR} geom/mu2eHall_v02.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/mu2eHall_v03.txt ${CURRENT_BINARY_DIR} geom/mu2eHall_v03.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/mu2eHall_v04.txt ${CURRENT_BINARY_DIR} geom/mu2eHall_v04.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/mu2eWorld.txt ${CURRENT_BINARY_DIR} geom/mu2eWorld.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/muonBeamStop.txt ${CURRENT_BINARY_DIR} geom/muonBeamStop.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/muonBeamStop_v02.txt ${CURRENT_BINARY_DIR} geom/muonBeamStop_v02.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/muonBeamStop_v03.txt ${CURRENT_BINARY_DIR} geom/muonBeamStop_v03.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/muonBeamStop_v04.txt ${CURRENT_BINARY_DIR} geom/muonBeamStop_v04.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/muonBeamStop_v05.txt ${CURRENT_BINARY_DIR} geom/muonBeamStop_v05.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/muonBeamStop_v06.txt ${CURRENT_BINARY_DIR} geom/muonBeamStop_v06.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/muonBeamStop_v07.txt ${CURRENT_BINARY_DIR} geom/muonBeamStop_v07.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/muonBeamStop_v08.txt ${CURRENT_BINARY_DIR} geom/muonBeamStop_v08.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/pionDegrader.txt ${CURRENT_BINARY_DIR} geom/pionDegrader.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/Pipe_v01.txt ${CURRENT_BINARY_DIR} geom/Pipe_v01.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/Pipe_v02.txt ${CURRENT_BINARY_DIR} geom/Pipe_v02.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/Pipe_v03.txt ${CURRENT_BINARY_DIR} geom/Pipe_v03.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/Pipe_v04.txt ${CURRENT_BINARY_DIR} geom/Pipe_v04.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/ProductionSolenoid_v01.txt ${CURRENT_BINARY_DIR} geom/ProductionSolenoid_v01.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/ProductionSolenoid_v02.txt ${CURRENT_BINARY_DIR} geom/ProductionSolenoid_v02.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/ProductionTarget_HaymanLowerDensity.txt ${CURRENT_BINARY_DIR} geom/ProductionTarget_HaymanLowerDensity.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/ProductionTarget_Hayman_v2_0.txt ${CURRENT_BINARY_DIR} geom/ProductionTarget_Hayman_v2_0.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/ProductionTarget_Hayman_v2_1.txt ${CURRENT_BINARY_DIR} geom/ProductionTarget_Hayman_v2_1.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/ProductionTarget_Hayman_v2.txt ${CURRENT_BINARY_DIR} geom/ProductionTarget_Hayman_v2.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/ProductionTargetInPS.txt ${CURRENT_BINARY_DIR} geom/ProductionTargetInPS.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/protonAbsorber_conical_v2.txt ${CURRENT_BINARY_DIR} geom/protonAbsorber_conical_v2.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/protonAbsorber_cylindrical.txt ${CURRENT_BINARY_DIR} geom/protonAbsorber_cylindrical.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/protonAbsorber_cylindrical_v02.txt ${CURRENT_BINARY_DIR} geom/protonAbsorber_cylindrical_v02.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/protonAbsorber_cylindrical_v03.txt ${CURRENT_BINARY_DIR} geom/protonAbsorber_cylindrical_v03.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/protonAbsorber_cylindrical_v04.txt ${CURRENT_BINARY_DIR} geom/protonAbsorber_cylindrical_v04.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/protonBeamDump_v02.txt ${CURRENT_BINARY_DIR} geom/protonBeamDump_v02.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/protonBeamDump_v03.txt ${CURRENT_BINARY_DIR} geom/protonBeamDump_v03.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/psEnclosure_v01.txt ${CURRENT_BINARY_DIR} geom/psEnclosure_v01.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/psEnclosure_v03.txt ${CURRENT_BINARY_DIR} geom/psEnclosure_v03.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/psEnclosure_v04.txt ${CURRENT_BINARY_DIR} geom/psEnclosure_v04.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/psEnclosure_v05.txt ${CURRENT_BINARY_DIR} geom/psEnclosure_v05.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/PSExternalShielding_v01.txt ${CURRENT_BINARY_DIR} geom/PSExternalShielding_v01.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/PSShield_v05.txt ${CURRENT_BINARY_DIR} geom/PSShield_v05.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/PSShield_v06.txt ${CURRENT_BINARY_DIR} geom/PSShield_v06.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/PTM.txt ${CURRENT_BINARY_DIR} geom/PTM.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/PTM_v02.txt ${CURRENT_BINARY_DIR} geom/PTM_v02.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/RotatedColl3.txt ${CURRENT_BINARY_DIR} geom/RotatedColl3.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/Saddle_cd3a.txt ${CURRENT_BINARY_DIR} geom/Saddle_cd3a.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/Saddle_cd3.txt ${CURRENT_BINARY_DIR} geom/Saddle_cd3.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/Saddle_v01.txt ${CURRENT_BINARY_DIR} geom/Saddle_v01.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/Saddle_v02.txt ${CURRENT_BINARY_DIR} geom/Saddle_v02.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/Saddle_v03.txt ${CURRENT_BINARY_DIR} geom/Saddle_v03.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/STM_v01.txt ${CURRENT_BINARY_DIR} geom/STM_v01.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/STM_v02.txt ${CURRENT_BINARY_DIR} geom/STM_v02.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/STM_v03.txt ${CURRENT_BINARY_DIR} geom/STM_v03.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/STM_v04.txt ${CURRENT_BINARY_DIR} geom/STM_v04.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/STM_v05.txt ${CURRENT_BINARY_DIR} geom/STM_v05.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/STM_v06.txt ${CURRENT_BINARY_DIR} geom/STM_v06.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/STM_v07.txt ${CURRENT_BINARY_DIR} geom/STM_v07.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/STM_v08.txt ${CURRENT_BINARY_DIR} geom/STM_v08.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/stoppingTarget_CD3C_34foils.txt ${CURRENT_BINARY_DIR} geom/stoppingTarget_CD3C_34foils.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/stoppingTargetHoles_DOE_review_2017.txt ${CURRENT_BINARY_DIR} geom/stoppingTargetHoles_DOE_review_2017.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/stoppingTargetHoles_v02.txt ${CURRENT_BINARY_DIR} geom/stoppingTargetHoles_v02.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/stoppingTarget_TDR.txt ${CURRENT_BINARY_DIR} geom/stoppingTarget_TDR.txt COPYONLY) - -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/studies/crv_counters_v03_no_CRV_D4.txt ${CURRENT_BINARY_DIR} geom/studies/crv_counters_v03_no_CRV_D4.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/studies/crv_counters_v05.txt ${CURRENT_BINARY_DIR} geom/studies/crv_counters_v05.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/studies/crv_counters_v06.txt ${CURRENT_BINARY_DIR} geom/studies/crv_counters_v06.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/studies/geom_cosmic_v05.txt ${CURRENT_BINARY_DIR} geom/studies/geom_cosmic_v05.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/studies/stoppingTarget_hole-r-18mm_two-extra-disks_forBkgFrames.txt ${CURRENT_BINARY_DIR} geom/studies/stoppingTarget_hole-r-18mm_two-extra-disks_forBkgFrames.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/studies/stoppingTarget_hole-r-18mm_two-extra-disks.txt ${CURRENT_BINARY_DIR} geom/studies/stoppingTarget_hole-r-18mm_two-extra-disks.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/studies/stoppingTarget_hole-r-20mm_forBkgFrames.txt ${CURRENT_BINARY_DIR} geom/studies/stoppingTarget_hole-r-20mm_forBkgFrames.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/studies/stoppingTarget_hole-r-20mm_offset-x--5mm.txt ${CURRENT_BINARY_DIR} geom/studies/stoppingTarget_hole-r-20mm_offset-x--5mm.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/studies/stoppingTarget_hole-r-20mm_offset-x-5mm.txt ${CURRENT_BINARY_DIR} geom/studies/stoppingTarget_hole-r-20mm_offset-x-5mm.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/studies/stoppingTarget_hole-r-20mm_offset-y--5mm.txt ${CURRENT_BINARY_DIR} geom/studies/stoppingTarget_hole-r-20mm_offset-y--5mm.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/studies/stoppingTarget_hole-r-20mm_offset-y-5mm.txt ${CURRENT_BINARY_DIR} geom/studies/stoppingTarget_hole-r-20mm_offset-y-5mm.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/studies/stoppingTarget_hole-r-20mm_two-extra-disks.txt ${CURRENT_BINARY_DIR} geom/studies/stoppingTarget_hole-r-20mm_two-extra-disks.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/studies/stoppingTarget_hole-r-20mm.txt ${CURRENT_BINARY_DIR} geom/studies/stoppingTarget_hole-r-20mm.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/studies/stoppingTarget_hole-r-21-5mm_three-extra-disks_forBkgFrames.txt ${CURRENT_BINARY_DIR} geom/studies/stoppingTarget_hole-r-21-5mm_three-extra-disks_forBkgFrames.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/studies/stoppingTarget_hole-r-21-5mm_three-extra-disks.txt ${CURRENT_BINARY_DIR} geom/studies/stoppingTarget_hole-r-21-5mm_three-extra-disks.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/studies/studyCOL3FlashBlock.txt ${CURRENT_BINARY_DIR} geom/studies/studyCOL3FlashBlock.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/studies/studyTrackerShielding.txt ${CURRENT_BINARY_DIR} geom/studies/studyTrackerShielding.txt COPYONLY) - -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/tracker_cd3_s4p2.txt ${CURRENT_BINARY_DIR} geom/tracker_cd3_s4p2.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/tracker_cd3.txt ${CURRENT_BINARY_DIR} geom/tracker_cd3.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/tracker_v0.txt ${CURRENT_BINARY_DIR} geom/tracker_v0.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/tracker_v3.txt ${CURRENT_BINARY_DIR} geom/tracker_v3.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/tracker_v4.txt ${CURRENT_BINARY_DIR} geom/tracker_v4.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/tracker_v5.txt ${CURRENT_BINARY_DIR} geom/tracker_v5.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/tracker_v6.txt ${CURRENT_BINARY_DIR} geom/tracker_v6.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/TransportSolenoid_DOErev2017.txt ${CURRENT_BINARY_DIR} geom/TransportSolenoid_DOErev2017.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/TransportSolenoid_v01.txt ${CURRENT_BINARY_DIR} geom/TransportSolenoid_v01.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/TransportSolenoid_v02.txt ${CURRENT_BINARY_DIR} geom/TransportSolenoid_v02.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/TransportSolenoid_v03.txt ${CURRENT_BINARY_DIR} geom/TransportSolenoid_v03.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/TransportSolenoid_v04.txt ${CURRENT_BINARY_DIR} geom/TransportSolenoid_v04.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/TransportSolenoid_v05.txt ${CURRENT_BINARY_DIR} geom/TransportSolenoid_v05.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/TransportSolenoid_v06.txt ${CURRENT_BINARY_DIR} geom/TransportSolenoid_v06.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/TransportSolenoid_v07.txt ${CURRENT_BINARY_DIR} geom/TransportSolenoid_v07.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/TransportSolenoid_v08.txt ${CURRENT_BINARY_DIR} geom/TransportSolenoid_v08.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/TSdA_v01.txt ${CURRENT_BINARY_DIR} geom/TSdA_v01.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/TSdA_v02.txt ${CURRENT_BINARY_DIR} geom/TSdA_v02.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/geom/visualization_regions.txt ${CURRENT_BINARY_DIR} geom/visualization_regions.txt COPYONLY) - -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/test/beamline_genconfig.txt ${CURRENT_BINARY_DIR} test/beamline_genconfig.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/test/beamline_geom.txt ${CURRENT_BINARY_DIR} test/beamline_geom.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/test/beamline_xz.mac ${CURRENT_BINARY_DIR} test/beamline_xz.mac COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/test/cosmicconfig_01.txt ${CURRENT_BINARY_DIR} test/cosmicconfig_01.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/test/display_03.C ${CURRENT_BINARY_DIR} test/display_03.C COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/test/g4test_03.C ${CURRENT_BINARY_DIR} test/g4test_03.C COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/test/g4test_03g.C ${CURRENT_BINARY_DIR} test/g4test_03g.C COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/test/g4validate_01.C ${CURRENT_BINARY_DIR} test/g4validate_01.C COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/test/genBrem_01.txt ${CURRENT_BINARY_DIR} test/genBrem_01.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/test/genconfig_01.txt ${CURRENT_BINARY_DIR} test/genconfig_01.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/test/genconfig_02.txt ${CURRENT_BINARY_DIR} test/genconfig_02.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/test/genconfig_03.txt ${CURRENT_BINARY_DIR} test/genconfig_03.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/test/genconfig_04.txt ${CURRENT_BINARY_DIR} test/genconfig_04.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/test/genconfig_05.txt ${CURRENT_BINARY_DIR} test/genconfig_05.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/test/genconfig_DownstreameMinus.txt ${CURRENT_BINARY_DIR} test/genconfig_DownstreameMinus.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/test/genconfig_example.txt ${CURRENT_BINARY_DIR} test/genconfig_example.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/test/genconfig_extMonCommon.txt ${CURRENT_BINARY_DIR} test/genconfig_extMonCommon.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/test/genconfig_mucapture.txt ${CURRENT_BINARY_DIR} test/genconfig_mucapture.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/test/geom_01_LowDetailGraphics.txt ${CURRENT_BINARY_DIR} test/geom_01_LowDetailGraphics.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/test/geom_01.txt ${CURRENT_BINARY_DIR} test/geom_01.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/test/geom_cd3.txt ${CURRENT_BINARY_DIR} test/geom_cd3.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/test/geom_cosmic.txt ${CURRENT_BINARY_DIR} test/geom_cosmic.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/test/geom_DifferentTTrackerRadius.txt ${CURRENT_BINARY_DIR} test/geom_DifferentTTrackerRadius.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/test/geom_dsfield.txt ${CURRENT_BINARY_DIR} test/geom_dsfield.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/test/geom_extMonCommon.txt ${CURRENT_BINARY_DIR} test/geom_extMonCommon.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/test/geom_ga03.txt ${CURRENT_BINARY_DIR} test/geom_ga03.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/test/geom_ga04.txt ${CURRENT_BINARY_DIR} test/geom_ga04.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/test/geom_ga05_custom.txt ${CURRENT_BINARY_DIR} test/geom_ga05_custom.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/test/geom_ga05.txt ${CURRENT_BINARY_DIR} test/geom_ga05.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/test/geom_mau10_custom.txt ${CURRENT_BINARY_DIR} test/geom_mau10_custom.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/test/geom_mucapture.txt ${CURRENT_BINARY_DIR} test/geom_mucapture.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/test/geom_tdr.txt ${CURRENT_BINARY_DIR} test/geom_tdr.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/test/geom_writeBF.txt ${CURRENT_BINARY_DIR} test/geom_writeBF.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/test/iontest.fcl ${CURRENT_BINARY_DIR} test/iontest.fcl COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/test/iontest_g4s1.fcl ${CURRENT_BINARY_DIR} test/iontest_g4s1.fcl COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/test/iontest_g4s2.fcl ${CURRENT_BINARY_DIR} test/iontest_g4s2.fcl COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/test/mu2e_gdml.C ${CURRENT_BINARY_DIR} test/mu2e_gdml.C COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/test/multiDIO.txt ${CURRENT_BINARY_DIR} test/multiDIO.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/test/pi_e_nu_genconfig.txt ${CURRENT_BINARY_DIR} test/pi_e_nu_genconfig.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/test/pi_e_nu_geom.txt ${CURRENT_BINARY_DIR} test/pi_e_nu_geom.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/test/protonBeamDump_v01.txt ${CURRENT_BINARY_DIR} test/protonBeamDump_v01.txt COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/test/StepsDiag.C ${CURRENT_BINARY_DIR} test/StepsDiag.C COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/test/sthktfO.C ${CURRENT_BINARY_DIR} test/sthktfO.C COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/test/strawHits.C ${CURRENT_BINARY_DIR} test/strawHits.C COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/test/strawHitsO.C ${CURRENT_BINARY_DIR} test/strawHitsO.C COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/test/visualization_regions.txt ${CURRENT_BINARY_DIR} test/visualization_regions.txt COPYONLY) +cet_build_plugin(GammaConvGenerator art::module + REG_SOURCE src/GammaConvGenerator_module.cc + LIBRARIES REG + Offline::Mu2eG4 + + Offline::DataProducts + Offline::MCDataProducts +) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/vis/vis4530.mac ${CURRENT_BINARY_DIR} vis/vis4530.mac COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/vis/vis45.mac ${CURRENT_BINARY_DIR} vis/vis45.mac COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/vis/vismqt.mac ${CURRENT_BINARY_DIR} vis/vismqt.mac COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/vis/vismqtm.mac ${CURRENT_BINARY_DIR} vis/vismqtm.mac COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/vis/visqtGUI.mac ${CURRENT_BINARY_DIR} vis/visqtGUI.mac COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/vis/visTree.mac ${CURRENT_BINARY_DIR} vis/visTree.mac COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/vis/visxy.mac ${CURRENT_BINARY_DIR} vis/visxy.mac COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/vis/visxz.mac ${CURRENT_BINARY_DIR} vis/visxz.mac COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/vis/visyz.mac ${CURRENT_BINARY_DIR} vis/visyz.mac COPYONLY) +install(DIRECTORY g4study DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/Offline/Mu2eG4) +install(DIRECTORY geom DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/Offline/Mu2eG4) +install(DIRECTORY test DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/Offline/Mu2eG4) +install(DIRECTORY vis DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/Offline/Mu2eG4) install_source(SUBDIRS src) install_headers(USE_PROJECT_NAME SUBDIRS inc) diff --git a/Mu2eUtilities/CMakeLists.txt b/Mu2eUtilities/CMakeLists.txt index be586a2285..ccc97e2309 100644 --- a/Mu2eUtilities/CMakeLists.txt +++ b/Mu2eUtilities/CMakeLists.txt @@ -12,6 +12,7 @@ cet_make_library( src/EjectedProtonSpectrum.cc src/EventWeightHelper.cc src/fromStrings.cc + src/GammaPairConversionSpectrum.cc src/GeneratorSummaryHistograms.cc src/HelixTool.cc src/HistTrackSum.cc diff --git a/TrkHitReco/CMakeLists.txt b/TrkHitReco/CMakeLists.txt index 6ff8d3e7e3..f611584458 100644 --- a/TrkHitReco/CMakeLists.txt +++ b/TrkHitReco/CMakeLists.txt @@ -1,5 +1,6 @@ cet_make_library( SOURCE + src/Chi2Clusterer.cc src/CombineStereoPoints.cc src/ComboPeakFitRoot.cc src/PeakFit.cc @@ -89,21 +90,11 @@ cet_build_plugin(StrawHitReco art::module Offline::TrackerGeom ) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/data/BkgMVAPanel.weights.xml ${CURRENT_BINARY_DIR} data/BkgMVAPanel.weights.xml COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/data/BkgMVA.weights.xml ${CURRENT_BINARY_DIR} data/BkgMVA.weights.xml COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/data/TrainBkgDiagPanelSpatial.dat ${CURRENT_BINARY_DIR} data/TrainBkgDiagPanelSpatial.dat COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/data/TrainBkgDiagPlaneSpatial.dat ${CURRENT_BINARY_DIR} data/TrainBkgDiagPlaneSpatial.dat COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/data/TrainBkgDiagStationChi2.dat ${CURRENT_BINARY_DIR} data/TrainBkgDiagStationChi2.dat COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/data/TrainBkgDiagStationSpatial.dat ${CURRENT_BINARY_DIR} data/TrainBkgDiagStationSpatial.dat COPYONLY) - -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/fcl/epilog_FBH_panel.fcl ${CURRENT_BINARY_DIR} fcl/epilog_FBH_panel.fcl COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/fcl/epilog_FBH_plane.fcl ${CURRENT_BINARY_DIR} fcl/epilog_FBH_plane.fcl COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/fcl/epilog_FBH_station.fcl ${CURRENT_BINARY_DIR} fcl/epilog_FBH_station.fcl COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/fcl/epilog_panel.fcl ${CURRENT_BINARY_DIR} fcl/epilog_panel.fcl COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/fcl/epilog_plane.fcl ${CURRENT_BINARY_DIR} fcl/epilog_plane.fcl COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/fcl/epilog_station.fcl ${CURRENT_BINARY_DIR} fcl/epilog_station.fcl COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/fcl/epilog_stereo.fcl ${CURRENT_BINARY_DIR} fcl/epilog_stereo.fcl COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/fcl/prolog.fcl ${CURRENT_BINARY_DIR} fcl/prolog.fcl COPYONLY) +cet_make_exec(NAME StereoLineTest + SOURCE src/StereoLineTest_main.cc + LIBRARIES + Offline::TrkHitReco +) install(DIRECTORY data DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/Offline/TrkHitReco) diff --git a/TrkPatRec/CMakeLists.txt b/TrkPatRec/CMakeLists.txt index 4fa71bd54b..b69049e2ba 100644 --- a/TrkPatRec/CMakeLists.txt +++ b/TrkPatRec/CMakeLists.txt @@ -156,20 +156,6 @@ cet_build_plugin(TimeAndPhiClusterFinderDiag art::tool Offline::RecoDataProducts ) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/data/HelixHitMVA.weights.xml ${CURRENT_BINARY_DIR} data/HelixHitMVA.weights.xml COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/data/HelixNonStereoHitMVA.weights.xml ${CURRENT_BINARY_DIR} data/HelixNonStereoHitMVA.weights.xml COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/data/HelixStereoHitMVA.weights.xml ${CURRENT_BINARY_DIR} data/HelixStereoHitMVA.weights.xml COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/data/TimeCluster3.weights.xml ${CURRENT_BINARY_DIR} data/TimeCluster3.weights.xml COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/data/TimeClusterCalo.weights.xml ${CURRENT_BINARY_DIR} data/TimeClusterCalo.weights.xml COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/data/TimeCluster.weights.xml ${CURRENT_BINARY_DIR} data/TimeCluster.weights.xml COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/data/TimePhiCluster.weights.xml ${CURRENT_BINARY_DIR} data/TimePhiCluster.weights.xml COPYONLY) - -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/fcl/AmbigResolver.fcl ${CURRENT_BINARY_DIR} fcl/AmbigResolver.fcl COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/fcl/DoubletAmbigResolver.fcl ${CURRENT_BINARY_DIR} fcl/DoubletAmbigResolver.fcl COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/fcl/PanelAmbigResolver.fcl ${CURRENT_BINARY_DIR} fcl/PanelAmbigResolver.fcl COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/fcl/Particle.fcl ${CURRENT_BINARY_DIR} fcl/Particle.fcl COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/fcl/prolog.fcl ${CURRENT_BINARY_DIR} fcl/prolog.fcl COPYONLY) - install(DIRECTORY data DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/Offline/TrkPatRec) install_source(SUBDIRS src) diff --git a/TrkReco/CMakeLists.txt b/TrkReco/CMakeLists.txt index a3b0d546a3..4a6a682d7b 100644 --- a/TrkReco/CMakeLists.txt +++ b/TrkReco/CMakeLists.txt @@ -62,9 +62,6 @@ art_dictionary( NO_CHECK_CLASS_VERSION # For some reason this segfaults Offline::TrkReco ) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/fcl/prolog.fcl ${CURRENT_BINARY_DIR} fcl/prolog.fcl COPYONLY) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/fcl/prolog_trigger.fcl ${CURRENT_BINARY_DIR} fcl/prolog_trigger.fcl COPYONLY) - install_source(SUBDIRS src) install_headers(USE_PROJECT_NAME SUBDIRS inc) install_fhicl(SUBDIRS fcl SUBDIRNAME Offline/TrkReco/fcl) diff --git a/Validation/CMakeLists.txt b/Validation/CMakeLists.txt index 5e8021b7d3..68884e662b 100644 --- a/Validation/CMakeLists.txt +++ b/Validation/CMakeLists.txt @@ -89,8 +89,6 @@ art_dictionary( Offline::Validation_Root ) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/fcl/val.fcl ${CURRENT_BINARY_DIR} fcl/val.fcl COPYONLY) - install_source(SUBDIRS src root) install_headers(USE_PROJECT_NAME SUBDIRS inc) install_fhicl(SUBDIRS fcl SUBDIRNAME Offline/Validation/fcl) diff --git a/check_cmake.sh b/check_cmake.sh new file mode 100755 index 0000000000..f07c88c744 --- /dev/null +++ b/check_cmake.sh @@ -0,0 +1,31 @@ +#!/bin/bash + +function check_directory() { + dir=$1 + + if [ -d $dir/src ]; then + pushd $dir >/dev/null 2>&1 + + #echo "Checking directory $dir" + files=($(ls src/*.cc src/*.cpp 2>/dev/null)) + cmakes=($(grep -oE "src/.*.c(c|pp)" CMakeLists.txt)) + + goodfiles=(`echo ${files[@]} ${cmakes[@]} | tr ' ' '\n' | sort | uniq -d`) + badfiles=(`echo ${files[@]} ${goodfiles[@]} | tr ' ' '\n' | sort | uniq -u`) + badcmakes=(`echo ${goodfiles[@]} ${cmakes[@]} | tr ' ' '\n' | sort | uniq -u`) + + for item in ${badfiles[@]}; do + echo "File $dir/$item is not defined in CMakeLists.txt!" + done + + for item in ${badcmakes[@]};do + echo "File $dir/$item defined in CMakeLists.txt but not found in directory!" + done + + popd >/dev/null 2>&1 + fi +} + +for dir in */;do + check_directory ${dir%/} +done diff --git a/fcl/CMakeLists.txt b/fcl/CMakeLists.txt index c2f698f539..cf31b1784c 100644 --- a/fcl/CMakeLists.txt +++ b/fcl/CMakeLists.txt @@ -1,10 +1,2 @@ -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/customizingMessageFacilityFcl.txt ${CURRENT_BINARY_DIR} customizingMessageFacilityFcl.txt ) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/messageService.fcl ${CURRENT_BINARY_DIR} messageService.fcl ) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/minimalMessageService.fcl ${CURRENT_BINARY_DIR} minimalMessageService.fcl ) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/standardInputs.fcl ${CURRENT_BINARY_DIR} standardInputs.fcl ) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/standardMessageDestinations.fcl ${CURRENT_BINARY_DIR} standardMessageDestinations.fcl ) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/standardProducers.fcl ${CURRENT_BINARY_DIR} standardProducers.fcl ) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/standardServices.fcl ${CURRENT_BINARY_DIR} standardServices.fcl ) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/TrkCaloDt.fcl ${CURRENT_BINARY_DIR} TrkCaloDt.fcl ) - +install_fhicl(SUBDIRNAME Offline/fcl) diff --git a/ups/product_deps b/ups/product_deps index 042258a5c7..9080432c4a 100644 --- a/ups/product_deps +++ b/ups/product_deps @@ -241,22 +241,17 @@ defaultqual s124:e28 # entry to match for a given product. # product version qual flags -art_root_io v1_13_01 s126 -art_root_io v1_12_04 s124 -gallery v1_22_01 s126 -gallery v1_21_03 s124 -geant4 v4_11_1_p02d s126 -geant4 v4_11_1_p02a s124 +art_root_io v1_13_03 s128 +gallery v1_22_03 s128 +geant4 v4_11_1_p02d s128 xerces_c v3_2_3e -artdaq_core_mu2e v2_01_02 -BTrk v1_02_45 s126 -BTrk v1_02_44 s124 -KinKal v02_05_00a s126 -KinKal v02_05_00 s124 +artdaq_core_mu2e v3_00_00 +BTrk v1_02_46 s128 +KinKal v02_05_00b s128 cry v1_7q gsl v2_7 swig - only_for_build -cetmodules v3_22_02 - only_for_build +cetmodules v3_24_01 - only_for_build end_product_list #################################### @@ -311,17 +306,11 @@ end_product_list # case it is optional. # qualifier art_root_io gallery geant4 xerces_c artdaq_core_mu2e BTrk KinKal cry gsl -e28:s126:trig:debug e28:debug e28:debug - e28 e28:s126:debug e28:p3915:debug e28:p3915:debug - -nq- -e28:s126:trig:prof e28:prof e28:prof - e28 e28:s126:prof e28:p3915:prof e28:p3915:prof - -nq- +e28:s128:trig:debug e28:debug e28:debug - e28 e28:s128:debug e28:p3915:debug e28:p3915:debug - -nq- +e28:s128:trig:prof e28:prof e28:prof - e28 e28:s128:prof e28:p3915:prof e28:p3915:prof - -nq- -e28:s124:trig:debug e28:debug e28:debug - e28 e28:s124:debug e28:p3915:debug e28:p3915:debug - -nq- -e28:s124:trig:prof e28:prof e28:prof - e28 e28:s124:prof e28:p3915:prof e28:p3915:prof - -nq- - -e28:s126:debug e28:debug e28:debug e28:mt:debug e28 e28:s126:debug e28:p3915:debug e28:p3915:debug e28:debug -nq- -e28:s126:prof e28:prof e28:prof e28:mt:prof e28 e28:s126:prof e28:p3915:prof e28:p3915:prof e28:prof -nq- - -e28:s124:debug e28:debug e28:debug e28:mt:debug e28 e28:s124:debug e28:p3915:debug e28:p3915:debug e28:debug -nq- -e28:s124:prof e28:prof e28:prof e28:mt:prof e28 e28:s124:prof e28:p3915:prof e28:p3915:prof e28:prof -nq- +e28:s128:debug e28:debug e28:debug e28:mt:debug e28 e28:s128:debug e28:p3915:debug e28:p3915:debug e28:debug -nq- +e28:s128:prof e28:prof e28:prof e28:mt:prof e28 e28:s128:prof e28:p3915:prof e28:p3915:prof e28:prof -nq- end_qualifier_list #################################### diff --git a/ups_install/CMakeLists.txt b/ups_install/CMakeLists.txt deleted file mode 100644 index 1d736d5089..0000000000 --- a/ups_install/CMakeLists.txt +++ /dev/null @@ -1,12 +0,0 @@ -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/installFQFile.sh ${CURRENT_BINARY_DIR} installFQFile.sh COPYONLY) - -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/install.sh ${CURRENT_BINARY_DIR} install.sh COPYONLY) - -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/installTableFile.sh ${CURRENT_BINARY_DIR} installTableFile.sh COPYONLY) - -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/tar_exclude_for_config.txt ${CURRENT_BINARY_DIR} tar_exclude_for_config.txt COPYONLY) - -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/tar_exclude_for_include.txt ${CURRENT_BINARY_DIR} tar_exclude_for_include.txt COPYONLY) - -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/tar_exclude_for_source.txt ${CURRENT_BINARY_DIR} tar_exclude_for_source.txt COPYONLY) - diff --git a/ups_install/install.sh b/ups_install/install.sh deleted file mode 100644 index 15ee246a7b..0000000000 --- a/ups_install/install.sh +++ /dev/null @@ -1,115 +0,0 @@ -#! /bin/bash -# -# Copy the files from the source and build areas to create a UPS product. -# -# This script unconditionally deletes previously existing installs of the -# same product+version+qualifiers: use with care. -# - -export PACKAGE_VERSION="$1" -export COMPILER_CODE=${MUSE_COMPILER_E} -export DEBUG_LEVEL=${MUSE_BUILD} -export PACKAGE_NAME=offline -export PACKAGE_SOURCE=${MUSE_WORK_DIR}/Offline - -# Check that the installation directoy has been defined. -if [ "${PRODUCTS_INSTALL}" = '' ];then - echo "The environment variable PRODUCTS_INSTALL is not set." - echo "You must define where to install the products before sourcing this script." - return 1 -fi - -# Learn if the extra products needed for the trigger are active. -# Use mu2e_artdaq_core as a proxy for the ensemble. -if [ "`ups active | grep artdaq_core_mu2e`" != "" ]; then - haveTrigger=".trig" -else - haveTrigger="" -fi - -# There are two representations of operating system UPS flavor: -# old style, for example: Linux64bit+2.6-2.12_e7 -# new style, for example: slf6.x86_64 -# We need them both. -old_flavour=`ups flavor` -new_flavour=`get-directory-name subdir` - -# Build the names of the directories into which we will write things -fq=${new_flavour}.${COMPILER_CODE}.${MUSE_ART}${haveTrigger}.${DEBUG_LEVEL} -topdir=${PRODUCTS_INSTALL}/${PACKAGE_NAME} -proddir=${PRODUCTS_INSTALL}/${PACKAGE_NAME}/${PACKAGE_VERSION} -verdir=${PRODUCTS_INSTALL}/${PACKAGE_NAME}/${PACKAGE_VERSION}.version -fqdir=${PRODUCTS_INSTALL}/${PACKAGE_NAME}/${PACKAGE_VERSION}/${fq} -incdir=${PRODUCTS_INSTALL}/${PACKAGE_NAME}/${PACKAGE_VERSION}/include -cfgdir=${PRODUCTS_INSTALL}/${PACKAGE_NAME}/${PACKAGE_VERSION}/config -upsdir=${PRODUCTS_INSTALL}/${PACKAGE_NAME}/${PACKAGE_VERSION}/ups - -# Make directories, if needed. -if ! [ -e ${topdir} ];then - mkdir ${topdir} -fi - -if ! [ -e ${proddir} ];then - mkdir ${proddir} -fi - -if ! [ -e ${verdir} ];then - mkdir ${verdir} -fi - -if ! [ -e ${fqdir} ];then - mkdir ${fqdir} -fi - -if ! [ -e ${cfgdir} ];then - mkdir ${cfgdir} -fi - -if ! [ -e ${incdir} ];then - mkdir ${incdir} -fi - -if ! [ -e ${upsdir} ];then - mkdir ${upsdir} -fi - -# Copy the required parts of the source directory to the installation area: - -# Header files: -rsync -ar --exclude-from ${PACKAGE_SOURCE}/ups_install/tar_exclude_for_include.txt \ - ${PACKAGE_SOURCE} ${proddir}/include - -# UPS table file -${PACKAGE_SOURCE}/ups_install/installTableFile.sh ${upsdir}/${PACKAGE_NAME}.table - -# Configuration files ( .fcl, .txt and all files that will go into databases). -rsync -ar --exclude-from ${PACKAGE_SOURCE}/ups_install/tar_exclude_for_config.txt \ - ${PACKAGE_SOURCE} ${cfgdir} - -# Libaries and binaries -rsync -ar ${BUILD}/lib ${fqdir} -rsync -ar ${BUILD}/bin ${fqdir} - -# A copy of the full source -rsync -ar --exclude-from ${PACKAGE_SOURCE}/ups_install/tar_exclude_for_source.txt \ - ${PACKAGE_SOURCE} ${proddir}/source - -# Create the ups fq files. -${PACKAGE_SOURCE}/ups_install/installFQFile.sh \ - ${verdir}/${old_flavour}_${COMPILER_CODE}_${MUSE_ART} \ - ${COMPILER_CODE}:${MUSE_ART} - -# Repeat for the trig qualified fq files. -${PACKAGE_SOURCE}/ups_install/installFQFile.sh \ - ${verdir}/${old_flavour}_${COMPILER_CODE}_${MUSE_ART}_trig \ - ${COMPILER_CODE}:${MUSE_ART}:trig - -unset old_flavour -unset new_flavour -unset fq -unset topdir -unset proddir -unset verdir -unset fqdir -unset incdir -unset upsdir diff --git a/ups_install/installFQFile.sh b/ups_install/installFQFile.sh deleted file mode 100755 index d7875ecd6d..0000000000 --- a/ups_install/installFQFile.sh +++ /dev/null @@ -1,46 +0,0 @@ -#! /bin/bash - -fqfile=$1 -qualifiers=$2 - - -cat > ${fqfile}_prof < ${fqfile}_debug < ${destination_file} < Date: Sat, 9 Mar 2024 11:49:46 -0800 Subject: [PATCH 175/213] Comments and variable name changes for clarity --- CommonMC/src/SelectRecoMC_module.cc | 54 ++++++++++++++++++++--------- 1 file changed, 38 insertions(+), 16 deletions(-) diff --git a/CommonMC/src/SelectRecoMC_module.cc b/CommonMC/src/SelectRecoMC_module.cc index 2bc7d26ace..106f829eff 100644 --- a/CommonMC/src/SelectRecoMC_module.cc +++ b/CommonMC/src/SelectRecoMC_module.cc @@ -309,25 +309,47 @@ namespace mu2e { TwoLinePCA_XYZ strawpca( XYZVectorF(straw.strawPosition()), XYZVectorF(straw.strawDirection()), tshmc._cpos, tdir ); - auto mcsep = wirepca.point2() - wirepca.point1(); - tshmc._wireLen = (wirepca.point2()-XYZVectorF(straw.wirePosition())).Dot(wdir); - auto mcperp = tdir.Cross(wdir).Unit(); - tshmc._wireDOCA = -1*mcperp.Dot(mcsep); - auto pdir = wdir.Cross(bdir); - if (pdir.Dot(XYZVectorF(straw.wirePosition())) < 0.0) pdir *= -1.0; //sign radially out - tshmc._wirePhi = atan2(mcsep.Dot(pdir),mcsep.Dot(bdir)); - tshmc._wireDot = tdir.Dot(wdir); - auto wperp = wdir.Cross(mcperp); - tshmc._wireTau = (tshmc._cpos-XYZVectorF(straw.wirePosition())).Dot(wperp); + // vector from middle of wire to POCA + auto wireMid_to_POCA = wirepca.point2() - XYZVectorF(straw.wirePosition()); + // longitudinal distance along wire to POCA + tshmc._wireLen = wireMid_to_POCA.Dot(wdir); + // perpedicular vector from wire to POCA + auto POCA_delta = wirepca.point2() - wirepca.point1(); + // define DOCA to be negative in direction of track cross wire + auto doca_sign_dir = tdir.Cross(wdir).Unit(); + tshmc._wireDOCA = -1*doca_sign_dir.Dot(POCA_delta); + // phi is defined by vector to POCA, with 0 in 'Bdir' + // and +pi/2 in V dir (radially out) + auto Vdir = wdir.Cross(bdir); + // ensure Vdir is pointing radially out + if (Vdir.Dot(XYZVectorF(straw.wirePosition())) < 0.0) Vdir *= -1.0; + tshmc._wirePhi = atan2(POCA_delta.Dot(Vdir),POCA_delta.Dot(bdir)); + // rdrift is the expected T2D given tdrift and phi tshmc._rdrift = srep->strawDrift().T2D(tshmc._tdrift,tshmc._wirePhi); + // wireDot is cos angle between track and wire + tshmc._wireDot = tdir.Dot(wdir); + // wireTau is delta distance perpedicular to the wire from POCA to trigger cluster + // first define unit vector perpendicular to particle track and wire direction + auto track_cross_wire = tdir.Cross(wdir).Unit(); + // then this cross wdir is the vector perpendicular to the wire and the vector to POCA + auto wire_cross_delta = wdir.Cross(track_cross_wire); + // relative position of the trigger cluster + auto wireMid_to_cluster = tshmc._cpos-XYZVectorF(straw.wirePosition()); + // wireTau is then the relative position of the trigger cluster in this direction + tshmc._wireTau = wireMid_to_cluster.Dot(wire_cross_delta); auto sdir = XYZVectorF(straw.strawDirection()); - mcsep = strawpca.point2() - strawpca.point1(); - mcperp = tdir.Cross(sdir).Unit(); - tshmc._strawDOCA = -1*mcperp.Dot(mcsep); - pdir = sdir.Cross(bdir); - if (pdir.Dot(XYZVectorF(straw.strawPosition())) < 0.0) pdir *= -1.0; //sign radially out - tshmc._strawPhi = atan2(mcsep.Dot(pdir),mcsep.Dot(bdir)); + // perpedicular vector from straw center to POCA + auto sPOCA_delta = strawpca.point2() - strawpca.point1(); + // define DOCA to be negative in direction of track cross straw + auto sdoca_sign_dir = tdir.Cross(sdir).Unit(); + tshmc._strawDOCA = -1*sdoca_sign_dir.Dot(sPOCA_delta); + // phi is defined by vector to POCA, with 0 in 'Bdir' + // and +pi/2 in V dir (radially out) + auto sVdir = sdir.Cross(bdir); + // ensure Vdir is pointing radially out + if (sVdir.Dot(XYZVectorF(straw.strawPosition())) < 0.0) sVdir *= -1.0; + tshmc._strawPhi = atan2(sPOCA_delta.Dot(sVdir),sPOCA_delta.Dot(bdir)); } void SelectRecoMC::fillSDMCI(KalSeedMC const& mcseed, SDIS& sdindices) { From f95b9c0eeaabb29086d4fc4126bc836f5e598cbb Mon Sep 17 00:00:00 2001 From: Andrei Gaponenko Date: Sat, 9 Mar 2024 21:11:55 -0600 Subject: [PATCH 176/213] New deltaFunctionGenerator module. --- EventGenerator/src/deltaFunctionGun_module.cc | 164 ++++++++++++++++++ 1 file changed, 164 insertions(+) create mode 100644 EventGenerator/src/deltaFunctionGun_module.cc diff --git a/EventGenerator/src/deltaFunctionGun_module.cc b/EventGenerator/src/deltaFunctionGun_module.cc new file mode 100644 index 0000000000..3149ddb134 --- /dev/null +++ b/EventGenerator/src/deltaFunctionGun_module.cc @@ -0,0 +1,164 @@ +// This generator throws particles of the same type and the same +// kinematics in each event, i.e. a delta-function distribution in the +// phase space. This is exactly what is needed for some simulations, +// in particular those using G4study. The explicit module name will +// hopefully help to prevent future complexification of this code. +// This generator is so basic that it does not even need random numbers. +// It is fully configurable via fcl, without the need for an +// additional txt file. +// +// Andrei Gaponenko, 2024 + +#include +#include +#include +#include + +#include "cetlib_except/exception.h" +#include "CLHEP/Vector/ThreeVector.h" + +#include "fhiclcpp/types/Atom.h" +#include "fhiclcpp/types/OptionalAtom.h" +#include "fhiclcpp/types/TupleAs.h" + +#include "art/Framework/Core/SharedProducer.h" +#include "art/Framework/Principal/Event.h" + +#include "Offline/GlobalConstantsService/inc/GlobalConstantsHandle.hh" +#include "Offline/GlobalConstantsService/inc/ParticleDataList.hh" +#include "Offline/DataProducts/inc/PDGCode.hh" +#include "Offline/MCDataProducts/inc/GenParticle.hh" + +namespace mu2e { + + class deltaFunctionGun : public art::SharedProducer { + public: + struct Config { + using Name=fhicl::Name; + using Comment=fhicl::Comment; + using Hep3Vector_t = CLHEP::Hep3Vector(double, double, double); + + fhicl::Atom particleName { + Name("particleName"), + Comment("Particle name as defined in the PDGCode enum-to-string") + }; + + fhicl::TupleAs position { + Name("position"), + Comment("The point from which the particles are launched") + }; + + fhicl::TupleAs direction { + Name("direction"), + Comment("A non-zero 3-vector ponting in the direction of the particle momentum") + }; + + fhicl::OptionalAtom momentum { + Name("momentum"), + Comment("The magnitude of momentum of the generated particles. This setting is mutially exclusive with kineticEnergy.") + }; + + fhicl::OptionalAtom kineticEnergy { + Name("kineticEnergy"), + Comment("Kinetic energy of the generated particles. This setting is mutially exclusive with momentum.") + }; + }; + + using Parameters = art::SharedProducer::Table; + explicit deltaFunctionGun(const Parameters& conf, const art::ProcessingFrame&); + + void produce(art::Event& event, const art::ProcessingFrame&) override; + + private: + const GenParticle particle_; + GenParticle define_particle(const Parameters& conf); + }; + + //================================================================ + deltaFunctionGun::deltaFunctionGun(const Parameters& conf, const art::ProcessingFrame&) + : SharedProducer{conf} + , particle_{define_particle(conf)} + { + async(); + produces(); + } + + //================================================================ + void deltaFunctionGun::produce(art::Event& event, const art::ProcessingFrame&) { + std::unique_ptr output(new GenParticleCollection); + output->emplace_back(particle_); + event.put(std::move(output)); + } + + //================================================================ + GenParticle deltaFunctionGun::define_particle(const Parameters& conf) { + + PDGCode pdg(conf().particleName()); + GlobalConstantsHandle pdt; + const double mass = pdt->particle(pdg.id()).mass(); + + //---------------------------------------------------------------- + // figure out the scalar momentum and energy + double pmag = 0., etot = 0.; + if(conf().momentum()) { + if(conf().kineticEnergy()) { + throw cet::exception("BADCONFIG") + << "deltaFunctionGun: ERROR: both momentum and kineticEnergy are specified" + << "\n"; + } + + pmag = *conf().momentum(); + if(pmag < 0.) { + throw cet::exception("BADCONFIG") + << "deltaFunctionGun: ERROR: momentum magnitude can not be negative, got "< 0.) { + dir = dir/norm; + } + else { + throw cet::exception("BADCONFIG") + << "deltaFunctionGun: ERROR: the direction vector must be non-zero" + << "\n"; + } + + const CLHEP::Hep3Vector mom3 = pmag * dir; + + CLHEP::HepLorentzVector fourmom(etot, mom3); + + return GenParticle(pdg.id(), + GenId::particleGun, + conf().position(), + fourmom, + 0., + 0.); + } + + //================================================================ + +} // namespace mu2e + +DEFINE_ART_MODULE(mu2e::deltaFunctionGun) From 6cfebb05d50e91caa439431336a785aa6f330d13 Mon Sep 17 00:00:00 2001 From: Andrei Gaponenko Date: Sat, 9 Mar 2024 23:32:20 -0600 Subject: [PATCH 177/213] Drive-by cleanups of g4study tools --- Mu2eG4/inc/InitEnvToolBase.hh | 17 +++++------------ Mu2eG4/src/ConstructEnvBox_tool.cc | 16 ++-------------- Mu2eG4/src/ConstructEnvCalo01_tool.cc | 13 +------------ Mu2eG4/src/ConstructEnvMuCapture_tool.cc | 14 +------------- Mu2eG4/src/ConstructEnvNBoxes_tool.cc | 6 +----- Mu2eG4/src/ConstructEnvTube_tool.cc | 15 +-------------- Mu2eG4/src/InitEnvToolBase.cc | 18 ------------------ 7 files changed, 11 insertions(+), 88 deletions(-) delete mode 100644 Mu2eG4/src/InitEnvToolBase.cc diff --git a/Mu2eG4/inc/InitEnvToolBase.hh b/Mu2eG4/inc/InitEnvToolBase.hh index 54c1740f49..6af3da1a91 100644 --- a/Mu2eG4/inc/InitEnvToolBase.hh +++ b/Mu2eG4/inc/InitEnvToolBase.hh @@ -1,28 +1,21 @@ #ifndef Mu2eG4_InitEnvToolBase_hh #define Mu2eG4_InitEnvToolBase_hh -#include "art/Framework/Services/Registry/ServiceHandle.h" -#include "art_root_io/TFileService.h" - -#include "Offline/Mu2eG4Helper/inc/VolumeInfo.hh" -#include "Offline/ConfigTools/inc/SimpleConfig.hh" - namespace mu2e { + class VolumeInfo; + class SimpleConfig; + class InitEnvToolBase { - protected: - std::string _name; public: InitEnvToolBase() noexcept = default ; - virtual ~InitEnvToolBase() noexcept = default ; - virtual const std::string& name() { return _name; }; + virtual ~InitEnvToolBase() noexcept = default ; - virtual int construct(VolumeInfo const & ParentVInfo, SimpleConfig const& Config) ; + virtual int construct(VolumeInfo const & ParentVInfo, SimpleConfig const& Config) = 0; }; } #endif - diff --git a/Mu2eG4/src/ConstructEnvBox_tool.cc b/Mu2eG4/src/ConstructEnvBox_tool.cc index 8bca894b5b..995c040fdd 100644 --- a/Mu2eG4/src/ConstructEnvBox_tool.cc +++ b/Mu2eG4/src/ConstructEnvBox_tool.cc @@ -37,24 +37,12 @@ namespace mu2e { class ConstructEnvBox: public InitEnvToolBase { public: - ConstructEnvBox(const fhicl::ParameterSet& PSet); - ~ConstructEnvBox(); + ConstructEnvBox(const fhicl::ParameterSet& PSet) {} int construct(VolumeInfo const& ParentVInfo, SimpleConfig const& Config); }; - -//----------------------------------------------------------------------------- - ConstructEnvBox::ConstructEnvBox(const fhicl::ParameterSet& PSet) { - _name = "Box"; - } - -//----------------------------------------------------------------------------- - ConstructEnvBox::~ConstructEnvBox() { - _name = "Box"; - } - -//----------------------------------------------------------------------------- + //----------------------------------------------------------------------------- int ConstructEnvBox::construct(VolumeInfo const& parentVInfo, SimpleConfig const& _config) { const bool forceAuxEdgeVisible = _config.getBool("g4.forceAuxEdgeVisible"); diff --git a/Mu2eG4/src/ConstructEnvCalo01_tool.cc b/Mu2eG4/src/ConstructEnvCalo01_tool.cc index 3c4daeb88e..8887b7b217 100644 --- a/Mu2eG4/src/ConstructEnvCalo01_tool.cc +++ b/Mu2eG4/src/ConstructEnvCalo01_tool.cc @@ -38,8 +38,7 @@ namespace mu2e { class ConstructEnvCalo01: public InitEnvToolBase { public: - ConstructEnvCalo01(const fhicl::ParameterSet& PSet); - ~ConstructEnvCalo01(); + ConstructEnvCalo01(const fhicl::ParameterSet& PSet) {} int construct(VolumeInfo const& ParentVInfo, SimpleConfig const& Config); private: @@ -65,16 +64,6 @@ namespace mu2e { ); }; -//----------------------------------------------------------------------------- - ConstructEnvCalo01::ConstructEnvCalo01(const fhicl::ParameterSet& PSet) { - _name = "Calo01"; - } - -//----------------------------------------------------------------------------- - ConstructEnvCalo01::~ConstructEnvCalo01() { - _name = "Calo01"; - } - //----------------------------------------------------------------------------- int ConstructEnvCalo01::construct(VolumeInfo const& parentVInfo, SimpleConfig const& config) { diff --git a/Mu2eG4/src/ConstructEnvMuCapture_tool.cc b/Mu2eG4/src/ConstructEnvMuCapture_tool.cc index 2cb7653f1d..f796a4d180 100644 --- a/Mu2eG4/src/ConstructEnvMuCapture_tool.cc +++ b/Mu2eG4/src/ConstructEnvMuCapture_tool.cc @@ -36,23 +36,11 @@ namespace mu2e { class ConstructEnvMuCapture: public InitEnvToolBase { public: - ConstructEnvMuCapture(const fhicl::ParameterSet& PSet); - ~ConstructEnvMuCapture(); + ConstructEnvMuCapture(const fhicl::ParameterSet& PSet) {} int construct(VolumeInfo const& ParentVInfo, SimpleConfig const& Config); }; - -//----------------------------------------------------------------------------- - ConstructEnvMuCapture::ConstructEnvMuCapture(const fhicl::ParameterSet& PSet) { - _name = "MuCapture"; - } - -//----------------------------------------------------------------------------- - ConstructEnvMuCapture::~ConstructEnvMuCapture() { - _name = "MuCapture"; - } - //----------------------------------------------------------------------------- int ConstructEnvMuCapture::construct(VolumeInfo const& parentVInfo, SimpleConfig const& _config) { diff --git a/Mu2eG4/src/ConstructEnvNBoxes_tool.cc b/Mu2eG4/src/ConstructEnvNBoxes_tool.cc index 6b9c8d6ab7..618055f98c 100644 --- a/Mu2eG4/src/ConstructEnvNBoxes_tool.cc +++ b/Mu2eG4/src/ConstructEnvNBoxes_tool.cc @@ -33,15 +33,11 @@ namespace mu2e { class ConstructEnvNBoxes: public InitEnvToolBase { public: - ConstructEnvNBoxes(const fhicl::ParameterSet& PSet); + ConstructEnvNBoxes(const fhicl::ParameterSet& PSet) {} int construct(VolumeInfo const& ParentVInfo, SimpleConfig const& Config); }; -//----------------------------------------------------------------------------- - ConstructEnvNBoxes::ConstructEnvNBoxes(const fhicl::ParameterSet& PSet) { - _name = "NBoxes"; - } //----------------------------------------------------------------------------- int ConstructEnvNBoxes::construct(VolumeInfo const& parentVInfo, SimpleConfig const& _config) { diff --git a/Mu2eG4/src/ConstructEnvTube_tool.cc b/Mu2eG4/src/ConstructEnvTube_tool.cc index 0ad6fbd72f..09d225787a 100644 --- a/Mu2eG4/src/ConstructEnvTube_tool.cc +++ b/Mu2eG4/src/ConstructEnvTube_tool.cc @@ -37,23 +37,10 @@ namespace mu2e { class ConstructEnvTube: public InitEnvToolBase { public: - ConstructEnvTube(const fhicl::ParameterSet& PSet); - ~ConstructEnvTube(); - + ConstructEnvTube(const fhicl::ParameterSet& PSet) {} int construct(VolumeInfo const& ParentVInfo, SimpleConfig const& Config); }; - -//----------------------------------------------------------------------------- - ConstructEnvTube::ConstructEnvTube(const fhicl::ParameterSet& PSet) { - _name = "Tube"; - } - -//----------------------------------------------------------------------------- - ConstructEnvTube::~ConstructEnvTube() { - _name = "Tube"; - } - //----------------------------------------------------------------------------- int ConstructEnvTube::construct(VolumeInfo const& parentVInfo, SimpleConfig const& _config) { diff --git a/Mu2eG4/src/InitEnvToolBase.cc b/Mu2eG4/src/InitEnvToolBase.cc deleted file mode 100644 index ae88dae88d..0000000000 --- a/Mu2eG4/src/InitEnvToolBase.cc +++ /dev/null @@ -1,18 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// base class for constructing non-Mu2e geometries to be studied using -// Mu2e simulation framework -/////////////////////////////////////////////////////////////////////////////// - -#include "Offline/Mu2eG4/inc/InitEnvToolBase.hh" - -namespace mu2e { - -//----------------------------------------------------------------------------- -// geometry construction hook -//----------------------------------------------------------------------------- - int InitEnvToolBase::construct(VolumeInfo const & ParentVInfo, SimpleConfig const& Config) { - _name = "unknown"; - return 0; - } - -} From 4d0ea8c25df97c9f5edcfee149ad796a888389a6 Mon Sep 17 00:00:00 2001 From: Andrei Gaponenko Date: Sat, 9 Mar 2024 23:43:25 -0600 Subject: [PATCH 178/213] New tool to create an "emtpy" geometry for g4study. --- Mu2eG4/src/ConstructEnvEmpty_tool.cc | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 Mu2eG4/src/ConstructEnvEmpty_tool.cc diff --git a/Mu2eG4/src/ConstructEnvEmpty_tool.cc b/Mu2eG4/src/ConstructEnvEmpty_tool.cc new file mode 100644 index 0000000000..f2ee0cd63d --- /dev/null +++ b/Mu2eG4/src/ConstructEnvEmpty_tool.cc @@ -0,0 +1,28 @@ +// A tool to create an "empty" G4study geometry. +// The calling code in Mu2eStudyWorld already creates a "box with a +// skin" world, and sometimes one does not need any other volumes. +// +// “Perfection is achieved, not when there is nothing more to add, but +// when there is nothing left to take away.” +// - Antoine de Saint-Exupéry +// +// Andrei Gaponenko, 2024 + +#include "art/Utilities/ToolMacros.h" + +#include "Offline/Mu2eG4/inc/InitEnvToolBase.hh" + +namespace mu2e { + + class ConstructEnvEmpty: public InitEnvToolBase { + public: + ConstructEnvEmpty(const fhicl::ParameterSet&) {} + + int construct(VolumeInfo const&, SimpleConfig const&) override { + return 0; + } + }; + +} + +DEFINE_ART_CLASS_TOOL(mu2e::ConstructEnvEmpty) From 76e399d15fa8c289e66eb73befdb7c1da3827fce Mon Sep 17 00:00:00 2001 From: Andrei Gaponenko Date: Sun, 10 Mar 2024 18:33:51 -0500 Subject: [PATCH 179/213] deltaFunctionGenerator: add more information to the online help --- EventGenerator/src/deltaFunctionGun_module.cc | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/EventGenerator/src/deltaFunctionGun_module.cc b/EventGenerator/src/deltaFunctionGun_module.cc index 3149ddb134..f1173d390b 100644 --- a/EventGenerator/src/deltaFunctionGun_module.cc +++ b/EventGenerator/src/deltaFunctionGun_module.cc @@ -45,22 +45,29 @@ namespace mu2e { fhicl::TupleAs position { Name("position"), - Comment("The point from which the particles are launched") + Comment("The point from which the particles are launched, in the GenParticle coordinate system.\n" + "This is usually the same as the Mu2e coordinate system, but the latter is not defined\n" + "for simplified geometries. The units are mm." + ) }; fhicl::TupleAs direction { Name("direction"), - Comment("A non-zero 3-vector ponting in the direction of the particle momentum") + Comment("A non-zero 3-vector ponting in the direction of the particle momentum, in the GenParticle\n" + "coordinate system." + ) }; fhicl::OptionalAtom momentum { Name("momentum"), - Comment("The magnitude of momentum of the generated particles. This setting is mutially exclusive with kineticEnergy.") + Comment("The magnitude of momentum of the generated particles, in MeV/c.\n" + "This setting is mutially exclusive with kineticEnergy.") }; fhicl::OptionalAtom kineticEnergy { Name("kineticEnergy"), - Comment("Kinetic energy of the generated particles. This setting is mutially exclusive with momentum.") + Comment("Kinetic energy of the generated particles, in MeV/c2.\n" + "This setting is mutially exclusive with momentum.") }; }; From 2b920a3fa1832ae1126bef167376048304e95f95 Mon Sep 17 00:00:00 2001 From: Andrei Gaponenko Date: Sun, 10 Mar 2024 20:14:32 -0500 Subject: [PATCH 180/213] deltaFunctionGenerator: make_unique instead of new. --- EventGenerator/src/deltaFunctionGun_module.cc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/EventGenerator/src/deltaFunctionGun_module.cc b/EventGenerator/src/deltaFunctionGun_module.cc index f1173d390b..d08f7500b8 100644 --- a/EventGenerator/src/deltaFunctionGun_module.cc +++ b/EventGenerator/src/deltaFunctionGun_module.cc @@ -92,9 +92,9 @@ namespace mu2e { //================================================================ void deltaFunctionGun::produce(art::Event& event, const art::ProcessingFrame&) { - std::unique_ptr output(new GenParticleCollection); - output->emplace_back(particle_); - event.put(std::move(output)); + using namespace std; + auto output{make_unique>({particle_})}; + event.put(move(output)); } //================================================================ From 1048f10bd3fcb79cd950bbb6734e7b92132b1df1 Mon Sep 17 00:00:00 2001 From: Eric Flumerfelt Date: Mon, 11 Mar 2024 14:31:06 -0500 Subject: [PATCH 181/213] Fix whitespace errors --- check_cmake.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/check_cmake.sh b/check_cmake.sh index f07c88c744..4ad0fe0249 100755 --- a/check_cmake.sh +++ b/check_cmake.sh @@ -2,7 +2,7 @@ function check_directory() { dir=$1 - + if [ -d $dir/src ]; then pushd $dir >/dev/null 2>&1 @@ -18,7 +18,7 @@ function check_directory() { echo "File $dir/$item is not defined in CMakeLists.txt!" done - for item in ${badcmakes[@]};do + for item in ${badcmakes[@]};do echo "File $dir/$item defined in CMakeLists.txt but not found in directory!" done From 5d3f77752e4a71397304680f055aee6a88a8aaeb Mon Sep 17 00:00:00 2001 From: Ray Culbertson Date: Tue, 12 Mar 2024 12:06:40 -0500 Subject: [PATCH 182/213] implement TFileService access --- Mu2eUtilities/inc/compressPdgId.hh | 7 +++++-- Mu2eUtilities/src/compressPdgId.cc | 10 +++++----- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/Mu2eUtilities/inc/compressPdgId.hh b/Mu2eUtilities/inc/compressPdgId.hh index 3737d50a02..48b505f157 100644 --- a/Mu2eUtilities/inc/compressPdgId.hh +++ b/Mu2eUtilities/inc/compressPdgId.hh @@ -3,6 +3,8 @@ #include "Offline/DataProducts/inc/PDGCode.hh" #include "Offline/DataProducts/inc/CompressedPDGCode.hh" +#include "art/Framework/Services/Registry/ServiceHandle.h" +#include "art_root_io/TFileService.h" #include "TH1D.h" #include @@ -13,8 +15,9 @@ namespace mu2e { CompressedPDGCode::enum_type compressPDGCode(PDGCode::enum_type pdgId); // a histogram with text labels, ready for use with CompressedPDGCode - TH1D compressPDGCodeHisto(std::string name="compPdgId", - std::string title="Compressed PDG ID"); + TH1D* compressPDGCodeHisto(art::ServiceHandle& tfs, + std::string name="compPdgId", + std::string title="Compressed PDG ID"); // compress PDG e,mu,gamma, pions and kaons produced // in cosmic generators into a index 0-7 diff --git a/Mu2eUtilities/src/compressPdgId.cc b/Mu2eUtilities/src/compressPdgId.cc index 6bc78bc3ed..85748054b6 100644 --- a/Mu2eUtilities/src/compressPdgId.cc +++ b/Mu2eUtilities/src/compressPdgId.cc @@ -74,24 +74,24 @@ namespace mu2e { return code; } - TH1D compressPDGCodeHisto(std::string name, std::string title) { + TH1D* compressPDGCodeHisto(art::ServiceHandle& tfs, + std::string name, std::string title) { float low = float(CompressedPDGCode::minBin) - 0.5; float hgh = float(CompressedPDGCode::maxBin) + 0.5; int nbin = CompressedPDGCode::maxBin - CompressedPDGCode::minBin +1; - TH1D hh(name.c_str(),title.c_str(),nbin,low,hgh); + auto hp = tfs->make(name.c_str(),title.c_str(),nbin,low,hgh); int rootBin = 0; for(int ibin=CompressedPDGCode::minBin; ibin<=CompressedPDGCode::maxBin; ibin++) { rootBin++; std::string name = CompressedPDGCode(ibin,false).name(); - std::cout << rootBin << " " << name << "\n"; - hh.GetXaxis()->SetBinLabel(rootBin,name.c_str()); + hp->GetXaxis()->SetBinLabel(rootBin,name.c_str()); } - return hh; + return hp; } From 0d0cc66b1b18d6027617478de8d646c495bf2077 Mon Sep 17 00:00:00 2001 From: ehrlich-uva Date: Wed, 13 Mar 2024 19:07:56 -0500 Subject: [PATCH 183/213] removed CrvStep collection name in epilog for extraced position --- CRVResponse/fcl/epilog_extracted_v03.fcl | 2 -- 1 file changed, 2 deletions(-) diff --git a/CRVResponse/fcl/epilog_extracted_v03.fcl b/CRVResponse/fcl/epilog_extracted_v03.fcl index 48a1a8b12f..873178a6ff 100644 --- a/CRVResponse/fcl/epilog_extracted_v03.fcl +++ b/CRVResponse/fcl/epilog_extracted_v03.fcl @@ -1,5 +1,3 @@ -physics.producers.CrvPhotons.crvStepModuleLabels : ["CrvSteps"] -physics.producers.CrvPhotons.crvStepProcessNames : ["CrvStepsConverter"] physics.producers.CrvPhotons.CRVSectors : ["EX","T1","T2"] physics.producers.CrvPhotons.reflectors : [ 0, 1, 0 ] physics.producers.CrvPhotons.scintillationYields : [39794,28573,28573] //assuming modules from CRV-T(1.8mm),CRV-DS,CRV-L From bbb65eba0f6787c9d90cf2daa9563d6b8020608c Mon Sep 17 00:00:00 2001 From: David Nathan Brown Date: Fri, 22 Mar 2024 15:15:31 -0700 Subject: [PATCH 184/213] Update to TrkAanV5 --- Mu2eKinKal/test/KKDrift.fcl | 56 +++++++++++++------------------------ 1 file changed, 20 insertions(+), 36 deletions(-) diff --git a/Mu2eKinKal/test/KKDrift.fcl b/Mu2eKinKal/test/KKDrift.fcl index 606129c512..a571a6a3de 100644 --- a/Mu2eKinKal/test/KKDrift.fcl +++ b/Mu2eKinKal/test/KKDrift.fcl @@ -38,22 +38,31 @@ physics : @sequence::Reconstruction.TrkReco, @sequence::Reconstruction.CrvReco, TimeClusterFinderDe, HelixFinderDe, - TimeClusterFinderUe, HelixFinderUe, - TimeClusterFinderDmu, HelixFinderDmu, CalTimePeakFinder, CalHelixFinderDe, CalTimePeakFinderMu, CalHelixFinderDmu, MHDeM, - MHUeP, - MHDmuM, KKDeM, - KKUeP, - KKDmuM, @sequence::Reconstruction.MCReco ] analyzers : { - TAKK : { - @table::TrkAnaReco.analyzers.TrkAnaNeg + TrkAna : { + @table::TrkAnaTreeMaker FitType : LoopHelix + diagLevel : 2 + FillMCInfo : true + FillCRVHits : true + FillTrkQualInfo : false + FillTrkPIDInfo : false + FillHitInfo : true + FillTriggerInfo : false + branches : [ + { input: "KK" +# branch : "trk" + branch : "dem" + suffix : "DeM" + options : { fillMC : true genealogyDepth : -1 } + } + ] } evtprint : { module_type : RunSubrunEvent @@ -63,7 +72,7 @@ physics : printEvent : true } } - EndPath : [TAKK] + EndPath : [TrkAna] } outputs : { Output : { @@ -76,7 +85,7 @@ outputs : { physics.producers.CaloHitTruthMatch.primaryParticle : "compressDigiMCs" physics.producers.CaloHitTruthMatch.caloShowerSimCollection : "compressDigiMCs" -physics.producers.SelectRecoMC.KalSeedCollections : ["KKDeM", "KKDmuM", "KKUeP"] +physics.producers.SelectRecoMC.KalSeedCollections : ["KKDeM"] physics.producers.SelectRecoMC.HelixSeedCollections : ["MHDeM"] physics.producers.SelectRecoMC.debugLevel : 0 @@ -87,33 +96,8 @@ physics.producers.KKDeM.ModuleSettings.PrintLevel : 0 physics.producers.KKDeM.ModuleSettings.SaveAllFits : true physics.producers.KKDeM.FitSettings.PrintLevel : 0 -physics.producers.KKUeP.ModuleSettings.HelixSeedCollections : [ "MHDeM" ] -physics.producers.KKUeP.ModuleSettings.ComboHitCollection : "makeSH" -physics.producers.KKUeP.ModuleSettings.CaloClusterCollection : "CaloClusterMaker" -physics.producers.KKUeP.ModuleSettings.PrintLevel : 0 -physics.producers.KKUeP.ModuleSettings.SaveAllFits : true -physics.producers.KKUeP.FitSettings.PrintLevel : 0 -physics.producers.KKDmuM.ModuleSettings.HelixSeedCollections : [ "MHDeM" ] -physics.producers.KKDmuM.ModuleSettings.ComboHitCollection : "makeSH" -physics.producers.KKDmuM.ModuleSettings.CaloClusterCollection : "CaloClusterMaker" -physics.producers.KKDmuM.ModuleSettings.PrintLevel : 0 -physics.producers.KKDmuM.ModuleSettings.SaveAllFits : true -physics.producers.KKDmuM.FitSettings.PrintLevel : 0 - -physics.analyzers.TAKK.candidate.options : @local::AllOpt -physics.analyzers.TAKK.diagLevel : 2 -physics.analyzers.TAKK.FillMCInfo : true -physics.analyzers.TAKK.FillCRVHits : true -physics.analyzers.TAKK.FillTrkQualInfo : false -physics.analyzers.TAKK.FillTrkPIDInfo : false -physics.analyzers.TAKK.FillHitInfo : true -physics.analyzers.TAKK.FillTriggerInfo : false -physics.analyzers.TAKK.candidate.input : "KK" -physics.analyzers.TAKK.candidate.suffix : "DeM" -physics.analyzers.TAKK.candidate.options.fillHits : true -physics.analyzers.TAKK.supplements : [@local::UeP, @local::DmuM] -physics.analyzers.TAKK.ExtraMCStepCollectionTags : [ "compressDigiMCs:protonabsorber", "compressDigiMCs:stoppingtarget" ] +physics.analyzers.TrkAna.ExtraMCStepCollectionTags : [ "compressDigiMCs:protonabsorber", "compressDigiMCs:stoppingtarget" ] physics.end_paths : [ EndPath ] # needed for generate_fcl services.TimeTracker.printSummary: true From 6aa9348908f652bd194aa92e4cb69a847aabd89c Mon Sep 17 00:00:00 2001 From: David Brown Date: Mon, 25 Mar 2024 11:36:49 -0700 Subject: [PATCH 185/213] changes for TrkAna --- MCDataProducts/inc/MCRelationship.hh | 8 ++++---- MCDataProducts/src/MCRelationship.cc | 3 +++ 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/MCDataProducts/inc/MCRelationship.hh b/MCDataProducts/inc/MCRelationship.hh index f81eacdb55..1c9f2d2197 100644 --- a/MCDataProducts/inc/MCRelationship.hh +++ b/MCDataProducts/inc/MCRelationship.hh @@ -5,12 +5,12 @@ #ifndef MCRelationship_HH #define MCRelationship_HH // art -#include "canvas/Persistency/Common/Ptr.h" -// MC data -#include "Offline/MCDataProducts/inc/SimParticle.hh" -#include "Offline/MCDataProducts/inc/StrawDigiMC.hh" +//#include "canvas/Persistency/Common/Ptr.h" +namespace art { template class Ptr; } namespace mu2e { + class SimParticle; + class StrawDigiMC; // some convenient typedefs class MCRelationship { public: diff --git a/MCDataProducts/src/MCRelationship.cc b/MCDataProducts/src/MCRelationship.cc index 4e32be5c3b..cb4f838092 100644 --- a/MCDataProducts/src/MCRelationship.cc +++ b/MCDataProducts/src/MCRelationship.cc @@ -3,6 +3,9 @@ // Dave Brown, LBNL, 20 Jun 2016 // #include "Offline/MCDataProducts/inc/MCRelationship.hh" +#include "Offline/MCDataProducts/inc/SimParticle.hh" +#include "Offline/MCDataProducts/inc/StrawDigiMC.hh" +#include "canvas/Persistency/Common/Ptr.h" #include namespace mu2e { From 4bf7bbf1c2dc91d27f1561e51651b05cc18b2870 Mon Sep 17 00:00:00 2001 From: David Nathan Brown Date: Mon, 25 Mar 2024 23:45:42 -0500 Subject: [PATCH 186/213] Add missing include --- MCDataProducts/inc/MCRelationship.hh | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/MCDataProducts/inc/MCRelationship.hh b/MCDataProducts/inc/MCRelationship.hh index 1c9f2d2197..76ceb131d6 100644 --- a/MCDataProducts/inc/MCRelationship.hh +++ b/MCDataProducts/inc/MCRelationship.hh @@ -4,11 +4,9 @@ // #ifndef MCRelationship_HH #define MCRelationship_HH -// art -//#include "canvas/Persistency/Common/Ptr.h" +#include namespace art { template class Ptr; } -namespace mu2e -{ +namespace mu2e { class SimParticle; class StrawDigiMC; // some convenient typedefs From d3cfd71b3867d960c8b16c22414f4670eccc6a4d Mon Sep 17 00:00:00 2001 From: David Nathan Brown Date: Tue, 26 Mar 2024 18:35:33 -0500 Subject: [PATCH 187/213] Address clang-tidy warning --- MCDataProducts/inc/MCRelationship.hh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/MCDataProducts/inc/MCRelationship.hh b/MCDataProducts/inc/MCRelationship.hh index 76ceb131d6..03d328fcde 100644 --- a/MCDataProducts/inc/MCRelationship.hh +++ b/MCDataProducts/inc/MCRelationship.hh @@ -42,8 +42,8 @@ namespace mu2e { // from the mixture MCRelationship(StrawDigiMC const& mcd, SPPtr const& spp); private: - int8_t _rel; // relationship - int8_t _rem; // distance between relationship + int8_t _rel = none; // relationship + int8_t _rem = -1; // distance between relationship }; } #endif From 3029346d5c6e7e5ffea8b8dae47c31a9023d24a2 Mon Sep 17 00:00:00 2001 From: David Nathan Brown Date: Wed, 27 Mar 2024 10:16:28 -0500 Subject: [PATCH 188/213] Explicitly type enum and data member --- MCDataProducts/inc/MCRelationship.hh | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/MCDataProducts/inc/MCRelationship.hh b/MCDataProducts/inc/MCRelationship.hh index 03d328fcde..ade906dd51 100644 --- a/MCDataProducts/inc/MCRelationship.hh +++ b/MCDataProducts/inc/MCRelationship.hh @@ -1,5 +1,5 @@ // -// MC relationships of some objects. Extracted from KalDiag +// MC relationships of some objects // Dave Brown, LBNL, 20 Jun 2016 // #ifndef MCRelationship_HH @@ -9,13 +9,12 @@ namespace art { template class Ptr; } namespace mu2e { class SimParticle; class StrawDigiMC; - // some convenient typedefs class MCRelationship { public: typedef art::Ptr SPPtr; // values of relationship of 2 MC objects - enum relation {none=-1,same=0,daughter,mother,sibling,udaughter,umother,usibling}; - relation relationship() const { return relation(_rel); } + enum relation : int8_t {none=-1,same=0,daughter,mother,sibling,udaughter,umother,usibling}; + relation relationship() const { return _rel; } int8_t removal() const { return _rem; } // relationship generational distance // convenience operators bool operator ==(MCRelationship const& other ) const { return _rel == other._rel; } @@ -42,7 +41,7 @@ namespace mu2e { // from the mixture MCRelationship(StrawDigiMC const& mcd, SPPtr const& spp); private: - int8_t _rel = none; // relationship + relation _rel = none; // relationship int8_t _rem = -1; // distance between relationship }; } From aef9e46d7911d9c5935109b07f85c66fbc3bb8f4 Mon Sep 17 00:00:00 2001 From: David Nathan Brown Date: Wed, 27 Mar 2024 23:33:30 -0500 Subject: [PATCH 189/213] improvements for trigger --- Mu2eKinKal/fcl/prolog.fcl | 5 +-- Mu2eKinKal/inc/KKFit.hh | 41 ++++++++++++++----- Mu2eKinKal/inc/KKFitSettings.hh | 1 + RecoDataProducts/inc/KalSeed.hh | 1 + RecoDataProducts/src/KalSeed.cc | 8 ++++ TrkFilters/src/SeedFilter_module.cc | 63 +++++++++++++++-------------- 6 files changed, 76 insertions(+), 43 deletions(-) diff --git a/Mu2eKinKal/fcl/prolog.fcl b/Mu2eKinKal/fcl/prolog.fcl index 510f7806a8..8ab5fb912f 100644 --- a/Mu2eKinKal/fcl/prolog.fcl +++ b/Mu2eKinKal/fcl/prolog.fcl @@ -39,6 +39,7 @@ Mu2eKinKal : { SampleTolerance : 0.1 # tolerance for intersection sample (mm) SampleInRange : true # require sample be in time range SampleInBounds : false # require sample be in surface bounds + SaveTrajectory : "Full" # save the entire fit result trajectory in the KalSeed } CHSEEDFIT: { @@ -122,10 +123,8 @@ Mu2eKinKal : { DivergenceDeltaChisq : 10.0 DivergenceDeltaParams : 1e6 DivergenceGap : 10 # mm - BFieldCorrection : true -# BFieldCorrection : false + BFieldCorrection : false BCorrTolerance : 1e-2 # momemntum fraction -# ProcessEnds : true ProcessEnds : false MetaIterationSettings : [ # annealing temp, strawhit updater algorithm diff --git a/Mu2eKinKal/inc/KKFit.hh b/Mu2eKinKal/inc/KKFit.hh index 9b922c1b94..87b364f0a8 100644 --- a/Mu2eKinKal/inc/KKFit.hh +++ b/Mu2eKinKal/inc/KKFit.hh @@ -82,6 +82,7 @@ namespace mu2e { using EXING = KinKal::ElementXing; using EXINGPTR = std::shared_ptr; using EXINGCOL = std::vector; + enum SaveTraj {none=0, full, t0seg}; // construct from fit configuration objects explicit KKFit(KKFitConfig const& fitconfig); // helper functions used to create components of the fit @@ -141,6 +142,8 @@ namespace mu2e { double sampletbuff_; // simple time buffer; replace this with extrapolation TODO bool sampleinrange_, sampleinbounds_; // require samples to be in range or on surface SurfaceMap::SurfacePairCollection sample_; // surfaces to sample the fit + + SaveTraj savetraj_; // trajectory saving option }; template KKFit::KKFit(KKFitConfig const& fitconfig) : @@ -178,6 +181,14 @@ namespace mu2e { // geometry service eventually, TODO SurfaceMap smap; smap.surfaces(ssids,sample_); + + if (fitconfig.saveTraj() == "T0") { + savetraj_ = t0seg; + } else if (fitconfig.saveTraj() == "Full") { + savetraj_ = full; + } else { + savetraj_ = none; + } } template void KKFit::makeStrawHits(Tracker const& tracker,StrawResponse const& strawresponse,BFieldMap const& kkbf, KKStrawMaterial const& smat, @@ -497,14 +508,15 @@ namespace mu2e { // loop over track components and store them fseed._hits.reserve(kktrk.strawHits().size()); for(auto const& strawhit : kktrk.strawHits() ) { - Residual utres, udres; + Residual utres = strawhit->refResidual(Mu2eKinKal::tresid); + Residual udres = strawhit->refResidual(Mu2eKinKal::dresid); // compute unbiased residuals; this can fail if the track has marginal coverage if(kktrk.fitStatus().usable()) { try { udres = strawhit->residual(Mu2eKinKal::dresid); utres = strawhit->residual(Mu2eKinKal::tresid); } catch (std::exception const& error) { - std::cout << "Unbiased residual calculation failure, nDOF = " << fstatus.chisq_.nDOF() << std::endl; + std::cout << "Unbiased KKStrawHit residual calculation failure, nDOF = " << fstatus.chisq_.nDOF() << std::endl; } } fseed._hits.emplace_back(strawhit->strawHitIndex(),strawhit->hit(), @@ -526,7 +538,14 @@ namespace mu2e { hflag.merge(StrawHitFlag::doca); } // calculate the unbiased time residual - auto tres = (kktrk.fitStatus().usable()) ? calohit->residual(0) : calohit->refResidual(0); + Residual ctres = calohit->refResidual(0); + if(kktrk.fitStatus().usable()){ + try { + ctres = calohit->residual(0); + } catch (std::exception const& error) { + std::cout << "Unbiased KKCaloHit residual calculation failure, nDOF = " << fstatus.chisq_.nDOF() << std::endl; + } + } // calculate the cluster depth = distance along the crystal axis from the POCA to the back face of this disk (where the SiPM sits) double backz = calo.geomUtil().mu2eToTracker(calo.disk(calohit->caloCluster()->diskID()).geomInfo().backFaceCenter()).z(); // calculate the distance from POCA to the SiPM, along the crystal (Z) direction, and projected along the track @@ -536,7 +555,7 @@ namespace mu2e { clen,trklen, ca.tpData(), calohit->unbiasedClosestApproach().tpData(), - tres,ca.particleTraj().momentum3(ca.particleToca())); + ctres,ca.particleTraj().momentum3(ca.particleToca())); } fseed._straws.reserve(kktrk.strawXings().size()); for(auto const& sxing : kktrk.strawXings()) { @@ -561,11 +580,15 @@ namespace mu2e { dm.R(), sxing->active() ); } - // save the fit segments - fseed._segments.reserve(fittraj.pieces().size()); - for (auto const& traj : fittraj.pieces() ){ - // skip zero-range segments. By convention, sample the state at the mid-time - if(traj->range().range() > 0.0) fseed._segments.emplace_back(*traj,traj->range().mid()); + // save the fit segments as requested + if (savetraj_ == full){ + fseed._segments.reserve(fittraj.pieces().size()); + for (auto const& traj : fittraj.pieces() ){ + // skip zero-range segments. By convention, sample the state at the mid-time + if(traj->range().range() > 0.0) fseed._segments.emplace_back(*traj,traj->range().mid()); + } + } else if (savetraj_ == t0seg ) { + fseed._segments.emplace_back(t0piece,t0val); } sampleFit(kktrk,fseed._inters); return fseed; diff --git a/Mu2eKinKal/inc/KKFitSettings.hh b/Mu2eKinKal/inc/KKFitSettings.hh index db285c89f4..6ea418acd1 100644 --- a/Mu2eKinKal/inc/KKFitSettings.hh +++ b/Mu2eKinKal/inc/KKFitSettings.hh @@ -84,6 +84,7 @@ namespace mu2e { fhicl::Atom sampleTol { Name("SampleTolerance"), Comment("Tolerance for sample surface intersections (mm)") }; fhicl::Atom sampleTBuff { Name("SampleTimeBuffer"), Comment("Time buffer for sample intersections (nsec)") }; fhicl::Sequence sampleSurfaces { Name("SampleSurfaces"), Comment("When creating the KalSeed, sample the fit at these surfaces") }; + fhicl::Atom saveTraj { Name("SaveTrajectory"), Comment("How to save the trajectory in the KalSeed: None, Full, or T0 (just the t0 segment)") }; }; // struct for configuring a KinKal fit module struct KKModuleConfig { diff --git a/RecoDataProducts/inc/KalSeed.hh b/RecoDataProducts/inc/KalSeed.hh index 96e261931e..87ce143c79 100644 --- a/RecoDataProducts/inc/KalSeed.hh +++ b/RecoDataProducts/inc/KalSeed.hh @@ -47,6 +47,7 @@ namespace mu2e { double t0Val() const; float chisquared() const { return _chisq; } int nDOF() const { return _ndof; } + unsigned nHits(bool active=true) const; float fitConsistency() const { return _fitcon; } UInt_t nTrajSegments() const { return _segments.size(); } KinKal::TimeRange timeRange() const { return KinKal::TimeRange(_segments.front()._tmin,_segments.back()._tmax); } diff --git a/RecoDataProducts/src/KalSeed.cc b/RecoDataProducts/src/KalSeed.cc index 9d9c9154ab..f5cc80ff8f 100644 --- a/RecoDataProducts/src/KalSeed.cc +++ b/RecoDataProducts/src/KalSeed.cc @@ -44,6 +44,14 @@ namespace mu2e { return KLPTPtr(); } + unsigned KalSeed::nHits(bool active) const { + if(!active) return _hits.size(); + unsigned nactive(0); + for(auto const& hit : hits()) + if(hit.flag().hasAllProperties(StrawHitFlag::active))++nactive; + return nactive; + } + std::vector::const_iterator KalSeed::intersection(SurfaceId const& surfid) const{ auto retval = _inters.end(); for(auto iinter = _inters.begin(); iinter != _inters.end(); ++iinter) { diff --git a/TrkFilters/src/SeedFilter_module.cc b/TrkFilters/src/SeedFilter_module.cc index ca45c77cb3..026b701df6 100644 --- a/TrkFilters/src/SeedFilter_module.cc +++ b/TrkFilters/src/SeedFilter_module.cc @@ -112,37 +112,38 @@ namespace mu2e } for(auto iks = kscol->begin(); iks != kscol->end(); ++iks) { auto const& ks = *iks; - // get the first segment - KalSegment const& fseg = ks.segments().front(); - //check particle type and fitdirection - if ( (ks.particle() != _tpart) || (fseg.momentum3().Z()*_fdir.dzdt() < 0)) continue; - - // I should not be calculating NDOF here, this should be in an adapter, FIXME!! - unsigned nactive(0); - for(auto const& ish : ks.hits()) - if(ish.flag().hasAllProperties(StrawHitFlag::active))++nactive; - float ndof = std::max(1.0,nactive - 5.0); - if(_debug > 2){ - printf("[SeedFilter::filter] %4d %10.3f %10.3f %10.3f %10.3f %10.3f %10.3f \n", nactive, fseg.mom(), fseg.momerr(),ks.chisquared()/ndof, ks.fitConsistency(), fseg.helix().tanDip(), fseg.helix().d0()); - - } - if( ks.status().hasAllProperties(_goods) && - (!_hascc || ks.caloCluster().isNonnull()) && - nactive >= _minnhits && - fseg.mom() > _minmom && fseg.mom() < _maxmom && fseg.momerr() < _maxmomerr && - ks.chisquared()/ndof < _maxchi2dof && - ks.fitConsistency() > _minfitcons && - fseg.helix().tanDip() > _mintdip && fseg.helix().tanDip() < _maxtdip && - fseg.helix().d0() > _minD0 && fseg.helix().d0() < _maxD0 ) { - retval = true; - ++_npass; - // Fill the trigger info object - // associate to the helix which triggers. Note there may be other helices which also pass the filter - // but filtering is by event! - size_t index = std::distance(kscol->begin(),iks); - triginfo->_tracks.push_back(art::Ptr(ksH,index)); - if(_debug > 1){ - std::cout << moduleDescription().moduleLabel() << " passed event " << evt.id() << std::endl; + if( ks.status().hasAllProperties(_goods) && ks.intersections().size()>0){ + // get the first intersection + auto const& kinter = ks.intersections().front(); + // convert to LoopHeix; this is needed to get d0 cut (which shoudl be replaced FIXME) + KinKal::LoopHelix lh(kinter.pstate_, KinKal::VEC3(kinter.bnom_)); + auto momvec = kinter.momentum3(); + double td = 1.0/tan(momvec.Theta()); + double mom = momvec.R(); + double d0 = lh.minAxisDist(); + //check particle type and fitdirection + if ( (ks.particle() != _tpart) || (momvec.Z()*_fdir.dzdt() < 0)) continue; + unsigned nactive = ks.nHits(true); //count active hits + if(_debug > 2){ + printf("[SeedFilter::filter] %4d %10.3f %10.3f %10.3f %10.3f %10.3f %10.3f \n", nactive, mom, kinter.momerr(),ks.chisquared()/ks.nDOF(), ks.fitConsistency(), td, d0); + } + if( (!_hascc || ks.caloCluster().isNonnull()) && + nactive >= _minnhits && + mom > _minmom && mom < _maxmom && kinter.momerr() < _maxmomerr && + ks.chisquared()/ks.nDOF() < _maxchi2dof && // chisq/ndof isn't a statistically robust measure, this cut should be removed FIXME + ks.fitConsistency() > _minfitcons && + td > _mintdip && td < _maxtdip && + d0 > _minD0 && d0 < _maxD0) { // d0 is not a global geometric parameter and signed cuts have particle-species dependence. This should be replaced with a selection based on consistency with the stopping target FIXME + retval = true; + ++_npass; + // Fill the trigger info object + // associate to the helix which triggers. Note there may be other helices which also pass the filter + // but filtering is by event! + size_t index = std::distance(kscol->begin(),iks); + triginfo->_tracks.push_back(art::Ptr(ksH,index)); + if(_debug > 1){ + std::cout << moduleDescription().moduleLabel() << " passed event " << evt.id() << std::endl; + } } } } From fe300a8f3fd3ec748d7f83f58338c9b2217e0a44 Mon Sep 17 00:00:00 2001 From: David Nathan Brown Date: Thu, 28 Mar 2024 11:04:04 -0500 Subject: [PATCH 190/213] Small fix --- Mu2eKinKal/test/KKDrift.fcl | 2 -- 1 file changed, 2 deletions(-) diff --git a/Mu2eKinKal/test/KKDrift.fcl b/Mu2eKinKal/test/KKDrift.fcl index 3558ffe8ca..aa73c942f3 100644 --- a/Mu2eKinKal/test/KKDrift.fcl +++ b/Mu2eKinKal/test/KKDrift.fcl @@ -50,8 +50,6 @@ physics : FitType : LoopHelix diagLevel : 2 FillMCInfo : true - FillCRVHits : true - FillTrkQualInfo : false FillTrkPIDInfo : false FillHitInfo : true FillTriggerInfo : false From 3d55461da2a13b9ad1d1683712cb03380e592146 Mon Sep 17 00:00:00 2001 From: David Nathan Brown Date: Thu, 28 Mar 2024 14:24:58 -0500 Subject: [PATCH 191/213] fix config --- Mu2eKinKal/test/KKDrift.fcl | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Mu2eKinKal/test/KKDrift.fcl b/Mu2eKinKal/test/KKDrift.fcl index 95286255a1..bd888eb17d 100644 --- a/Mu2eKinKal/test/KKDrift.fcl +++ b/Mu2eKinKal/test/KKDrift.fcl @@ -55,8 +55,7 @@ physics : FillTriggerInfo : false branches : [ { input: "KK" -# branch : "trk" - branch : "dem" + branch : "trk" suffix : "DeM" options : { fillMC : true genealogyDepth : -1 } } From 09d4680c2e1d24e65243112db0b988794c347070 Mon Sep 17 00:00:00 2001 From: David Nathan Brown Date: Thu, 28 Mar 2024 18:10:04 -0500 Subject: [PATCH 192/213] Update envset --- .muse | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.muse b/.muse index b4ac1d7eab..8647f57904 100644 --- a/.muse +++ b/.muse @@ -1,5 +1,5 @@ # prefer to build with this environment -ENVSET p055 +ENVSET p056 # add Offline/bin to path PATH bin # recent commits can take enforce these flags From aca7ba300be6ecf37e7b5bbb68e00efb475ab95a Mon Sep 17 00:00:00 2001 From: David Nathan Brown Date: Sat, 30 Mar 2024 19:58:35 -0500 Subject: [PATCH 193/213] Don't extend NoField processing for now --- Mu2eKinKal/fcl/prolog.fcl | 1 + 1 file changed, 1 insertion(+) diff --git a/Mu2eKinKal/fcl/prolog.fcl b/Mu2eKinKal/fcl/prolog.fcl index 8ab5fb912f..f0aaf9d429 100644 --- a/Mu2eKinKal/fcl/prolog.fcl +++ b/Mu2eKinKal/fcl/prolog.fcl @@ -356,6 +356,7 @@ Mu2eKinKal : { ExtensionSettings : { @table::Mu2eKinKal.DRIFTEXT BFieldCorrection : false + ProcessEnds : false MetaIterationSettings : [ # annealing temp, strawhit updater algorithms [ 2.0, "CADSHU" ], From 5cba54c2ad90448d4ff0f9f38955efac419486d3 Mon Sep 17 00:00:00 2001 From: David Nathan Brown Date: Fri, 5 Apr 2024 22:49:15 -0500 Subject: [PATCH 194/213] Revert type change, which causes computation errors --- MCDataProducts/inc/MCRelationship.hh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/MCDataProducts/inc/MCRelationship.hh b/MCDataProducts/inc/MCRelationship.hh index ade906dd51..30d2df0604 100644 --- a/MCDataProducts/inc/MCRelationship.hh +++ b/MCDataProducts/inc/MCRelationship.hh @@ -14,7 +14,7 @@ namespace mu2e { typedef art::Ptr SPPtr; // values of relationship of 2 MC objects enum relation : int8_t {none=-1,same=0,daughter,mother,sibling,udaughter,umother,usibling}; - relation relationship() const { return _rel; } + relation relationship() const { return (relation)_rel; } int8_t removal() const { return _rem; } // relationship generational distance // convenience operators bool operator ==(MCRelationship const& other ) const { return _rel == other._rel; } @@ -41,7 +41,7 @@ namespace mu2e { // from the mixture MCRelationship(StrawDigiMC const& mcd, SPPtr const& spp); private: - relation _rel = none; // relationship + int8_t _rel = none; // relationship int8_t _rem = -1; // distance between relationship }; } From 1af59eaa43960d989d2a324c85b57d48bc7c4107 Mon Sep 17 00:00:00 2001 From: Ray Culbertson Date: Thu, 11 Apr 2024 17:09:20 -0500 Subject: [PATCH 195/213] add trk align sim and crv tables --- DbService/data/create.sql | 76 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 76 insertions(+) diff --git a/DbService/data/create.sql b/DbService/data/create.sql index 21e2174fe3..7e0f508f16 100644 --- a/DbService/data/create.sql +++ b/DbService/data/create.sql @@ -16,6 +16,9 @@ GRANT USAGE ON SCHEMA trk TO PUBLIC; CREATE SCHEMA sim; GRANT USAGE ON SCHEMA sim TO PUBLIC; +CREATE SCHEMA crv; +GRANT USAGE ON SCHEMA crv TO PUBLIC; + -- rows are calibration tables CREATE TABLE val.tables (tid SERIAL, @@ -245,6 +248,42 @@ CREATE TABLE trk.alignstraw GRANT SELECT ON trk.alignstraw TO PUBLIC; GRANT INSERT ON trk.alignstraw TO trk_role; +-- tracker sim alignment + +CREATE TABLE trk.aligntrackersim + (cid INTEGER, index INTEGER, strawid TEXT, + dx NUMERIC, dy NUMERIC, dz NUMERIC, + rx NUMERIC, ry NUMERIC, rz NUMERIC, + CONSTRAINT trk_aligntrackersim_pk PRIMARY KEY (cid,index) ); +GRANT SELECT ON trk.aligntrackersim TO PUBLIC; +GRANT INSERT ON trk.aligntrackersim TO trk_role; + +CREATE TABLE trk.alignplanesim + (cid INTEGER, index INTEGER, strawid TEXT, + dx NUMERIC, dy NUMERIC, dz NUMERIC, + rx NUMERIC, ry NUMERIC, rz NUMERIC, + CONSTRAINT trk_alignplanesim_pk PRIMARY KEY (cid,index) ); +GRANT SELECT ON trk.alignplanesim TO PUBLIC; +GRANT INSERT ON trk.alignplanesim TO trk_role; + +CREATE TABLE trk.alignpanelsim + (cid INTEGER, index INTEGER, strawid TEXT, + dx NUMERIC, dy NUMERIC, dz NUMERIC, + rx NUMERIC, ry NUMERIC, rz NUMERIC, + CONSTRAINT trk_alignpanelsim_pk PRIMARY KEY (cid,index) ); +GRANT SELECT ON trk.alignpanelsim TO PUBLIC; +GRANT INSERT ON trk.alignpanelsim TO trk_role; + +CREATE TABLE trk.alignstrawsim + (cid INTEGER, index INTEGER, StrawId TEXT, + wire_cal_dV NUMERIC, wire_cal_dW NUMERIC, + wire_hv_dV NUMERIC, wire_hv_dW NUMERIC, + straw_cal_dV NUMERIC, straw_cal_dW NUMERIC, + straw_hv_dV NUMERIC, straw_hv_dW NUMERIC, + CONSTRAINT trk_alignstrawsim_pk PRIMARY KEY (cid,index) ); +GRANT SELECT ON trk.alignstrawsim TO PUBLIC; +GRANT INSERT ON trk.alignstrawsim TO trk_role; + -- tracker component status CREATE TABLE trk.panelstatus @@ -299,3 +338,40 @@ CREATE TABLE sim.efficiencies2 CONSTRAINT sim_efficiencies2_pk PRIMARY KEY (cid,tag) ); GRANT SELECT ON sim.efficiencies2 TO PUBLIC; GRANT INSERT ON sim.efficiencies2 TO sim_role; + +-- +-- crv schema tables +-- + + +-- crv calibration table added 3/2024 + +CREATE TABLE crv.badchan + (cid INTEGER, + channel INTEGER, status INTEGER, + CONSTRAINT crv_badchan_pk PRIMARY KEY (cid,channel) ); +GRANT SELECT ON crv.badchan TO PUBLIC; +GRANT INSERT ON crv.badchan TO crv_role; + +CREATE TABLE crv.sipm + (cid INTEGER, + channel INTEGER, + pedestal NUMERIC, pulseheight NUMERIC, pulsearea NUMERIC, + CONSTRAINT crv_sipm_pk PRIMARY KEY (cid,channel) ); +GRANT SELECT ON crv.sipm TO PUBLIC; +GRANT INSERT ON crv.sipm TO crv_role; + +CREATE TABLE crv.photon + (cid INTEGER, + channel INTEGER, photonyielddeviation NUMERIC, + CONSTRAINT crv_photon_pk PRIMARY KEY (cid,channel) ); +GRANT SELECT ON crv.photon TO PUBLIC; +GRANT INSERT ON crv.photon TO crv_role; + +CREATE TABLE crv.time + (cid INTEGER, + channel INTEGER, timeoffset NUMERIC, + CONSTRAINT crv_time_pk PRIMARY KEY (cid,channel) ); +GRANT SELECT ON crv.time TO PUBLIC; +GRANT INSERT ON crv.time TO crv_role; + From 765e98afbcb87a103e7c588ab54a240977a544c8 Mon Sep 17 00:00:00 2001 From: Andrei Gaponenko Date: Fri, 12 Apr 2024 13:54:55 -0500 Subject: [PATCH 196/213] Pass TFileService by its handle instead of handle reference. Passing a *handle* by address instead of by value probably does not affect code performance in a measurable way, but loses functionality: member initialization like the following example does not work with the extraneous '&' MyAnalyzer::MyAnalyzer(const Parameters& conf, const art::ProcessingFrame&) : SharedAnalyzer{conf} , myhisto_{compressPDGCodeHisto(art::ServiceHandle())} , .... { ... } --- Mu2eUtilities/inc/compressPdgId.hh | 2 +- Mu2eUtilities/src/compressPdgId.cc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Mu2eUtilities/inc/compressPdgId.hh b/Mu2eUtilities/inc/compressPdgId.hh index 48b505f157..bb1f357c98 100644 --- a/Mu2eUtilities/inc/compressPdgId.hh +++ b/Mu2eUtilities/inc/compressPdgId.hh @@ -15,7 +15,7 @@ namespace mu2e { CompressedPDGCode::enum_type compressPDGCode(PDGCode::enum_type pdgId); // a histogram with text labels, ready for use with CompressedPDGCode - TH1D* compressPDGCodeHisto(art::ServiceHandle& tfs, + TH1D* compressPDGCodeHisto(art::ServiceHandle tfs, std::string name="compPdgId", std::string title="Compressed PDG ID"); diff --git a/Mu2eUtilities/src/compressPdgId.cc b/Mu2eUtilities/src/compressPdgId.cc index 85748054b6..008f45f853 100644 --- a/Mu2eUtilities/src/compressPdgId.cc +++ b/Mu2eUtilities/src/compressPdgId.cc @@ -74,7 +74,7 @@ namespace mu2e { return code; } - TH1D* compressPDGCodeHisto(art::ServiceHandle& tfs, + TH1D* compressPDGCodeHisto(art::ServiceHandle tfs, std::string name, std::string title) { float low = float(CompressedPDGCode::minBin) - 0.5; From b21906338c404e61503bd155d5250ee067ee8073 Mon Sep 17 00:00:00 2001 From: David Nathan Brown Date: Fri, 12 Apr 2024 14:02:08 -0500 Subject: [PATCH 197/213] Add module to merge multiple KalSeed collections into a single Ptr collection --- RecoDataProducts/inc/KalSeed.hh | 2 + RecoDataProducts/src/classes_def.xml | 5 ++- TrkReco/src/MergeKalSeeds_module.cc | 64 ++++++++++++++++++++++++++++ 3 files changed, 69 insertions(+), 2 deletions(-) create mode 100644 TrkReco/src/MergeKalSeeds_module.cc diff --git a/RecoDataProducts/inc/KalSeed.hh b/RecoDataProducts/inc/KalSeed.hh index 87ce143c79..14d5a826c8 100644 --- a/RecoDataProducts/inc/KalSeed.hh +++ b/RecoDataProducts/inc/KalSeed.hh @@ -94,5 +94,7 @@ namespace mu2e { float _flt0 = 0.0; // flight distance where the track crosses the tracker midplane (z=0). Redundant with t0 in KinKal fits, and in the wrong unit }; typedef std::vector KalSeedCollection; + typedef art::Ptr KalSeedPtr; + typedef std::vector KalSeedPtrCollection; } #endif diff --git a/RecoDataProducts/src/classes_def.xml b/RecoDataProducts/src/classes_def.xml index e9bea6546e..3a4796fe02 100644 --- a/RecoDataProducts/src/classes_def.xml +++ b/RecoDataProducts/src/classes_def.xml @@ -211,9 +211,10 @@ - - + + + diff --git a/TrkReco/src/MergeKalSeeds_module.cc b/TrkReco/src/MergeKalSeeds_module.cc new file mode 100644 index 0000000000..2fa728acdb --- /dev/null +++ b/TrkReco/src/MergeKalSeeds_module.cc @@ -0,0 +1,64 @@ +// +// Merge KalSeeds from different reconstruction paths. +// This module produces an indirect (Ptr) collection, not a deep copy, to keep from break provenance or MC truth associations +// Note that, when persisting merged collections created by this module, the KalSeed object collections merged here MUST ALSO BE PERSISTED in +// order for the references to not be broken. +// Note too that the MC truth association of these KalSeeds ARE NOT MERGED by this module. This is to avoid making reco code depend on MC. +// There is a separate module which merges the Assns between the KalSeeds referenced by the output of this module and the associated KalSeedMCs. +// original author: D. Brown (LBNL) +// +#include "fhiclcpp/types/Atom.h" +#include "fhiclcpp/types/Sequence.h" +#include "canvas/Utilities/InputTag.h" +#include "canvas/Persistency/Common/Ptr.h" +#include "art/Framework/Core/EDProducer.h" +#include "art/Framework/Principal/Event.h" +#include "art/Framework/Principal/Handle.h" +// mu2e data products +#include "Offline/RecoDataProducts/inc/KalSeed.hh" +#include "Offline/Mu2eUtilities/inc/LsqSums4.hh" +// C++ +#include + +namespace mu2e { + class MergeKalSeeds : public art::EDProducer { + public: + using Name=fhicl::Name; + using Comment=fhicl::Comment; + struct Config { + fhicl::Atom debug{ Name("debugLevel"), Comment("Debug Level"), 0}; + fhicl::Sequence seedCollTags {Name("KalSeedCollections"), Comment("KalSeed collections tomerge") }; + }; + using Parameters = art::EDProducer::Table; + explicit MergeKalSeeds(const Parameters& conf); + void produce(art::Event& evt) override; + private: + int debug_; + std::vector seedcolltags_; + }; + + MergeKalSeeds::MergeKalSeeds(const Parameters& config) : art::EDProducer{config}, debug_(config().debug()) + { + for(auto const& seedcolltag :config().seedCollTags()){ + consumes (seedcolltag); + seedcolltags_.push_back(seedcolltag); + if(debug_ > 0) std::cout << "Merging KalSeeds from " << seedcolltag << std::endl; + } + produces (); + } + + void MergeKalSeeds::produce(art::Event& event) { + // create output + std::unique_ptr mkseeds(new KalSeedPtrCollection); + // loop over input KalSeed collections + for(auto const& seedcolltag : seedcolltags_) { + auto const& ksch = event.getValidHandle(seedcolltag); + auto const& ksc = *ksch; + if(debug_ > 2) std::cout << seedcolltag << " Has " << ksc.size() << " KalSeeds" << std::endl; + for(size_t ikseed = 0; ikseed emplace_back(ksch,ikseed); } + } + if(debug_ > 1) std::cout << "Merged " << mkseeds->size() << " KalSeeds" << std::endl; + event.put(std::move(mkseeds)); + } +} +DEFINE_ART_MODULE(mu2e::MergeKalSeeds) From 73a5d379a74f9fae4141ba4476a0743a41546a6e Mon Sep 17 00:00:00 2001 From: Richard Bonventre Date: Fri, 12 Apr 2024 16:18:51 -0500 Subject: [PATCH 198/213] Enable AlignedTrackerSim db --- TrackerConditions/fcl/prolog.fcl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/TrackerConditions/fcl/prolog.fcl b/TrackerConditions/fcl/prolog.fcl index 6882bdf427..2aaefb60bf 100644 --- a/TrackerConditions/fcl/prolog.fcl +++ b/TrackerConditions/fcl/prolog.fcl @@ -27,7 +27,7 @@ AlignedTracker : { AlignedTrackerSim : { verbose : 0 - useDb : false + useDb : true onlyWireOffsets : true } From 3d344e7fbf5c82ea5c2717f27415337f3995eddd Mon Sep 17 00:00:00 2001 From: David Nathan Brown Date: Sat, 13 Apr 2024 14:58:43 -0500 Subject: [PATCH 199/213] small tweaks and add test --- TrkReco/src/MergeKalSeeds_module.cc | 3 +-- TrkReco/test/TestMergeKalSeeds.fcl | 35 +++++++++++++++++++++++++++++ 2 files changed, 36 insertions(+), 2 deletions(-) create mode 100644 TrkReco/test/TestMergeKalSeeds.fcl diff --git a/TrkReco/src/MergeKalSeeds_module.cc b/TrkReco/src/MergeKalSeeds_module.cc index 2fa728acdb..7e1bc8951f 100644 --- a/TrkReco/src/MergeKalSeeds_module.cc +++ b/TrkReco/src/MergeKalSeeds_module.cc @@ -5,7 +5,7 @@ // order for the references to not be broken. // Note too that the MC truth association of these KalSeeds ARE NOT MERGED by this module. This is to avoid making reco code depend on MC. // There is a separate module which merges the Assns between the KalSeeds referenced by the output of this module and the associated KalSeedMCs. -// original author: D. Brown (LBNL) +// original author: D. Brown (LBNL) 2024 // #include "fhiclcpp/types/Atom.h" #include "fhiclcpp/types/Sequence.h" @@ -16,7 +16,6 @@ #include "art/Framework/Principal/Handle.h" // mu2e data products #include "Offline/RecoDataProducts/inc/KalSeed.hh" -#include "Offline/Mu2eUtilities/inc/LsqSums4.hh" // C++ #include diff --git a/TrkReco/test/TestMergeKalSeeds.fcl b/TrkReco/test/TestMergeKalSeeds.fcl new file mode 100644 index 0000000000..4719793168 --- /dev/null +++ b/TrkReco/test/TestMergeKalSeeds.fcl @@ -0,0 +1,35 @@ +# +#Simple test of MergeKalSeeds. run as; +# mu2e -c Offline/TrkReco/test/TestMergeKalSeeds.fcl --source "mcs.yourfile.art" --nevts 100 +# +#include "Offline/fcl/minimalMessageService.fcl" +#include "Offline/fcl/standardServices.fcl" +#include "Production/JobConfig/reco/prolog.fcl" +#include "Offline/Mu2eKinKal/fcl/prolog.fcl" +#include "TrkAna/fcl/prolog.fcl" + +process_name: MKS +source : { module_type : RootInput } +services : @local::Services.Reco +physics : +{ + producers : { + MergeKalSeeds : { + module_type : MergeKalSeeds + debugLevel : 2 + KalSeedCollections : ["KKDeM", "KKDeP", "KKUeM", "KKUeP", "KKDmuM", "KKDmuP", "KKUmuM", "KKUmuP" ] + } + } + TPath : [ MergeKalSeeds ] + EPath : [ MergedOutput ] +} +outputs : { + MergedOutput : { + module_type : RootOutput + SelectEvents : [ "TPath" ] + outputCommands : [ "keep *_*_*_*" ] + fileName : "mcs.owner.MergedKalSeeds.version.sequencer.art" + } +} +physics.trigger_paths : [ TPath ] +physics.end_paths : [ EPath ] From 678e91758cc1b064682b0a500afc8046e578d4a4 Mon Sep 17 00:00:00 2001 From: David Nathan Brown Date: Sat, 13 Apr 2024 15:03:49 -0500 Subject: [PATCH 200/213] Correct comment --- TrkReco/src/MergeKalSeeds_module.cc | 2 -- 1 file changed, 2 deletions(-) diff --git a/TrkReco/src/MergeKalSeeds_module.cc b/TrkReco/src/MergeKalSeeds_module.cc index 7e1bc8951f..d5b935db83 100644 --- a/TrkReco/src/MergeKalSeeds_module.cc +++ b/TrkReco/src/MergeKalSeeds_module.cc @@ -3,8 +3,6 @@ // This module produces an indirect (Ptr) collection, not a deep copy, to keep from break provenance or MC truth associations // Note that, when persisting merged collections created by this module, the KalSeed object collections merged here MUST ALSO BE PERSISTED in // order for the references to not be broken. -// Note too that the MC truth association of these KalSeeds ARE NOT MERGED by this module. This is to avoid making reco code depend on MC. -// There is a separate module which merges the Assns between the KalSeeds referenced by the output of this module and the associated KalSeedMCs. // original author: D. Brown (LBNL) 2024 // #include "fhiclcpp/types/Atom.h" From fea41e6a197ebf0d8c70c402908c089ea4b99b12 Mon Sep 17 00:00:00 2001 From: Gianantonio Pezzullo Date: Mon, 15 Apr 2024 08:01:26 -0500 Subject: [PATCH 201/213] clean up of deprecated fcl files --- CaloFilters/fcl/runCaloOnlyFilter.fcl | 77 ---------------- CommonMC/fcl/prolog_trigger.fcl | 26 ------ TrkFilters/fcl/ReadDigis.fcl | 95 ------------------- TrkFilters/fcl/ReadDigisCalo.fcl | 126 -------------------------- TrkReco/fcl/prolog_trigger.fcl | 77 ---------------- 5 files changed, 401 deletions(-) delete mode 100644 CaloFilters/fcl/runCaloOnlyFilter.fcl delete mode 100644 CommonMC/fcl/prolog_trigger.fcl delete mode 100644 TrkFilters/fcl/ReadDigis.fcl delete mode 100644 TrkFilters/fcl/ReadDigisCalo.fcl delete mode 100644 TrkReco/fcl/prolog_trigger.fcl diff --git a/CaloFilters/fcl/runCaloOnlyFilter.fcl b/CaloFilters/fcl/runCaloOnlyFilter.fcl deleted file mode 100644 index 303d4c72da..0000000000 --- a/CaloFilters/fcl/runCaloOnlyFilter.fcl +++ /dev/null @@ -1,77 +0,0 @@ -# -*- mode:tcl -*- -#------------------------------------------------------------------------------ -# performs the calorimeter and track reconstruciton -#------------------------------------------------------------------------------ -# > mu2e --config CaloFilters/fcl/runCaloOnlyFilter.fcl --source "your digis file" --TFile CaloOnlyFilter.root --nevts=100 -#include "Offline/fcl/minimalMessageService.fcl" -#include "Offline/fcl/standardServices.fcl" -#include "Offline/fcl/standardProducers.fcl" -#include "Offline/TrkHitReco/fcl/prolog_trigger.fcl" -#include "Offline/CaloCluster/fcl/prolog_trigger.fcl" - -BEGIN_PROLOG -#prescale factors for the calorimeter-only trigger -caloOnly_evt_sf : 1 -caloOnly_sf : 1 -#prescale factors for the cosmic muon calibration -caloCosmicMuon_evt_sf : 1 -caloCosmicMuon_sf : 1 -#prescale factors for the caloDigi count filter -cDCount_evt_sf : 500 -cDCount_sf : 1 -#prescale factors for the "large" caloDigi counter filter -largeCDCount_evt_sf : 500 -largeCDCount_sf : 1 -END_PROLOG - -#include "Offline/CaloFilters/fcl/prolog_trigger.fcl" - -process_name : caloOnlyFilter - -source : -{ - module_type : RootInput -} -# we don't need any simulation services for this job -#services : @local::Services.Reco - -services : @local::Services.SimAndReco - - -# timing information -services.TimeTracker : { - dbOutput : { - filename : "ReadCaloDigis.db" - overwrite : true - } -} - -services.scheduler.wantSummary: true - -producers : { @table::CaloFilters.producers } -filters : { @table::CaloFilters.filters } -paths : { @table::CaloFilters.sequences } - - -physics : { - producers: { - @table::producers - @table::CaloClusterTrigger.producers - @table::TrkHitRecoTrigger.producers - } - - filters : { @table::filters } - - caloOnly_path : [ FetchCaloDigis, @sequence::paths.caloOnly ] - - caloMixed_path : [ FetchCaloDigis, @sequence::paths.caloMixed ] - - out : [ ] - end_paths : [ out ] -} - - -services.TFileService.fileName : "readCaloDigis.root" -services.SeedService.baseSeed : 8 -services.SeedService.maxUniqueEngines : 20 - diff --git a/CommonMC/fcl/prolog_trigger.fcl b/CommonMC/fcl/prolog_trigger.fcl deleted file mode 100644 index 7965f5e90f..0000000000 --- a/CommonMC/fcl/prolog_trigger.fcl +++ /dev/null @@ -1,26 +0,0 @@ -# -# Trigger specific: used for trigger MC-truth based diagnostics -# -#include "Offline/CommonMC/fcl/prolog.fcl" -BEGIN_PROLOG -CommonMCTrigger : { - TTSelectRecoMC : { - @table::CommonMC.SelectRecoMC - TrkOnly : true - CaloClusterMinE : 10.0 - SaveEnergySteps : false - SaveUnusedDigiMCs : false - SaveAllUnusedDigiMCs : false - PrimaryParticle : "compressDigiMCs" - StrawDigiCollection : "makeSD" - ComboHitCollection : "TTflagBkgHits" - CaloDigiCollection : "CaloDigiMaker" - CaloClusterCollection : "CaloClusterFast" - StrawDigiMCCollection : "compressDigiMCs" - CrvDigiCollection : "CrvDigi" - CrvDigiMCCollection : "compressDigiMCs" - CrvCoincidenceClusterCollections : [ "CrvCoincidenceClusterFinder" ] - VDSPCollection : "compressDigiMCs:virtualdetector" - } -} -END_PROLOG diff --git a/TrkFilters/fcl/ReadDigis.fcl b/TrkFilters/fcl/ReadDigis.fcl deleted file mode 100644 index b3f071127c..0000000000 --- a/TrkFilters/fcl/ReadDigis.fcl +++ /dev/null @@ -1,95 +0,0 @@ -# -# Read Tracker digis and run the track trigger prototype -# -# > mu2e --config TrkFilters/fcl/ReadDigis.fcl --source "your digis file" --TFile ReadDigis.root --nevts=100 -# -#include "Offline/fcl/minimalMessageService.fcl" -#include "Offline/fcl/standardServices.fcl" -#include "Offline/fcl/standardProducers.fcl" -#include "Offline/CaloCluster/fcl/prolog_trigger.fcl" -#include "Offline/TrkHitReco/fcl/prolog.fcl" -#include "Offline/TrkPatRec/fcl/prolog.fcl" - - -BEGIN_PROLOG -#prescale factor fot the tracker-only track triggers -# downstream e- -tprDeMSeed_evt_sf : 1 -tprDeMSeed_sf : 1 -# downstream e+ -tprDePSeed_evt_sf : 1 -tprDePSeed_sf : 1 -#prescale factor fot the calo-seeded track triggers -# downstream e- -cprDeMSeed_evt_sf : 1 -cprDeMSeed_sf : 1 -# downstream e+ -cprDePSeed_evt_sf : 1 -cprDePSeed_sf : 1 -END_PROLOG - -#include "Offline/TrkHitReco/fcl/prolog_trigger.fcl" -#include "Offline/TrkPatRec/fcl/prolog_trigger.fcl" -#include "Offline/TrkFilters/fcl/prolog_trigger.fcl" -#include "Offline/TrkDiag/fcl/prolog.fcl" - -process_name : ReadDigis - -source : -{ - module_type : RootInput -} -# we don't need any simulation services for this job -#services : @local::Services.Reco - -services : @local::Services.SimAndReco - -# timing information -services.TimeTracker : { - dbOutput : { - filename : "ReadDigis.db" - overwrite : true - } -} -# setup modules needed to filter tracks -physics : -{ - producers : { - @table::TrkHitRecoTrigger.producers - @table::Tracking.producers - @table::TprTrigger.producers - @table::CaloClusterTrigger.producers - - RSD : { - module_type : ReadStrawDigi - } - - } - filters : { - @table::TrkFilters.filters - } - # analyzers : { - # TrkTriggerDiag : { - # module_type : TrkTriggerDiag - # } - # } -} - -# create a trigger test path. Note that physics.trigger_paths and physics.end_paths are not used, art will -# create those automatically from all the defined paths - -physics.TCTrigPath : [ TPRFetchDigis, @sequence::TrkFilters.sequences.tprTC ] - -physics.PHTrigPath : [ TPRFetchDigis, @sequence::TrkFilters.sequences.tprPosHelix ] - -physics.DeMSeedTrigPath : [ TPRFetchDigis, @sequence::TrkFilters.sequences.tprDeMSeed ] - -#physics.DeMKalTrigPath : [ @sequence::Tracking.Trigger.DeMKal ] -physics.DePSeedTrigPath : [ TPRFetchDigis, @sequence::TrkFilters.sequences.tprDePSeed ] - -# analysis path: this is for monitoring only -# physics.ReadDigisEndPath : [ TrkTriggerDiag ] - -services.TFileService.fileName : "readDigis.hist" -services.SeedService.baseSeed : 8 -services.SeedService.maxUniqueEngines : 20 diff --git a/TrkFilters/fcl/ReadDigisCalo.fcl b/TrkFilters/fcl/ReadDigisCalo.fcl deleted file mode 100644 index 7d1e97545c..0000000000 --- a/TrkFilters/fcl/ReadDigisCalo.fcl +++ /dev/null @@ -1,126 +0,0 @@ -# -# Read Tracker digis and run the track trigger prototype -# -# > mu2e --config TrkFilters/fcl/ReadDigis.fcl --source "your digis file" --TFile ReadDigis.root --nevts=100 -# -#include "Offline/fcl/minimalMessageService.fcl" -#include "Offline/fcl/standardServices.fcl" -#include "Offline/fcl/standardProducers.fcl" -#include "Offline/TrkHitReco/fcl/prolog.fcl" -#include "Offline/TrkPatRec/fcl/prolog_trigger.fcl" -#include "Offline/TrkFilters/fcl/prolog.fcl" -#include "Offline/TrkDiag/fcl/prolog.fcl" - -process_name : ReadDigis - -source : -{ - module_type : RootInput -} -# we don't need any simulation services for this job -services : @local::Services.Reco - -services : { - message : @local::default_message - # TFileService : { fileName : "e11s6220.hist" } - TFileService : { fileName : "/mu2e/data/users/gianipez/hist/readDigis.hist" } - - RandomNumberGenerator : {defaultEngineKind: "MixMaxRng" } - # Timing : { } - - GeometryService : { inputFile : "Offline/Mu2eG4/geom/geom_common.txt" } - ConditionsService : { conditionsfile : "Offline/ConditionsService/data/conditions_01.txt" } - GlobalConstantsService : { inputFile : "Offline/GlobalConstantsService/data/globalConstants_01.txt" } - Mu2eG4Helper : { } - BTrkHelper : @local::BTrkHelperDefault - SeedService : { @table::automaticSeeds - baseSeed : 8 - maxUniqueEngines : 20 - } - -} - -# timing information -services.TimeTracker : { - dbOutput : { - filename : "ReadDigisCalo.db" - overwrite : true - } -} -# setup modules needed to filter tracks -physics : -{ - producers : { - @table::TrkHitReco.producers - @table::Tracking.TrkTrigger.producers - @table::CalPatRec.producers - @table::CaloClusterTrigger.producers - - TTKSFDeM : @local::TTKSF - TTKSFDeP : @local::TTKSF - RSD : { - module_type : ReadStrawDigi - } - - # TThelixFinder : { @table::Tracking.TrkTrigger.producers.TThelixFinder - # reducedchi2 : 1 - - # RobustHelixFit : { - # # diagLevel : 1 - # refineXYFit : 1 - # refineZPhiFit : 1 - # } - # } - - } - filters : { - @table::TrkTrigger.Filters - @table::CalPatRec.filters - } - # analyzers : { - # TrkTriggerDiag : { - # module_type : TrkTriggerDiag - # } - # } -} - -physics.filters.PosHelixFilter.MinMomentum : 10.0 -physics.filters.NegHelixFilter.MinMomentum : 10.0 -physics.filters.PosHelixFilter.MinNHits : 10.0 -physics.filters.NegHelixFilter.MinNHits : 10.0 -physics.filters.DeMSeedFilter.MinMomentum : 10.0 -physics.filters.DePSeedFilter.MinMomentum : 10.0 - -physics.producers.TTtimeClusterFinder.UseCaloCluster : true - -physics.producers.TTKSFDeM.SeedCollection : "TThelixFinder:Positive" -physics.producers.TTKSFDeM.fitparticle : @local::Particle.eminus -physics.producers.TTKSFDeM.fitdirection : @local::FitDir.downstream -physics.producers.TTKSFDeM.KalFit.MaxIterations : 1 - -physics.producers.TTKSFDeP.SeedCollection : "TThelixFinder:Negative" -physics.producers.TTKSFDeP.fitparticle : @local::Particle.eplus -physics.producers.TTKSFDeP.fitdirection : @local::FitDir.downstream -physics.producers.TTKSFDeP.KalFit.MaxIterations : 1 - -physics.filters.CalTimePeakFinder.caloClusterModuleLabel : "CaloClusterFast" -# create a trigger test path. Note that physics.trigger_paths and physics.end_paths are not used, art will -# create those automatically from all the defined paths - -physics.TCTrigPath : [ RSD, @sequence::TrkTrigger.Sequences.TCFilterSequence ] - -physics.PHTrigPath : [ RSD, @sequence::TrkTrigger.Sequences.PosHelixFilterSequence ] - -physics.DeMSeedTrigPath : [RSD, @sequence::TrkTrigger.Sequences.DeMSeedFilterSequence ] - -#physics.DeMKalTrigPath : [ @sequence::Tracking.Trigger.DeMKalFilterSequence ] -physics.DePSeedTrigPath : [RSD, @sequence::TrkTrigger.Sequences.DePSeedFilterSequence ] - -physics.CPRDeMSeedTrigPath : [RSD, @sequence::TrkTrigger.Sequences.CPRDeMSeedFilterSequence ] -physics.CPRDePSeedTrigPath : [RSD, @sequence::TrkTrigger.Sequences.CPRDePSeedFilterSequence ] - - - -# analysis path: this is for monitoring only -# physics.ReadDigisEndPath : [ TrkTriggerDiag ] - diff --git a/TrkReco/fcl/prolog_trigger.fcl b/TrkReco/fcl/prolog_trigger.fcl deleted file mode 100644 index 0cc5a67905..0000000000 --- a/TrkReco/fcl/prolog_trigger.fcl +++ /dev/null @@ -1,77 +0,0 @@ -#include "Offline/TrkReco/fcl/prolog.fcl" -BEGIN_PROLOG - -TrkRecoTrigger : { - - TTrobustHelixFit : { - @table::TrkReco.RobustHelixFit - } - - - producers : { - # these module instance allows to remove the helix duplicates - # from the output of the helix finders. - # We need an instance for each track trigger sequence - TTHelixMergerUeM : { - @table::TrkReco.producers.MergeHelices - HelixFinders : [ "TThelixFinderUe:Negative" ] - } - - TTHelixMergerUeP : { - @table::TrkReco.producers.MergeHelices - HelixFinders : [ "TThelixFinderUe:Positive" ] - } - - TTHelixMergerDeM : { - @table::TrkReco.producers.MergeHelices - HelixFinders : [ "TThelixFinder:Positive" ] - } - - TTHelixMergerDeP : { - @table::TrkReco.producers.MergeHelices - HelixFinders : [ "TThelixFinder:Negative" ] - } - - TTHelixUCCMergerDeM : { - @table::TrkReco.producers.MergeHelices - HelixFinders : [ "TThelixFinderUCC:Positive" ] - } - - TTHelixUCCMergerDeP : { - @table::TrkReco.producers.MergeHelices - HelixFinders : [ "TThelixFinderUCC:Negative" ] - } - - TTCalHelixMergerDeM : { - @table::TrkReco.producers.MergeHelices - HelixFinders : [ "TTCalHelixFinderDe:Positive" ] - } - - TTCalHelixMergerDeP : { - @table::TrkReco.producers.MergeHelices - HelixFinders : [ "TTCalHelixFinderDe:Negative" ] - } - - TTCalHelixMergerUeM : { - @table::TrkReco.producers.MergeHelices - HelixFinders : [ "TTCalHelixFinderUe:Negative" ] - } - - TTCalHelixMergerUeP : { - @table::TrkReco.producers.MergeHelices - HelixFinders : [ "TTCalHelixFinderUe:Positive" ] - } - - TTCalHelixUCCMergerDeM : { - @table::TrkReco.producers.MergeHelices - HelixFinders : [ "TTCalHelixFinderUCCDe:Positive" ] - } - - TTCalHelixUCCMergerDeP : { - @table::TrkReco.producers.MergeHelices - HelixFinders : [ "TTCalHelixFinderUCCDe:Negative" ] - } - } -} - -END_PROLOG From b0bd76d2674dca3d6f7d7235fca1d856c2be7615 Mon Sep 17 00:00:00 2001 From: David Nathan Brown Date: Mon, 15 Apr 2024 14:40:13 -0500 Subject: [PATCH 202/213] Add protection against tracks with too few usable hits --- Mu2eKinKal/fcl/prolog.fcl | 1 + Mu2eKinKal/inc/HelixFit_module.hh | 117 +++++++++++++++--------------- Mu2eKinKal/inc/KKFit.hh | 11 ++- Mu2eKinKal/inc/KKFitSettings.hh | 1 + Mu2eKinKal/inc/KKStrawHit.hh | 1 + 5 files changed, 70 insertions(+), 61 deletions(-) diff --git a/Mu2eKinKal/fcl/prolog.fcl b/Mu2eKinKal/fcl/prolog.fcl index f0aaf9d429..9b85aabbd3 100644 --- a/Mu2eKinKal/fcl/prolog.fcl +++ b/Mu2eKinKal/fcl/prolog.fcl @@ -14,6 +14,7 @@ Mu2eKinKal : { KKFIT: { PrintLevel : 0 TPOCAPrecision : 1e-4 # mm + MinNStrawHits : 5 UseCaloCluster : true MaterialCorrection : true AddHits : true diff --git a/Mu2eKinKal/inc/HelixFit_module.hh b/Mu2eKinKal/inc/HelixFit_module.hh index 0f0513778b..7637d0ea62 100644 --- a/Mu2eKinKal/inc/HelixFit_module.hh +++ b/Mu2eKinKal/inc/HelixFit_module.hh @@ -100,7 +100,7 @@ namespace mu2e { // extend the generic module configuration as needed struct KKHelixModuleConfig : KKModuleConfig { fhicl::Sequence seedCollections {Name("HelixSeedCollections"), Comment("Seed fit collections to be processed ") }; - fhicl::OptionalAtom fixedBField { Name("ConstantBField"), Comment("Constant BField value") }; + fhicl::OptionalAtom fixedBField { Name("ConstantBField"), Comment("Constant BField value") }; }; struct HelixFitConfig { @@ -109,7 +109,7 @@ namespace mu2e { fhicl::Table fitSettings { Name("FitSettings") }; fhicl::Table extSettings { Name("ExtensionSettings") }; fhicl::Table matSettings { Name("MaterialSettings") }; -// helix module specific config + // helix module specific config fhicl::Atom fitDirection { Name("FitDirection"), Comment("Particle direction to fit, either upstream or downstream") }; fhicl::Atom pdgCharge { Name("UsePDGCharge"), Comment("Use particle charge from fitParticle")}; }; @@ -162,7 +162,7 @@ namespace mu2e { KinKal::ExtraConfig xconfig_; // tolerance and maximum Dt when extrapolating bool fixedfield_; // special case usage for seed fits, if no BField corrections are needed SurfaceMap::SurfacePairCollection extrap_; // surfaces to extrapolate the fit to - }; + }; HelixFit::HelixFit(const Parameters& settings,TrkFitFlag fitflag) : art::EDProducer{settings}, fitflag_(fitflag), @@ -178,7 +178,7 @@ namespace mu2e { kkmat_(settings().matSettings()), config_(Mu2eKinKal::makeConfig(settings().fitSettings())), exconfig_(Mu2eKinKal::makeConfig(settings().extSettings())), - fixedfield_(false) + fixedfield_(false) { // collection handling for(const auto& hseedtag : settings().modSettings().seedCollections()) { hseedCols_.emplace_back(consumes(hseedtag)); } @@ -187,7 +187,7 @@ namespace mu2e { produces(); // build the initial seed covariance auto const& seederrors = settings().modSettings().seederrors(); - if(seederrors.size() != KinKal::NParams()) + if(seederrors.size() != KinKal::NParams()) throw cet::exception("RECO")<<"mu2e::HelixFit:Seed error configuration error"<< endl; for(size_t ipar=0;ipar < seederrors.size(); ++ipar){ seedcov_[ipar][ipar] = seederrors[ipar]*seederrors[ipar]; @@ -268,7 +268,7 @@ namespace mu2e { if(usePDGCharge_)throw cet::exception("RECO")<<"mu2e::HelixFit: inconsistent charge" << endl; fitpart = static_cast(-1*fitpart); // reverse sign } - // time range of the hits + // time range of the hits auto trange = Mu2eKinKal::timeBounds(hseed.hits()); // construt the seed trajectory KTRAJ seedtraj = makeSeedTraj(hseed,trange,bnom,charge); @@ -284,61 +284,62 @@ namespace mu2e { strawhits.reserve(strawHitIdxs.size()); KKSTRAWXINGCOL strawxings; strawxings.reserve(strawHitIdxs.size()); - kkfit_.makeStrawHits(*tracker, *strawresponse, *kkbf_, kkmat_.strawMaterial(), pseedtraj, chcol, strawHitIdxs, strawhits, strawxings); - // optionally (and if present) add the CaloCluster as a constraint - // verify the cluster looks physically reasonable before adding it TODO! Or, let the KKCaloHit updater do it TODO - KKCALOHITCOL calohits; - if (kkfit_.useCalo() && hseed.caloCluster().isNonnull())kkfit_.makeCaloHit(hseed.caloCluster(),*calo_h, pseedtraj, calohits); - // set the seed range given the hits and xings - seedtraj.range() = kkfit_.range(strawhits,calohits,strawxings); - // create and fit the track - auto kktrk = make_unique(config_,*kkbf_,seedtraj,fitpart,kkfit_.strawHitClusterer(),strawhits,strawxings,calohits); - // Check the fit - auto goodfit = goodFit(*kktrk); - // if we have an extension schedule, extend. - if(goodfit && exconfig_.schedule().size() > 0) { - kkfit_.extendTrack(exconfig_,*kkbf_, *tracker,*strawresponse, kkmat_.strawMaterial(), chcol, *calo_h, cc_H, *kktrk ); - goodfit = goodFit(*kktrk); - } -// extrapolate as required - if(goodfit && extrap_.size()>0) { - // test the drection of this fit - auto const& ftraj = kktrk->fitTraj(); - bool downstream = ftraj.momentum3(ftraj.range().mid()).Z() > 0.0; // replace with momentum at tracker middle TODO - const static VEC3 opos(0.0,0.0,0.0); - for(auto const& surf : extrap_){ - // configure the extrapolation time direction according to the surface and the track momentum direction - if(surf.first.id() == SurfaceIdEnum::TT_Front){ - xconfig_.xdir_ = downstream ? TimeDir::backwards : TimeDir::forwards; - double zpos = surf.second->tangentPlane(opos).center().Z(); // this is crude: I need an accessor that knows the TT_Front is a plane TODO - ExtrapolateToZ xtoz(*kktrk,xconfig_.xdir_,zpos); - kktrk->extrapolate(xconfig_,xtoz); - } else if(surf.first.id() == SurfaceIdEnum::TT_Back){ - xconfig_.xdir_ = downstream ? TimeDir::forwards : TimeDir::backwards; - double zpos = surf.second->tangentPlane(opos).center().Z(); - ExtrapolateToZ xtoz(*kktrk,xconfig_.xdir_,zpos); - kktrk->extrapolate(xconfig_,xtoz); - } else if(surf.first.id() == SurfaceIdEnum::TT_Outer){ - // extrapolate in both time directions + if(kkfit_.makeStrawHits(*tracker, *strawresponse, *kkbf_, kkmat_.strawMaterial(), pseedtraj, chcol, strawHitIdxs, strawhits, strawxings)){ + // optionally (and if present) add the CaloCluster as a constraint + // verify the cluster looks physically reasonable before adding it TODO! Or, let the KKCaloHit updater do it TODO + KKCALOHITCOL calohits; + if (kkfit_.useCalo() && hseed.caloCluster().isNonnull())kkfit_.makeCaloHit(hseed.caloCluster(),*calo_h, pseedtraj, calohits); + // set the seed range given the hits and xings + seedtraj.range() = kkfit_.range(strawhits,calohits,strawxings); + // create and fit the track + auto kktrk = make_unique(config_,*kkbf_,seedtraj,fitpart,kkfit_.strawHitClusterer(),strawhits,strawxings,calohits); + // Check the fit + auto goodfit = goodFit(*kktrk); + // if we have an extension schedule, extend. + if(goodfit && exconfig_.schedule().size() > 0) { + kkfit_.extendTrack(exconfig_,*kkbf_, *tracker,*strawresponse, kkmat_.strawMaterial(), chcol, *calo_h, cc_H, *kktrk ); + goodfit = goodFit(*kktrk); + } + // extrapolate as required + if(goodfit && extrap_.size()>0) { + // test the drection of this fit + auto const& ftraj = kktrk->fitTraj(); + bool downstream = ftraj.momentum3(ftraj.range().mid()).Z() > 0.0; // replace with momentum at tracker middle TODO + const static VEC3 opos(0.0,0.0,0.0); + for(auto const& surf : extrap_){ + // configure the extrapolation time direction according to the surface and the track momentum direction + if(surf.first.id() == SurfaceIdEnum::TT_Front){ + xconfig_.xdir_ = downstream ? TimeDir::backwards : TimeDir::forwards; + double zpos = surf.second->tangentPlane(opos).center().Z(); // this is crude: I need an accessor that knows the TT_Front is a plane TODO + ExtrapolateToZ xtoz(*kktrk,xconfig_.xdir_,zpos); + kktrk->extrapolate(xconfig_,xtoz); + } else if(surf.first.id() == SurfaceIdEnum::TT_Back){ + xconfig_.xdir_ = downstream ? TimeDir::forwards : TimeDir::backwards; + double zpos = surf.second->tangentPlane(opos).center().Z(); + ExtrapolateToZ xtoz(*kktrk,xconfig_.xdir_,zpos); + kktrk->extrapolate(xconfig_,xtoz); + } else if(surf.first.id() == SurfaceIdEnum::TT_Outer){ + // extrapolate in both time directions + } } } - } - if(print_>0)kktrk->printFit(std::cout,print_); - if(goodfit || saveall_){ - TrkFitFlag fitflag(hptr->status()); - fitflag.merge(fitflag_); - if(goodfit) - fitflag.merge(TrkFitFlag::FitOK); - else - fitflag.clear(TrkFitFlag::FitOK); - kkseedcol->push_back(kkfit_.createSeed(*kktrk,fitflag,*calo_h)); - // fill assns with the helix seed - auto hptr = art::Ptr(hseedcol_h,iseed); - auto kseedptr = art::Ptr(KalSeedCollectionPID,kkseedcol->size()-1,KalSeedCollectionGetter); - kkseedassns->addSingle(kseedptr,hptr); - // save (unpersistable) KKTrk in the event - kktrkcol->push_back(kktrk.release()); + if(print_>0)kktrk->printFit(std::cout,print_); + if(goodfit || saveall_){ + TrkFitFlag fitflag(hptr->status()); + fitflag.merge(fitflag_); + if(goodfit) + fitflag.merge(TrkFitFlag::FitOK); + else + fitflag.clear(TrkFitFlag::FitOK); + kkseedcol->push_back(kkfit_.createSeed(*kktrk,fitflag,*calo_h)); + // fill assns with the helix seed + auto hptr = art::Ptr(hseedcol_h,iseed); + auto kseedptr = art::Ptr(KalSeedCollectionPID,kkseedcol->size()-1,KalSeedCollectionGetter); + kkseedassns->addSingle(kseedptr,hptr); + // save (unpersistable) KKTrk in the event + kktrkcol->push_back(kktrk.release()); + } } } } diff --git a/Mu2eKinKal/inc/KKFit.hh b/Mu2eKinKal/inc/KKFit.hh index 87b364f0a8..76bfd001a1 100644 --- a/Mu2eKinKal/inc/KKFit.hh +++ b/Mu2eKinKal/inc/KKFit.hh @@ -86,7 +86,7 @@ namespace mu2e { // construct from fit configuration objects explicit KKFit(KKFitConfig const& fitconfig); // helper functions used to create components of the fit - void makeStrawHits(Tracker const& tracker,StrawResponse const& strawresponse, BFieldMap const& kkbf, KKStrawMaterial const& smat, + bool makeStrawHits(Tracker const& tracker,StrawResponse const& strawresponse, BFieldMap const& kkbf, KKStrawMaterial const& smat, PKTRAJ const& ptraj, ComboHitCollection const& chcol, StrawHitIndexCollection const& strawHitIdxs, KKSTRAWHITCOL& hits, KKSTRAWXINGCOL& exings) const; SensorLine caloAxis(CaloCluster const& cluster, Calorimeter const& calo) const; // should come from CaloCluster TODO @@ -115,6 +115,7 @@ namespace mu2e { void sampleFit(KKTRK const& kktrk,KalIntersectionCollection& inters) const; // sample fit at the surfaces specified in the config void extendFit(KKTRK& kktrk) const; int printLevel_; + unsigned minNStrawHits_; bool matcorr_, addhits_, addmat_, usecalo_; // flags KKSTRAWHITCLUSTERER shclusterer_; // functor to cluster KKStrawHits // CaloHit configuration @@ -148,6 +149,7 @@ namespace mu2e { template KKFit::KKFit(KKFitConfig const& fitconfig) : printLevel_(fitconfig.printLevel()), + minNStrawHits_(fitconfig.minNStrawHits()), matcorr_(fitconfig.matCorr()), addhits_(fitconfig.addHits()), addmat_(fitconfig.addMaterial()), @@ -191,9 +193,10 @@ namespace mu2e { } } - template void KKFit::makeStrawHits(Tracker const& tracker,StrawResponse const& strawresponse,BFieldMap const& kkbf, KKStrawMaterial const& smat, + template bool KKFit::makeStrawHits(Tracker const& tracker,StrawResponse const& strawresponse,BFieldMap const& kkbf, KKStrawMaterial const& smat, PKTRAJ const& ptraj, ComboHitCollection const& chcol, StrawHitIndexCollection const& strawHitIdxs, KKSTRAWHITCOL& hits, KKSTRAWXINGCOL& exings) const { + unsigned ngood(0); // loop over the individual straw combo hits for(auto strawidx : strawHitIdxs) { const ComboHit& combohit(chcol.at(strawidx)); @@ -213,11 +216,13 @@ namespace mu2e { CAHint hint(ptime,htime); // compute PCA between the seed trajectory and this straw PCA pca(ptraj, wline, hint, tprec_ ); - // create the hit + // create the hit. Note these may initially be unusable hits.push_back(std::make_shared(kkbf, pca, combohit, straw, strawidx, strawresponse)); // create the material crossing, including this reference if(matcorr_) exings.push_back(std::make_shared(hits.back(),smat)); + if(hits.back()->hitState().usable())ngood++; } + return ngood >= minNStrawHits_; } template SensorLine KKFit::caloAxis(CaloCluster const& cluster, Calorimeter const& calo) const { diff --git a/Mu2eKinKal/inc/KKFitSettings.hh b/Mu2eKinKal/inc/KKFitSettings.hh index 6ea418acd1..54d2574011 100644 --- a/Mu2eKinKal/inc/KKFitSettings.hh +++ b/Mu2eKinKal/inc/KKFitSettings.hh @@ -61,6 +61,7 @@ namespace mu2e { fhicl::Atom addHits { Name("AddHits"), Comment("Add hits to the fit") }; fhicl::Atom addMaterial { Name("AddMaterial"), Comment("Add materials to the fit") }; fhicl::Atom useCaloCluster { Name("UseCaloCluster"), Comment("Use CaloCluster in the fit") }; + fhicl::Atom minNStrawHits { Name("MinNStrawHits"), Comment("Minimum number of straw hits to attempt a fit") }; fhicl::Atom strawHitClusterDeltaStraw { Name("StrawHitClusterDeltaStraw"), Comment("Maximum straw index difference between StrawHits in StrawHitClusters") }; fhicl::Atom strawHitClusterDeltaT { Name("StrawHitClusterDeltaT"), Comment("Maximum time difference between StrawHits in StrawHitClusters") }; fhicl::Atom strawHitClusterLevel { Name("StrawHitClusterLevel"), Comment("Level for selecting StrawHitClusters (see StrawIdMask for details") }; diff --git a/Mu2eKinKal/inc/KKStrawHit.hh b/Mu2eKinKal/inc/KKStrawHit.hh index caa76ab161..0622c44d6a 100644 --- a/Mu2eKinKal/inc/KKStrawHit.hh +++ b/Mu2eKinKal/inc/KKStrawHit.hh @@ -111,6 +111,7 @@ namespace mu2e { ca_(pca.localTraj(),wire_,pca.precision(),pca.tpData(),pca.dDdP(),pca.dTdP()), chit_(chit), shindex_(shindex), straw_(straw), sresponse_(sresponse) { + if(!pca.usable())whstate_.state_ = WireHitState::unusable; // make sure this is a single-straw based ComboHit if(chit_.mask().level() != StrawIdMask::uniquestraw) throw cet::exception("RECO")<<"mu2e::KKStrawHit: ComboHit doesn't correspond to a unique straw"<< std::endl; From ad02cfdafa205b872b2f2e90a27b6f38ec037180 Mon Sep 17 00:00:00 2001 From: Gianantonio Pezzullo Date: Mon, 15 Apr 2024 15:34:50 -0500 Subject: [PATCH 203/213] increased the number of allowed hits in a helix candidate --- CalPatRec/inc/CalHelixFinderData.hh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CalPatRec/inc/CalHelixFinderData.hh b/CalPatRec/inc/CalHelixFinderData.hh index bbaea32202..36a1fe82aa 100644 --- a/CalPatRec/inc/CalHelixFinderData.hh +++ b/CalPatRec/inc/CalHelixFinderData.hh @@ -50,9 +50,9 @@ namespace mu2e { // // kNPanelsPerFace = 3 // }; - enum { kMaxResidIndex = 500 }; + enum { kMaxResidIndex = 5000 }; - constexpr static uint16_t kNMaxChHits = 500; + constexpr static uint16_t kNMaxChHits = 5000; struct Diag_t { int loopId_4; // fData[4] From 127a16cf080f2636a37468615ace873961ceee14 Mon Sep 17 00:00:00 2001 From: Gianantonio Pezzullo Date: Mon, 15 Apr 2024 15:41:55 -0500 Subject: [PATCH 204/213] restored CommonMC/fcl/prolog_trigger.fcl file --- CommonMC/fcl/prolog_trigger.fcl | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 CommonMC/fcl/prolog_trigger.fcl diff --git a/CommonMC/fcl/prolog_trigger.fcl b/CommonMC/fcl/prolog_trigger.fcl new file mode 100644 index 0000000000..7965f5e90f --- /dev/null +++ b/CommonMC/fcl/prolog_trigger.fcl @@ -0,0 +1,26 @@ +# +# Trigger specific: used for trigger MC-truth based diagnostics +# +#include "Offline/CommonMC/fcl/prolog.fcl" +BEGIN_PROLOG +CommonMCTrigger : { + TTSelectRecoMC : { + @table::CommonMC.SelectRecoMC + TrkOnly : true + CaloClusterMinE : 10.0 + SaveEnergySteps : false + SaveUnusedDigiMCs : false + SaveAllUnusedDigiMCs : false + PrimaryParticle : "compressDigiMCs" + StrawDigiCollection : "makeSD" + ComboHitCollection : "TTflagBkgHits" + CaloDigiCollection : "CaloDigiMaker" + CaloClusterCollection : "CaloClusterFast" + StrawDigiMCCollection : "compressDigiMCs" + CrvDigiCollection : "CrvDigi" + CrvDigiMCCollection : "compressDigiMCs" + CrvCoincidenceClusterCollections : [ "CrvCoincidenceClusterFinder" ] + VDSPCollection : "compressDigiMCs:virtualdetector" + } +} +END_PROLOG From fc47e70edd652b5dc8f6ad6617d2049650d21ab6 Mon Sep 17 00:00:00 2001 From: Andrei Gaponenko Date: Mon, 15 Apr 2024 17:31:22 -0500 Subject: [PATCH 205/213] FilterStepPointPDG: use FHICL validation and provide description. --- Filters/src/FilterStepPointPDG_module.cc | 69 ++++++++++++++++-------- 1 file changed, 47 insertions(+), 22 deletions(-) diff --git a/Filters/src/FilterStepPointPDG_module.cc b/Filters/src/FilterStepPointPDG_module.cc index 57f28568c0..6dd819c3f5 100644 --- a/Filters/src/FilterStepPointPDG_module.cc +++ b/Filters/src/FilterStepPointPDG_module.cc @@ -2,7 +2,7 @@ // copy selected hits to output collections, preserving product // instance names. // -// Andrei Gaponenko, 2013 +// Andrei Gaponenko, 2013, 2024 #include #include @@ -11,7 +11,8 @@ #include // art includes. -#include "fhiclcpp/ParameterSet.h" +#include "fhiclcpp/types/Atom.h" +#include "fhiclcpp/types/Sequence.h" #include "art/Framework/Core/EDFilter.h" #include "art/Framework/Principal/Event.h" #include "art/Framework/Principal/Handle.h" @@ -24,6 +25,37 @@ namespace mu2e { //================================================================ class FilterStepPointPDG : public art::EDFilter { + public: + struct Config { + using Name=fhicl::Name; + using Comment=fhicl::Comment; + + fhicl::Sequence inputs { + Name("inputs"), + Comment("A list of StepPointMCCollection-s to process") + }; + + fhicl::Sequence pdgToDrop { + Name("pdgToDrop"), + Comment("A list of particle types to drop while keeping everything else. Mutually exclusive with pdgToKeep."), + std::vector() + }; + + fhicl::Sequence pdgToKeep { + Name("pdgToKeep"), + Comment("A list of particle types to keep while dropping everything else. Mutually exclusive with pdgToDrop."), + std::vector() + }; + }; + + using Parameters = art::EDFilter::Table; + explicit FilterStepPointPDG(const Parameters& conf); + + virtual bool filter(art::Event& event) override; + virtual void endJob() override; + + private: + typedef std::vector InputTags; InputTags inputs_; @@ -42,49 +74,42 @@ namespace mu2e { unsigned numInputEvents_; unsigned numPassedEvents_; - - public: - explicit FilterStepPointPDG(const fhicl::ParameterSet& pset); - virtual bool filter(art::Event& event) override; - virtual void endJob() override; }; //================================================================ - FilterStepPointPDG::FilterStepPointPDG(const fhicl::ParameterSet& pset) - : art::EDFilter{pset} + FilterStepPointPDG::FilterStepPointPDG(const Parameters& conf) + : art::EDFilter{conf} + , inputs_{conf().inputs()} , numInputHits_() , numOutputHits_() , numInputEvents_() , numPassedEvents_() { - const auto tags(pset.get >("inputs")); - for(const auto& i : tags) { - inputs_.emplace_back(i); + for(const auto& i: inputs_) { // Coalesce same instance names from multiple input modules/processes. - outNames_.insert(inputs_.back().instance()); + outNames_.insert(i.instance()); } + for(const auto& i : outNames_) { produces(i); } - const auto drop(pset.get >("pdgToDrop", std::vector())); - for(const auto i : drop) { + for(const auto i: conf().pdgToDrop()) { pdgToDrop_.emplace_back(PDGCode::type(i)); } - const auto keep(pset.get >("pdgToKeep", std::vector())); - for(const auto i : keep) { + for(const auto i: conf().pdgToKeep()) { pdgToKeep_.emplace_back(PDGCode::type(i)); } - if(drop.empty() && keep.empty()) { + if(pdgToDrop_.empty() && pdgToKeep_.empty()) { throw cet::exception("BADCONFIG") - <<"FilterStepPointPDG: either pdgToDrop or pdgToKeep must be specified.\n"; + <<"FilterStepPointPDG: either pdgToDrop or pdgToKeep must be specified, neither is given.\n"; } - if(!drop.empty() && ! keep.empty()) { + if(!pdgToDrop_.empty() && ! pdgToKeep_.empty()) { throw cet::exception("BADCONFIG") - <<"FilterStepPointPDG: either pdgToDrop or pdgToKeep," - <<" but not both, can be used at a time.\n"; + <<"FilterStepPointPDG: pdgToDrop and pdgToKeep settings are mutually exclusive," + " please specify only one of them.\n"; } } From 73995f29fc5ef0660b7908645bb55b68e6439e22 Mon Sep 17 00:00:00 2001 From: Ray Culbertson Date: Mon, 15 Apr 2024 22:43:34 -0500 Subject: [PATCH 206/213] make ptr check more general --- Validation/src/ValStepPointMC.cc | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/Validation/src/ValStepPointMC.cc b/Validation/src/ValStepPointMC.cc index e24fb100d7..31c5f69840 100644 --- a/Validation/src/ValStepPointMC.cc +++ b/Validation/src/ValStepPointMC.cc @@ -34,21 +34,15 @@ int mu2e::ValStepPointMC::fill(const mu2e::StepPointMCCollection& coll, _hVer->Fill(1.0); _hN->Fill(coll.size()); - mu2e::SimParticleCollection const* sph = nullptr; - art::ProductID oldId(0); for (auto sp : coll) { // unfortunately, if the event was truncated, then StepPointMC's // can point to missing SimParticles, this code catches that case // (none of the art::Ptr checks will tell us this, those only abort) - if (sp.simParticle().id() != oldId) { - sph = &sp.simParticle().parentAs>(); - oldId = sp.simParticle().id(); + if (sp.simParticle().isAvailable()) { + _id.fill(sp.simParticle()->pdgId()); } - auto key = cet::map_vector_key(sp.simParticle().key()); - bool hasSim = sph->find(key) != sph->end(); - if (hasSim) _id.fill(sp.simParticle()->pdgId()); _hp->Fill(sp.momentum().mag()); _hx->Fill(sp.position().x()); _hy->Fill(sp.position().y()); From 11b7e2417ac368c865099f4797f0d3f45967f2d8 Mon Sep 17 00:00:00 2001 From: Andrei Gaponenko Date: Tue, 16 Apr 2024 11:21:01 -0500 Subject: [PATCH 207/213] FilterStepPointPDG: declare consumes. --- Filters/src/FilterStepPointPDG_module.cc | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Filters/src/FilterStepPointPDG_module.cc b/Filters/src/FilterStepPointPDG_module.cc index 6dd819c3f5..06f73a6c06 100644 --- a/Filters/src/FilterStepPointPDG_module.cc +++ b/Filters/src/FilterStepPointPDG_module.cc @@ -86,6 +86,8 @@ namespace mu2e { , numPassedEvents_() { for(const auto& i: inputs_) { + consumes(i); + // Coalesce same instance names from multiple input modules/processes. outNames_.insert(i.instance()); } From c6c160e165ce5d9672f4775e1ab2730725e6b582 Mon Sep 17 00:00:00 2001 From: Andrei Gaponenko Date: Tue, 16 Apr 2024 13:48:53 -0500 Subject: [PATCH 208/213] FilterStepPointPDG: switch configuration from PDG codes to particle names. --- Filters/src/FilterStepPointPDG_module.cc | 29 ++++++++++++++++-------- 1 file changed, 19 insertions(+), 10 deletions(-) diff --git a/Filters/src/FilterStepPointPDG_module.cc b/Filters/src/FilterStepPointPDG_module.cc index 06f73a6c06..4324b47bc9 100644 --- a/Filters/src/FilterStepPointPDG_module.cc +++ b/Filters/src/FilterStepPointPDG_module.cc @@ -37,14 +37,23 @@ namespace mu2e { fhicl::Sequence pdgToDrop { Name("pdgToDrop"), - Comment("A list of particle types to drop while keeping everything else. Mutually exclusive with pdgToKeep."), + Comment( + "A list of particle type names to drop while keeping everything else.\n" + "Accepted names, like e_minus, anti_proton, etc., can be found\n" + "in Offline/DataProducts/src/PDGCode.cc\n" + "Mutually exclusive with pdgToKeep." + ), std::vector() }; - fhicl::Sequence pdgToKeep { + fhicl::Sequence pdgToKeep { Name("pdgToKeep"), - Comment("A list of particle types to keep while dropping everything else. Mutually exclusive with pdgToDrop."), - std::vector() + Comment("A list of particle types to keep while dropping everything else.\n" + "Accepted names, like e_minus, anti_proton, etc., can be found\n" + "in Offline/DataProducts/src/PDGCode.cc\n" + "Mutually exclusive with pdgToDrop." + ), + std::vector() }; }; @@ -65,8 +74,8 @@ namespace mu2e { // Particle type lists are typically short, so a vector works // better than a set. - std::vector pdgToDrop_; - std::vector pdgToKeep_; + std::vector pdgToDrop_; + std::vector pdgToKeep_; // statistics unsigned numInputHits_; @@ -96,12 +105,12 @@ namespace mu2e { produces(i); } - for(const auto i: conf().pdgToDrop()) { - pdgToDrop_.emplace_back(PDGCode::type(i)); + for(const auto& i: conf().pdgToDrop()) { + pdgToDrop_.emplace_back(PDGCode(i)); } - for(const auto i: conf().pdgToKeep()) { - pdgToKeep_.emplace_back(PDGCode::type(i)); + for(const auto& i: conf().pdgToKeep()) { + pdgToKeep_.emplace_back(PDGCode(i)); } if(pdgToDrop_.empty() && pdgToKeep_.empty()) { From 8cd27b5205c71ec67ace9869325761975bd45cfe Mon Sep 17 00:00:00 2001 From: Andrei Gaponenko Date: Tue, 16 Apr 2024 14:30:12 -0500 Subject: [PATCH 209/213] FilterStepPointPDG: make the module async multithreaded. This change required to drop the summary printout, which was suppressed anyway. --- Filters/src/FilterStepPointPDG_module.cc | 47 +++++------------------- 1 file changed, 10 insertions(+), 37 deletions(-) diff --git a/Filters/src/FilterStepPointPDG_module.cc b/Filters/src/FilterStepPointPDG_module.cc index 4324b47bc9..7a7cd6faee 100644 --- a/Filters/src/FilterStepPointPDG_module.cc +++ b/Filters/src/FilterStepPointPDG_module.cc @@ -13,7 +13,7 @@ // art includes. #include "fhiclcpp/types/Atom.h" #include "fhiclcpp/types/Sequence.h" -#include "art/Framework/Core/EDFilter.h" +#include "art/Framework/Core/SharedFilter.h" #include "art/Framework/Principal/Event.h" #include "art/Framework/Principal/Handle.h" #include "messagefacility/MessageLogger/MessageLogger.h" @@ -24,7 +24,7 @@ namespace mu2e { //================================================================ - class FilterStepPointPDG : public art::EDFilter { + class FilterStepPointPDG : public art::SharedFilter { public: struct Config { using Name=fhicl::Name; @@ -57,11 +57,10 @@ namespace mu2e { }; }; - using Parameters = art::EDFilter::Table; - explicit FilterStepPointPDG(const Parameters& conf); + using Parameters = art::SharedFilter::Table; + FilterStepPointPDG(const Parameters& conf, const art::ProcessingFrame&); - virtual bool filter(art::Event& event) override; - virtual void endJob() override; + virtual bool filter(art::Event& event, const art::ProcessingFrame&) override; private: @@ -76,24 +75,15 @@ namespace mu2e { // better than a set. std::vector pdgToDrop_; std::vector pdgToKeep_; - - // statistics - unsigned numInputHits_; - unsigned numOutputHits_; - - unsigned numInputEvents_; - unsigned numPassedEvents_; }; //================================================================ - FilterStepPointPDG::FilterStepPointPDG(const Parameters& conf) - : art::EDFilter{conf} + FilterStepPointPDG::FilterStepPointPDG(const Parameters& conf, const art::ProcessingFrame&) + : art::SharedFilter{conf} , inputs_{conf().inputs()} - , numInputHits_() - , numOutputHits_() - , numInputEvents_() - , numPassedEvents_() { + async(); + for(const auto& i: inputs_) { consumes(i); @@ -125,7 +115,7 @@ namespace mu2e { } //================================================================ - bool FilterStepPointPDG::filter(art::Event& event) { + bool FilterStepPointPDG::filter(art::Event& event, const art::ProcessingFrame&) { bool passed = false; typedef std::map > OutMap; @@ -157,32 +147,15 @@ namespace mu2e { passed |= true; } } - - numInputHits_ += ih->size(); - numOutputHits_ += out.size(); } for(const auto& i : outNames_) { event.put(std::move(outHits[i]), i); } - ++numInputEvents_; - if(passed) { - ++numPassedEvents_; - } - return passed; } - //================================================================ - void FilterStepPointPDG::endJob() { - mf::LogInfo("Summary")<<"FilterStepPointPDG: passed " - < Date: Tue, 23 Apr 2024 13:05:23 -0500 Subject: [PATCH 210/213] Remove dead straws even in offspill --- TrkDiag/src/ComboHitDiag_module.cc | 4 +++- TrkDiag/src/StrawHitDiag_module.cc | 4 +++- TrkHitReco/src/CombineStrawHits_module.cc | 2 ++ 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/TrkDiag/src/ComboHitDiag_module.cc b/TrkDiag/src/ComboHitDiag_module.cc index 523c29f9af..96ae6ba9c4 100644 --- a/TrkDiag/src/ComboHitDiag_module.cc +++ b/TrkDiag/src/ComboHitDiag_module.cc @@ -96,7 +96,7 @@ namespace mu2e int _nsh, _nch; // number of associated straw hits int _strawid, _straw, _panel, _plane, _level; // strawid info int _eend; - int _esel,_rsel, _tsel, _nsel, _bkgclust, _bkg, _sth, _ph, _tdiv, _isolated, _strawxtalk, _elecxtalk, _calosel, _sline; + int _esel,_rsel, _tsel, _nsel, _bkgclust, _bkg, _sth, _dead, _ph, _tdiv, _isolated, _strawxtalk, _elecxtalk, _calosel, _sline; // mc diag XYZVectorF _mcpos, _mcmom; float _mctime, _mcwdist; @@ -167,6 +167,7 @@ namespace mu2e _chdiag->Branch("bkgclust",&_bkgclust,"bkgclust/I"); _chdiag->Branch("bkg",&_bkg,"bkg/I"); _chdiag->Branch("sth",&_sth,"sth/I"); + _chdiag->Branch("dead",&_dead,"dead/I"); _chdiag->Branch("ph",&_ph,"ph/I"); _chdiag->Branch("tdiv",&_tdiv,"tdiv/I"); _chdiag->Branch("strawxtalk",&_strawxtalk,"strawxtalk/I"); @@ -246,6 +247,7 @@ namespace mu2e _qual = ch.qual(); auto const& flag = ch.flag(); _sth = flag.hasAllProperties(StrawHitFlag::stereo); + _dead = flag.hasAllProperties(StrawHitFlag::dead); _ph = flag.hasAllProperties(StrawHitFlag::panelcombo); _tdiv = flag.hasAllProperties(StrawHitFlag::tdiv); _esel = flag.hasAllProperties(StrawHitFlag::energysel); diff --git a/TrkDiag/src/StrawHitDiag_module.cc b/TrkDiag/src/StrawHitDiag_module.cc index f46b2dbd25..715a5b0e21 100644 --- a/TrkDiag/src/StrawHitDiag_module.cc +++ b/TrkDiag/src/StrawHitDiag_module.cc @@ -88,7 +88,7 @@ namespace mu2e Float_t _mcwt[2]; Double_t _mcsptime; Double_t _mcptime; - Int_t _esel,_rsel, _tsel, _bkgclust, _bkg, _stereo, _tdiv, _isolated, _strawxtalk, _elecxtalk, _calosel; + Int_t _esel,_rsel, _tsel, _bkgclust, _bkg, _dead, _stereo, _tdiv, _isolated, _strawxtalk, _elecxtalk, _calosel; Int_t _sid, _plane, _panel, _layer, _straw; Float_t _shwres, _shtres; Bool_t _mcxtalk; @@ -213,6 +213,7 @@ namespace mu2e _shdiag->Branch("bkgclust",&_bkgclust,"bkgclust/I"); _shdiag->Branch("bkg",&_bkg,"bkg/I"); _shdiag->Branch("stereo",&_stereo,"stereo/I"); + _shdiag->Branch("dead",&_dead,"dead/I"); _shdiag->Branch("tdiv",&_tdiv,"tdiv/I"); _shdiag->Branch("strawxtalk",&_strawxtalk,"strawxtalk/I"); _shdiag->Branch("elecxtalk",&_elecxtalk,"elecxtalk/I"); @@ -301,6 +302,7 @@ namespace mu2e _shlen =(ch.posCLHEP()-straw.getMidPoint()).dot(straw.getDirection()); _slen = straw.halfLength(); _stereo = ch.flag().hasAllProperties(StrawHitFlag::stereo); + _dead = ch.flag().hasAllProperties(StrawHitFlag::dead); _tdiv = ch.flag().hasAllProperties(StrawHitFlag::tdiv); _esel = shf.hasAllProperties(StrawHitFlag::energysel); _rsel = shf.hasAllProperties(StrawHitFlag::radsel); diff --git a/TrkHitReco/src/CombineStrawHits_module.cc b/TrkHitReco/src/CombineStrawHits_module.cc index 6c224089a1..f95585f010 100644 --- a/TrkHitReco/src/CombineStrawHits_module.cc +++ b/TrkHitReco/src/CombineStrawHits_module.cc @@ -161,6 +161,7 @@ namespace mu2e { isUsed[ich] = true; const ComboHit& hit1 = chcOrig[ich]; + if ( _testflag && hit1.flag().hasAnyProperty(StrawHitFlag::dead)) continue; if ( testflag && (!hit1.flag().hasAllProperties(_shsel) || hit1.flag().hasAnyProperty(_shmask))) continue; ComboHit combohit; combohit.init(hit1,ich); @@ -172,6 +173,7 @@ namespace mu2e { if (hit2.strawId().uniquePanel() != panel1) break; if (abs(hit2.strawId().straw()-hit1.strawId().straw())> _maxds ) continue; // hits are not sorted by straw number + if ( _testflag && hit2.flag().hasAnyProperty(StrawHitFlag::dead)) continue; if ( testflag && (!hit2.flag().hasAllProperties(_shsel) || hit2.flag().hasAnyProperty(_shmask)) ) continue; float dt = _useTOT ? fabs(hit1.correctedTime() - hit2.correctedTime()) : fabs(hit1.time() - hit2.time()); From 845069b567938eb7018d90be2e7f7c3c4785ed09 Mon Sep 17 00:00:00 2001 From: Pavel Murat Date: Wed, 24 Apr 2024 15:46:06 -0500 Subject: [PATCH 211/213] add mu+ --- Mu2eG4/src/Mu2eG4TrackingAction.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Mu2eG4/src/Mu2eG4TrackingAction.cc b/Mu2eG4/src/Mu2eG4TrackingAction.cc index 16de201e00..289805c93a 100644 --- a/Mu2eG4/src/Mu2eG4TrackingAction.cc +++ b/Mu2eG4/src/Mu2eG4TrackingAction.cc @@ -243,7 +243,7 @@ namespace mu2e { if (_muonPreAssignedDecayProperTime>=0.0) { const G4DynamicParticle* dynPart = trk->GetDynamicParticle(); - if (dynPart->GetPDGcode() == PDGCode::mu_minus) { + if ((dynPart->GetPDGcode() == PDGCode::mu_minus) or (dynPart->GetPDGcode() == PDGCode::mu_plus)) { // if track is a muon and preassigned proper time is set, assing it if (trackingVerbosityLevel>0) { G4cout << __func__ @@ -259,7 +259,7 @@ namespace mu2e { if ((_muonMaxPreAssignedDecayProperTime>=0.0) || (_muonMinPreAssignedDecayProperTime>=0.0)) { const G4DynamicParticle* dynPart = trk->GetDynamicParticle(); - if (dynPart->GetPDGcode() == PDGCode::mu_minus) { + if ((dynPart->GetPDGcode() == PDGCode::mu_minus) or (dynPart->GetPDGcode() == PDGCode::mu_plus)) { // if track is a muon and preassigned proper time is set, assing it if (trackingVerbosityLevel>0) { G4cout << __func__ From 2caa610aa6dae931ba90c1767f8afeacf366fdcb Mon Sep 17 00:00:00 2001 From: Krzysztof L Genser Date: Wed, 24 Apr 2024 17:01:21 -0500 Subject: [PATCH 212/213] enabling g4studyMT --- Mu2eG4/g4study/g4studyMT.fcl | 16 ++++++++++++++++ Mu2eG4/src/Mu2eG4MTRunManager.cc | 7 +++++-- 2 files changed, 21 insertions(+), 2 deletions(-) create mode 100644 Mu2eG4/g4study/g4studyMT.fcl diff --git a/Mu2eG4/g4study/g4studyMT.fcl b/Mu2eG4/g4study/g4studyMT.fcl new file mode 100644 index 0000000000..1ef627d577 --- /dev/null +++ b/Mu2eG4/g4study/g4studyMT.fcl @@ -0,0 +1,16 @@ +# +# MT version of g4study +# +#include "Offline/Mu2eG4/g4study/g4study.fcl" + +# Note that all parameters except the following should mostly be +# set in the non MT file included above (which includes prolog files) + +physics.producers.g4run.module_type : "Mu2eG4MT" + +# this sets the number of threads used in MT mode +# number and threads and number of schedules should +# be the same + +services.scheduler.num_schedules : 5 +services.scheduler.num_threads : 5 diff --git a/Mu2eG4/src/Mu2eG4MTRunManager.cc b/Mu2eG4/src/Mu2eG4MTRunManager.cc index eaa13be280..bb9ff85bbc 100644 --- a/Mu2eG4/src/Mu2eG4MTRunManager.cc +++ b/Mu2eG4/src/Mu2eG4MTRunManager.cc @@ -22,6 +22,7 @@ #include "Offline/GeometryService/inc/WorldG4.hh" #include "Offline/Mu2eG4/inc/WorldMaker.hh" #include "Offline/Mu2eG4/inc/Mu2eWorld.hh" +#include "Offline/Mu2eG4/inc/Mu2eStudyWorld.hh" #include "Offline/Mu2eG4/inc/physicsListDecider.hh" #include "Offline/Mu2eG4/inc/preG4InitializeTasks.hh" #include "Offline/Mu2eG4/inc/Mu2eG4MasterRunAction.hh" @@ -171,8 +172,10 @@ namespace mu2e { make_unique(conf_))); } else { - throw cet::exception("CONFIG") - << "Error: You are trying to run in MT mode without the Standard Mu2e Detector!\n"; + allMu2e = (new WorldMaker(make_unique(conf_, &sensitiveDetectorHelper_), + make_unique(conf_))); + // throw cet::exception("CONFIG") + // << "Error: You are trying to run in MT mode without the Standard Mu2e Detector!\n"; } preG4InitializeTasks(conf_); From 527821437279a20e8239e47f38e82816c846f321 Mon Sep 17 00:00:00 2001 From: Krzysztof L Genser Date: Wed, 24 Apr 2024 18:01:10 -0500 Subject: [PATCH 213/213] removing commented out code --- Mu2eG4/src/Mu2eG4MTRunManager.cc | 2 -- 1 file changed, 2 deletions(-) diff --git a/Mu2eG4/src/Mu2eG4MTRunManager.cc b/Mu2eG4/src/Mu2eG4MTRunManager.cc index bb9ff85bbc..7440384db3 100644 --- a/Mu2eG4/src/Mu2eG4MTRunManager.cc +++ b/Mu2eG4/src/Mu2eG4MTRunManager.cc @@ -174,8 +174,6 @@ namespace mu2e { else { allMu2e = (new WorldMaker(make_unique(conf_, &sensitiveDetectorHelper_), make_unique(conf_))); - // throw cet::exception("CONFIG") - // << "Error: You are trying to run in MT mode without the Standard Mu2e Detector!\n"; } preG4InitializeTasks(conf_);