Skip to content

Commit

Permalink
Merge pull request #269 from JeffersonLab/v2.2-rc1
Browse files Browse the repository at this point in the history
Merge v2.2-rc1 into master as new release v2.2.0
  • Loading branch information
wdconinc authored Sep 12, 2019
2 parents f626940 + 4a7b64f commit 323d1b4
Show file tree
Hide file tree
Showing 158 changed files with 4,396 additions and 15,978 deletions.
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,9 @@ log
.cproject
.project

#ignore build type file
.buildtype

#ignore dot files
*.dot

Expand Down
45 changes: 24 additions & 21 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,18 +5,24 @@ services:
script:
- docker build -t jeffersonlab/remoll .
- for suite in load validate overlap ; do
docker run -t jeffersonlab/remoll "scripts/tests/test_geometries.sh ${suite}" ;
docker run --rm -t jeffersonlab/remoll scripts/tests/test_geometries.sh ${suite} ;
done
- for suite in unit commit release ; do
docker run -t jeffersonlab/remoll "scripts/tests/test_macros.sh ${suite}" || exit 1 ;
docker start $(docker ps -l -q) ;
docker exec $(docker ps -l -q) scripts/tests/targz_macros.sh ${suite} ;
docker cp $(docker ps -l -q):"/jlab/remoll/remolltest.${suite}.log.tar.gz" . ;
docker cp $(docker ps -l -q):"/jlab/remoll/remolltest.${suite}.root.tar.gz" . ;
docker cp $(docker ps -l -q):"/jlab/remoll/remolltest.${suite}.analysis.log.tar.gz" . ;
docker cp $(docker ps -l -q):"/jlab/remoll/remolltest.${suite}.analysis.pdf.tar.gz" . ;
docker cp $(docker ps -l -q):"/jlab/remoll/remolltest.${suite}.analysis.root.tar.gz" . ;
docker stop $(docker ps -l -q) ;
- for suite in unit ; do
docker run --rm -t jeffersonlab/remoll scripts/tests/test_macros.sh ${suite} ;
done
- for suite in commit release ; do
docker run -t jeffersonlab/remoll sh -c "
scripts/tests/test_macros.sh ${suite} &&
scripts/tests/targz_macros.sh ${suite} &&
scripts/tests/watermark.sh ${suite}
" || exit 1 ;
docker cp $(docker ps -l -q):"/jlab/remoll/remolltest.*.*.log.tar.gz" . ;
docker cp $(docker ps -l -q):"/jlab/remoll/remolltest.*.*.root.tar.gz" . ;
docker cp $(docker ps -l -q):"/jlab/remoll/remolltest.*.*.analysis.log.tar.gz" . ;
docker cp $(docker ps -l -q):"/jlab/remoll/remolltest.*.*.analysis.pdf.tar.gz" . ;
docker cp $(docker ps -l -q):"/jlab/remoll/remolltest.*.*.analysis.root.tar.gz" . ;
docker cp $(docker ps -l -q):"/jlab/remoll/rootfiles_tests_*_*_analysis.pdf" . ;
docker rm $(docker ps -l -q) ;
done

