Commit c7402520 authored by Alessandro Mirone's avatar Alessandro Mirone

Compressa storia per versione distribuita

Squashed commit of the following:

commit a7eaf2f367b20e3816aaa2014785404a8616fdd2
Author: Alessandro Mirone <mirone@esrf.fr>
Date:   Wed Jun 5 14:00:56 2013 +0200

    aggiunta licenza

commit 85a4f6ecf3da8893efe165b458ad7b9cc1813476
Author: Alessandro Mirone <mirone@esrf.fr>
Date:   Wed Jun 5 13:55:38 2013 +0200

    giusto prima di aggiungere licenze

commit a4067729c384a968dd7d998abd9b7b856cd422b7
Author: Alessandro Mirone <mirone@esrf.fr>
Date:   Wed Jun 5 12:21:11 2013 +0200

    da testare per release

commit c6110188efdafa130a3225d6f54e8e51658fbf6e
Author: Alessandro Mirone <mirone@rnice6-0201.esrf.fr>
Date:   Wed May 29 12:11:36 2013 +0200

    corretta l' imprecisione del noverlap

commit 7260d0236ec8f05d185fcf9ee29c735d2054e368
Merge: 54abea2 c4cf36e
Author: Alessandro Mirone <mirone@rnice6-0101.esrf.fr>
Date:   Wed May 29 11:29:32 2013 +0200

    Merge branch 'master2' of git.epn-campus.eu:chst into master2

commit 54abea2e35894cfdda6ec217b989ea062f65580f
Author: Alessandro Mirone <mirone@rnice6-0101.esrf.fr>
Date:   Wed May 29 11:29:01 2013 +0200

    aggiunto ( in commento) per fare cross-correlation (quando attivato)

commit c4cf36e811fc180a761067d89901a5032428e0ff
Author: Alessandro Mirone <mirone@esrf.fr>
Date:   Thu May 23 17:05:48 2013 +0200

    corretto doc

commit 904cf007799b42488133d247896594849d4c3ed9
Author: Alessandro Mirone <mirone@gputesla02.esrf.fr>
Date:   Thu May 23 17:03:07 2013 +0200

    ricorretto

commit 7550de5c346c8848413d9fc486c8fbc0b464b02a
Author: Alessandro Mirone <mirone@esrf.fr>
Date:   Thu May 23 16:52:03 2013 +0200

    piccolo errore

commit 3c1d4394a54fb779d486afd76fc61c3722f0e72d
Author: Alessandro Mirone <mirone@gputesla02.esrf.fr>
Date:   Thu May 23 16:41:00 2013 +0200

    OK

commit 1dcf58383cd7d32651b151eed8a419a91886fa37
Author: Alessandro Mirone <mirone@esrf.fr>
Date:   Thu May 23 16:00:21 2013 +0200

    corrected machinefile_name and deployment of nn plugin

commit 3304c4fc11d123c23d2c4a320e8dcfbd310a8c64
Author: Alessandro Mirone <mirone@esrf.fr>
Date:   Thu May 16 14:14:21 2013 +0200

    changed doc for overlapping patches and nnfbp

commit fb60bbc7abad9a128e178ffa11e6c80f09a951fc
Author: Alessandro Mirone <mirone@esrf.fr>
Date:   Wed May 15 17:33:06 2013 +0200

    commentato patches

commit 50050e4409dd3ca4c5cc3925ab04c9a359fee53c
Author: Alessandro Mirone <mirone@esrf.fr>
Date:   Wed May 15 16:12:59 2013 +0200

    just indentation

commit 579e95ca026faf404e3d88f77aec8778c6e73e5e
Author: Operator for ID11 <opid11@crunch.esrf.fr>
Date:   Mon May 6 15:15:37 2013 +0200

    neural filter plugin implemented by Daniel Pelt

    Added NN-FBP method
Signed-off-by: default avatarDaniel Pelt <d.m.pelt@cwi.nl>

    Done the plugin for neural

    added a forgotten file

commit 652343e6dfb36ee9351c3884d612ad38c5472e82
Author: Alessandro Mirone <mirone@esrf.fr>
Date:   Mon May 6 11:42:56 2013 +0200

    aumentato di un pochetto il ciclo per Lipschitz

commit 23865ae231d2e1fffb6685dc85f30f4809b1c8d3
Author: Alessandro Mirone <mirone@gputesla01.esrf.fr>
Date:   Fri Apr 19 22:36:18 2013 +0200

    fatte modifiche perche funzioni anche su macchine a due core per cpu. Corretto compila_cluster

commit 912614b911758cf3b2f1e549ee6b919368a19821
Author: Alessandro Mirone <mirone@gpu0102.esrf.fr>
Date:   Fri Apr 12 17:35:55 2013 +0200

    risolti i problemi di installazione per debian versus cluster

commit 2deebb9ee82e301b0274a35b3582da3840262bf4
Author: Alessandro Mirone <mirone@esrf.fr>
Date:   Fri Apr 12 15:53:21 2013 +0200

    funziona benone

commit 5ca6a38d9bfb6f15ed86556c5a4c687d60519ad5
Author: Alessandro MIRONE <alex@lapalex.casa>
Date:   Wed Apr 10 22:55:27 2013 +0200

    liberate le componenti 1 e 2

commit aac95dedb7943439d49272c0c608d2368499032f
Author: Alessandro MIRONE <alex@lapalex.casa>
Date:   Wed Apr 10 22:39:00 2013 +0200

    aggiunta opzione WEIGHT_OVERLAP

commit 4099486822b94c36b2039530b6685298376b81a0
Author: Alessandro Mirone <mirone@esrf.fr>
Date:   Wed Apr 10 18:24:04 2013 +0200

    messo controllo sparsita

commit 692ba89384c96f5bd903e4b3ca06f01bb5c66d1a
Author: Alessandro Mirone <mirone@esrf.fr>
Date:   Wed Apr 10 14:37:51 2013 +0200

    corretto per il posizionamento all interno dei multiframe ( Luc Salvo)

commit 284eb7f1f227cb9142b3fd8f81f18f5e31208d2f
Merge: c1299c2 44d4abb
Author: Alessandro MIRONE <alex@lapalex.casa>
Date:   Tue Apr 9 18:54:34 2013 +0200

    Merge branch 'fb_dl' into master2

    Conflicts:
    	compila

commit 44d4abb05a99184f97d2c249f99ef642739a8287
Author: Alessandro MIRONE <alex@lapalex.casa>
Date:   Tue Apr 9 18:42:05 2013 +0200

    adesso funziona veramente bene

commit 8d1406a8220363f1bdd600f33f5d6fca4ae55b55
Author: Alessandro MIRONE <alex@lapalex.casa>
Date:   Tue Apr 9 14:23:31 2013 +0200

    arriva fino alla fine e l 'errore scende di parecchio

commit ea4a1d8cb7793ecb4558a3680fbd89eac99fa6b6
Author: Alessandro MIRONE <alex@lapalex.casa>
Date:   Tue Apr 9 09:54:05 2013 +0200

    debuggando fruttuosamente

commit 51adfa26863bc0f2da01377b1d52f3a4fafbe0f0
Author: Alessandro MIRONE <alex@lapalex.casa>
Date:   Tue Apr 9 01:28:28 2013 +0200

    adesso tutto il loop gira senza fare Nan

commit 6e27086903fe98a5b4ee90652981466a1d22b961
Author: Alessandro Mirone <mirone@esrf.fr>
Date:   Mon Apr 8 21:29:29 2013 +0200

    in avanti con la ricerca di come mai resta a zero

commit d81078ac527ca5186ea594abb47a649d12675477
Author: Alessandro MIRONE <alex@lapalex.casa>
Date:   Mon Apr 8 06:48:45 2013 +0200

    adesso gira ma lipschitz resta a zero

commit cd52c2d5d28d820a1757b1529058bf30244f5bb2
Author: Alessandro MIRONE <alex@lapalex.casa>
Date:   Mon Apr 8 05:29:33 2013 +0200

    TRYGPU non si inizializzava correttamente se -1 in linea di comando

commit 82e98279fd4a1b26ce63bc8ad1df3fe7855fac97
Author: Alessandro MIRONE <alex@lapalex.casa>
Date:   Mon Apr 8 05:14:38 2013 +0200

    corretto il posizionamento inizializzazione VECTORIALITY prima gpu_maininit

commit d02a66f060c2cf2d07aca7ca0d5b805110982e87
Author: Jerome Kieffer <jerome.kieffer@esrf.fr>
Date:   Thu Mar 28 13:48:23 2013 +0100

    Converter volume to HDF5 data

commit d9810a6484f098914452710a6f82165ddee343a8
Author: Jerome Kieffer <jerome.kieffer@esrf.fr>
Date:   Thu Mar 28 11:56:38 2013 +0100

    refactored setup.py

commit 4bd4c7c871189a1ab8835fbf6599541a0cc87140
Author: Jerome Kieffer <jerome.kieffer@esrf.fr>
Date:   Tue Mar 26 18:40:38 2013 +0100

    Convertor to HDF5

commit fced1fd8077d937b8f726ec0e9b5bd348f9d3e92
Author: Alessandro MIRONE <alex@lapalex.casa>
Date:   Sun Apr 7 16:17:05 2013 +0200

    maintenant ca marche meme avec la GPU ( dlopen vise le bon repertoire, le meme que les sources python )

    Conflicts:

    	PyHST/PyHST.py

commit 4b2c918ae046c04980198cd39bf1be157818baa9
Author: Jerome Kieffer <jerome.kieffer@terre-adelie.org>
Date:   Mon Mar 25 21:52:59 2013 +0100

    add small dataset for testing

commit f52dd84fb17a391f240d7963a5511efb9e6d6c82
Author: Jerome Kieffer <jerome.kieffer@esrf.fr>
Date:   Mon Mar 25 21:43:52 2013 +0100

    add launcher scripts

commit cec48c9b5bdc5f0f218823cd50a043fca0ede8d8
Author: Alessandro MIRONE <alex@lapalex.casa>
Date:   Sun Apr 7 16:05:28 2013 +0200

    inizia a funzionare ma ci devono essere dei commit di distribution che mancano

commit 334b9588b3c4910119ff77f153eee4b19d7af250
Author: Alessandro Mirone <mirone@esrf.fr>
Date:   Fri Apr 5 18:54:19 2013 +0200

    aggiunto il completamento dei patches nel caseo fb_dl

commit c1299c27faeb1afa964e7345d897f8abfd5e0b2b
Author: Alessandro Mirone <mirone@esrf.fr>
Date:   Fri Apr 5 18:26:56 2013 +0200

    aggiunta l' immagine non corretta all' esempio TV

commit cf6da3d2a5a3b6dff9cb3b56b88c67e4bf3865dd
Author: Alessandro Mirone <mirone@esrf.fr>
Date:   Fri Apr 5 11:57:41 2013 +0200

    aggiunto anche le ring_correction with thresholding

commit 05182fa33bf72a2dd47deaceaa0dded72dc8c2d3
Author: Alessandro Mirone <mirone@esrf.fr>
Date:   Fri Apr 5 11:47:20 2013 +0200

    aggiunto esempio patches

commit e6ad8679623902a68987882872aea977455ae86e
Author: Alessandro Mirone <mirone@esrf.fr>
Date:   Fri Apr 5 11:19:57 2013 +0200

    DOC: esempio TV

commit 87cad6dd73c15d8c146fdaf4cabecd69ade02eef
Author: Alessandro Mirone <mirone@esrf.fr>
Date:   Thu Apr 4 19:01:54 2013 +0200

    documentazione finita, a parte qualche esempio ancora da mettere

commit aba51916451649eaf0cabff99e808b7d6e55dcda
Author: Alessandro Mirone <mirone@gputesla02.esrf.fr>
Date:   Thu Apr 4 17:10:52 2013 +0200

    compila OK

commit dd46455ecf31ae4910f3394eefa604827bab33cc
Author: Alessandro Mirone <mirone@esrf.fr>
Date:   Thu Apr 4 16:10:02 2013 +0200

    pronto per gli esempi

commit 09eace7c481d2b2f3e3a877e0d4d59538b2d9395
Author: Alessandro Mirone <mirone@esrf.fr>
Date:   Thu Apr 4 15:50:57 2013 +0200

    finita docc eccetto esempi

commit bdd436f274d14c0d7ada4b54375f9de312beedcf
Author: Alessandro Mirone <mirone@esrf.fr>
Date:   Thu Apr 4 06:09:48 2013 +0200

    per il manuale rimane : geometria,  input..

commit 736a486fdae91a25d14ef80022a6007acdd6f9e9
Author: Alessandro Mirone <mirone@esrf.fr>
Date:   Wed Apr 3 16:12:06 2013 +0200

    buon avanzamento col manuale

commit 928e503b5d09a46353d869825888866eba16455f
Author: Alessandro Mirone <mirone@esrf.fr>
Date:   Wed Apr 3 11:33:17 2013 +0200

    small modifications to the doc

commit ba26849a77791929f6091dd2a11e13faa76a4512
Author: Alessandro MIRONE <alex@lapalex.casa>
Date:   Tue Apr 2 00:52:50 2013 +0200

    compila bene

commit 51c0e34f316dd30a7427527f5484a0ff7633f493
Author: Alessandro MIRONE <alex@lapalex.casa>
Date:   Sun Mar 31 03:22:18 2013 +0200

    compilando

commit 595d1179fd990630c7433333b1ff6e091fc0f18c
Author: Alessandro MIRONE <alex@lapalex.casa>
Date:   Fri Mar 29 23:31:17 2013 +0100

    finito di scrivere tutto , una rilettura si impone

