Changeset 20033 for branches/cnb_branch_20080830/psastro/src/psastro.h

Timestamp:

Oct 9, 2008, 2:39:01 PM (18 years ago)

Author:

beaumont

Message:

merged mainline into branch. resolved conflicts. added plots.

Location:

branches/cnb_branch_20080830/psastro/src

Files:

• . (modified) (1 prop)
• psastro.h (modified) (4 diffs)

branches/cnb_branch_20080830/psastro/src

@@ -15 +15 @@
 psastroModel
 gpcModel
+psastroModelFit

@@ -15 +15 @@
 psastroModel
 gpcModel
+psastroModelFit

branches/cnb_branch_20080830/psastro/src/psastro.h

@@ -17 +17 @@
 // logN = offset + slope * logS
 typedef struct {
-    double mMin;                        // minimum magnitude bin with data
-    double mMax;                        // maximum magnitude bin with data
-    double offset;                      // fitted line offset
-    double slope;                       // fitted line slope
-    double mPeak;                       // mag of peak bin 
-    int nPeak;                          // # of stars in peak bin
-    int sPeak;                          // sum of stars to peak bin
+    double mMin;                        // minimum magnitude bin with data
+    double mMax;                        // maximum magnitude bin with data
+    double offset;                      // fitted line offset
+    double slope;                       // fitted line slope
+    double mPeak;                       // mag of peak bin
+    int nPeak;                          // # of stars in peak bin
+    int sPeak;                          // sum of stars to peak bin
 } pmLumFunc;
 
@@ -35 +35 @@
 psArray          *pmSourceToAstromObj (psArray *sources);
 bool              psastroAstromGuess (int *nStars, pmConfig *config);
+bool              psastroAstromGuessCheck (pmConfig *config);
 
 psPlaneDistort   *psPlaneDistortIdentity ();
@@ -46 +47 @@
 bool              psastroChooseRefstars (pmConfig *config, psArray *refs);
 bool              psastroRefstarSubset (pmReadout *readout);
-pmLumFunc        *psastroLuminosityFunction (psArray *stars);
+pmLumFunc        *psastroLuminosityFunction (psArray *stars, pmLumFunc *rawFunc);
+bool              psastroLuminosityFunctionPlot(psVector *lnMag, psVector *Mag, pmLumFunc *lumFunc, pmLumFunc *rawFunc);
 psArray          *psastroRemoveClumps (psArray *input, int scale);
 
@@ -55 +57 @@
 
 // mosaic fitting functions
-bool              psastroMosaicGradients (pmFPA *fpa, psMetadata *recipe);
-bool              psastroMosaicCommonScale (pmFPA *fpa, psMetadata *recipe);
-bool              psastroMosaicAstrom (pmConfig *config);
-bool              psastroMosaicChipAstrom (pmFPA *fpa, psMetadata *recipe, int iteration);
-bool              psastroMosaicSetMatch (pmFPA *fpa, psMetadata *recipe, int iteration);
-bool              psastroMosaicSetAstrom (pmFPA *fpa);
-bool              psastroMosaicHeaders (pmConfig *config);
-bool              psastroMosaicRescaleChips (pmFPA *fpa);
-bool              psastroMosaicOneChip (pmChip *chip, pmReadout *readout, psMetadata *recipe, psMetadata *updates, int iteration);
+bool              psastroMosaicDistortion (pmFPA *fpa, psMetadata *recipe, int pass);
+psPlaneTransform *psastroMosaicFitRotAndScale (pmFPA *fpa);
+bool              psastroMosaicApplyRotAndScale (pmFPA *fpa, psPlaneTransform *TPtoFP);
+bool              psastroMosaicDistortionFromGradients (pmFPA *fpa, psMetadata *recipe);
+bool              psastroMosaicCorrectDistortion (pmFPA *fpa, psPlaneTransform *TPtoFP);
+bool              psastroMosaicCommonScale (pmFPA *fpa, psMetadata *recipe);
+bool              psastroMosaicAstrom (pmConfig *config);
+bool              psastroMosaicChipAstrom (pmFPA *fpa, psMetadata *recipe, int iteration);
+bool              psastroMosaicSetMatch (pmFPA *fpa, psMetadata *recipe, int iteration);
+bool              psastroMosaicSetAstrom (pmFPA *fpa);
+bool              psastroMosaicHeaders (pmConfig *config);
+bool              psastroMosaicRescaleChips (pmFPA *fpa);
+bool              psastroMosaicOneChip (pmChip *chip, pmReadout *readout, psMetadata *recipe, psMetadata *updates, int iteration);
 
 // Return version strings.
-psString          psastroVersion(void);
-psString          psastroVersionLong(void);
+psString          psastroVersion(void);
+psString          psastroVersionLong(void);
 
 // demo plots
-bool              psastroPlotRawstars (psArray *rawstars, pmFPA *fpa, pmChip *chip, psMetadata *recipe);
-bool              psastroPlotRefstars (psArray *refstars, psMetadata *recipe);
-bool              psastroPlotOneChipFit (psArray *rawstars, psArray *refstars, psArray *match, psMetadata *recipe);
+bool              psastroPlotRawstars (psArray *rawstars, pmFPA *fpa, pmChip *chip, psMetadata *recipe);
+bool              psastroPlotRefstars (psArray *refstars, psMetadata *recipe);
+bool              psastroPlotOneChipFit (psArray *rawstars, psArray *refstars, psArray *match, psMetadata *recipe);
 
-bool              psastroDumpRawstars (psArray *rawstars, pmFPA *fpa, pmChip *chip);
-bool              psastroDumpRefstars (psArray *refstars, char *filename);
-bool              psastroDumpMatches (pmFPA *fpa, char *filename);
-bool              psastroDumpStars (psArray *stars, char *filename);
+bool              psastroDumpRawstars (psArray *rawstars, pmFPA *fpa, pmChip *chip);
+bool              psastroDumpRefstars (psArray *refstars, char *filename);
+bool              psastroDumpMatches (pmFPA *fpa, char *filename);
+bool              psastroDumpStars (psArray *stars, char *filename);
 bool              psastroDumpMatchedStars (char *filename, psArray *rawstars, psArray *refstars, psArray *match);
 bool              psastroDumpGradients (psArray *gradients, char *filename);
 
-bool              psastroMosaicSetAstrom_tmp (pmFPA *fpa);
-int               psastroSortByMag (const void *a, const void *b);
+bool              psastroMosaicSetAstrom_tmp (pmFPA *fpa);
+int               psastroSortByMag (const void *a, const void *b);
 
 bool              psastroFixChips (pmConfig *config, psMetadata *recipe);
 bool              psastroFixChipsTest (pmConfig *config, psMetadata *recipe);
 bool              psastroUseModel (pmConfig *config, psMetadata *recipe);
-bool              psastroDumpCorners (char *filename, pmFPA *fpa);
+bool              psastroDumpCorners (char *filenameU, char *filenameD, pmFPA *fpa);
 
 

@@ -15 +15 @@
 psastroModel
 gpcModel
+psastroModelFit