after_success:
Expand All @@ -34,17 +40,14 @@ deploy:
provider: releases
api_key:
secure: MzvvPA8KxYjEVa8C9rNtAQbtD+mDx2Wn3Em02JKMtwv953Htnv3zRcyGPfF++sLV80RvZ8NZ8pN3WfiAPTBHatUSgWh9w+GRv0G366wxKrAS4O+9BVy96U7A0gFkaXRwXirJWo4u2lJscQ1hC2IDbI2dGAS/VF5Lt1TLjWcPUL8LPcKgF80FG8+9+BUH1cRiW8mULT36EeVAB1K+vwO6Qob5k4ef66eHjkbdpuUktDr6wrehoyGXtFiBfl+XWotvcrer/51J6wn85UqCc/A+KYrVshBH/gKCD7/w6D2akNM2/sJcFdLzv5WkaQOwplsAYuzLn1cNRUKbWay5ClCSm6rsoHGfaagW4/wXk9TxqJhcdmNZ+eeAvNXAxJIeRvb82pwANlSJ658FBw2ov75p3Y6rjvc8CUPsxBXZkw3dzOgwTdjmJI9q+aD4GuVeGiq9MdyJDgXUjxlP2qEtcLJfvvF9q5Bnzy+hoAV+A5yHg0lR0VjsUem2+CdexuHb/LJLx4YVkSrCSyEELAsfyJTCYNLaMKrWKujelqtKwXy4H/rwzaja6IBP77gkisNI82bvnrzn/QsvnueGyWSu/Z2HC2M/d6WAQAl3Et9W6kOb7MK+NAmEMOTW7tzaxjD+lq8aOiLJYndrOYaymin5GLNk3F2iqZMkhMCRC2YcstNr61w=
file_glob: true
file:
- remolltest.commit.log.tar.gz
- remolltest.commit.root.tar.gz
- remolltest.commit.analysis.log.tar.gz
- remolltest.commit.analysis.png.tar.gz
- remolltest.commit.analysis.root.tar.gz
- remolltest.release.log.tar.gz
- remolltest.release.root.tar.gz
- remolltest.release.analysis.log.tar.gz
- remolltest.release.analysis.pdf.tar.gz
- remolltest.release.analysis.root.tar.gz
- "remolltest.*.*.log.tar.gz"
- "remolltest.*.*.root.tar.gz"
- "remolltest.*.*.analysis.log.tar.gz"
- "remolltest.*.*.analysis.pdf.tar.gz"
- "remolltest.*.*.analysis.root.tar.gz"
- "rootfiles_tests_*_*_analysis.pdf"
skip_cleanup: true
on:
repo: JeffersonLab/remoll
Expand Down
29 changes: 29 additions & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -236,6 +236,18 @@ foreach(file ${exefiles})
)
endforeach()

#
# custom targets
#
add_custom_target(create-manual
COMMAND ./remoll -g ${PROJECT_SOURCE_DIR}/geometry/mollerMother.gdml ${PROJECT_SOURCE_DIR}/macros/manual.mac | awk '/Command directory path/,/Graphics systems deleted/' > manual.txt
BYPRODUCTS manual.txt
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
DEPENDS remoll)
add_custom_target(check-manual
COMMAND diff ${PROJECT_SOURCE_DIR}/manual.txt manual.txt || true
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
DEPENDS create-manual)

#----------------------------------------------------------------------------
# Copy all scripts to the build directory, i.e. the directory in which we
Expand Down Expand Up @@ -307,6 +319,23 @@ install(FILES
${REMOLL_MAP_DIR}/blockyHybrid_rm_3.0.txt
${REMOLL_MAP_DIR}/blockyUpstream_rm_1.1.txt
DESTINATION ${CMAKE_INSTALL_DATADIR}/remoll)
if(ADDITIONAL_FIELDS)
message(STATUS "Ensuring additional fields are available")
file(DOWNLOAD
${REMOLL_DOWNLOADS}/upstreamSymmetric_sensR_0.1.txt
${REMOLL_MAP_DIR}/upstreamSymmetric_sensR_0.1.txt
EXPECTED_MD5 849d9dc5abab0842fc13fef7f4918648)
file(DOWNLOAD
${REMOLL_DOWNLOADS}/hybridSymmetric_sensR_0.1.txt
${REMOLL_MAP_DIR}/hybridSymmetric_sensR_0.1.txt
EXPECTED_MD5 78fad2ffa5b5ae129df11bdf0ce25333)
install(FILES
${REMOLL_MAP_DIR}/upstreamSymmetric_sensR_0.0.txt
${REMOLL_MAP_DIR}/hybridSymmetric_sensR_0.0.txt
DESTINATION ${CMAKE_INSTALL_DATADIR}/remoll)
else()
message(STATUS "Download additional fields with '-DADDITIONAL_FIELDS=ON'.")
endif()


#----------------------------------------------------------------------------
Expand Down
24 changes: 15 additions & 9 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
FROM jeffersonlab/jlabce:2.3

# Install libgcj and pdftk
RUN wget https://copr.fedorainfracloud.org/coprs/robert/gcj/repo/epel-7/robert-gcj-epel-7.repo -P /etc/yum.repos.d && \
wget https://copr.fedorainfracloud.org/coprs/robert/pdftk/repo/epel-7/robert-pdftk-epel-7.repo -P /etc/yum.repos.d && \
yum install -y pdftk ghostscript

