lp:~maus-mlcr/maus/maus-v314

Created by mice-lcr and last modified
Get this branch:
bzr branch lp:~maus-mlcr/maus/maus-v314
Members of maus-mlcr can upload to this branch. Log in for directions.

Branch merges

Related bugs

Related blueprints

Branch information

Owner:
maus-mlcr
Project:
MAUS
Status:
Development

Recent revisions

1251. By mice-lcr

MAUS-v3.1.4 for VB

1250. By mice-lcr

MAUS-v3.1.4 tagged for VB emittance paper

1249. By Paolo Franchini

Fixed link

1248. By Paolo Franchini

Removed test data

1247. By Paolo Franchini

Merge from MAUS-v3.1.0

1246. By Paolo Franchini

New cuts class data structure

-------------- Thi line and the following will be ignored --------------

added:
  files/PID/test_200MeV_mu_plus_2017_09_13T13_00_47_156699/
  files/PID/test_200MeV_mu_plus_2017_09_21T02_52_34_057513/
  src/common_cpp/DataStructure/Cuts.cc
  src/common_cpp/DataStructure/Cuts.hh
  src/common_cpp/JsonCppProcessors/CutsProcessor.cc
  src/common_cpp/JsonCppProcessors/CutsProcessor.hh
  src/map/MapCppCuts/
  src/map/MapCppCuts/MapCppCuts.cc
  src/map/MapCppCuts/MapCppCuts.hh
  src/map/MapCppCuts/sconscript
  src/map/MapCppCuts/test_MapCppCuts.py
  src/map/MapCppCuts/test_data/
  src/map/MapCppCuts/test_data/08083_recon.root
  src/map/MapCppCuts/test_data/140MeV_test_10547.root
  src/map/MapCppCuts/test_data/140MeV_test_9954.root
  src/map/MapCppCuts/test_data/adding_cuts.json
  tests/cpp_unit/DataStructure/CutsTest.cc
modified:
  bin/analyze_data_offline.py
  bin/simulate_beam.py
  bin/simulate_mice.py
  src/common_cpp/DataStructure/LinkDef.hh
  src/common_cpp/DataStructure/ReconEvent.cc
  src/common_cpp/DataStructure/ReconEvent.hh
  src/common_cpp/JsonCppProcessors/ReconEventProcessor.cc
  src/common_cpp/JsonCppProcessors/ReconEventProcessor.hh
  src/common_cpp/Recon/SciFi/PatternRecognition.cc
  src/common_py/ConfigurationDefaults.py
  src/map/MapCppMCReconSetup/MapCppMCReconSetup.cc
  src/map/MapCppReconSetup/MapCppReconSetup.cc
  tests/cpp_unit/DataStructure/ReconEventTest.cc
  tests/cpp_unit/JsonCppProcessors/ReconEventProcessorTest.cc
unknown:
  files/PID/test_200MeV_mu_plus_2018_01_12T16_36_09_458432/
pending merges:
  Misha Fedorov 2018-01-12 fixed style error
    Misha Fedorov 2018-01-12 final changes to cut data structure
    Misha Fedorov 2018-01-11 added test data
    Misha Fedorov 2018-01-11 changes to Mapper
    Misha Fedorov 2018-01-11 attempt to solve mapper
    Misha Fedorov 2018-01-09 adjusted mom cut routine
    Misha Fedorov 2018-01-08 Changes to mom us/ds limits, mom selection routine
    Misha Fedorov 2017-12-20 added DS cuts, changed momentum routine, added DS values in configfile
    Misha Fedorov 2017-12-12 Adjusted station_cut, pval_cut, mass_cut, mom_loss_cut
    Misha Fedorov 2017-12-02 PatterRecognition.cc still contained MERGE source file, removed
    Misha Fedorov 2017-12-02 removed MERGE SOURCE function in Rootfitter.cc/hh
    Misha Fedorov 2017-12-02 [merge] modified files: PatternRecognition.cc , RootFitter.hh/cc
    Misha Fedorov 2017-11-06 no changes
    Misha Fedorov 2017-11-06 [merge] fixed tof_mc_plotter issue, check if it works
    Misha Fedorov 2017-12-02 conflicts already happen to be resolved?
    Misha Fedorov 2017-12-02 [merge] Merged with trunk, Rootfitter.hh had lines my branch was missing
    Misha Fedorov 2017-11-28 changed to rootfitter.cc (file from Chris H)
    Misha Fedorov 2017-11-02 maus_output.root
    Misha Fedorov 2017-11-02 cut parameters in configdefault
    Misha Fedorov 2017-11-02 json file for test_mapper
    Misha Fedorov 2017-11-02 Put cuts analysis code back
    Misha Fedorov 2017-11-01 added cuts to simulate_mice/beam
    Misha Fedorov 2017-11-01 add mapper to analyze data offline
    Misha Fedorov 2017-10-31 style error
    Misha Fedorov 2017-10-31 test
    Misha Fedorov 2017-10-11 MapCppCuts
    Misha Fedorov 2017-10-10 [merge] merging
    Misha Fedorov 2017-10-10 removed MapCppCuts
    Misha Fedorov 2017-10-10 fix style error in map cc
    Misha Fedorov 2017-10-10 -
    Misha Fedorov 2017-10-09 MAUS namespace
    Misha Fedorov 2017-10-09 explicit MAUS namespaces in cc
    Misha Fedorov 2017-10-02 modify
    Misha Fedorov 2017-10-02 modified map cc
    Misha Fedorov 2017-10-02 adding mapper cc hh files
    Misha Fedorov 2017-09-27 removed MapCppCuts
    Misha Fedorov 2017-09-27 created directory and added build script
    Misha Fedorov 2017-09-26 removed Mapper
    Misha Fedorov 2017-09-26 added MapCppCuts files
    Misha Fedorov 2017-09-26 modified MapCppRecon
    Misha Fedorov 2017-09-26 added MapCppCuts directory with header
    Misha Fedorov 2017-09-24 added unknown files
    Misha Fedorov 2017-09-24 added cuts stuff

1245. By Durga Rajaram

add zextentfactor to parent-geometry-file-creation

1244. By Paolo Franchini

PR fixes - address the 50meV Bump
using Minuit by default
includes the additional TOF-Tracker low pt mapper

1243. By Durga Rajaram

coolingchannel scales datacard bug fix

1242. By Durga Rajaram

add datacards to set coolingchannel current scale factors, modifying^Ceometry download scripts to enable this. added analyze_data_offline_globals script for globals processing

Branch metadata

Branch format:
Branch format 7
Repository format:
Bazaar repository format 2a (needs bzr 1.16 or later)
Stacked on:
lp:maus
This branch contains Public information 
Everyone can see this information.

Subscribers