-
Notifications
You must be signed in to change notification settings - Fork 4.2k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Cumulative updates to HipPy scripting, TwoBodyDecay, Alignment/OfflineValidation and MuonAnalysis/MuscleFit macros #17559
Merged
Merged
Changes from 21 commits
Commits
Show all changes
22 commits
Select commit
Hold shift + click to select a range
c7862ea
Add Y1SMuMu validation
usarica 8d61254
Rearrange important scripts
usarica 25904d1
Some misc fixes
usarica 89c742e
Add some more scritps
usarica 953d261
Merge
usarica 29105a3
Oh really?
usarica cefdf26
Merge
usarica c0e6c21
Forgot to comment this out
usarica 29f9ed2
Some tmp stuff preventing concurrent job submissions
usarica 0b27501
Merge
usarica c3c4502
Improve plotting scripts
usarica 4444b55
plotting scripts
usarica c5792ab
Package dependencies and script improvements
usarica cfa8877
Misc fixes
usarica b0dd6b8
How many other files are there?
usarica 18337de
Some fixes to the comfiguration perl script
usarica 3f1be8a
Bugfixes to the job submission script
usarica b6f0a8e
Why were these not ported?
usarica 1764df0
Apparently this was also not here
usarica 8d46020
Missing lines
usarica bafeb73
What?
usarica 8937d04
Update PR per request from Gregor
usarica File filter
Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
6 changes: 0 additions & 6 deletions
6
Alignment/HIPAlignmentAlgorithm/data/ALCARECOTkAlCosmicsCTF0T.dat_CRUZET_PromptReco
This file was deleted.
Oops, something went wrong.
13 changes: 0 additions & 13 deletions
13
Alignment/HIPAlignmentAlgorithm/data/ALCARECOTkAlCosmicsCTF0T.dat_CRUZET_StreamExpress
This file was deleted.
Oops, something went wrong.
69 changes: 0 additions & 69 deletions
69
Alignment/HIPAlignmentAlgorithm/data/ALCARECOTkAlMinBias.dat_2016B_StreamExpress_v1
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,76 @@ | ||
#!/bin/bash | ||
|
||
infile=$1 | ||
iovfile=$2 | ||
nbreaks=-1 | ||
if [[ $3 != "" ]];then | ||
let nbreaks=$3 | ||
fi | ||
|
||
iovlist=() | ||
while IFS='' read -r line || [[ -n "$line" ]]; do | ||
iovlist+=($line) | ||
done < $iovfile | ||
|
||
let niovs=${#iovlist[@]} | ||
let lastiov=$niovs-1 | ||
for (( i=0; i<${niovs}; i++ )); | ||
do | ||
let ni=$i+1 | ||
|
||
core=${infile%%.dat*} | ||
newfile=$core".dat_"${iovlist[i]} | ||
rm -f $newfile | ||
|
||
str="" | ||
let nadded=1 | ||
|
||
for f in $(cat $infile) | ||
do | ||
|
||
if [[ $f != "#"* ]];then | ||
nobegin=${f#*/000/} | ||
noend=${nobegin%%/00000*} | ||
let run=${noend/\//} | ||
addfile=${f%*,} | ||
if [ $i -eq $lastiov ];then | ||
if [ $run -ge ${iovlist[i]} ]; then | ||
|
||
appendstr="" | ||
if [ $nadded -eq $nbreaks ];then | ||
appendstr="\n" | ||
let nadded=0 | ||
else | ||
appendstr="," | ||
fi | ||
addfile=$addfile$appendstr | ||
|
||
str=$str$addfile | ||
let nadded=nadded+1 | ||
fi | ||
elif [ $run -ge ${iovlist[i]} ] && [ $run -lt ${iovlist[$ni]} ]; then | ||
|
||
appendstr="" | ||
if [ $nadded -eq $nbreaks ];then | ||
appendstr="\n" | ||
let nadded=0 | ||
else | ||
appendstr="," | ||
fi | ||
addfile=$addfile$appendstr | ||
|
||
str=$str$addfile | ||
let nadded=nadded+1 | ||
fi | ||
fi | ||
|
||
done | ||
|
||
str2=${str%,} | ||
if [[ $str2 != "" ]];then | ||
echo -e $str2 >> $newfile | ||
else | ||
$newfile" is empty. Please skip!" | ||
fi | ||
|
||
done |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@usarica the data directory might not be the optimal place to put a shell script, although I understand that it is supposed to deal with files in this directory.
I would like to let @davidlange6 or @smuzaffar comment on this.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I completely agree, but the HipPy instructions right now point to using data/ for storing alignment objects. I can change the instructions and also put breakup.sh somewhere else, maybe test/?