Changeset 8758 for trunk

Timestamp:

10/15/07 15:50:00 (17 years ago)

Author:

hoehne

Message:

*** empty log message ***

Location:

trunk/MagicSoft

Files:

• Mars/Changelog (modified) (1 diff)
• Mars/datacenter/scripts/fillcamera (added)
• Mars/datacenter/scripts/mcsequences (modified) (3 diffs)
• Mars/datacenter/scripts/processmcsequences (modified) (1 diff)
• include-Classes/MMcFormat/MMcCorsikaRunHeader.h (modified) (1 diff)

trunk/MagicSoft/Mars/Changelog

@@ -18 +18 @@
 
                                                  -*-*- END OF LINE -*-*-
+
+ 2007/10/15 Daniel Hoehne
+
+   * datacenter/macros/fillcamera.C:
+     - included more parameters to fill into MCDB
+     - introduced discrimination of P/C and D files
+     - included linking of camera files
+
+   * datacenter/scripts/fillcamera:
+     - added
+
+   * datacenter/scripts/mcsequences:
+     - included handling of more than two P/C runs per rawfile directory
+     - building sequences based on rawfile dirs and MC epochs
+
+   * datacenter/scripts/processmcsequences:
+     - included MC epochs for finding the right callisto.rc
+
+   * mmc/MMcCorsikaRunHeader.h:
+   - included GetViewConeAngle[Inner,Outer], GetAtmosphericModel
+
+
 
  2007/10/13 Thomas Bretz

trunk/MagicSoft/Mars/datacenter/scripts/mcsequences

@@ -40 +40 @@
 set -C
 
-scriptlog=$runlogpath/$program`date +%F`.log
+scriptlog=$runlogpath/$program-$datetime.log
 date >> $scriptlog 2>&1
 
@@ -48 +48 @@
 
 # find montecarlo directories, build one sequence per directory and write sequence file
-printprocesslog "INFO building one sequence per mcdirectory"
+printprocesslog "INFO building one sequence per mcdirectory and epoch"
 dirs=`find $mcrawpath -type d`
 for dir in ${dirs[@]}
 do 
-   cont=`echo $dir | cut -d/ -f6`
+#   cont=`echo $dir | cut -d/ -f6`
+   cont=`echo $dir | cut -d/ -f10`
    if [ "$cont" == "" ]
    then
@@ -58 +59 @@
    fi
    echo $dir >> $scriptlog 2>&1
-   files=`ls $dir`
-   calfile=`find $dir -name *_C_*`
-   pedfile=`find $dir -name *_P_*`
-   calrun=`echo $calfile | cut -d_ -f2`
-   pedrun=`echo $pedfile | cut -d_ -f2`
-   datruns=`find $dir -name *_D_* | cut -d_ -f2 | tr "\n" " "`
-# workaround due to 5digit runnumber for data with runnumber < 35487
-#   firstrun=`echo $datruns | cut -c 0-8`
-   firstrun=`echo $datruns | cut -c 0-5 | sed -e 's/^0//g' -e 's/^0//g' -e 's/^0//g' -e 's/^0//g'`
-   date=`echo $dir | cut -c 22-31 | sed -e 's/\//-/g'`
    