commit 5b64e79d84a69b9d601bce3c91208eea74efcc8a
Author: Alessandro MIRONE <alex@lapalex.casa>
Date:   Fri Mar 29 21:49:55 2013 +0100

    fbdl completato. Rimane da chiamare correttament in CCspace.c : prima per Lipschitw

commit 043f92d7dd9eced4fea53db65e0a0ce844faf615
Merge: ef7b5a0 59e9bab
Author: Alessandro MIRONE <alex@lapalex.casa>
Date:   Fri Mar 29 21:02:31 2013 +0100

    Merge ../chst into fb_dl

commit ef7b5a0415e034d2e7ebacdb64a534e1f0026fba
Merge: 04fc639 c1a3aa6
Author: Alessandro MIRONE <alex@lapalex.casa>
Date:   Fri Mar 29 20:59:15 2013 +0100

    merge
    Merge ../chst into fb_dl

commit 04fc639c06a65bf8e46673eceb28186151909abd
Author: Alessandro MIRONE <alex@lapalex.casa>
Date:   Fri Mar 29 18:00:12 2013 +0100

    mancano solo gli ultimi ritocchi per estrarre lipschitz e dopo e' finito

commit 2489af1d2306ffcda6b128a39d6cf5188717104d
Author: Alessandro Mirone <mirone@esrf.fr>
Date:   Thu Mar 28 19:57:40 2013 +0100

    imbastitura completa. Verificare dimensioni sinogramma nbins , dim_fft

commit 59e9babda448495a47292b40347da2d43878014c
Author: Alessandro Mirone <mirone@rnice48.esrf.fr>
Date:   Thu Mar 28 15:01:49 2013 +0100

    added FBFILTER=3

commit f519c6f257aa88c0312f9808fd55969f451d8cb1
Author: Alessandro Mirone <mirone@esrf.fr>
Date:   Wed Mar 27 14:48:52 2013 +0100

    ritorna, pulisci, completa i put

commit e28909c57bc7bdc0da268a489185e4c402c0fc71
Author: Alessandro Mirone <mirone@esrf.fr>
Date:   Mon Mar 25 18:28:09 2013 +0100

    si inizia a vederci piu chiaro per il nuovo schema

commit c1a3aa6fa52d1712b67ebf9c100aeedd36ab14a7
Author: Jerome Kieffer <jerome.kieffer@esrf.fr>
Date:   Mon Mar 25 14:46:27 2013 +0100

    add default version number

commit bc74b17c94777a7fa80b17d08ceab8f8e5a7898b
Author: Jerome Kieffer <jerome.kieffer@esrf.fr>
Date:   Mon Mar 25 14:31:08 2013 +0100

    add example of paramter file for future tests

commit e9a451b1758e7af4c9cb927ad22e62bcf9bd5658
Author: Jerome Kieffer <jerome.kieffer@esrf.fr>
Date:   Mon Mar 25 14:30:23 2013 +0100

    make script launcher in python (not shell scripts)

commit a87b6854687308b0b4c956e1e826ac28aa25d3b2
Author: Alessandro MIRONE <alex@lapalex.casa>
Date:   Mon Mar 25 07:31:15 2013 +0100

    facendo gpu_fbdl

commit a1f3c3491bc245b15ff946bc9376115d37c21baf
Author: Alessandro MIRONE <alex@lapalex.casa>
Date:   Sun Mar 24 18:29:45 2013 +0100

    ripiazzato correttamente il t_new di fista

commit c7561edbf7c0a2610cf458543016095e6fe30a71
Author: Jerome Kieffer <jerome.kieffer@esrf.fr>
Date:   Thu Mar 21 13:42:29 2013 +0100

    put GPU library at the right place

commit 2fee66da43de574a70fd39ae2a1c335911d02558
Merge: a50833f ec67eca
Author: Alessandro Mirone <mirone@gputesla02.esrf.fr>
Date:   Wed Mar 20 23:52:38 2013 +0100

    Merge branch 'master2' of git.epn-campus.eu:chst into master2

commit a50833ff47264fb17c0c9c3933cc8040853a727f
Author: Alessandro Mirone <mirone@gputesla02.esrf.fr>
Date:   Wed Mar 20 23:51:41 2013 +0100

    passato a un sistema con un solo contesto per evitare crash

commit ec67eca8b553087f40b9f6d7a58acd61045c0152
Author: Alessandro Mirone <mirone@esrf.fr>
Date:   Mon Mar 18 11:05:49 2013 +0100

    compila OK

commit 7212c3c0110af45ef5ca211d4479c4ee9aecfe82
Author: Alessandro Mirone <mirone@esrf.fr>
Date:   Sun Mar 17 02:32:44 2013 +0100

    delle modifiche in corso per testere il rotazionale

commit e765804d89af548c1a99cd83230f9611a9771bec
Author: Alessandro Mirone <mirone@esrf.fr>
Date:   Fri Mar 15 12:44:17 2013 +0100

    ca compile nickel. TOutefois il faut ensuite deplacer ls lib*so dans PyHST si non elels ne sont pas trouve et ca continue sur CPU

commit 8e24afb16aa57572bf763ab80806f12fdfef0a63
Author: Alessandro Mirone <mirone@esrf.fr>
Date:   Fri Mar 15 12:36:17 2013 +0100

    compilation est OK

commit dd90c7623c6aa45c5d88c53450a4372e42533986
Author: Jerome Kieffer <jerome.kieffer@esrf.fr>
Date:   Fri Mar 15 12:14:39 2013 +0100

    cleaner ? compile way

commit 3345d8d99bc50a3bb16e452252b8c5e1118c8def
Author: Jerome Kieffer <jerome.kieffer@esrf.fr>
Date:   Fri Mar 15 10:49:36 2013 +0100

    remove openMP and SWIG stuff from setup

commit 2664d3b572e1784c3d73a60439fe73f3a6afe0f3
Author: Jerome Kieffer <jerome.kieffer@esrf.fr>
Date:   Fri Mar 15 10:35:50 2013 +0100

    add myself for distribution :)

commit 7cdbc666d25582e6cc1e95f73dc198fa2b74aea6
Merge: cd3f173 a3354f2
Author: Jerome Kieffer <jerome.kieffer@esrf.fr>
Date:   Fri Mar 15 10:34:02 2013 +0100

    Merge branch 'master2' into distribution

commit cd3f17344d673854f4bf52b06317a27f3167aadb
Author: Jerome Kieffer <jerome.kieffer@esrf.fr>
Date:   Fri Mar 15 10:30:51 2013 +0100

    include cuda and C files for source distribution

commit a3354f23e4a1da27ce3928066ac0403c51437587
Author: Alessandro Mirone <mirone@esrf.fr>
Date:   Thu Mar 14 00:22:04 2013 +0100

    OK

commit 7b68cc1ff34a925c9dc3ad0b2a52df672861a53c
Author: Alessandro Mirone <mirone@esrf.fr>
Date:   Wed Mar 13 17:14:05 2013 +0100

    in prova, la copia di result in L1 non c' era piu

commit c95c54a3dde18daca82cb1ec03272c10f63a4a58
Author: Alessandro Mirone <mirone@esrf.fr>
Date:   Wed Mar 13 15:02:22 2013 +0100

    steoforpatches era muto

commit 153e1b309c371ee3b86ecc39a425b8c3918cd362
Author: Alessandro MIRONE <alex@lapalex.casa>
Date:   Tue Mar 12 19:59:36 2013 +0100

    il vettoriale con iterativo gira

commit 1bfb539ba824ae8b20f97b2109fe86b4c4b70916
Author: Alessandro Mirone <mirone@esrf.fr>
Date:   Tue Mar 12 11:26:08 2013 +0100

    compilato il vettoriale

commit b572d25bba8458bf4f3258a9b3c509a4d4e78dc3
Author: Alessandro MIRONE <alex@lapalex.casa>
Date:   Wed Mar 6 02:36:42 2013 +0100

    risolto un problema di parentesi

commit d302f5559d4a7269eb002b3731355c0e2bb93079
Author: Alessandro MIRONE <alex@lapalex.casa>
Date:   Wed Mar 6 02:27:16 2013 +0100

    finito di scrivere anche il rotazionale

commit f1e1f8a8fc52a84b6817822cf7d86896e714d60a
Author: Alessandro Mirone <mirone@esrf.fr>
Date:   Tue Mar 5 15:40:09 2013 +0100

    vettorialita scritta e da testare. Rimane da scrivere il rotazionale

commit ed97091a03e9767055be88c1c7d74b06fd712a3e
Author: Alessandro MIRONE <alex@lapalex.casa>
Date:   Tue Mar 5 09:53:24 2013 +0100

    la vettorialita si e' spinta fino ai confini di rec_driver pro_driver

commit 1737482dae35612bfdc7348e448461d3e4d60453
Author: Alessandro Mirone <mirone@esrf.fr>
Date:   Mon Mar 4 14:49:42 2013 +0100

    rimesso dentro il nlm e aggiunta documentazion

commit ae322c443c68c4042a08a765b4c5a0b047e39d93
Author: Alessandro Mirone <mirone@esrf.fr>
Date:   Thu Feb 21 16:12:24 2013 +0100

    aggiunta  documentazione per Paganin

commit 3cf256c84379befde07da8bad49de53b97ab4d85
Author: Alessandro Mirone <mirone@esrf.fr>
Date:   Tue Feb 5 16:44:22 2013 +0100

    corretto un villano errore del denoising patches : si riscriveva sull immagine stessa

commit 70f82e1a964afaa1137a50f05f4d69389ff0831a
Author: Alessandro Mirone <mirone@rnice35.esrf.fr>
Date:   Fri Feb 1 18:18:35 2013 +0100

    corretto l' indicazione della locazione del package perche adesso la doc sara nello stesos posto

commit a1f9cf2d578a5b9e3ddabc7b4a474738d0724f6e
Author: Alessandro Mirone <mirone@esrf.fr>
Date:   Fri Feb 1 15:19:18 2013 +0100

    premiere version de test pour les dictionnaires

commit 0f9454e4a20038ac40e78e4a1f4a782460744a9a
Author: Alessandro Mirone <mirone@esrf.fr>
Date:   Fri Feb 1 10:23:06 2013 +0100

    bene patches con fista ma c' e' un problema con il denoising omp

commit 2ff0dbec297d67daf0bae4466869735c07058276
Author: Alessandro MIRONE <alex@lapalex.casa>
Date:   Fri Feb 1 00:21:21 2013 +0100

    aggiunte piu maniglie

commit 4cdbe4225048ee377eb3bfa381b0a82b81caa832
Author: Alessandro MIRONE <alex@lapalex.casa>
Date:   Thu Jan 31 17:35:03 2013 +0100

    provato a velocizzare omp

commit 561ace4afec44e5e4d71409751d7d8175564a7db
Author: Alessandro MIRONE <alex@lapalex.casa>
Date:   Thu Jan 31 17:18:36 2013 +0100

    piccoli casini

commit 6e32d696bfc06fce0f6c1f2088e4dd9673b1a153
Author: Alessandro Mirone <mirone@esrf.fr>
Date:   Wed Jan 30 11:46:52 2013 +0100

    rimesso i nuovi filtri da tvl2_old

commit e3b88b02e74dfc0934e58e85fc5a64c480edc45d
Author: Alessandro Mirone <mirone@esrf.fr>
Date:   Wed Jan 30 10:51:44 2013 +0100

    qui sto per cambiare le routine in gputomo.cu, quelle per i patches

commit 360f32e5c051121256ccb9215a6139326e09c1cc
Author: Alessandro Mirone <mirone@esrf.fr>
Date:   Thu Jan 24 11:02:58 2013 +0100

    corretto il nome del file histogramma

commit 5c23b4718def023c12c0c40d82bd521fc5636444
Author: Alessandro Mirone <mirone@esrf.fr>
Date:   Thu Jan 24 10:36:59 2013 +0100

    test sui dizionari-fista in corso.

commit a4fc2054b2c2a399f5843c60dffb8fefd6003468
Author: Alessandro Mirone <mirone@esrf.fr>
Date:   Wed Jan 23 01:29:29 2013 +0100

    ottimo!

commit 40a3adcf408989d9422bc4476af91e6d72c5dce3
Author: Alessandro Mirone <mirone@esrf.fr>
Date:   Tue Jan 22 15:29:24 2013 +0100

    aggiunto parte proveninente da test python tvl2 (tvl2_old). Compila OK

commit 62d1cb70e25c41a1ec5b492de91902c3ad5c154b
Author: Alessandro MIRONE <alex@lapalex.casa>
Date:   Sat Jan 19 07:51:20 2013 +0100

    compila ok

commit cba8bad4e4cc541272367968ec3e111ae9340e9e
Author: Alessandro Mirone <mirone@esrf.fr>
Date:   Fri Jan 18 17:40:47 2013 +0100

    finito di scriver i patches

commit 9514a90c25a0c8bde3227f2758735a2d5aedfeef
Author: Alessandro Mirone <mirone@gputesla02.esrf.fr>
Date:   Fri Jan 18 13:17:43 2013 +0100

    sembra funzionare OK l' OUTPUT_PAGANIN

commit df1cc7b91526c9442239eaa83c939f1d96038c6a
Author: Alessandro Mirone <mirone@esrf.fr>
Date:   Fri Jan 18 11:55:32 2013 +0100

    compila bene

commit d4b22f64cc2dcc85f3529c1fa9bff2c2197dc3bc
Author: Alessandro Mirone <mirone@esrf.fr>
Date:   Fri Jan 18 11:44:09 2013 +0100

    reintrodotto il do_output_paganin piu' patches in corso

