Changeset 4056 for trunk/MagicSoft/Mars

Timestamp:

05/12/04 18:50:10 (21 years ago)

Author:

rico

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mtemp/mifae

Files:

• Changelog (modified) (1 diff)
• library/MSrcRotate.cc (modified) (4 diffs)
• library/MSrcRotate.h (modified) (2 diffs)
• macros/alpha.C (added)
• macros/plotOptimal.C (added)
• programs/makeHillas.cc (modified) (2 diffs)
• programs/optimizeCuts.cc (modified) (1 diff)
• programs/optimizecuts.datacard (modified) (1 diff)
• programs/srcPos.cc (modified) (1 diff)
• programs/srcpos.datacard (modified) (1 diff)

trunk/MagicSoft/Mars/mtemp/mifae/Changelog

@@ -18 +18 @@
 
                                                  -*-*- END OF LINE -*-*-
+
+
+
+ 2004/05/12: Javier Rico
+   * macros/alpha.C, macros/plotOptimal.C
+     - added
+
+   * library/MSrcRotate.[cc.h]
+     - correct bug in computation of run time for rotation
+        
+   * programs/srcPos.cc
+     - change mjdpos type to Double_t
+        
+        
+        
  2004/05/11: Javier Rico
    * programs/optimizeCuts.cc, programs/optimizecuts.datacard

trunk/MagicSoft/Mars/mtemp/mifae/library/MSrcRotate.cc

@@ -149 +149 @@
       // save the number of events, initial and final times
       fNEvts    = fRunHeader->GetNumEvents();
-      fFirstEvt = fEvtHeader->GetDAQEvtNumber();
       fIniTime  = fRunHeader->GetRunStart();
       fFinTime  = fRunHeader->GetRunEnd();
@@ -164 +163 @@
       cout << "Run number: " << fRunHeader->GetRunNumber() << endl;
       cout << "Number of events: " << fNEvts << endl;
-      cout << "First event: " << fFirstEvt << endl;
       cout << "Initial MJD date: " << fIniTime.GetMjd() << endl;
       cout << "Final MJD   date: " << fFinTime.GetMjd() << endl;
@@ -175 +173 @@
   // FIXME: for the time being, this is computed by assuming constant event rate
   MTime eventTime;
-  Double_t newMJD = fIniTime.GetMjd() + (fFinTime.GetMjd()-fIniTime.GetMjd())*(fEvtHeader->GetDAQEvtNumber()-fFirstEvt)/fNEvts;  
-  eventTime.SetMjd(newMJD);  
-  
+  Double_t newMJD = fIniTime.GetMjd() + (fFinTime.GetMjd()-fIniTime.GetMjd())*fEvtHeader->GetDAQEvtNumber()/fNEvts;  
+  eventTime.SetMjd(newMJD);    
+  MTime refTime;
+  refTime.SetMjd(fRefMJD);
+
   // de-rotate the source position
   const MAstroSky2Local Observation(eventTime, *fObservatory);
-  const MAstroSky2Local RefObservation(fRefMJD, *fObservatory);
+  const MAstroSky2Local RefObservation(refTime, *fObservatory);
+
+#ifdef DEBUG
+  printf("Run:%d, Event:%d, iniMJD=%15.5f, finMJD=%15.5f, fDeltaT=%15.5f, newMJD=%15.5f, fRefMJD=%15.5f, rotation=%15.5f, ref=%15.5f\n",
+         fRunHeader->GetRunNumber(),fEvtHeader->GetDAQEvtNumber(),
+         fIniTime.GetMjd(),fFinTime.GetMjd(),fDeltaT,
+         newMJD,fRefMJD,Observation.RotationAngle(fRA,fDEC),
+         RefObservation.RotationAngle(fRA,fDEC));
+  //  cout << "newMJD=" << newMJD << ", fRefMJD="<<fRefMJD<<", rotation="<<Observation.RotationAngle(fRA,fDEC)<<", ref="<<RefObservation.RotationAngle(fRA,fDEC)<< endl;
+#endif
+
   Double_t rotationAngle = Observation.RotationAngle(fRA,fDEC)-RefObservation.RotationAngle(fRA,fDEC);
   
@@ -186 +196 @@
   Float_t s = TMath::Sin(rotationAngle);
   // perform a rotation of -rotationAngle to move the source back to the "initial" position
-  Float_t newX = c*fSrcPos->GetX()+s*fSrcPos->GetY();
-  Float_t newY = -s*fSrcPos->GetX()+c*fSrcPos->GetY();
+  Float_t newX = c*fSrcPos->GetX()-s*fSrcPos->GetY();
+  Float_t newY = s*fSrcPos->GetX()+c*fSrcPos->GetY();
 
 #ifdef DEBUG

