search

padsley / k600analyser

Code for the K600 analyser including plugin codes for silicon, clover and HAGAR data
1 stars 4 forks source link

Setup dev retief #88

Closed neveling closed 8 years ago

neveling commented 8 years ago

A brief description of changes:

We no longer have a file called f-plane.c; it is replaced with main.c

The code is now structured so that most of the subroutines that used to be in f-plane.c are now moved to FocalPlane.c with definitions to FocalPlane.h.

The ANA_MODULE focalplane_module was changed to main_module, and accordingly we have main_event, main_bor, main_eor and main_init instead of focal_event etc. These changes are affected in both analyzer.c and main.c These are just naming conventions that I feel is more logical.

Also, a lot of variable definitions that used to be in f-plane.c is moved to parameters.h

The codes adc.c and qdc.c were cleaned up. A lot of code that was commented out for the past few years were deleted. Similarly a lot of dead weight code in f-plane.c (now main.c) were deleted. These include provision for histograms for NaI and Si detectors, which is now handled entirely by GammaData.c HagarSort.c MMM.c SiliconData.c W1.c etc.

The raytracing code was improved to include fixZ and fixX subroutines. The chisq calculation was changed to a rsquared calculation (the chi sq value was never the proper chisq value in any case)

A small 3mm adjustment was made to the Y calculation.

The code is still not as I want it to be.

The main aim is to take out all the VDC content and move it out to a FocalplaneDATA.c/h and VDC.c/h structure that will mimic the structure Phil created for e.g. SiliconDATA.c/h and MMM.c/h. So far all that was done is the first step: to make f-plane.c into main.c, and to take out all the subroutines in this file (that makes it so difficult to read) out to a temporary Focalplane.c/h structure...

What I would also still like to do is to make sure all angle calcs, line shape corrections etc use parameters from the config file. Lets do away with the use of the ODB for these!

Finaly: I added some comments to config.cfg, making it prettier in my eyes (^:

padsley commented 8 years ago

I'm working on the manual merge at the moment. It's likely that the master branch will be out of commission for the rest of the day. I suggest that you avoid using it.

padsley commented 8 years ago

Done (hopefully).

I've not tried running the new-style master branch with any files but it compiles.

Testing will commence this afternoon (hopefully...)

padsley commented 8 years ago

I've just started working with the new master branch so we shall see what occurs.

I shall start a new issue thread for any problems that I find.

padsley commented 8 years ago

Right. Given the information in issue #89, I've restored the SetupDevRetief branch so that I can see the possible differences between the old main.c in that any anything newer.