Changeset 7903 for trunk/MagicSoft

Timestamp:

08/22/06 08:43:27 (18 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• Makefile (modified) (1 diff)
• Makefile.rules (modified) (1 diff)
• mbadpixels/MBadPixelsCam.cc (modified) (1 diff)
• mbadpixels/MBadPixelsCam.h (modified) (1 diff)

trunk/MagicSoft/Mars/Changelog

@@ -48 +48 @@
      - let condor wait until all jobs are finished and then
        link everything
+
+   * mbadpixels/MBadPixelsCam.[h,cc]:
+     - added a simple function GetNumUnsuitable which can be used
+       as a rule eg. in a filter.
 
 

trunk/MagicSoft/Mars/Makefile

@@ -125 +125 @@
 endif
 
-condor: $(CONDOR)
+rmcondor:
+        rm -f .makcondor.log
+
+condor: rmcondor $(CONDOR)
+        echo Waiting for jobs to finish...
+        condor_wait .makecondor.log
+        rm .makecondor.log
+        make -j2 $(PROGRAMS)
+#       find -name "*/.makecondor.*"
+#       find -maxdepth 2 -name ".makecondor.*" -exec echo {}\\\; cat {}\\\; echo {}\\\; \;
 
 dox: $(SOLIB)

trunk/MagicSoft/Mars/Makefile.rules

@@ -7 +7 @@
 $(CONDOR):
         @echo " Starting make in $(@:.condor=) via condor"
-        (cd $(@:.condor=); (condor_run $(MAKE) &); cd ..;)
+        (echo universe=vanilla; \
+         echo executable=/bin/bash; \
+         echo arguments=-c make; \
+         echo log=../.makecondor.log;    \
+         echo initialdir=$(@:.condor=); \
+         echo getenv=true;     \
+         echo notification=never; \
+         echo queue) | condor_submit > /dev/null
+#       (cd $(@:.condor=); (condor_run $(MAKE) &); cd ..;)
+#         echo output=.makecondor.out; \
+#         echo error=.makecondor.err;  \
 
 $(CLEANERS):

trunk/MagicSoft/Mars/mbadpixels/MBadPixelsCam.cc

@@ -237 +237 @@
             rc++;
     }
+    return rc;
+}
+
+// --------------------------------------------------------------------------
+//
+// Count the number of unsuitable pixels.
+//
+Short_t MBadPixelsCam::GetNumUnsuitable() const
+{
+    const UInt_t n = GetSize();
+
+    Short_t rc = 0;
+    for (UInt_t i=0; i<n; i++)
+        if ((*this)[i].IsUnsuitable())
+            rc++;
+
     return rc;
 }

trunk/MagicSoft/Mars/mbadpixels/MBadPixelsCam.h

@@ -42 +42 @@
     Short_t GetNumUnsuitable(MBadPixelsPix::UnsuitableType_t type, const MGeomCam *geom, Int_t aidx=-1) const;
     Short_t GetNumUnsuitable(MBadPixelsPix::UnsuitableType_t type) const { return GetNumUnsuitable(type, 0); }
+    Short_t GetNumUnsuitable() const;
     Short_t GetNumSuitable(MBadPixelsPix::UnsuitableType_t type, const MGeomCam *geom, Int_t aidx=-1) const;
     Short_t GetNumSuitable(MBadPixelsPix::UnsuitableType_t type) const { return GetNumSuitable(type, 0); }