Changeset 34259 for trunk/psModules/src/objects/pmSourceFitModel.c

Timestamp:

Jul 31, 2012, 3:59:03 PM (14 years ago)

Author:

eugene

Message:

add TRAIL models; autocode PS1_DV? and PS1_SV1 I/O formats

Location:

trunk/psModules

Files:

• . (modified) (1 prop)
• src/objects (modified) (1 prop)
• src/objects/pmSourceFitModel.c (modified) (1 diff)

trunk/psModules/src/objects

@@ -9 +9 @@
 pmSourceIO_CMF_PS1_V3.c
 pmSourceIO_CMF_PS1_V4.c
-pmSourceIO_CMF_PS1_V3.v1.c
-pmSourceIO_CMF_PS1_V1.v1.c
-pmSourceIO_CMF_PS1_V2.v1.c
-
+pmSourceIO_CMF_PS1_SV1.c
+pmSourceIO_CMF_PS1_DV1.c
+pmSourceIO_CMF_PS1_DV2.c

@@ -9 +9 @@
 pmSourceIO_CMF_PS1_V3.c
 pmSourceIO_CMF_PS1_V4.c
-pmSourceIO_CMF_PS1_V3.v1.c
-pmSourceIO_CMF_PS1_V1.v1.c
-pmSourceIO_CMF_PS1_V2.v1.c
-
+pmSourceIO_CMF_PS1_SV1.c
+pmSourceIO_CMF_PS1_DV1.c
+pmSourceIO_CMF_PS1_DV2.c

trunk/psModules/src/objects/pmSourceFitModel.c

@@ -182 +182 @@
         constraint->paramMask->data.PS_TYPE_VECTOR_MASK_DATA[PM_PAR_YPOS] = 1;
         constraint->paramMask->data.PS_TYPE_VECTOR_MASK_DATA[PM_PAR_SKY] = 1;
+        break;
+      case PM_SOURCE_FIT_TRAIL:
+        // special mode for pmModel_TRAIL: Io, Xo, Yo, Length, and Theta (not Io or Sigma)
+        nParams = params->n - 3;
+        psVectorInit (constraint->paramMask, 0);
+        constraint->paramMask->data.PS_TYPE_VECTOR_MASK_DATA[PM_PAR_SKY] = 1;
+        constraint->paramMask->data.PS_TYPE_VECTOR_MASK_DATA[PM_PAR_SIGMA] = 1;
         break;
       case PM_SOURCE_FIT_INDEX:

@@ -9 +9 @@
 pmSourceIO_CMF_PS1_V3.c
 pmSourceIO_CMF_PS1_V4.c
-pmSourceIO_CMF_PS1_V3.v1.c
-pmSourceIO_CMF_PS1_V1.v1.c
-pmSourceIO_CMF_PS1_V2.v1.c
-
+pmSourceIO_CMF_PS1_SV1.c
+pmSourceIO_CMF_PS1_DV1.c
+pmSourceIO_CMF_PS1_DV2.c