commit e49a209130edaf10ba3ca3b9cabdb10c2799c95a
Author: Alessandro MIRONE <alex@lapalex.casa>
Date:   Tue Jan 15 13:04:40 2013 +0100

    avanti con la doc

commit 5c00df0c0e6d7ad5e29d15027ede3f674e05056c
Author: Alessandro Mirone <mirone@esrf.fr>
Date:   Tue Jan 15 09:42:49 2013 +0100

    avanti con la doc

commit f0755ac7304d201ba713989bb094519844a5d38f
Author: Alessandro Mirone <mirone@esrf.fr>
Date:   Mon Jan 14 10:01:38 2013 +0100

    cambiato nome histogramma su suggerimento Paul

commit fba602386131fcad144cd22e6eb57c43e0878888
Author: Alessandro Mirone <mirone@esrf.fr>
Date:   Wed Jan 9 09:26:33 2013 +0100

    avanti con la doc

commit d106d1f8a741b3316184ed64d52192f18310f07f
Author: Alessandro Mirone <mirone@esrf.fr>
Date:   Tue Jan 8 18:28:31 2013 +0100

    piccola modif

commit 9641b2bc9eae11d8ed4c0afbdfb1d106dd1cdc52
Author: Alessandro Mirone <mirone@esrf.fr>
Date:   Tue Jan 8 14:59:16 2013 +0100

    corretta documentazione

commit a6dc3d2915091378c41ccce9e6f97976a8a65fe6
Author: Alessandro Mirone <mirone@esrf.fr>
Date:   Tue Jan 8 14:14:44 2013 +0100

    corretto l' estremo per S1 S2

commit 7d6c348b77a3c47363a99eb25d7a99ca5e7c8401
Author: Alessandro Mirone <mirone@rnice30.esrf.fr>
Date:   Tue Jan 8 11:27:46 2013 +0100

    OK

commit bbe3c58a3dd92d33d448781b496aa20020b7fd8a
Author: Alessandro Mirone <mirone@rnice33.esrf.fr>
Date:   Tue Jan 8 10:51:22 2013 +0100

    applicato saturazioni a tutto

commit 57348ef7f9c08c209958154c0a3ef0146308846d
Author: Alessandro Mirone <mirone@rnice33.esrf.fr>
Date:   Mon Jan 7 18:15:58 2013 +0100

    histogramma OK

commit 2b05bba08efca639564b7c051856ab6ca62b692e
Author: Alessandro Mirone <mirone@esrf.fr>
Date:   Mon Jan 7 14:27:35 2013 +0100

    compila OK

commit 93bd1d04b1530f4adc8e18fc9451d2d9b2d773e5
Author: Alessandro Mirone <mirone@rnice25.esrf.fr>
Date:   Fri Dec 21 17:15:11 2012 +0100

    finito di scrivere tutto per la saturazione
    isognera controllare

commit 0c6514a1142c0253100147e7b59739e001b7a41e
Author: Alessandro Mirone <mirone@rnice25.esrf.fr>
Date:   Fri Dec 21 16:44:33 2012 +0100

    min,max, saturazioni

commit d39a72e817b152bd5ffc4aa3ca1596d9e83e5eb6
Author: Alessandro Mirone <mirone@esrf.fr>
Date:   Tue Dec 18 18:51:26 2012 +0100

    sphinx

    ottimo ! sphinx+doxygen+breathe funzionano con commenti nei sorgenti!

commit 714e475d560dc432b3d589634593de9a461f2596
Author: Alessandro Mirone <mirone@rnice25.esrf.fr>
Date:   Tue Dec 18 15:42:48 2012 +0100

    aggiunto min max in edf

commit eda8340a6efbb161669f57563e7d43a45b281684
Author: Alessandro Mirone <mirone@gputesla02.esrf.fr>
Date:   Mon Dec 17 01:13:48 2012 +0100

    corretto un problemaccio : mai attaccare un puntatore ad una variabile dinamica perche' quest 'ultima puo scomparire nel suo stesso scope appena il compilatore crede che non e' piu necessaria

commit 4c3600d88ee2ef7d008aa741f0b2f61e463ece8e
Author: Alessandro MIRONE <alex@lapalex.casa>
Date:   Sun Dec 16 13:35:35 2012 +0100

    corretta u incongruenza nel managent dei contesti gpu per Paganin

commit 58cd5d00b8cd8ee242e7b0b9e7e59a6d2d34f1c6
Author: Alessandro Mirone <mirone@rnice25.esrf.fr>
Date:   Fri Dec 7 14:46:21 2012 +0100

    da testare precondizionamento

commit 21dd4ca8c92df401fcc45ee25fc4c96f88ac3d81
Author: Alessandro Mirone <mirone@rnice25.esrf.fr>
Date:   Thu Dec 6 17:54:35 2012 +0100

    corretta la rimozione del segnale thresholded

commit 422d3c33c056cf08fc4061451d5f089079a8975e
Author: Alessandro Mirone <mirone@gputesla01.esrf.fr>
Date:   Tue Dec 4 15:59:21 2012 +0100

    RING_FILTER = "RING_Filter_THRESHOLDED"  it is as RING_FILTER = "RING_Filter" but the filtering is done on an averaged projection
            from which one has beforehand removed the projection
            of a thresholded reconstruction

commit 78a692eafeddf7fbffec286a5c422e7a15c45366
Author: Alessandro Mirone <mirone@rnice32.esrf.fr>
Date:   Wed Nov 14 14:01:05 2012 +0100

    corretto un problema distribuzione slices. L' ultimo pezzo
    conteneva della slices anteriori

commit 126c721051d51e42e0f3ffacc3687f8398f8bbed
Author: Alessandro Mirone <mirone@rnice35.esrf.fr>
Date:   Tue Nov 13 19:01:55 2012 +0100

    versione che da dei risultati soddisfacenti per il ginocchio

commit 4ee6bcb47ec41dfba7698f66ee280efb914c7ee2
Author: Alessandro Mirone <mirone@rnice35.esrf.fr>
Date:   Mon Nov 12 18:43:45 2012 +0100

    nlm sembra soddisfacente

commit 86107ec1c2994c620d7ee07f6d3035aae9f22e1e
Author: Alessandro Mirone <mirone@rnice28.esrf.fr>
Date:   Fri Nov 9 14:38:03 2012 +0100

    finito scrittura nlm

commit edbb96eafcee0becb1f4bc91355f8916ffb16d16
Author: Alessandro Mirone <mirone@esrf.fr>
Date:   Thu Nov 8 13:28:04 2012 +0100

    sto levando il dispenser

commit 6548f3a15f1c218e2a32b1b2019538d5d4954bae
Author: Emmanuelle Gouillart <emmanuelle.gouillart@nsup.org>
Date:   Mon Oct 29 22:58:47 2012 +0100

    Small modifications to README

commit 94b4875e15d7ef0f450edd262ec0bc0b0516c2b8
Author: Alessandro Mirone <mirone@gputesla02.esrf.fr>
Date:   Thu Oct 25 16:31:52 2012 +0200

    aggiunto il parametro DO_LOCAL_TOMO. Corretto il default di ITERATIVE_CORRECTIONS_NOPREC ( se no iniziava subito )

commit 6ccc11b8ecc23ca0b1fd97aa700366063386e219
Author: Alessandro Mirone <mirone@gputesla01.esrf.fr>
Date:   Thu Oct 25 00:55:50 2012 +0200

    compilato i tre commits precedenti

commit da04f3de1df18522c1a22c9812b3efc15fff7a9d
Author: Alessandro Mirone <mirone@rnice21.esrf.fr>
Date:   Thu Oct 25 00:52:58 2012 +0200

    sostituiti dei cublasSdot, che sono pericolosi numericamente, con la routine cublasSnrm2

commit 63e19eb039e70958aa2396069c45bef56361b361
Author: Alessandro Mirone <mirone@rnice21.esrf.fr>
Date:   Thu Oct 25 00:34:42 2012 +0200

    correzione della distribuzione dei sampling sulla duty del detector

commit 570e57d7d9f53245d9468b4ba37bb98530d969ff
Author: Alessandro Mirone <mirone@rnice21.esrf.fr>
Date:   Thu Oct 25 00:25:41 2012 +0200

    piccole modificazioni per manipolare meglio la roi nel caso di tomo locale

commit 25fe8f652f7eda29cedfec684185d6848c8f1a57
Author: Emmanuelle Gouillart <emmanuelle.gouillart@nsup.org>
Date:   Mon Oct 22 23:22:07 2012 +0200

    Added a section in the README about total-variation regression.

commit 855becbde5e0791bb4f023b4869910667e562a96
Author: Alessandro Mirone <mirone@gputesla02.esrf.fr>
Date:   Mon Oct 22 10:18:44 2012 +0200

    DETECTOR_DUTY_OVERSAMPLING>1 (il default est 1) e DETECTOR_DUTY_RATIO fra ]0,1]

commit 710bf1e3fba40748120bcc76613574d967bd9d8e
Author: Alessandro Mirone <mirone@gputesla02.esrf.fr>
Date:   Sat Oct 20 09:01:06 2012 +0200

    Ottimizzato projector : non piu' clipping ma si mette un perimetro di zero attorno alla texture della slice

commit 917054adc2182ae5ce290179ac4ced86eba7aaa5
Author: Alessandro MIRONE <alex@lapalex.casa>
Date:   Fri Oct 19 22:21:22 2012 +0200

    tomo locale: compila ok

commit c21ac0da8bbcbbf2e2271d9b352d465fa5f80005
Author: Alessandro Mirone <mirone@rnice28.esrf.fr>
Date:   Fri Oct 19 21:08:34 2012 +0200

    levato un cliptozero che rovinava i sinogrammi precalcolati esternamente aventi valori negativi.

commit 24602981f1f7e4dc97b30c1d80713e88fd12ac08
Author: Alessandro Mirone <mirone@rnice26.esrf.fr>
Date:   Thu Oct 18 14:14:03 2012 +0200

    fidelity_error e' accumulato su un double. Corretto segno integrazione FBFILTER=2.  Fatto alcune prove di ottimizzazione del projector

commit 05e08de8fab01488d5b6b8661b12414642f7df7d
Author: Alessandro Mirone <mirone@rnice26.esrf.fr>
Date:   Wed Oct 17 13:52:53 2012 +0200

    corretto il centering e il segno per FBFILTER=2

commit 39338b93eab53dcb66641de7d75183bdc4f3e78e
Author: Alessandro Mirone <mirone@rnice26.esrf.fr>
Date:   Wed Oct 17 10:15:04 2012 +0200

    aggiunto OUTPUT_SINOGRAMS per Manu

commit 262f47c1dfc663cb56b12c5efdd80ea80d31c315
Author: Alessandro Mirone <mirone@esrf.fr>
Date:   Wed Oct 17 10:04:16 2012 +0200

    ..

commit 334c8c4a86d0d0d23682b17ce15512293a5137fb
Author: Alessandro Mirone <mirone@gputesla01.esrf.fr>
Date:   Tue Oct 16 14:58:29 2012 +0200

    ottimo!

commit 93a0958d4b3fa149df9c394f4c81aa2239b201c2
Author: Alessandro Mirone <mirone@gputesla02.esrf.fr>
Date:   Tue Oct 16 10:30:49 2012 +0200

    La modification pour le cas encombrents semble marcher correctement

commit 724f16df59f98b85dc779c47d5e61cb776c8135f
Author: Alessandro Mirone <mirone@esrf.fr>
Date:   Mon Oct 15 16:02:55 2012 +0200

    Encore a tester. Enleve un ou deux warnings de compilation. Un warning etait important : (float complex)(a,b) ne donne pas a+I*b.
    Il faut utiliser a+_Complex_I  * b.

commit d275928afafb525bded9d7bebc514b36696cb427
Author: Alessandro Mirone <mirone@esrf.fr>
Date:   Mon Oct 15 15:28:56 2012 +0200

    ...intanto compila .. Ancora da testare

commit a4b1a4cb22d4d7b6560e84a0a391bb6a3d3acae8
Author: Alessandro Mirone <mirone@esrf.fr>
Date:   Mon Oct 15 15:20:06 2012 +0200

    - A Tester - termine'e une grosse restructuration pour faire passer de grande reconstructions et garder une impreinte memoire reduite

commit 3f5954cb975d5ac88001c30c774b92eb893749df
Author: Alessandro Mirone <mirone@rnice35.esrf.fr>
Date:   Mon Oct 15 10:37:10 2012 +0200

    Ajoute' FILE_INTERVAL pour ls cas MULTIEDF. Changes les memory requirements avec un facteur 90% pour eviter de saturer le systeme dans les gros calculs

commit c10289dbf39763bc72751ce18cb87a5a4b33dcec
Author: Alessandro Mirone <mirone@tomo0404.esrf.fr>
Date:   Fri Oct 12 16:11:51 2012 +0200

    installato un sistema per il precondizionamento in fista. Rimesso un dim_fft a denominatore per l' interferometria

commit 710cf8de87357be636e27b3cc0f04f9a9ec2f1fd
Author: Alessandro Mirone <mirone@rnice40.esrf.fr>
Date:   Fri Oct 12 15:24:21 2012 +0200

    rimesso angoli OK

commit 8714fb01fa0317c67b8576ae1d672e84568e0035
Author: Alessandro Mirone <mirone@esrf.fr>
Date:   Fri Oct 12 11:05:43 2012 +0200

    compabilita per Peter

commit 7c915fa4588aed65f102e1c4a0956a3b6bb9ae8f
Author: Alessandro Mirone <mirone@esrf.fr>
Date:   Thu Oct 11 15:01:03 2012 +0200

    reintrodotto il filtro per l' interferometria

