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

Fix for linux dev build #471

Closed
wants to merge 4 commits into from
Closed
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
7 changes: 6 additions & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,12 @@ jobs:
environment-file: environment-dev.yml
python-version: ${{ matrix.python }}
miniconda-version: "latest"


- name: Install Conda GCC
if: runner.os == 'Linux'
run: |
conda install -y -c conda-forge gcc gxx

- name: Install Helios
run: |
python -m pip install -v .
Expand Down
5 changes: 5 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,11 @@ git clone https://github.com/3dgeo-heidelberg/helios.git
cd helios
conda env create -f environment-dev.yml
conda activate helios-dev

# On Linux, the following line is recommended, to go with a Conda-provided compiler.
# We had issues with incompatible system compilers before.
conda install -c conda-forge gcc gxx

python -m pip install --no-deps -v -e .
```

Expand Down
16 changes: 8 additions & 8 deletions python/pyhelios/data/scanners_tls.xml
Original file line number Diff line number Diff line change
Expand Up @@ -109,27 +109,27 @@


<!-- ##### BEGIN Velodyne VLP-16 ("Puck") ##### -->
<!-- for the angles and corrections, see https://velodynelidar.com/wp-content/uploads/2019/12/63-9243-Rev-E-VLP-16-User-Manual.pdf, page 54) -->
<!-- for the angles and corrections, see https://www.amtechs.co.jp/product/VLP-16-Puck.pdf) -->

<scanner id = "vlp16"
accuracy_m = "0.03"
beamDivergence_rad = "0.0007"
name = "Velodyne VLP-16"
optics = "rotating"
pulseFreqs_Hz = "18750"
pulseLength_ns = "4"
rangeMin_m = "0.0100"
pulseLength_ns = "5"
rangeMin_m = "0.09144"
rangeMax_m = "100"
scanAngleMax_deg = "1"
scanAngleEffectiveMax_deg = "1"
scanFreqMin_Hz = "0"
scanFreqMax_Hz = "0"
wavelength_nm = "903"
wavelength_nm = "905"
maxNOR = "2"
headRotatePerSecMax_deg = "7200"
>

<FWFSettings beamSampleQuality="1"/> <!-- set to one for fast simulations -->
<FWFSettings beamSampleQuality="3"/> <!-- set to one for fast simulations -->
<channels>
<channel id="0">
<beamOrigin x="0" y="0" z="0">
Expand Down Expand Up @@ -224,14 +224,14 @@
name = "Velodyne HDL-64E"
optics = "rotating"
pulseFreqs_Hz = "20312"
pulseLength_ns = "10"
rangeMin_m = "0.0100"
pulseLength_ns = "5"
rangeMin_m = "0.9144"
rangeMax_m = "120"
scanAngleMax_deg = "1"
scanAngleEffectiveMax_deg = "1"
scanFreqMin_Hz = "0"
scanFreqMax_Hz = "0"
wavelength_nm = "903"
wavelength_nm = "905"
maxNOR = "1"
headRotatePerSecMax_deg = "5250"
>
Expand Down
2 changes: 1 addition & 1 deletion src/scene/dynamic/DynSequence.h
Original file line number Diff line number Diff line change
Expand Up @@ -205,7 +205,7 @@ class DynSequence {
* @param id New identifier for the dynamic sequence
* @see DynSequence::setId
*/
inline void setId(string const & id) const {this->id = id;}
inline void setId(string const & id) {this->id = id;}
/**
* @brief Get next identifier for the dynamic sequence
* @return Identifier of next dynamic sequence
Expand Down
Loading