Skip to content

Commit 6f6e588

Browse files
committed
not sure why it compiled on mac but fixed getGParticles
1 parent 825d638 commit 6f6e588

4 files changed

Lines changed: 18 additions & 25 deletions

File tree

gdata/examples/gdata_event_example.cc

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* \file gdata_event_example.cpp
2+
* \file gdata_event_example.cc
33
* \brief Example demonstrating event data collection in the GData library.
44
*
55
* \mainpage GData Event Data Example
@@ -79,13 +79,11 @@ int main(int argc, char* argv[]) {
7979
// Add the event data collection to the run.
8080
runData->push_back(eventData);
8181

82-
// Cleanup temporary objects (these are managed by the eventData now or no longer needed).
82+
// Clean up temporary objects (these are managed by the eventData now or no longer needed).
8383
delete hit;
8484
delete ctof;
8585
}
8686

87-
// we probably want to print events here
88-
// At this point, one could iterate over runData and print or process events.
8987
// For demonstration, we'll simply print the event numbers.
9088
for (size_t i = 0; i < runData->size(); i++) {
9189
log->info(" > Event ", i + 1, " collected with event number: ", runData->at(i)->getEventNumber());

gparticle/gparticle_options.cc

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -20,25 +20,25 @@ vector<GparticlePtr> getGParticles(GOptions* gopts, std::shared_ptr<GLogger>& lo
2020
gparticles.emplace_back(std::make_unique<Gparticle>(
2121
gopts->get_variable_in_option<string>(gparticle_item, "name", goptions::NODFLT),
2222
gopts->get_variable_in_option<int>(gparticle_item, "multiplicity", 1),
23-
gopts->get_variable_in_option<float>(gparticle_item, "p", GPARTICLENOTDEFINED),
24-
gopts->get_variable_in_option<float>(gparticle_item, "delta_p", 0),
23+
gopts->get_variable_in_option<double>(gparticle_item, "p", GPARTICLENOTDEFINED),
24+
gopts->get_variable_in_option<double>(gparticle_item, "delta_p", 0),
2525
gopts->get_variable_in_option<string>(gparticle_item, "punit", "MeV"),
2626
gopts->get_variable_in_option<string>(gparticle_item, "randomMomentumModel", "uniform"),
2727

28-
gopts->get_variable_in_option<float>(gparticle_item, "theta", 0),
29-
gopts->get_variable_in_option<float>(gparticle_item, "delta_theta", 0),
28+
gopts->get_variable_in_option<double>(gparticle_item, "theta", 0),
29+
gopts->get_variable_in_option<double>(gparticle_item, "delta_theta", 0),
3030
gopts->get_variable_in_option<string>(gparticle_item, "randomThetaModel", "uniform"),
31-
gopts->get_variable_in_option<float>(gparticle_item, "phi", 0),
32-
gopts->get_variable_in_option<float>(gparticle_item, "delta_phi", 0),
31+
gopts->get_variable_in_option<double>(gparticle_item, "phi", 0),
32+
gopts->get_variable_in_option<double>(gparticle_item, "delta_phi", 0),
3333
gopts->get_variable_in_option<string>(gparticle_item, "aunit", "deg"),
3434

35-
gopts->get_variable_in_option<float>(gparticle_item, "vx", 0),
36-
gopts->get_variable_in_option<float>(gparticle_item, "vy", 0),
37-
gopts->get_variable_in_option<float>(gparticle_item, "vz", 0),
35+
gopts->get_variable_in_option<double>(gparticle_item, "vx", 0),
36+
gopts->get_variable_in_option<double>(gparticle_item, "vy", 0),
37+
gopts->get_variable_in_option<double>(gparticle_item, "vz", 0),
3838

39-
gopts->get_variable_in_option<float>(gparticle_item, "delta_vx", 0),
40-
gopts->get_variable_in_option<float>(gparticle_item, "delta_vy", 0),
41-
gopts->get_variable_in_option<float>(gparticle_item, "delta_vz", 0),
39+
gopts->get_variable_in_option<double>(gparticle_item, "delta_vx", 0),
40+
gopts->get_variable_in_option<double>(gparticle_item, "delta_vy", 0),
41+
gopts->get_variable_in_option<double>(gparticle_item, "delta_vz", 0),
4242
gopts->get_variable_in_option<string>(gparticle_item, "vunit", "cm"),
4343

4444
gopts->get_variable_in_option<string>(gparticle_item, "randomVertexModel", "uniform"),

gstreamer/examples/gstreamer_example.cc

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,11 @@
11
// gstreamer
22
#include "gstreamer.h"
3+
#include "gstreamer_options.h"
34

4-
// c++
5-
#include <iostream>
6-
using namespace std;
5+
// gemc
6+
#include "glogger.h"
77

8-
9-
int main()
10-
{
8+
int main(int argc, char* argv[]) {
119

1210

1311
return EXIT_SUCCESS;

gstreamer/gstreamer_options.h

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,6 @@
33
// gstreamer
44
#include "gstreamer.h"
55

6-
// gemc
7-
#include "glogger.h"
8-
96
constexpr const char* GSTREAMER_LOGGER = "gstreamer";
107

118
namespace gstreamer {

0 commit comments

Comments
 (0)