commit 88e5012b7a8f7ad3410e2d0553abf8a1cdab4d03
Author: Alessandro Mirone <mirone@rnice40.esrf.fr>
Date:   Thu Oct 11 10:59:03 2012 +0200

    corretto un problema di lettura edf per il caso float

commit eece67ddcadcd4261dbdd5fb326b46c703e56dc5
Author: Alessandro MIRONE <alex@lapalex.casa>
Date:   Sun Oct 7 18:33:33 2012 +0200

    Funziona da meraviglia

commit fd5dd25be377b96042ec3bf336a8d8cd095bde6e
Author: Alessandro MIRONE <alex@lapalex.casa>
Date:   Sat Oct 6 23:43:34 2012 +0200

    Compila con fista-tv!!

commit 8fc52b5e75a9186bef9b5b626a90c63f7ee83ecf
Author: Alessandro MIRONE <alex@lapalex.casa>
Date:   Sat Oct 6 09:09:27 2012 +0200

    tutto e' pronto , denoising fa il suo dovere

commit 935de00f8349ac1398d4f1564d7947b842936d50
Author: Alessandro MIRONE <alex@lapalex.casa>
Date:   Sat Oct 6 01:57:46 2012 +0200

    compila e posso per ora testare il denoising

commit aa5768a0e750865048e45944ad4872f51f27a50b
Author: Alessandro MIRONE <alex@lapalex.casa>
Date:   Fri Oct 5 23:12:04 2012 +0200

    rimettendo in piedi il ciclo iterativo

commit 8f2cef7e83e78dd1c482c7fafb6b3ddc49a13fc1
Merge: ea5f95d f8e0902
Author: Alessandro Mirone <mirone@gputesla01.esrf.fr>
Date:   Fri Oct 5 18:37:44 2012 +0200

    Merge commit 'f8e0902de779d3267cd9493eab49be2e8633e34c' into master2

commit f8e0902de779d3267cd9493eab49be2e8633e34c
Author: Alessandro Mirone <mirone@gputesla01.esrf.fr>
Date:   Fri Oct 5 18:24:06 2012 +0200

    corretto piccoli errori per la produzione

commit ea5f95d32c640521ca17f87e510483883d300bb1
Author: Alessandro Mirone <mirone@tomo0402.esrf.fr>
Date:   Fri Oct 5 17:51:02 2012 +0200

    ci sono delle correzioni che vanno levate gia
    dalla versione anteriore per la produzione "una svista"

commit fe7319912564bd039b6c093fdb97f6e2f29a870d
Author: Alessandro Mirone <mirone@esrf.fr>
Date:   Fri Oct 5 17:11:48 2012 +0200

    punto dopo merge : compila, niente warning

commit c6ca75119c0ccc73e9f488a18293b576fe2bee38
Author: Alessandro Mirone <mirone@esrf.fr>
Date:   Fri Oct 5 16:06:13 2012 +0200

    corretti lasciti del merge

commit de33c97ffa459dd1cfa28384a3bb993e8a78d520
Merge: 4a77521 e648303 5f97008
Author: Alessandro Mirone <mirone@esrf.fr>
Date:   Fri Oct 5 15:04:44 2012 +0200

    dopo merge ma c 'e da controllare
    Merge branch 'experimental2'; commit '5f97008275f328d14cd46ef680afce98bfb8612c' into master2

    Conflicts:
    	PyHST/Cspace/CCspace.c
    	PyHST/Cspace/CCspace.h
    	PyHST/Cspace/c_hst_project_1over.cu
    	PyHST/Parameters_module.py
    	compila

commit 4a77521eab76fd0303369eec1b35355c0242014c
Author: Alessandro Mirone <mirone@esrf.fr>
Date:   Fri Oct 5 14:25:51 2012 +0200

    corretto due cose piccole. Preparo per il merge con la branche art

commit 81d6ffee140e553e69c823751814f66abeebc544
Author: Alessandro Mirone <mirone@rnice33.esrf.fr>
Date:   Tue Oct 2 21:17:46 2012 +0200

    una svista

commit f46c02934170d506d0f733eb93f7cacd6f4207cc
Author: Alessandro Mirone <mirone@tomo0405.esrf.fr>
Date:   Tue Sep 25 10:41:40 2012 +0200

    poche mods

commit 0fa1b650518451371546df08bfc419b2ffe9622d
Author: Alessandro Mirone <mirone@tomo0405.esrf.fr>
Date:   Thu Sep 20 17:51:08 2012 +0200

    funziona senza parametri

commit b3b869e05b43ae773e26e0f7bc710fa4773a8b29
Author: Alessandro Mirone <mirone@rnice34.esrf.fr>
Date:   Thu Sep 20 15:07:51 2012 +0200

    automatizzazione e file.vol finita

commit 29b230b3e3491da9f449d69679e4735899999b59
Author: Alessandro MIRONE <alex@lapalex.casa>
Date:   Thu Sep 20 08:19:35 2012 +0200

    automatizzazione parametri

commit e6483037de95fd7b50926fc0772fc60e1c41e0de
Author: Alessandro Mirone <mirone@rnice38.esrf.fr>
Date:   Mon Sep 3 11:12:08 2012 +0200

    rimosso un potenziale memory leak

commit 957e38b84b29ef362049eeaaf2ba2c343b0aa599
Author: Alessandro Mirone <mirone@rnice48.esrf.fr>
Date:   Thu Jul 19 16:56:03 2012 +0200

    corretto un paio di overflow dovuti all uso di int*int
    Corretto un problema di oar su htc che non dava il numero di gpu =-1 quando non c' e'

commit 5f97008275f328d14cd46ef680afce98bfb8612c
Author: Alessandro Mirone <mirone@esrf.fr>
Date:   Tue Jul 17 09:33:33 2012 +0200

    bene cosi adesso pulizia

commit deb64b10cc1bed735e0d783f2b6c6998d888f0ca
Author: Alessandro Mirone <mirone@esrf.fr>
Date:   Mon Jul 16 16:59:33 2012 +0200

    errore conversione float int mxiing

commit 673b05369f684b72b969d9439296428751c55419
Author: Alessandro MIRONE <alex@lapalex.casa>
Date:   Mon Jul 16 06:50:16 2012 +0200

    rifatta mescolanza

commit 7d7849b7dd84725f60857f8b87d8693d64ecd397
Author: Alessandro MIRONE <alex@lapalex.casa>
Date:   Sun Jul 15 20:37:07 2012 +0200

    con solution compila

commit 50d8ea862a3f3ef63bfa396c739f263ed9c1dc24
Author: Alessandro MIRONE <alex@lapalex.casa>
Date:   Sat Jul 14 20:57:58 2012 +0200

    passeggia compila

commit 8953dcad0f2817db59253d137d0d7f4ad9d14342
Author: Alessandro MIRONE <alex@lapalex.casa>
Date:   Sat Jul 14 14:01:36 2012 +0200

    a parte passeggia il resto e testato

commit 2e29673af975aca4d3c2cdbef0d3af5564d3078b
Author: Alessandro MIRONE <alex@lapalex.casa>
Date:   Sat Jul 14 01:38:35 2012 +0200

    impacchettato bene ben

commit 050195255b3ee0052c41d8d902aef8c7e3968f90
Merge: 2166b6a 5dbdec5
Author: Alessandro Mirone <mirone@esrf.fr>
Date:   Fri Jul 13 23:18:51 2012 +0200

    Merge ../chst_a/chst into experimental2

commit 5dbdec5907d1f005b56e7953e70227d528feaeab
Author: Alessandro Mirone <mirone@esrf.fr>
Date:   Fri Jul 13 23:08:03 2012 +0200

    bell effetto

commit 2166b6a94029b0af5409fea46acc13e83d2a8d82
Author: Alessandro Mirone <mirone@esrf.fr>
Date:   Fri Jul 13 23:06:12 2012 +0200

    Revert "Revert "da capire""

    This reverts commit 02ab501eefd4027800aa0fd87e01859166fd5b08.

commit dc75300194b39b7aaf4c296211b3b6159bce5e12
Author: Alessandro Mirone <mirone@esrf.fr>
Date:   Fri Jul 13 23:06:09 2012 +0200

    Revert "Revert "compila""

    This reverts commit b29dae91a2cc6b4d7c955ea6755f032d89d953ca.

commit b9da1a4eabf334b2b90aecb0bf3225a2779172ca
Author: Alessandro Mirone <mirone@esrf.fr>
Date:   Fri Jul 13 23:06:07 2012 +0200

    Revert "Revert "scritto OK""

    This reverts commit 2f9cced2c49406994264bff68c7d82c03ee7e981.

commit 7beec465e6f95543054c2259777c19cd02a7f9a4
Author: Alessandro Mirone <mirone@esrf.fr>
Date:   Fri Jul 13 23:06:01 2012 +0200

    Revert "Revert "finendo parte in cu""

    This reverts commit 98ad80fa6c869a86124b2c659e910fbefb6e36bc.

commit 07bccdf364a719bc9cd548d167b53b9af89ac54c
Author: Alessandro Mirone <mirone@esrf.fr>
Date:   Fri Jul 13 14:35:29 2012 +0200

    rimesso zerooffmask al posto giusto

commit 570edc3fdab7c432e04c2f4846bf1581f43b801a
Author: Alessandro Mirone <mirone@esrf.fr>
Date:   Fri Jul 13 14:35:29 2012 +0200

    rimesso zerooffmask al posto giusto

commit 98ad80fa6c869a86124b2c659e910fbefb6e36bc
Author: Alessandro Mirone <mirone@esrf.fr>
Date:   Fri Jul 13 12:07:15 2012 +0200

    Revert "finendo parte in cu"

    This reverts commit 9226e7729d1b300dc2af378b4924896bb8210877.

commit 2f9cced2c49406994264bff68c7d82c03ee7e981
Author: Alessandro Mirone <mirone@esrf.fr>
Date:   Fri Jul 13 12:07:14 2012 +0200

    Revert "scritto OK"

    This reverts commit d4742e2d71c73b91f427fd017857e416d285e226.

commit b29dae91a2cc6b4d7c955ea6755f032d89d953ca
Author: Alessandro Mirone <mirone@esrf.fr>
Date:   Fri Jul 13 12:07:12 2012 +0200

    Revert "compila"

    This reverts commit c29401a2c630ebcdc5db4adf039fcd0544a30b51.

commit 02ab501eefd4027800aa0fd87e01859166fd5b08
Author: Alessandro Mirone <mirone@esrf.fr>
Date:   Fri Jul 13 12:07:10 2012 +0200

    Revert "da capire"

    This reverts commit 6dafb116b06301bdd1fe61aabc36131fa2c9f42a.

commit 88cf49dd657c1d644c79bb746a243fbf9d7553d5
Author: Alessandro Mirone <mirone@esrf.fr>
Date:   Fri Jul 13 12:07:08 2012 +0200

    Revert "cambiato schema"

    This reverts commit c40fbad1c7334879a866106facfb9abae80c4558.

commit 2f5a479145b9a85534ad527d062c0603e3b2608a
Author: Alessandro Mirone <mirone@esrf.fr>
Date:   Fri Jul 13 12:07:00 2012 +0200

    Revert "arrivato a un punto dove si vede che ci sono degli autovettori"

    This reverts commit 31c9ea3b63d8967a8e65694b8ff284209d3716a6.

commit 31c9ea3b63d8967a8e65694b8ff284209d3716a6
Author: Alessandro Mirone <mirone@esrf.fr>
Date:   Fri Jul 13 12:05:36 2012 +0200

    arrivato a un punto dove si vede che ci sono degli autovettori
    esplosivi di P**-1 x P

commit c40fbad1c7334879a866106facfb9abae80c4558
Author: Alessandro MIRONE <alex@lapalex.casa>
Date:   Fri Jul 13 08:47:21 2012 +0200

    cambiato schema

commit 6dafb116b06301bdd1fe61aabc36131fa2c9f42a
Author: Alessandro MIRONE <alex@lapalex.casa>
Date:   Fri Jul 13 08:24:12 2012 +0200

    da capire

commit c29401a2c630ebcdc5db4adf039fcd0544a30b51
Author: Alessandro MIRONE <alex@lapalex.casa>
Date:   Thu Jul 12 14:51:14 2012 +0200

    compila

commit d4742e2d71c73b91f427fd017857e416d285e226
Author: Alessandro Mirone <mirone@esrf.fr>
Date:   Thu Jul 12 12:01:56 2012 +0200

    scritto OK

commit 9226e7729d1b300dc2af378b4924896bb8210877
Author: Alessandro MIRONE <alex@lapalex.casa>
Date:   Thu Jul 12 09:14:48 2012 +0200

    finendo parte in cu

commit e6bad81397fe5030786976800c22669493a7a6c7
Author: Alessandro Mirone <mirone@esrf.fr>
Date:   Tue Jul 10 18:06:09 2012 +0200

    mixing factor

commit 027dc6a7f3f458372056176f62744c44d5cf97cf
Author: Alessandro MIRONE <alex@lapalex.casa>
Date:   Tue Jul 10 13:24:53 2012 +0200

    bello per iter

commit c2f113d7f29b55f5e171843c7396b06f30abdb6b
Author: Alessandro Mirone <mirone@rnice29.esrf.fr>
Date:   Mon Jul 9 00:27:25 2012 +0200

    aggiunto straigthen_sinos e corretta una boulette :
     non risettavo a zero slice, errore introdotto con forward projection

commit 8075e57d904de4a33edfdf3836cb28143c31dc22
Author: Alessandro Mirone <mirone@gpu0101.esrf.fr>
Date:   Thu Jul 5 17:15:15 2012 +0200

    corretto avoid_half condition

    corretto un problema per sino_filter.