-# workaround due to 5digit runnumber for data with runnumber < 35487
-#   no=`echo $firstrun | cut -c 0-4`
-   no=`printf %08d $firstrun | cut -c 0-4`
-   no2=`printf %08d $firstrun`
-   sequpath=$mcsequpath/$no
-   makedir $sequpath >> $scriptlog 2>&1
-#   sequfile=$sequpath/sequence$firstrun.txt
-   sequfile=$sequpath/sequence$no2.txt
-   echo "writing sequfile "$sequfile >> $scriptlog 2>&1
-   printprocesslog "INFO writing sequencefile $sequfile"
-   
-   echo "Sequence:        $firstrun" >| $sequfile
-   echo "Night:           $date" >> $sequfile
-   echo "" >> $sequfile
-   echo "CalRuns:         $calrun" >> $sequfile
-   echo "PedRuns:         $pedrun" >> $sequfile
-   echo "DatRuns:         $datruns" >> $sequfile
-   echo "" >> $sequfile
-   echo "MonteCarlo: Yes" >> $sequfile
-   echo "" >> $sequfile
+   epochs=`ls -l $mcpath/camera | cut -c 52-70`
+   for epoch in ${epochs[@]}
+   do
+      echo $epoch >> $scriptlog 2>&1
+      calfile=`find $dir -lname *$epoch*.root | grep "_C_"`
+      pedfile=`find $dir -lname *$epoch*.root | grep "_P_"`
+#      datfiles=`find $dir -lname '*$epoch*.root' | grep "_D_"`
+      
+      calrun=`echo $calfile | cut -d_ -f2`
+      pedrun=`echo $pedfile | cut -d_ -f2`
+      datruns=`find $dir -lname *$epoch*.root | grep "_D_" | cut -d_ -f2 | tr "\n" " "`
+      # workaround due to 5digit runnumber for data with runnumber < 35487
+      firstrun=`echo $datruns | cut -c 0-8`
+      #   firstrun=`echo $datruns | cut -c 0-5 | sed -e 's/^0//g' -e 's/^0//g' -e 's/^0//g' -e 's/^0//g'`
+#      date=`echo $dir | cut -c 28-37 | sed -e 's/\//-/g'`
+      # for tests
+      date=`echo $dir | cut -c 57-66 | sed -e 's/\//-/g'`
+      
+      # workaround due to 5digit runnumber for data with runnumber < 35487
+      no=`echo $firstrun | cut -c 0-4`
+      #   no=`printf %08d $firstrun | cut -c 0-4`
+      #   no2=`printf %08d $firstrun`
+      sequpath=$mcsequpath/$no
+      makedir $sequpath >> $scriptlog 2>&1
+      sequfile=$sequpath/sequence$firstrun.txt
+      #   sequfile=$sequpath/sequence$no2.txt
+      echo "writing sequfile "$sequfile >> $scriptlog 2>&1
+      printprocesslog "INFO writing sequencefile $sequfile"
+      
+      echo "Sequence:        $firstrun" >| $sequfile
+      echo "Night:           $date" >> $sequfile
+      echo "Epoch:           $epoch" >> $sequfile
+      echo "" >> $sequfile
+      echo "CalRuns:         $calrun" >> $sequfile
+      echo "PedRuns:         $pedrun" >> $sequfile
+      echo "DatRuns:         $datruns" >> $sequfile
+      echo "" >> $sequfile
+      echo "MonteCarlo: Yes" >> $sequfile
+      echo "" >> $sequfile
+   done
 done
 

trunk/MagicSoft/Mars/datacenter/scripts/processmcsequences

@@ -59 +59 @@
    no=`echo $sequno | cut -c 0-4`
    date=`grep Night $sequfile | cut -c 18-29 | sed -e 's/-/\//g'`
+   muxcheck=`grep Epoch $sequfile | cut -c 18-32`
+   case $muxcheck in
+      "MC_up_to_April06")
+      callistorc=$setuppath/callisto/callisto.rc
+      ;;
+      "MC_old")
+      callistorc=$setuppath/callisto/callisto.rc
+      ;;
+      "MC_April_May06")
+      callistorc=$setuppath/callisto/callisto.rc
+      ;;
+      "MC_post_June06")
+      callistorc=$setuppath/callisto/callisto.rc
+      ;;
+      "MC_MuxFADCs")
+      callistorc=$setuppath/callisto/callisto_mux.rc
+      ;;
+      "MC_MuxFADCs_NEW")
+      callistorc=$setuppath/callisto/callisto_mux.rc
+      ;;
+      *)
+      echo "No epoch found"
+      printprocesslog "ERROR no epoch found in $sequfile for setting the right callisto.rc, using standard callisto.rc, epoch: $epoch"
+      finish >> $scriptlog 2>&1
+      ;;
+   esac
+      
    caloutpath=$mccalpath/$no/$sequno
    makedir $caloutpath >> $scriptlog 2>&1

trunk/MagicSoft/include-Classes/MMcFormat/MMcCorsikaRunHeader.h

@@ -98 +98 @@
     Float_t GetWobbleMode() const { return fWobbleMode; }
     Float_t GetCorsikaVersion() const { return fCorsikaVersion; }
+    Float_t GetViewconeAngleInner() const { return fViewconeAngles[0]; }
+    Float_t GetViewconeAngleOuter() const { return fViewconeAngles[1]; }
+    Float_t GetAtmosphericModel() const { return fAtmosphericModel; }
 
     Int_t GetNumCT() const { return fNumCT; }