Changeset 9368 for trunk/MagicSoft

Timestamp:

03/01/09 21:40:44 (16 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Makefile.rules (modified) (2 diffs)
• ceres.rc (modified) (1 diff)
• mgeom/MGeom.cc (added)
• mgeom/MGeom.h (added)
• mgeom/MGeomRectangle.cc (added)
• mgeom/MGeomRectangle.h (added)

trunk/MagicSoft/Mars/Makefile.rules

@@ -37 +37 @@
         -c $(INCLUDES) $(DEFINES) $(HEADERS) $(CINT)Incl.h $(CINT)LinkDef.h 
 
-%.d:    
+%.d:
         @echo " - Generating dependencies" $@
-        $(ROOTSYS)/bin/rmkdepend -f- -Y -w 3000 -- $(INCLUDES) -- $(SRCFILES) -- $(PROGRAMS:=.cc) 2> /dev/null | \
-         sed 's/^\(.*\).o:/$@ \1.o:/' > $@
+        rmkdepend -f- -Y -w 3000 -- $(INCLUDES) -- $(SRCFILES) -- $(PROGRAMS:=.cc) 2> /dev/null | \
+        sed 's/^\(.*\).o:/$@ \1.o:/' > $@
         echo "$@: Makefile" >> $@
 
@@ -104 +104 @@
 
 diff:
-        @cvs diff | grep -v "^? " > mars.diff
+        @cvs -d diff | grep -v "^? " > mars.diff
 
 zdiff:

trunk/MagicSoft/Mars/ceres.rc

@@ -117 +117 @@
 MSimBundlePhotons.FileName: mreflector/dwarf-apdmap.txt
 
+# Set the APD type (1: 30x30 <default>, 2: 60x60)
+#MSimAPD.Type: 1
+
 # --- MAGIC ---
 #MGeomCam.Constructor:   MGeomCamMagic(17.0)