Index: trunk/MagicSoft/Mars/Changelog
===================================================================
--- trunk/MagicSoft/Mars/Changelog	(revision 3499)
+++ trunk/MagicSoft/Mars/Changelog	(revision 3500)
@@ -19,10 +19,9 @@
                                                  -*-*- END OF LINE -*-*-
 
-
-
  2004/03/15: Wolfgang Wittek
 
    * mastro/MObservatory.[h,cc]
      - remove bugs in RotationAngle(theta, phi, sin, cos)
+
 
 
@@ -47,4 +46,19 @@
      - added fLut.Set to FixSize and resize fLut by a factor of 2
        instead of +1 which acelerates creation of all pixels a lot
+
+   * mbadpixels/MBadPixelsPix.cc:
+     - fixed a typo
+
+   * mfilter/MFSoftwareTrigger.cc:
+     - made statistics output meaning independant of usage of filter!
+
+   * mhbase/MFill.[h,cc]:
+     - added possibility to give tab a different name
+
+   * mhist/MHCamera.cc:
+     - fixed a bug when determin scale for same-option
+
+   * mjobs/MJCalibration.cc:
+     - changed tab names for MFillH
 
 
Index: trunk/MagicSoft/Mars/mastro/MAstroCamera.cc
===================================================================
--- trunk/MagicSoft/Mars/mastro/MAstroCamera.cc	(revision 3499)
+++ trunk/MagicSoft/Mars/mastro/MAstroCamera.cc	(revision 3500)
@@ -129,5 +129,5 @@
         */
 
-    v.Set(spot(1), -spot(0));
+    v.Set(spot(0), spot(1));
 
     const Float_t max = fGeom->GetMaxRadius()*0.70;
@@ -235,4 +235,5 @@
     rot.RotateZ(-zdaz0.Phi());
     rot.RotateY(-zdaz0.Theta());
+    rot.RotateZ(-TMath::Pi()/2); // align coordinate system
 
     DrawNet(rot);
@@ -267,5 +268,5 @@
             if (hasdot)
             {
-                TMarker *m=new TMarker(spot(1), -spot(0), 1);
+                TMarker *m=new TMarker(spot(0), spot(1), 1);
                 m->SetBit(kCannotPick);
                 m->SetBit(kCanDelete);
@@ -275,8 +276,8 @@
             }
             if (h)
-                h->Fill(spot(1), -spot(0), pow(10, -mag/2.5));
+                h->Fill(spot(0), spot(1), pow(10, -mag/2.5));
 
             if (usecam)
-                camera->Fill(spot(1), -spot(0), pow(10, -mag/2.5));
+                camera->Fill(spot(0), spot(1), pow(10, -mag/2.5));
 
             num++;
@@ -286,5 +287,5 @@
         mean *= 1./num;
 
-        DrawStar(mean(1), -mean(0), *radec, !hasmean, Form("x=%.1fmm y=%.1fmm", mean(1), -mean(0)));
+        DrawStar(mean(0), mean(1), *radec, !hasmean, Form("x=%.1fmm y=%.1fmm", mean(0), mean(1)));
     }
 }