commit a9534a65be76a9a1e527656c3ee56dfb1c9376f6
Author: Alessandro Mirone <mirone@esrf.fr>
Date:   Thu Jul 5 15:29:00 2012 +0200

    corretto da dopo pull

commit 30a1f8e15a77b06ae855919cf6d171ac65497217
Merge: 9055047 cd4471b
Author: Alessandro Mirone <mirone@esrf.fr>
Date:   Thu Jul 5 15:16:40 2012 +0200

    Merge git.epn-campus.eu:chst into experimental2

    Conflicts:
    	PyHST/Cspace/CCspace.c
    	compila

commit 9055047d0cefa2ee795210102371e85d16d54046
Author: Alessandro Mirone <mirone@esrf.fr>
Date:   Thu Jul 5 14:32:56 2012 +0200

    tutto OK per forward correzione

commit 157d1f1565cb530a85e4964ed5cc20e863d11e1b
Author: Alessandro Mirone <mirone@esrf.fr>
Date:   Thu Jul 5 11:32:14 2012 +0200

    compilato ma non funziona la gpu su linkakrouli

commit 5516b3507cb882ae4079a880c283048c799420da
Author: Alessandro Mirone <mirone@rnice26.esrf.fr>
Date:   Mon Jul 2 11:07:58 2012 +0200

    rimesso il compila di experimental2

commit 12d8aa3fd421297f0e77609146f92b3cb17c0a1a
Author: Alessandro Mirone <mirone@rnice26.esrf.fr>
Date:   Mon Jul 2 11:07:29 2012 +0200

    rimessa correzione in maniera che funziona correttamente

    Conflicts:

    	compila

commit 909eeb13832b3101b4726c6813d27f6c0e264812
Author: Alessandro Mirone <mirone@rnice26.esrf.fr>
Date:   Mon Jul 2 11:06:58 2012 +0200

    levata una condizione inutile che a volte bloccava tutto

    Conflicts:

    	compila

commit cd4471bed28b86304eaaf148128d9f552045bed6
Author: Alessandro Mirone <mirone@rnice26.esrf.fr>
Date:   Mon Jul 2 11:04:04 2012 +0200

    rimessa correzione in maniera che funziona correttamente

commit a1db7b3013f68a3c07c4418383f0c983cb2c8975
Author: Alessandro Mirone <mirone@rnice29.esrf.fr>
Date:   Mon Jul 2 01:35:44 2012 +0200

    levata una condizione inutile che a volte bloccava tutto

commit 85e9ed4b7b6be3a93dfcd331f1da34e70196ec1b
Author: Alessandro Mirone <mirone@gpu0101.esrf.fr>
Date:   Fri Jun 29 15:41:05 2012 +0200

    MULTIFRAME=2 FUNZIONA

commit 441232d6b19a0ef8431e57ca077a895a9dc31096
Author: Alessandro Mirone <mirone@rnice37.esrf.fr>
Date:   Fri Jun 22 14:10:03 2012 +0200

    correto : scrittura edf ( num_x/y y/x ). paganin unsharp, unsharp_log

commit 40770deef332256544513257199a380d18119e40
Author: Alessandro Mirone <mirone@gputesla01.esrf.fr>
Date:   Fri Jun 29 10:54:33 2012 +0200

    la linea ad angolo theta+180 era ricopiata prendendola dalla prima slice del set di slices che sino_2_slice ricostruiva

    Conflicts:

    	compila

commit f9375c1b039688560eb1260967560749d3679a73
Author: Alessandro Mirone <mirone@gputesla01.esrf.fr>
Date:   Fri Jun 29 10:52:06 2012 +0200

    pronti per testare multiframe=2

commit fa616879a3c210843b690221505a6a31be437d22
Author: Alessandro Mirone <mirone@esrf.fr>
Date:   Fri Jun 29 10:43:35 2012 +0200

    come prima ma con in piu multiframe=2

commit 761e0270728460933c38144288b3fdbfd2f9027f
Author: Alessandro Mirone <mirone@esrf.fr>
Date:   Thu Jun 28 18:31:18 2012 +0200

    proiezioni funzionano molto bene. Ho rispostato il centro di rotazione
    perche mancava mezzo pixel

commit c77b4162587248269246fb272a24d41b2fcede8c
Author: Alessandro Mirone <mirone@esrf.fr>
Date:   Tue Jun 26 18:41:15 2012 +0200

    funziona e comparando ho corretto 1over cpu. Bisognera trasferire a gpu

commit 9ac6587a40227432783c7502e93252476ed5387f
Author: Alessandro Mirone <mirone@rnice37.esrf.fr>
Date:   Tue Jun 26 14:41:37 2012 +0200

    messo a posto un paio di cose per la compilazione

commit 5533c22631ba799ad49ce5d6bb7ee017ae267c74
Author: Alessandro Mirone <mirone@rnice37.esrf.fr>
Date:   Fri Jun 22 14:10:03 2012 +0200

    correto : scrittura edf ( num_x/y y/x ). paganin unsharp, unsharp_log

commit e6f5ae9394901a76a52e4227ddb1a4222473b916
Author: Alessandro Mirone <mirone@rnice41.esrf.fr>
Date:   Thu Jun 21 18:00:36 2012 +0200

    la linea ad angolo theta+180 era ricopiata prendendola dalla prima slice del set di slices che sino_2_slice ricostruiva

commit d00c3bf72d59e1034c724f7fe311aa102cecd4c0
Author: Alessandro Mirone <mirone@rnice41.esrf.fr>
Date:   Thu Jun 21 17:49:08 2012 +0200

    messo in piedi la proiezione con gpu , il controllo errore,
    e installato variabili flottanti per SLICE e data in modo da iterare
    (in seguito )

commit ed4a306e273d63ebe8d9c6b879c6a00703b85dae
Author: Alessandro Mirone <mirone@gpu0102.esrf.fr>
Date:   Thu Jun 21 14:41:27 2012 +0200

    aggiunto controllo errore

commit 130365589004e82a9a2a8d8459d758ccbd0618cd
Author: Alessandro Mirone <mirone@rnice41.esrf.fr>
Date:   Thu Jun 21 13:47:08 2012 +0200

    piccola pulitura

commit f8d8b01e6cb0dbc3d174099a5463597f7d489817
Author: Alessandro Mirone <mirone@gpu0102.esrf.fr>
Date:   Mon Jun 18 15:23:50 2012 +0200

    la parte async non funziona ancora ma si e' migliorata la copia 2d della slice ricostruita. Corretto LoG in LOG

commit b9179308838508e5ac3e289aba7e8e8eed824dd8
Author: Alessandro Mirone <mirone@gpu0102.esrf.fr>
Date:   Mon Jun 18 15:49:38 2012 +0200

    corretto un lascito del merge

commit da2bde9269275537925f436dfe669474572fbe86
Author: Alessandro Mirone <mirone@rnice29.esrf.fr>
Date:   Fri Jun 15 15:35:15 2012 +0200

    funziona quasi con gli stream ma la copia async lascia tutto a zero

commit 60cb0602e3a9f52ec3300ee72ff1edf790553eac
Author: Alessandro Mirone <mirone@rnice34.esrf.fr>
Date:   Wed Jun 13 18:07:17 2012 +0200

    fatte modifiche ma problema paganin nogpu fbfilter

commit 5169f19bbf11678cf563203b404741bd158eb508
Author: Alessandro Mirone <mirone@rnice42.esrf.fr>
Date:   Fri Jun 8 23:45:36 2012 +0200

    ingrandito work_perproj perche con un angle_offset la cpu cadeva fuori

commit d1a0a92f3bd75ae617d62bb70282ae417ba58b36
Author: Alessandro Mirone <mirone@gpu0101.esrf.fr>
Date:   Fri Jun 8 12:12:18 2012 +0200

    rimosso machinefile

commit 8ea93a475d869ef05d70aed095153af90d56727c
Author: Alessandro Mirone <mirone@esrf.fr>
Date:   Thu Jun 7 14:26:36 2012 +0200

    corretto il band limited

commit 1618d47cf86f3449805f4a92a8ccf24c979685aa
Author: Alessandro Mirone <mirone@esrf.fr>
Date:   Mon Jun 4 16:15:13 2012 +0200

    corretto lo swapping dei floats

commit f9c911279c2c06b2fb5e2a71295f247902f8c409
Author: Alessandro Mirone <mirone@esrf.fr>
Date:   Fri Jun 1 17:45:57 2012 +0200

    good changes to facilitate compilation : fftw is no more include by nvcc

commit b5578aa41cbb4f9211fe83c5370714f53d636c42
Author: Alessandro Mirone <mirone@rnice26.esrf.fr>
Date:   Wed May 23 17:10:53 2012 +0200

    corretto un errore di indice nella costruzione del kernel di paganin

commit dc3dd7582ff0d8b2f4b2adae90e0c835ea940e74
Author: Alessandro Mirone <mirone@gpu0102.esrf.fr>
Date:   Mon May 21 17:42:37 2012 +0200

    corretto i limiti ricostruzione. Trovato che per un set di Manu il clipone=10 non bastava

commit 86b6adf469d7087638573f624b1c3d3d56d456b0
Author: Alessandro Mirone <mirone@rnice27.esrf.fr>
Date:   Tue May 15 17:02:59 2012 +0200

    messa la slice assoluta nel nome del file edf

commit 3dc86b529c953f4b373b6d7011078d7f4636ef35
Author: Alessandro Mirone <mirone@rnice42.esrf.fr>
Date:   Mon May 14 17:42:15 2012 +0200

    aggiunto a lesson

commit 75748cc1ad86e31363d676047a0a6658f780de4b
Author: Alessandro Mirone <mirone@rnice42.esrf.fr>
Date:   Mon May 14 17:46:18 2012 +0200

    ripulito dir sporchi a ampliato gitignore

commit 7e0439f9e1849116650a783eca48f11a92e9b76f
Author: Alessandro Mirone <mirone@rnice42.esrf.fr>
Date:   Mon May 14 17:25:13 2012 +0200

    antiseche

commit d4d9713622a7385ec97e51a6dbb25bb814eb8e6f
Author: Alessandro Mirone <mirone@rnice42.esrf.fr>
Date:   Mon May 14 17:12:52 2012 +0200

     ignoring installation directories

commit 2e58d2384b29d165c63866b6f9941d6815d46cc6
Author: Alessandro Mirone <mirone@rnice42.esrf.fr>
Date:   Mon May 14 17:11:15 2012 +0200

     ignoring TEST directories

commit 44dc72429bb4803a16870e21442d4d2854c3ecb6
Author: Alessandro Mirone <mirone@rnice42.esrf.fr>
Date:   Mon May 14 16:58:13 2012 +0200

    add gitignore

commit e697bb688565cdd26f9482c8a7002369b7aedb5b
Author: Alessandro Mirone <mirone@rnice51.esrf.fr>
Date:   Mon May 14 11:45:43 2012 +0200

    corretto qualche baco

commit 38185680e279a432401a8d5ff2f5c2bdecb28796
Author: Alessandro Mirone <mirone@gpu0102.esrf.fr>
Date:   Thu May 10 19:26:42 2012 +0200

    messo lo stesso mirror per pag con cpu

commit 8f7bc827908d7b97836a5c7c87a04b6c3ec5d7cd
Author: Alessandro Mirone <mirone@gpu0102.esrf.fr>
Date:   Thu May 10 19:21:57 2012 +0200

    corretto problema di oneclipvalue

commit 423fa402b6529c01dfd071848817783166052818
Author: Alessandro Mirone <mirone@gpu0102.esrf.fr>
Date:   Wed May 9 18:11:02 2012 +0200

    OK median su GPU, slice per filter. FFT tomo per bunch. Multi ciontext per pag. un solo context per med a causa texture

commit 7fb458923bcd1f59ace9295e50499ee1ab28a016
Author: Alessandro Mirone <mirone@rnice27.esrf.fr>
Date:   Wed May 9 11:43:08 2012 +0200

    funziona tutto ok rimane da fare lo splitting dell output

commit c479fb8ba061e0e206c22cb5b46afec04140d355
Author: Alessandro Mirone <mirone@gpu0102.esrf.fr>
Date:   Mon May 7 15:24:43 2012 +0200

    compilazione OK con med gpu

commit 6f680047cdef0906e897be90e29e5c6b5b00b0a4
Author: Alessandro Mirone <mirone@rnice31.esrf.fr>
Date:   Sat May 5 23:28:28 2012 +0200

    prima di creare contesto per ogni paganin. Paganin momentaneamente disabilitato

commit 0f5e39650b06c8587d9b07680f8cf6f9efb82e40
Author: Alessandro Mirone <mirone@gpu0102.esrf.fr>
Date:   Fri May 4 18:23:10 2012 +0200

    risolto un problema di mangling

commit f7404f97d4e05c218880fdd000b01a7698a05575
Author: Alessandro Mirone <Alessandro Mirone>
Date:   Fri May 4 17:39:51 2012 +0200

     compila gpu paganin. Creato contesto speciale anche per gputomo 9 era il default). Fissato setup.py per linkarkouli

commit 73ebde98839ff7a456d3380021be59368ebda222
Author: Alessandro Mirone <mirone@rnice42.esrf.fr>
Date:   Fri Apr 27 18:25:18 2012 +0200

    correctto il file info

commit 3b53630f554929a608aec0a0a9378745ad11a17f
Author: Alessandro Mirone <mirone@gpu0102.esrf.fr>
Date:   Fri Apr 27 18:13:49 2012 +0200

    molto bene