trunk/MagicSoft/Mars/mtemp/mifae/library/MSrcRotate.h

@@ -18 +18 @@
 {
 private:
-    MSrcPosCam*    fSrcPos;      //!  Pointer to the source position
-    MDCA*          fDCA;         //!  Pointer to the MDCA object
-    MRawEvtHeader* fEvtHeader;   //!  Pointer to the event header
-    MRawRunHeader* fRunHeader;   //!  Pointer to the run header
-    MObservatory*  fObservatory; //!  Pointer to the MObservatory    
+    MSrcPosCam*    fSrcPos;      //  Pointer to the source position
+    MDCA*          fDCA;         //  Pointer to the MDCA object
+    MRawEvtHeader* fEvtHeader;   //  Pointer to the event header
+    MRawRunHeader* fRunHeader;   //  Pointer to the run header
+    MObservatory*  fObservatory; //  Pointer to the MObservatory    
 
     TString     fSrcPosName;
@@ -31 +31 @@
     Double_t   fRefMJD;      //  [MJ date] reference time for rotation
     UInt_t     fNEvts;       //  Number of events in file
-    UInt_t     fFirstEvt;    //  Event index for first event in file
     MTime      fIniTime;     //  Run initial time 
     MTime      fFinTime;     //  Run final time 

trunk/MagicSoft/Mars/mtemp/mifae/programs/makeHillas.cc

@@ -141 +141 @@
     return;
 
-  //  MPedestalCam pedcam = pedloop.GetPedestalCam();
-  
   /*****************************/
   /* SECOND LOOP: CALIBRATION  */
@@ -155 +153 @@
   if (!calloop.Process(pedloop.GetPedestalCam()))
     return;
-
-  //  MCalibrationChargeCam calcam = calloop.GetCalibrationCam();
 
   /************************************************************************/

trunk/MagicSoft/Mars/mtemp/mifae/programs/optimizeCuts.cc

@@ -131 +131 @@
   sprintf(evecut,"event%%%d==0",onRate);
   sprintf(gencut,"size>%f && dist>%f && dist<%f",sizecut,lowdistcut,uppdistcut);
-  cout << "General cut " << gencut << "(" << evecut << ") for on-data" << endl;
+  cout << "General cut " << gencut << " (" << evecut << " for on-data)" << endl;
 
   // loop on widht and length cuts

trunk/MagicSoft/Mars/mtemp/mifae/programs/optimizecuts.datacard

@@ -7 +7 @@
 
 // Input file name pattern (On data)
-ONFILES  /mnt/users/jrico/magic/mars/Mars_Standard02/mtemp/mifae/hillas/mrk20040215OnRotateB.root
+ONFILES  /mnt/users/jrico/magic/mars/Mars_Standard02/mtemp/mifae/hillas/mrk20040215OnRotateNoCalB.root
 
 // Input file name pattern (Off data)
-OFFFILES  /mnt/users/jrico/magic/mars/Mars_Standard02/mtemp/mifae/hillas/mrk20040215OffRotateA-C.root
+OFFFILES  /mnt/users/jrico/magic/mars/Mars_Standard02/mtemp/mifae/hillas/mrk20040215OffRotateNoCalA-C.root
 
 // output file name
-OUTFILE  ./optimizePrueba.root
+OUTFILE  ./optimize_fine.out
 
-// Previous cuts (size in size units, distance in deg)
-SIZECUT  1800
+// Preliminar cuts (size in size units, distance in deg)
+SIZECUT  2000
 DISTCUTS 0.2 1.1
 
 // Length initial, final and step values
-LENGTHCUTS 0.01 0.3 0.005 
+LENGTHCUTS 0.1 0.4 0.005 
 
 // Width initial, final and step values
-WIDTHCUTS 0.01 0.3 0.005 
+WIDTHCUTS 0.0 0.3 0.005 
 
 

trunk/MagicSoft/Mars/mtemp/mifae/programs/srcPos.cc

@@ -44 +44 @@
 Float_t  xsrcpos=0.;
 Float_t  ysrcpos=0.;
-Float_t  mjdpos=53050;
+Double_t mjdpos=53050;
 Bool_t   kRotate=1;
 Bool_t   kSrcPolicy=kTRUE;

trunk/MagicSoft/Mars/mtemp/mifae/programs/srcpos.datacard

@@ -1 +1 @@
 
 // Maximun number of on and off events to be processed)
-NEVENTS 9999999
+NEVENTS 20000
 
 // Input file name pattern
-INPUTFILES  /mnt/users/jrico/magic/mars/Mars_Standard02/mtemp/mifae/hillas/mrk20040215OnB.root
+INPUTFILES   /mnt/users/jrico/magic/mars/Mars_Standard02/mtemp/mifae/hillas/mrk20040215OnNoCalB.root
 
 // output file name