Skip to content

Commit

Permalink
first version of shared layer subtraction
Browse files Browse the repository at this point in the history
  • Loading branch information
@mverwe
mverwe committed May 13, 2019
1 parent 1abd31e commit d26ce71
Show file tree
Hide file tree
Showing 7 changed files with 625 additions and 151 deletions.
86 changes: 16 additions & 70 deletions Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,29 +18,30 @@ LIBRARIES += `$(FJCONFIG) --libs --plugins` -lfastjetcontribfragile
PYTHIA8LOCATION = /afs/cern.ch/sw/lcg/external/MCGenerators_lcgcmt67c/pythia8/226/x86_64-slc6-gcc48-opt
INCLUDE += -I$(PYTHIA8LOCATION)/include
LIBRARIES += -L$(PYTHIA8LOCATION)/lib -lpythia8
LIBRARIES += -lgsl -lgslcblas -lm

INCLUDE += -I/usr/include

LIBRARIES +=
INCLUDE +=

INCLUDE += `root-config --cflags`
LIBRARIES += `root-config --libs`
LIBRARIES += `root-config --glibs`
INCLUDE += $(LCLINCLUDE)

COMMONSRC =
F77SRC =
COMMONOBJ =

PROGSRC = runCreatePythiaEvents.cc runCreatePythiaEventsPartonLevel.cc runCreateThermalEvents.cc runCSVariations.cc runFromFile.cc runJetPerformance.cc runJewelSub.cc runSDGenVarious.cc runtest.cc
PROGOBJ = runCreatePythiaEvents.o runCreatePythiaEventsPartonLevel.o runCreateThermalEvents.o runCSVariations.o runFromFile.o runJetPerformance.o runJewelSub.o runSDGenVarious.o runtest.o
PROGSRC = runConversionQPYTHIA.cc runCreatePythiaEvents.cc runCreatePythiaEventsPartonLevel.cc runCreateThermalEvents.cc runCSVariations.cc runFromFile.cc runJetPerformance.cc runJewelSub.cc runSDGenVarious.cc runSDGenVariousJewelSub.cc runSharedLayerSubtraction.cc runtest.cc
PROGOBJ = runConversionQPYTHIA.o runCreatePythiaEvents.o runCreatePythiaEventsPartonLevel.o runCreateThermalEvents.o runCSVariations.o runFromFile.o runJetPerformance.o runJewelSub.o runSDGenVarious.o runSDGenVariousJewelSub.o runSharedLayerSubtraction.o runtest.o

INCLUDE +=
LIBRARIES += -LPU14 -lPU14 -lz


all: runCreatePythiaEvents runCreatePythiaEventsPartonLevel runCreateThermalEvents runCSVariations runFromFile runJetPerformance runJewelSub runSDGenVarious runtest
all: runConversionQPYTHIA runCreatePythiaEvents runCreatePythiaEventsPartonLevel runCreateThermalEvents runCSVariations runFromFile runJetPerformance runJewelSub runSDGenVarious runSDGenVariousJewelSub runSharedLayerSubtraction runtest


runConversionQPYTHIA: runConversionQPYTHIA.o $(COMMONOBJ)
$(CXX) $(LDFLAGS) -o $@ $@.o $(COMMONOBJ) $(LIBRARIES)

runCreatePythiaEvents: runCreatePythiaEvents.o $(COMMONOBJ)
$(CXX) $(LDFLAGS) -o $@ $@.o $(COMMONOBJ) $(LIBRARIES)

Expand All @@ -65,6 +66,12 @@ runJewelSub: runJewelSub.o $(COMMONOBJ)
runSDGenVarious: runSDGenVarious.o $(COMMONOBJ)
$(CXX) $(LDFLAGS) -o $@ $@.o $(COMMONOBJ) $(LIBRARIES)

runSDGenVariousJewelSub: runSDGenVariousJewelSub.o $(COMMONOBJ)
$(CXX) $(LDFLAGS) -o $@ $@.o $(COMMONOBJ) $(LIBRARIES)

runSharedLayerSubtraction: runSharedLayerSubtraction.o $(COMMONOBJ)
$(CXX) $(LDFLAGS) -o $@ $@.o $(COMMONOBJ) $(LIBRARIES)

runtest: runtest.o $(COMMONOBJ)
$(CXX) $(LDFLAGS) -o $@ $@.o $(COMMONOBJ) $(LIBRARIES)

