Changeset 3676

Timestamp:

Apr 6, 2005, 9:34:06 AM (21 years ago)

Author:

desonia

Message:

merged fixes from head for rel 5.1.

Location:

branches/rel5/psModules

Files:

• configure.ac (modified) (1 diff)
• psmodule.kdevses (modified) (1 diff)
• src/pmObjects.h (modified) (2 diffs)
• src/pmReadoutCombine.h (modified) (2 diffs)
• src/pmSubtractBias.h (modified) (2 diffs)
• src/pmSubtractSky.h (modified) (2 diffs)

branches/rel5/psModules/configure.ac

@@ -1 @@
-AC_INIT([psModule],[0.5.0],[http://www.pan-starrs.org/bugzilla])
+AC_INIT([psmodule],[0.5.1],[http://www.pan-starrs.org/bugzilla])
 
 AM_CONFIG_HEADER(src/config.h)
-AM_INIT_AUTOMAKE(psModule, 0.5.0)
+AM_INIT_AUTOMAKE(psmodule, 0.5.1)
 
 AC_LANG(C)

branches/rel5/psModules/psmodule.kdevses

@@ -2 +2 @@
 <!DOCTYPE KDevPrjSession>
 <KDevPrjSession>
- <DocsAndViews NumberOfDocuments="5" >
-  <Doc0 NumberOfViews="1" URL="file:///home/desonia/panstarrs/psModule/test/tst_pmObjects01.c" >
-   <View0 line="395" Type="Source" />
+ <DocsAndViews NumberOfDocuments="2" >
+  <Doc0 NumberOfViews="1" URL="file:///home/desonia/panstarrs/psModule/src/pmSubtractSky.h" >
+   <View0 line="24" Type="Source" />
   </Doc0>
-  <Doc1 NumberOfViews="1" URL="file:///home/desonia/panstarrs/psModule/src/pmObjects.c" >
-   <View0 line="320" Type="Source" />
+  <Doc1 NumberOfViews="1" URL="file:///home/desonia/panstarrs/psModule/configure.ac" >
+   <View0 line="10" Type="Source" />
   </Doc1>
-  <Doc2 NumberOfViews="1" URL="file:///home/desonia/panstarrs/psModule/test/Makefile.am" >
-   <View0 line="20" Type="Source" />
-  </Doc2>
-  <Doc3 NumberOfViews="1" URL="file:///home/desonia/panstarrs/psLib/test/astronomy/Makefile.am" >
-   <View0 line="79" Type="Source" />
-  </Doc3>
-  <Doc4 NumberOfViews="1" URL="file:///home/desonia/panstarrs/psModule/Makefile.am" >
-   <View0 line="4" Type="Source" />
-  </Doc4>
  </DocsAndViews>
  <pluginList>

branches/rel5/psModules/src/pmObjects.h

@@ -5 +5 @@
  *  @author GLG, MHPCC
  *
- *  @version $Revision: 1.7 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-04-01 21:38:27 $
+ *  @version $Revision: 1.7.2.1 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-04-06 19:34:06 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -22 +22 @@
 #include<math.h>
 #include "pslib.h"
-// XXX: have Desonia do this correctly.
-#include "../../psLib/src/dataManip/psConstants.h"
 
 typedef enum {

branches/rel5/psModules/src/pmReadoutCombine.h

@@ -5 +5 @@
  *  @author GLG, MHPCC
  *
- *  @version $Revision: 1.2 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-12-23 23:42:25 $
+ *  @version $Revision: 1.2.4.1 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-04-06 19:34:06 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -23 +23 @@
 #include "pslib.h"
 #include "psConstants.h"
-// XXX: have Desonia do this correctly.
-#include "../../psLib/src/dataManip/psConstants.h"
 
 typedef struct

branches/rel5/psModules/src/pmSubtractBias.h

@@ -6 +6 @@
  *  @author George Gusciora, MHPCC
  *
- *  @version $Revision: 1.4 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-10-14 18:30:08 $
+ *  @version $Revision: 1.4.6.1 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-04-06 19:34:06 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -23 +23 @@
 #include<math.h>
 #include "pslib.h"
-// XXX: have Desonia do this correctly.
-#include "../../psLib/src/dataManip/psConstants.h"
 
 typedef enum {

branches/rel5/psModules/src/pmSubtractSky.h

@@ -6 +6 @@
  *  @author GLG, MHPCC
  *
- *  @version $Revision: 1.2 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-12-18 02:27:42 $
+ *  @version $Revision: 1.2.4.1 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-04-06 19:34:06 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -23 +23 @@
 #include<math.h>
 #include "pslib.h"
-// XXX: have Desonia do this correctly.
-#include "../../psLib/src/dataManip/psConstants.h"
 
 // XXX: this is pmFit in pmSubtractBias.c, named psFit here.