Index: trunk/MagicSoft/Mars/datacenter/db/magicdefs.php =================================================================== --- trunk/MagicSoft/Mars/datacenter/db/magicdefs.php (revision 7506) +++ trunk/MagicSoft/Mars/datacenter/db/magicdefs.php (revision 7507) @@ -171,4 +171,7 @@ "fArrTimeRmsInner" => "Rms
ArrT
In", "fArrTimeRmsOuter" => "Rms
ArrT
Out", + "fMeanSignalInner" => "Sign
In", + "fMeanSignalOuter" => "Sign
Out", + "fPulsePosMean" => "Puls
Pos", "fConvFactorInner" => "Conv
In", "fConvFactorOuter" => "Conv
Out", @@ -266,4 +269,7 @@ $alias["fArrTimeRmsInner"] => "1", $alias["fArrTimeRmsOuter"] => "1", + $alias["fMeanSignalInner"] => "1", + $alias["fMeanSignalOuter"] => "1", + $alias["fPulsePosMean"] => "1", $alias["fConvFactorInner"] => "1", $alias["fConvFactorOuter"] => "1", @@ -403,4 +409,7 @@ "fArrTimeRmsInner" => "Calibration.fArrTimeRmsInner", "fArrTimeRmsOuter" => "Calibration.fArrTimeRmsOuter", + "fMeanSignalInner" => "Calibration.fMeanSignalInner", + "fMeanSignalOuter" => "Calibration.fMeanSignalOuter", + "fPulsePosMean" => "Calibration.fPulsePosMean", "fConvFactorInner" => "Calibration.fConvFactorInner", "fConvFactorOuter" => "Calibration.fConvFactorOuter", Index: trunk/MagicSoft/Mars/datacenter/db/querycal.php =================================================================== --- trunk/MagicSoft/Mars/datacenter/db/querycal.php (revision 7506) +++ trunk/MagicSoft/Mars/datacenter/db/querycal.php (revision 7507) @@ -85,4 +85,13 @@ $_GET["fArrTimeRmsOuter"]=$first?"On":""; + if (empty($_GET["fMeanSignalInner"])) + $_GET["fMeanSignalInner"]=$first?"Off":""; + + if (empty($_GET["fMeanSignalOuter"])) + $_GET["fMeanSignalOuter"]=$first?"Off":""; + + if (empty($_GET["fPulsePosMean"])) + $_GET["fPulsePosMean"]=$first?"Off":""; + if (empty($_GET["fConvFactorInner"])) $_GET["fConvFactorInner"]=$first?"On":""; @@ -104,17 +113,15 @@ CheckBox("fUnreliableInner", "Unreliable inner"); CheckBox("fUnreliableOuter", "Unreliable outer"); - - printf(" \n"); - CheckBox("fIsolatedInner", "Isolated inner"); CheckBox("fIsolatedOuter", "Isolated outer"); + + printf(" \n"); + CheckBox("fIsolatedMaxCluster", "IsolatedMaxCluster"); - - printf(" \n"); - CheckBox("fArrTimeMeanInner", "ArrTimeMean inner "); CheckBox("fArrTimeMeanOuter", "ArrTimeMean outer "); CheckBox("fArrTimeRmsInner", "ArrTimeRms inner "); CheckBox("fArrTimeRmsOuter", "ArrTimeRms outer "); + CheckBox("fPulsePosMean", "Mean PulsePos"); printf(" \n"); @@ -124,4 +131,6 @@ CheckBox("fMeanPedRmsInner", "MeanPedRms inner"); CheckBox("fMeanPedRmsOuter", "MeanPedRms outer"); + CheckBox("fMeanSignalInner", "MeanSignal inner"); + CheckBox("fMeanSignalOuter", "MeanSignal outer"); printf(" \n"); Index: trunk/MagicSoft/Mars/datacenter/db/sequence.php =================================================================== --- trunk/MagicSoft/Mars/datacenter/db/sequence.php (revision 7506) +++ trunk/MagicSoft/Mars/datacenter/db/sequence.php (revision 7507) @@ -18,5 +18,5 @@ $query0 .= " fCallisto, fFillCallisto, ";//21,22 $query0 .= " fStar, fFillStar, ";//23,24 - //calibration (25-39) + //calibration (25-42) $query0 .= " fUnsuitableInner, fUnsuitableOuter, ";//25,26 $query0 .= " fUnreliableInner, fUnreliableOuter, ";//27,28 @@ -26,11 +26,13 @@ $query0 .= " fConvFactorInner, fConvFactorOuter, ";//36,37 $query0 .= " fMeanPedRmsInner, fMeanPedRmsOuter, ";//38,39 - //myon,star (40-47) - $query0 .= " fPSF, fRatio, fMuonRate, ";//40,41,42 - $query0 .= " fMuonNumber, fEffOnTime, fDataRate, ";//43,44,45 - $query0 .= " fMaxHumidity, fMeanNumberIslands, ";//46,47 - $query0 .= " CONCAT('cal-log') as 'CalLink', ";//48 - $query0 .= " CONCAT('star-log') as 'StarLink', ";//49 - $query0 .= " CONCAT('', 'sequ-file') as 'SequLink' ";//50 + $query0 .= " fMeanSignalInner, fMeanSignalOuter, ";//40,41 + $query0 .= " fPulsePosMean, ";//42 + //myon,star (43-51) + $query0 .= " fPSF, fRatio, fMuonRate, ";//43,44,45 + $query0 .= " fMuonNumber, fEffOnTime, fDataRate, ";//46,47,48 + $query0 .= " fMaxHumidity, fMeanNumberIslands, fInhomogeneity, ";//49,50,51 + $query0 .= " CONCAT('cal-log') as 'CalLink', ";//52 + $query0 .= " CONCAT('star-log') as 'StarLink', ";//53 + $query0 .= " CONCAT('', 'sequ-file') as 'SequLink' ";//54 $query0 .= " FROM Sequences "; @@ -248,15 +250,19 @@ $meanpedrmsi=mysql_result($result0, $i, 38); $meanpedrmso=mysql_result($result0, $i, 39); - $psf=mysql_result($result0, $i, 40); - $ratio=mysql_result($result0, $i, 41); - $muonrate=mysql_result($result0, $i, 42); - $muonnum=mysql_result($result0, $i, 43); - $effontime=mysql_result($result0, $i, 44); - $datarate=mysql_result($result0, $i, 45); - $maxhum=mysql_result($result0, $i, 46); - $meannumislands=mysql_result($result0, $i, 47); - $callink=mysql_result($result0, $i, 48); - $starlink=mysql_result($result0, $i, 49); - $sequlink=mysql_result($result0, $i, 50); + $meansignali=mysql_result($result0, $i, 40); + $meansignalo=mysql_result($result0, $i, 41); + $pulsposmean=mysql_result($result0, $i, 42); + $psf=mysql_result($result0, $i, 43); + $ratio=mysql_result($result0, $i, 44); + $muonrate=mysql_result($result0, $i, 45); + $muonnum=mysql_result($result0, $i, 46); + $effontime=mysql_result($result0, $i, 47); + $datarate=mysql_result($result0, $i, 48); + $maxhum=mysql_result($result0, $i, 49); + $meannumislands=mysql_result($result0, $i, 50); + $inhom=mysql_result($result0, $i, 51); + $callink=mysql_result($result0, $i, 52); + $starlink=mysql_result($result0, $i, 53); + $sequlink=mysql_result($result0, $i, 54); printf(""); @@ -416,4 +422,11 @@ printf(" %s \n", $meanpedrmsi); printf(" %s \n", $meanpedrmso); + printf(" "); + printf(" mean signal\n"); + printf(" %s \n", $meansignali); + printf(" %s \n", $meansignalo); + printf(" "); + printf(" mean pulse pos\n"); + printf(" %s \n", $pulsposmean); printf(" "); printf(" "); @@ -426,5 +439,5 @@ printf(" "); printf(" "); - printf(" \n"); + printf(" \n"); printf(" "); printf(" \n"); @@ -435,4 +448,5 @@ printf(" \n"); printf(" \n"); + printf(" \n"); printf(" "); printf(" \n", $meannumislands); @@ -443,4 +457,5 @@ printf(" \n", $ratio); printf(" \n", $psf); + printf(" \n", $inhom); printf(" "); printf("
starstar
# islandsratiopsfinhom
%s %s %smm %s
"); Index: trunk/MagicSoft/Mars/datacenter/db/sequinfo.php =================================================================== --- trunk/MagicSoft/Mars/datacenter/db/sequinfo.php (revision 7506) +++ trunk/MagicSoft/Mars/datacenter/db/sequinfo.php (revision 7507) @@ -343,4 +343,13 @@ $_GET["fArrTimeRmsOuter"]="Off"; + if (empty($_GET["fMeanSignalInner"])) + $_GET["fMeanSignalInner"]=$first?"Off":""; + + if (empty($_GET["fMeanSignalOuter"])) + $_GET["fMeanSignalOuter"]=$first?"Off":""; + + if (empty($_GET["fPulsePosMean"])) + $_GET["fPulsePosMean"]=$first?"Off":""; + if (empty($_GET["fConvFactorInner"])) $_GET["fConvFactorInner"]=$first?"On":""; @@ -424,17 +433,15 @@ CheckBox("fUnreliableInner", "Unreliable inner"); CheckBox("fUnreliableOuter", "Unreliable outer"); - - printf(" \n"); - CheckBox("fIsolatedInner", "Isolated inner"); CheckBox("fIsolatedOuter", "Isolated outer"); + + printf(" \n"); + CheckBox("fIsolatedMaxCluster", "IsolatedMaxCluster"); - - printf(" \n"); - CheckBox("fArrTimeMeanInner", "ArrTimeMean inner "); CheckBox("fArrTimeMeanOuter", "ArrTimeMean outer "); CheckBox("fArrTimeRmsInner", "ArrTimeRms inner "); CheckBox("fArrTimeRmsOuter", "ArrTimeRms outer "); + CheckBox("fPulsePosMean", "Mean PulsePos"); printf(" \n"); @@ -444,4 +451,6 @@ CheckBox("fMeanPedRmsInner", "MeanPedRms inner"); CheckBox("fMeanPedRmsOuter", "MeanPedRms outer"); + CheckBox("fMeanSignalInner", "MeanSignal inner"); + CheckBox("fMeanSignalOuter", "MeanSignal outer"); printf(" \n");