ENV JLAB_VERSION=2.3
ENV JLAB_ROOT=/jlab
ENV JLAB_SOFTWARE=/jlab/2.3/Linux_CentOS7.2.1511-x86_64-gcc4.8.5
Expand All @@ -17,14 +22,15 @@ RUN source $JLAB_ROOT/$JLAB_VERSION/ce/jlab.sh && \
make -j$(nproc) && \
make install

# Create entry point bash script
RUN echo '#!/bin/bash' > /usr/local/bin/entrypoint.sh && \
echo 'unset OSRELEASE' >> /usr/local/bin/entrypoint.sh && \
echo 'source $JLAB_ROOT/$JLAB_VERSION/ce/jlab.sh' >> /usr/local/bin/entrypoint.sh && \
echo 'export PATH=${REMOLL}/bin:${PATH}' >> /usr/local/bin/entrypoint.sh && \
echo 'export REMOLL=${REMOLL}' >> /usr/local/bin/entrypoint.sh && \
echo 'cd $REMOLL && exec $*' >> /usr/local/bin/entrypoint.sh && \
chmod +x /usr/local/bin/entrypoint.sh
# Create environment point bash script
RUN echo '#!/bin/bash' > /entrypoint.sh && \
echo 'unset OSRELEASE' >> /entrypoint.sh && \
echo 'source $JLAB_ROOT/$JLAB_VERSION/ce/jlab.sh' >> /entrypoint.sh && \
echo 'export PATH=${REMOLL}/bin:${PATH}' >> /entrypoint.sh && \
echo 'export REMOLL=${REMOLL}' >> /entrypoint.sh && \
echo 'cd $REMOLL && exec "$@"' >> /entrypoint.sh && \
chmod +x /entrypoint.sh

ENTRYPOINT ["/usr/local/bin/entrypoint.sh"]
ENTRYPOINT ["/entrypoint.sh"]

CMD ["build/remoll","-h"]
36 changes: 36 additions & 0 deletions analysis/hyperon/hyperon_pion_rates.C
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
// Run using (for example):
// build/reroot -l -q 'analysis/hyperon/hyperon_pion_rates.C("hyperon_lambda_2M.root")'

