From b4eb81a0ec215615a8c95b74471ff48bc345eda8 Mon Sep 17 00:00:00 2001 From: james szalkie Date: Tue, 26 May 2026 12:25:38 -0400 Subject: [PATCH] OS checker on makefile --- .DS_Store | Bin 0 -> 12292 bytes Armory/.DS_Store | Bin 0 -> 10244 bytes Armory/AnasenMS.dSYM/Contents/Info.plist | 20 +++++ .../Relocations/aarch64/AnasenMS.yml | 5 ++ Armory/Makefile | 84 ++++++++++++------ Armory/Mapper.dSYM/Contents/Info.plist | 20 +++++ .../Resources/Relocations/aarch64/Mapper.yml | 5 ++ Armory/anasenMS.cpp | 4 +- ELoss/.DS_Store | Bin 0 -> 8196 bytes 9 files changed, 111 insertions(+), 27 deletions(-) create mode 100644 .DS_Store create mode 100644 Armory/.DS_Store create mode 100644 Armory/AnasenMS.dSYM/Contents/Info.plist create mode 100644 Armory/AnasenMS.dSYM/Contents/Resources/Relocations/aarch64/AnasenMS.yml create mode 100644 Armory/Mapper.dSYM/Contents/Info.plist create mode 100644 Armory/Mapper.dSYM/Contents/Resources/Relocations/aarch64/Mapper.yml create mode 100644 ELoss/.DS_Store diff --git a/.DS_Store b/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..bf54090c70df78b8187ca9eac956ffc381222cf2 GIT binary patch literal 12292 zcmeHN&2!sC6n~qht=+_llg3G*En~OZZ%I~eDWcA@RWhm2WC6Dyv)&Ab@{@(7}eJc@> zsPx*WiB1qv1}Dq>FwsDks5pc_%E8b1j2-)sB5=Nk6Zd%{iyU(F)_S*T#B!$z&l&>* zs1Vz45a)inM4zbkvzmDLQ?qO6j$11Imd}fUeS`ZC9L!`74Grf;M)PCihsP$y3WdVt zRN=_@%SY?^!_7u(wPRa7vt6|e%dQwbt)3rsR;-QLmSxV_+Pbc7EVe6N)->}*$JX0dmzN#QT~h9^b7?KxGK@LP(Oum#uiuoVyV}~U zxon|CuEEtVKXMi|+kuQ>maaE!yJ2>;%H}Pj(bSBqX2o({Yi&tKE4b#e$Xd72(#_8F z2Y-5Y%}$qj6yeCzw0DDXGZEbRQY@I3sUh#2moQ!a*ng6tlXQV>r9aS(bgd#YsQgt8;US#XY5M2T*O@@zIaTzHCm#x@j4?)+dDQ=t~egS9!_Yl zSMFuW8?zZ}x%lc|X^GZ_xmP)u*h5`T$7>_)pz0Zxwp)e87jfEXfkyY@IBA1F6dUxz zMd~g2S8-YNvIhEDSN59@N{S$4FH;et5ky_~*Dm^6BLU4e+Z}D8w{!1y(M~tq)1<9b z^pw)GFQA{dX%1)$*eZBpd-HhFk?zDflU%FXazIxT>=x@Y%=W--h3)>x2z$(T3~8gT zTzekpo2V&!i&&Z5+xLi!l*z1xkOkk5v`{W~9N}96o3mf3gR>rLa|%zQn$XKbnua5q z=6z(uGcnU49P`DN32G4FVkJtZe^Hno@jX}_mSVoxr?K~3jWZ^>-YYiRQf6Dl=HQX} z7nG}06D77$hlD;FLXK@C}@bd)Qj6p^iJAPganpjkLs8F#AuamB)dDwi(dP zBcKnvA+4`Iwyt5V?48Wr>doUURKgfaxQDr`P8DFerv-N8IwpB3*e|4Ea$7@y+?kJ; zb~#nN?W_QdVRXfxg(m{ zma67qXy%m+voQ~=wZJHQjL5i`TQfA{rK|bW|$TbL7Ch>VT zggFSzI%a&HU$N2(=jPcpl>3mJ6?cy!Fthf>+{f%{C(PoQNgs=e%;3Ck31Nnmx_RX! zM8A@=ZxqgwQIWEErAaF40QA^c_gJ`YCUDj_Z*#-Jw-<6h<%i(iee(O?o>OVqH~4Mv zf@K-a;J(pZ#2a$FcCT8d+t5wTmM@I;wuUS>ujyvn+Nkgwen(F1HtwUwcq=m zM1GI(bI_(;zDJmxI#PIP{OGatdxV7V5vI%CElKoK`!Hcvd?ap&JE9@(dKMiB49$aG zIfR2hAwx$tA4g@l;%)kcgYBfip1X}YEJhIC_TZ>^E9R2iaO4n$1D;rj&I|1jHs^=t z98PeMz+0G!;em7#YN`E^(IF4#Dn=AXk%NnjZ}=nyXW%h}oJc^{Ww60px86o;f*y7{ zAw5%c5xE(`Te<9dsS!zZ zU3(Gd9h`h{zAaB~LvSNs#Y4(h@sK5Ckq7R}d;_`VN!;Q1|33mq=l|`Ot?B%~^D*qR K8w@?Q`TrkK>)(L@ literal 0 HcmV?d00001 diff --git a/Armory/.DS_Store b/Armory/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..dda6d329ae12e7de4f5f277450db872f0c3e8b4a GIT binary patch literal 10244 zcmeHM&2AG(5Uvi%W^Bhvb_Eg_q>;FAh>YVPB*ew}(=HN02qRzxyIwms$%x5}f0H%=pZTbVofkw(IMv`l`EH-60~iGZ}0W`9$QQvs_=n zqoncg+zV|X`{ov;0-h+QloC3mF$D!}_l0A?G2j?*3^)cH1OEpGuxE4gYFfIdW56-s z7`R}7>w}NZvYpAPmQp(KkRt%(BEFV}cbo$R<7cv+$*GnC#hCi^pfae+ju=YA@w?CJ zknK!PwbXD@8cr&+tg;h|66?VEqE4!bS>Ssi5dZ47(F^`u43`B7My zC0NioPHc~a|IY^hhGzdX8D)FM$Nne`lC;_Uq!z9$F8#FZEqgWZkIr#?+DUuqB-!bW zU-GA?aUAw%@4f!BV0hYHzq%VoX)lO|V*vz%Ayi&H528VQx)V>LK_b|W{=utwmG1iW zv$NLb)`s7@bMJh^KfBjzZuob$?w+4lylXda-+$756P`rzKd2RGN@+>;OwI(?A0wi- zopBV#5m#D9{DM`s4+i#-g?;RL`CX!c+z)bm@p?7+T0!0>s0v-=L*JN}?zl2jOxzlF zt^nh213TM0H<8V3|F*5l+BMM?pt*Yfig^=bl)_5nnQ!@7mDSA^f_E_XxKJTv^_o`d zsCvA*bPWu%S(+5B@hq}dP4xm9z|u&fI<#ZrwQONl%P_E2wkA;jEbJ`bPC5o01C9a5 zfMejYFmOc&>enFm=l}ozve4n;bPQZd2GrtSXKx3g&kjR*7Wl5+NB;|*8|zKA6bK%2 v9S + + + + CFBundleDevelopmentRegion + English + CFBundleIdentifier + com.apple.xcode.dsym.AnasenMS + CFBundleInfoDictionaryVersion + 6.0 + CFBundlePackageType + dSYM + CFBundleSignature + ???? + CFBundleShortVersionString + 1.0 + CFBundleVersion + 1 + + diff --git a/Armory/AnasenMS.dSYM/Contents/Resources/Relocations/aarch64/AnasenMS.yml b/Armory/AnasenMS.dSYM/Contents/Resources/Relocations/aarch64/AnasenMS.yml new file mode 100644 index 0000000..7341803 --- /dev/null +++ b/Armory/AnasenMS.dSYM/Contents/Resources/Relocations/aarch64/AnasenMS.yml @@ -0,0 +1,5 @@ +--- +triple: 'arm64-apple-darwin' +binary-path: AnasenMS +relocations: [] +... diff --git a/Armory/Makefile b/Armory/Makefile index 31a4ecf..dab515d 100644 --- a/Armory/Makefile +++ b/Armory/Makefile @@ -1,40 +1,74 @@ ######################################################################## -# -# -######################################################################### +# Cross-platform Makefile (macOS + Linux) +######################################################################## -CC = g++ +UNAME_S := $(shell uname -s) -#COPTS = -fPIC -DLINUX -O2 -std=c++17 -lpthread -COPTS = -fPIC -DLINUX -g -O0 -Wall -std=c++17 -lpthread +######################################################################## +# Defaults +######################################################################## -ROOTCFLAGS := $(shell root-config --cflags) -ROOTLIBS := $(shell root-config --libs) +ifeq ($(UNAME_S),Darwin) + +######################################################################## +# macOS (Homebrew + Apple Clang) +######################################################################## + +SDKROOT := $(shell xcrun --show-sdk-path) + +CXX := clang++ + +ROOTCFLAGS := $(shell root-config --cflags | sed 's/-stdlib=libc++//g') +ROOTLIBS := $(shell root-config --libs | sed 's/-stdlib=libc++//g') + +CXXFLAGS := -g -O0 -Wall -std=c++17 -fPIC +CXXFLAGS += $(ROOTCFLAGS) +CXXFLAGS += -isysroot $(SDKROOT) +CXXFLAGS += -I$(SDKROOT)/usr/include/c++/v1 + +LDFLAGS := $(shell root-config --glibs) -lGeom -lEve -lGui + +else + +######################################################################## +# Linux (system g++) +######################################################################## CXX := g++ -CXXFLAGS := -O2 $(ROOTCFLAGS) -ALL = Mapper EventBuilder#AnasenMS +COPTS := -fPIC -DLINUX -g -O0 -Wall -std=c++17 -pthread -######################################################################### +ROOTCFLAGS := $(shell root-config --cflags) +ROOTLIBS := $(shell root-config --libs) -all : $(ALL) +CXXFLAGS := $(COPTS) $(ROOTCFLAGS) +LDFLAGS := $(ROOTLIBS) -lGeom -lEve -lGui -clean : - /bin/rm -f $(OBJS) $(ALL) +endif -Mapper : Mapper.cpp ../mapping.h ClassDet.h - @echo "--------- making Mapper" - $(CC) $(COPTS) $(ROOTCFLAGS) -o Mapper Mapper.cpp $(ROOTLIBS) +######################################################################## +# Targets +######################################################################## -AnasenMS : constant.h Isotope.h ClassTransfer.h ClassSX3.h ClassPW.h ClassAnasen.h anasenMS.cpp - @echo "--------- making ANASEN Monte Carlo" - $(CC) $(COPTS) $(ROOTCFLAGS) -o AnasenMS anasenMS.cpp $(ROOTLIBS) -lEve -lGui -lGeom +ALL = Mapper EventBuilder AnasenMS -EventBuilder : EventBuilder.cpp ClassData.h fsuReader.h Hit.h - @echo "--------- making EventBuilder" - $(CC) $(COPTS) -o EventBuilder EventBuilder.cpp $(ROOTLIBS) +all: $(ALL) -#anasenMS: anasenMS.cpp -# $(CXX) $(CXXFLAGS) anasenMS.cpp -o anasenMS $(ROOTLIBS) +clean: + /bin/rm -f $(ALL) +######################################################################## +# Build rules +######################################################################## + +Mapper: Mapper.cpp ../mapping.h ClassDet.h + @echo "--------- making Mapper" + $(CXX) $(CXXFLAGS) Mapper.cpp -o Mapper $(LDFLAGS) + +EventBuilder: EventBuilder.cpp ClassData.h fsuReader.h Hit.h + @echo "--------- making EventBuilder" + $(CXX) $(CXXFLAGS) EventBuilder.cpp -o EventBuilder $(LDFLAGS) + +AnasenMS: anasenMS.cpp constant.h Isotope.h ClassTransfer.h ClassSX3.h ClassPW.h ClassAnasen.h + @echo "--------- making ANASEN Monte Carlo" + $(CXX) $(CXXFLAGS) anasenMS.cpp -o AnasenMS $(LDFLAGS) \ No newline at end of file diff --git a/Armory/Mapper.dSYM/Contents/Info.plist b/Armory/Mapper.dSYM/Contents/Info.plist new file mode 100644 index 0000000..320a174 --- /dev/null +++ b/Armory/Mapper.dSYM/Contents/Info.plist @@ -0,0 +1,20 @@ + + + + + CFBundleDevelopmentRegion + English + CFBundleIdentifier + com.apple.xcode.dsym.Mapper + CFBundleInfoDictionaryVersion + 6.0 + CFBundlePackageType + dSYM + CFBundleSignature + ???? + CFBundleShortVersionString + 1.0 + CFBundleVersion + 1 + + diff --git a/Armory/Mapper.dSYM/Contents/Resources/Relocations/aarch64/Mapper.yml b/Armory/Mapper.dSYM/Contents/Resources/Relocations/aarch64/Mapper.yml new file mode 100644 index 0000000..29e4f66 --- /dev/null +++ b/Armory/Mapper.dSYM/Contents/Resources/Relocations/aarch64/Mapper.yml @@ -0,0 +1,5 @@ +--- +triple: 'arm64-apple-darwin' +binary-path: Mapper +relocations: [] +... diff --git a/Armory/anasenMS.cpp b/Armory/anasenMS.cpp index 25b344d..564c4dc 100644 --- a/Armory/anasenMS.cpp +++ b/Armory/anasenMS.cpp @@ -45,7 +45,7 @@ bool IsDeadSX3(int id){ return dead.count(id); } -static std::set> ReactionProductb = { {1,1} }; // add reaction product b (light particle) A,Z pairs here, e.g. {1,1} for proton, {4,2} for alpha +static std::set> ReactionProductb = { {4,2} }; // add reaction product b (light particle) A,Z pairs here, e.g. {1,1} for proton, {4,2} for alpha int main(int argc, char **argv){ @@ -88,7 +88,7 @@ int main(int argc, char **argv){ transfer.SetIncidentEnergyAngle((42.82/14.0), 0, 0); // arguments are KEA in MeV/u, theta and phi in degree transfer.Seta( 4, 2); // identify reaction product a in internal indexing e.g., 4He (alpha) transfer.Setb(ReactionProductb.begin()->first, ReactionProductb.begin()->second); // identify reaction product b e.g., 1H (proton) - transfer.SetB(17, 8); // identify reaction product B e.g., 23Na (Z=11) + transfer.SetB(14, 7); // identify reaction product B e.g., 23Na (Z=11) // TODO add alpha source or alternative reaction channel selection diff --git a/ELoss/.DS_Store b/ELoss/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..82df7d9a0bc57cfd63a2fe3aaa9b1f01f00f2571 GIT binary patch literal 8196 zcmeHM-A)rh6g~qeTPs*YP4L2G6K@eqLC|JV(UO7QUJ&aJQf9g#K`foLECj-D(Cj16c-m?p~n{WbOMDD*5{^^7wgj&_)lv;EnAC zwirva3OWBn6rnJUU!#C-&@$Bu@Ly8+YRbMt9qLnrwnr{{d-;0UwUnNjU+4+QFVONS zrR7pe%Ok91ftCu;-%o{J$w!av{09A4*e*Z|KYUL3;c{x`UGNux$HKJ}_e4@d+LKRV zzfOy&xsf0|ki;ACnFo6z{^oH9bf89#SZ{KC2{S$(-v-MobWcTOV(o&0r~|P|UJ8?r zud;%Xw^N926_tsmDFyWaD}yDhDU0M0lw8$x2Dv%%M9M0UpCoot!FJWr8IM;nD_?w1 zcIZIdy!qnx?Ew6{!UsG85Cd5~Y&sD+oYfbI6pL)Ev6JUJ9xDo_ME9{O3;RX~wk`A> z)e2`+LCnx5t-;c0#;fRae~jjvi5UiV6)n|MXnBv-r?_KaTG4Y6z8rl&+W5pHF``gi z1&`U&;p{=!jd#hfcGq*ms8;*N#>OYkou4!&jk2-b+6@M+$cp-5)9StCpSFU)vyc0h z{mktQ+Lh{B;76A0cX|TgIvoso_1yKHV9*Tuz7q;;OTI8lMyXwyJv>}oxIJgqS8g56 znTL1kwK;QXarx+|WL&v^^X`-OTW`+~J|fysSo|Z3rsU_7mPc|SFZ->Y?*%^JvpBv) zTk!lIcr(Rb9p*;aheVW}n9-dx!N9nj#cUaJqxk;+Ow3hJLNlNl_%jT!iS^cc6S|L& zg|r!-Yn!OAQF-CxhEfU$8j+4eigX)3pQxW6< literal 0 HcmV?d00001