Expand All @@ -76,7 +83,7 @@ clean:
rm -vf $(COMMONOBJ) $(PROGOBJ)

realclean: clean
rm -vf runCreatePythiaEvents runCreatePythiaEventsPartonLevel runCreateThermalEvents runCSVariations runFromFile runJetPerformance runJewelSub runSDGenVarious runtest
rm -vf runConversionQPYTHIA runCreatePythiaEvents runCreatePythiaEventsPartonLevel runCreateThermalEvents runCSVariations runFromFile runJetPerformance runJewelSub runSDGenVarious runSDGenVariousJewelSub runSharedLayerSubtraction runtest

.cc.o: $<
$(CXX) $(CXXFLAGS) $(INCLUDE) -c $< -o $@
Expand All @@ -92,64 +99,3 @@ realclean: clean

depend:
makedepend $(LCLINCLUDE) -Y -- -- $(COMMONSRC) $(PROGSRC)
# DO NOT DELETE

runCreatePythiaEvents.o: include/ProgressBar.h include/pythiaEvent.hh
runCreatePythiaEvents.o: include/extraInfo.hh include/extraInfo.hh
runCreatePythiaEvents.o: PU14/CmdLine.hh
runCreatePythiaEventsPartonLevel.o: include/ProgressBar.h
runCreatePythiaEventsPartonLevel.o: include/pythiaEvent.hh
runCreatePythiaEventsPartonLevel.o: include/extraInfo.hh include/extraInfo.hh
runCreatePythiaEventsPartonLevel.o: PU14/CmdLine.hh
runCreateThermalEvents.o: include/ProgressBar.h include/thermalEvent.hh
runCreateThermalEvents.o: include/extraInfo.hh PU14/CmdLine.hh
runCSVariations.o: include/ProgressBar.h PU14/EventMixer.hh PU14/CmdLine.hh
runCSVariations.o: PU14/EventSource.hh PU14/CmdLine.hh PU14/PU14.hh
runCSVariations.o: PU14/HepPID/ParticleIDMethods.hh include/jetCollection.hh
runCSVariations.o: include/csSubtractor.hh PU14/PU14.hh
runCSVariations.o: include/csSubtractorFullEvent.hh include/skSubtractor.hh
runCSVariations.o: include/softDropGroomer.hh include/jetCollection.hh
runCSVariations.o: include/treeWriter.hh include/jetMatcher.hh
runCSVariations.o: include/randomCones.hh include/Angularity.hh
runFromFile.o: include/ProgressBar.h PU14/EventMixer.hh PU14/CmdLine.hh
runFromFile.o: PU14/EventSource.hh PU14/CmdLine.hh PU14/PU14.hh
runFromFile.o: PU14/HepPID/ParticleIDMethods.hh include/jetCollection.hh
runFromFile.o: include/csSubtractor.hh PU14/PU14.hh
runFromFile.o: include/csSubtractorFullEvent.hh include/skSubtractor.hh
runFromFile.o: include/softDropGroomer.hh include/jetCollection.hh
runFromFile.o: include/treeWriter.hh include/jetMatcher.hh
runFromFile.o: include/randomCones.hh include/Angularity.hh
runFromFile.o: include/jewelMatcher.hh
runJetPerformance.o: include/ProgressBar.h PU14/EventMixer.hh PU14/CmdLine.hh
runJetPerformance.o: PU14/EventSource.hh PU14/CmdLine.hh PU14/PU14.hh
runJetPerformance.o: PU14/HepPID/ParticleIDMethods.hh
runJetPerformance.o: include/jetCollection.hh include/csSubtractor.hh
runJetPerformance.o: PU14/PU14.hh include/csSubtractorFullEvent.hh
runJetPerformance.o: include/skSubtractor.hh include/softDropGroomer.hh
runJetPerformance.o: include/jetCollection.hh include/treeWriter.hh
runJetPerformance.o: include/jetMatcher.hh include/randomCones.hh
runJetPerformance.o: include/Angularity.hh
runJewelSub.o: include/ProgressBar.h PU14/EventMixer.hh PU14/CmdLine.hh
runJewelSub.o: PU14/EventSource.hh PU14/CmdLine.hh PU14/PU14.hh
runJewelSub.o: PU14/HepPID/ParticleIDMethods.hh include/jetCollection.hh
runJewelSub.o: include/csSubtractor.hh PU14/PU14.hh
runJewelSub.o: include/csSubtractorFullEvent.hh include/skSubtractor.hh
runJewelSub.o: include/softDropGroomer.hh include/jetCollection.hh
runJewelSub.o: include/treeWriter.hh include/jetMatcher.hh
runJewelSub.o: include/randomCones.hh include/Angularity.hh
runJewelSub.o: include/jewelMatcher.hh
runSDGenVarious.o: include/ProgressBar.h PU14/EventMixer.hh PU14/CmdLine.hh
runSDGenVarious.o: PU14/EventSource.hh PU14/CmdLine.hh PU14/PU14.hh
runSDGenVarious.o: PU14/HepPID/ParticleIDMethods.hh include/jetCollection.hh
runSDGenVarious.o: include/csSubtractor.hh PU14/PU14.hh
runSDGenVarious.o: include/csSubtractorFullEvent.hh include/skSubtractor.hh
runSDGenVarious.o: include/softDropGroomer.hh include/jetCollection.hh
runSDGenVarious.o: include/treeWriter.hh include/jetMatcher.hh
runSDGenVarious.o: include/randomCones.hh include/Angularity.hh
runtest.o: PU14/CmdLine.hh include/ProgressBar.h include/jetCollection.hh
runtest.o: include/thermalEvent.hh include/extraInfo.hh
runtest.o: include/pythiaEvent.hh include/csSubtractor.hh PU14/PU14.hh
runtest.o: include/csSubtractorFullEvent.hh include/skSubtractor.hh
runtest.o: include/softDropGroomer.hh include/jetCollection.hh
runtest.o: include/softDropCounter.hh include/treeWriter.hh
runtest.o: include/jetMatcher.hh include/randomCones.hh
20 changes: 2 additions & 18 deletions PU14/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,8 @@ LDFLAGS += -std=c++11
FJCONFIG = /afs/cern.ch/user/m/mverweij/work/soft/toy/fastjet-install/bin/fastjet-config
INCLUDE += `$(FJCONFIG) --cxxflags`
LIBRARIES += `$(FJCONFIG) --libs --plugins` -lfastjetcontribfragile
LIBRARIES += -lgsl -lgslcblas -lm

