Changeset 34403 for trunk/psModules/src/objects/mksource.pl

Timestamp:

Sep 5, 2012, 4:16:36 PM (14 years ago)

Author:

eugene

Message:

adding SATSTAR profile code (but keeping it disabled for now); adding PS1_SV2 and PS1_DV3, finalizing PS1_V4; PLTSCALE now includes a sign for the image sky parity

Location:

trunk/psModules

Files:

• . (modified) (1 prop)
• src/objects/mksource.pl (modified) (6 diffs)

trunk/psModules/src/objects/mksource.pl

@@ -14 +14 @@
 # validate the cmfmode
 
-# see if we can add in PS1_DV* and PS1_SV* as well...
-%cmfmodes = ("PS1_V1", 1,
-             "PS1_V2", 2,
-             "PS1_V3", 3,
-             "PS1_V4", 4,
+# keep the series (V1,SV1,DV1) separate)
+%cmfmodes_v = ("PS1_V1", 1,
+               "PS1_V2", 2,
+               "PS1_V3", 3,
+               "PS1_V4", 4,
+    );
+%cmfmodes_dv = ("PS1_DV1", 1,
+                "PS1_DV2", 2,
+                "PS1_DV3", 3,
+    );
+%cmfmodes_sv = ("PS1_SV1", 1,
+                "PS1_SV2", 2,
     );
 
@@ -118 +125 @@
         if ($rule =~ m|^>=|) {
             print ">= rule: $rule\n" if $DEBUG;
-            if ($cmfmodes{$cmfmode} == 0) { next; }
+            # find the cmfmode series (v, dv, sv)
             $realrule = substr($rule,2);
-            $thisLevel = $cmfmodes{$realrule};
-            $myLevel = $cmfmodes{$cmfmode};
+            %series = &cmf_series ($realrule);
+            if (! %series) { next; }
+            if ($series{$cmfmode} == 0) { next; }
+            $thisLevel = $series{$realrule};
+            $myLevel = $series{$cmfmode};
             print "levels: $cmfmode, $realrule, $myLevel, $thisLevel\n" if $DEBUG;
             if ($myLevel >= $thisLevel) { $keepLine = 1; }
@@ -130 +140 @@
         if ($rule =~ m|^>|) {
             print "> rule: $rule\n" if $DEBUG;
-            if ($cmfmodes{$cmfmode} == 0) { next; }
+            # find the cmfmode series (v, dv, sv)
             $realrule = substr($rule,1);
-            $thisLevel = $cmfmodes{$realrule};
-            $myLevel = $cmfmodes{$cmfmode};
+            %series = &cmf_series ($realrule);
+            if (! %series) { next; }
+            if ($series{$cmfmode} == 0) { next; }
+            $thisLevel = $series{$realrule};
+            $myLevel = $series{$cmfmode};
             print "levels: $cmfmode, $realrule, $myLevel, $thisLevel\n" if $DEBUG;
             if ($myLevel > $thisLevel) { $keepLine = 1; }
@@ -142 +155 @@
         if ($rule =~ m|^<=|) {
             print "<= rule: $rule\n" if $DEBUG;
-            if ($cmfmodes{$cmfmode} == 0) { next; }
+            # find the cmfmode series (v, dv, sv)
             $realrule = substr($rule,2);
-            $thisLevel = $cmfmodes{$realrule};
-            $myLevel = $cmfmodes{$cmfmode};
+            %series = &cmf_series ($realrule);
+            if (! %series) { next; }
+            if ($series{$cmfmode} == 0) { next; }
+            $thisLevel = $series{$realrule};
+            $myLevel = $series{$cmfmode};
             print "levels: $cmfmode, $realrule, $myLevel, $thisLevel\n" if $DEBUG;
             if ($myLevel <= $thisLevel) { $keepLine = 1; }
@@ -154 +170 @@
         if ($rule =~ m|^<|) {
             print "< rule: $rule\n" if $DEBUG;
-            if ($cmfmodes{$cmfmode} == 0) { next; }
+            # find the cmfmode series (v, dv, sv)
             $realrule = substr($rule,1);
-            $thisLevel = $cmfmodes{$realrule};
-            $myLevel = $cmfmodes{$cmfmode};
+            %series = &cmf_series ($realrule);
+            if (! %series) { next; }
+            if ($series{$cmfmode} == 0) { next; }
+            $thisLevel = $series{$realrule};
+            $myLevel = $series{$cmfmode};
             print "levels: $cmfmode, $realrule, $myLevel, $thisLevel\n" if $DEBUG;
             if ($myLevel < $thisLevel) { $keepLine = 1; }
@@ -174 +193 @@
 
 exit 0;
+
+sub cmf_series {
+
+    my ($rule) = $_[0];
+
+    if ($cmfmodes_v{$rule})  { return %cmfmodes_v;  }
+    if ($cmfmodes_sv{$rule}) { return %cmfmodes_sv; }
+    if ($cmfmodes_dv{$rule}) { return %cmfmodes_dv; }
+    return 0;
+}