Changeset 36884 for branches/eam_branches/ipp-20140610/psModules/src/objects/pmModelClass.h

Timestamp:

Jun 17, 2014, 5:58:38 AM (12 years ago)

Author:

eugene

Message:

merge in changes from trunk (up through pv3 tag)

Location:

branches/eam_branches/ipp-20140610

Files:

• . (modified) (1 prop)
• psModules/src/objects/pmModelClass.h (modified) (1 diff)

branches/eam_branches/ipp-20140610/psModules/src/objects/pmModelClass.h

@@ -35 +35 @@
     char *name;
     int nParams;
+    bool useReff;
     pmModelFunc          modelFunc;
     pmModelFlux          modelFlux;
     pmModelRadius        modelRadius;
+    pmModelSetFWHM       modelSetFWHM;
     pmModelLimits        modelLimits;
     pmModelGuessFunc     modelGuess;