Fork me on GitHub

Changeset 37deb3b in git


Ignore:
Timestamp:
Dec 9, 2014, 1:40:26 PM (10 years ago)
Author:
Michele Selvaggi <michele.selvaggi@…>
Branches:
ImprovedOutputFile, Timing, dual_readout, llp, master
Children:
9e991f8
Parents:
49234af (diff), ba7fc1e (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge branch 'Delphes4LHCb' of ​https://github.com/selvaggi/delphes into selvaggi-Delphes4LHCb

Conflicts:

Makefile

Files:
5 added
6 edited

Legend:

Unmodified
Added
Removed

  • Makefile

    r49234af r37deb3b  
    301301        modules/ParticlePropagator.h \
    302302        modules/Efficiency.h \
     303        modules/IdentificationMap.h \
    303304        modules/EnergySmearing.h \
    304305        modules/MomentumSmearing.h \
    … …  
    696697        modules/EnergyScale.$(SrcSuf) \
    697698        modules/EnergyScale.h \
     699        classes/DelphesClasses.h \
     700        classes/DelphesFactory.h \
     701        classes/DelphesFormula.h \
     702        external/ExRootAnalysis/ExRootResult.h \
     703        external/ExRootAnalysis/ExRootFilter.h \
     704        external/ExRootAnalysis/ExRootClassifier.h
     705tmp/modules/IdentificationMap.$(ObjSuf): \
     706        modules/IdentificationMap.$(SrcSuf) \
     707        modules/IdentificationMap.h \
    698708        classes/DelphesClasses.h \
    699709        classes/DelphesFactory.h \
    … …  
    11641174        tmp/modules/PdgCodeFilter.$(ObjSuf) \
    11651175        tmp/modules/EnergyScale.$(ObjSuf) \
     1176        tmp/modules/IdentificationMap.$(ObjSuf) \
    11661177        tmp/modules/TrackCountingBTagging.$(ObjSuf) \
    11671178        tmp/modules/Calorimeter.$(ObjSuf) \
    … …  
    14871498        @touch $@
    14881499
     1500modules/IdentificationMap.h: \
     1501        classes/DelphesModule.h
     1502        @touch $@
     1503
     1504modules/ExampleModule.h: \
     1505        classes/DelphesModule.h
     1506        @touch $@
     1507
    14891508modules/Isolation.h: \
    14901509        classes/DelphesModule.h
    … …  
    14961515
    14971516modules/Merger.h: \
    1498         classes/DelphesModule.h
    1499         @touch $@
    1500 
    1501 modules/ExampleModule.h: \
    15021517        classes/DelphesModule.h
    15031518        @touch $@

  • display/DelphesHtmlSummary.cc

    r49234af r37deb3b  
     1/*
     2 *  Delphes: a framework for fast simulation of a generic collider experiment
     3 *  Copyright (C) 2012-2014  Universite catholique de Louvain (UCL), Belgium
     4 * 
     5 *  This program is free software: you can redistribute it and/or modify
     6 *  it under the terms of the GNU General Public License as published by
     7 *  the Free Software Foundation, either version 3 of the License, or
     8 *  (at your option) any later version.
     9 * 
     10 *  This program is distributed in the hope that it will be useful,
     11 *  but WITHOUT ANY WARRANTY; without even the implied warranty of
     12 *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     13 *  GNU General Public License for more details.
     14 * 
     15 *  You should have received a copy of the GNU General Public License
     16 *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
     17 */
     18
    119#include "display/DelphesHtmlSummary.h"
    220#include "TGHtml.h"

  • display/DelphesHtmlSummary.h

    r49234af r37deb3b  
     1/*
     2 *  Delphes: a framework for fast simulation of a generic collider experiment
     3 *  Copyright (C) 2012-2014  Universite catholique de Louvain (UCL), Belgium
     4 * 
     5 *  This program is free software: you can redistribute it and/or modify
     6 *  it under the terms of the GNU General Public License as published by
     7 *  the Free Software Foundation, either version 3 of the License, or
     8 *  (at your option) any later version.
     9 * 
     10 *  This program is distributed in the hope that it will be useful,
     11 *  but WITHOUT ANY WARRANTY; without even the implied warranty of
     12 *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     13 *  GNU General Public License for more details.
     14 * 
     15 *  You should have received a copy of the GNU General Public License
     16 *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
     17 */
     18
    119// Delphes HTML table for the event display.
    220// Based on the ROOT example "alice_esd_html_summary.C"

  • display/DelphesPlotSummary.cc

    r49234af r37deb3b  
     1/*
     2 *  Delphes: a framework for fast simulation of a generic collider experiment
     3 *  Copyright (C) 2012-2014  Universite catholique de Louvain (UCL), Belgium
     4 * 
     5 *  This program is free software: you can redistribute it and/or modify
     6 *  it under the terms of the GNU General Public License as published by
     7 *  the Free Software Foundation, either version 3 of the License, or
     8 *  (at your option) any later version.
     9 * 
     10 *  This program is distributed in the hope that it will be useful,
     11 *  but WITHOUT ANY WARRANTY; without even the implied warranty of
     12 *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     13 *  GNU General Public License for more details.
     14 * 
     15 *  You should have received a copy of the GNU General Public License
     16 *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
     17 */
     18
    119#include "display/DelphesPlotSummary.h"
    220#include "TRootEmbeddedCanvas.h"

  • display/DelphesPlotSummary.h

    r49234af r37deb3b  
     1/*
     2 *  Delphes: a framework for fast simulation of a generic collider experiment
     3 *  Copyright (C) 2012-2014  Universite catholique de Louvain (UCL), Belgium
     4 * 
     5 *  This program is free software: you can redistribute it and/or modify
     6 *  it under the terms of the GNU General Public License as published by
     7 *  the Free Software Foundation, either version 3 of the License, or
     8 *  (at your option) any later version.
     9 * 
     10 *  This program is distributed in the hope that it will be useful,
     11 *  but WITHOUT ANY WARRANTY; without even the implied warranty of
     12 *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     13 *  GNU General Public License for more details.
     14 * 
     15 *  You should have received a copy of the GNU General Public License
     16 *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
     17 */
     18
    119#ifndef DelphesPlotSummary_h
    220#define DelphesPlotSummary_h

  • modules/ModulesLinkDef.h

    r49234af r37deb3b  
    2222 *  Lists classes to be included in cint dicitonary
    2323 *
    24  *  $Date$
    25  *  $Revision$
     24 *  $Date: 2014-04-16 17:17:35 +0200 (Wed, 16 Apr 2014) $
     25 *  $Revision: 1369 $
    2626 *
    2727 *
    … …  
    3636#include "modules/ParticlePropagator.h"
    3737#include "modules/Efficiency.h"
     38#include "modules/IdentificationMap.h"
    3839#include "modules/EnergySmearing.h"
    3940#include "modules/MomentumSmearing.h"
    … …  
    7576#pragma link C++ class ParticlePropagator+;
    7677#pragma link C++ class Efficiency+;
     78#pragma link C++ class IdentificationMap+;
    7779#pragma link C++ class EnergySmearing+;
    7880#pragma link C++ class MomentumSmearing+;
Note: See TracChangeset for help on using the changeset viewer.