commit 66de0151e1a49db88876e0ea6da24ac01487eed1
Author: Alessandro Mirone <mirone@gpu0102.esrf.fr>
Date:   Wed Apr 25 16:39:04 2012 +0200

    risolti problemini per fare aspettare ai bordi. Expansion di ncpus. Problema path launcher

commit 67f1dbde986bbadf611135831c6f73f1de89b860
Author: Alessandro Mirone <mirone@gpu0102.esrf.fr>
Date:   Wed Apr 25 10:11:39 2012 +0200

    todo muy bien

commit 2c08e7b87bc5bd341b5996c1c1315232b6ab5830
Author: Alessandro Mirone <mirone@rnice26.esrf.fr>
Date:   Tue Apr 24 03:16:01 2012 +0200

    quasi risolut pus>0. Rimane omp con discrezione, double FF. MPI

commit 06fa417071d8d163bb036ab13b48806f48879771
Author: Alessandro Mirone <mirone@rnice43.esrf.fr>
Date:   Mon Apr 23 18:12:43 2012 +0200

    paganin OK

commit 6e87a7a6b3b8638c5d113373aae2f57c4bcbc0e3
Author: Alessandro Mirone <mirone@gpu0102.esrf.fr>
Date:   Mon Apr 23 17:40:16 2012 +0200

    debuggate molte cose

commit 667c451200d907a1303be671bf30c7268ae8ff2e
Author: Alessandro MIRONE <alex@lapalex.casa>
Date:   Sun Apr 22 23:40:14 2012 +0200

    dovrebbe essere ok paganin

commit 49eecee58f3054ea22fd55cb34c4311e5971a8e6
Author: Alessandro Mirone <mirone@gpu0102.esrf.fr>
Date:   Thu Apr 12 02:20:10 2012 +0200

    lavorando a paganin

commit 03d90fd96ec83d3b8afd1253198dcb1312244557
Author: Alessandro Mirone <mirone@gpu0102.esrf.fr>
Date:   Thu Apr 12 01:39:04 2012 +0200

    funziona half tomo sinofilter ccdfilter zerooffmask.
    Rimane paganin  doubleff correctaxis

commit 7a7837920f62c3e4cd090a4efa44e43a8fd39dfe
Author: Alessandro Mirone <Alessandro Mirone>
Date:   Tue Apr 10 14:43:04 2012 +0200

     aggiunto EdfFile.py che mancava

commit 1af6a0a83c9df6cc06601e4f1be1b602ce9c92a8
Author: Alessandro Mirone <Alessandro Mirone>
Date:   Tue Apr 10 14:23:55 2012 +0200

     funziona bene

commit 2530acbc369fe2f3e144c7af4239b60c022c8cc5
Author: Alessandro Mirone <Alessandro Mirone>
Date:   Thu Apr 5 11:19:38 2012 +0200

     compila OK

commit f1a626cb78992ef7526e2c508b276e3af97d6c40
Author: Alessandro MIRONE <alex@lapalex.casa>
Date:   Wed Apr 4 22:31:00 2012 +0200

    piccole corr

commit c1c1d43791f85f6f78a522f29b8000e75aca39bb
Author: Alessandro MIRONE <alex@lapalex.casa>
Date:   Wed Apr 4 21:42:33 2012 +0200

    piccole corr

commit 0e3e9f2898183f97d6ba000d4292aeb25d1bfc85
Author: Alessandro MIRONE <alex@lapalex.casa>
Date:   Wed Apr 4 21:24:03 2012 +0200

    tutto finito

commit e5447c3e3c452cf67c29cd9343b32436a33cf8df
Author: Alessandro MIRONE <alex@lapalex.casa>
Date:   Wed Apr 4 01:24:58 2012 +0200

    scritto init per gpu

commit a103ef2a5c906686723817fb3531f633769ce961
Author: Alessandro Mirone <Alessandro Mirone>
Date:   Tue Apr 3 22:22:17 2012 +0200

     stro per impiantare gpu

commit 3cf1f285eed60dedf0492ae05d2098b456e80a60
Author: Alessandro Mirone <Alessandro Mirone>
Date:   Fri Mar 30 18:17:43 2012 +0200

     corretto baco strano

commit 08d47fa3080157c8042a6e4620ca3713ba4f2f27
Author: Alessandro Mirone <Alessandro Mirone>
Date:   Fri Mar 30 17:50:30 2012 +0200

     tutto in aria , bisogna riorganizzare il loop gpu/cpu in CCspace.c sino_slice

commit e3513dd03354e5e227ffe20cad5493e4bf58db84
Author: Alessandro Mirone <Alessandro Mirone>
Date:   Thu Mar 29 01:06:37 2012 +0200

    messo a posto vol vol.info vol.xml. Messo cpu_main omp
      rimane da troncare kernel paganin, output paganin

commit 922b7478fb3e6005c95ae8a47c3081f783d2cad9
Author: Alessandro Mirone <Alessandro Mirone>
Date:   Thu Mar 29 00:03:21 2012 +0200

     a questo punto accetto il filter cosi come e anche se da una piccola differenza

commit 0fd9def349964ae410b069f3865f79430b019817
Author: Alessandro Mirone <Alessandro Mirone>
Date:   Tue Mar 27 16:20:20 2012 +0200

     levato un bag : pixel_size era intero e troncava.  Ci mancava un fattore 2 nel filtro a rampa

commit 8b20ebaf79fbf3bec09e05017868f2693b1040bc
Author: Alessandro Mirone <Alessandro Mirone>
Date:   Thu Mar 22 18:10:43 2012 +0100

     ready to retest dopo correzzione trattamento ff

commit f22155854b6cd442b492a650394c62f6b336cb73
Author: Alessandro Mirone <Alessandro Mirone>
Date:   Fri Mar 16 16:55:10 2012 +0100

     corretto

commit 7365a951148660a3ca8f4daa941b3c4c7241559c
Author: Alessandro Mirone <Alessandro Mirone>
Date:   Fri Mar 16 16:36:10 2012 +0100

     prima di affrontare un problema di coordinazione request fra threads

commit a31ee39f129efa3e29349b481b365e1d4eea6643
Author: Alessandro Mirone <Alessandro Mirone>
Date:   Thu Mar 15 12:09:57 2012 +0100

     corretto transpose

commit 160a858160962f3686f1a8f0e91fe5ad7d273afa
Author: Alessandro Mirone <Alessandro Mirone>
Date:   Tue Mar 13 16:01:46 2012 +0100

     sto testando transposer

commit 8234117c8caa7e3ac61694f29214434430e9d759
Author: Alessandro Mirone <Alessandro Mirone>
Date:   Tue Mar 13 15:57:44 2012 +0100

     sto testando transposer

commit 8fa80b6ad8272fd34f945fc5e829d3afbca51f80
Author: Alessandro Mirone <Alessandro Mirone>
Date:   Tue Mar 13 11:20:55 2012 +0100

     prima di cercare un bug in read_chunck

commit 667ebc654c73bd0dac0f868b9482328df70648c9
Author: Alessandro Mirone <Alessandro Mirone>
Date:   Mon Mar 12 17:15:53 2012 +0100

     compila OK , adesso sto debuggando

commit 46126e1f2abccbfebabbc6f64a2d2329cae1237f
Author: Alessandro Mirone <Alessandro Mirone>
Date:   Mon Mar 12 15:26:37 2012 +0100

     compila mo iniziano le cose serie

commit 9d9d7fc6a130b89c03ee0ee3772653b70ae687cd
Author: Alessandro Mirone <Alessandro Mirone>
Date:   Thu Mar 8 18:05:12 2012 +0100

     compilazione, gia grosso lavoro, fatto sino_2_slice

commit 98ee27a715c43c13aece1df056a0055382e487a2
Author: Alessandro Mirone <Alessandro Mirone>
Date:   Wed Mar 7 17:35:57 2012 +0100

     fino alla chiamata di cpu _ main , rimangono da mettere alcune cose in struttura comune

commit 80adb9777e71743bb0c3cc5dbe085210910df2ad
Author: Alessandro Mirone <Alessandro Mirone>
Date:   Thu Mar 1 16:53:42 2012 +0100

     avvicinandosi al cpu_main

commit 2e59201392952d11d0fd11e404d7661870328cd5
Author: Alessandro Mirone <Alessandro Mirone>
Date:   Tue Feb 28 18:17:21 2012 +0100

     finalmente sono al fbp

commit 7775143f1642eee4a8b86ce90987fa4fa42b3d49
Author: Alessandro Mirone <Alessandro Mirone>
Date:   Mon Feb 27 17:34:12 2012 +0100

     programmando limits

commit 8a80cecb53ed7f9d6b307442c6abeb72f7f79dd1
Author: Alessandro Mirone <Alessandro Mirone>
Date:   Wed Feb 22 16:23:15 2012 +0100

     finito di trascrivere SG

commit dad1fbd254065154dea50efcb294b257ed53babe
Author: Alessandro MIRONE <alex@lapalex.casa>
Date:   Mon Feb 20 08:36:11 2012 +0100

    finito di scrivere sino_filter standared

commit 181d8e0c2b5f54dd852f328192481b882bfc139c
Author: Alessandro Mirone <Alessandro Mirone>
Date:   Fri Feb 17 16:37:57 2012 +0100

     dentro a sino_filter

commit bca71df9989d42c1da744e9b570f104b35057c0a
Author: Alessandro MIRONE <alex@lapalex.casa>
Date:   Fri Feb 17 08:51:07 2012 +0100

    vai con filtri

commit a385a8afac2e2fba2569f65b5e04ec7ffd4f5526
Author: Alessandro Mirone <Alessandro Mirone>
Date:   Mon Feb 13 14:53:02 2012 +0100

     programmando reconstruct

commit 06affd1fa36e6b9f491c95d1b48e679f118e3ecf
Author: Alessandro MIRONE <alex@lapalex.casa>
Date:   Mon Feb 13 07:26:59 2012 +0100

    scrivendo la struttura per sincronizzazione dispenser

commit 19e3b09686b91e6ebf497e5810fcb67d6d326c73
Author: Alessandro Mirone <Alessandro Mirone>
Date:   Sat Feb 11 06:08:18 2012 +0100

    writing the tranposition

commit f70dcd6a4227aa3d62419c34228c153219f830ad
Author: Alessandro MIRONE <alex@lapalex.casa>
Date:   Mon Feb 6 09:43:10 2012 +0100

    scritta transposizione ( controllo solo )

commit d316b687fdab4b94c8ead60ef7c3e3b21745a58d
Author: Alessandro Mirone <Alessandro Mirone>
Date:   Fri Feb 3 08:49:17 2012 +0100

     finito a paganin si riflette a mpi

commit 6c73908e3605f90f63027b6f2f3aa6b01b0da223
Author: Alessandro Mirone <Alessandro Mirone>
Date:   Tue Jan 31 16:46:12 2012 +0100

     programmando ccd_filter dentro a filter and trim con tutti i parametri gia settati

commit 7feb8ec0c4024edf94fd7c860a5336ca7ad0f22f
Author: Alessandro Mirone <Alessandro Mirone>
Date:   Thu Jan 26 17:19:01 2012 +0100

     compilato e linkato con fftw. Definire min in paganin. Finire Paganin

commit 12a4b0d9bb834cee8d34c8474e657a054a4f6ca1
Author: Alessandro Mirone <Alessandro Mirone>
Date:   Wed Jan 25 15:44:46 2012 +0100

    sto programmando paganin ( metti threads )

commit 2b018885714c90371c4c71bb05530ec9ccbd8a4e
Author: Alessandro Mirone <Alessandro Mirone>
Date:   Wed Jan 25 09:27:15 2012 +0100

     funziona preprocessing anche coi thread

commit d557fee067735cb0feea9374b314ac4f3cfcc3a6
Author: Alessandro Mirone <Alessandro Mirone>
Date:   Fri Jan 20 17:07:21 2012 +0100

     compilazione OK

commit a13acf021e37e06dd2516f6a58f8bd7d97c6dd5d
Author: Alessandro Mirone <Alessandro Mirone>
Date:   Fri Jan 20 15:36:44 2012 +0100

     e ora di compilare

commit 2efccf1021fb9597d1c24531c801ab4972fc3daf
Author: Alessandro MIRONE <alex@lapalex.casa>
Date:   Tue Jan 17 16:47:29 2012 +0100

    tutti i parametri sono pronti per il number crunching del preprocessing

commit 97a66f57b9ab5168b77f6fdc14f86b076db317e7
Author: Alessandro Mirone <Alessandro Mirone>
Date:   Fri Jan 13 18:57:24 2012 +0100

     testato OK

commit d4e48a1aae2f39f716f7f613b58bb3399f1d6bfb
Author: Alessandro Mirone <Alessandro Mirone>
Date:   Mon Jan 9 18:39:35 2012 +0100

    compilato e corretto

commit 2fe21f812f8d96fd70e839c50454376897d9c160
Author: Alessandro Mirone <Alessandro Mirone>
Date:   Sun Jan 8 23:07:02 2012 +0100

     scrivendo lettura ff

commit f1f254385212837c505367ad18faeea2085a0ce6
Author: Alessandro Mirone <Alessandro Mirone>
Date:   Wed Dec 21 13:19:54 2011 +0100

    coi thread  semafori per ff

commit c0ecf56fa191f3c5c7adecc4de95c9b798159e0f
Author: Alessandro Mirone <Alessandro Mirone>
Date:   Tue Dec 20 17:36:41 2011 +0100

     preparata la lettura degli ff. Rimane da leggerli in read chunck

commit b1d27d333866c326d1ba6b70b385bcae401d88fc
Author: Alessandro Mirone <Alessandro Mirone>
Date:   Mon Dec 19 17:19:51 2011 +0100

     prepared infos for FFs