void hyperon_pion_rates(const TString& files)
{
TChain* T = new TChain("T");
T->Add(files);

std::vector<remollEventParticle_t>* parts = 0;
std::vector<remollGenericDetectorHit_t>* hits = 0;

T->SetBranchAddress("hit", &hits);
T->SetBranchAddress("part", &parts);

TH1F h_hit_r("h_hit_r","Pion hit radius at the main detector plane",20,0,2000);

// Loop over events
for (size_t iev = 0; iev < T->GetEntries(); iev++) {
T->GetEntry(iev);

// Store hits on main detector
for (size_t ihit = 0; ihit < hits->size(); ihit++) {
remollGenericDetectorHit_t hit = hits->at(ihit);
if (hit.det == 28 && hit.pid == -211) {
h_hit_r.Fill(hit.r);
}
}
for (size_t ipart = 0; ipart < parts->size(); ipart++) {
remollEventParticle_t part = parts->at(ipart);
}
}

TCanvas c;
h_hit_r.Draw();
c.SaveAs("images/hyperon_pion_rates_hit_r.png");
}
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
/remoll/beamcurr 85 microampere
# Make interactions with W, Cu, and Pb
# realistic rather than pure absorbers
/remoll/kryptonite/set true
/control/execute macros/kryptonite.mac
/process/list
# Specify random number seed - DO NOT USE THE SAME SEED OVER AND OVER AGAIN
#/remoll/seed 123456
Expand Down
2 changes: 1 addition & 1 deletion analysis/pruneTreeEnvelope/runexample_limit_envelope.mac
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
/remoll/beamcurr 85 microampere
# Make interactions with W, Cu, and Pb
# realistic rather than pure absorbers
/remoll/kryptonite/set true
/control/execute macros/kryptonite.mac
/process/list
# Specify random number seed - DO NOT USE THE SAME SEED OVER AND OVER AGAIN
#/remoll/seed 123456
Expand Down
2 changes: 1 addition & 1 deletion analysis/pruneTreeEnvelope/runexample_moller_envelope.mac
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
/remoll/beamcurr 85 microampere
# Make interactions with W, Cu, and Pb
# realistic rather than pure absorbers
/remoll/kryptonite/set true
/control/execute macros/kryptonite.mac
/process/list
# Specify random number seed - DO NOT USE THE SAME SEED OVER AND OVER AGAIN
#/remoll/seed 123456
Expand Down
146 changes: 146 additions & 0 deletions analysis/rootScripts/plotDetPlaneCuts.C
Original file line number Diff line number Diff line change
@@ -0,0 +1,146 @@
#include <utility>
#include <vector>
#include <TString.h>
#include "TCut.h"
#include <list>
#include <dirent.h>
#include <unistd.h>
#include <fstream>
#include <iostream>
#include <sstream>
#include <string>
#include <algorithm>
#include <TSystem.h>
#include <TChain.h>
#include <TFile.h>
#include <TCanvas.h>
#include <TROOT.h>
#include <TH1.h>
#include <TH2.h>
void plotDetPlaneCuts(Double_t r_outer_cut=0, Int_t n_steps = 15, Double_t r_step = 10.0, Double_t z_cut = 27000.0, Int_t detector = 28, TString type = "moller", Int_t radialCut = 1, TString fname = "NULL"){
/* I want to take a given ROOT output file and plot a specific detector's
* hit.x/y/r/theta, etc. distributions (weighted by rate)
* and using cuts that are set at the z_cut position, cutting out all part.tjr
* (calculated radii) tracks that are > r_outer_cut
*
* I would also like to have this loop over r_outer_cut from some initial
* to final in fine steps and make a plot of the number of cut out/in epelastic/moller
* particles (weighted by rate) vs. that cut radius
*
* I would also like to do a similar scan in z maybe... or at least compare at multiple
* z cut places */

if (r_outer_cut==0) {
std::cout<<"Usage: Load Data Root File to gDirectory, root> .x plotDetPlaneCuts(r_outer_cut=0, n_steps = 15, r_step = 10.0, z_cut = 27000.0, detector = 28, type = \"moller\")\n\n"<<std::endl;
return;
}

TChain * T = new TChain("T");
if (fname == "NULL"){
T = (TChain*)gDirectory->Get("T");
}
else {
T->Add(fname);
}
FILE *fp;
fp = fopen(Form("Output_cuts.txt"),"a");

Int_t n_events = 100000;
Int_t start_event_n = 1;
Double_t z_cut_space = 1.0; // mm

const Int_t n_canvases = 100;
const Int_t n_plots = 1;
Double_t norm_rate_weight_all[n_canvases*n_plots];
Double_t norm_rate_weight_in[n_canvases*n_plots];
Double_t norm_rate_weight_out[n_canvases*n_plots];
TCanvas *canvas[n_canvases];
TH1F *totalRate[n_canvases*n_plots];
TH1F *r_inside[n_canvases*n_plots];
TH1F *r_outside[n_canvases*n_plots];
TH2F *xy_inside[n_canvases*n_plots];
TH2F *xy_outside[n_canvases*n_plots];

for (Int_t n_canvas = 0; n_canvas < n_steps; n_canvas++) {
r_outer_cut = r_outer_cut - r_step;
canvas[n_canvas] = new TCanvas(Form("Plot of %s in detector %d hits for z plane %f, r > %f",type.Data(),detector,z_cut,r_outer_cut),Form("Plot of %s in detector %d hits for z plane %f, r > %f",type.Data(),detector,z_cut,r_outer_cut));
canvas[n_canvas]->Divide(n_plots*2,2);
for (Int_t n_plot = 0; n_plot<n_plots; n_plot++){
std::cout<<"Plot number "<<n_canvas*n_plots+n_plot<<", n_canvas "<<n_canvas<<", n_plot "<<n_plot<<std::endl;

canvas[n_canvas]->cd(n_plot+1);
T->Draw(Form("hit.r[0]>>h_totalRate_%d",n_canvas*n_plots + n_plot),Form("rate*(hit.det[0] == %d && part.tjz > %f-%f && part.tjz < %f+%f)",detector,z_cut,z_cut_space,z_cut,z_cut_space),"",n_events,start_event_n);
totalRate[n_canvas*n_plots + n_plot] = (TH1F*)gROOT->FindObject(Form("h_totalRate_%d",n_canvas*n_plots + n_plot));
norm_rate_weight_all[n_canvas*n_plots + n_plot] = totalRate[n_canvas*n_plots + n_plot]->Integral();
Printf("Normalization total rate weight = %f",norm_rate_weight_all[n_canvas*n_plots + n_plot]);

// Radial
if (radialCut == 1){
T->Draw(Form("hit.r[0]>>h_r_inside_%d",n_canvas*n_plots + n_plot),Form("rate*(hit.det[0] == %d && part.tjz > %f-%f && part.tjz < %f+%f && sqrt((part.tjx*part.tjx)+(part.tjy*part.tjy)) < %f)",detector,z_cut,z_cut_space,z_cut,z_cut_space,r_outer_cut),"",n_events,start_event_n);
}
else {
// X cut
T->Draw(Form("hit.r[0]>>h_r_inside_%d",n_canvas*n_plots + n_plot),Form("rate*(hit.det[0] == %d && part.tjz > %f-%f && part.tjz < %f+%f && part.tjx < %f)",detector,z_cut,z_cut_space,z_cut,z_cut_space,r_outer_cut),"",n_events,start_event_n);
}
r_inside[n_canvas*n_plots + n_plot] = (TH1F*)gROOT->FindObject(Form("h_r_inside_%d",n_canvas*n_plots + n_plot));
norm_rate_weight_in[n_canvas*n_plots + n_plot] = r_inside[n_canvas*n_plots + n_plot]->Integral();

canvas[n_canvas]->cd(n_plot+2);
// Radial
if (radialCut == 1){
T->Draw(Form("hit.r[0]>>h_r_outside_%d",n_canvas*n_plots + n_plot),Form("rate*(hit.det[0] == %d && part.tjz > %f-%f && part.tjz < %f+%f && sqrt((part.tjx*part.tjx)+(part.tjy*part.tjy)) > %f)",detector,z_cut,z_cut_space,z_cut,z_cut_space,r_outer_cut),"",n_events,start_event_n);
// X cut
}
else {
T->Draw(Form("hit.r[0]>>h_r_outside_%d",n_canvas*n_plots + n_plot),Form("rate*(hit.det[0] == %d && part.tjz > %f-%f && part.tjz < %f+%f && part.tjx > %f)",detector,z_cut,z_cut_space,z_cut,z_cut_space,r_outer_cut),"",n_events,start_event_n);
}
r_outside[n_canvas*n_plots + n_plot] = (TH1F*)gROOT->FindObject(Form("h_r_outside_%d",n_canvas*n_plots + n_plot));
norm_rate_weight_out[n_canvas*n_plots + n_plot] = r_outside[n_canvas*n_plots + n_plot]->Integral();

canvas[n_canvas]->cd(n_plot+3);
// Radial
if (radialCut == 1){
T->Draw(Form("hit.y[0]:hit.x[0]>>h_xy_inside_%d",n_canvas*n_plots + n_plot),Form("rate*(hit.det[0] == %d && part.tjz > %f-%f && part.tjz < %f+%f && sqrt((part.tjx*part.tjx)+(part.tjy*part.tjy)) < %f)",detector,z_cut,z_cut_space,z_cut,z_cut_space,r_outer_cut),"",n_events,start_event_n);
}
else {
// X cut
T->Draw(Form("hit.y[0]:hit.x[0]>>h_xy_inside_%d",n_canvas*n_plots + n_plot),Form("rate*(hit.det[0] == %d && part.tjz > %f-%f && part.tjz < %f+%f && part.tjx < %f)",detector,z_cut,z_cut_space,z_cut,z_cut_space,r_outer_cut),"",n_events,start_event_n);
}
xy_inside[n_canvas*n_plots + n_plot] = (TH2F*)gROOT->FindObject(Form("h_xy_inside_%d",n_canvas*n_plots + n_plot));

canvas[n_canvas]->cd(n_plot+4);
// Radial
if (radialCut == 1){
T->Draw(Form("hit.y[0]:hit.x[0]>>h_xy_outside_%d",n_canvas*n_plots + n_plot),Form("rate*(hit.det[0] == %d && part.tjz > %f-%f && part.tjz < %f+%f && sqrt((part.tjx*part.tjx)+(part.tjy*part.tjy)) > %f)",detector,z_cut,z_cut_space,z_cut,z_cut_space,r_outer_cut),"",n_events,start_event_n);
}
// X cut
else {
T->Draw(Form("hit.y[0]:hit.x[0]>>h_xy_outside_%d",n_canvas*n_plots + n_plot),Form("rate*(hit.det[0] == %d && part.tjz > %f-%f && part.tjz < %f+%f && part.tjx > %f)",detector,z_cut,z_cut_space,z_cut,z_cut_space,r_outer_cut),"",n_events,start_event_n);
}
xy_outside[n_canvas*n_plots + n_plot] = (TH2F*)gROOT->FindObject(Form("h_xy_outside_%d",n_canvas*n_plots + n_plot));

// CAMGUIN feature: writeFile_h takes the name of the variable, the value to set it to, the "run number" which is a unique identifier, the split number (which is another unique identifier), and the number of runs (another one)
//writeFile_h("r_outer_cut", r_outer_cut, r_outer_cut, z_cut, detector*1.0);
//writeFile_h("z_cut", z_cut, r_outer_cut, z_cut, detector*1.0);
//writeFile_h("detector", detector*1.0, r_outer_cut, z_cut, detector*1.0);
//writeFile_h(Form("%s_norm_rate_weight_all",type.Data()), norm_rate_weight_all[n_canvas*n_plots + n_plot], r_outer_cut, z_cut, detector*1.0);
//writeFile_h(Form("%s_norm_rate_weight_in",type.Data()), norm_rate_weight_in[n_canvas*n_plots + n_plot], r_outer_cut, z_cut, detector*1.0);
//writeFile_h(Form("%s_norm_rate_weight_out",type.Data()), norm_rate_weight_out[n_canvas*n_plots + n_plot], r_outer_cut, z_cut, detector*1.0);

if(fp!=NULL){
fprintf(fp,"r_outer_cut = %f, z_cut = %f, detector = %d, %s_norm_rate_weight_all = %f, %s_norm_rate_weight_in = %f, %s_norm_rate_weight_out = %f\n",r_outer_cut,z_cut,detector,type.Data(),norm_rate_weight_all[n_canvas*n_plots + n_plot],type.Data(),norm_rate_weight_in[n_canvas*n_plots + n_plot],type.Data(),norm_rate_weight_out[n_canvas*n_plots + n_plot]);
}
}
if (n_canvas == 0 && n_steps != 1){
canvas[n_canvas]->SaveAs(Form("%s_norm_rate_weight.pdf(",type.Data()));
}
else if (n_canvas < n_steps || n_steps==1) {
canvas[n_canvas]->SaveAs(Form("%s_norm_rate_weight.pdf",type.Data()));
}
else {
canvas[n_canvas]->SaveAs(Form("%s_norm_rate_weight.pdf)",type.Data()));
}
}

fclose(fp);
}
5 changes: 4 additions & 1 deletion cmake/modules/BuildType.cmake
Original file line number Diff line number Diff line change
@@ -1,7 +1,10 @@
# Set a default build type if none was specified
set(DEFAULT_CMAKE_BUILD_TYPE "Release")
if (EXISTS "${CMAKE_SOURCE_DIR}/.git")
set(DEFAULT_CMAKE_BUILD_TYPE "Debug")
set(DEFAULT_CMAKE_BUILD_TYPE "RelWithDebInfo")
endif()
if (EXISTS "${CMAKE_SOURCE_DIR}/.buildtype")
file(STRINGS "${CMAKE_SOURCE_DIR}/.buildtype" DEFAULT_CMAKE_BUILD_TYPE)
endif()
if (NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES)
message(STATUS "Setting build type to '${DEFAULT_CMAKE_BUILD_TYPE}' as none was specified.")
Expand Down
4 changes: 2 additions & 2 deletions generators/aniol/.gitignore
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
a.out
hyperon-gen
hyperon_decay
lambda_decay

hyperon_outp.dat
hyperon_particle_decays.dat
*.dat
6 changes: 3 additions & 3 deletions generators/aniol/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,14 @@ CC=g++
CFLAGS=
LIBS=-lm

EXES=hyperon_decay hyperon-gen
EXES=hyperon_decay hyperon-gen lambda_decay

all: $(EXES)

%.o: %.c
%.o: %.c %.h
$(CC) -c -o $@ $< $(CFLAGS)

%: %.o
%: %.o %.h
$(CC) -o $@ $^ $(CFLAGS) $(LIBS)

.PHONY: clean
Expand Down
Loading

0 comments on commit 323d1b4

Please sign in to comment.