INCLUDE += -I/usr/include

LIBRARIES +=
INCLUDE +=
INCLUDE += $(LCLINCLUDE)

COMMONSRC = CmdLine.cc EventMixer.cc EventSource.cc helpers.cc ParticleIDMethods.cc ParticleName.cc PU14.cc Version.cc zfstream.cc
Expand Down Expand Up @@ -62,17 +60,3 @@ realclean: clean

depend:
makedepend $(LCLINCLUDE) -Y -- -- $(COMMONSRC) $(PROGSRC)
# DO NOT DELETE

CmdLine.o: CmdLine.hh
EventMixer.o: EventMixer.hh CmdLine.hh EventSource.hh PU14.hh
EventMixer.o: HepPID/ParticleIDMethods.hh helpers.hh
EventSource.o: EventSource.hh FastIStringStream.hh PU14.hh
EventSource.o: HepPID/ParticleIDMethods.hh zfstream.h
helpers.o: helpers.hh
ParticleIDMethods.o: HepPID/ParticleIDMethods.hh HepPID/ParticleName.hh
ParticleName.o: HepPID/ParticleName.hh HepPID/ParticleIDMethods.hh
ParticleName.o: HepPID/Version.hh
PU14.o: PU14.hh HepPID/ParticleIDMethods.hh
Version.o: HepPID/Version.hh
zfstream.o: zfstream.h
4 changes: 2 additions & 2 deletions include/Angularity.hh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,13 @@ public:
{}

/// compute the function
virtual double result(const PseudoJet &jet) const {
virtual double result(const fastjet::PseudoJet &jet) const {
// check the jet is appropriate for computation
if (!jet.has_constituents()) {
Printf("Angularities can only be applied on jets for which the constituents are known.");
return -999.;
}
vector<PseudoJet> constits = jet.constituents();
vector<fastjet::PseudoJet> constits = jet.constituents();
double ang = 0.;
for(fastjet::PseudoJet p : constits) {
ang += std::pow(p.pt()/jet.pt(),_kappa)*std::pow(jet.delta_R(p)/_R0,_beta); //use scalar pT for jet?
Expand Down
Loading

0 comments on commit d26ce71

Please sign in to comment.