[cig-commits] [commit] master: Untested fix for HDF5 events import (1d8a12d)

[cig_noreply at geodynamics.org]

Repository : https://github.com/geodynamics/vq

On branch  : master
Link       : https://github.com/geodynamics/vq/compare/4a71dae87966b80bfee7c194773543359a343617...941b3d7e55983967dea392d12aeac9ce3998ca30

>---------------------------------------------------------------

commit 1d8a12d6a19184634f2cef8305fac7f29e2f3302
Author: kwschultz <kwschultz at ucdavis.edu>
Date:   Tue Jan 6 13:14:52 2015 -0800

    Untested fix for HDF5 events import


>---------------------------------------------------------------

1d8a12d6a19184634f2cef8305fac7f29e2f3302
 examples/pyvq.py            |  4 ++--
 quakelib/src/QuakeLibIO.cpp | 14 +++++++-------
 quakelib/src/QuakeLibIO.h   |  2 +-
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/examples/pyvq.py b/examples/pyvq.py
index 572e7b6..4653c7a 100755
--- a/examples/pyvq.py
+++ b/examples/pyvq.py
@@ -151,7 +151,7 @@ class BasePlotter:
         ax.set_title(plot_title)
         if not (len(x_data) == len(y_data) and len(x_data) == len(colors) and len(colors) == len(labels) and len(linewidths) == len(colors)):
             sys.exit("These lists must be the same length: x_data, y_data, colors, labels, linewidths.")
-        for i in range(len(x_data))
+        for i in range(len(x_data)):
             ax.plot(x_data[i], y_data[i], color=colors[i], label=labels[i], linewidth=linewidths[i])
         ax.legend(title=legend_str, loc='best')
         plt.show()
@@ -477,7 +477,7 @@ if __name__ == "__main__":
     if args.plot_p_of_t:
         ProbabilityPlot().plot_p_of_t(events)
     if args.plot_prob_vs_t_fixed_dt:
-        ProbabilityPlot().plot_conditional_fixed_dt(events)`
+        ProbabilityPlot().plot_conditional_fixed_dt(events)
 
     # Generate stress plots
     if args.stress_elements:
diff --git a/quakelib/src/QuakeLibIO.cpp b/quakelib/src/QuakeLibIO.cpp
index 0744fbe..38f4f24 100644
--- a/quakelib/src/QuakeLibIO.cpp
+++ b/quakelib/src/QuakeLibIO.cpp
@@ -2925,12 +2925,12 @@ void quakelib::ModelEventSet::read_events_hdf5(const hid_t &data_file) {
 
 void quakelib::ModelEventSet::read_sweeps_hdf5(const hid_t &data_file) {
     std::vector<FieldDesc>                          descs;
-    ModelEventSet::const_iterator                   fit;
+    ModelEventSet::iterator                   fit;
     hsize_t                     num_fields, num_sweeps;
     unsigned int                i;
-    unsigned int                *start_sweep;
-    unsigned int                *end_sweep;
-    ModelSweeps                 *event_sweeps;
+    unsigned int                start_sweep;
+    unsigned int                end_sweep;
+    SweepData                   *event_sweeps;
     size_t                      *field_offsets;
     size_t                      *field_sizes;
     herr_t                      res;
@@ -2950,17 +2950,17 @@ void quakelib::ModelEventSet::read_sweeps_hdf5(const hid_t &data_file) {
 
     if (res < 0) exit(-1);
 
-    event_sweeps = new ModelSweeps[num_sweeps];
+    event_sweeps = new SweepData[num_sweeps];
     res = H5TBread_records(data_file, ModelSweeps::hdf5_table_name().c_str(), 0, num_sweeps, sizeof(ModelSweeps), field_offsets, field_sizes, event_sweeps);
     
     if (res < 0) exit(-1);
     
     // Read sweeps data into the ModelEventSet
     for (fit=_events.begin(); fit!=_events.end(); ++fit) {
-        fit->getStartEndSweep(&start_sweep, &end_sweep);
+        fit->getStartEndSweep(start_sweep, end_sweep);
         ModelSweeps new_sweeps;
         
-        for (i=*start_sweep; i<*end_sweep; i++) {
+        for (i=start_sweep; i<end_sweep; i++) {
             new_sweeps.read_data(event_sweeps[i]);
         }
         fit->setSweeps(new_sweeps);
diff --git a/quakelib/src/QuakeLibIO.h b/quakelib/src/QuakeLibIO.h
index feb35b3..463b449 100644
--- a/quakelib/src/QuakeLibIO.h
+++ b/quakelib/src/QuakeLibIO.h
@@ -791,7 +791,7 @@ namespace quakelib {
                 _data._start_sweep_rec = start_sweep;
                 _data._end_sweep_rec = end_sweep;
             }
-            void getStartEndSweep(unsigned int &start_sweep, unsigned int &end_sweep) {
+            void getStartEndSweep(unsigned int &start_sweep, unsigned int &end_sweep) const {
                 start_sweep = _data._start_sweep_rec;
                 end_sweep = _data._end_sweep_rec;
             }