Changeset 34772 for branches/czw_branch/20120906/Ohana/src/addstar/src/mkcmf.c

Timestamp:

Dec 6, 2012, 6:32:19 PM (14 years ago)

Author:

watersc1

Message:

merge from trunk. Preliminary versions of stacktool/warptool updates and regenerate_background.pl script. The warp code is finished and tested, and I still need to get the stack version resolved.

Location:

branches/czw_branch/20120906/Ohana

Files:

• . (modified) (1 prop)
• src/addstar/src/mkcmf.c (modified) (9 diffs)

branches/czw_branch/20120906/Ohana/src/addstar/src/mkcmf.c

@@ -178 +178 @@
   }
     
+  gauss_init (2048);
+
   // load test stars from a file:
   Nstars = 0;
@@ -254 +256 @@
   gfits_modify (&header, "NASTRO",   "%d", 1, 10); 
 
-  gfits_modify (&header, "IMAGEID",  "%d", 1, (int)(1000*drand48())); 
-  gfits_modify (&header, "SOURCEID", "%d", 1, (int)(100*drand48())); 
+  int imageID = 1000.0*drand48();
+  int sourceID = 100.0*drand48();
+
+  gfits_modify (&header, "IMAGEID",  "%d", 1, imageID);
+  gfits_modify (&header, "SOURCEID", "%d", 1, sourceID);
 
   PutCoords (&coords, &header);
@@ -396 +401 @@
   // this needs to make different output 'stars' entries depending on the desired type
   ALLOCATE (stars, PS1_DEV_0, Nstars);
-  gauss_init (2048);
   for (i = 0; i < Nstars; i++) {
     stars[i].detID = i;
@@ -441 +445 @@
   // this needs to make different output 'stars' entries depending on the desired type
   ALLOCATE (stars, PS1_DEV_1, Nstars);
-  gauss_init (2048);
   for (i = 0; i < Nstars; i++) {
     stars[i].detID = i;
@@ -489 +492 @@
   // this needs to make different output 'stars' entries depending on the desired type
   ALLOCATE (stars, CMF_PS1_V1, Nstars);
-  gauss_init (2048);
   for (i = 0; i < Nstars; i++) {
     stars[i].detID = i;
@@ -537 +539 @@
   // this needs to make different output 'stars' entries depending on the desired type
   ALLOCATE (stars, CMF_PS1_V2, Nstars);
-  gauss_init (2048);
   for (i = 0; i < Nstars; i++) {
     stars[i].detID = i;
@@ -591 +592 @@
   // this needs to make different output 'stars' entries depending on the desired type
   ALLOCATE (stars, CMF_PS1_V3, Nstars);
-  gauss_init (2048);
   for (i = 0; i < Nstars; i++) {
     stars[i].detID = i;
@@ -649 +649 @@
   // this needs to make different output 'stars' entries depending on the desired type
   ALLOCATE (stars, CMF_PS1_V4, Nstars);
-  gauss_init (2048);
   for (i = 0; i < Nstars; i++) {
     stars[i].detID = i;
@@ -660 +659 @@
     stars[i].M = M[i];
     stars[i].Map = M[i] - 0.05;
+    stars[i].MapRaw = M[i] - 0.10;
+
+    stars[i].Flux = flux;
+    stars[i].dFlux = flux * fSN;
+
+    stars[i].apFlux = pow(10.0, -0.4*stars[i].Map);
+    stars[i].apFluxErr = stars[i].apFlux * fSN;
 
     if (ADDNOISE) {