commit ac8a0fccd3d78563ec495e4a13ac25ef04e9a618
Author: Alessandro Mirone <Alessandro Mirone>
Date:   Fri Dec 9 18:24:34 2011 +0100

    OK

commit 5e5b00f7a3a9c1b19c4f7880f3c2ec9baa5d09f0
Author: Alessandro Mirone <Alessandro Mirone>
Date:   Wed Dec 7 15:23:35 2011 +0100

    trovato blocco risorse. Da testare.

commit ca73f137d0012c24b9a6a70287cac8290bdcb4db
Author: Alessandro Mirone <Alessandro Mirone>
Date:   Tue Dec 6 17:12:24 2011 +0100

    ottima gestione senza npbunches. per npbunches serve affinare controllo
    vedi commento

commit b52b0cedbbb9014fbe1ee3242b1ec124c4a2e8fd
Author: Alessandro Mirone <Alessandro Mirone>
Date:   Tue Dec 6 14:59:14 2011 +0100

    lasciando la gil funziona bene. Rimangono punti precedenti

commit 1747f837e20433e11c81c8b0885be9ed3dbf280c
Author: Alessandro Mirone <Alessandro Mirone>
Date:   Fri Dec 2 18:27:30 2011 +0100

    ripulito output.
    Mettere mpi in Cspace per controllare output myrank==0.
    Controlla suddivisione in funzione di atonce

commit f91d47bb349217dbfbf20918697cf6dce3f42b06
Author: Alessandro Mirone <Alessandro Mirone>
Date:   Thu Dec 1 15:20:30 2011 +0100

    funziona dall inizio alla fine

commit 691011057e72c6a773cfcaad2f5dc2d0da75bcdf
Author: Alessandro Mirone <Alessandro Mirone>
Date:   Tue Nov 29 12:00:17 2011 +0100

    messo a psoto una contabilita  allocazione risorse

commit 8ab5848c63893ba3a6ddf54fdc766a3a2e4cca56
Author: Alessandro Mirone <mirone@esrf.fr>
Date:   Thu Nov 17 14:34:33 2011 +0100

    aggiunto median filter per stack immagini

commit 7e8114abc2e35e206445608817440064e3549e84
Author: Alessandro Mirone <mirone@esrf.fr>
Date:   Wed Nov 16 14:54:08 2011 +0100

    added medianstack.cu MEDIA FOR A STACK

commit 017dee7e3b5249880c12f2b860e149318158d88b
Author: Alessandro Mirone <mirone@esrf.fr>
Date:   Mon Nov 7 18:34:38 2011 +0100

    aggiustato la liberazione delle risorse

commit 0bc72899d55439ee6f16e4e2937042ccdda01a7d
Author: Alessandro Mirone <mirone@esrf.fr>
Date:   Tue Oct 11 22:15:51 2011 +0200

    bisogna chiamare free_resources dopo ogni process

commit b2cfe3fa03f0d6fd8c072a16ea8d4f4db75bb68e
Author: Alessandro MIRONE <alex@lapalex.casa>
Date:   Tue Oct 11 20:25:48 2011 +0200

    tolti molti printf di debug

commit 014cb50f5ac397dadb3e6f437c70a695bf6a193b
Author: Alessandro Mirone <mirone@esrf.fr>
Date:   Tue Oct 11 18:22:59 2011 +0200

    c ' e' le pos e size passate come liste.
     ma perche gli assert funzionini bisogna undefinire NDEBUG
    prima di include Python.h
    Adesso ripulire codice dai print

commit e22b5a95e3e9ef6c2dbed92845dab9675f0f2278
Author: Alessandro Mirone <mirone@esrf.fr>
Date:   Tue Oct 11 16:16:14 2011 +0200

    c ' e' una size nulla che arriva in get_chunck

commit 4b92b183c35232d1481484513990d62f61ae6dce
Author: Alessandro Mirone <mirone@esrf.fr>
Date:   Mon Oct 10 22:33:49 2011 +0200

    guardare la linea  print " parametri per ntokens " ,  C.get_n_arraysraw(),   C.get_n_arraystreated()
    perche sono tutti due zero

commit 7827a6fd2aa31ec6c9543c244233880bbad746a1
Author: Alessandro Mirone <mirone@rnice25.esrf.fr>
Date:   Fri Oct 7 18:38:47 2011 +0200

    facendolo girare

commit b36a976760cbaedea0fe1c77f3ed0d623c73e446
Author: Alessandro Mirone <mirone@rnice27.esrf.fr>
Date:   Fri Oct 7 15:23:54 2011 +0200

    facendo i test

commit e91e252e9e7bd4a1c8c627af5496e885ae783e2b
Author: Alessandro Mirone <mirone@esrf.fr>
Date:   Thu Sep 29 17:24:44 2011 +0200

    compila OK

commit 94e01a0bdeaab619309d94a81f4db49578599b69
Author: Alessandro MIRONE <alex@lapalex.casa>
Date:   Wed Sep 28 15:29:39 2011 +0200

    aggiunti dei commenti su come si fara in caso di non contiguita della cpuset

commit adc2f8b10b29a1d9b6738437ab655217df807349
Author: Alessandro MIRONE <alex@lapalex.casa>
Date:   Wed Sep 28 14:09:19 2011 +0200

    pronto per lanciare lettura in parallelo

commit 6db1aa6028cd67565ccc9978789cd979a82a35c3
Author: Alessandro Mirone <mirone@esrf.fr>
Date:   Mon Sep 26 16:57:11 2011 +0200

    scritto lettura da edf per rotazione verticale

commit 8cdf96d10bcef586ec2727749a16deec52d280ec
Author: Alessandro Mirone <mirone@esrf.fr>
Date:   Thu Sep 22 17:31:22 2011 +0200

    scrivendo la routine read_chunk. Tutte le informazioni ci sono

commit fe893f303cbd9ee4d9ed047b5269aa2b57ff333f
Author: Alessandro Mirone <mirone@esrf.fr>
Date:   Tue Sep 20 16:13:27 2011 +0200

    scrivendo la parte C. Bisogna fare una conversione per array in 2 dimensioni
    ( per pos_s size_s etc etc )  e poi scrivere la routine di lettura in ccspace
    che usera tra l' altro size_s per la  grandezza del chunk da leggere e per
    saper di quanto si deve spostare

commit 2c454ae536bd4fb8e4eef177b24fa300279404fd
Author: Alessandro Mirone <mirone@esrf.fr>
Date:   Mon Sep 19 17:10:30 2011 +0200

    finito di scrivere la parte di controllo. Rimane da agganciarsi allo cspace ,
    e ricontrollare il meccanismo dei locs

commit ad19a35012cbd3e4a2a251c8df62323b6f88af80
Author: Alessandro Mirone <mirone@esrf.fr>
Date:   Fri Sep 9 18:03:34 2011 +0200

    arrivato vicino al lanciamento dello cspace

commit c78a12daa382a9ec138c04da6f5500aa967e4635
Author: Alessandro Mirone <mirone@rnice33.esrf.fr>
Date:   Tue Sep 6 15:53:40 2011 +0200

    si chiarificano le idee sul controllo

commit 0a4e481768bd1b7cf09458836b6592fff3b81112
Author: Alessandro Mirone <mirone@rnice46.esrf.fr>
Date:   Fri Jul 29 15:14:54 2011 +0200

    controllo

commit c041bd4075ad26b69bb0601e0e4ca2973c943da7
Author: Alessandro Mirone <mirone@rnice46.esrf.fr>
Date:   Tue Jul 26 14:48:42 2011 +0200

    fino a qui bene

commit 271a384f31c332043bb4e6185ed6d7e871e7fc28
Author: Alessandro Mirone <mirone@rnice47.esrf.fr>
Date:   Mon Jul 25 22:10:42 2011 +0200

    aggiunti due files

commit 1166edc62dc55d5d1b96924ab6593d14519a37a5
Author: Alessandro Mirone <mirone@rnice50.esrf.fr>
Date:   Mon Jul 25 15:10:24 2011 +0200

    da testare con valgrind

commit 8d5e1436bc35ec0e3f7e48643658a7e47af2d277
Author: Alessandro Mirone <mirone@rnice54.esrf.fr>
Date:   Fri Jul 22 14:18:38 2011 +0200

    compilato con setup.py, pensando a struttura multithread

commit 88603477c679859c9192b03f3b7436a20d6d930c
Author: Alessandro Mirone <mirone@rnice54.esrf.fr>
Date:   Thu Jul 21 17:25:20 2011 +0200

    added two files

commit c343b7954bb1f79f60585964f735fd67b6134e35
Author: Alessandro Mirone <mirone@rnice54.esrf.fr>
Date:   Thu Jul 21 17:23:37 2011 +0200

    pronto a lanciare setup.py

commit ae54aa5a36b6dfb0bc52c6f861675687c6664952
Author: Alessandro Mirone <mirone@rnice54.esrf.fr>
Date:   Wed Jul 20 12:48:10 2011 +0200

    ormai pronto per codare lettura

commit 42898681b73d63813645a944992c8d4da071f394
Author: Alessandro Mirone <mirone@rnice54.esrf.fr>
Date:   Tue Jul 19 16:41:56 2011 +0200

    avanti

commit 49cc09776fe2c246431c7379d18c884d5beb5fa3
Author: Alessandro Mirone <mirone@rnice47.esrf.fr>
Date:   Wed Jul 13 15:06:34 2011 +0200

    prossima : mettere dentro array num proj