Index: trunk/MagicSoft/Mars/mbadpixels/MBadPixelsPix.cc
===================================================================
--- trunk/MagicSoft/Mars/mbadpixels/MBadPixelsPix.cc	(revision 3499)
+++ trunk/MagicSoft/Mars/mbadpixels/MBadPixelsPix.cc	(revision 3500)
@@ -49,5 +49,5 @@
 {
     fName  = name  ? name  : "MBadPixelsPix";
-    fTitle = title ? title : "Container storeing bad pixel information for a single pixel";
+    fTitle = title ? title : "Container storing bad pixel information for a single pixel";
 
     fInfo[1] = 0;
Index: trunk/MagicSoft/Mars/mfilter/MFSoftwareTrigger.cc
===================================================================
--- trunk/MagicSoft/Mars/mfilter/MFSoftwareTrigger.cc	(revision 3499)
+++ trunk/MagicSoft/Mars/mfilter/MFSoftwareTrigger.cc	(revision 3500)
@@ -162,13 +162,12 @@
     *fLog << dec << setfill(' ');
 
+    *fLog << " " << setw(7) << fCut[0] << " (" << setw(3) ;
+    *fLog << (int)(fCut[0]*100/GetNumExecutions());
+    *fLog << "%) Evts fullfilled software trigger";
+    *fLog << " (NumPhotons>=" << fNumMinPhotons << ", NumNeighbors>=";
+    *fLog << (int)fNumNeighbors << ")" << endl;
     *fLog << " " << setw(7) << fCut[1] << " (" << setw(3) ;
-    *fLog << (int)(fCut[1]*100/GetNumExecutions()) ;
-    *fLog << "%) Evts skipped due to: Software trigger not fullfilled" ;
-    *fLog << " (NumPhotons>=" << fNumMinPhotons << ", NumNeighbors>=";
-    *fLog << fNumNeighbors << ")" << endl;
-
-    *fLog << " " << fCut[0] << " (" << (int)(fCut[0]*100/GetNumExecutions()) ;
-    *fLog << "%) Evts survived software trigger!" << endl;
-    *fLog << endl;
+    *fLog << (int)(fCut[1]*100/GetNumExecutions());
+    *fLog << "%) Evts didn't fullfill software trigger."  << endl;
 
     return kTRUE;
Index: trunk/MagicSoft/Mars/mhbase/MFillH.cc
===================================================================
--- trunk/MagicSoft/Mars/mhbase/MFillH.cc	(revision 3499)
+++ trunk/MagicSoft/Mars/mhbase/MFillH.cc	(revision 3500)
@@ -356,5 +356,5 @@
         return kTRUE;
 
-    fCanvas = &fDisplay->AddTab(fH->GetName());
+    fCanvas = &fDisplay->AddTab(fNameTab.IsNull() ? fH->GetName() : fNameTab.Data());
     fH->Draw();
 
Index: trunk/MagicSoft/Mars/mhbase/MFillH.h
===================================================================
--- trunk/MagicSoft/Mars/mhbase/MFillH.h	(revision 3499)
+++ trunk/MagicSoft/Mars/mhbase/MFillH.h	(revision 3500)
@@ -28,4 +28,5 @@
     MH* fH;                       // Pointer to the MH container to get filled
     TString fHName;               // Name to a MH container to get filled
+    TString fNameTab;
 
     MWeight *fWeight;             // Pointer to the container storing a weight
@@ -54,4 +55,6 @@
     ~MFillH();
 
+    void SetNameTab(const char *n="") { fNameTab = n; }
+
     void SetRuleForIdx(const TString rule);
     void SetRuleForIdx(MData *rule);
Index: trunk/MagicSoft/Mars/mhist/MHCamera.cc
===================================================================
--- trunk/MagicSoft/Mars/mhist/MHCamera.cc	(revision 3499)
+++ trunk/MagicSoft/Mars/mhist/MHCamera.cc	(revision 3500)
@@ -626,5 +626,5 @@
     // necessary for 'same' option and allows distorted images of the camera!
     const Float_t maxr = (1-fGeomCam->GetConvMm2Deg())*fGeomCam->GetMaxRadius()/2;
-    const Float_t conv = issame ||
+    const Float_t conv = !issame ||
         gPad->GetX1()<-maxr || gPad->GetY1()<-maxr ||
         gPad->GetX2()> maxr || gPad->GetY2()>maxr ? 1 : fGeomCam->GetConvMm2Deg();
Index: trunk/MagicSoft/Mars/mjobs/MJCalibration.cc
===================================================================
--- trunk/MagicSoft/Mars/mjobs/MJCalibration.cc	(revision 3499)
+++ trunk/MagicSoft/Mars/mjobs/MJCalibration.cc	(revision 3500)
@@ -543,7 +543,11 @@
     MCalibrationChargeCalc   calcalc;
 
-    MFillH fillpin  ("MHCalibrationChargePINDiode", "MExtractedSignalPINDiode");
-    MFillH fillblind("MHCalibrationChargeBlindPix", "MExtractedSignalBlindPixel");
-    MFillH fillcam  ("MHCalibrationChargeCam",      "MExtractedSignalCam");
+    MFillH fillpin("MHCalibrationChargePINDiode", "MExtractedSignalPINDiode");
+    MFillH fillbnd("MHCalibrationChargeBlindPix", "MExtractedSignalBlindPixel");
+    MFillH fillcam("MHCalibrationChargeCam",      "MExtractedSignalCam");
+    fillpin.SetNameTab("PINDiode");
+    fillbnd.SetNameTab("BlindPix");
+    fillcam.SetNameTab("Charge");
+
     // 
     // Apply a filter against cosmics
@@ -565,5 +569,5 @@
     tlist.AddToList(&fillcam);
     tlist.AddToList(&fillpin);
-    tlist.AddToList(&fillblind);
+    tlist.AddToList(&fillbnd);
     tlist.AddToList(&calcalc);