Changeset 20033 for branches/cnb_branch_20080830/psastro/src/psastroRefstarSubset.c

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)
• psastroRefstarSubset.c (modified) (3 diffs)

branches/cnb_branch_20080830/psastro/src

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

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

branches/cnb_branch_20080830/psastro/src/psastroRefstarSubset.c

@@ -21 +21 @@
   // is needed...
   psLogMsg ("psastro", 4, "measuring luminosity function for rawstars\n");
-  pmLumFunc *rawfunc = psastroLuminosityFunction (rawstars);
+  pmLumFunc *rawfunc = psastroLuminosityFunction (rawstars, NULL);
   if (rawfunc == NULL) {
     psLogMsg ("psastro", 4, "giving up on rawstars for this readout\n");
@@ -27 +27 @@
   }
   psLogMsg ("psastro", 4, "measuring luminosity function for refstars\n");
-  pmLumFunc *reffunc = psastroLuminosityFunction (refstars);
+  pmLumFunc *reffunc = psastroLuminosityFunction (refstars, rawfunc);
   if (reffunc == NULL) {
     psLogMsg ("psastro", 4, "giving up on refstars for this readout\n");
@@ -84 +84 @@
 /* this test is a bit sensitive to the total number of refstars or rawstars available
    watch out if:
-   - the fitted slopes are extremely different 
+   - the fitted slopes are extremely different
    - the average number of stars per bin is ~1
-   
+
    skip the cut in these cases?
 */

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