parent 8889a2c7
# Object files
*.o
# Libraries
*.lib
# Shared objects (inc. Windows DLLs)
*.dll
*.so
# Executables
*.exe
*.out
*.py[cod]
# C extensions
*.so
# Packages
*.egg
*.egg-info
dist
build
eggs
parts
bin
var
sdist
develop-eggs
.installed.cfg
lib
lib64
# Installer logs
pip-log.txt
# Unit test / coverage reports
.coverage
.tox
nosetests.xml
#Translations
*.mo
#Mr Developer
.mr.developer.cfg
# emacs temp
*~
# test directories
TEST*
testsdata
#installation directory
scripts/
libs/
#define MAXNTOKENS 3
typedef struct {
int ntokens ;
float *datatokens[MAXNTOKENS];
} CCarraylist;
void CCarraylist_initialise(CCarraylist * self) {
self->ntokens=0
}
void CCarraylist_appendarray(CCarraylist* self, float * array) {
if(self->ntokens==MAXNTOKENS-1) {
fprintf(stderr, " ntokens==MAXNTOKENS-1 in file %s line %d ", __FILE__, __LINE__);
exit(1);
}
self->datatokens[ntokens]=array;
}
typedef struct {
CCarraylist* rawdatatokens ;
CCarraylist* datatokens ;
} CCspace;
void CCspace_initialise(CCspace * self ) {
self->rawdatatokens = (CCarraylist*) malloc( sizeof(CCarraylist));
self->datatokens = (CCarraylist*) malloc( sizeof(CCarraylist));
CCarraylist_initialise(self->rawdatatokens);
CCarraylist_initialise(self->datatokens);
}
void CCspace_addRawDataSpace(CCspace * self , float *token ) {
CCarraylist_appendarray( self->rawdatatokens, token)
}
void CCspace_addDataSpace(CCspace * self , float *token ) {
CCarraylist_appendarray( self->datatokens, token)
}
#include"Python.h"
#include <stdlib.h>
#include <stdio.h>
#include <math.h>
#include<time.h>
#include"structmember.h"
#include<string.h>
#include"CCspace.h"
#include"cpyutils.h"
#
#include "numpy/arrayobject.h"
#include<assert.h>
#define DEBUG(a) printf("%s \n", a);
/*
* The error object to expose
*/
static PyObject *ErrorObject;
#define onError(message)\
{ PyErr_SetString(ErrorObject, message); return NULL;}
typedef struct {
PyObject_HEAD
CCspace *myspace;
} Cspace;
staticforward PyTypeObject Cspacetype;
static void
Cspace_dealloc(Cspace *self)
{
DEBUG("... going to destroy a Cspace ...")
if(self && 0 )
free(self);
DEBUG("... going to destroy a Cspace ... OK")
}
static PyObject *
Cspace_new( PyObject *self, PyObject *args)
{
PyObject *Oarrayspace ;
PyObject *OParameters ;
PyObject *Otmp;
PyArray *Oa;
int i,k;
Cspace* res;
res= (Cspace*) PyObject_NEW(Cspace , &Cspacetype);
if(!PyArg_ParseTuple(args,"oo:Cspace_new",&Oarrayspace,&OParameters ))
return NULL;
res->myspace = (CCspace*) malloc(sizeof( CCspace));
CCspace_initialise( res->myspace );
for(k=0;k<2;k++) {
if(k==0) Otmp = cpyutils_get_pydic_Oval(Oarrayspace , "rawdatatokens") ;
else Otmp = cpyutils_get_pydic_Oval(Oarrayspace , "datatokens") ;
assert( PyList_Check( Otmp ) );
for(i=0;i<PyList_Size(Otmp);i++) {
assert(PyArray_Check( PyList_GetItem( Otmp , i)));
Oa = ((PyArray*) PyList_GetItem( Otmp , i));
assert(PyArray_ISFLOAT(Oa));
if(k==0) CCspace_addRawDataSpace( res->myspace , ((float *) Oa->data) );
else CCspace_addDataSpace ( res->myspace , ((float *) Oa->data) );
}
}
return (PyObject*) res;
}
static PyMethodDef Cspace_methods[]={
{ NULL, NULL}
/* {"calcSlices",(PyCFunction) Cspace_calcSlices, METH_VARARGS,Cspace_calcSlices_doc}, */
/* {"calcMedian",(PyCFunction) Cspace_calcMedian, METH_VARARGS,Cspace_calcMedian_doc}, */
/*{"calcSlicesMemory",(PyCFunction) Cspace_calcSlicesMemory, METH_VARARGS,Cspace_calcSlicesMemory_doc}, */
/* {"setFilterFunct",(PyCFunction) Cspace_SetFilterFunct, METH_VARARGS,Cspace_SetFilterFunct_doc}, */
/* { "setThetaOffset", (PyCFunction) Cspace_setthetaoffset , METH_VARARGS, NULL } , */
/* {"close", (PyCFunction) Cspace_close, METH_VARARGS, NULL }, */
};
static struct memberlist Cspace_memberlist[]={
{ NULL }
};
static PyMethodDef Cspace_functions[] = {
{"Cspace", Cspace_new, METH_VARARGS, Cspace_new_doc },
{ NULL, NULL}
};
static PyObject *
Cspace_getattr(Cspace *self, char *attr)
{
PyObject *res;
res= Py_FindMethod(Cspace_methods, (PyObject*) self, attr);
if(NULL !=res)
return res;
else {
PyErr_Clear();
return PyMember_Get((char*) self,Cspace_memberlist, attr);
}
}
void initCspace(void)
{
PyObject *m, *d;
m = Py_InitModule("Cspace", Cspace_functions);
d = PyModule_GetDict(m);
ErrorObject = Py_BuildValue("s","Cspace.error");
PyDict_SetItemString(d,"error", ErrorObject);
if(PyErr_Occurred())
Py_FatalError("can't initialize module Cspace");
#ifdef import_array
import_array();
#endif
}
static PyTypeObject Cspacetype = {
PyObject_HEAD_INIT(&PyType_Type)
0,
"Cspace",
sizeof(Cspace),
0,
(destructor) Cspace_dealloc,
0,
(getattrfunc) Cspace_getattr,
};
This diff is collapsed.
recursive-include PyHST *.h *.c *.cu
recursive-include doc *
include MANIFEST.in
import string
import traceback
import sys
import numpy
import math
myrank = MPI.COMM_WORLD.Get_rank()
nprocs = MPI.COMM_WORLD.Get_size()
mypname = MPI.Get_processor_name()
comm = MPI.COMM_WORLD
def treat_par_file(s):
"""
pythonify the old format (fortran)
input file given as a string s
"""
print "PYTHONIFYING INPUT FILE"
s=string.replace(s,"!","#")
lines=string.split(s,"\n")
new_lines=""
for line in lines:
if( string.find(line,"FILE ")>=0 or string.find(line,"FILE=")>=0):
line=add_quotes(line)
elif( string.find(line,"PREFIX")>=0):
line=add_quotes(line)
elif( string.find(line,"POSTFIX")>=0):
line=add_quotes(line)
new_lines=new_lines+"\n"+line
# try to execute the input file
print "CHECKING INPUTFILE FOR EXECUTION"
try:
NO =0
YES=1
new_lines= string.replace(new_lines, "\"N.A.\"", "\"N_A_\"")
new_lines= string.replace(new_lines, "N.A.", "\"N_A_\"")
exec(new_lines)
except:
print new_lines
import traceback
traceback.print_exception(sys.exc_type, sys.exc_value, sys.exc_traceback)
raise " something went wrong interpreting input file "
print "INPUT FILE IS GOOD FOR ME"
return new_lines
def add_quotes(s):
pos=string.find(s,"=")
if(pos==-1): return s
new_s=s[:pos+1]
pos=pos+1
toggle=0
while(pos<len(s) and s[pos]==" "):
pos=pos+1
if(pos==len(s)):
return s
new_s=new_s+"\""
while(pos<len(s) and s[pos]!=" "):
new_s=new_s+s[pos]
pos=pos+1
new_s=new_s+"\""
return new_s
filename=sys.argv[1]
try:
f=open(filename,"r")
except :
print " problems reading file ", filename
raise
s=f.read()
f.close()
s=treat_par_file(s)
NO=0
YES=1
class Parameters:
NUM_IMAGE_1 = 0 # Number of pixels horizontally (take into account binning : smaller if binning > 1 )
NUM_IMAGE_2 = 0 # Number of pixels vertically (take into account binning )
ROTATION_VERTICAL=1 # If horizontal data are rotated at reading time
# Then all parameter as if axis were vertical
RECONSTRUCT_FROM_SINOGRAMS=0
NO_SINOGRAM_FILTERING=0
DO_CCD_FILTER=0
DO_SINO_FILTER=0
CCD_FILTER=""
SINO_FILTER=""
CCD_FILTER_PATH="/"
SINO_FILTER_PATH="/"
CCD_FILTER_PARA ={}
SINO_FILTER_PARA={}
DO_AXIS_CORRECTION=0
AXIS_CORRECTION_FILE=""
OPTIONS= { 'padding':'E' }
FOURIER_FILTER=None
FOURIER_FILTER_HAS_RAMP = NO
OUTPUT_SINOGRAMS=0
FILE_INTERVAL = 1
BICUBIC=0
SUMRULE=0
SAVE_JPEG_SLICES=0
JPEG_QUALITY=100
DO_HISTOGRAM=0
DO_PROJECTION_MEDIAN=0
DO_PROJECTION_MEAN=0
DO_AXIS_LONGITUDINAL_CORRECTION=0
PROJECTION_MEDIAN_FILENAME = "projectionmedian.edf"
DOUBLEFFCORRECTION=0
ZEROCLIPVALUE=1.0e-9
ONECLIPVALUE =None
OFFSETRADIOETFF=0.0
BINNING = None
XYCORRECTIONS=0
ANGLES_FILE=None
PENTEZONE=10.0
ZEROOFFMASK=1
SINOGRAM_STEP=1
RENORMALIZE_FOR_TALBOT=0
TALBOT_P2=0
TALBOT_TD=0
CUMSUM_INTEGRAL=0 # 0 no, 1 yes, 2 subract average, 3 subtract slope
DO_PAGANIN=0
PAGANIN_Lmicron =0
PAGANIN_MARGE=10
DO_OUTPUT_PAGANIN=0
OUTPUT_PAGANIN_FILE=None
PAGANIN_TRY_CUFFT=1
PAGANIN_TRY_FFTW =1
PUS=0
PUC=0
UNSHARP_LoG=0
TRYGPU=1
NEEDGPU=0
MULTIFRAME=0
KEEPONGOING=0
ONLINEVISU=0
MPIWITHMASTER=0
EDF2H5_FILE=None
MAXMEMORY = 0
NSLICESATONCE= 1000000
MAXNTOKENS = 3
exec(s)
if Parameters.PUS!=0:
Parameters.PUC = Parameters.PUC*max( Parameters.PUS *Parameters.PUS ,1)
Parameters.PUS = Parameters.PUS/2
DEG2RAD=math.pi/180.0
if( Parameters.ANGLES_FILE is not None ):
angles_ = string.split( open( Parameters.ANGLES_FILE).read())
angles=[]
for a in angles_:
try:
angles.append( string.atof(a) )
except:
break
angles=(numpy.array(angles)*DEG2RAD).astype("f")
else:
angles=0
if myrank==0:
def simplereadxml(filename,what):
e = open(filename,'r')
value = None
for line in e.readlines():
posbeg = line.find('<'+what+'>')
if posbeg > -1:
posend = line.find('</'+what+'>')
value = line[posbeg+len(what)+2:posend].strip()
break
e.close()
return value
####################################################################
# cherche le fichier xml contenant le tag idAc
idAc = "N_A_"
if not Parameters.RECONSTRUCT_FROM_SINOGRAMS:
toc= Parameters.FILE_PREFIX
else:
toc= Parameters.SINOGRAM_PREFIX
file_xml_idac = toc+"_idAc.xml"
try:
idAc = simplereadxml(file_xml_idac,"idAc")
except:
pass
Parameters.idAc = idAc
################################################
class derivedParameters:
pass
def check_axis_corrections()
Parameters.DO_AXIS_LONGITUDINAL_CORRECTION = 0
if( Parameters.DO_AXIS_CORRECTION ):
s=open(Parameters.AXIS_CORRECTION_FILE,"r").read()
sl=string.split(s)
sl2 = string.split(s,"\n")
while( sl2[0][0]=="#" ):
sl2=sl2[1:]
if len( string.split(sl2[0]) )==2:
Parameters.DO_AXIS_LONGITUDINAL_CORRECTION = 1
if Parameters.DO_AXIS_LONGITUDINAL_CORRECTION :
for i in range(Parameters.numpj) :
Parameters.axis_corrections[i], Parameters.axis_correctionsL[i] = map( string.atof, string.split(sl2[i]))
Parameters.PIECE_MARGE = max(Parameters.PIECE_MARGE, int(abs( Parameters.axis_correctionsL[i] )+1) )
else:
for i in range(Parameters.numpj) :
Parameters.axis_corrections[i]=string.atof(sl[i])
def OverlappingLogic (pos_edf, size_edf, axis, last_slice , marge ):
pos_edf_= copy(pos_edf)
if(pos_edf_[axis]>=marge):
pos_edf_[axis]=pos_edf_[axis]-marge
else:
pos_edf_[axis]=0
dsize=pos_edf[axis]-pos_edf_[axis]
if(size_edf[axis]-1+pos_edf[axis]+marge<=(last_slice)):
dsize=dsize+marge
else:
dsize=dsize+ last_slice - ((size_edf[axis]-1)+pos_edf[axis])
size_edf_=copy(size_edf)
size_edf_[axis]= size_edf[axis]+dsize
return pos_edf_, size_edf_
def readjust_marges(pos, size):
P.PIECE_MARGE_touse= P.PIECE_MARGE
if P.DO_PAGANIN:
P.PIECE_MARGE_touse = P.PIECE_MARGE_touse + P.PAGANIN_MARGE
P.PIECE_MARGE_touse=int(P.PIECE_MARGE_touse+0.5)
pos_, size_ = OverlappingLogic (
pos, size, 0, P.P.NUM_IMAGE_2-1 ,
P.PIECE_MARGE_touse )
return pos_, size_
P=Parameters
P.myprojections = numpy.arange( P.NUM_FIRST_IMAGE, P.NUM_LAST_IMAGE+1, P.FILE_INTERVAL)
P.numpj = len(myprojections)
P.axis_corrections=Numeric.zeros([numpj ],"f")
P.axis_correctionsL = Numeric.zeros([numpj ],"f")
P.PIECE_MARGE=1
check_axis_corrections()
P.first_slices = numpy.arange( P.START_VOXEL_3 -1,
P.END_VOXEL_3-1 +1,
P.NSLICESATONCE)
P.last_slices = numpy.minimum(P.first_slices + P.NSLICESATONCE -1,
P.END_VOXEL_3-1)
P.pos_s = [ [first_slice,0]
for first_slice in P.first_slices ]
P.size_s = [ [last_slice-first_slice+1, P.NUM_IMAGE_1 ]
for first_slice, last_slices in zip(P.first_slices, P.last_slices) ]
P.pos_s_ = [None]*len(P.pos_s )
P.size_s_ = [None]*len(P.pos_s )
for pos, size , count in zip( P.pos_s ,P.size_s , range(len(P.pos_s )) ):
P.pos_s_[count], P.size_s_s[count] = readjust_marges(pos,size)
def create_arrays_space_as_dictionary():
P=Parameters
dims = numpy.max(P.size_s_, axis]=0)
ppproc = int( (P.numpj*1.0/nprocs)+0.999999)
my_nprocs = min( ppproc, P.numpj-myrank*ppproc )
dims = [ len(range(myrank,my_nprocs , nprocs)) , dims[0], dims[1] ]
ntokensraw=min(P.MAXNTOKENS,len(P.pos_s_))
rawdatatokens = [ numpy.zeros( dims ,"") for i in range(ntokensraw) ]
dims = numpy.max(P.size_s, axis]=0)
dims = [len(range(myrank, dims[0], nprocs)), P.numpj ,dims[1] ]
ntokens = min( P.MAXNTOKENS,len(P.pos_s_))
datatokens = [ numpy.zeros( dims ,"") for i in range(ntokens) ]
return {"rawdatatokens":rawdatatokens , "datatokens":datatokens }
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
#/*##########################################################################
# Copyright (C) 2001-2013 European Synchrotron Radiation Facility
#
# PyHST2
# European Synchrotron Radiation Facility, Grenoble,France
#
# PyHST2 is developed at
# the ESRF by the Scientific Software staff.
# Principal author for PyHST2: Alessandro Mirone.
#
# This program is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by the Free
# Software Foundation; either version 2 of the License, or (at your option)
# any later version.
#
# PyHST2 is distributed in the hope that it will be useful, but WITHOUT ANY
# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
# details.
#
# You should have received a copy of the GNU General Public License along with
# PyHST2; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
# Suite 330, Boston, MA 02111-1307, USA.
#
# PyHST2 follows the dual licensing model of Trolltech's Qt and Riverbank's PyQt
# and cannot be used as a free plugin for a non-free program.
#
# Please contact the ESRF industrial unit (industry@esrf.fr) if this license
# is a problem for you.
#############################################################################*/
#/*##########################################################################
# Copyright (C) 2004-2010 European Synchrotron Radiation Facility
#
# This file is part of the PyHST Toolkit developed at
# the ESRF by the SciSoft group.
#
# This toolkit is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by the Free
# Software Foundation; either version 2 of the License, or (at your option)
# any later version.
#
# PyHST is distributed in the hope that it will be useful, but WITHOUT ANY
# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
# details.
#
# You should have received a copy of the GNU General Public License along with