lp:~ma5dev/madanalysis5/v1.6beta
Created by
Eric Conte
and last modified
- Get this branch:
- bzr branch lp:~ma5dev/madanalysis5/v1.6beta
Members of
MadAnalysis5 developers
can upload to this branch. Log in for directions.
Branch merges
Propose for merging
No branches
dependent on this one.
- MadAnalysisTeam: Pending requested
-
Diff: 23946 lines (+9146/-4662) (has conflicts)275 files modifiedbin/ma5 (+5/-0)
madanalysis/IOinterface/delphescard_checker.py (+224/-0)
madanalysis/IOinterface/html_report_writer.py (+19/-18)
madanalysis/IOinterface/job_reader.py (+246/-140)
madanalysis/IOinterface/job_writer.py (+44/-23)
madanalysis/IOinterface/latex_report_writer.py (+25/-15)
madanalysis/IOinterface/madgraph_interface.py (+5/-3)
madanalysis/IOinterface/saf_block_status.py (+0/-2)
madanalysis/IOinterface/text_report.py (+9/-16)
madanalysis/UpdateNotes.txt (+80/-0)
madanalysis/build/makefile_writer.py (+17/-17)
madanalysis/configuration/clustering_cdfjetclu.py (+1/-1)
madanalysis/configuration/recast_configuration.py (+37/-470)
madanalysis/core/expert_mode.py (+21/-15)
madanalysis/core/launcher.py (+23/-3)
madanalysis/core/script_stack.py (+149/-0)
madanalysis/enumeration/argument_type.py (+4/-7)
madanalysis/enumeration/backstyle_type.py (+20/-20)
madanalysis/enumeration/color_type.py (+12/-12)
madanalysis/enumeration/combination_type.py (+1/-1)
madanalysis/enumeration/connector_type.py (+8/-8)
madanalysis/enumeration/cut_type.py (+4/-4)
madanalysis/enumeration/font_type.py (+24/-24)
madanalysis/enumeration/graphic_render_type.py (+2/-2)
madanalysis/enumeration/linestyle_type.py (+19/-19)
madanalysis/enumeration/observable_type.py (+138/-141)
madanalysis/enumeration/operator_type.py (+11/-11)
madanalysis/enumeration/report_format_type.py (+2/-2)
madanalysis/enumeration/sb_ratio_type.py (+6/-6)
madanalysis/input/installation_options.dat (+2/-0)
madanalysis/install/detector_manager.py (+60/-0)
madanalysis/install/install_delphes.py (+58/-7)
madanalysis/install/install_delphesMA5tune.py (+5/-3)
madanalysis/install/install_fastjet.py (+2/-1)
madanalysis/install/install_fastjetcontrib.py (+2/-1)
madanalysis/install/install_pad.py (+160/-37)
madanalysis/install/install_padma5tune.py (+9/-2)
madanalysis/install/install_root.py (+1/-0)
madanalysis/install/install_zlib.py (+3/-2)
madanalysis/interpreter/cmd_cut.py (+96/-33)
madanalysis/interpreter/cmd_display_regions.py (+1/-1)
madanalysis/interpreter/cmd_import.py (+3/-3)
madanalysis/interpreter/cmd_install.py (+9/-3)
madanalysis/interpreter/cmd_open.py (+6/-4)
madanalysis/interpreter/cmd_plot.py (+127/-53)
madanalysis/interpreter/cmd_selection_base.py (+3/-6)
madanalysis/interpreter/cmd_submit.py (+64/-293)
madanalysis/interpreter/interpreter.py (+8/-3)
madanalysis/interpreter/interpreter_base.py (+7/-4)
madanalysis/interpreter/ma5_interpreter.py (+4/-1)
madanalysis/job/job_candidate_cut.py (+49/-51)
madanalysis/job/job_event_cut.py (+62/-65)
madanalysis/job/job_execute.py (+63/-71)
madanalysis/job/job_finalize.py (+1/-32)
madanalysis/job/job_header.py (+24/-55)
madanalysis/job/job_initialize.py (+76/-53)
madanalysis/job/job_main.py (+0/-2)
madanalysis/job/job_particle.py (+8/-13)
madanalysis/job/job_plot.py (+97/-104)
madanalysis/layout/cut_info.py (+3/-1)
madanalysis/layout/cutflow.py (+32/-28)
madanalysis/layout/cutflow_for_dataset.py (+186/-180)
madanalysis/layout/histogram.py (+13/-14)
madanalysis/layout/histogram_frequency.py (+6/-0)
madanalysis/layout/histogram_logx.py (+6/-1)
madanalysis/layout/layout.py (+468/-241)
madanalysis/layout/merging_plots.py (+0/-3)
madanalysis/layout/plotflow.py (+22/-24)
madanalysis/misc/run_recast.py (+882/-0)
madanalysis/observable/observable_list.py (+37/-0)
madanalysis/region/region_collection.py (+40/-4)
madanalysis/selection/cut.py (+23/-11)
madanalysis/selection/histogram.py (+30/-18)
madanalysis/selection/selection.py (+1/-1)
madanalysis/system/checkup.py (+3/-1)
madanalysis/system/detect_gpp.py (+2/-2)
madanalysis/system/detect_make.py (+2/-2)
madanalysis/system/detect_manager.py (+3/-0)
madanalysis/system/detect_python.py (+2/-2)
madanalysis/system/detect_scipy.py (+95/-0)
madanalysis/system/detect_zlib.py (+3/-2)
madanalysis/system/session_info.py (+1/-0)
madanalysis/system/user_info.py (+7/-0)
tools/SampleAnalyzer/Commons/Base/ClusterAlgoBase.h (+6/-6)
tools/SampleAnalyzer/Commons/Base/Configuration.cpp (+8/-6)
tools/SampleAnalyzer/Commons/Base/Configuration.h (+1/-9)
tools/SampleAnalyzer/Commons/Base/DetectorBase.h (+4/-4)
tools/SampleAnalyzer/Commons/Base/ReaderBase.h (+1/-1)
tools/SampleAnalyzer/Commons/Base/StatusCode.h (+4/-0)
tools/SampleAnalyzer/Commons/DataFormat/EventFormat.h (+1/-0)
tools/SampleAnalyzer/Commons/DataFormat/GeneratorInfo.h (+4/-0)
tools/SampleAnalyzer/Commons/DataFormat/IsolationConeType.h (+3/-1)
tools/SampleAnalyzer/Commons/DataFormat/MCEventFormat.cpp (+113/-0)
tools/SampleAnalyzer/Commons/DataFormat/MCEventFormat.h (+55/-14)
tools/SampleAnalyzer/Commons/DataFormat/MCParticleFormat.h (+58/-46)
tools/SampleAnalyzer/Commons/DataFormat/MCProcessFormat.h (+1/-0)
tools/SampleAnalyzer/Commons/DataFormat/MCSampleFormat.h (+23/-7)
tools/SampleAnalyzer/Commons/DataFormat/ParticleBaseFormat.h (+8/-7)
tools/SampleAnalyzer/Commons/DataFormat/PdgDataFormat.cpp (+9/-3)
tools/SampleAnalyzer/Commons/DataFormat/PdgDataFormat.h (+22/-20)
tools/SampleAnalyzer/Commons/DataFormat/PdgTable.h (+9/-6)
tools/SampleAnalyzer/Commons/DataFormat/RecEventFormat.h (+30/-2)
tools/SampleAnalyzer/Commons/DataFormat/RecJetFormat.h (+3/-1)
tools/SampleAnalyzer/Commons/DataFormat/RecLeptonFormat.h (+14/-1)
tools/SampleAnalyzer/Commons/DataFormat/RecParticleFormat.h (+4/-2)
tools/SampleAnalyzer/Commons/DataFormat/RecPhotonFormat.h (+3/-1)
tools/SampleAnalyzer/Commons/DataFormat/RecSampleFormat.h (+1/-0)
tools/SampleAnalyzer/Commons/DataFormat/RecTauFormat.h (+3/-1)
tools/SampleAnalyzer/Commons/DataFormat/RecTowerFormat.h (+3/-1)
tools/SampleAnalyzer/Commons/DataFormat/RecTrackFormat.h (+2/-0)
tools/SampleAnalyzer/Commons/DataFormat/SampleFormat.h (+3/-1)
tools/SampleAnalyzer/Commons/DataFormat/WeightCollection.cpp (+30/-0)
tools/SampleAnalyzer/Commons/DataFormat/WeightCollection.h (+170/-0)
tools/SampleAnalyzer/Commons/DataFormat/WeightDefinition.cpp (+128/-0)
tools/SampleAnalyzer/Commons/DataFormat/WeightDefinition.h (+133/-0)
tools/SampleAnalyzer/Commons/Service/CompilationService.h (+1/-0)
tools/SampleAnalyzer/Commons/Service/ConvertService.h (+3/-2)
tools/SampleAnalyzer/Commons/Service/DisplayService.h (+2/-0)
tools/SampleAnalyzer/Commons/Service/ExceptionService.h (+2/-0)
tools/SampleAnalyzer/Commons/Service/ExceptionType.h (+17/-12)
tools/SampleAnalyzer/Commons/Service/Identification.h (+2/-0)
tools/SampleAnalyzer/Commons/Service/Isolation.cpp (+3/-0)
tools/SampleAnalyzer/Commons/Service/Isolation.h (+2/-0)
tools/SampleAnalyzer/Commons/Service/IsolationBase.cpp (+3/-0)
tools/SampleAnalyzer/Commons/Service/IsolationBase.h (+2/-0)
tools/SampleAnalyzer/Commons/Service/IsolationCalorimeter.h (+2/-0)
tools/SampleAnalyzer/Commons/Service/IsolationCombined.h (+2/-0)
tools/SampleAnalyzer/Commons/Service/IsolationEFlow.h (+2/-0)
tools/SampleAnalyzer/Commons/Service/IsolationTracker.h (+2/-0)
tools/SampleAnalyzer/Commons/Service/LogMsgKey.h (+3/-1)
tools/SampleAnalyzer/Commons/Service/LogMsgValue.h (+4/-1)
tools/SampleAnalyzer/Commons/Service/LogReport.cpp (+3/-2)
tools/SampleAnalyzer/Commons/Service/LogReport.h (+1/-1)
tools/SampleAnalyzer/Commons/Service/LogService.h (+1/-0)
tools/SampleAnalyzer/Commons/Service/LogStream.h (+1/-0)
tools/SampleAnalyzer/Commons/Service/LoopService.cpp (+17/-14)
tools/SampleAnalyzer/Commons/Service/LoopService.h (+1/-0)
tools/SampleAnalyzer/Commons/Service/PDGService.cpp (+3/-0)
tools/SampleAnalyzer/Commons/Service/PDGService.h (+2/-0)
tools/SampleAnalyzer/Commons/Service/Physics.cpp (+3/-0)
tools/SampleAnalyzer/Commons/Service/Physics.h (+28/-20)
tools/SampleAnalyzer/Commons/Service/RECconfig.h (+1/-0)
tools/SampleAnalyzer/Commons/Service/RandomService.h (+1/-0)
tools/SampleAnalyzer/Commons/Service/SortingService.cpp (+3/-22)
tools/SampleAnalyzer/Commons/Service/SortingService.h (+2/-0)
tools/SampleAnalyzer/Commons/Service/Terminate.h (+1/-0)
tools/SampleAnalyzer/Commons/Service/TimeMeasureType.h (+10/-6)
tools/SampleAnalyzer/Commons/Service/TimeService.cpp (+1/-0)
tools/SampleAnalyzer/Commons/Service/TimeService.h (+5/-6)
tools/SampleAnalyzer/Commons/Service/TransverseVariables.cpp (+5/-3)
tools/SampleAnalyzer/Commons/Service/TransverseVariables.h (+16/-3)
tools/SampleAnalyzer/Commons/Vector/MABoost.h (+3/-2)
tools/SampleAnalyzer/Commons/Vector/MALorentzVector.cpp (+3/-3)
tools/SampleAnalyzer/Commons/Vector/MALorentzVector.h (+15/-12)
tools/SampleAnalyzer/Commons/Vector/MAMatrix.h (+3/-2)
tools/SampleAnalyzer/Commons/Vector/MARotation3axis.h (+17/-16)
tools/SampleAnalyzer/Commons/Vector/MARotation3euler.h (+5/-4)
tools/SampleAnalyzer/Commons/Vector/MAVector3.cpp (+3/-3)
tools/SampleAnalyzer/Commons/Vector/MAVector3.h (+15/-12)
tools/SampleAnalyzer/Configuration/PortabilityCheckup/PortabilityCheckup.cpp (+36/-0)
tools/SampleAnalyzer/Interfaces/delphes/DelphesDataFormat.cpp (+13/-1)
tools/SampleAnalyzer/Interfaces/delphes/DelphesDataFormat.h (+8/-3)
tools/SampleAnalyzer/Interfaces/delphes/DelphesDataFormat2.cpp (+3/-1)
tools/SampleAnalyzer/Interfaces/delphes/DelphesDataFormat2.h (+5/-2)
tools/SampleAnalyzer/Interfaces/delphes/DelphesMemoryInterface.cpp (+5/-2)
tools/SampleAnalyzer/Interfaces/delphes/DelphesMemoryInterface.h (+3/-1)
tools/SampleAnalyzer/Interfaces/delphes/DelphesTreeReader.cpp (+337/-203)
tools/SampleAnalyzer/Interfaces/delphes/DelphesTreeReader.h (+4/-3)
tools/SampleAnalyzer/Interfaces/delphes/DetectorDelphes.cpp (+116/-38)
tools/SampleAnalyzer/Interfaces/delphes/DetectorDelphes.h (+3/-3)
tools/SampleAnalyzer/Interfaces/delphes/MA5EfficiencyD0.cc.install (+129/-0)
tools/SampleAnalyzer/Interfaces/delphes/MA5EfficiencyD0.h.install (+60/-0)
tools/SampleAnalyzer/Interfaces/delphes/delphes_atlas.tcl (+278/-112)
tools/SampleAnalyzer/Interfaces/delphes/delphes_atlas_pileup.tcl (+125/-91)
tools/SampleAnalyzer/Interfaces/delphes/delphes_cms.tcl (+307/-113)
tools/SampleAnalyzer/Interfaces/delphes/delphes_cms_pileup.tcl (+271/-146)
tools/SampleAnalyzer/Interfaces/delphes/ma5_atlas.tcl (+319/-119)
tools/SampleAnalyzer/Interfaces/delphes/ma5_cms.tcl (+358/-120)
tools/SampleAnalyzer/Interfaces/delphesMA5tune/DelphesMA5tuneTreeReader.cpp (+93/-36)
tools/SampleAnalyzer/Interfaces/delphesMA5tune/DelphesMA5tuneTreeReader.h (+4/-3)
tools/SampleAnalyzer/Interfaces/delphesMA5tune/DetectorDelphesMA5tune.cpp (+75/-15)
tools/SampleAnalyzer/Interfaces/delphesMA5tune/DetectorDelphesMA5tune.h (+3/-2)
tools/SampleAnalyzer/Interfaces/fastjet/ClusterAlgoCDFJetClu.cpp (+2/-3)
tools/SampleAnalyzer/Interfaces/fastjet/ClusterAlgoCDFMidpoint.cpp (+4/-2)
tools/SampleAnalyzer/Interfaces/fastjet/ClusterAlgoFastJet.cpp (+24/-15)
tools/SampleAnalyzer/Interfaces/fastjet/ClusterAlgoFastJet.h (+2/-2)
tools/SampleAnalyzer/Interfaces/fastjet/ClusterAlgoGridJet.cpp (+4/-2)
tools/SampleAnalyzer/Interfaces/fastjet/ClusterAlgoSISCone.cpp (+4/-2)
tools/SampleAnalyzer/Interfaces/fastjet/ClusterAlgoStandard.cpp (+2/-2)
tools/SampleAnalyzer/Interfaces/fastjet/DJRextractor.cpp (+34/-30)
tools/SampleAnalyzer/Interfaces/fastjet/DJRextractor.h (+2/-2)
tools/SampleAnalyzer/Interfaces/root/ROOTReader.cpp (+7/-1)
tools/SampleAnalyzer/Interfaces/root/ROOTReader.h (+3/-1)
tools/SampleAnalyzer/Interfaces/root/RootMainHeaders.h (+1/-4)
tools/SampleAnalyzer/Interfaces/root/TreeReaderBase.h (+4/-2)
tools/SampleAnalyzer/Interfaces/zlib/gz_file.h (+1/-0)
tools/SampleAnalyzer/Interfaces/zlib/gz_istream.h (+2/-0)
tools/SampleAnalyzer/Interfaces/zlib/gz_ostream.h (+1/-0)
tools/SampleAnalyzer/Interfaces/zlib/gz_streambase.h (+2/-1)
tools/SampleAnalyzer/Process/Analyzer/AnalyzerBase.h (+3/-4)
tools/SampleAnalyzer/Process/Analyzer/AnalyzerManager.cpp (+7/-4)
tools/SampleAnalyzer/Process/Analyzer/AnalyzerManager.h (+2/-0)
tools/SampleAnalyzer/Process/Analyzer/MergingPlots.cpp (+53/-34)
tools/SampleAnalyzer/Process/Analyzer/MergingPlots.h (+8/-5)
tools/SampleAnalyzer/Process/Core/ManagerBase.h (+3/-3)
tools/SampleAnalyzer/Process/Core/ProgressBar.cpp (+1/-0)
tools/SampleAnalyzer/Process/Core/ProgressBar.h (+2/-2)
tools/SampleAnalyzer/Process/Core/SampleAnalyzer.cpp (+134/-98)
tools/SampleAnalyzer/Process/Core/SampleAnalyzer.h (+3/-6)
tools/SampleAnalyzer/Process/Core/xdr_istream.cpp (+45/-40)
tools/SampleAnalyzer/Process/Core/xdr_istream.h (+0/-1)
tools/SampleAnalyzer/Process/Counter/Counter.h (+1/-0)
tools/SampleAnalyzer/Process/Counter/CounterManager.h (+3/-1)
tools/SampleAnalyzer/Process/Counter/MultiRegionCounter.h (+2/-1)
tools/SampleAnalyzer/Process/Counter/MultiRegionCounterManager.h (+3/-1)
tools/SampleAnalyzer/Process/Detector/DetectorManager.cpp (+6/-0)
tools/SampleAnalyzer/Process/Detector/DetectorManager.h (+1/-0)
tools/SampleAnalyzer/Process/JetClustering/JetClusterer.cpp (+1/-0)
tools/SampleAnalyzer/Process/JetClustering/JetClusterer.h (+3/-2)
tools/SampleAnalyzer/Process/JetClustering/JetClustererManager.cpp (+1/-0)
tools/SampleAnalyzer/Process/JetClustering/JetClustererManager.h (+1/-0)
tools/SampleAnalyzer/Process/JetClustering/TauTagger.cpp (+20/-15)
tools/SampleAnalyzer/Process/JetClustering/TauTagger.h (+3/-1)
tools/SampleAnalyzer/Process/JetClustering/bTagger.cpp (+11/-11)
tools/SampleAnalyzer/Process/JetClustering/bTagger.h (+3/-0)
tools/SampleAnalyzer/Process/JetClustering/cTagger.cpp (+14/-8)
tools/SampleAnalyzer/Process/JetClustering/cTagger.h (+3/-0)
tools/SampleAnalyzer/Process/Plot/Histo.cpp (+68/-91)
tools/SampleAnalyzer/Process/Plot/Histo.h (+6/-4)
tools/SampleAnalyzer/Process/Plot/HistoFrequency.h (+92/-52)
tools/SampleAnalyzer/Process/Plot/HistoLogX.cpp (+1/-1)
tools/SampleAnalyzer/Process/Plot/HistoLogX.h (+10/-9)
tools/SampleAnalyzer/Process/Plot/MergingPlotType.cpp (+9/-23)
tools/SampleAnalyzer/Process/Plot/MergingPlotType.h (+10/-6)
tools/SampleAnalyzer/Process/Plot/PlotBase.h (+26/-15)
tools/SampleAnalyzer/Process/Plot/PlotManager.cpp (+0/-38)
tools/SampleAnalyzer/Process/Plot/PlotManager.h (+21/-6)
tools/SampleAnalyzer/Process/Reader/HEPMCReader.cpp (+139/-137)
tools/SampleAnalyzer/Process/Reader/HEPMCReader.h (+23/-10)
tools/SampleAnalyzer/Process/Reader/LHCOReader.cpp (+12/-10)
tools/SampleAnalyzer/Process/Reader/LHCOReader.h (+3/-1)
tools/SampleAnalyzer/Process/Reader/LHEReader.cpp (+195/-67)
tools/SampleAnalyzer/Process/Reader/LHEReader.h (+5/-1)
tools/SampleAnalyzer/Process/Reader/ReaderManager.cpp (+3/-0)
tools/SampleAnalyzer/Process/Reader/ReaderManager.h (+3/-1)
tools/SampleAnalyzer/Process/Reader/ReaderTextBase.cpp (+2/-1)
tools/SampleAnalyzer/Process/Reader/ReaderTextBase.h (+5/-3)
tools/SampleAnalyzer/Process/Reader/STDHEPreader.cpp (+86/-61)
tools/SampleAnalyzer/Process/Reader/STDHEPreader.h (+9/-5)
tools/SampleAnalyzer/Process/RegionSelection/RegionSelection.cpp (+2/-1)
tools/SampleAnalyzer/Process/RegionSelection/RegionSelection.h (+3/-1)
tools/SampleAnalyzer/Process/RegionSelection/RegionSelectionManager.cpp (+55/-28)
tools/SampleAnalyzer/Process/RegionSelection/RegionSelectionManager.h (+131/-3)
tools/SampleAnalyzer/Process/Writer/LHCOParticleFormat.cpp (+1/-0)
tools/SampleAnalyzer/Process/Writer/LHCOParticleFormat.h (+3/-0)
tools/SampleAnalyzer/Process/Writer/LHCOWriter.cpp (+1/-0)
tools/SampleAnalyzer/Process/Writer/LHCOWriter.h (+3/-1)
tools/SampleAnalyzer/Process/Writer/LHEParticleFormat.cpp (+1/-0)
tools/SampleAnalyzer/Process/Writer/LHEParticleFormat.h (+3/-0)
tools/SampleAnalyzer/Process/Writer/LHEWriter.cpp (+32/-12)
tools/SampleAnalyzer/Process/Writer/LHEWriter.h (+3/-1)
tools/SampleAnalyzer/Process/Writer/SAFWriter.h (+3/-1)
tools/SampleAnalyzer/Process/Writer/WriterBase.h (+2/-1)
tools/SampleAnalyzer/Process/Writer/WriterManager.cpp (+1/-0)
tools/SampleAnalyzer/Process/Writer/WriterManager.h (+3/-1)
tools/SampleAnalyzer/Process/Writer/WriterTextBase.cpp (+1/-0)
tools/SampleAnalyzer/Process/Writer/WriterTextBase.h (+3/-1)
tools/SampleAnalyzer/Test/Commons/Test.cpp (+4/-2)
tools/SampleAnalyzer/Test/Delphes/Test.cpp (+4/-2)
tools/SampleAnalyzer/Test/DelphesMA5tune/Test.cpp (+4/-2)
tools/SampleAnalyzer/Test/Fastjet/Test.cpp (+9/-4)
tools/SampleAnalyzer/Test/Process/Test.cpp (+2/-1)
tools/SampleAnalyzer/Test/Root/Test.cpp (+4/-2)
tools/SampleAnalyzer/Test/Zlib/Test.cpp (+4/-2)
tools/SampleAnalyzer/newAnalyzer.py (+34/-29)
Branch information
Recent revisions
Branch metadata
- Branch format:
- Branch format 7
- Repository format:
- Bazaar repository format 2a (needs bzr 1.16 or later)
- Stacked on:
- lp:madanalysis5