Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
G
G4Alfo
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Alfonso Pisapia
G4Alfo
Commits
9ba15a96
Commit
9ba15a96
authored
5 months ago
by
Alfonso
Browse files
Options
Downloads
Patches
Plain Diff
Risolto conflitto e rimosso file .pyc
parent
806daf4e
No related branches found
No related tags found
No related merge requests found
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
primo.mac
+2
-4
2 additions, 4 deletions
primo.mac
python/convertRoot2Fits.py
+2
-0
2 additions, 0 deletions
python/convertRoot2Fits.py
python/main.py
+1
-0
1 addition, 0 deletions
python/main.py
with
5 additions
and
4 deletions
primo.mac
+
2
−
4
View file @
9ba15a96
/gps/particle gamma
/gps/pos/type Plane
/gps/pos/shape Square
/gps/pos/halfx 50 cm
...
...
@@ -15,5 +13,5 @@
/gps/direction -0.000 -0.000 -1.000
/gps/energy 150.0 keV
/run/beamOn 10000000
Kumar, P.; Zhang, B. The physics of gamma-ray bursts relativistic jets. Phys. Rep. 2015, 561, 1–109.
\ No newline at end of file
/run/beamOn 1000000
This diff is collapsed.
Click to expand it.
python/convertRoot2Fits.py
+
2
−
0
View file @
9ba15a96
...
...
@@ -101,3 +101,5 @@ def generate_fits(energy, theta_deg, phi_deg):
print
(
"
File .fits creato correttamente
"
)
except
Exception
as
e
:
print
(
"
Errore durante la creazione del file .fits
"
)
generate_fits
(
66
,
0
,
0
)
\ No newline at end of file
This diff is collapsed.
Click to expand it.
python/main.py
+
1
−
0
View file @
9ba15a96
...
...
@@ -29,6 +29,7 @@ def main():
rot2_x
,
rot2_y
,
rot2_z
,
dir_x
,
dir_y
,
dir_z
)
run_macro
(
macro_name
)
generate_fits
(
energy
,
theta_deg
,
phi_deg
)
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment