Skip to content
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

master -> main updates #153

Merged
merged 1 commit into from
Apr 25, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ You also agree to abide by our [contributor code of conduct][conduct].
1. We use the [fork and pull][gh-fork-pull] model to manage changes.
More information about [forking a repository][gh-fork] and [making a Pull Request][gh-pull].

2. For our lessons, you should branch from and submit pull requests against the `master` branch.
2. For our lessons, you should branch from and submit pull requests against the `main` branch.

3. When editing lesson pages, you need only commit changes to the Markdown source files.

Expand Down
4 changes: 2 additions & 2 deletions archive/FCChhFullAnalysis.md
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ But first, make sure your **setup of the FCC software** is working correctly. A
!which fccrun
```

If the above command fails without printing a path like `/cvmfs/fcc.cern.ch/sw/releases/fccsw/0.10/x86_64-centos7-gcc62-opt/scripts/fccrun` check [**the documentation page on FCC software setup**](https://github.com/HEP-FCC/fcc-tutorials/blob/master/FccSoftwareGettingStarted.md).
If the above command fails without printing a path like `/cvmfs/fcc.cern.ch/sw/releases/fccsw/0.10/x86_64-centos7-gcc62-opt/scripts/fccrun` check [**the documentation page on FCC software setup**](https://github.com/HEP-FCC/fcc-tutorials/blob/main/FccSoftwareGettingStarted.md).


## Part I: Generate and simulate Events with FCCSW
Expand Down Expand Up @@ -797,7 +797,7 @@ By comparing the CMS and FCC Delphes cards, try to explain:
[]() Other documentation
------------------------

- [Submit FCCSW jobs using the condor queue](https://github.com/HEP-FCC/fcc-tutorials/blob/master/FccCondor.md)
- [Submit FCCSW jobs using the condor queue](https://github.com/HEP-FCC/fcc-tutorials/blob/main/FccCondor.md)
- [Submit Heppy jobs using the batch queue](https://github.com/HEP-FCC/heppy/blob/master/doc/Heppy_-_Parallel_Processing.md)
- [FCCSW webpage](http://fccsw.web.cern.ch/fccsw/index.html)
- [Pythia8 manual](http://home.thep.lu.se/~torbjorn/pythia81html/Welcome.html)
Expand Down
2 changes: 1 addition & 1 deletion archive/FccCaloPerformance.md
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ You can check that the command to run jobs in the Gaudi framework is available o
```python
!which fccrun
```
If you don't see a valid path like `/usr/local/bin/fccrun` you should consult [the documentation page on FCCSW setup](https://github.com/vvolkl/fcc-tutorials/blob/master/FccSoftwareGettingStarted.md)
If you don't see a valid path like `/usr/local/bin/fccrun` you should consult [the documentation page on FCCSW setup](https://github.com/vvolkl/fcc-tutorials/blob/main/FccSoftwareGettingStarted.md)

## Using the DD4hep detector model in FCC Software.

Expand Down
2 changes: 1 addition & 1 deletion archive/FccCaloPerformance_2021/FccCaloPerformance.md
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ You can check that the command to run jobs in the Gaudi framework is available o
```bash
which fccrun
```
If you don't see a valid path like `/usr/local/bin/fccrun` you should consult [the documentation page on FCCSW setup](https://github.com/vvolkl/fcc-tutorials/blob/master/FccSoftwareGettingStarted.md)
If you don't see a valid path like `/usr/local/bin/fccrun` you should consult [the documentation page on FCCSW setup](https://github.com/vvolkl/fcc-tutorials/blob/main/FccSoftwareGettingStarted.md)

## Using the DD4hep detector model in FCC Software.

Expand Down
2 changes: 1 addition & 1 deletion archive/FccFullAnalysis.md
Original file line number Diff line number Diff line change
Expand Up @@ -212,7 +212,7 @@ By comparing the CMS and FCC Delphes cards, try to explain:
[]() Other documentation
------------------------

- [Submit FCCSW jobs using the condor queue](https://github.com/HEP-FCC/fcc-tutorials/blob/master/FccCondor.md)
- [Submit FCCSW jobs using the condor queue](https://github.com/HEP-FCC/fcc-tutorials/blob/main/FccCondor.md)
- [Submit Heppy jobs using the batch queue](https://github.com/HEP-FCC/heppy/blob/master/doc/Heppy_-_Parallel_Processing.md)
- [FCCSW webpage](http://fccsw.web.cern.ch/fccsw/index.html)
- [Pythia8 manual](http://home.thep.lu.se/~torbjorn/pythia81html/Welcome.html)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -294,8 +294,8 @@ fccanalysis run analysis_tutorial_mva.py --output photons_10layers.root --test

We get the following plotting scripts
```shell
wget https://raw.githubusercontent.com/HEP-FCC/fcc-tutorials/master/full-detector-simulations/FCCeeCaloPhotonPi0Discrimination/draw_rocCurve_pi0_gamma_GNN.py
wget https://raw.githubusercontent.com/HEP-FCC/fcc-tutorials/master/full-detector-simulations/FCCeeCaloPhotonPi0Discrimination/rocCurveFacility.py
wget https://raw.githubusercontent.com/HEP-FCC/fcc-tutorials/main/full-detector-simulations/FCCeeCaloPhotonPi0Discrimination/draw_rocCurve_pi0_gamma_GNN.py
wget https://raw.githubusercontent.com/HEP-FCC/fcc-tutorials/main/full-detector-simulations/FCCeeCaloPhotonPi0Discrimination/rocCurveFacility.py
```

Edit `draw_rocCurve_pi0_gamma_GNN.py` and edit the following:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -260,7 +260,7 @@ From there, you can navigate the geometry hierarchy to see how volumes are neste
:align: center
```

This tool is useful but not perfect and will not meet all the needs (especially if you want to overlay a physics event). To go further, other solutions are described in the dedicated [Visualization](https://hep-fcc.github.io/fcc-tutorials/master/full-detector-simulations/Visualization/Visualization.html) tutorial.
This tool is useful but not perfect and will not meet all the needs (especially if you want to overlay a physics event). To go further, other solutions are described in the dedicated [Visualization](https://hep-fcc.github.io/fcc-tutorials/main/full-detector-simulations/Visualization/Visualization.html) tutorial.

## Additional Resources
- [Key4hep tutorial](https://key4hep.github.io/key4hep-doc/setup-and-getting-started/README.html)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ Open the file `runCaloSim.py` and briefly browse it to get familiar with the `Ga
NB: everything defined as a `Gaudi::Property` in the C++ implementation (e.g. `MomentumMin` from `MomentumRangeParticleGun`) can be set at run time in command line arguments.
The complete list of parameters that can be modified is displayed with `fccrun runCaloSim.py -h`.

Run the simulation with `fccrun runCaloSim.py` (you can safely ignore the warnings and the error about HistogramSvc). While this command runs, try to answer the following questions by browsing [runCaloSim.py](https://github.com/HEP-FCC/fcc-tutorials/blob/master/full-detector-simulations/FccCaloPerformance/runCaloSim.py):
Run the simulation with `fccrun runCaloSim.py` (you can safely ignore the warnings and the error about HistogramSvc). While this command runs, try to answer the following questions by browsing [runCaloSim.py](https://github.com/HEP-FCC/fcc-tutorials/blob/main/full-detector-simulations/FccCaloPerformance/runCaloSim.py):

- how to change the type of particle you shoot in the detector?
:::{admonition} Answer
Expand Down