Index: unk/MagicSoft/include-Classes/MHeaderTrig.cxx
===================================================================
--- /trunk/MagicSoft/include-Classes/MHeaderTrig.cxx	(revision 509)
+++ 	(revision )
@@ -1,55 +1,0 @@
-#include <iostream.h>
-#include "MHeaderTrig.hxx"
-
-
-//==========
-// MHeaderTrig
-//    
-// This class contains the MonteCarlo information
-// of the trigger simulation for the current run.
-// The information is saved only once, whatever the
-// number of events is
- 
-
-
-ClassImp(MHeaderTrig)
-
-
-
-MHeaderTrig::MHeaderTrig() {
-  //
-  //  default constructor
-  //  set all values to zero
-
-  Int_t i;
-
-  topology     = -1 ;
-  multiplicity = -1 ;
-  for(i=0;i<TRIGGER_PIXELS;i++){
-    threshold[i] = -1.0;
-  }
-  
-  TriggerPattern[0]=0;
-  TriggerPattern[1]=0;
-
-}
-
-MHeaderTrig::~MHeaderTrig() {
-  //
-  //  default destructor
-  //
-}
-
-
-void MHeaderTrig::Print(Option_t *Option) {
-  //
-  //  print out the data member on screen
-  //
-
-  cout <<endl << "Monte Carlo Trigger output:" <<endl;
-  cout << " XSTopology Trigger in this run : "<<topology<<endl;
-  cout << " Multiplicity Trigger in this run : "<<multiplicity<<endl;
-  cout << " Trigger Pattern in this run : "<<TriggerPattern[0]<<
-    TriggerPattern[1]<<endl;
-  cout << endl ; 
-}
Index: unk/MagicSoft/include-Classes/MHeaderTrig.hxx
===================================================================
--- /trunk/MagicSoft/include-Classes/MHeaderTrig.hxx	(revision 509)
+++ 	(revision )
@@ -1,66 +1,0 @@
-#ifndef __MHeaderTrig__
-#define __MHeaderTrig__
-
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#include <unistd.h>
-#include <fcntl.h>  
-
-#include <iostream.h>
-#include "TObject.h"
-
-#include "../Simulation/Detector/include-MTrigger/MTriggerDefine.h"
-
-class MHeaderTrig : public TObject {
- private:
-
-  Short_t topology     ;      // Topology of the trigger
-                                   // 0 = N-1 neighbours of one pixel
-                                   // 1 = N neighbours
-                                   // 2 = N closed pack
-  Short_t multiplicity ;      // Pixel multiplicity of trigger configuration
-  Float_t threshold[TRIGGER_PIXELS] ; // Threshold for trigger
-  UInt_t TriggerPattern[2];     // Used to inddentify with 
-                              // RawEvt::Trigger Pattern identification  
-
- public:
-  MHeaderTrig() ;
-
-  ~MHeaderTrig(); 
-
-  void Print(Option_t *);
-  
-  void SetTopology(Short_t nTop) {
-    topology=nTop;
-  }
-
-  void SetMultiplicity(Short_t nMul) {
-    multiplicity=nMul;
-  }
-
-  void SetThreshold(Float_t fthr[]){
-    int i;
-    for(i=0;i<TRIGGER_PIXELS;i++){
-      threshold[i]=fthr[i];
-    }
-  }
-
-  void SetTriggerPattern (UInt_t upi, UInt_t loi){
-
-    if (upi==loi==0) {
-      TriggerPattern[0]= (UInt_t) threshold[0];
-      TriggerPattern[1]= (UInt_t) (100*multiplicity+topology);
-    }
-    else {
-      TriggerPattern[0]=upi;
-      TriggerPattern[1]=loi;
-    }
-  }
-
-  ClassDef(MHeaderTrig, 1)  //Stores Montecarlo Information 
-
-};
-
-#endif
-
Index: unk/MagicSoft/include-Classes/MMcEvt.h
===================================================================
--- /trunk/MagicSoft/include-Classes/MMcEvt.h	(revision 509)
+++ 	(revision )
@@ -1,108 +1,0 @@
-#ifndef __MMcEvt__
-#define __MMcEvt__
-
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#include <unistd.h>
-#include <fcntl.h>  
-
-#include <iostream.h>
-#include "TObject.h"
-
-
-class MMcEvt : public TObject {
- private:
-  UShort_t usPartId;     // Type of particle
-  Float_t fEnergy;       // Energy in GeV
-
-  Float_t fTheta;        // Theta angle of event 
-  Float_t fPhi;          // Phi angle of event 
-
-  Float_t fCoreD;        // Core d pos
-  Float_t fCoreX;        // Core x pos
-  Float_t fCoreY;        // Core y pos
-  Float_t fImpact;       // impact parameter
-
-  UShort_t usPhotIni;      // Initial number of photons
-  UShort_t usPassPhotAtm;  // Passed atmosphere
-  UShort_t usPassPhotRef;  // Passed reflector
-  UShort_t usPassPhotCone; // Passed glas
-  UShort_t usPhotEl    ;   // Passed qe
- 
-
- public:
-  MMcEvt() ;
-  
-  MMcEvt( UShort_t, 
-	  Float_t, Float_t, Float_t, Float_t, Float_t, Float_t, Float_t,
-	  UShort_t, UShort_t, UShort_t, UShort_t, UShort_t ) ; 
-  
-  ~MMcEvt(); 
-
-  void Clear();
-
-  void Fill( UShort_t, 
-	     Float_t, Float_t, Float_t, Float_t, Float_t, Float_t, Float_t,
-	     UShort_t, UShort_t, UShort_t, UShort_t, UShort_t ) ; 
-
-
-  void Print(Option_t *);
-
-
-
-  Short_t GetPartId() const { return usPartId; }       //Get Type of particle
-  Float_t GetEnergy() const { return fEnergy; }        //Get Energy
-
-  Float_t GetTheta() const { return fTheta; }          //Get Theta angle
-  Float_t GetPhi() const { return fPhi ;  }            //Get Phi angle
-
-/*    Float_t GetCoreD() { return fCoreD; }          //Get Core d pos */
-/*    Float_t GetCoreX() { return fCoreX; }          //Get Core x pos */
-/*    Float_t GetCoreY() { return fCoreY; }          //Get Core y pos */
-  Float_t GetImpact() const { return fImpact;}         //Get impact parameter 
-
-/*    Short_t GetPhotIni() { return usPhotIni; }           //Get Initial photons */
-/*    Short_t GetPassPhotAtm() { return usPassPhotAtm;}    //Get Passed atmosphere */
-/*    Short_t GetPassPhotRef() { return usPassPhotRef; }   //Get Passed reflector */
-/*    Short_t GetPassPhotCone() { return usPassPhotCone; } //Get Passed glas */
-/*    Short_t GetPhotEl() { return usPhotEl; }             //Get Passed qe */
-
-
-
- /*  void SetPartId(Short_t PartId)  */
-/*     { usPartId=PartId; }             //Set Type of particle */
-/*   void SetEnergy(Float_t Energy)  */
-/*     { fEnergy=Energy; }              //Set Energy */
- 
-/*   void SetTheta(Float_t Theta)  */
-/*     { fTheta=Theta; }                //Set Theta angle */
-/*   void SetPhi(Float_t Phi)  */
-/*     { fPhi=Phi;  }                   //Set Phi angle */
- 
-/*    void SetCoreD(Float_t CoreD)  */
-/*      { fCoreD=CoreD; }                //Set Core d pos */
-/*    void SetCoreX(Float_t CoreX)  */
-/*      { fCoreX=CoreX; }                //Set Core x pos */
-/*    void SetCoreY(Float_t CoreY )  */
-/*      { fCoreY=CoreY; }                //Set Core y pos */
-/*    void SetImpact(Float_t Impact)  */
-/*      { fImpact=Impact;}               //Set impact parameter */
-  
-/*    void SetPhotIni(Short_t PhotIni)  */
-/*      { usPhotIni=PhotIni; }                 //Set Initial photons */
-/*    void SetPassPhotAtm(Short_t PassPhotAtm)  */
-/*      { usPassPhotAtm=PassPhotAtm;}         //Set Passed atmosphere */
-/*    void SetPassPhotRef(Short_t PassPhotRef)  */
-/*      { usPassPhotRef=PassPhotRef ; }       //Set Passed reflector */
-/*    void SetPassPhotCone(Short_t PhotCon)  */
-/*      { usPassPhotCone=PhotCon; }           //Set Passed glas */
-/*    void SetPhotEl(Short_t PhotEl)  */
-/*      { usPhotEl=PhotEl; }                  //Set Passed qe */
-
-
-  ClassDef(MMcEvt, 1)  //Stores Montecarlo Information 
-
-};
-
-#endif