aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas White <taw@bitwiz.org.uk>2010-09-18 16:00:31 +0200
committerThomas White <taw@physics.org>2012-02-22 15:26:58 +0100
commit8b64510731343321ba3ce00199ea80fb7266c8db (patch)
tree7cf023955459e579ce1eba06efc82f881b55116c
parent2c5b9563cbf4312ad7220c95da8842c5c75bf934 (diff)
cubeit: Pass detector properly
-rw-r--r--src/cubeit.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/cubeit.c b/src/cubeit.c
index ebe1bb5f..a63b7e6e 100644
--- a/src/cubeit.c
+++ b/src/cubeit.c
@@ -53,6 +53,7 @@ struct process_args
int config_angles;
pthread_mutex_t angles_mutex; /* Protects "angles" */
unsigned int *angles;
+ struct detector *det;
};
@@ -161,7 +162,7 @@ static void process_image(struct process_args *pargs)
image.filename = pargs->filename;
image.hits = NULL;
image.n_hits = 0;
- image.det = NULL;
+ image.det = pargs->det;
/* View head-on (unit cell is tilted) */
image.orientation.w = 1.0;
@@ -581,6 +582,7 @@ int main(int argc, char *argv[])
worker_args[i]->config_angles = config_angles;
worker_args[i]->vals = vals;
worker_args[i]->angles = angles;
+ worker_args[i]->det = det;
pthread_mutex_init(&worker_args[i]->control_mutex, NULL);
pthread_mutex_init(&worker_args[i]->vals_mutex, NULL);
pthread_mutex_init(&worker_args[i]->angles_mutex, NULL);